Merge pull request #41 from rubberduck-vba/next

sync with merged PR's in main repo

Author: retailcoder

RetailCoder.VBE/App.cs

@@ -53,16 +53,16 @@ public App(VBE vbe, IMessageBox messageBox,
             _parserErrorsPresenterFactory = parserErrorsPresenterFactory;
             _parser = parser;
             _inspectorFactory = inspectorFactory;
-            _autoSave = new AutoSave.AutoSave(_vbe, new AutoSaveSettings());
             _configService = configService;
+            _autoSave = new AutoSave.AutoSave(_vbe, _configService);
             _appMenus = appMenus;
             _stateBar = stateBar;
             _indenter = indenter;
             //_hooks = hooks;
             _logger = LogManager.GetCurrentClassLogger();
 
             //_hooks.MessageReceived += hooks_MessageReceived;
-            _configService.SettingsChanged += _configService_SettingsChanged;
+            _configService.LanguageChanged += ConfigServiceLanguageChanged;
             _parser.State.StateChanged += Parser_StateChanged;
             _stateBar.Refresh += _stateBar_Refresh;
 
@@ -177,7 +177,7 @@ private void CleanReloadConfig()
             Setup();
         }
 
-        private void _configService_SettingsChanged(object sender, EventArgs e)
+        private void ConfigServiceLanguageChanged(object sender, EventArgs e)
         {
             CleanReloadConfig();
         }
@@ -211,7 +211,7 @@ private void Setup()
         public void Dispose()
         {
             //_hooks.MessageReceived -= hooks_MessageReceived;
-            _configService.SettingsChanged -= _configService_SettingsChanged;
+            _configService.LanguageChanged -= ConfigServiceLanguageChanged;
             _parser.State.StateChanged -= Parser_StateChanged;
             _autoSave.Dispose();
 

RetailCoder.VBE/AutoSave/AutoSave.cs

@@ -1,44 +1,41 @@
 using System;
-using System.ComponentModel;
 using System.IO;
 using System.Linq;
 using System.Timers;
 using Microsoft.Vbe.Interop;
+using Rubberduck.Settings;
 
 namespace Rubberduck.AutoSave
 {
     public class AutoSave : IDisposable
     {
         private readonly VBE _vbe;
-        private readonly IAutoSaveSettings _settings;
+        private readonly IGeneralConfigService _configService;
         private readonly Timer _timer = new Timer();
+        private Configuration _config;
 
         private const int VbeSaveCommandId = 3;
 
-        public AutoSave(VBE vbe, IAutoSaveSettings settings)
+        public AutoSave(VBE vbe, IGeneralConfigService configService)
         {
             _vbe = vbe;
-            _settings = settings;
+            _configService = configService;
+            _config = _configService.LoadConfiguration();
 
-            _settings.PropertyChanged += _settings_PropertyChanged;
+            _configService.SettingsChanged += ConfigServiceSettingsChanged;
 
-            _timer.Enabled = _settings.IsEnabled;
-            _timer.Interval = _settings.TimerDelay;
+            _timer.Enabled = _config.UserSettings.GeneralSettings.AutoSaveEnabled;
+            _timer.Interval = _config.UserSettings.GeneralSettings.AutoSavePeriod * 1000;
 
             _timer.Elapsed += _timer_Elapsed;
         }
 
-        private void _settings_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        void ConfigServiceSettingsChanged(object sender, EventArgs e)
         {
-            switch (e.PropertyName)
-            {
-                case "IsEnabled":
-                    _timer.Enabled = _settings.IsEnabled;
-                    break;
-                case "TimerDelay":
-                    _timer.Interval = _settings.TimerDelay;
-                    break;
-            }
+            _config = _configService.LoadConfiguration();
+
+            _timer.Enabled = _config.UserSettings.GeneralSettings.AutoSaveEnabled;
+            _timer.Interval = _config.UserSettings.GeneralSettings.AutoSavePeriod * 1000;
         }
 
         private void _timer_Elapsed(object sender, ElapsedEventArgs e)
@@ -61,7 +58,7 @@ private void _timer_Elapsed(object sender, ElapsedEventArgs e)
 
         public void Dispose()
         {
-            _settings.PropertyChanged -= _settings_PropertyChanged;
+            _configService.LanguageChanged -= ConfigServiceSettingsChanged;
             _timer.Elapsed -= _timer_Elapsed;
 
             _timer.Dispose();

RetailCoder.VBE/AutoSave/AutoSaveSettings.cs

@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using Antlr4.Runtime;
 using Rubberduck.Parsing.Grammar;
-using Rubberduck.UI;
 using Rubberduck.VBEditor;
 
 namespace Rubberduck.Inspections

RetailCoder.VBE/Inspections/AssignedByValParameterInspectionResult.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Antlr4.Runtime;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;

RetailCoder.VBE/Inspections/EncapsulatePublicFieldInspectionResult.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
 using Rubberduck.Parsing.VBA;

RetailCoder.VBE/Inspections/IInspector.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using Antlr4.Runtime;
 using Rubberduck.Parsing.Symbols;
-using Rubberduck.UI;
 using Rubberduck.VBEditor;
 
 namespace Rubberduck.Inspections

RetailCoder.VBE/Inspections/IdentifierNotAssignedInspectionResult.cs

@@ -2,7 +2,6 @@
 using Antlr4.Runtime;
 using Rubberduck.Common;
 using Rubberduck.Parsing.Symbols;
-using Rubberduck.UI;
 using Rubberduck.VBEditor;
 
 namespace Rubberduck.Inspections

RetailCoder.VBE/Inspections/IdentifierNotUsedInspectionResult.cs

@@ -3,7 +3,6 @@
 using System.Linq;
 using Microsoft.Vbe.Interop;
 using Rubberduck.Parsing.VBA;
-using Rubberduck.UI;
 using Rubberduck.VBEditor.Extensions;
 using Rubberduck.VBEditor.VBEHost;
 

RetailCoder.VBE/Inspections/ImplicitActiveWorkbookReferenceInspection.cs

@@ -5,7 +5,6 @@
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
-using Rubberduck.UI;
 
 namespace Rubberduck.Inspections
 {