diff --git a/src/com/jpexs/decompiler/flash/gui/MainFrameRibbonMenu.java b/src/com/jpexs/decompiler/flash/gui/MainFrameRibbonMenu.java index 07270e79e..63720776e 100644 --- a/src/com/jpexs/decompiler/flash/gui/MainFrameRibbonMenu.java +++ b/src/com/jpexs/decompiler/flash/gui/MainFrameRibbonMenu.java @@ -276,12 +276,12 @@ public class MainFrameRibbonMenu implements MainFrameMenu, ActionListener { return mainMenu; } - private List getEmptyResizePolicies(JRibbonBand ribbonBand) { + private List titleResizePolicies(final JRibbonBand ribbonBand) { List resizePolicies = new ArrayList<>(); resizePolicies.add(new BaseRibbonBandResizePolicy(ribbonBand.getControlPanel()) { @Override public int getPreferredWidth(int i, int i1) { - return 105; + return ribbonBand.getGraphics().getFontMetrics(ribbonBand.getFont()).stringWidth(ribbonBand.getTitle())+20; } @Override @@ -292,7 +292,7 @@ public class MainFrameRibbonMenu implements MainFrameMenu, ActionListener { } private List getResizePolicies(JRibbonBand ribbonBand) { - List resizePolicies = new ArrayList<>(); + List resizePolicies = new ArrayList<>(); resizePolicies.add(new CoreRibbonResizePolicies.Mirror(ribbonBand.getControlPanel())); resizePolicies.add(new IconRibbonBandResizePolicy(ribbonBand.getControlPanel())); return resizePolicies; @@ -516,14 +516,14 @@ public class MainFrameRibbonMenu implements MainFrameMenu, ActionListener { advancedSettingsBand.addCommandButton(clearRecentFilesCommandButton, RibbonElementPriority.MEDIUM); JRibbonBand deobfuscationBand = new JRibbonBand(translate("menu.deobfuscation"), null); - deobfuscationBand.setResizePolicies(getEmptyResizePolicies(deobfuscationBand)); //TODO: add icons and change this to getResizePolicies + deobfuscationBand.setResizePolicies(titleResizePolicies(deobfuscationBand)); CommandToggleButtonGroup grpDeobfuscation = new CommandToggleButtonGroup(); - deobfuscationModeOldToggleButton = new JCommandToggleButton(fixCommandTitle(translate("menu.file.deobfuscation.old")), null); + deobfuscationModeOldToggleButton = new JCommandToggleButton(fixCommandTitle(translate("menu.file.deobfuscation.old")), View.getResizableIcon("deobfuscateold16")); assignListener(deobfuscationModeOldToggleButton, ACTION_DEOBFUSCATION_MODE_OLD); - deobfuscationModeNewToggleButton = new JCommandToggleButton(fixCommandTitle(translate("menu.file.deobfuscation.new")), null); + deobfuscationModeNewToggleButton = new JCommandToggleButton(fixCommandTitle(translate("menu.file.deobfuscation.new")), View.getResizableIcon("deobfuscatenew16")); assignListener(deobfuscationModeNewToggleButton, ACTION_DEOBFUSCATION_MODE_NEW); grpDeobfuscation.add(deobfuscationModeOldToggleButton); diff --git a/src/com/jpexs/decompiler/flash/gui/graphics/deobfuscatenew16.png b/src/com/jpexs/decompiler/flash/gui/graphics/deobfuscatenew16.png new file mode 100644 index 000000000..f2bdef6be Binary files /dev/null and b/src/com/jpexs/decompiler/flash/gui/graphics/deobfuscatenew16.png differ diff --git a/src/com/jpexs/decompiler/flash/gui/graphics/deobfuscateold16.png b/src/com/jpexs/decompiler/flash/gui/graphics/deobfuscateold16.png new file mode 100644 index 000000000..e24982b06 Binary files /dev/null and b/src/com/jpexs/decompiler/flash/gui/graphics/deobfuscateold16.png differ diff --git a/src/com/jpexs/decompiler/flash/gui/locales/MainFrame.properties b/src/com/jpexs/decompiler/flash/gui/locales/MainFrame.properties index 9f73cb831..218406871 100644 --- a/src/com/jpexs/decompiler/flash/gui/locales/MainFrame.properties +++ b/src/com/jpexs/decompiler/flash/gui/locales/MainFrame.properties @@ -493,8 +493,8 @@ header.displayrect.value.pixels = %xmin%,%ymin% => %xmax%,%ymax% pixels contextmenu.saveToFile = Save to File contextmenu.parseActions = Parse actions contextmenu.parseABC = Parse ABC -contextmenu.parseInstructions = Parse AVM2 Instrctions +contextmenu.parseInstructions = Parse AVM2 Instructions -menu.deobfuscation = Deobfuscation +menu.deobfuscation = AS1/2 Deobfuscation menu.file.deobfuscation.old = Old style menu.file.deobfuscation.new = New style diff --git a/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_cs.properties b/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_cs.properties index 47e382c35..254e32f3c 100644 --- a/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_cs.properties +++ b/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_cs.properties @@ -490,3 +490,12 @@ header.framecount = Po\u010det sn\u00edmk\u016f: header.displayrect = Zobrazen\u00fd obd\u00e9ln\u00edk: header.displayrect.value.twips = %xmin%,%ymin% => %xmax%,%ymax% twip\u016f header.displayrect.value.pixels = %xmin%,%ymin% => %xmax%,%ymax% pixel\u016f + +contextmenu.saveToFile = Ulo\u017eit do souboru +contextmenu.parseActions = Naparsovat akce +contextmenu.parseABC = Naparsovat ABC +contextmenu.parseInstructions = Naparsovat AVM2 instrukce + +menu.deobfuscation = AS1/2 Deobfuskace +menu.file.deobfuscation.old = Star\u00fd zp\u016fsob +menu.file.deobfuscation.new = Nov\u00fd zp\u016fsob diff --git a/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_hu.properties b/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_hu.properties index 05da53b8c..a552efd5e 100644 --- a/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_hu.properties +++ b/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_hu.properties @@ -495,6 +495,6 @@ contextmenu.parseActions = Action-\u00f6k elemz\u00e9se contextmenu.parseABC = ABC elemz\u00e9se contextmenu.parseInstructions = AVM2 utas\u00edt\u00e1sok elemz\u00e9se -menu.deobfuscation = Deobfuszk\u00e1l\u00e1s +menu.deobfuscation = AS1/2 Deobfuszk\u00e1l\u00e1s menu.file.deobfuscation.old = R\u00e9gi menu.file.deobfuscation.new = \u00daj