JAL-3322 Once background displayed, allow asynchronous progress setting

[jalview.git] / getdown / src / getdown / core / src / main / java / com / threerings / getdown / data / Application.java

diff --git a/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
index c851c24..bbac55f 100644 (file)
--- a/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
+++ b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
@@ -70,13 +70,18 @@ public class Application
         public enum Step
         {
             UPDATE_JAVA(10),
-            VERIFY_METADATA(15, 65, 95),
-            DOWNLOAD(40),
+            //VERIFY_METADATA(15, 65, 95),
+            VERIFY_METADATA(15, 45, 90),
+            DOWNLOAD(50),
             PATCH(60),
-            VERIFY_RESOURCES(70, 97),
-            REDOWNLOAD_RESOURCES(90),
-            UNPACK(98),
-            LAUNCH(99);
+            //VERIFY_RESOURCES(70, 97),
+            VERIFY_RESOURCES(30, 60),
+            //REDOWNLOAD_RESOURCES(90),
+            REDOWNLOAD_RESOURCES(70),
+            //UNPACK(98),
+            UNPACK(90),
+            //LAUNCH(99);
+            LAUNCH(100);
 
             /** What is the final percent value for this step? */
             public final List<Integer> defaultPercents;
@@ -145,9 +150,12 @@ public class Application
         /** Whether progress text should be hidden or not. */
         public final boolean hideProgressText;
 
-        /** Whether the splash screen should retain focus. */
+        /** Whether the splash screen should update non-asynchronously before being shown. */
         public final boolean progressSync;
 
+        /** Whether the splash screen should update non-asynchronously after being shown. */
+        public final boolean progressSyncAfterShown;
+
         /** Whether the splash screen should retain focus. */
         public final boolean keepOnTop;
 
@@ -175,7 +183,8 @@ public class Application
                 ", pb=" + progressBar + ", srect=" + status + ", st=" + statusText +
                 ", shadow=" + textShadow + ", err=" + installError + ", nrect=" + patchNotes +
                 ", notes=" + patchNotesUrl + ", stepPercentages=" + stepPercentages +
-                ", hideProgressText=" + hideProgressText + ", keepOnTop=" + keepOnTop + ", progressSync=" + progressSync + ", minShow=" + minShowSeconds +
+                ", hideProgressText=" + hideProgressText + ", keepOnTop=" + keepOnTop + ", progressSync=" + progressSync +
+                ", progressSyncAfterShown=" + progressSyncAfterShown + ", minShow=" + minShowSeconds +
                 ", displayAppbase=" + displayAppbase + ", displayVersion=" + displayVersion + "]";
         }
 
@@ -186,6 +195,7 @@ public class Application
             this.progressText = config.getColor("ui.progress_text", Color.BLACK);
             this.hideProgressText =  config.getBoolean("ui.hide_progress_text");
             this.progressSync =  config.getBoolean("ui.progress_sync");
+            this.progressSyncAfterShown =  config.getBoolean("ui.progress_sync_after_shown");
             this.keepOnTop =  config.getBoolean("ui.keep_on_top");
             this.displayAppbase =  config.getBoolean("ui.display_appbase");
             this.displayVersion =  config.getBoolean("ui.display_version");