diff --git a/CHANGELOG.md b/CHANGELOG.md index 6361e03a0..a8834d291 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ All notable changes to this project will be documented in this file. - Tag list view - Inserting new tags before and after selection - [#1825], [#1737] Adding new frames +- Context menu icons ### Fixed - [#1834] PlaceObject4 tags appear as Unresolved inside of DefineSprite diff --git a/src/com/jpexs/decompiler/flash/gui/dumpview/DumpTree.java b/src/com/jpexs/decompiler/flash/gui/dumpview/DumpTree.java index e7f9dc9a9..f80693244 100644 --- a/src/com/jpexs/decompiler/flash/gui/dumpview/DumpTree.java +++ b/src/com/jpexs/decompiler/flash/gui/dumpview/DumpTree.java @@ -252,42 +252,52 @@ public class DumpTree extends JTree { final JMenuItem expandRecursiveMenuItem = new JMenuItem(mainPanel.translate("contextmenu.expandAll")); expandRecursiveMenuItem.addActionListener(this::expandRecursiveButtonActionPerformed); + expandRecursiveMenuItem.setIcon(View.getIcon("expand16")); contextPopupMenu.add(expandRecursiveMenuItem); final JMenuItem saveToFileMenuItem = new JMenuItem(mainPanel.translate("contextmenu.saveToFile")); saveToFileMenuItem.addActionListener(this::saveToFileButtonActionPerformed); + saveToFileMenuItem.setIcon(View.getIcon("saveas16")); contextPopupMenu.add(saveToFileMenuItem); final JMenuItem saveUncompressedToFileMenuItem = new JMenuItem(mainPanel.translate("contextmenu.saveUncompressedToFile")); saveUncompressedToFileMenuItem.addActionListener(this::saveUncompressedToFileButtonActionPerformed); + saveUncompressedToFileMenuItem.setIcon(View.getIcon("saveas16")); contextPopupMenu.add(saveUncompressedToFileMenuItem); final JMenuItem closeSelectionMenuItem = new JMenuItem(mainPanel.translate("contextmenu.closeSwf")); closeSelectionMenuItem.addActionListener(this::closeSwfButtonActionPerformed); + closeSelectionMenuItem.setIcon(View.getIcon("close16")); contextPopupMenu.add(closeSelectionMenuItem); final JMenuItem parseActionsMenuItem = new JMenuItem(mainPanel.translate("contextmenu.parseActions")); parseActionsMenuItem.addActionListener(this::parseActionsButtonActionPerformed); + parseActionsMenuItem.setIcon(View.getIcon("parse16")); contextPopupMenu.add(parseActionsMenuItem); final JMenuItem parseAbcMenuItem = new JMenuItem(mainPanel.translate("contextmenu.parseABC")); parseAbcMenuItem.addActionListener(this::parseAbcButtonActionPerformed); + parseAbcMenuItem.setIcon(View.getIcon("parse16")); contextPopupMenu.add(parseAbcMenuItem); final JMenuItem parseInstructionsMenuItem = new JMenuItem(mainPanel.translate("contextmenu.parseInstructions")); parseInstructionsMenuItem.addActionListener(this::parseInstructionsButtonActionPerformed); + parseInstructionsMenuItem.setIcon(View.getIcon("parse16")); contextPopupMenu.add(parseInstructionsMenuItem); final JMenuItem gotoTagMenuItem = new JMenuItem(mainPanel.translate("contextmenu.showInResources")); gotoTagMenuItem.addActionListener(this::gotoTagButtonActionPerformed); + gotoTagMenuItem.setIcon(View.getIcon("folder16")); contextPopupMenu.add(gotoTagMenuItem); final JMenuItem gotoActionListMenuItem = new JMenuItem(mainPanel.translate("contextmenu.showInResources")); gotoActionListMenuItem.addActionListener(this::gotoActionListButtonActionPerformed); + gotoActionListMenuItem.setIcon(View.getIcon("folder16")); contextPopupMenu.add(gotoActionListMenuItem); final JMenuItem gotoMethodMenuItem = new JMenuItem(mainPanel.translate("contextmenu.showInResources")); gotoMethodMenuItem.addActionListener(this::gotoMethodButtonActionPerformed); + gotoMethodMenuItem.setIcon(View.getIcon("folder16")); contextPopupMenu.add(gotoMethodMenuItem); addMouseListener(new MouseAdapter() { diff --git a/src/com/jpexs/decompiler/flash/gui/graphics/addtag16.png b/src/com/jpexs/decompiler/flash/gui/graphics/addtag16.png new file mode 100644 index 000000000..f135248f8 Binary files /dev/null and b/src/com/jpexs/decompiler/flash/gui/graphics/addtag16.png differ diff --git a/src/com/jpexs/decompiler/flash/gui/graphics/exportjava16.png b/src/com/jpexs/decompiler/flash/gui/graphics/exportjava16.png new file mode 100644 index 000000000..9527efbe4 Binary files /dev/null and b/src/com/jpexs/decompiler/flash/gui/graphics/exportjava16.png differ diff --git a/src/com/jpexs/decompiler/flash/gui/graphics/frameadd16.png b/src/com/jpexs/decompiler/flash/gui/graphics/frameadd16.png new file mode 100644 index 000000000..40d681feb Binary files /dev/null and b/src/com/jpexs/decompiler/flash/gui/graphics/frameadd16.png differ diff --git a/src/com/jpexs/decompiler/flash/gui/graphics/jumpto16.png b/src/com/jpexs/decompiler/flash/gui/graphics/jumpto16.png new file mode 100644 index 000000000..b1a181923 Binary files /dev/null and b/src/com/jpexs/decompiler/flash/gui/graphics/jumpto16.png differ diff --git a/src/com/jpexs/decompiler/flash/gui/graphics/move16.png b/src/com/jpexs/decompiler/flash/gui/graphics/move16.png new file mode 100644 index 000000000..ad4dc2796 Binary files /dev/null and b/src/com/jpexs/decompiler/flash/gui/graphics/move16.png differ diff --git a/src/com/jpexs/decompiler/flash/gui/graphics/openinside16.png b/src/com/jpexs/decompiler/flash/gui/graphics/openinside16.png new file mode 100644 index 000000000..80fe1ed0c Binary files /dev/null and b/src/com/jpexs/decompiler/flash/gui/graphics/openinside16.png differ diff --git a/src/com/jpexs/decompiler/flash/gui/graphics/parse16.png b/src/com/jpexs/decompiler/flash/gui/graphics/parse16.png new file mode 100644 index 000000000..67de2c6cc Binary files /dev/null and b/src/com/jpexs/decompiler/flash/gui/graphics/parse16.png differ diff --git a/src/com/jpexs/decompiler/flash/gui/graphics/rawedit16.png b/src/com/jpexs/decompiler/flash/gui/graphics/rawedit16.png new file mode 100644 index 000000000..0bfecd50e Binary files /dev/null and b/src/com/jpexs/decompiler/flash/gui/graphics/rawedit16.png differ diff --git a/src/com/jpexs/decompiler/flash/gui/graphics/remove16.png b/src/com/jpexs/decompiler/flash/gui/graphics/remove16.png new file mode 100644 index 000000000..ebad933c8 Binary files /dev/null and b/src/com/jpexs/decompiler/flash/gui/graphics/remove16.png differ diff --git a/src/com/jpexs/decompiler/flash/gui/graphics/replaceitem16.png b/src/com/jpexs/decompiler/flash/gui/graphics/replaceitem16.png new file mode 100644 index 000000000..80fe1ed0c Binary files /dev/null and b/src/com/jpexs/decompiler/flash/gui/graphics/replaceitem16.png differ diff --git a/src/com/jpexs/decompiler/flash/gui/graphics/replacewithtag16.png b/src/com/jpexs/decompiler/flash/gui/graphics/replacewithtag16.png new file mode 100644 index 000000000..2a9f6266e Binary files /dev/null and b/src/com/jpexs/decompiler/flash/gui/graphics/replacewithtag16.png differ diff --git a/src/com/jpexs/decompiler/flash/gui/graphics/scriptadd16.png b/src/com/jpexs/decompiler/flash/gui/graphics/scriptadd16.png new file mode 100644 index 000000000..d650552d9 Binary files /dev/null and b/src/com/jpexs/decompiler/flash/gui/graphics/scriptadd16.png differ diff --git a/src/com/jpexs/decompiler/flash/gui/graphics/undo16.png b/src/com/jpexs/decompiler/flash/gui/graphics/undo16.png new file mode 100644 index 000000000..fdc394c7c Binary files /dev/null and b/src/com/jpexs/decompiler/flash/gui/graphics/undo16.png differ diff --git a/src/com/jpexs/decompiler/flash/gui/tagtree/TagTreeContextMenu.java b/src/com/jpexs/decompiler/flash/gui/tagtree/TagTreeContextMenu.java index 13bf0653d..8d72aab4f 100644 --- a/src/com/jpexs/decompiler/flash/gui/tagtree/TagTreeContextMenu.java +++ b/src/com/jpexs/decompiler/flash/gui/tagtree/TagTreeContextMenu.java @@ -213,128 +213,160 @@ public class TagTreeContextMenu extends JPopupMenu { expandRecursiveMenuItem = new JMenuItem(mainPanel.translate("contextmenu.expandAll")); expandRecursiveMenuItem.addActionListener(this::expandRecursiveActionPerformed); + expandRecursiveMenuItem.setIcon(View.getIcon("expand16")); add(expandRecursiveMenuItem); removeMenuItem = new JMenuItem(mainPanel.translate("contextmenu.remove")); removeMenuItem.addActionListener((ActionEvent e) -> { removeItemActionPerformed(e, false); }); + removeMenuItem.setIcon(View.getIcon("remove16")); add(removeMenuItem); removeWithDependenciesMenuItem = new JMenuItem(mainPanel.translate("contextmenu.removeWithDependencies")); removeWithDependenciesMenuItem.addActionListener((ActionEvent e) -> { removeItemActionPerformed(e, true); }); + removeWithDependenciesMenuItem.setIcon(View.getIcon("remove16")); add(removeWithDependenciesMenuItem); undoTagMenuItem = new JMenuItem(mainPanel.translate("contextmenu.undo")); undoTagMenuItem.addActionListener(this::undoTagActionPerformed); + undoTagMenuItem.setIcon(View.getIcon("undo16")); add(undoTagMenuItem); exportSelectionMenuItem = new JMenuItem(mainPanel.translate("menu.file.export.selection")); exportSelectionMenuItem.addActionListener(mainPanel::exportSelectionActionPerformed); + exportSelectionMenuItem.setIcon(View.getIcon("exportsel16")); add(exportSelectionMenuItem); replaceMenuItem = new JMenuItem(mainPanel.translate("button.replace")); replaceMenuItem.addActionListener(mainPanel::replaceButtonActionPerformed); + replaceMenuItem.setIcon(View.getIcon("replaceitem16")); add(replaceMenuItem); replaceNoFillMenuItem = new JMenuItem(mainPanel.translate("button.replaceNoFill")); replaceNoFillMenuItem.addActionListener(mainPanel::replaceNoFillButtonActionPerformed); + replaceNoFillMenuItem.setIcon(View.getIcon("replaceitem16")); add(replaceNoFillMenuItem); replaceWithTagMenuItem = new JMenuItem(mainPanel.translate("button.replaceWithTag")); replaceWithTagMenuItem.addActionListener(this::replaceWithTagActionPerformed); + replaceWithTagMenuItem.setIcon(View.getIcon("replacewithtag16")); add(replaceWithTagMenuItem); replaceRefsWithTagMenuItem = new JMenuItem(mainPanel.translate("button.replaceRefs")); replaceRefsWithTagMenuItem.addActionListener(this::replaceRefsWithTagActionPerformed); + replaceRefsWithTagMenuItem.setIcon(View.getIcon("replacewithtag16")); add(replaceRefsWithTagMenuItem); rawEditMenuItem = new JMenuItem(mainPanel.translate("contextmenu.rawEdit")); rawEditMenuItem.addActionListener(this::rawEditActionPerformed); + rawEditMenuItem.setIcon(View.getIcon("rawedit16")); add(rawEditMenuItem); jumpToCharacterMenuItem = new JMenuItem(mainPanel.translate("contextmenu.jumpToCharacter")); jumpToCharacterMenuItem.addActionListener(this::jumpToCharacterActionPerformed); + jumpToCharacterMenuItem.setIcon(View.getIcon("jumpto16")); add(jumpToCharacterMenuItem); exportJavaSourceMenuItem = new JMenuItem(mainPanel.translate("contextmenu.exportJavaSource")); exportJavaSourceMenuItem.addActionListener(mainPanel::exportJavaSourceActionPerformed); + exportJavaSourceMenuItem.setIcon(View.getIcon("exportjava16")); add(exportJavaSourceMenuItem); exportSwfXmlMenuItem = new JMenuItem(mainPanel.translate("contextmenu.exportSwfXml")); exportSwfXmlMenuItem.addActionListener(mainPanel::exportSwfXmlActionPerformed); + exportSwfXmlMenuItem.setIcon(View.getIcon("exportxml16")); add(exportSwfXmlMenuItem); importSwfXmlMenuItem = new JMenuItem(mainPanel.translate("contextmenu.importSwfXml")); importSwfXmlMenuItem.addActionListener(mainPanel::importSwfXmlActionPerformed); + importSwfXmlMenuItem.setIcon(View.getIcon("importxml16")); add(importSwfXmlMenuItem); showInResourcesViewTagMenuItem = new JMenuItem(mainPanel.translate("contextmenu.showInResources")); showInResourcesViewTagMenuItem.addActionListener(this::showInResourcesViewActionPerformed); + showInResourcesViewTagMenuItem.setIcon(View.getIcon("folder16")); add(showInResourcesViewTagMenuItem); showInTagListViewTagMenuItem = new JMenuItem(mainPanel.translate("contextmenu.showInTagList")); showInTagListViewTagMenuItem.addActionListener(this::showInTagListViewActionPerformed); + showInTagListViewTagMenuItem.setIcon(View.getIcon("taglist16")); add(showInTagListViewTagMenuItem); addTagMenu = new JMenu(mainPanel.translate("contextmenu.addTag")); + addTagMenu.setIcon(View.getIcon("addtag16")); add(addTagMenu); addTagBeforeMenu = new JMenu(mainPanel.translate("contextmenu.addTagBefore")); + addTagBeforeMenu.setIcon(View.getIcon("addtag16")); add(addTagBeforeMenu); addTagAfterMenu = new JMenu(mainPanel.translate("contextmenu.addTagAfter")); + addTagAfterMenu.setIcon(View.getIcon("addtag16")); add(addTagAfterMenu); cloneTagMenuItem = new JMenuItem(mainPanel.translate("contextmenu.cloneTag")); cloneTagMenuItem.addActionListener(this::cloneTagActionPerformed); + cloneTagMenuItem.setIcon(View.getIcon("copy16")); add(cloneTagMenuItem); moveTagMenuItem = new JMenuItem(mainPanel.translate("contextmenu.moveTagAround")); moveTagMenuItem.addActionListener(this::moveTagActionPerformed); + moveTagMenuItem.setIcon(View.getIcon("move16")); add(moveTagMenuItem); moveTagToMenu = new JMenu(mainPanel.translate("contextmenu.moveTag")); + moveTagToMenu.setIcon(View.getIcon("move16")); add(moveTagToMenu); copyTagMenu = new JMenu(mainPanel.translate("contextmenu.copyTag")); + copyTagMenu.setIcon(View.getIcon("copy16")); add(copyTagMenu); copyTagWithDependenciesMenu = new JMenu(mainPanel.translate("contextmenu.copyTagWithDependencies")); + copyTagWithDependenciesMenu.setIcon(View.getIcon("copy16")); add(copyTagWithDependenciesMenu); openSWFInsideTagMenuItem = new JMenuItem(mainPanel.translate("contextmenu.openswfinside")); + openSWFInsideTagMenuItem.setIcon(View.getIcon("openinside16")); + openSWFInsideTagMenuItem.addActionListener(this::openSwfInsideActionPerformed); add(openSWFInsideTagMenuItem); - openSWFInsideTagMenuItem.addActionListener(this::openSwfInsideActionPerformed); - + addAs12ScriptMenuItem = new JMenuItem(mainPanel.translate("contextmenu.addScript")); addAs12ScriptMenuItem.addActionListener(this::addAs12ScriptActionPerformed); + addAs12ScriptMenuItem.setIcon(View.getIcon("scriptadd16")); add(addAs12ScriptMenuItem); addAs3ClassMenuItem = new JMenuItem(mainPanel.translate("contextmenu.addClass")); addAs3ClassMenuItem.addActionListener(this::addAs3ClassActionPerformed); + addAs3ClassMenuItem.setIcon(View.getIcon("scriptadd16")); add(addAs3ClassMenuItem); addFramesMenuItem = new JMenuItem(mainPanel.translate("contextmenu.addFrames")); addFramesMenuItem.addActionListener(this::addFramesActionPerformed); + addFramesMenuItem.setIcon(View.getIcon("frameadd16")); add(addFramesMenuItem); addFramesBeforeMenuItem = new JMenuItem(mainPanel.translate("contextmenu.addFramesBefore")); addFramesBeforeMenuItem.addActionListener(this::addFramesBeforeActionPerformed); + addFramesBeforeMenuItem.setIcon(View.getIcon("frameadd16")); add(addFramesBeforeMenuItem); addFramesAfterMenuItem = new JMenuItem(mainPanel.translate("contextmenu.addFramesAfter")); addFramesAfterMenuItem.addActionListener(this::addFramesAfterActionPerformed); + addFramesAfterMenuItem.setIcon(View.getIcon("frameadd16")); add(addFramesAfterMenuItem); textSearchMenuItem = new JMenuItem(mainPanel.translate("menu.tools.search")); textSearchMenuItem.addActionListener(this::textSearchActionPerformed); + textSearchMenuItem.setIcon(View.getIcon("search16")); add(textSearchMenuItem); closeMenuItem = new JMenuItem(mainPanel.translate("contextmenu.closeSwf")); closeMenuItem.addActionListener(this::closeSwfActionPerformed); + closeMenuItem.setIcon(View.getIcon("close16")); add(closeMenuItem); MouseAdapter adapter = new MouseAdapter() { @@ -703,18 +735,21 @@ public class TagTreeContextMenu extends JPopupMenu { swfItem.addActionListener((ActionEvent ae) -> { moveTagToActionPerformed(ae, items, targetSwf); }); + swfItem.setIcon(View.getIcon("flash16")); moveTagToMenu.add(swfItem); swfItem = new JMenuItem(targetSwf.getShortFileName()); swfItem.addActionListener((ActionEvent ae) -> { copyTagActionPerformed(ae, items, targetSwf); }); + swfItem.setIcon(View.getIcon("flash16")); copyTagMenu.add(swfItem); swfItem = new JMenuItem(targetSwf.getShortFileName()); swfItem.addActionListener((ActionEvent ae) -> { copyTagWithDependenciesActionPerformed(ae, items, targetSwf); }); + swfItem.setIcon(View.getIcon("flash16")); copyTagWithDependenciesMenu.add(swfItem); } }