From 0e126daace5b234169ba46fc6f38153198b09be8 Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Sun, 8 May 2016 04:12:16 +0800 Subject: [PATCH] Refactor ProgressDialog --- source/net/filebot/ui/rename/RenameAction.java | 4 +++- source/net/filebot/util/ui/ProgressMonitor.java | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/net/filebot/ui/rename/RenameAction.java b/source/net/filebot/ui/rename/RenameAction.java index 24c11978..be0d8633 100644 --- a/source/net/filebot/ui/rename/RenameAction.java +++ b/source/net/filebot/ui/rename/RenameAction.java @@ -97,7 +97,9 @@ class RenameAction extends AbstractAction { } else { // call and wait RenameWorker worker = new RenameWorker(renameMap, renameLog, action); - ProgressMonitor.runTask(action.getDisplayName(), String.format("%s %d %s. This may take a while.", action.getDisplayName() + "ing", renameMap.size(), renameMap.size() == 1 ? "file" : "files"), worker).get(); + String title = String.format("%s - %s", getApplicationName(), action.getDisplayName()); + String message = String.format("%s %d %s. This may take a while.", action.getDisplayName() + "ing", renameMap.size(), renameMap.size() == 1 ? "file" : "files"); + ProgressMonitor.runTask(title, message, worker).get(); } } catch (CancellationException e) { debug.finest(e::toString); diff --git a/source/net/filebot/util/ui/ProgressMonitor.java b/source/net/filebot/util/ui/ProgressMonitor.java index ac227f2d..9e147dea 100644 --- a/source/net/filebot/util/ui/ProgressMonitor.java +++ b/source/net/filebot/util/ui/ProgressMonitor.java @@ -12,10 +12,8 @@ import java.util.logging.Level; import org.controlsfx.dialog.ProgressDialog; import javafx.concurrent.Task; -import javafx.event.EventHandler; import javafx.stage.Modality; import javafx.stage.Stage; -import javafx.stage.WindowEvent; public class ProgressMonitor {