Use window visibililty settings on startup.

comintern · comintern · commit 841ab81daa43 · 2016-12-25T23:26:14.000-06:00
diff --git a/RetailCoder.VBE/Settings/WindowSettings.cs b/RetailCoder.VBE/Settings/WindowSettings.cs
@@ -1,4 +1,11 @@
 ﻿using System.Xml.Serialization;
+using Rubberduck.Properties;
+using Rubberduck.UI;
+using Rubberduck.UI.CodeExplorer;
+using Rubberduck.UI.Inspections;
+using Rubberduck.UI.SourceControl;
+using Rubberduck.UI.ToDoItems;
+using Rubberduck.UI.UnitTesting;
 
 namespace Rubberduck.Settings
 {
@@ -9,6 +16,8 @@ public interface IWindowSettings
         bool SourceControlVisibleOnStartup { get; set; }
         bool TestExplorerVisibleOnStartup { get; set; }
         bool TodoExplorerVisibleOnStartup { get; set; }
+
+        bool IsWindowVisible(DockableToolwindowPresenter candidate);
     }
 
     [XmlType(AnonymousType = true)]
@@ -34,5 +43,33 @@ public WindowSettings(bool codeExplorerVisibleOnStartup, bool codeInspectionsVis
         public bool SourceControlVisibleOnStartup { get; set; }
         public bool TestExplorerVisibleOnStartup { get; set; }
         public bool TodoExplorerVisibleOnStartup { get; set; }
+
+        public bool IsWindowVisible(DockableToolwindowPresenter candidate)
+        {
+            //I'm sure there's a better way to do this, because this is a lazy-ass way to do it.
+            //We're injecting into the base class, so check the derived class:
+            if (candidate is CodeExplorerDockablePresenter)
+            {
+                return CodeExplorerVisibleOnStartup;
+            }
+            if (candidate is CodeInspectionsDockablePresenter)
+            {
+                return CodeInspectionsVisibleOnStartup;
+            }
+            if (candidate is SourceControlDockablePresenter)
+            {
+                return SourceControlVisibleOnStartup;
+            }
+            if (candidate is TestExplorerDockablePresenter)
+            {
+                return TestExplorerVisibleOnStartup;
+            }
+            if (candidate is ToDoExplorerDockablePresenter)
+            {
+                return TodoExplorerVisibleOnStartup;
+            }
+            //Oh. Hello. I have no clue who you are...
+            return false;
+        }
     }
 }
diff --git a/RetailCoder.VBE/UI/CodeExplorer/CodeExplorerDockablePresenter.cs b/RetailCoder.VBE/UI/CodeExplorer/CodeExplorerDockablePresenter.cs
@@ -1,11 +1,13 @@
-﻿using Rubberduck.VBEditor.SafeComWrappers.Abstract;
+﻿using Rubberduck.Settings;
+using Rubberduck.SettingsProvider;
+using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.UI.CodeExplorer
 {
     public class CodeExplorerDockablePresenter : DockableToolwindowPresenter
     {
-        public CodeExplorerDockablePresenter(IVBE vbe, IAddIn addIn, CodeExplorerWindow view)
-            : base(vbe, addIn, view)
+        public CodeExplorerDockablePresenter(IVBE vbe, IAddIn addIn, CodeExplorerWindow view, IConfigProvider<WindowSettings> settings)
+            : base(vbe, addIn, view, settings)
         {
         }
     }
diff --git a/RetailCoder.VBE/UI/Controls/SearchResultsDockablePresenter.cs b/RetailCoder.VBE/UI/Controls/SearchResultsDockablePresenter.cs
@@ -4,8 +4,8 @@ namespace Rubberduck.UI.Controls
 {
     public class SearchResultsDockablePresenter : DockableToolwindowPresenter
     {
-        public SearchResultsDockablePresenter(IVBE vbe, IAddIn addin, IDockableUserControl view) 
-            : base(vbe, addin, view)
+        public SearchResultsDockablePresenter(IVBE vbe, IAddIn addin, IDockableUserControl view)
+            : base(vbe, addin, view, null)
         {
         }
 
diff --git a/RetailCoder.VBE/UI/DockableToolwindowPresenter.cs b/RetailCoder.VBE/UI/DockableToolwindowPresenter.cs
@@ -1,7 +1,10 @@
 ﻿using System;
+using System.Configuration;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 using NLog;
+using Rubberduck.Settings;
+using Rubberduck.SettingsProvider;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.UI
@@ -23,13 +26,18 @@ public abstract class DockableToolwindowPresenter : IDockablePresenter, IDisposa
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
         private readonly IWindow _window;
         private readonly UserControl _userControl;
+        private readonly WindowSettings _settings;  //Storing this really doesn't matter - it's only checked on startup and never persisted.
 
-        protected DockableToolwindowPresenter(IVBE vbe, IAddIn addin, IDockableUserControl view)
+        protected DockableToolwindowPresenter(IVBE vbe, IAddIn addin, IDockableUserControl view, IConfigProvider<WindowSettings> settingsProvider)
         {
             _vbe = vbe;
             _addin = addin;
             Logger.Trace(string.Format("Initializing Dockable Panel ({0})", GetType().Name));
             _userControl = view as UserControl;
+            if (settingsProvider != null)
+            {
+                _settings = settingsProvider.Create();
+            }
             _window = CreateToolWindow(view);
         }
 
@@ -69,7 +77,7 @@ private IWindow CreateToolWindow(IDockableUserControl control)
 
             EnsureMinimumWindowSize(toolWindow);
 
-            toolWindow.IsVisible = false; //hide it again
+            toolWindow.IsVisible = _settings != null && !_settings.IsWindowVisible(this);
 
             userControlHost.AddUserControl(control as UserControl, new IntPtr(_vbe.MainWindow.HWnd));
             return toolWindow;
diff --git a/RetailCoder.VBE/UI/IdentifierReferences/IdentifierReferencesListDockablePresenter.cs b/RetailCoder.VBE/UI/IdentifierReferences/IdentifierReferencesListDockablePresenter.cs
@@ -7,7 +7,7 @@ namespace Rubberduck.UI.IdentifierReferences
     public class IdentifierReferencesListDockablePresenter : DockableToolwindowPresenter
     {
         public IdentifierReferencesListDockablePresenter(IVBE vbe, IAddIn addin, SimpleListControl control, Declaration target)
-            : base(vbe, addin, control)
+            : base(vbe, addin, control, null)
         {
             BindTarget(target);
         }
diff --git a/RetailCoder.VBE/UI/IdentifierReferences/ImplementationsListDockablePresenter.cs b/RetailCoder.VBE/UI/IdentifierReferences/ImplementationsListDockablePresenter.cs
@@ -9,7 +9,7 @@ namespace Rubberduck.UI.IdentifierReferences
     public class ImplementationsListDockablePresenter : DockableToolwindowPresenter
     {
         public ImplementationsListDockablePresenter(IVBE vbe, IAddIn addin, IDockableUserControl control, IEnumerable<Declaration> implementations)
-            : base(vbe, addin, control)
+            : base(vbe, addin, control, null)
         {
             BindTarget(implementations);
         }
diff --git a/RetailCoder.VBE/UI/Inspections/CodeInspectionsDockablePresenter.cs b/RetailCoder.VBE/UI/Inspections/CodeInspectionsDockablePresenter.cs
@@ -1,11 +1,13 @@
-﻿using Rubberduck.VBEditor.SafeComWrappers.Abstract;
+﻿using Rubberduck.Settings;
+using Rubberduck.SettingsProvider;
+using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.UI.Inspections
 {
     public class CodeInspectionsDockablePresenter : DockableToolwindowPresenter
     {
-        public CodeInspectionsDockablePresenter(IVBE vbe, IAddIn addin, CodeInspectionsWindow window)
-            :base(vbe, addin, window)
+        public CodeInspectionsDockablePresenter(IVBE vbe, IAddIn addin, CodeInspectionsWindow window, IConfigProvider<WindowSettings> settings)
+            : base(vbe, addin, window, settings)
         {
         }
     }
diff --git a/RetailCoder.VBE/UI/ParserErrors/ParserErrorsPresenter.cs b/RetailCoder.VBE/UI/ParserErrors/ParserErrorsPresenter.cs
@@ -17,7 +17,7 @@ public interface IParserErrorsPresenter
     public class ParserErrorsPresenter : DockableToolwindowPresenter, IParserErrorsPresenter
     {
         public ParserErrorsPresenter(IVBE vbe, IAddIn addin) 
-            : base(vbe, addin, new SimpleListControl(RubberduckUI.ParseErrors_Caption))
+            : base(vbe, addin, new SimpleListControl(RubberduckUI.ParseErrors_Caption), null)
         {
             _source = new BindingList<ParseErrorListItem>();
             var control = UserControl as SimpleListControl;
diff --git a/RetailCoder.VBE/UI/SourceControl/SourceControlDockablePresenter.cs b/RetailCoder.VBE/UI/SourceControl/SourceControlDockablePresenter.cs
@@ -1,4 +1,6 @@
 ﻿using System.Diagnostics;
+using Rubberduck.Settings;
+using Rubberduck.SettingsProvider;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.UI.SourceControl
@@ -8,8 +10,8 @@ namespace Rubberduck.UI.SourceControl
     /// </summary>
     public class SourceControlDockablePresenter : DockableToolwindowPresenter
     {
-        public SourceControlDockablePresenter(IVBE vbe, IAddIn addin, SourceControlPanel window)
-            : base(vbe, addin, window)
+        public SourceControlDockablePresenter(IVBE vbe, IAddIn addin, SourceControlPanel window, IConfigProvider<WindowSettings> settings)
+            : base(vbe, addin, window, settings)
         {
         }
 
diff --git a/RetailCoder.VBE/UI/ToDoItems/ToDoExplorerDockablePresenter.cs b/RetailCoder.VBE/UI/ToDoItems/ToDoExplorerDockablePresenter.cs
@@ -1,4 +1,6 @@
-﻿using Rubberduck.VBEditor.SafeComWrappers.Abstract;
+﻿using Rubberduck.Settings;
+using Rubberduck.SettingsProvider;
+using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.UI.ToDoItems
 {
@@ -7,8 +9,8 @@ namespace Rubberduck.UI.ToDoItems
     /// </summary>
     public class ToDoExplorerDockablePresenter : DockableToolwindowPresenter
     {
-        public ToDoExplorerDockablePresenter(IVBE vbe, IAddIn addin, ToDoExplorerWindow window)
-            : base(vbe, addin, window)
+        public ToDoExplorerDockablePresenter(IVBE vbe, IAddIn addin, ToDoExplorerWindow window, IConfigProvider<WindowSettings> settings)
+            : base(vbe, addin, window, settings)
         {
         }
     }
diff --git a/RetailCoder.VBE/UI/UnitTesting/TestExplorerDockablePresenter.cs b/RetailCoder.VBE/UI/UnitTesting/TestExplorerDockablePresenter.cs
@@ -1,11 +1,13 @@
-﻿using Rubberduck.VBEditor.SafeComWrappers.Abstract;
+﻿using Rubberduck.Settings;
+using Rubberduck.SettingsProvider;
+using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.UI.UnitTesting
 {
     public class TestExplorerDockablePresenter : DockableToolwindowPresenter
     {
-        public TestExplorerDockablePresenter(IVBE vbe, IAddIn addin, TestExplorerWindow view)
-            : base(vbe, addin, view)
+        public TestExplorerDockablePresenter(IVBE vbe, IAddIn addin, TestExplorerWindow view, IConfigProvider<WindowSettings> settings)
+            : base(vbe, addin, view, settings)
         {
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,13 @@`
`1`		`-using Rubberduck.VBEditor.SafeComWrappers.Abstract;`
	`1`	`+using Rubberduck.Settings;`
	`2`	`+using Rubberduck.SettingsProvider;`
	`3`	`+using Rubberduck.VBEditor.SafeComWrappers.Abstract;`
`2`	`4`
`3`	`5`	`namespace Rubberduck.UI.CodeExplorer`
`4`	`6`	`{`
`5`	`7`	`public class CodeExplorerDockablePresenter : DockableToolwindowPresenter`
`6`	`8`	`{`
`7`		`- public CodeExplorerDockablePresenter(IVBE vbe, IAddIn addIn, CodeExplorerWindow view)`
`8`		`- : base(vbe, addIn, view)`
	`9`	`+ public CodeExplorerDockablePresenter(IVBE vbe, IAddIn addIn, CodeExplorerWindow view, IConfigProvider<WindowSettings> settings)`
	`10`	`+ : base(vbe, addIn, view, settings)`
`9`	`11`	`{`
`10`	`12`	`}`
`11`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ namespace Rubberduck.UI.Controls`
`4`	`4`	`{`
`5`	`5`	`public class SearchResultsDockablePresenter : DockableToolwindowPresenter`
`6`	`6`	`{`
`7`		`- public SearchResultsDockablePresenter(IVBE vbe, IAddIn addin, IDockableUserControl view)`
`8`		`- : base(vbe, addin, view)`
	`7`	`+ public SearchResultsDockablePresenter(IVBE vbe, IAddIn addin, IDockableUserControl view)`
	`8`	`+ : base(vbe, addin, view, null)`
`9`	`9`	`{`
`10`	`10`	`}`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace Rubberduck.UI.IdentifierReferences`
`7`	`7`	`public class IdentifierReferencesListDockablePresenter : DockableToolwindowPresenter`
`8`	`8`	`{`
`9`	`9`	`public IdentifierReferencesListDockablePresenter(IVBE vbe, IAddIn addin, SimpleListControl control, Declaration target)`
`10`		`- : base(vbe, addin, control)`
	`10`	`+ : base(vbe, addin, control, null)`
`11`	`11`	`{`
`12`	`12`	`BindTarget(target);`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace Rubberduck.UI.IdentifierReferences`
`9`	`9`	`public class ImplementationsListDockablePresenter : DockableToolwindowPresenter`
`10`	`10`	`{`
`11`	`11`	`public ImplementationsListDockablePresenter(IVBE vbe, IAddIn addin, IDockableUserControl control, IEnumerable<Declaration> implementations)`
`12`		`- : base(vbe, addin, control)`
	`12`	`+ : base(vbe, addin, control, null)`
`13`	`13`	`{`
`14`	`14`	`BindTarget(implementations);`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public interface IParserErrorsPresenter`
`17`	`17`	`public class ParserErrorsPresenter : DockableToolwindowPresenter, IParserErrorsPresenter`
`18`	`18`	`{`
`19`	`19`	`public ParserErrorsPresenter(IVBE vbe, IAddIn addin)`
`20`		`- : base(vbe, addin, new SimpleListControl(RubberduckUI.ParseErrors_Caption))`
	`20`	`+ : base(vbe, addin, new SimpleListControl(RubberduckUI.ParseErrors_Caption), null)`
`21`	`21`	`{`
`22`	`22`	`_source = new BindingList<ParseErrorListItem>();`
`23`	`23`	`var control = UserControl as SimpleListControl;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`using System.Diagnostics;`
	`2`	`+using Rubberduck.Settings;`
	`3`	`+using Rubberduck.SettingsProvider;`
`2`	`4`	`using Rubberduck.VBEditor.SafeComWrappers.Abstract;`
`3`	`5`
`4`	`6`	`namespace Rubberduck.UI.SourceControl`
`@@ -8,8 +10,8 @@ namespace Rubberduck.UI.SourceControl`
`8`	`10`	`/// </summary>`
`9`	`11`	`public class SourceControlDockablePresenter : DockableToolwindowPresenter`
`10`	`12`	`{`
`11`		`- public SourceControlDockablePresenter(IVBE vbe, IAddIn addin, SourceControlPanel window)`
`12`		`- : base(vbe, addin, window)`
	`13`	`+ public SourceControlDockablePresenter(IVBE vbe, IAddIn addin, SourceControlPanel window, IConfigProvider<WindowSettings> settings)`
	`14`	`+ : base(vbe, addin, window, settings)`
`13`	`15`	`{`
`14`	`16`	`}`
`15`	`17`