Merge pull request #2020 from Hosch250/sourceControlHotkey

retailcoder · web-flow · commit df2a00f09300 · 2016-07-11T22:01:07.000-04:00
Add SC hotkey
diff --git a/RetailCoder.VBE/Common/Hotkeys/HotkeyInfo.cs b/RetailCoder.VBE/Common/Hotkeys/HotkeyInfo.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Text;
 using System.Windows.Forms;
+using Rubberduck.UI;
 
 namespace Rubberduck.Common.Hotkeys
 {
@@ -25,20 +26,21 @@ public override string ToString()
             var builder = new StringBuilder();
             if (_keys.HasFlag(Keys.Alt))
             {
-                builder.Append(Rubberduck.UI.RubberduckUI.GeneralSettings_HotkeyAlt);
+                builder.Append(RubberduckUI.GeneralSettings_HotkeyAlt);
                 builder.Append('+');
             }
             if (_keys.HasFlag(Keys.Control))
             {
-                builder.Append(Rubberduck.UI.RubberduckUI.GeneralSettings_HotkeyCtrl);
+                builder.Append(RubberduckUI.GeneralSettings_HotkeyCtrl);
                 builder.Append('+');
             }
             if (_keys.HasFlag(Keys.Shift))
             {
-                builder.Append(Rubberduck.UI.RubberduckUI.GeneralSettings_HotkeyShift);
+                builder.Append(RubberduckUI.GeneralSettings_HotkeyShift);
                 builder.Append('+');
             }
-            builder.Append(_keys & ~Modifiers);
+            
+            builder.Append(HotkeyDisplayConverter.Convert(_keys & ~Modifiers));
             return builder.ToString();
         }
     }
diff --git a/RetailCoder.VBE/Common/RubberduckHooks.cs b/RetailCoder.VBE/Common/RubberduckHooks.cs
@@ -13,6 +13,7 @@
 using Rubberduck.UI.Command;
 using Rubberduck.UI.Command.Refactorings;
 using NLog;
+using Rubberduck.UI;
 
 namespace Rubberduck.Common
 {
diff --git a/RetailCoder.VBE/Rubberduck.csproj b/RetailCoder.VBE/Rubberduck.csproj
@@ -580,6 +580,7 @@
     <Compile Include="Navigation\CodeExplorer\CodeExplorerMemberViewModel.cs" />
     <Compile Include="Navigation\CodeExplorer\CodeExplorerProjectViewModel.cs" />
     <Compile Include="Navigation\CodeExplorer\CodeExplorerViewModel.cs" />
+    <Compile Include="UI\HotkeyDisplayConverter.cs" />
     <Compile Include="UI\Inspections\InspectionDescriptionConverter.cs" />
     <Compile Include="UI\Inspections\InspectionImageSourceConverter.cs" />
     <Compile Include="UI\Inspections\InspectionResultsControl.xaml.cs">
@@ -704,6 +705,7 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>RubberduckUI.sv.resx</DependentUpon>
     </Compile>
+    <Compile Include="UI\Settings\Converters\HotkeyDisplayConverter.cs" />
     <Compile Include="UI\Settings\Converters\AssertModeValueToTextConverter.cs" />
     <Compile Include="UI\Settings\Converters\DelimiterToTextConverter.cs" />
     <Compile Include="UI\Settings\Converters\EndOfLineCommentStyleToTextConverter.cs" />
diff --git a/RetailCoder.VBE/Settings/HotkeySetting.cs b/RetailCoder.VBE/Settings/HotkeySetting.cs
@@ -26,15 +26,6 @@ public string Prompt
             get { return RubberduckUI.ResourceManager.GetString("HotkeyDescription_" + Name, UI.Settings.Settings.Culture); } 
         }
 
-        public string ToMenuHotkeyString()
-        {
-            return string.Format("{0}{1}{2}+{3}",
-                HasCtrlModifier ? RubberduckUI.GeneralSettings_HotkeyCtrl : string.Empty,
-                HasShiftModifier ? (HasCtrlModifier ? "+" : string.Empty) + RubberduckUI.GeneralSettings_HotkeyShift : string.Empty,
-                HasAltModifier ? (HasCtrlModifier | HasShiftModifier ? "+" : string.Empty) + RubberduckUI.GeneralSettings_HotkeyAlt : string.Empty,
-                Key1);
-        }
-
         public override string ToString()
         {
             return string.Format("{0}{1}{2}{3}",
diff --git a/RetailCoder.VBE/Settings/HotkeySettings.cs b/RetailCoder.VBE/Settings/HotkeySettings.cs
@@ -23,7 +23,8 @@ public class HotkeySettings : IHotkeySettings
             new HotkeySetting{Name=RubberduckHotkey.TestExplorer.ToString(), IsEnabled=true, HasCtrlModifier = true, HasShiftModifier = true, Key1="T" },
             new HotkeySetting{Name=RubberduckHotkey.RefactorMoveCloserToUsage.ToString(), IsEnabled=true, HasCtrlModifier = true, HasShiftModifier = true, Key1="C" },
             new HotkeySetting{Name=RubberduckHotkey.RefactorRename.ToString(), IsEnabled=true, HasCtrlModifier = true, HasShiftModifier = true, Key1="R" },
-            new HotkeySetting{Name=RubberduckHotkey.RefactorExtractMethod.ToString(), IsEnabled=true, HasCtrlModifier = true, HasShiftModifier = true, Key1="M" }            
+            new HotkeySetting{Name=RubberduckHotkey.RefactorExtractMethod.ToString(), IsEnabled=true, HasCtrlModifier = true, HasShiftModifier = true, Key1="M" },
+            new HotkeySetting{Name=RubberduckHotkey.SourceControl.ToString(), IsEnabled=true, HasCtrlModifier = true, HasShiftModifier = true, Key1="D6" }
         };
 
         private HashSet<HotkeySetting> _settings;
diff --git a/RetailCoder.VBE/Settings/RubberduckHotkey.cs b/RetailCoder.VBE/Settings/RubberduckHotkey.cs
@@ -13,5 +13,6 @@ public enum RubberduckHotkey
         RefactorMoveCloserToUsage,
         RefactorRename,
         RefactorExtractMethod,
+        SourceControl
     }
 }
diff --git a/RetailCoder.VBE/UI/Command/ShowSourceControlPanelCommand.cs b/RetailCoder.VBE/UI/Command/ShowSourceControlPanelCommand.cs
@@ -1,5 +1,6 @@
 ﻿using System.Runtime.InteropServices;
 using NLog;
+using Rubberduck.Settings;
 using Rubberduck.UI.SourceControl;
 
 namespace Rubberduck.UI.Command
@@ -10,7 +11,7 @@ namespace Rubberduck.UI.Command
     [ComVisible(false)]
     public class ShowSourceControlPanelCommand : CommandBase
     {
-        public readonly IPresenter _presenter;
+        private readonly IPresenter _presenter;
 
         public ShowSourceControlPanelCommand(SourceControlDockablePresenter presenter) : base(LogManager.GetCurrentClassLogger())
         {
@@ -21,5 +22,10 @@ protected override void ExecuteImpl(object parameter)
         {
             _presenter.Show();
         }
+
+        public override RubberduckHotkey Hotkey
+        {
+            get { return RubberduckHotkey.SourceControl; }
+        }
     }
 }
diff --git a/RetailCoder.VBE/UI/HotKeyDisplayConverter.cs b/RetailCoder.VBE/UI/HotKeyDisplayConverter.cs
@@ -0,0 +1,42 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows.Forms;
+
+namespace Rubberduck.UI
+{
+    public static class HotkeyDisplayConverter
+    {
+        private static readonly List<Tuple<Keys, string>> _keys = new List<Tuple<Keys, string>>
+        {
+            Tuple.Create(Keys.D0, "0"),
+            Tuple.Create(Keys.D1, "1"),
+            Tuple.Create(Keys.D2, "2"),
+            Tuple.Create(Keys.D3, "3"),
+            Tuple.Create(Keys.D4, "4"),
+            Tuple.Create(Keys.D5, "5"),
+            Tuple.Create(Keys.D6, "6"),
+            Tuple.Create(Keys.D7, "7"),
+            Tuple.Create(Keys.D8, "8"),
+            Tuple.Create(Keys.D9, "9")
+        };
+
+        public static string Convert(Keys value)
+        {
+            var tuple = _keys.SingleOrDefault(k => k.Item1 == value);
+            return tuple == null ? value.ToString() : tuple.Item2;
+        }
+
+        public static string Convert(string value)
+        {
+            var tuple = _keys.SingleOrDefault(k => k.Item1.ToString() == value);
+            return tuple == null ? value : tuple.Item2;
+        }
+
+        public static string ConvertBack(string value)
+        {
+            var tuple = _keys.SingleOrDefault(k => k.Item2 == value);
+            return tuple == null ? value : tuple.Item1.ToString();
+        }
+    }
+}
diff --git a/RetailCoder.VBE/UI/RubberduckUI.Designer.cs b/RetailCoder.VBE/UI/RubberduckUI.Designer.cs
diff --git a/RetailCoder.VBE/UI/RubberduckUI.resx b/RetailCoder.VBE/UI/RubberduckUI.resx
@@ -1730,4 +1730,7 @@ All our stargazers, likers &amp; followers, for the warm fuzzies
   <data name="CodeExplorer_Indent" xml:space="preserve">
     <value>Indent</value>
   </data>
+  <data name="HotkeyDescription_SourceControl" xml:space="preserve">
+    <value>Source Control</value>
+  </data>
 </root>
diff --git a/RetailCoder.VBE/UI/Settings/Converters/HotkeyDisplayConverter.cs b/RetailCoder.VBE/UI/Settings/Converters/HotkeyDisplayConverter.cs
@@ -0,0 +1,19 @@
+﻿using System;
+using System.Globalization;
+using System.Windows.Data;
+
+namespace Rubberduck.UI.Settings.Converters
+{
+    public class HotkeyDisplayConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return UI.HotkeyDisplayConverter.Convert((string)value);
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return UI.HotkeyDisplayConverter.ConvertBack((string)value);
+        }
+    }
+}
diff --git a/RetailCoder.VBE/UI/Settings/GeneralSettings.xaml b/RetailCoder.VBE/UI/Settings/GeneralSettings.xaml
@@ -13,6 +13,8 @@
     <UserControl.Resources>
         <converters:DelimiterValueToTextConverter x:Key="DelimiterValueToText" />
         <converters:DelimiterToTextConverter x:Key="DelimiterToText" />
+        <converters:HotkeyDisplayConverter x:Key="HotkeyDisplay" />
+        
         <LinearGradientBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" EndPoint="0,1" StartPoint="0,0">
             <GradientStop Color="#FFD9F4FF" Offset="0"/>
             <GradientStop Color="#FF9BDDFB" Offset="1"/>
@@ -188,7 +190,7 @@
                     SortMemberPath="KeyDisplaySymbol">
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
-                                    <TextBox Text="{Binding Key1, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                                    <TextBox Text="{Binding Key1, Converter={StaticResource HotkeyDisplay}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                                 </DataTemplate>
                             </DataGridTemplateColumn.CellTemplate>
                         </DataGridTemplateColumn>
diff --git a/RubberduckTests/Settings/HotkeySettingsTests.cs b/RubberduckTests/Settings/HotkeySettingsTests.cs
@@ -21,7 +21,8 @@ public void DefaultsSetInCtor()
                 new HotkeySetting{Name=RubberduckHotkey.TestExplorer.ToString(), IsEnabled=true, HasCtrlModifier = true, HasShiftModifier = true, Key1="T" },
                 new HotkeySetting{Name=RubberduckHotkey.RefactorMoveCloserToUsage.ToString(), IsEnabled=true, HasCtrlModifier = true, HasShiftModifier = true, Key1="C" },
                 new HotkeySetting{Name=RubberduckHotkey.RefactorRename.ToString(), IsEnabled=true, HasCtrlModifier = true, HasShiftModifier = true, Key1="R" },
-                new HotkeySetting{Name=RubberduckHotkey.RefactorExtractMethod.ToString(), IsEnabled=true, HasCtrlModifier = true, HasShiftModifier = true, Key1="M" }            
+                new HotkeySetting{Name=RubberduckHotkey.RefactorExtractMethod.ToString(), IsEnabled=true, HasCtrlModifier = true, HasShiftModifier = true, Key1="M" },
+                new HotkeySetting{Name=RubberduckHotkey.SourceControl.ToString(), IsEnabled=true, HasCtrlModifier = true, HasShiftModifier = true, Key1="D6" }
             };
 
             var settings = new HotkeySettings();

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Text;`
`3`	`3`	`using System.Windows.Forms;`
	`4`	`+using Rubberduck.UI;`
`4`	`5`
`5`	`6`	`namespace Rubberduck.Common.Hotkeys`
`6`	`7`	`{`
`@@ -25,20 +26,21 @@ public override string ToString()`
`25`	`26`	`var builder = new StringBuilder();`
`26`	`27`	`if (_keys.HasFlag(Keys.Alt))`
`27`	`28`	`{`
`28`		`- builder.Append(Rubberduck.UI.RubberduckUI.GeneralSettings_HotkeyAlt);`
	`29`	`+ builder.Append(RubberduckUI.GeneralSettings_HotkeyAlt);`
`29`	`30`	`builder.Append('+');`
`30`	`31`	`}`
`31`	`32`	`if (_keys.HasFlag(Keys.Control))`
`32`	`33`	`{`
`33`		`- builder.Append(Rubberduck.UI.RubberduckUI.GeneralSettings_HotkeyCtrl);`
	`34`	`+ builder.Append(RubberduckUI.GeneralSettings_HotkeyCtrl);`
`34`	`35`	`builder.Append('+');`
`35`	`36`	`}`
`36`	`37`	`if (_keys.HasFlag(Keys.Shift))`
`37`	`38`	`{`
`38`		`- builder.Append(Rubberduck.UI.RubberduckUI.GeneralSettings_HotkeyShift);`
	`39`	`+ builder.Append(RubberduckUI.GeneralSettings_HotkeyShift);`
`39`	`40`	`builder.Append('+');`
`40`	`41`	`}`
`41`		`- builder.Append(_keys & ~Modifiers);`
	`42`	`+`
	`43`	`+ builder.Append(HotkeyDisplayConverter.Convert(_keys & ~Modifiers));`
`42`	`44`	`return builder.ToString();`
`43`	`45`	`}`
`44`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`using Rubberduck.UI.Command;`
`14`	`14`	`using Rubberduck.UI.Command.Refactorings;`
`15`	`15`	`using NLog;`
	`16`	`+using Rubberduck.UI;`
`16`	`17`
`17`	`18`	`namespace Rubberduck.Common`
`18`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,6 @@ public enum RubberduckHotkey`
`13`	`13`	`RefactorMoveCloserToUsage,`
`14`	`14`	`RefactorRename,`
`15`	`15`	`RefactorExtractMethod,`
	`16`	`+ SourceControl`
`16`	`17`	`}`
`17`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System.Runtime.InteropServices;`
`2`	`2`	`using NLog;`
	`3`	`+using Rubberduck.Settings;`
`3`	`4`	`using Rubberduck.UI.SourceControl;`
`4`	`5`
`5`	`6`	`namespace Rubberduck.UI.Command`
`@@ -10,7 +11,7 @@ namespace Rubberduck.UI.Command`
`10`	`11`	`[ComVisible(false)]`
`11`	`12`	`public class ShowSourceControlPanelCommand : CommandBase`
`12`	`13`	`{`
`13`		`- public readonly IPresenter _presenter;`
	`14`	`+ private readonly IPresenter _presenter;`
`14`	`15`
`15`	`16`	`public ShowSourceControlPanelCommand(SourceControlDockablePresenter presenter) : base(LogManager.GetCurrentClassLogger())`
`16`	`17`	`{`
`@@ -21,5 +22,10 @@ protected override void ExecuteImpl(object parameter)`
`21`	`22`	`{`
`22`	`23`	`_presenter.Show();`
`23`	`24`	`}`
	`25`	`+`
	`26`	`+ public override RubberduckHotkey Hotkey`
	`27`	`+ {`
	`28`	`+ get { return RubberduckHotkey.SourceControl; }`
	`29`	`+ }`
`24`	`30`	`}`
`25`	`31`	`}`