From 86dd67860484e33426d7b847eef286dea7e47f45 Mon Sep 17 00:00:00 2001 From: drdev Date: Fri, 30 May 2014 00:46:46 +0000 Subject: [PATCH] Show progress trail for scanning for existing items --- .../src/main/java/forge/download/GuiDownloader.java | 2 +- .../src/forge/screens/settings/GuiDownloader.java | 12 +++++++++++- .../main/java/forge/download/GuiDownloadService.java | 5 ++++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/download/GuiDownloader.java b/forge-gui-desktop/src/main/java/forge/download/GuiDownloader.java index 223a8a32af8..7b5559e9dd0 100644 --- a/forge-gui-desktop/src/main/java/forge/download/GuiDownloader.java +++ b/forge-gui-desktop/src/main/java/forge/download/GuiDownloader.java @@ -95,7 +95,7 @@ public class GuiDownloader extends DefaultBoundedRangeModel { pnl.add(pnlDialog, "w 400px!, h 350px!, ax center, ay center"); SOverlayUtils.showOverlay(); - service.initialize(txtAddress, txtPort, progressBar, btnStart, cmdClose, new Runnable() { + service.initialize(txtAddress, txtPort, progressBar, btnStart, cmdClose, null, new Runnable() { @Override public void run() { fireStateChanged(); diff --git a/forge-gui-mobile/src/forge/screens/settings/GuiDownloader.java b/forge-gui-mobile/src/forge/screens/settings/GuiDownloader.java index a83ff7199dc..71264fe66c4 100644 --- a/forge-gui-mobile/src/forge/screens/settings/GuiDownloader.java +++ b/forge-gui-mobile/src/forge/screens/settings/GuiDownloader.java @@ -19,6 +19,8 @@ package forge.screens.settings; import java.net.Proxy; +import com.badlogic.gdx.Gdx; + import forge.UiCommand; import forge.assets.FSkinFont; import forge.download.GuiDownloadService; @@ -74,11 +76,19 @@ public class GuiDownloader extends FDialog { btnCancel.setCommand(cmdClose); progressBar.reset(); + progressBar.setShowProgressTrail(true); progressBar.setDescription("Scanning for existing items..."); + Gdx.graphics.setContinuousRendering(true); show(); - service.initialize(txtAddress, txtPort, progressBar, btnStart, cmdClose, null); + service.initialize(txtAddress, txtPort, progressBar, btnStart, cmdClose, new Runnable() { + @Override + public void run() { + Gdx.graphics.setContinuousRendering(false); + progressBar.setShowProgressTrail(false); + } + }, null); } private class ProxyHandler implements FEventHandler { diff --git a/forge-gui/src/main/java/forge/download/GuiDownloadService.java b/forge-gui/src/main/java/forge/download/GuiDownloadService.java index 36e224a7d3c..b81f9dac86e 100644 --- a/forge-gui/src/main/java/forge/download/GuiDownloadService.java +++ b/forge-gui/src/main/java/forge/download/GuiDownloadService.java @@ -78,7 +78,7 @@ public abstract class GuiDownloadService implements Runnable { protected GuiDownloadService() { } - public void initialize(ITextField txtAddress0, ITextField txtPort0, IProgressBar progressBar0, IButton btnStart0, UiCommand cmdClose0, Runnable onUpdate0) { + public void initialize(ITextField txtAddress0, ITextField txtPort0, IProgressBar progressBar0, IButton btnStart0, UiCommand cmdClose0, final Runnable onReadyToStart, Runnable onUpdate0) { txtAddress = txtAddress0; txtPort = txtPort0; progressBar = progressBar0; @@ -99,6 +99,9 @@ public abstract class GuiDownloadService implements Runnable { FThreads.invokeInEdtLater(new Runnable() { @Override public void run() { + if (onReadyToStart != null) { + onReadyToStart.run(); + } readyToStart(); } });