Reset Code Explorer after saving settings

Author: Hosch250

RetailCoder.VBE/App.cs

@@ -17,7 +17,6 @@ public class App : IDisposable
     {
         private readonly VBE _vbe;
         private readonly AddIn _addIn;
-        private readonly CodeInspectionsToolbar _codeInspectionsToolbar;
         private readonly IList<IInspection> _inspections;
         private readonly Inspector _inspector;
         private readonly ParserErrorsPresenter _parserErrorsPresenter;
@@ -27,6 +26,7 @@ public class App : IDisposable
 
         private Configuration _config;
         private RubberduckMenu _menu;
+        private CodeInspectionsToolbar _codeInspectionsToolbar;
 
         public App(VBE vbe, AddIn addIn)
         {
@@ -44,7 +44,7 @@ public App(VBE vbe, AddIn addIn)
 
             _inspector = new Inspector(_parser, _inspections);
             //_menu = new RubberduckMenu(vbe, addIn, _configService, _parser, _editor, _inspector);
-            _codeInspectionsToolbar = new CodeInspectionsToolbar(vbe, _inspector);
+            //_codeInspectionsToolbar = new CodeInspectionsToolbar(vbe, _inspector);
 
             LoadConfig();
         }
@@ -66,8 +66,16 @@ private void LoadConfig()
                 _menu.Dispose();
             }
 
+            if (_codeInspectionsToolbar != null)
+            {
+                _codeInspectionsToolbar.Dispose();
+            }
+
             _menu = new RubberduckMenu(_vbe, _addIn, _configService, _parser, _editor, _inspector);
             _menu.Initialize();
+
+            _codeInspectionsToolbar = new CodeInspectionsToolbar(_vbe, _inspector);
+            _codeInspectionsToolbar.Initialize();
         }
 
         private void _parser_ParseStarted(object sender, ParseStartedEventArgs e)
@@ -128,7 +136,7 @@ protected virtual void Dispose(bool disposing)
         public void CreateExtUi()
         {
             //_menu.Initialize();
-            _codeInspectionsToolbar.Initialize();
+            //_codeInspectionsToolbar.Initialize();
         }
     }
 }

RetailCoder.VBE/UI/CodeInspections/CodeInspectionsToolbar.cs

@@ -48,34 +48,34 @@ public CodeInspectionsToolbar(VBE vbe, IInspector inspector)
 
         public void Initialize()
         {
-            var toolbar = _vbe.CommandBars.Add(RubberduckUI.CodeInspections, Temporary: true);
-            _refreshButton = (CommandBarButton)toolbar.Controls.Add(MsoControlType.msoControlButton, Temporary: true);
+            _toolbar = _vbe.CommandBars.Add(RubberduckUI.CodeInspections, Temporary: true);
+            _refreshButton = (CommandBarButton)_toolbar.Controls.Add(MsoControlType.msoControlButton, Temporary: true);
             _refreshButton.TooltipText = RubberduckUI.CodeInspections_Run;
 
             var refreshIcon = Resources.Refresh;
             refreshIcon.MakeTransparent(Color.Magenta);
             Menu.SetButtonImage(_refreshButton, refreshIcon);
 
-            _statusButton = (CommandBarButton)toolbar.Controls.Add(MsoControlType.msoControlButton, Temporary: true);
+            _statusButton = (CommandBarButton)_toolbar.Controls.Add(MsoControlType.msoControlButton, Temporary: true);
             _statusButton.Caption = string.Format(RubberduckUI.CodeInspections_NumberOfIssues, 0, "s");
             _statusButton.FaceId = 463; // Resources.Warning doesn't look good here
             _statusButton.Style = MsoButtonStyle.msoButtonIconAndCaption;
 
-            _quickFixButton = (CommandBarButton)toolbar.Controls.Add(MsoControlType.msoControlButton, Temporary: true);
+            _quickFixButton = (CommandBarButton)_toolbar.Controls.Add(MsoControlType.msoControlButton, Temporary: true);
             _quickFixButton.Caption = RubberduckUI.Fix;
             _quickFixButton.Style = MsoButtonStyle.msoButtonIconAndCaption;
             _quickFixButton.FaceId = 305; // Resources.applycodechanges_6548_321 doesn't look good here
             _quickFixButton.Enabled = false;
 
-            _navigatePreviousButton = (CommandBarButton)toolbar.Controls.Add(MsoControlType.msoControlButton, Temporary:true);
+            _navigatePreviousButton = (CommandBarButton)_toolbar.Controls.Add(MsoControlType.msoControlButton, Temporary:true);
             _navigatePreviousButton.BeginGroup = true;
             _navigatePreviousButton.Caption = RubberduckUI.Previous;
             _navigatePreviousButton.TooltipText = RubberduckUI.Previous;
             _navigatePreviousButton.Style = MsoButtonStyle.msoButtonIconAndCaption;
             _navigatePreviousButton.FaceId = 41; // Resources.112_LeftArrowLong_Blue_16x16_72 makes a gray Block when disabled
             _navigatePreviousButton.Enabled = false;
 
-            _navigateNextButton = (CommandBarButton)toolbar.Controls.Add(MsoControlType.msoControlButton, Temporary: true);
+            _navigateNextButton = (CommandBarButton)_toolbar.Controls.Add(MsoControlType.msoControlButton, Temporary: true);
             _navigateNextButton.Caption = RubberduckUI.Next;
             _navigateNextButton.TooltipText = RubberduckUI.Next;
             _navigateNextButton.Style = MsoButtonStyle.msoButtonIconAndCaption;
@@ -174,6 +174,8 @@ private void _quickFixButton_Click(CommandBarButton Ctrl, ref bool CancelDefault
         }
 
         private CancellationTokenSource _tokenSource;
+        private CommandBar _toolbar;
+
         private void _refreshButton_Click(CommandBarButton Ctrl, ref bool CancelDefault)
         {
             _tokenSource = new CancellationTokenSource();
@@ -233,6 +235,14 @@ private void SetQuickFixTooltip()
 
         public void Dispose()
         {
+            Dispose(true);
+        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!disposing) { return; }
+
+            _toolbar.Delete();
         }
     }
 }