From 2037a0b6f97f81798147ec1f9db7327ff92e52a3 Mon Sep 17 00:00:00 2001 From: Honfika Date: Sat, 1 Feb 2014 21:09:49 +0100 Subject: [PATCH] others tag icon, save as exe moved to export (+new icon), save as exe: gfx option removed from save dialog --- .../src/com/jpexs/decompiler/flash/gui/Main.java | 10 ++++++---- .../decompiler/flash/gui/MainFrameRibbonMenu.java | 6 +++--- .../com/jpexs/decompiler/flash/gui/TagTree.java | 4 ++++ .../jpexs/decompiler/flash/gui/TagTreeModel.java | 4 +++- .../jpexs/decompiler/flash/gui/TreeNodeType.java | 1 + .../decompiler/flash/gui/graphics/othertag16.png | Bin 0 -> 597 bytes .../decompiler/flash/gui/graphics/saveasexe16.png | Bin 0 -> 658 bytes 7 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 trunk/src/com/jpexs/decompiler/flash/gui/graphics/othertag16.png create mode 100644 trunk/src/com/jpexs/decompiler/flash/gui/graphics/saveasexe16.png diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/Main.java b/trunk/src/com/jpexs/decompiler/flash/gui/Main.java index bf7bea98f..e04683532 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/Main.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/Main.java @@ -549,10 +549,12 @@ public class Main { return AppStrings.translate("filter.gfx"); } }; - if (swf.gfx) { - fc.setFileFilter(gfxFilter); - } else { - fc.addChoosableFileFilter(gfxFilter); + if (mode == SaveFileMode.SAVE || mode == SaveFileMode.SAVEAS) { + if (swf.gfx) { + fc.setFileFilter(gfxFilter); + } else { + fc.addChoosableFileFilter(gfxFilter); + } } fc.setAcceptAllFileFilterUsed(false); JFrame f = new JFrame(); diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/MainFrameRibbonMenu.java b/trunk/src/com/jpexs/decompiler/flash/gui/MainFrameRibbonMenu.java index b7d80c6d6..ff1e6f23c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/MainFrameRibbonMenu.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/MainFrameRibbonMenu.java @@ -284,8 +284,6 @@ public class MainFrameRibbonMenu implements MainFrameMenu, ActionListener { assignListener(saveCommandButton, ACTION_SAVE); saveasCommandButton = new JCommandButton(fixCommandTitle(translate("menu.file.saveas")), View.getResizableIcon("saveas16")); assignListener(saveasCommandButton, ACTION_SAVE_AS); - saveasexeCommandButton = new JCommandButton(fixCommandTitle(translate("menu.file.saveasexe")), View.getResizableIcon("saveas16")); - assignListener(saveasexeCommandButton, ACTION_SAVE_AS_EXE); reloadCommandButton = new JCommandButton(fixCommandTitle(translate("menu.file.reload")), View.getResizableIcon("reload16")); assignListener(reloadCommandButton, ACTION_RELOAD); @@ -293,7 +291,6 @@ public class MainFrameRibbonMenu implements MainFrameMenu, ActionListener { editBand.addCommandButton(openCommandButton, RibbonElementPriority.TOP); editBand.addCommandButton(saveCommandButton, RibbonElementPriority.TOP); editBand.addCommandButton(saveasCommandButton, RibbonElementPriority.MEDIUM); - editBand.addCommandButton(saveasexeCommandButton, RibbonElementPriority.MEDIUM); editBand.addCommandButton(reloadCommandButton, RibbonElementPriority.MEDIUM); JRibbonBand exportBand = new JRibbonBand(translate("menu.export"), null); @@ -304,10 +301,13 @@ public class MainFrameRibbonMenu implements MainFrameMenu, ActionListener { assignListener(exportAllCommandButton, ACTION_EXPORT); exportSelectionCommandButton = new JCommandButton(fixCommandTitle(translate("menu.file.export.selection")), View.getResizableIcon("exportsel16")); assignListener(exportSelectionCommandButton, ACTION_EXPORT_SEL); + saveasexeCommandButton = new JCommandButton(fixCommandTitle(translate("menu.file.saveasexe")), View.getResizableIcon("saveasexe16")); + assignListener(saveasexeCommandButton, ACTION_SAVE_AS_EXE); exportBand.addCommandButton(exportFlaCommandButton, RibbonElementPriority.TOP); exportBand.addCommandButton(exportAllCommandButton, RibbonElementPriority.MEDIUM); exportBand.addCommandButton(exportSelectionCommandButton, RibbonElementPriority.MEDIUM); + exportBand.addCommandButton(saveasexeCommandButton, RibbonElementPriority.MEDIUM); return new RibbonTask(translate("menu.file"), editBand, exportBand); } diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/TagTree.java b/trunk/src/com/jpexs/decompiler/flash/gui/TagTree.java index 5d73f59ef..0e09f97ae 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/TagTree.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/TagTree.java @@ -227,6 +227,10 @@ public class TagTree extends JTree { } } } + + if (t instanceof Tag) { + return TreeNodeType.OTHER_TAG; + } return TreeNodeType.FOLDER; } diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/TagTreeModel.java b/trunk/src/com/jpexs/decompiler/flash/gui/TagTreeModel.java index f0905776c..280401793 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/TagTreeModel.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/TagTreeModel.java @@ -26,6 +26,7 @@ import com.jpexs.decompiler.flash.gui.treenodes.SWFNode; import com.jpexs.decompiler.flash.gui.treenodes.StringNode; import com.jpexs.decompiler.flash.gui.treenodes.TagTreeRoot; import com.jpexs.decompiler.flash.tags.DefineSpriteTag; +import com.jpexs.decompiler.flash.tags.FrameLabelTag; import com.jpexs.decompiler.flash.tags.PlaceObject2Tag; import com.jpexs.decompiler.flash.tags.PlaceObject3Tag; import com.jpexs.decompiler.flash.tags.PlaceObject4Tag; @@ -130,7 +131,8 @@ public class TagTreeModel implements TreeModel { || t instanceof PlaceObject3Tag || t instanceof PlaceObject4Tag || t instanceof RemoveObjectTag - || t instanceof RemoveObject2Tag)) { + || t instanceof RemoveObject2Tag + || t instanceof FrameLabelTag)) { others.add(new TagNode(t)); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/TreeNodeType.java b/trunk/src/com/jpexs/decompiler/flash/gui/TreeNodeType.java index 35d71ff4a..bcb96f567 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/TreeNodeType.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/TreeNodeType.java @@ -37,6 +37,7 @@ public enum TreeNodeType { MOVIE, SOUND, BINARY_DATA, + OTHER_TAG, FOLDER, FOLDER_OPEN, BUNDLE_ZIP, diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/othertag16.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/othertag16.png new file mode 100644 index 0000000000000000000000000000000000000000..6fb1ca40cc062342034115807ecd38d8eab441bf GIT binary patch literal 597 zcmV-b0;>IqP)!8Fm6rp8!Gt#nIkpryMz zp+B}?XC}5O&{ALWcJ|HN&v)LwnNjFJERjgSbzK4=V?|LY5C|xp_*&C-9hS{dvux?r znuRm&@pv3U;N~!RY3T{2(`ib7`%0!+pt0NICUSx9Y4NH ztOfGj_mR&xD_SU<=<#^^m9632woonPKpXqeK9=No@;i%M_5j(#L*$PNP*qj@#mt3W z5OCeG!O8{D`X07E6fw8+1Do%UL92WCV;-SgDnm3@z=Dwiu~=+I7b`ms8mA=*hu@ia zxcd|HyBQfbDrH!e3XC4OEAS#3h2t>T)l<;ZB%ZxBv6#$Zfjh0g2AnGD%z>z|7w!r~ zxj?hg1hZ-YI|DsW;?bKtXpO@S2RsQwy9##&L_*^qxNR4$a|W~+XeGgOb?$BG1K?f( zDWa+oNOPO~(UPy4rVfNJ3rLYjT{fl9 jTxZqq+}W@S{t7SvZ+>sIY^)>m00000NkvXXu0mjfGrAAJ literal 0 HcmV?d00001 diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/graphics/saveasexe16.png b/trunk/src/com/jpexs/decompiler/flash/gui/graphics/saveasexe16.png new file mode 100644 index 0000000000000000000000000000000000000000..dd01478592cac5ce0aa89ca129cb47e741414d7f GIT binary patch literal 658 zcmV;D0&V??P)Ywih|fiEYw6Jm|zGOZ|`>Zy%~$WL=>Cgz?AdN|Nk@apCzX*&s;ikboBO0 zVl^{B6;mZ>z|>GvECkdH3xS|YUpa5h%`IM;oor0UqlZVQN|l-$sBCI+t(Al+U^-56 zbIHojO-pa*<^W;~#?A5Fn+BY_HBSLB1t9YQ15Ayepctw~P$hUP+LSC9y9Rp+8VUer zMVd|!Gt3Dl#?|{D=!PxXhhL3;bxdh!;Q2Kc1M(&u9o}P(lc(DnYA6lu+6{cz1zq)tv~A<>U+J58lI3 zAxSgh*~vx&X#D+Yr?0=V;XxRvuW@|;82#lTaIo4LVtdU~EkoSR?Vokv;wNFX_4{THLs?EdT%j07*qoM6N<$f`Y9UbN~PV literal 0 HcmV?d00001