From 626a5fa17635940571117b34ae2379d5a1bae8da Mon Sep 17 00:00:00 2001
From: Marcus Stenberg <84939319+Fim-84@users.noreply.github.com>
Date: Fri, 5 May 2023 12:46:31 +0200
Subject: [PATCH] MS: added bootstrap version to splashscreen (#179)

---
 .../main/java/org/unigrid/janus/view/SplashScreen.java   | 4 ++++
 .../resources/org/unigrid/janus/view/splashScreen.fxml   | 9 +++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/fx/src/main/java/org/unigrid/janus/view/SplashScreen.java b/fx/src/main/java/org/unigrid/janus/view/SplashScreen.java
index 84cbf4ce..02382872 100644
--- a/fx/src/main/java/org/unigrid/janus/view/SplashScreen.java
+++ b/fx/src/main/java/org/unigrid/janus/view/SplashScreen.java
@@ -49,6 +49,7 @@ of the License (see COPYING and COPYING.addendum).
 import org.apache.commons.io.monitor.FileAlterationObserver;
 import org.kordamp.ikonli.javafx.FontIcon;
 import org.unigrid.janus.controller.SplashScreenController;
+import org.unigrid.janus.model.BootstrapModel;
 import org.unigrid.janus.model.DataDirectory;
 import org.unigrid.janus.model.JanusModel;
 import org.unigrid.janus.model.cdi.Eager;
@@ -80,6 +81,7 @@ public class SplashScreen implements Window {
 	private Label text;
 	private Label status;
 	private Label lbl;
+	private Label lblBootstrapVersion;
 	private FileAlterationMonitor monitor = new FileAlterationMonitor(2000);
 
 	@PostConstruct
@@ -93,6 +95,8 @@ private void init() {
 	public void show() {
 		lbl = (Label) stageSplash.getScene().lookup("#verLbl");
 		lbl.setText("version: ".concat(janusModel.getVersion()));
+		lblBootstrapVersion = (Label) stageSplash.getScene().lookup("#lblBootstrapVersion");
+		lblBootstrapVersion.setText("installer: ".concat(BootstrapModel.getBootstrapVer()));
 
 		try {
 			stageSplash.show();
diff --git a/fx/src/main/resources/org/unigrid/janus/view/splashScreen.fxml b/fx/src/main/resources/org/unigrid/janus/view/splashScreen.fxml
index 617504e9..a5d31773 100644
--- a/fx/src/main/resources/org/unigrid/janus/view/splashScreen.fxml
+++ b/fx/src/main/resources/org/unigrid/janus/view/splashScreen.fxml
@@ -18,7 +18,7 @@
 <?import javafx.stage.Stage?>
 <?import org.kordamp.ikonli.javafx.FontIcon?>
 
-<Stage height="220.0" title="Unigrid Janus Splash Screen" xmlns="http://javafx.com/javafx/" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.unigrid.janus.controller.SplashScreenController">
+<Stage height="220.0" title="Unigrid Janus Splash Screen" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.unigrid.janus.controller.SplashScreenController">
     <scene>
         <Scene>
             <root>
@@ -61,13 +61,18 @@
                               </Label>
                            </children>
                         </FlowPane>
-                        <FlowPane alignment="CENTER" columnHalignment="CENTER" prefHeight="20.0" prefWidth="90.0" GridPane.columnIndex="2" GridPane.rowIndex="4">
+                        <FlowPane alignment="CENTER" columnHalignment="CENTER" orientation="VERTICAL" prefHeight="20.0" prefWidth="90.0" GridPane.columnIndex="2" GridPane.rowIndex="4">
                            <children>
                               <Label fx:id="verLbl" text="version:" textAlignment="CENTER" textFill="#ababab">
                                  <font>
                                     <Font size="9.0" />
                                  </font>
                               </Label>
+                              <Label fx:id="lblBootstrapVersion" text="version:" textAlignment="CENTER" textFill="#ababab">
+                                 <font>
+                                    <Font size="9.0" />
+                                 </font>
+                              </Label>
                            </children>
                         </FlowPane>
                         <TextArea fx:id="debugTxt" maxHeight="200.0" visible="false" GridPane.columnSpan="3" GridPane.rowIndex="6">