Merge pull request #136 from rubberduck-vba/next

sync with main repo

Author: retailcoder

RetailCoder.VBE/App.cs

@@ -37,6 +37,7 @@ public sealed class App : IDisposable
         private bool _handleSinkEvents = true;
         private readonly BranchesViewViewModel _branchesVM;
         private readonly SourceControlViewViewModel _sourceControlPanelVM;
+        private readonly UI.Settings.Settings _settings;
 
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
@@ -52,6 +53,7 @@ public sealed class App : IDisposable
             new Dictionary<string, Tuple<IConnectionPoint, int>>();
 
         public App(VBE vbe, IMessageBox messageBox,
+            UI.Settings.Settings settings,
             IRubberduckParser parser,
             IGeneralConfigService configService,
             IAppMenu appMenus,
@@ -61,6 +63,7 @@ public App(VBE vbe, IMessageBox messageBox,
         {
             _vbe = vbe;
             _messageBox = messageBox;
+            _settings = settings;
             _parser = parser;
             _configService = configService;
             _autoSave = new AutoSave.AutoSave(_vbe, _configService);
@@ -543,6 +546,11 @@ public void Dispose()
                 _hooks = null;
             }
 
+            if (_settings != null)
+            {
+                _settings.Dispose();
+            }
+
             if (_configService != null)
             {
                 _configService.SettingsChanged -= _configService_SettingsChanged;

RetailCoder.VBE/Common/DeclarationExtensions.cs

@@ -22,7 +22,7 @@ public static class DeclarationExtensions
 
         public static string ToLocalizedString(this DeclarationType type)
         {
-            return RubberduckUI.ResourceManager.GetString("DeclarationType_" + type);
+            return RubberduckUI.ResourceManager.GetString("DeclarationType_" + type, UI.Settings.Settings.Culture);
         }
 
         public static BitmapImage BitmapImage(this Declaration declaration)

RetailCoder.VBE/Inspections/DefaultProjectNameInspectionResult.cs

@@ -41,7 +41,7 @@ public class RenameProjectQuickFix : CodeInspectionQuickFix
         private readonly RubberduckParserState _state;
 
         public RenameProjectQuickFix(ParserRuleContext context, QualifiedSelection selection, Declaration target, RubberduckParserState state)
-            : base(context, selection, string.Format(RubberduckUI.Rename_DeclarationType, RubberduckUI.ResourceManager.GetString("DeclarationType_" + DeclarationType.Project, RubberduckUI.Culture)))
+            : base(context, selection, string.Format(RubberduckUI.Rename_DeclarationType, RubberduckUI.ResourceManager.GetString("DeclarationType_" + DeclarationType.Project, UI.Settings.Settings.Culture)))
         {
             _target = target;
             _state = state;

RetailCoder.VBE/Inspections/InspectionBase.cs

@@ -54,13 +54,13 @@ protected InspectionBase(RubberduckParserState state, CodeInspectionSeverity def
         /// <summary>
         /// Meta-information about why an inspection exists.
         /// </summary>
-        public virtual string Meta { get { return InspectionsUI.ResourceManager.GetString(Name + "Meta"); } }
+        public virtual string Meta { get { return InspectionsUI.ResourceManager.GetString(Name + "Meta", UI.Settings.Settings.Culture); } }
 
         /// <summary>
         /// Gets a localized string representing the type of inspection.
         /// <see cref="InspectionType"/>
         /// </summary>
-        public virtual string InspectionTypeName { get { return InspectionsUI.ResourceManager.GetString(InspectionType.ToString()); } }
+        public virtual string InspectionTypeName { get { return InspectionsUI.ResourceManager.GetString(InspectionType.ToString(), UI.Settings.Settings.Culture); } }
 
         /// <summary>
         /// Gets a string representing the text that must be present in an 

RetailCoder.VBE/Inspections/Inspector.cs

@@ -81,7 +81,7 @@ public async Task<IEnumerable<ICodeInspectionResult>> FindIssuesAsync(Rubberduck
                         })).ToList();
 
                 await Task.WhenAll(inspections);
-                state.OnStatusMessageUpdate(RubberduckUI.ResourceManager.GetString("ParserState_" + state.Status)); // should be "Ready"
+                state.OnStatusMessageUpdate(RubberduckUI.ResourceManager.GetString("ParserState_" + state.Status, UI.Settings.Settings.Culture)); // should be "Ready"
                 return allIssues;
             }
 

RetailCoder.VBE/Inspections/UseMeaningfulNameInspectionResult.cs

@@ -28,7 +28,7 @@ public UseMeaningfulNameInspectionResult(IInspection inspection, Declaration tar
 
         public override string Description
         {
-            get { return string.Format(InspectionsUI.UseMeaningfulNameInspectionResultFormat, RubberduckUI.ResourceManager.GetString("DeclarationType_" + Target.DeclarationType), Target.IdentifierName); }
+            get { return string.Format(InspectionsUI.UseMeaningfulNameInspectionResultFormat, RubberduckUI.ResourceManager.GetString("DeclarationType_" + Target.DeclarationType, UI.Settings.Settings.Culture), Target.IdentifierName); }
         }
 
         public override NavigateCodeEventArgs GetNavigationArgs()
@@ -47,7 +47,7 @@ public class RenameDeclarationQuickFix : CodeInspectionQuickFix
         private readonly IMessageBox _messageBox;
 
         public RenameDeclarationQuickFix(ParserRuleContext context, QualifiedSelection selection, Declaration target, RubberduckParserState state, IMessageBox messageBox)
-            : base(context, selection, string.Format(RubberduckUI.Rename_DeclarationType, RubberduckUI.ResourceManager.GetString("DeclarationType_" + target.DeclarationType, RubberduckUI.Culture)))
+            : base(context, selection, string.Format(RubberduckUI.Rename_DeclarationType, RubberduckUI.ResourceManager.GetString("DeclarationType_" + target.DeclarationType, UI.Settings.Settings.Culture)))
         {
             _target = target;
             _state = state;

RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerViewModel.cs

@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Windows.Input;
 using Microsoft.Vbe.Interop;
+using NLog;
 using Rubberduck.Navigation.Folders;
 using Rubberduck.Parsing.Annotations;
 using Rubberduck.Parsing.Symbols;
@@ -30,7 +31,7 @@ public CodeExplorerViewModel(FolderHelper folderHelper, RubberduckParserState st
             _state.StateChanged += ParserState_StateChanged;
             _state.ModuleStateChanged += ParserState_ModuleStateChanged;
 
-            _refreshCommand = new DelegateCommand(param => _state.OnParseRequested(this),
+            _refreshCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), param => _state.OnParseRequested(this),
                 param => !IsBusy && _state.IsDirty());
 
             _refreshComponentCommand = commands.OfType<CodeExplorer_RefreshComponentCommand>().FirstOrDefault();
@@ -54,7 +55,7 @@ public CodeExplorerViewModel(FolderHelper folderHelper, RubberduckParserState st
             _externalRemoveCommand = commands.OfType<CodeExplorer_RemoveCommand>().FirstOrDefault();
             if (_externalRemoveCommand != null)
             {
-                _removeCommand = new DelegateCommand(ExecuteRemoveComand, _externalRemoveCommand.CanExecute);
+                _removeCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteRemoveComand, _externalRemoveCommand.CanExecute);
             }
 
             _printCommand = commands.OfType<CodeExplorer_PrintCommand>().FirstOrDefault();
@@ -64,13 +65,13 @@ public CodeExplorerViewModel(FolderHelper folderHelper, RubberduckParserState st
 
             _copyResultsCommand = commands.OfType<CodeExplorer_CopyResultsCommand>().FirstOrDefault();
 
-            _setNameSortCommand = new DelegateCommand(param =>
+            _setNameSortCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), param =>
             {
                 SortByName = (bool)param;
                 SortBySelection = !(bool)param;
             });
 
-            _setSelectionSortCommand = new DelegateCommand(param =>
+            _setSelectionSortCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), param =>
             {
                 SortBySelection = (bool)param;
                 SortByName = !(bool)param;

RetailCoder.VBE/Root/FatalExceptionInterceptor.cs

@@ -326,8 +326,6 @@ private void BindCommandsToMenuItems()
 
                         binding.When(request => whenCommandMenuItemCondition(request) || whenHooksCondition(request))
                             .InSingletonScope();
-
-                        binding.Intercept().With<FatalExceptionInterceptor>();
                     }
                 }
                 catch (InvalidOperationException)

RetailCoder.VBE/Root/RubberduckModule.cs

@@ -256,6 +256,7 @@
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="PresentationFramework.Aero" />
+    <Reference Include="PresentationFramework.Aero2" />
     <Reference Include="ReachFramework" />
     <Reference Include="stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <EmbedInteropTypes>False</EmbedInteropTypes>
@@ -391,7 +392,6 @@
     <Compile Include="Refactorings\ExtractMethod\IExtractMethodProc.cs" />
     <Compile Include="Refactorings\ExtractMethod\IExtractMethodRule.cs" />
     <Compile Include="Refactorings\ExtractMethod\IExtractMethodSelectionValidation.cs" />
-    <Compile Include="Root\FatalExceptionInterceptor.cs" />
     <Compile Include="Root\EnumerableCounterInterceptor.cs" />
     <Compile Include="Root\InterceptedException.cs" />
     <Compile Include="Root\InterceptorBase.cs" />
@@ -729,6 +729,7 @@
     <Compile Include="UI\Settings\InspectionSettingsViewModel.cs" />
     <Compile Include="UI\Settings\ISettingsView.cs" />
     <Compile Include="UI\Settings\ISettingsViewModel.cs" />
+    <Compile Include="UI\Settings\Settings.cs" />
     <Compile Include="UI\Settings\SettingsControl.xaml.cs">
       <DependentUpon>SettingsControl.xaml</DependentUpon>
     </Compile>