Skip to content

Commit 5c6c020

Browse files
committed
Close #2101
1 parent ee0ea0a commit 5c6c020

File tree

6 files changed

+26
-4
lines changed

6 files changed

+26
-4
lines changed

RetailCoder.VBE/Settings/HotkeySettings.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ public class HotkeySettings : IHotkeySettings
2424
new HotkeySetting{Name=RubberduckHotkey.RefactorMoveCloserToUsage.ToString(), IsEnabled=true, HasCtrlModifier = true, HasShiftModifier = true, Key1="C" },
2525
new HotkeySetting{Name=RubberduckHotkey.RefactorRename.ToString(), IsEnabled=true, HasCtrlModifier = true, HasShiftModifier = true, Key1="R" },
2626
new HotkeySetting{Name=RubberduckHotkey.RefactorExtractMethod.ToString(), IsEnabled=true, HasCtrlModifier = true, HasShiftModifier = true, Key1="M" },
27-
new HotkeySetting{Name=RubberduckHotkey.SourceControl.ToString(), IsEnabled=true, HasCtrlModifier = true, HasShiftModifier = true, Key1="D6" }
27+
new HotkeySetting{Name=RubberduckHotkey.SourceControl.ToString(), IsEnabled=true, HasCtrlModifier = true, HasShiftModifier = true, Key1="D6" },
28+
new HotkeySetting{Name=RubberduckHotkey.RefactorEncapsulateField.ToString(), IsEnabled=true, HasCtrlModifier = true, HasShiftModifier = true, Key1="E" }
2829
};
2930

3031
private HashSet<HotkeySetting> _settings;

RetailCoder.VBE/Settings/RubberduckHotkey.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ public enum RubberduckHotkey
1313
RefactorMoveCloserToUsage,
1414
RefactorRename,
1515
RefactorExtractMethod,
16+
RefactorEncapsulateField,
1617
SourceControl
1718
}
1819
}

RetailCoder.VBE/UI/Command/Refactorings/RefactorEncapsulateFieldCommand.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
namespace Rubberduck.UI.Command.Refactorings
99
{
10+
using Rubberduck.Settings;
11+
1012
[ComVisible(false)]
1113
public class RefactorEncapsulateFieldCommand : RefactorCommandBase
1214
{
@@ -49,5 +51,10 @@ protected override void ExecuteImpl(object parameter)
4951
refactoring.Refactor();
5052
}
5153
}
54+
55+
public override RubberduckHotkey Hotkey
56+
{
57+
get { return RubberduckHotkey.RefactorEncapsulateField; }
58+
}
5259
}
5360
}

RetailCoder.VBE/UI/RubberduckUI.Designer.cs

Lines changed: 10 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

RetailCoder.VBE/UI/RubberduckUI.resx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1485,7 +1485,7 @@ All our stargazers, likers &amp; followers, for the warm fuzzies
14851485
<value>Find symbol</value>
14861486
</data>
14871487
<data name="HotkeyDescription_RefactorMoveCloserToUsage" xml:space="preserve">
1488-
<value>Move declaration closer to usage</value>
1488+
<value>Refactor / Move declaration closer to usage</value>
14891489
</data>
14901490
<data name="RubberduckMenu_RegexSearchReplace" xml:space="preserve">
14911491
<value>Rege&amp;x Search/Replace</value>
@@ -1772,4 +1772,7 @@ All our stargazers, likers &amp; followers, for the warm fuzzies
17721772
<data name="CodeInspectionSettings_WhitelistedIdentifiersDescription" xml:space="preserve">
17731773
<value>These identifiers will be ignored by the 'Use meaningful names' inspection</value>
17741774
</data>
1775+
<data name="HotkeyDescription_RefactorEncapsulateField" xml:space="preserve">
1776+
<value>Refactor / Encapsulate Field</value>
1777+
</data>
17751778
</root>

RubberduckTests/Settings/HotkeySettingsTests.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ public void DefaultsSetInCtor()
2222
new HotkeySetting{Name=RubberduckHotkey.RefactorMoveCloserToUsage.ToString(), IsEnabled=true, HasCtrlModifier = true, HasShiftModifier = true, Key1="C" },
2323
new HotkeySetting{Name=RubberduckHotkey.RefactorRename.ToString(), IsEnabled=true, HasCtrlModifier = true, HasShiftModifier = true, Key1="R" },
2424
new HotkeySetting{Name=RubberduckHotkey.RefactorExtractMethod.ToString(), IsEnabled=true, HasCtrlModifier = true, HasShiftModifier = true, Key1="M" },
25-
new HotkeySetting{Name=RubberduckHotkey.SourceControl.ToString(), IsEnabled=true, HasCtrlModifier = true, HasShiftModifier = true, Key1="D6" }
25+
new HotkeySetting{Name=RubberduckHotkey.SourceControl.ToString(), IsEnabled=true, HasCtrlModifier = true, HasShiftModifier = true, Key1="D6" },
26+
new HotkeySetting{Name=RubberduckHotkey.RefactorEncapsulateField.ToString(), IsEnabled=true, HasCtrlModifier = true, HasShiftModifier = true, Key1="E" }
2627
};
2728

2829
var settings = new HotkeySettings();

0 commit comments

Comments
 (0)