diff --git a/CHANGELOG.md b/CHANGELOG.md index fe40c09e2..7ec2810fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +### Added +- "Starting Flash content debugger" in status bar when debugging starts + ### Fixed - Resize export dialogs labels to match localized strings - AS1/2 debugger - deletion of SWD file after debugging diff --git a/src/com/jpexs/decompiler/flash/gui/Main.java b/src/com/jpexs/decompiler/flash/gui/Main.java index 623940944..5c65af12c 100644 --- a/src/com/jpexs/decompiler/flash/gui/Main.java +++ b/src/com/jpexs/decompiler/flash/gui/Main.java @@ -497,6 +497,7 @@ public class Main { instrSWF.addEventListener(prepEventListener); try { File fTempFile = new File(instrSWF.getFile()); + startWork(AppStrings.translate("work.injecting_debuginfo"), swfPrepareWorker, true); instrSWF.enableDebugging(true, new File("."), true, doPCode, swfHash); try (FileOutputStream fos = new FileOutputStream(fTempFile)) { instrSWF.saveTo(fos); @@ -534,6 +535,7 @@ public class Main { } } }); + startWork(AppStrings.translate("work.generating_swd"), swfPrepareWorker, true); if (doPCode) { instrSWF.generatePCodeSwdFile(swdFile, getPackBreakPoints(true, swfHash), swfHash); } else { @@ -830,6 +832,7 @@ public class Main { runningPreparation = new SwfDebugPrepare(doPCode); } Main.stopWork(); + Main.startWork(AppStrings.translate("work.debugging.start") + "...", null, true); Main.startDebugger(); runPlayer(AppStrings.translate("work.debugging.wait"), playerLocation, fTempFile.getAbsolutePath(), flashVars); } @@ -1004,10 +1007,16 @@ public class Main { } public static void startWork(String name, CancellableWorker worker) { - startWork(name, -1, worker); + startWork(name, -1, worker, false); + } + public static void startWork(String name, CancellableWorker worker, boolean force) { + startWork(name, -1, worker, force); } public static void startWork(final String name, final int percent, final CancellableWorker worker) { + startWork(name, percent, worker, false); + } + public static void startWork(final String name, final int percent, final CancellableWorker worker, boolean force) { working = true; long nowTime = System.currentTimeMillis(); if (mainFrame != null && nowTime < lastTimeStartWork + 1000) { @@ -1036,6 +1045,7 @@ public class Main { public static void stopWork() { working = false; + lastTimeStartWork = 0; View.execInEventDispatchLater(() -> { if (mainFrame != null) { mainFrame.getPanel().setWorkStatus("", null); diff --git a/src/com/jpexs/decompiler/flash/gui/locales/MainFrame.properties b/src/com/jpexs/decompiler/flash/gui/locales/MainFrame.properties index 1d3f94c59..be4a5b61d 100644 --- a/src/com/jpexs/decompiler/flash/gui/locales/MainFrame.properties +++ b/src/com/jpexs/decompiler/flash/gui/locales/MainFrame.properties @@ -1050,4 +1050,7 @@ zoom = Zoom zoom.hint = Zoom level. Click to change. zoom.enter = Enter zoom percentage value: -contextmenu.showInEasy = Show in Simple editor \ No newline at end of file +contextmenu.showInEasy = Show in Simple editor + +#after 23.0.1 +work.debugging.start = Starting Flash content debugger \ No newline at end of file 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 9c4bd676c..f4060bf59 100644 --- a/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_cs.properties +++ b/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_cs.properties @@ -1051,3 +1051,6 @@ zoom.hint = \u00darove\u0148 p\u0159ibl\u00ed\u017een\u00ed. Klikn\u011bte pro z zoom.enter = Zadejte hodnotu p\u0159ibl\u00ed\u017een\u00ed v procentech: contextmenu.showInEasy = Zobrazit v Jednoduch\u00e9m editoru + +#after 23.0.1 +work.debugging.start = Spou\u0161t\u00ed se Flash content debugger \ No newline at end of file