Skip to content

Commit 7b88d02

Browse files
committed
added more refactoring icons
1 parent 76a2c1a commit 7b88d02

File tree

9 files changed

+66
-7
lines changed

9 files changed

+66
-7
lines changed

RetailCoder.VBE/Properties/Resources.Designer.cs

Lines changed: 30 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

RetailCoder.VBE/Properties/Resources.resx

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,4 +394,13 @@
394394
<data name="ImplementInterface_5540_321_Mask" type="System.Resources.ResXFileRef, System.Windows.Forms">
395395
<value>..\Resources\Microsoft\Mask\ImplementInterface_5540_32.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
396396
</data>
397+
<data name="AddVariable_5541_32_Mask" type="System.Resources.ResXFileRef, System.Windows.Forms">
398+
<value>..\Resources\Microsoft\Mask\AddVariable_5541_32.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
399+
</data>
400+
<data name="PromoteLocal_6784_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
401+
<value>..\Resources\Microsoft\PromoteLocal_6784_32.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
402+
</data>
403+
<data name="PromoteLocal_6784_32_Mask" type="System.Resources.ResXFileRef, System.Windows.Forms">
404+
<value>..\Resources\Microsoft\Mask\PromoteLocal_6784_32.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
405+
</data>
397406
</root>
Binary file not shown.
Binary file not shown.

RetailCoder.VBE/Rubberduck.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1165,12 +1165,14 @@
11651165
<Resource Include="Resources\cross-button.png" />
11661166
<Resource Include="Resources\init-repo.png" />
11671167
<Content Include="Resources\Microsoft\Mask\AddProperty_5538_32.bmp" />
1168+
<None Include="Resources\Microsoft\Mask\AddVariable_5541_32.bmp" />
11681169
<Content Include="Resources\Microsoft\Mask\AllLoadedTests_8644_24.bmp" />
11691170
<None Include="Resources\Microsoft\Mask\ExtractInterface_6778_32.bmp" />
11701171
<Content Include="Resources\Microsoft\Mask\ExtractMethod_6786_32.bmp" />
11711172
<Content Include="Resources\Microsoft\Mask\FindSymbol_6263_32.bmp" />
11721173
<None Include="Resources\Microsoft\Mask\RemoveParameters_6781_32.bmp" />
11731174
<None Include="Resources\Microsoft\Mask\ImplementInterface_5540_32.bmp" />
1175+
<None Include="Resources\Microsoft\Mask\PromoteLocal_6784_32.bmp" />
11741176
<Content Include="Resources\Microsoft\Mask\ReorderParameters_6780_32.bmp" />
11751177
<Content Include="Resources\Microsoft\Mask\TestManager_8590_32.bmp" />
11761178
<Content Include="Resources\Rubberduck\RD-AboutWindow.png" />

RetailCoder.VBE/UI/Command/MenuItems/ParentMenus/RefactoringsParentMenu.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ public RefactoringsParentMenu(IEnumerable<IMenuItem> items)
1414

1515
public enum RefactoringsMenuItemDisplayOrder
1616
{
17-
ExtractMethod,
1817
RenameIdentifier,
18+
ExtractMethod,
19+
ExtractInterface,
20+
ImplementInterface,
21+
MoveCloserToUsage,
22+
IntroduceParameter,
1923
ReorderParameters,
2024
RemoveParameters,
21-
IntroduceParameter,
2225
IntroduceField,
2326
EncapsulateField,
24-
MoveCloserToUsage,
25-
ExtractInterface,
26-
ImplementInterface
2727
}
2828
}

RetailCoder.VBE/UI/Command/MenuItems/RefactorExtractMethodCommandMenuItem.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@ public RefactorExtractMethodCommandMenuItem(ICommand command)
1515

1616
public override string Key { get { return "RefactorMenu_ExtractMethod"; } }
1717
public override int DisplayOrder { get { return (int)RefactoringsMenuItemDisplayOrder.ExtractMethod; } }
18+
19+
public override bool BeginGroup
20+
{
21+
get { return true; }
22+
}
23+
1824
public override Image Image { get { return Resources.ExtractMethod_6786_32; } }
1925
public override Image Mask { get { return Resources.ExtractMethod_6786_32_Mask; } }
2026

RetailCoder.VBE/UI/Command/MenuItems/RefactorIntroduceFieldCommandMenuItem.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
using System.Windows.Input;
1+
using System.Drawing;
2+
using System.Windows.Input;
23
using Rubberduck.Parsing.VBA;
4+
using Rubberduck.Properties;
35
using Rubberduck.UI.Command.MenuItems.ParentMenus;
46

57
namespace Rubberduck.UI.Command.MenuItems
@@ -14,6 +16,10 @@ public RefactorIntroduceFieldCommandMenuItem (ICommand command)
1416
public override string Key { get { return "RefactorMenu_IntroduceField"; } }
1517
public override int DisplayOrder { get { return (int)RefactoringsMenuItemDisplayOrder.IntroduceField; } }
1618

19+
public override Image Image { get { return Resources.AddVariable_5541_32; } }
20+
public override Image Mask { get { return Resources.AddVariable_5541_32_Mask; } }
21+
22+
1723
public override bool EvaluateCanExecute(RubberduckParserState state)
1824
{
1925
return state.Status == ParserState.Ready;

RetailCoder.VBE/UI/Command/MenuItems/RefactorIntroduceParameterCommandMenuItem.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
using System.Windows.Input;
1+
using System.Drawing;
2+
using System.Windows.Input;
23
using Rubberduck.Parsing.VBA;
4+
using Rubberduck.Properties;
35
using Rubberduck.UI.Command.MenuItems.ParentMenus;
46

57
namespace Rubberduck.UI.Command.MenuItems
@@ -13,6 +15,10 @@ public RefactorIntroduceParameterCommandMenuItem (ICommand command)
1315

1416
public override string Key { get { return "RefactorMenu_IntroduceParameter"; } }
1517
public override int DisplayOrder { get { return (int)RefactoringsMenuItemDisplayOrder.IntroduceParameter; } }
18+
public override bool BeginGroup { get { return true; } }
19+
20+
public override Image Image { get { return Resources.PromoteLocal_6784_32; } }
21+
public override Image Mask { get { return Resources.PromoteLocal_6784_32_Mask; } }
1622

1723
public override bool EvaluateCanExecute(RubberduckParserState state)
1824
{

0 commit comments

Comments
 (0)