From 17df6076bf87b1d832d4cf0de148f08951f689f8 Mon Sep 17 00:00:00 2001 From: hosch250 Date: Thu, 18 Feb 2016 12:51:11 -0600 Subject: [PATCH 01/10] Add auto-save to settings. Remove unused usings from inspections (mostly RubberduckUI references). --- .../AssignedByValParameterInspectionResult.cs | 1 - .../EncapsulatePublicFieldInspectionResult.cs | 3 +- RetailCoder.VBE/Inspections/IInspector.cs | 1 - .../IdentifierNotAssignedInspectionResult.cs | 1 - .../IdentifierNotUsedInspectionResult.cs | 1 - ...plicitActiveWorkbookReferenceInspection.cs | 1 - .../ImplicitByRefParameterInspection.cs | 1 - .../ImplicitByRefParameterInspectionResult.cs | 4 +-- .../ImplicitPublicMemberInspectionResult.cs | 1 - ...plicitVariantReturnTypeInspectionResult.cs | 1 - .../Inspections/InspectionResultBase.cs | 3 +- .../MakeSingleLineParameterQuickFix.cs | 1 - .../MultilineParameterInspection.cs | 1 - .../MultipleDeclarationsInspectionResult.cs | 1 - .../ObsoleteCommentSyntaxInspectionResult.cs | 1 - ...soleteLetStatementUsageInspectionResult.cs | 1 - .../Inspections/ObsoleteTypeHintInspection.cs | 1 - .../ObsoleteTypeHintInspectionResult.cs | 1 - .../Inspections/OptionExplicitInspection.cs | 1 - .../OptionExplicitInspectionResult.cs | 1 - .../ParameterCanBeByValInspectionResult.cs | 1 - .../ParameterNotUsedInspectionResult.cs | 2 -- .../Inspections/ProcedureNotUsedInspection.cs | 1 - .../RemoveExplicitCallStatmentQuickFix.cs | 1 - ...UnassignedVariableUsageInspectionResult.cs | 1 - .../UntypedFunctionUsageInspectionResult.cs | 1 - ...VariableTypeNotDeclaredInspectionResult.cs | 1 - .../WriteOnlyPropertyInspection.cs | 1 - .../Settings/ConfigurationLoader.cs | 3 +- RetailCoder.VBE/Settings/GeneralSettings.cs | 9 ++++- RetailCoder.VBE/UI/RubberduckUI.Designer.cs | 30 ++++++++++++---- RetailCoder.VBE/UI/RubberduckUI.resx | 12 +++++-- .../UI/Settings/GeneralSettings.xaml | 10 +++++- .../UI/Settings/GeneralSettingsViewModel.cs | 34 +++++++++++++++++++ .../Settings/GeneralSettingsTests.cs | 34 ++++++++++++++++--- .../Settings/SettingsControlTests.cs | 20 ++++++++--- 36 files changed, 134 insertions(+), 54 deletions(-) diff --git a/RetailCoder.VBE/Inspections/AssignedByValParameterInspectionResult.cs b/RetailCoder.VBE/Inspections/AssignedByValParameterInspectionResult.cs index fd637e305f..8eb2eb815c 100644 --- a/RetailCoder.VBE/Inspections/AssignedByValParameterInspectionResult.cs +++ b/RetailCoder.VBE/Inspections/AssignedByValParameterInspectionResult.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 diff --git a/RetailCoder.VBE/Inspections/EncapsulatePublicFieldInspectionResult.cs b/RetailCoder.VBE/Inspections/EncapsulatePublicFieldInspectionResult.cs index 3a54e01d7e..0097574be8 100644 --- a/RetailCoder.VBE/Inspections/EncapsulatePublicFieldInspectionResult.cs +++ b/RetailCoder.VBE/Inspections/EncapsulatePublicFieldInspectionResult.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; diff --git a/RetailCoder.VBE/Inspections/IInspector.cs b/RetailCoder.VBE/Inspections/IInspector.cs index ffa74c65d2..16722041d2 100644 --- a/RetailCoder.VBE/Inspections/IInspector.cs +++ b/RetailCoder.VBE/Inspections/IInspector.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; diff --git a/RetailCoder.VBE/Inspections/IdentifierNotAssignedInspectionResult.cs b/RetailCoder.VBE/Inspections/IdentifierNotAssignedInspectionResult.cs index 1d8c999ffd..673cc05410 100644 --- a/RetailCoder.VBE/Inspections/IdentifierNotAssignedInspectionResult.cs +++ b/RetailCoder.VBE/Inspections/IdentifierNotAssignedInspectionResult.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 diff --git a/RetailCoder.VBE/Inspections/IdentifierNotUsedInspectionResult.cs b/RetailCoder.VBE/Inspections/IdentifierNotUsedInspectionResult.cs index 860ed8b32f..1e7dec002c 100644 --- a/RetailCoder.VBE/Inspections/IdentifierNotUsedInspectionResult.cs +++ b/RetailCoder.VBE/Inspections/IdentifierNotUsedInspectionResult.cs @@ -2,7 +2,6 @@ using Antlr4.Runtime; using Rubberduck.Common; using Rubberduck.Parsing.Symbols; -using Rubberduck.UI; using Rubberduck.VBEditor; namespace Rubberduck.Inspections diff --git a/RetailCoder.VBE/Inspections/ImplicitActiveWorkbookReferenceInspection.cs b/RetailCoder.VBE/Inspections/ImplicitActiveWorkbookReferenceInspection.cs index 75e5f8ce6c..c0676c5f4a 100644 --- a/RetailCoder.VBE/Inspections/ImplicitActiveWorkbookReferenceInspection.cs +++ b/RetailCoder.VBE/Inspections/ImplicitActiveWorkbookReferenceInspection.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; diff --git a/RetailCoder.VBE/Inspections/ImplicitByRefParameterInspection.cs b/RetailCoder.VBE/Inspections/ImplicitByRefParameterInspection.cs index c50a620d17..ef79d7aead 100644 --- a/RetailCoder.VBE/Inspections/ImplicitByRefParameterInspection.cs +++ b/RetailCoder.VBE/Inspections/ImplicitByRefParameterInspection.cs @@ -5,7 +5,6 @@ using Rubberduck.Parsing.Grammar; using Rubberduck.Parsing.Symbols; using Rubberduck.Parsing.VBA; -using Rubberduck.UI; namespace Rubberduck.Inspections { diff --git a/RetailCoder.VBE/Inspections/ImplicitByRefParameterInspectionResult.cs b/RetailCoder.VBE/Inspections/ImplicitByRefParameterInspectionResult.cs index bbc65094d7..74f5c17914 100644 --- a/RetailCoder.VBE/Inspections/ImplicitByRefParameterInspectionResult.cs +++ b/RetailCoder.VBE/Inspections/ImplicitByRefParameterInspectionResult.cs @@ -1,9 +1,7 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using Antlr4.Runtime; using Rubberduck.Parsing; using Rubberduck.Parsing.Grammar; -using Rubberduck.UI; using Rubberduck.VBEditor; namespace Rubberduck.Inspections diff --git a/RetailCoder.VBE/Inspections/ImplicitPublicMemberInspectionResult.cs b/RetailCoder.VBE/Inspections/ImplicitPublicMemberInspectionResult.cs index bbddc28e7d..b63cac07bb 100644 --- a/RetailCoder.VBE/Inspections/ImplicitPublicMemberInspectionResult.cs +++ b/RetailCoder.VBE/Inspections/ImplicitPublicMemberInspectionResult.cs @@ -3,7 +3,6 @@ using Rubberduck.Parsing; using Rubberduck.Parsing.Grammar; using Rubberduck.Parsing.Symbols; -using Rubberduck.UI; using Rubberduck.VBEditor; namespace Rubberduck.Inspections diff --git a/RetailCoder.VBE/Inspections/ImplicitVariantReturnTypeInspectionResult.cs b/RetailCoder.VBE/Inspections/ImplicitVariantReturnTypeInspectionResult.cs index 10818f3235..b8b3c9c634 100644 --- a/RetailCoder.VBE/Inspections/ImplicitVariantReturnTypeInspectionResult.cs +++ b/RetailCoder.VBE/Inspections/ImplicitVariantReturnTypeInspectionResult.cs @@ -3,7 +3,6 @@ using Rubberduck.Parsing; using Rubberduck.Parsing.Grammar; using Rubberduck.Parsing.VBA.Nodes; -using Rubberduck.UI; using Rubberduck.VBEditor; namespace Rubberduck.Inspections diff --git a/RetailCoder.VBE/Inspections/InspectionResultBase.cs b/RetailCoder.VBE/Inspections/InspectionResultBase.cs index 2a3250c012..8716977c48 100644 --- a/RetailCoder.VBE/Inspections/InspectionResultBase.cs +++ b/RetailCoder.VBE/Inspections/InspectionResultBase.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using Antlr4.Runtime; using Rubberduck.Parsing; diff --git a/RetailCoder.VBE/Inspections/MakeSingleLineParameterQuickFix.cs b/RetailCoder.VBE/Inspections/MakeSingleLineParameterQuickFix.cs index 580ac570aa..c87efeb00a 100644 --- a/RetailCoder.VBE/Inspections/MakeSingleLineParameterQuickFix.cs +++ b/RetailCoder.VBE/Inspections/MakeSingleLineParameterQuickFix.cs @@ -1,6 +1,5 @@ using Antlr4.Runtime; using Rubberduck.Parsing.VBA; -using Rubberduck.UI; using Rubberduck.VBEditor; namespace Rubberduck.Inspections diff --git a/RetailCoder.VBE/Inspections/MultilineParameterInspection.cs b/RetailCoder.VBE/Inspections/MultilineParameterInspection.cs index b13292c640..bdd7182da2 100644 --- a/RetailCoder.VBE/Inspections/MultilineParameterInspection.cs +++ b/RetailCoder.VBE/Inspections/MultilineParameterInspection.cs @@ -3,7 +3,6 @@ using Rubberduck.Parsing; using Rubberduck.Parsing.Symbols; using Rubberduck.Parsing.VBA; -using Rubberduck.UI; namespace Rubberduck.Inspections { diff --git a/RetailCoder.VBE/Inspections/MultipleDeclarationsInspectionResult.cs b/RetailCoder.VBE/Inspections/MultipleDeclarationsInspectionResult.cs index 4aff2a800b..59e587200c 100644 --- a/RetailCoder.VBE/Inspections/MultipleDeclarationsInspectionResult.cs +++ b/RetailCoder.VBE/Inspections/MultipleDeclarationsInspectionResult.cs @@ -3,7 +3,6 @@ using Antlr4.Runtime; using Rubberduck.Parsing; using Rubberduck.Parsing.Grammar; -using Rubberduck.UI; using Rubberduck.VBEditor; namespace Rubberduck.Inspections diff --git a/RetailCoder.VBE/Inspections/ObsoleteCommentSyntaxInspectionResult.cs b/RetailCoder.VBE/Inspections/ObsoleteCommentSyntaxInspectionResult.cs index d0c109a85c..d2fca1a76f 100644 --- a/RetailCoder.VBE/Inspections/ObsoleteCommentSyntaxInspectionResult.cs +++ b/RetailCoder.VBE/Inspections/ObsoleteCommentSyntaxInspectionResult.cs @@ -3,7 +3,6 @@ using Rubberduck.Parsing.Grammar; using Rubberduck.Parsing.Nodes; using Rubberduck.Parsing.VBA; -using Rubberduck.UI; using Rubberduck.VBEditor; namespace Rubberduck.Inspections diff --git a/RetailCoder.VBE/Inspections/ObsoleteLetStatementUsageInspectionResult.cs b/RetailCoder.VBE/Inspections/ObsoleteLetStatementUsageInspectionResult.cs index 56d78d2aff..210f66a44e 100644 --- a/RetailCoder.VBE/Inspections/ObsoleteLetStatementUsageInspectionResult.cs +++ b/RetailCoder.VBE/Inspections/ObsoleteLetStatementUsageInspectionResult.cs @@ -2,7 +2,6 @@ using Antlr4.Runtime; using Rubberduck.Parsing; using Rubberduck.Parsing.Grammar; -using Rubberduck.UI; using Rubberduck.VBEditor; namespace Rubberduck.Inspections diff --git a/RetailCoder.VBE/Inspections/ObsoleteTypeHintInspection.cs b/RetailCoder.VBE/Inspections/ObsoleteTypeHintInspection.cs index 1a61027a2b..2ef4ac5b79 100644 --- a/RetailCoder.VBE/Inspections/ObsoleteTypeHintInspection.cs +++ b/RetailCoder.VBE/Inspections/ObsoleteTypeHintInspection.cs @@ -2,7 +2,6 @@ using System.Linq; using Rubberduck.Parsing; using Rubberduck.Parsing.VBA; -using Rubberduck.UI; namespace Rubberduck.Inspections { diff --git a/RetailCoder.VBE/Inspections/ObsoleteTypeHintInspectionResult.cs b/RetailCoder.VBE/Inspections/ObsoleteTypeHintInspectionResult.cs index 40cf2cb577..96c85c39eb 100644 --- a/RetailCoder.VBE/Inspections/ObsoleteTypeHintInspectionResult.cs +++ b/RetailCoder.VBE/Inspections/ObsoleteTypeHintInspectionResult.cs @@ -6,7 +6,6 @@ using Rubberduck.Parsing; using Rubberduck.Parsing.Grammar; using Rubberduck.Parsing.Symbols; -using Rubberduck.UI; using Rubberduck.VBEditor; namespace Rubberduck.Inspections diff --git a/RetailCoder.VBE/Inspections/OptionExplicitInspection.cs b/RetailCoder.VBE/Inspections/OptionExplicitInspection.cs index a2dc3f2a90..f105a88f52 100644 --- a/RetailCoder.VBE/Inspections/OptionExplicitInspection.cs +++ b/RetailCoder.VBE/Inspections/OptionExplicitInspection.cs @@ -3,7 +3,6 @@ using Rubberduck.Parsing.Grammar; using Rubberduck.Parsing.Symbols; using Rubberduck.Parsing.VBA; -using Rubberduck.UI; namespace Rubberduck.Inspections { diff --git a/RetailCoder.VBE/Inspections/OptionExplicitInspectionResult.cs b/RetailCoder.VBE/Inspections/OptionExplicitInspectionResult.cs index 008aa317bd..4182232108 100644 --- a/RetailCoder.VBE/Inspections/OptionExplicitInspectionResult.cs +++ b/RetailCoder.VBE/Inspections/OptionExplicitInspectionResult.cs @@ -3,7 +3,6 @@ using Antlr4.Runtime; using Rubberduck.Parsing.Grammar; using Rubberduck.Parsing.Nodes; -using Rubberduck.UI; using Rubberduck.VBEditor; namespace Rubberduck.Inspections diff --git a/RetailCoder.VBE/Inspections/ParameterCanBeByValInspectionResult.cs b/RetailCoder.VBE/Inspections/ParameterCanBeByValInspectionResult.cs index 9a6506738b..f0f0e19582 100644 --- a/RetailCoder.VBE/Inspections/ParameterCanBeByValInspectionResult.cs +++ b/RetailCoder.VBE/Inspections/ParameterCanBeByValInspectionResult.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 diff --git a/RetailCoder.VBE/Inspections/ParameterNotUsedInspectionResult.cs b/RetailCoder.VBE/Inspections/ParameterNotUsedInspectionResult.cs index e9c1922345..d75b1342ae 100644 --- a/RetailCoder.VBE/Inspections/ParameterNotUsedInspectionResult.cs +++ b/RetailCoder.VBE/Inspections/ParameterNotUsedInspectionResult.cs @@ -1,9 +1,7 @@ -using System; using System.Collections.Generic; using Antlr4.Runtime; using Rubberduck.Parsing.VBA; using Rubberduck.Refactorings.RemoveParameters; -using Rubberduck.UI; using Rubberduck.VBEditor; namespace Rubberduck.Inspections diff --git a/RetailCoder.VBE/Inspections/ProcedureNotUsedInspection.cs b/RetailCoder.VBE/Inspections/ProcedureNotUsedInspection.cs index 3ad651d271..4ad3bc5a6e 100644 --- a/RetailCoder.VBE/Inspections/ProcedureNotUsedInspection.cs +++ b/RetailCoder.VBE/Inspections/ProcedureNotUsedInspection.cs @@ -5,7 +5,6 @@ using Rubberduck.Parsing.Grammar; using Rubberduck.Parsing.Symbols; using Rubberduck.Parsing.VBA; -using Rubberduck.UI; using Rubberduck.VBEditor; namespace Rubberduck.Inspections diff --git a/RetailCoder.VBE/Inspections/RemoveExplicitCallStatmentQuickFix.cs b/RetailCoder.VBE/Inspections/RemoveExplicitCallStatmentQuickFix.cs index 55cf30e46e..0624cfb8fb 100644 --- a/RetailCoder.VBE/Inspections/RemoveExplicitCallStatmentQuickFix.cs +++ b/RetailCoder.VBE/Inspections/RemoveExplicitCallStatmentQuickFix.cs @@ -2,7 +2,6 @@ using Antlr4.Runtime; using Rubberduck.Parsing; using Rubberduck.Parsing.Grammar; -using Rubberduck.UI; using Rubberduck.VBEditor; namespace Rubberduck.Inspections diff --git a/RetailCoder.VBE/Inspections/UnassignedVariableUsageInspectionResult.cs b/RetailCoder.VBE/Inspections/UnassignedVariableUsageInspectionResult.cs index 802df2f3b6..aaa713bc59 100644 --- a/RetailCoder.VBE/Inspections/UnassignedVariableUsageInspectionResult.cs +++ b/RetailCoder.VBE/Inspections/UnassignedVariableUsageInspectionResult.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using Antlr4.Runtime; -using Rubberduck.UI; using Rubberduck.VBEditor; namespace Rubberduck.Inspections diff --git a/RetailCoder.VBE/Inspections/UntypedFunctionUsageInspectionResult.cs b/RetailCoder.VBE/Inspections/UntypedFunctionUsageInspectionResult.cs index 95cdaa80c1..00e8b094bf 100644 --- a/RetailCoder.VBE/Inspections/UntypedFunctionUsageInspectionResult.cs +++ b/RetailCoder.VBE/Inspections/UntypedFunctionUsageInspectionResult.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using Antlr4.Runtime; -using Rubberduck.UI; using Rubberduck.VBEditor; namespace Rubberduck.Inspections diff --git a/RetailCoder.VBE/Inspections/VariableTypeNotDeclaredInspectionResult.cs b/RetailCoder.VBE/Inspections/VariableTypeNotDeclaredInspectionResult.cs index 5362241808..89248be2a9 100644 --- a/RetailCoder.VBE/Inspections/VariableTypeNotDeclaredInspectionResult.cs +++ b/RetailCoder.VBE/Inspections/VariableTypeNotDeclaredInspectionResult.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 diff --git a/RetailCoder.VBE/Inspections/WriteOnlyPropertyInspection.cs b/RetailCoder.VBE/Inspections/WriteOnlyPropertyInspection.cs index 2851d0396e..eca20b9455 100644 --- a/RetailCoder.VBE/Inspections/WriteOnlyPropertyInspection.cs +++ b/RetailCoder.VBE/Inspections/WriteOnlyPropertyInspection.cs @@ -1,4 +1,3 @@ -using System; using System.Collections.Generic; using System.Linq; using Rubberduck.Parsing.Symbols; diff --git a/RetailCoder.VBE/Settings/ConfigurationLoader.cs b/RetailCoder.VBE/Settings/ConfigurationLoader.cs index cd3aa1351d..61b641cd57 100644 --- a/RetailCoder.VBE/Settings/ConfigurationLoader.cs +++ b/RetailCoder.VBE/Settings/ConfigurationLoader.cs @@ -139,7 +139,8 @@ private GeneralSettings GetDefaultGeneralSettings() { new Hotkey{Name="IndentProcedure", IsEnabled=true, KeyDisplaySymbol="CTRL-P"}, new Hotkey{Name="IndentModule", IsEnabled=true, KeyDisplaySymbol="CTRL-M"} - }); + }, + false, 10); } public ToDoMarker[] GetDefaultTodoMarkers() diff --git a/RetailCoder.VBE/Settings/GeneralSettings.cs b/RetailCoder.VBE/Settings/GeneralSettings.cs index 3af09116f1..3c233203b8 100644 --- a/RetailCoder.VBE/Settings/GeneralSettings.cs +++ b/RetailCoder.VBE/Settings/GeneralSettings.cs @@ -6,6 +6,8 @@ interface IGeneralSettings { DisplayLanguageSetting Language { get; set; } Hotkey[] HotkeySettings { get; set; } + bool AutoSaveEnabled { get; set; } + int AutoSavePeriod { get; set; } } [XmlType(AnonymousType = true)] @@ -15,16 +17,21 @@ public class GeneralSettings : IGeneralSettings [XmlArrayItem("Hotkey", IsNullable = false)] public Hotkey[] HotkeySettings { get; set; } + + public bool AutoSaveEnabled { get; set; } + public int AutoSavePeriod { get; set; } public GeneralSettings() { //empty constructor needed for serialization } - public GeneralSettings(DisplayLanguageSetting language, Hotkey[] hotkeySettings) + public GeneralSettings(DisplayLanguageSetting language, Hotkey[] hotkeySettings, bool autoSaveEnabled, int autoSavePeriod) { Language = language; HotkeySettings = hotkeySettings; + AutoSaveEnabled = autoSaveEnabled; + AutoSavePeriod = autoSavePeriod; } } } \ No newline at end of file diff --git a/RetailCoder.VBE/UI/RubberduckUI.Designer.cs b/RetailCoder.VBE/UI/RubberduckUI.Designer.cs index 8d989c07b3..f841666ce3 100644 --- a/RetailCoder.VBE/UI/RubberduckUI.Designer.cs +++ b/RetailCoder.VBE/UI/RubberduckUI.Designer.cs @@ -1214,6 +1214,24 @@ public static string FunctionNotUsed_ { } } + /// + /// Looks up a localized string similar to Enable Auto Save. + /// + public static string GeneralSettings_AutoSaveEnabled { + get { + return ResourceManager.GetString("GeneralSettings_AutoSaveEnabled", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Auto Save:. + /// + public static string GeneralSettings_AutoSaveLabel { + get { + return ResourceManager.GetString("GeneralSettings_AutoSaveLabel", resourceCulture); + } + } + /// /// Looks up a localized string similar to Description. /// @@ -1242,20 +1260,20 @@ public static string GeneralSettings_HotkeyKeyPress { } /// - /// Looks up a localized string similar to Display language:. + /// Looks up a localized string similar to Hotkeys:. /// - public static string GeneralSettings_LanguageLabel { + public static string GeneralSettings_HotkeysLabel { get { - return ResourceManager.GetString("GeneralSettings_LanguageLabel", resourceCulture); + return ResourceManager.GetString("GeneralSettings_HotkeysLabel", resourceCulture); } } /// - /// Looks up a localized string similar to Project '{0}' has generic name. + /// Looks up a localized string similar to Display language:. /// - public static string GenericProjectName_ { + public static string GeneralSettings_LanguageLabel { get { - return ResourceManager.GetString("GenericProjectName_", resourceCulture); + return ResourceManager.GetString("GeneralSettings_LanguageLabel", resourceCulture); } } diff --git a/RetailCoder.VBE/UI/RubberduckUI.resx b/RetailCoder.VBE/UI/RubberduckUI.resx index f0bd4ba76e..202f4e0586 100644 --- a/RetailCoder.VBE/UI/RubberduckUI.resx +++ b/RetailCoder.VBE/UI/RubberduckUI.resx @@ -660,9 +660,6 @@ Warning: All customized settings will be lost. Your old file will be saved in ' Selected Tests - - Project '{0}' has generic name - Line @@ -1314,4 +1311,13 @@ Are you sure you want to proceed with this rename? Type + + Auto Save: + + + Hotkeys: + + + Enable Auto Save + \ No newline at end of file diff --git a/RetailCoder.VBE/UI/Settings/GeneralSettings.xaml b/RetailCoder.VBE/UI/Settings/GeneralSettings.xaml index 0d1411d91a..571e1728ce 100644 --- a/RetailCoder.VBE/UI/Settings/GeneralSettings.xaml +++ b/RetailCoder.VBE/UI/Settings/GeneralSettings.xaml @@ -4,6 +4,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:settings="clr-namespace:Rubberduck.UI.Settings" + xmlns:controls="clr-namespace:Rubberduck.UI.Controls" mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="300" d:DataContext="{d:DesignInstance {x:Type settings:GeneralSettingsViewModel}, IsDesignTimeCreatable=False}"> @@ -67,7 +68,14 @@