Merge pull request #1095 from Hosch250/BugBlipper

Bug blipper

Author: Hosch250

RetailCoder.VBE/Rubberduck.csproj

@@ -548,6 +548,8 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>RubberduckUI.sv.resx</DependentUpon>
     </Compile>
+    <Compile Include="UI\Settings\Converters\EndOfLineCommentStyleToTextConverter.cs" />
+    <Compile Include="UI\Settings\Converters\EndOfLineCommentStyleValueTextToEnumValueConverter.cs" />
     <Compile Include="UI\Settings\Converters\AssertModeToTextConverter.cs" />
     <Compile Include="UI\Settings\Converters\AssertModeValueToTextConverter.cs" />
     <Compile Include="UI\Settings\Converters\BindingModeValueToTextConverter.cs" />

RetailCoder.VBE/Settings/ConfigurationLoader.cs

@@ -139,8 +139,8 @@ private GeneralSettings GetDefaultGeneralSettings()
             return new GeneralSettings(new DisplayLanguageSetting("en-US"),
                 new[]
                 {
-                    new Hotkey{Name="Indent Module", IsEnabled=true, KeyDisplaySymbol="CTRL-M", Prompt="Enable Indent Module Hotkey"},
-                    new Hotkey{Name="Indent Procedure", IsEnabled=true, KeyDisplaySymbol="CTRL-P", Prompt="Enable Indent Procedure Hotkey"}
+                    new Hotkey{Name="IndentModule", IsEnabled=true, KeyDisplaySymbol="CTRL-M",},
+                    new Hotkey{Name="IndentProcedure", IsEnabled=true, KeyDisplaySymbol="CTRL-P"}
                 });
         }
 
@@ -172,7 +172,7 @@ public IndenterSettings GetDefaultIndenterSettings()
                 IgnoreOperatorsInContinuations = true,
                 IndentCase = false,
                 ForceDebugStatementsInColumn1 = false,
-                ForceCompilerStuffInColumn1 = false,
+                ForceCompilerDirectivesInColumn1 = false,
                 IndentCompilerDirectives = true,
                 AlignDims = false,
                 AlignDimColumn = 15,

RetailCoder.VBE/Settings/Hotkey.cs

@@ -1,10 +1,18 @@
-namespace Rubberduck.Settings
+using System.Xml.Serialization;
+using Rubberduck.UI;
+
+namespace Rubberduck.Settings
 {
     public class Hotkey
     {
-        public bool IsEnabled { get; set; }
-        public string KeyDisplaySymbol { get; set; }
         public string Name { get; set; }
-        public string Prompt { get; set; }
+        public string KeyDisplaySymbol { get; set; }
+        public bool IsEnabled { get; set; }
+
+        [XmlIgnore]
+        public string Prompt
+        {
+            get { return RubberduckUI.ResourceManager.GetString(Name + "Hotkey_Description"); } 
+        }
     }
 }

RetailCoder.VBE/Settings/IndenterSettings.cs

@@ -14,7 +14,7 @@ public class IndenterSettings : IIndenterSettings
         public bool IgnoreOperatorsInContinuations { get; set; }
         public bool IndentCase { get; set; }
         public bool ForceDebugStatementsInColumn1 { get; set; }
-        public bool ForceCompilerStuffInColumn1 { get; set; }
+        public bool ForceCompilerDirectivesInColumn1 { get; set; }
         public bool IndentCompilerDirectives { get; set; }
         public bool AlignDims { get; set; }
         public int AlignDimColumn { get; set; }

RetailCoder.VBE/Settings/XmlConfigurationServiceBase.cs

@@ -12,7 +12,7 @@ protected virtual void OnSettingsChanged(EventArgs e)
             var handler = SettingsChanged;
             if (handler != null)
             {
-                SettingsChanged(this, e);
+                handler(this, e);
             }
         }
 

RetailCoder.VBE/UI/Controls/NumberPicker.xaml

@@ -8,7 +8,7 @@
              Name="Root">
     <Grid>
         <StackPanel Orientation="Horizontal">
-            <TextBox Margin="5,5,0,5" Height="20" Width="50" Text="{Binding ElementName=Root, Path=NumValue, Mode=TwoWay, StringFormat=\{0:D\}, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Top" />
+            <TextBox Margin="5,5,0,5" Height="20" Width="50" Text="{Binding ElementName=Root, Path=NumValue, Mode=TwoWay, StringFormat=\{0:D\}, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Top" VerticalContentAlignment="Center" />
             <StackPanel Margin="0,5" >
                 <Button Height="10" Width="20" Click="cmdUp_Click">
                     <TextBlock Text="˄" FontSize="10" Margin="0,-4,0,0"/>