diff --git a/jadx-gui/src/main/java/jadx/gui/jobs/BackgroundExecutor.java b/jadx-gui/src/main/java/jadx/gui/jobs/BackgroundExecutor.java index 7aaee093b868a694d7e12c04d13f926520af4b3b..1a27560dfaabc61fad54ab0a015c01f3734185a2 100644 --- a/jadx-gui/src/main/java/jadx/gui/jobs/BackgroundExecutor.java +++ b/jadx-gui/src/main/java/jadx/gui/jobs/BackgroundExecutor.java @@ -79,7 +79,7 @@ public class BackgroundExecutor { @Override protected Boolean doInBackground() throws Exception { - progressPane.changeLabel(this, task.getTitle() + ':'); + progressPane.changeLabel(this, task.getTitle() + "… "); progressPane.changeCancelBtnVisible(this, task.canBeCanceled()); progressPane.changeVisibility(this, true); @@ -125,7 +125,8 @@ public class BackgroundExecutor { } if (isCancelled()) { executor.shutdownNow(); - progressPane.changeLabel(this, task.getTitle() + " (Canceling):"); + progressPane.changeLabel(this, task.getTitle() + " (Canceling)… "); + progressPane.changeIndeterminate(this, true); // force termination executor.awaitTermination(5, TimeUnit.SECONDS); return false; diff --git a/jadx-gui/src/main/java/jadx/gui/jobs/DecompileJob.java b/jadx-gui/src/main/java/jadx/gui/jobs/DecompileJob.java index 0df98ad4febc902caabc96217e42a3542d053141..aa7230c5587c7861b0edf54b24fcd040f7ba4c53 100644 --- a/jadx-gui/src/main/java/jadx/gui/jobs/DecompileJob.java +++ b/jadx-gui/src/main/java/jadx/gui/jobs/DecompileJob.java @@ -19,6 +19,6 @@ public class DecompileJob extends BackgroundJob { @Override public String getInfoString() { - return NLS.str("progress.decompile"); + return NLS.str("progress.decompile") + "… "; } } diff --git a/jadx-gui/src/main/java/jadx/gui/jobs/IndexJob.java b/jadx-gui/src/main/java/jadx/gui/jobs/IndexJob.java index c595366e386549a447d9e4c11db0f602fc7f8089..52c4bbb60a3546d00d1438025c4faae7344c085c 100644 --- a/jadx-gui/src/main/java/jadx/gui/jobs/IndexJob.java +++ b/jadx-gui/src/main/java/jadx/gui/jobs/IndexJob.java @@ -68,6 +68,6 @@ public class IndexJob extends BackgroundJob { @Override public String getInfoString() { - return NLS.str("progress.index"); + return NLS.str("progress.index") + "… "; } } diff --git a/jadx-gui/src/main/java/jadx/gui/ui/ProgressPanel.java b/jadx-gui/src/main/java/jadx/gui/ui/ProgressPanel.java index f118d8ff56f0587d5da10ad28e95a70876b485e0..632063320e46e958b2e45718e3baa220b4162b9a 100644 --- a/jadx-gui/src/main/java/jadx/gui/ui/ProgressPanel.java +++ b/jadx-gui/src/main/java/jadx/gui/ui/ProgressPanel.java @@ -79,6 +79,10 @@ public class ProgressPanel extends JPanel implements PropertyChangeListener { setVisible(((Boolean) evt.getNewValue())); break; + case "indeterminate": + setIndeterminate(((Boolean) evt.getNewValue())); + break; + case "cancel-visible": cancelButton.setVisible(((Boolean) evt.getNewValue())); break; @@ -97,6 +101,10 @@ public class ProgressPanel extends JPanel implements PropertyChangeListener { task.firePropertyChange("label", null, label); } + public void changeIndeterminate(SwingWorker task, boolean indeterminate) { + task.firePropertyChange("indeterminate", null, indeterminate); + } + public void changeVisibility(SwingWorker task, boolean visible) { task.firePropertyChange("visible", null, visible); }