From ba61e8af0496578f22c99f32c0cf794d4a9636cb Mon Sep 17 00:00:00 2001 From: "honfika@gmail.com" Date: Sun, 14 Jun 2015 11:29:28 +0200 Subject: [PATCH] sprite export settings added to export dialog --- .../flash/console/CommandLineArgumentParser.java | 4 ++-- src/com/jpexs/decompiler/flash/gui/ExportDialog.java | 4 ++++ .../decompiler/flash/gui/locales/ExportDialog.properties | 9 +++++++++ .../flash/gui/locales/ExportDialog_hu.properties | 9 +++++++++ 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java b/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java index c87cbc171..bd32dc39d 100644 --- a/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java +++ b/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java @@ -1142,8 +1142,6 @@ public class CommandLineArgumentParser { } boolean parallel = Configuration.parallelSpeedUp.get(); - String scriptsFolder = Path.combine(outDir, ScriptExportSettings.EXPORT_FOLDER_NAME); - Path.createDirectorySafe(new File(scriptsFolder)); Boolean singleScriptFile = parseBooleanConfigValue(formats.get("singlescript")); if (singleScriptFile == null) { singleScriptFile = Configuration.scriptExportSingleFile.get(); @@ -1161,6 +1159,8 @@ public class CommandLineArgumentParser { as3classes = parseSelectClassOld(args); } + String scriptsFolder = Path.combine(outDir, ScriptExportSettings.EXPORT_FOLDER_NAME); + Path.createDirectorySafe(new File(scriptsFolder)); String singleFileName = Path.combine(scriptsFolder, swf.getShortFileName() + scriptExportSettings.getFileExtension()); try (FileTextWriter writer = scriptExportSettings.singleFile ? new FileTextWriter(Configuration.getCodeFormatting(), new FileOutputStream(singleFileName)) : null) { scriptExportSettings.singleFileWriter = writer; diff --git a/src/com/jpexs/decompiler/flash/gui/ExportDialog.java b/src/com/jpexs/decompiler/flash/gui/ExportDialog.java index f1a6c51ec..c1128f75d 100644 --- a/src/com/jpexs/decompiler/flash/gui/ExportDialog.java +++ b/src/com/jpexs/decompiler/flash/gui/ExportDialog.java @@ -28,6 +28,7 @@ import com.jpexs.decompiler.flash.exporters.modes.MovieExportMode; import com.jpexs.decompiler.flash.exporters.modes.ScriptExportMode; import com.jpexs.decompiler.flash.exporters.modes.ShapeExportMode; import com.jpexs.decompiler.flash.exporters.modes.SoundExportMode; +import com.jpexs.decompiler.flash.exporters.modes.SpriteExportMode; import com.jpexs.decompiler.flash.exporters.modes.SymbolClassExportMode; import com.jpexs.decompiler.flash.exporters.modes.TextExportMode; import com.jpexs.decompiler.flash.gui.tagtree.TagTreeModel; @@ -76,6 +77,7 @@ public class ExportDialog extends AppDialog { TagTreeModel.FOLDER_SCRIPTS, TagTreeModel.FOLDER_BINARY_DATA, TagTreeModel.FOLDER_FRAMES, + TagTreeModel.FOLDER_SPRITES, TagTreeModel.FOLDER_BUTTONS, TagTreeModel.FOLDER_FONTS, TagTreeModel.FOLDER_MORPHSHAPES, @@ -92,6 +94,7 @@ public class ExportDialog extends AppDialog { {ASMSource.class, ScriptPack.class}, {DefineBinaryDataTag.class}, {Frame.class}, + {Frame.class}, {ButtonTag.class}, {FontTag.class}, {MorphShapeTag.class}, @@ -108,6 +111,7 @@ public class ExportDialog extends AppDialog { ScriptExportMode.class, BinaryDataExportMode.class, FrameExportMode.class, + SpriteExportMode.class, ButtonExportMode.class, FontExportMode.class, MorphShapeExportMode.class, diff --git a/src/com/jpexs/decompiler/flash/gui/locales/ExportDialog.properties b/src/com/jpexs/decompiler/flash/gui/locales/ExportDialog.properties index f8e3c485d..7912dab9b 100644 --- a/src/com/jpexs/decompiler/flash/gui/locales/ExportDialog.properties +++ b/src/com/jpexs/decompiler/flash/gui/locales/ExportDialog.properties @@ -67,6 +67,15 @@ frames.canvas = HTML5 Canvas frames.pdf = PDF frames.bmp = BMP +sprites = Sprites +sprites.png = PNG +sprites.gif = GIF +sprites.avi = AVI +sprites.svg = SVG +sprites.canvas = HTML5 Canvas +sprites.pdf = PDF +sprites.bmp = BMP + buttons = Buttons buttons.png = PNG buttons.svg = SVG diff --git a/src/com/jpexs/decompiler/flash/gui/locales/ExportDialog_hu.properties b/src/com/jpexs/decompiler/flash/gui/locales/ExportDialog_hu.properties index d0b06e7b6..e5b2eb279 100644 --- a/src/com/jpexs/decompiler/flash/gui/locales/ExportDialog_hu.properties +++ b/src/com/jpexs/decompiler/flash/gui/locales/ExportDialog_hu.properties @@ -67,6 +67,15 @@ frames.canvas = HTML5 V\u00e1szon frames.pdf = PDF frames.bmp = BMP +sprites = Szpr\u00e1jtok +sprites.png = PNG +sprites.gif = GIF +sprites.avi = AVI +sprites.svg = SVG +sprites.canvas = HTML5 V\u00e1szon +sprites.pdf = PDF +sprites.bmp = BMP + buttons = Gombok buttons.png = PNG buttons.svg = SVG