From 5f76dfcdb59bd89db534b7bbf665e02695730853 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Sun, 31 Aug 2014 15:48:19 +0200 Subject: [PATCH] Deobfuscation old/new icons czech translation updated other translation fixes --- .../decompiler/flash/gui/MainFrameRibbonMenu.java | 12 ++++++------ .../flash/gui/graphics/deobfuscatenew16.png | Bin 0 -> 719 bytes .../flash/gui/graphics/deobfuscateold16.png | Bin 0 -> 726 bytes .../flash/gui/locales/MainFrame.properties | 4 ++-- .../flash/gui/locales/MainFrame_cs.properties | 9 +++++++++ .../flash/gui/locales/MainFrame_hu.properties | 2 +- 6 files changed, 18 insertions(+), 9 deletions(-) create mode 100644 src/com/jpexs/decompiler/flash/gui/graphics/deobfuscatenew16.png create mode 100644 src/com/jpexs/decompiler/flash/gui/graphics/deobfuscateold16.png 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 0000000000000000000000000000000000000000..f2bdef6be8a783eb7903f2369b7d868a14b58194 GIT binary patch literal 719 zcmV;=0xJ@95jSE5A%ge_ins}gi!8E`O6kJ1h=>~tC15ut zhN?)5E3L|iZFJF=*g_=_^DuEHTaU-1<9YtxodHgl>v@>xAxV-FEX%^_baD=dL!A@w?eOp=8xA9r z$snChBauiTl}aHRje-D@{otVRRsdtSzw(Ddia41}D%C|%#M#-I0`hph__Dum`X_*4 z7_*xaWU-tqSCqx%U9ljCczzCMZ!dBK;IUe#x$SLaNDz<55s5?;ahR-}o}MBQ2*68l z`F>+(2iE}Msj2D2$_lc(ySSL0MT}t}2m&~cLx}9q6mWcetN>{;SX*CrT>(6Ug9d4F z5m};M%*-G$F@fJ>V-S{>KqG|D=L3xpCnS{LVPkU>?`*b81z@kLQhCS6k)_L&*^D@y zW22*p_V+{V=|O024sN$wXh+oA&=3Ry#HoX*MuT4s4fs@Dt;@Mg^Ccw@tmWk&jv5;!R-?J}*4AEruB^=3 z)as{q-o_UN1^M%Zh1xg8#irLqMY?&F>VB?m{R_n_>>p`!{|5j7002ovPDHLkV1lz) BL~;NC literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e24982b061bf02e4c6a6b82f87ebd4159ff65dc2 GIT binary patch literal 726 zcmV;{0xA88P)zon!ba9u zXI6J)*ZK3_IJ?fy^qWZ+DYbzIGjHDK``-NKJpuo@wq70Vtq_H4^_!wm+i{TRMd}rw zX8Kz?JkP_1_3)M}A2adT=Gd*)W<FyUAn z;fgR;4H&q+PrfPC#e3U!5w^-W?PJ|Ukuxk>3`NKLH(=&I(zQt=ejq7fY(5FyaxtS7 z|IAFdK-dp(ybyhq<5v^q8pwpBje8m*$6sOhb_YAMPw-8l<fS$skhH)HI+aYBvSiBGfK#U;ohG8;Yoqc(!CkRj;ptmyK6t6w` z0m!Ip1GtR2HVbAlXa+|JE-p5H zMVD}WY$aa4M6YBMOaXkdj5%WzV4^z2P(_2JG=^{VeLnX$4t}G{HTvE!C>d#RJ-Y&% z*eH0Ilrh}g9qhWP)i#}|7eFxi^0plEu0wNv-xE@l<`Zy>ewZvFA9&M{ZtFY8V zTG%h5uymjB58sM+lmV5RvfgR+1AYrI06RQTNYhsm!~g&Q07*qo IM6N<$f^SDf6951J literal 0 HcmV?d00001 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