From 99eb31b3125bc70b7d7c411a5b613e50d544fbc8 Mon Sep 17 00:00:00 2001 From: Skylot Date: Fri, 27 Dec 2019 18:19:24 +0000 Subject: [PATCH] fix(gui): add dots for progress titles --- .../src/main/java/jadx/gui/jobs/BackgroundExecutor.java | 5 +++-- jadx-gui/src/main/java/jadx/gui/jobs/DecompileJob.java | 2 +- jadx-gui/src/main/java/jadx/gui/jobs/IndexJob.java | 2 +- jadx-gui/src/main/java/jadx/gui/ui/ProgressPanel.java | 8 ++++++++ 4 files changed, 13 insertions(+), 4 deletions(-) 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 7aaee093b..1a27560df 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 0df98ad4f..aa7230c55 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 c595366e3..52c4bbb60 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 f118d8ff5..632063320 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); }