Skip to content

Commit 9c40015

Browse files
MeychiMeychi
committed
Merge pull request fdorg#742 from Gama11/AddIcons
Add icons to various menus
2 parents aba845d + 3b5acb1 commit 9c40015

File tree

6 files changed

+26
-23
lines changed

6 files changed

+26
-23
lines changed

‎External/Plugins/CodeRefactor/Controls/RefactorMenu.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ public RefactorMenu(Boolean createSurroundMenu)
2323
{
2424
this.Text = TextHelper.GetString("Label.Refactor");
2525
this.renameMenuItem = this.DropDownItems.Add(TextHelper.GetString("Label.Rename")) as ToolStripMenuItem;
26+
this.renameMenuItem.Image = PluginBase.MainForm.FindImage("331");
2627
this.extractMethodMenuItem = this.DropDownItems.Add(TextHelper.GetString("Label.ExtractMethod"), null) as ToolStripMenuItem;
2728
this.extractLocalVariableMenuItem = this.DropDownItems.Add(TextHelper.GetString("Label.ExtractLocalVariable"), null) as ToolStripMenuItem;
2829
this.delegateMenuItem = this.DropDownItems.Add(TextHelper.GetString("Label.DelegateMethods"), null) as ToolStripMenuItem;

‎External/Plugins/ProjectManager/Controls/Icons.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ public class Icons
7474
public static FDImage Copy;
7575
public static FDImage Paste;
7676
public static FDImage Delete;
77+
public static FDImage Rename;
7778
public static FDImage Options;
7879
public static FDImage OptionsWithIssues;
7980
public static FDImage NewProject;
@@ -146,6 +147,7 @@ public static void Initialize(IMainForm mainForm)
146147
Copy = Get(292);
147148
Paste = Get(283);
148149
Delete = Get(111);
150+
Rename = Get(331);
149151
Options = Get(54);
150152
OptionsWithIssues = Get("54|6|3|3");
151153
NewProject = Get("274|0|5|4");

‎External/Plugins/ProjectManager/Controls/TreeView/ProjectContextMenu.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class ProjectContextMenu : ContextMenuStrip
3737
public ToolStripMenuItem Copy = new ToolStripMenuItem(TextHelper.GetString("Label.Copy"), Icons.Copy.Img);
3838
public ToolStripMenuItem Paste = new ToolStripMenuItem(TextHelper.GetString("Label.Paste"), Icons.Paste.Img);
3939
public ToolStripMenuItem Delete = new ToolStripMenuItem(TextHelper.GetString("Label.Delete"), Icons.Delete.Img);
40-
public ToolStripMenuItem Rename = new ToolStripMenuItem(TextHelper.GetString("Label.Rename"));
40+
public ToolStripMenuItem Rename = new ToolStripMenuItem(TextHelper.GetString("Label.Rename"), Icons.Rename.Img);
4141
public ToolStripMenuItem LibraryOptions = new ToolStripMenuItem(TextHelper.GetString("Label.Options"), Icons.Options.Img);
4242
public ToolStripMenuItem NothingToDo = new ToolStripMenuItem(TextHelper.GetString("Label.NotValidGroup"));
4343
public ToolStripMenuItem NoProjectOutput = new ToolStripMenuItem(TextHelper.GetString("Label.NoProjectOutput"));

‎FlashDevelop/Bin/Debug/Settings/MainMenu.xml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<mainmenu>
33
<menu label="Label.File" name="FileMenu">
44
<menu label="Label.New" name="NewMenu">
5-
<button label="Label.BlankDocument" click="SmartNew" shortcut="Control|N" image="559" />
5+
<button label="Label.BlankDocument" click="SmartNew" shortcut="Control|N" />
66
<separator />
77
<button label="Label.AS2Document" click="NewFromTemplate" tag="as;$(TemplateDir)\AS2.fdt" />
88
<button label="Label.AS3Document" click="NewFromTemplate" tag="as;$(TemplateDir)\AS3.fdt" />
@@ -16,9 +16,9 @@
1616
<button label="Label.TextDocument" click="NewFromTemplate" tag="txt;$(TemplateDir)\TXT.fdt" />
1717
</menu>
1818
<menu label="Label.Modify" name="ModifyMenu" flags="Enable:IsEditable">
19-
<button label="Label.Reload" click="Reload" shortcut="Control|Shift|R" flags="Enable:IsEditable|!IsUntitled" image="559" />
20-
<button label="Label.Duplicate" click="Duplicate" shortcut="Control|Shift|N" flags="Enable:IsEditable" />
21-
<button label="Label.Revert" click="Revert" shortcut="Control|Shift|T" flags="Enable:IsEditable|CanUndo" />
19+
<button label="Label.Reload" click="Reload" shortcut="Control|Shift|R" flags="Enable:IsEditable|!IsUntitled" image="66" />
20+
<button label="Label.Duplicate" click="Duplicate" shortcut="Control|Shift|N" flags="Enable:IsEditable" image="292" />
21+
<button label="Label.Revert" click="Revert" shortcut="Control|Shift|T" flags="Enable:IsEditable|CanUndo" image="73" />
2222
</menu>
2323
<button label="Label.Open" click="Open" shortcut="Control|O" image="214" />
2424
<separator />
@@ -131,33 +131,33 @@
131131
<button label="Label.ClearBookmarks" click="ClearBookmarks" image="402|4|4|4" flags="Enable:IsEditable|HasBookmarks" />
132132
</menu>
133133
<menu label="Label.Insert" name="InsertMenu">
134-
<button label="Label.FromFile" click="InsertFile" tag="$(OpenFile)" flags="Enable:IsEditable" image="559" />
135-
<button label="Label.FileDetails" click="InsertFileDetails" flags="Enable:IsEditable|!IsUntitled" />
136-
<button label="Label.Timestamp" click="InsertTimestamp" tag="g" flags="Enable:IsEditable" />
134+
<button label="Label.FromFile" click="InsertFile" tag="$(OpenFile)" flags="Enable:IsEditable" image="275" />
135+
<button label="Label.FileDetails" click="InsertFileDetails" flags="Enable:IsEditable|!IsUntitled" image="275|16|4|4" />
136+
<button label="Label.Timestamp" click="InsertTimestamp" tag="g" flags="Enable:IsEditable" image="163" />
137137
<separator />
138-
<button label="Label.Snippet" click="InsertSnippet" shortcut="Control|B" tag="null" flags="Enable:IsEditable" />
139-
<button label="Label.Color" click="InsertColor" shortcut="Control|Shift|K" flags="Enable:IsEditable" />
138+
<button label="Label.Snippet" click="InsertSnippet" shortcut="Control|B" tag="null" flags="Enable:IsEditable" image="341" />
139+
<button label="Label.Color" click="InsertColor" shortcut="Control|Shift|K" flags="Enable:IsEditable" image="328" />
140140
<button label="Label.GUID" click="InsertGUID" shortcut="Control|Shift|I" flags="Enable:IsEditable" />
141141
<separator />
142142
<button label="Label.Hash" click="InsertHash" shortcut="Control|Shift|H" flags="Enable:IsEditable" />
143143
</menu>
144144
<menu label="Label.Tools" name="ToolsMenu">
145-
<button label="Label.KillRunningProcess" click="KillProcess" flags="Enable:ProcessIsRunning" />
145+
<button label="Label.KillRunningProcess" click="KillProcess" flags="Enable:ProcessIsRunning" image="153" />
146146
<separator />
147-
<menu label="Label.FlashTools" name="FlashToolsMenu">
147+
<menu label="Label.FlashTools" name="FlashToolsMenu" >
148148
<button label="Label.SOReader" click="RunProcess" tag="$(Quote)$(AppDir)\Tools\soreader\SOReaderUI.exe$(Quote)" />
149149
<button label="Label.ASDocGen" click="RunProcess" tag="$(Quote)$(AppDir)\Tools\asdocgen\ASDocGen.exe$(Quote)" />
150150
<separator />
151151
<button label="Label.TestMovieInFlash" click="PluginCommand" tag="ASCompletion.CallFlashIDE;$(Quote)$(AppDir)\Tools\flashide\testmovie.jsfl$(Quote)" shortcut="F6" />
152152
<button label="Label.PublishMovieInFlash" click="PluginCommand" tag="ASCompletion.CallFlashIDE;$(Quote)$(AppDir)\Tools\flashide\buildmovie.jsfl$(Quote)" shortcut="Control|F6" />
153153
</menu>
154-
<menu label="Label.GeneralTools" name="GeneralToolsMenu">
154+
<menu label="Label.GeneralTools" name="GeneralToolsMenu" >
155155
<button label="Label.CommandPrompt" click="PluginCommand" tag="FileExplorer.PromptHere;$(WorkingDir)" image="57" />
156156
<button label="Label.WindowsExplorer" click="PluginCommand" tag="FileExplorer.Explore;$(WorkingDir)" image="56" />
157157
<separator />
158158
<button label="Label.CompareFiles" click="RunProcess" tag="$(Quote)$(AppDir)\Tools\diffui\diffui.exe$(Quote)" image="37|16|-1|-1" />
159159
</menu>
160-
<menu label="Label.WebTools" name="WebToolsMenu">
160+
<menu label="Label.WebTools" name="WebToolsMenu" >
161161
<button label="Label.HTMLValidator" click="Browse" tag="http://validator.w3.org/" image="559" />
162162
<button label="Label.CSSValidator" click="Browse" tag="http://jigsaw.w3.org/css-validator/" />
163163
</menu>

‎FlashDevelop/Bin/Debug/Settings/ScintillaMenu.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
<button label="Label.SaveAsSnippet" click="SaveAsSnippet" flags="Enable:HasSelection" />
2222
</menu>
2323
<menu label="Label.Insert" name="InsertMenu">
24-
<button label="Label.FromFile" click="InsertFile" tag="$(OpenFile)" />
25-
<button label="Label.FileDetails" click="InsertFileDetails" flags="Enable:!IsUntitled" />
26-
<button label="Label.Timestamp" click="InsertTimestamp" tag="g" />
24+
<button label="Label.FromFile" click="InsertFile" tag="$(OpenFile)" image="275" />
25+
<button label="Label.FileDetails" click="InsertFileDetails" flags="Enable:!IsUntitled" image="275|16|4|4" />
26+
<button label="Label.Timestamp" click="InsertTimestamp" tag="g" image="163" />
2727
<separator />
28-
<button label="Label.Snippet" click="InsertSnippet" tag="null" />
29-
<button label="Label.Color" click="InsertColor" />
28+
<button label="Label.Snippet" click="InsertSnippet" tag="null" image="341" />
29+
<button label="Label.Color" click="InsertColor" image="328" />
3030
<button label="Label.GUID" click="InsertGUID" />
3131
<separator />
3232
<button label="Label.Hash" click="InsertHash" />

‎FlashDevelop/Bin/Debug/Settings/TabMenu.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
<button label="Label.CloseOthers" click="CloseOthers" keyid="FileMenu.CloseOthers" flags="Enable:!IsAloneInPane" />
55
<button label="Label.CloseAll" click="CloseAll" keyid="FileMenu.CloseAll" flags="Enable:!IsAloneInPane" />
66
<separator />
7-
<button label="Label.Reload" click="Reload" keyid="ModifyMenu.Reload" flags="Enable:IsEditable|!IsUntitled" />
8-
<button label="Label.Duplicate" click="Duplicate" keyId="ModifyMenu.Duplicate" flags="Enable:IsEditable" />
9-
<button label="Label.Revert" click="Revert" keyid="ModifyMenu.Revert" flags="Enable:IsEditable|CanUndo" />
7+
<button label="Label.Reload" click="Reload" keyid="ModifyMenu.Reload" flags="Enable:IsEditable|!IsUntitled" image="66" />
8+
<button label="Label.Duplicate" click="Duplicate" keyId="ModifyMenu.Duplicate" flags="Enable:IsEditable" image="292" />
9+
<button label="Label.Revert" click="Revert" keyid="ModifyMenu.Revert" flags="Enable:IsEditable|CanUndo" image="73" />
1010
<separator />
11-
<button label="Label.Save" click="Save" keyid="FileMenu.Save" flags="Enable:IsEditable" />
11+
<button label="Label.Save" click="Save" keyid="FileMenu.Save" flags="Enable:IsEditable" image="168" />
1212
<button label="Label.SaveAs" click="SaveAs" keyid="FileMenu.SaveAs" flags="Enable:IsEditable" />
1313
<separator />
1414
<button label="Label.CommandPrompt" click="PluginCommand" tag="FileExplorer.PromptHere;$(CurDir)" image="57" keyid="GeneralToolsMenu.CommandPrompt" />

0 commit comments

Comments
 (0)