Merge pull request #2448 from ThunderFrame/next

Adds Window Settings to Rubberduck Settings

Author: retailcoder

RetailCoder.VBE/Root/RubberduckModule.cs

@@ -194,6 +194,7 @@ private void ApplyConfigurationConvention(IEnumerable<Assembly> assemblies)
             Bind<IPersistanceService<HotkeySettings>>().To<XmlPersistanceService<HotkeySettings>>().InCallScope();
             Bind<IPersistanceService<ToDoListSettings>>().To<XmlPersistanceService<ToDoListSettings>>().InCallScope();
             Bind<IPersistanceService<UnitTestSettings>>().To<XmlPersistanceService<UnitTestSettings>>().InCallScope();
+            Bind<IPersistanceService<WindowSettings>>().To<XmlPersistanceService<WindowSettings>>().InCallScope();
             Bind<IPersistanceService<IndenterSettings>>().To<XmlPersistanceService<IndenterSettings>>().InCallScope();
             Bind<IFilePersistanceService<SourceControlSettings>>().To<XmlPersistanceService<SourceControlSettings>>().InCallScope();
 
@@ -205,6 +206,7 @@ private void ApplyConfigurationConvention(IEnumerable<Assembly> assemblies)
             Bind<IHotkeySettings>().To<HotkeySettings>().InCallScope();
             Bind<IToDoListSettings>().To<ToDoListSettings>().InCallScope();
             Bind<IUnitTestSettings>().To<UnitTestSettings>().InCallScope();
+            Bind<IWindowSettings>().To<WindowSettings>().InCallScope();
             Bind<IIndenterSettings>().To<IndenterSettings>().InCallScope();
             Bind<ISourceControlSettings>().To<SourceControlSettings>().InCallScope();        
         }

RetailCoder.VBE/Rubberduck.csproj

@@ -445,6 +445,8 @@
     <Compile Include="Settings\ToDoListConfigProvider.cs" />
     <Compile Include="Settings\UnitTestConfigProvider.cs" />
     <Compile Include="Settings\WhitelistedIdentifierSetting.cs" />
+    <Compile Include="Settings\WindowConfigProvider.cs" />
+    <Compile Include="Settings\WindowSettings.cs" />
     <Compile Include="UI\About\AboutControl.xaml.cs">
       <DependentUpon>AboutControl.xaml</DependentUpon>
     </Compile>
@@ -843,6 +845,10 @@
     <Compile Include="UI\IdentifierReferences\ListItemActionEventArgs.cs" />
     <Compile Include="UI\ParserErrors\ParserErrorsPresenter.cs" />
     <Compile Include="Refactorings\ExtractMethod\ExtractMethodModel.cs" />
+    <Compile Include="UI\Settings\WindowSettings.xaml.cs">
+      <DependentUpon>WindowSettings.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="UI\Settings\WindowSettingsViewModel.cs" />
     <Compile Include="UI\SimpleListControl.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -1483,6 +1489,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="UI\Settings\WindowSettings.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="UI\SourceControl\BranchesView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

RetailCoder.VBE/Settings/ConfigurationLoader.cs

@@ -32,16 +32,18 @@ public class ConfigurationLoader : IGeneralConfigService
         private readonly IConfigProvider<CodeInspectionSettings> _inspectionProvider;
         private readonly IConfigProvider<UnitTestSettings> _unitTestProvider;
         private readonly IConfigProvider<IndenterSettings> _indenterProvider;
+        private readonly IConfigProvider<WindowSettings> _windowProvider;
 
         public ConfigurationLoader(IConfigProvider<GeneralSettings> generalProvider, IConfigProvider<HotkeySettings> hotkeyProvider, IConfigProvider<ToDoListSettings> todoProvider,
-                                   IConfigProvider<CodeInspectionSettings> inspectionProvider, IConfigProvider<UnitTestSettings> unitTestProvider, IConfigProvider<IndenterSettings> indenterProvider)
+                                   IConfigProvider<CodeInspectionSettings> inspectionProvider, IConfigProvider<UnitTestSettings> unitTestProvider, IConfigProvider<IndenterSettings> indenterProvider, IConfigProvider<WindowSettings> windowProvider)
         {
             _generalProvider = generalProvider;
             _hotkeyProvider = hotkeyProvider;
             _todoProvider = todoProvider;
             _inspectionProvider = inspectionProvider;
             _unitTestProvider = unitTestProvider;
             _indenterProvider = indenterProvider;
+            _windowProvider = windowProvider;
         }
 
         /// <summary>
@@ -58,7 +60,8 @@ public virtual Configuration LoadConfiguration()
                     _todoProvider.Create(),
                     _inspectionProvider.Create(),
                     _unitTestProvider.Create(),
-                    _indenterProvider.Create()
+                    _indenterProvider.Create(),
+                    _windowProvider.Create()
                 )
             };            
             return config;
@@ -75,7 +78,8 @@ public Configuration GetDefaultConfiguration()
                     _todoProvider.CreateDefaults(),
                     _inspectionProvider.CreateDefaults(),
                     _unitTestProvider.CreateDefaults(),
-                    _indenterProvider.CreateDefaults()
+                    _indenterProvider.CreateDefaults(),
+                    _windowProvider.CreateDefaults()
                 )
             };
         }
@@ -93,6 +97,7 @@ public void SaveConfiguration(Configuration toSerialize)
             _inspectionProvider.Save(toSerialize.UserSettings.CodeInspectionSettings);
             _unitTestProvider.Save(toSerialize.UserSettings.UnitTestSettings);
             _indenterProvider.Save(toSerialize.UserSettings.IndenterSettings);
+            _windowProvider.Save(toSerialize.UserSettings.WindowSettings);
 
             OnSettingsChanged(new ConfigurationChangedEventArgs(inspectOnReparse, langChanged, !oldInspectionSettings.SequenceEqual(newInspectionSettings)));
         }

RetailCoder.VBE/Settings/UserSettings.cs

@@ -12,20 +12,23 @@ public class UserSettings
         public CodeInspectionSettings CodeInspectionSettings { get; set; }
         public UnitTestSettings UnitTestSettings { get; set; }
         public IndenterSettings IndenterSettings { get; set; }
+        public WindowSettings WindowSettings { get; set; }
 
         public UserSettings(GeneralSettings generalSettings,
                             HotkeySettings hotkeySettings,
                             ToDoListSettings todoSettings, 
                             CodeInspectionSettings codeInspectionSettings,
                             UnitTestSettings unitTestSettings,
-                            IndenterSettings indenterSettings)
+                            IndenterSettings indenterSettings,
+                            WindowSettings windowSettings)
         {
             GeneralSettings = generalSettings;
             HotkeySettings = hotkeySettings;
             ToDoListSettings = todoSettings;
             CodeInspectionSettings = codeInspectionSettings;
             UnitTestSettings = unitTestSettings;
             IndenterSettings = indenterSettings;
+            WindowSettings = windowSettings;
         }
     }
 }

RetailCoder.VBE/Settings/WindowConfigProvider.cs

@@ -0,0 +1,30 @@
+using Rubberduck.SettingsProvider;
+
+namespace Rubberduck.Settings
+{
+    public class WindowConfigProvider : IConfigProvider<WindowSettings>
+    {
+        private readonly IPersistanceService<WindowSettings> _persister;
+
+        public WindowConfigProvider(IPersistanceService<WindowSettings> persister)
+        {
+            _persister = persister;
+        }
+
+        public WindowSettings Create()
+        {
+            var prototype = new WindowSettings();
+            return _persister.Load(prototype) ?? prototype;
+        }
+
+        public WindowSettings CreateDefaults()
+        {
+            return new WindowSettings();
+        }
+
+        public void Save(WindowSettings settings)
+        {
+            _persister.Save(settings);
+        }
+    }
+}

RetailCoder.VBE/Settings/WindowSettings.cs

@@ -0,0 +1,38 @@
+using System.Xml.Serialization;
+
+namespace Rubberduck.Settings
+{
+    public interface IWindowSettings
+    {
+        bool CodeExplorerVisibleOnStartup { get; set; }
+        bool CodeInspectionsVisibleOnStartup { get; set; }
+        bool SourceControlVisibleOnStartup { get; set; }
+        bool TestExplorerVisibleOnStartup { get; set; }
+        bool TodoExplorerVisibleOnStartup { get; set; }
+    }
+
+    [XmlType(AnonymousType = true)]
+    public class WindowSettings : IWindowSettings
+    {
+        public WindowSettings()
+            : this(false, false, false, false, false)
+        {
+            //empty constructor needed for serialization
+        }
+
+        public WindowSettings(bool codeExplorerVisibleOnStartup, bool codeInspectionsVisibleOnStartup, bool sourceControlVisibleOnStartup, bool testExplorerVisibleOnStartup, bool todoExplorerVisibleOnStartup)
+        {
+            CodeExplorerVisibleOnStartup = codeExplorerVisibleOnStartup;
+            CodeInspectionsVisibleOnStartup = codeInspectionsVisibleOnStartup;
+            SourceControlVisibleOnStartup = sourceControlVisibleOnStartup;
+            TestExplorerVisibleOnStartup = testExplorerVisibleOnStartup;
+            TodoExplorerVisibleOnStartup = todoExplorerVisibleOnStartup;
+        }
+
+        public bool CodeExplorerVisibleOnStartup { get; set; }
+        public bool CodeInspectionsVisibleOnStartup { get; set; }
+        public bool SourceControlVisibleOnStartup { get; set; }
+        public bool TestExplorerVisibleOnStartup { get; set; }
+        public bool TodoExplorerVisibleOnStartup { get; set; }
+    }
+}

RetailCoder.VBE/UI/RubberduckUI.Designer.cs

@@ -1084,6 +1084,9 @@ Are you sure you want to proceed with this rename?</value>
   <data name="SettingsCaption_UnitTestSettings" xml:space="preserve">
     <value>Unit Test Settings</value>
   </data>
+  <data name="SettingsCaption_WindowSettings" xml:space="preserve">
+    <value>Window Settings</value>
+  </data>
   <data name="SeverityLabelText" xml:space="preserve">
     <value>Severity:</value>
   </data>
@@ -1096,6 +1099,9 @@ Are you sure you want to proceed with this rename?</value>
   <data name="SettingsInstructions_UnitTestSettings" xml:space="preserve">
     <value>Configure the settings for new unit test modules and methods.</value>
   </data>
+  <data name="SettingsInstructions_WindowSettings" xml:space="preserve">
+    <value>Configure the settings for window visibility.</value>
+  </data>
   <data name="UnitTestSettings_AssertMode" xml:space="preserve">
     <value>Type safety:</value>
   </data>
@@ -1126,6 +1132,9 @@ Are you sure you want to proceed with this rename?</value>
   <data name="UnitTestSettings_TestModuleTemplateHeader" xml:space="preserve">
     <value>Test Module Template</value>
   </data>
+  <data name="WindowSettings_StartupVisibilityHeader" xml:space="preserve">
+    <value>Window visibility at startup</value>
+  </data>
   <data name="TestOutcome_Failed" xml:space="preserve">
     <value>Failed</value>
   </data>
@@ -1867,6 +1876,9 @@ End Sub</value>
   <data name="DialogCaption_LoadUnitTestSettings" xml:space="preserve">
     <value>Load Unit Test Settings</value>
   </data>
+  <data name="DialogCaption_LoadWindowSettings" xml:space="preserve">
+    <value>Load Window Settings</value>
+  </data>
   <data name="DialogCaption_SaveGeneralSettings" xml:space="preserve">
     <value>Save General Settings</value>
   </data>
@@ -1879,6 +1891,9 @@ End Sub</value>
   <data name="DialogCaption_SaveUnitTestSettings" xml:space="preserve">
     <value>Save Unit Test Settings</value>
   </data>
+  <data name="DialogCaption_SaveWindowSettings" xml:space="preserve">
+    <value>Save Window Settings</value>
+  </data>
   <data name="ContextReferences" xml:space="preserve">
     <value>references</value>
     <comment>Used to display number of references in commandbar's context selection</comment>

RetailCoder.VBE/UI/RubberduckUI.resx

@@ -19,14 +19,15 @@ public SettingsControlViewModel(IGeneralConfigService configService,
             SettingsView inspectionSettings,
             SettingsView unitTestSettings,
             SettingsView indenterSettings,
+            SettingsView windowSettings,
             SettingsViews activeView = UI.Settings.SettingsViews.GeneralSettings)
         {
             _configService = configService;
             _config = config;
 
             SettingsViews = new ObservableCollection<SettingsView>
             {
-                generalSettings, todoSettings, inspectionSettings, unitTestSettings, indenterSettings
+                generalSettings, todoSettings, inspectionSettings, unitTestSettings, indenterSettings, windowSettings
             };
 
             SelectedSettingsView = SettingsViews.First(v => v.View == activeView);

RetailCoder.VBE/UI/Settings/SettingsControlViewModel.cs

@@ -42,6 +42,11 @@ public SettingsForm(IGeneralConfigService configService, IOperatingSystem operat
                     Control = new IndenterSettings(new IndenterSettingsViewModel(config)),
                     View = SettingsViews.IndenterSettings
                 },
+                new SettingsView
+                {
+                    Control = new WindowSettings(new WindowSettingsViewModel(config)),
+                    View = SettingsViews.WindowSettings
+                },
                 activeView);
 
             ViewModel.OnWindowClosed += ViewModel_OnWindowClosed;

RetailCoder.VBE/UI/Settings/SettingsForm.cs

@@ -6,6 +6,7 @@ public enum SettingsViews
         TodoSettings,
         InspectionSettings,
         UnitTestSettings,
-        IndenterSettings
+        IndenterSettings,
+        WindowSettings
     }
 }