From: Ben Soares Date: Fri, 21 Jun 2019 09:01:30 +0000 (+0100) Subject: JAL-3322 Adding a configurable getdown version number display (above appbase) to... X-Git-Tag: Release_2_11_0~3^2~1^2~10 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=f7545136de21902cc4226a97c43c3d22a4e68f47;p=jalview.git JAL-3322 Adding a configurable getdown version number display (above appbase) to getdown splashscreen --- diff --git a/getdown/lib/getdown-core-1.8.3-SNAPSHOT.jar b/getdown/lib/getdown-core.jar similarity index 70% rename from getdown/lib/getdown-core-1.8.3-SNAPSHOT.jar rename to getdown/lib/getdown-core.jar index 022c067..550c83f 100644 Binary files a/getdown/lib/getdown-core-1.8.3-SNAPSHOT.jar and b/getdown/lib/getdown-core.jar differ diff --git a/getdown/lib/getdown-launcher.jar b/getdown/lib/getdown-launcher.jar index 43d56f9..687317f 100644 Binary files a/getdown/lib/getdown-launcher.jar and b/getdown/lib/getdown-launcher.jar differ diff --git a/getdown/src/getdown/ant/pom.xml b/getdown/src/getdown/ant/pom.xml index f8231aa..3529aa4 100644 --- a/getdown/src/getdown/ant/pom.xml +++ b/getdown/src/getdown/ant/pom.xml @@ -4,7 +4,7 @@ com.threerings.getdown getdown - 1.8.3-SNAPSHOT + 1.0B-JVL-1.8.3-SNAPSHOT getdown-ant diff --git a/getdown/src/getdown/core/pom.xml b/getdown/src/getdown/core/pom.xml index efec8b6..c1e7c23 100644 --- a/getdown/src/getdown/core/pom.xml +++ b/getdown/src/getdown/core/pom.xml @@ -4,7 +4,7 @@ com.threerings.getdown getdown - 1.8.3-SNAPSHOT + 1.0B-JVL-1.8.3-SNAPSHOT getdown-core 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 3497b21..d446e20 100644 --- 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 @@ -151,6 +151,9 @@ public class Application /** Whether to display the appbase. */ public final boolean displayAppbase; + /** Whether to display the version. */ + public final boolean displayVersion; + /** The minimum number of seconds to display the GUI. This is to prevent the GUI from * flashing up on the screen and immediately disappearing, which can be confusing to the * user. */ @@ -169,7 +172,8 @@ public class Application ", pb=" + progressBar + ", srect=" + status + ", st=" + statusText + ", shadow=" + textShadow + ", err=" + installError + ", nrect=" + patchNotes + ", notes=" + patchNotesUrl + ", stepPercentages=" + stepPercentages + - ", hideProgressText=" + hideProgressText + ", keepOnTop=" + keepOnTop + ", minShow=" + minShowSeconds + "]"; + ", hideProgressText=" + hideProgressText + ", keepOnTop=" + keepOnTop + ", minShow=" + minShowSeconds + + ", displayAppbase=" + displayAppbase + ", displayVersion=" + displayVersion + "]"; } public UpdateInterface (Config config) @@ -180,6 +184,7 @@ public class Application this.hideProgressText = config.getBoolean("ui.hide_progress_text"); this.keepOnTop = config.getBoolean("ui.keep_on_top"); this.displayAppbase = config.getBoolean("ui.display_appbase"); + this.displayVersion = config.getBoolean("ui.display_version"); this.minShowSeconds = config.getInt("ui.min_show_seconds", 5); this.progressBar = config.getColor("ui.progress_bar", 0x6699CC); this.status = config.getRect("ui.status", new Rectangle(5, 25, 500, 100)); diff --git a/getdown/src/getdown/launcher/pom.xml b/getdown/src/getdown/launcher/pom.xml index e77061a..5b6dfcd 100644 --- a/getdown/src/getdown/launcher/pom.xml +++ b/getdown/src/getdown/launcher/pom.xml @@ -4,7 +4,7 @@ com.threerings.getdown getdown - 1.8.3-SNAPSHOT + 1.0B-JVL-1.8.3-SNAPSHOT getdown-launcher diff --git a/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/StatusPanel.java b/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/StatusPanel.java index 5526568..f74546a 100644 --- a/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/StatusPanel.java +++ b/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/StatusPanel.java @@ -28,6 +28,7 @@ import com.samskivert.swing.util.SwingUtil; import com.samskivert.util.Throttle; import com.threerings.getdown.data.Application.UpdateInterface; +import com.threerings.getdown.data.Build; import com.threerings.getdown.util.MessageUtil; import com.threerings.getdown.util.Rectangle; import com.threerings.getdown.util.StringUtil; @@ -273,8 +274,12 @@ public final class StatusPanel extends JComponent } StringBuilder labelText = new StringBuilder(); + if (_ifc.displayVersion) { + labelText.append("version: "+Build.version()); + labelText.append("\n"); + } if (_ifc.displayAppbase) { - labelText.append(" appbase: "+_appbase); + labelText.append("appbase: "+_appbase); labelText.append("\n"); } labelText.append(status); diff --git a/getdown/src/getdown/mvn_cmd b/getdown/src/getdown/mvn_cmd index 0ce786f..03875e6 100644 --- a/getdown/src/getdown/mvn_cmd +++ b/getdown/src/getdown/mvn_cmd @@ -1 +1 @@ -mvn clean package -Dgetdown.host.whitelist="jalview.org,*.jalview.org" && cp launcher/target/getdown-launcher-1.8.3-SNAPSHOT.jar ../../../getdown/lib/getdown-launcher.jar && cp core/target/getdown-core-1.8.3-SNAPSHOT.jar ../../../getdown/lib/getdown-core-1.8.3-SNAPSHOT.jar && cp core/target/getdown-core-1.8.3-SNAPSHOT.jar ../../../j8lib/getdown-core.jar && cp core/target/getdown-core-1.8.3-SNAPSHOT.jar ../../../j11lib/getdown-core.jar +VERSION=1.0B-JVL-1.8.3-SNAPSHOT; mvn clean package -Dgetdown.host.whitelist="jalview.org,*.jalview.org" && cp launcher/target/getdown-launcher-$VERSION.jar ../../../getdown/lib/getdown-launcher.jar && cp core/target/getdown-core-$VERSION.jar ../../../getdown/lib/getdown-core.jar && cp core/target/getdown-core-$VERSION.jar ../../../j8lib/getdown-core.jar && cp core/target/getdown-core-$VERSION.jar ../../../j11lib/getdown-core.jar diff --git a/getdown/src/getdown/pom.xml b/getdown/src/getdown/pom.xml index 78d67b0..a13b662 100644 --- a/getdown/src/getdown/pom.xml +++ b/getdown/src/getdown/pom.xml @@ -10,7 +10,7 @@ com.threerings.getdown getdown pom - 1.8.3-SNAPSHOT + 1.0B-JVL-1.8.3-SNAPSHOT getdown An application installer and updater. diff --git a/gradle.properties b/gradle.properties index 9cf137b..94fe3c7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -52,7 +52,7 @@ getdown_app_dir = dist getdown_files_dir = getdown/files getdown_launcher = getdown/lib/getdown-launcher.jar getdown_launcher_new = getdown-launcher-new.jar -getdown_core = getdown/lib/getdown-core-1.8.3-SNAPSHOT.jar +getdown_core = getdown/lib/getdown-core.jar getdown_launch_jvl = channel_launch.jvl getdown_current_build_properties = build_properties getdown_install_build_properties = build_properties.install @@ -67,6 +67,7 @@ getdown_txt_title = Jalview getdown_txt_ui.name = Jalview getdown_txt_ui.keep_on_top = true getdown_txt_ui.display_appbase = true +getdown_txt_ui.display_version = true getdown_txt_ui.background = FFFFFF getdown_txt_ui.background_image = resources/images/jalview_logo_background_getdown-640x480.png getdown_txt_ui.instant_background_image = resources/images/jalview_logo_background_getdown_instant-640x480.png diff --git a/j11lib/getdown-core.jar b/j11lib/getdown-core.jar index 965e75d..550c83f 100644 Binary files a/j11lib/getdown-core.jar and b/j11lib/getdown-core.jar differ diff --git a/j8lib/getdown-core.jar b/j8lib/getdown-core.jar index 965e75d..550c83f 100644 Binary files a/j8lib/getdown-core.jar and b/j8lib/getdown-core.jar differ