Public

Project privacy set to public. By default, its content is available to everyone (authenticated or not). Please note that more restrictive permissions might exist on some items.

client

Clone or download

Bumped javafx to 17-ea+12, Added Java and JavaFX version Label to Settings

Download Browse
+37 −12
Debayan Sutradhar (rnayabed) 2021-06-22 12:26
Debayan Sutradhar (rnayabed) 2021-06-22 12:26
d3daed4265c6a8d55d55eaf3523f39249e921258
193c26680daa46cc3f4eecdaac47e9384dcdbd1c
git #client/d3daed4265c6a8d55d55eaf3523f39249e921258

Modified Files

List
Side by side diff
M .github/workflows/build.yml
+8 −8
--- 'a/.github/workflows/build.yml'
+++ b/.github/workflows/build.yml
@@ -19,8 +19,8 @@ jobs:
- name: Setup JavaFX
run: |
cd /tmp
- axel -n 8 https://download2.gluonhq.com/openjfx/17/openjfx-17-ea+11_linux-x64_bin-jmods.zip
- unzip /tmp/openjfx-17-ea+11_linux-x64_bin-jmods.zip -d /tmp
+ axel -n 8 https://download2.gluonhq.com/openjfx/17/openjfx-17-ea+12_linux-x64_bin-jmods.zip
+ unzip /tmp/openjfx-17-ea+12_linux-x64_bin-jmods.zip -d /tmp
- name: Download GraalVM 21.1.0
run: |
cd /tmp
@@ -114,8 +114,8 @@ jobs:
java-version: 16
- name: Setup JavaFX
run: |
- wget -P /tmp https://download2.gluonhq.com/openjfx/17/openjfx-17-ea+11_linux-x64_bin-jmods.zip
- unzip /tmp/openjfx-17-ea+11_linux-x64_bin-jmods.zip -d /tmp
+ wget -P /tmp https://download2.gluonhq.com/openjfx/17/openjfx-17-ea+12_linux-x64_bin-jmods.zip
+ unzip /tmp/openjfx-17-ea+12_linux-x64_bin-jmods.zip -d /tmp
- name: Download built jars
uses: dawidd6/action-download-artifact@v2
with:
@@ -179,8 +179,8 @@ jobs:
name: version
- name: Setup JavaFX
run: |
- bitsadmin /Transfer DownloadJavaFX https://download2.gluonhq.com/openjfx/17/openjfx-17-ea+11_windows-x64_bin-jmods.zip D:\openjfx-17-ea+11_windows-x64_bin-jmods.zip
- Expand-Archive -Force D:\openjfx-17-ea+11_windows-x64_bin-jmods.zip D:\
+ bitsadmin /Transfer DownloadJavaFX https://download2.gluonhq.com/openjfx/17/openjfx-17-ea+12_windows-x64_bin-jmods.zip D:\openjfx-17-ea+12_windows-x64_bin-jmods.zip
+ Expand-Archive -Force D:\openjfx-17-ea+12_windows-x64_bin-jmods.zip D:\
- name: Download built jars
uses: dawidd6/action-download-artifact@v2
with:
@@ -235,8 +235,8 @@ jobs:
INSTALL_DIR=target/install
mkdir -p $INSTALL_DIR
mv target/lib/* $INSTALL_DIR
- axel -n 8 https://download2.gluonhq.com/openjfx/17/openjfx-17-ea+11_linux-arm32_bin-sdk.zip
- unzip openjfx-17-ea+11_linux-arm32_bin-sdk.zip -d javafx-sdk-arm32
+ axel -n 8 https://download2.gluonhq.com/openjfx/17/openjfx-17-ea+12_linux-arm32_bin-sdk.zip
+ unzip openjfx-17-ea+12_linux-arm32_bin-sdk.zip -d javafx-sdk-arm32
mv javafx-sdk-arm32/javafx-sdk-17/legal javafx-sdk-arm32/javafx-sdk-17/javafx-legal
mv javafx-sdk-arm32/javafx-sdk-17/lib/libgluon_drm* javafx-sdk-arm32/javafx-sdk-17/lib/libgluon_drm.so
mv javafx-sdk-arm32/javafx-sdk-17/lib/* $INSTALL_DIR/
M .github/workflows/init.yml
+2 −2
--- 'a/.github/workflows/init.yml'
+++ b/.github/workflows/init.yml
@@ -17,8 +17,8 @@ jobs:
- name: Setup JavaFX
run: |
cd /tmp
- axel -n 8 https://download2.gluonhq.com/openjfx/17/openjfx-17-ea+11_linux-x64_bin-sdk.zip
- unzip /tmp/openjfx-17-ea+11_linux-x64_bin-sdk.zip -d /tmp
+ axel -n 8 https://download2.gluonhq.com/openjfx/17/openjfx-17-ea+12_linux-x64_bin-sdk.zip
+ unzip /tmp/openjfx-17-ea+12_linux-x64_bin-sdk.zip -d /tmp
- name: Set Timezone
uses: szenius/set-timezone@v1.0
with:
M pom.xml
+1 −1
--- 'a/pom.xml'
+++ b/pom.xml
@@ -13,7 +13,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.release>11</maven.compiler.release>
- <javafx.version>17-ea+11</javafx.version>
+ <javafx.version>17-ea+12</javafx.version>
<gluonfx.plugin.version>1.0.0</gluonfx.plugin.version>
<ikonli.version>11.5.0</ikonli.version>
M src/main/java/com/stream_pi/client/window/settings/About/AboutTab.java
+21 −1
--- 'a/src/main/java/com/stream_pi/client/window/settings/About/AboutTab.java'
+++ b/src/main/java/com/stream_pi/client/window/settings/About/AboutTab.java
@@ -103,6 +103,19 @@ public class AboutTab extends ScrollPane
hBox1.setAlignment(Pos.CENTER);
hBox1.setSpacing(10);
+ Label javaVersionLabel = new Label("Java "+System.getProperty("java.version"));
+ javaVersionLabel.getStyleClass().add("about_java_version");
+
+ Label javafxVersionLabel = new Label("JavaFX "+System.getProperty("javafx.version"));
+ javafxVersionLabel.getStyleClass().add("about_javafx_version");
+
+ HBox hBox2 = new HBox(javaVersionLabel, getSep(),
+ javafxVersionLabel);
+
+ hBox2.setAlignment(Pos.CENTER);
+ hBox2.setSpacing(10);
+
+
Label disclaimerLabel = new Label("This contributor list shows only those who have contributed " +
"to the Client Source code.\nTo know about the contributors of Action API, Theme API, Util, " +
"visit the respective repositories. If you want to know about the Core Team instead, please visit the website.");
@@ -116,7 +129,7 @@ public class AboutTab extends ScrollPane
buildDateLabel.getStyleClass().add("build-date-label");
mainVBox.getChildren().addAll(appIconImageView, tabPane, disclaimerLabel,
- donateButton, hBox1, buildDateLabel);
+ donateButton, hBox1, hBox2, buildDateLabel);
mainVBox.prefWidthProperty().bind(widthProperty().subtract(25));
setContent(mainVBox);
@@ -134,6 +147,13 @@ public class AboutTab extends ScrollPane
setCacheHint(CacheHint.SPEED);
}
+ private Label getSep()
+ {
+ Label label = new Label("|");
+ label.getStyleClass().add("separator_ui_label");
+ return label;
+ }
+
public void openWebpage(String url)
{
clientListener.openURL(url);
M src/main/resources/com/stream_pi/client/style.css
+5 −0
--- 'a/src/main/resources/com/stream_pi/client/style.css'
+++ b/src/main/resources/com/stream_pi/client/style.css
@@ -200,4 +200,9 @@
.screensaver
{
-fx-background-color: black;
+}
+
+.separator_ui_label
+{
+ -fx-text-fill: grey;
}
\ No newline at end of file