From 8782d94eaaf0fff6564a9e456e262ae77e5d6a59 Mon Sep 17 00:00:00 2001 From: Kilian Mair Date: Mon, 9 Oct 2023 14:36:47 +0200 Subject: [PATCH 1/8] BugFix include a new Css Sysle --- pom.xml | 6 ++++++ src/main/java/de/doubleslash/usb_led_matrix/App.java | 1 + src/main/java/de/doubleslash/usb_led_matrix/Settings.java | 5 +++++ src/main/resources/CSS/Style_Mode.css | 3 +++ 4 files changed, 15 insertions(+) create mode 100644 src/main/resources/CSS/Style_Mode.css diff --git a/pom.xml b/pom.xml index 3057a68..f2dd344 100644 --- a/pom.xml +++ b/pom.xml @@ -54,6 +54,12 @@ 11.0.2 win + + org.openjfx + javafx-graphics + 11.0.2 + mac + org.openjfx javafx-graphics diff --git a/src/main/java/de/doubleslash/usb_led_matrix/App.java b/src/main/java/de/doubleslash/usb_led_matrix/App.java index f1f49b8..2392e91 100644 --- a/src/main/java/de/doubleslash/usb_led_matrix/App.java +++ b/src/main/java/de/doubleslash/usb_led_matrix/App.java @@ -57,6 +57,7 @@ public void start(final Stage primaryStage) throws Exception { final UsbDeviceView usbDeviceView = new UsbDeviceView(model, usbAdapter); usbDeviceView.initialize(); final Scene scene = new Scene(root); + scene.getStylesheets().add("/CSS/Style_Mode.css"); final ConfigurationView configurationView = fxmlLoader.getController(); configurationView.setModel(model); configurationView.setScene(scene); diff --git a/src/main/java/de/doubleslash/usb_led_matrix/Settings.java b/src/main/java/de/doubleslash/usb_led_matrix/Settings.java index 43e4631..fc576d6 100644 --- a/src/main/java/de/doubleslash/usb_led_matrix/Settings.java +++ b/src/main/java/de/doubleslash/usb_led_matrix/Settings.java @@ -42,6 +42,8 @@ public class Settings { private static double brightness = defaultBrightness; private static String colorMode = defaultColorMode; private static String cssFile = "/CSS/light_Mode.css"; + + private static String styleMode = "/CSS/Style_Mode.css"; private static int timeoutInMinutes = defaultTimeoutInMinutes; private static int numberOfLeds = defaultNumberOfLeds; @@ -265,11 +267,14 @@ public static void Dark(final Scene scene) { setColorMode("dark"); if (scene.getStylesheets().contains(cssFile)) { scene.getStylesheets().remove(cssFile); + scene.getStylesheets().add(styleMode); } } public static void Light(final Scene scene) { scene.getStylesheets().add(cssFile); + scene.getStylesheets().add(styleMode); + setColorMode("light"); } diff --git a/src/main/resources/CSS/Style_Mode.css b/src/main/resources/CSS/Style_Mode.css new file mode 100644 index 0000000..a10aee2 --- /dev/null +++ b/src/main/resources/CSS/Style_Mode.css @@ -0,0 +1,3 @@ +*{ +-fx-font-family:"Arial"; +} \ No newline at end of file From 0fc8d3e547dd1bc7517b849d8b4ecad5367a341b Mon Sep 17 00:00:00 2001 From: Kilian Mair Date: Mon, 9 Oct 2023 14:43:03 +0200 Subject: [PATCH 2/8] BugFix include a new Css Sysle --- .../de/doubleslash/usb_led_matrix/view/ConfigurationView.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/de/doubleslash/usb_led_matrix/view/ConfigurationView.java b/src/main/java/de/doubleslash/usb_led_matrix/view/ConfigurationView.java index 2448cb4..83b1701 100644 --- a/src/main/java/de/doubleslash/usb_led_matrix/view/ConfigurationView.java +++ b/src/main/java/de/doubleslash/usb_led_matrix/view/ConfigurationView.java @@ -216,6 +216,8 @@ private void initialize() { final Parent root = fxmlLoader.load(); final AuthenticationView authFlow = fxmlLoader.getController(); final Scene scene = new Scene(root); + scene.getStylesheets().add("/CSS/Style_Mode.css"); + authFlow.setScene(scene); authFlow.customInitialize(); model.deviceCodeProperty().bind(authFlow.getDeviceCodeProperty()); From 80faffaef75b2cf7042a2ce5038b2ae009b65e9f Mon Sep 17 00:00:00 2001 From: Kilian Mair Date: Mon, 9 Oct 2023 15:27:53 +0200 Subject: [PATCH 3/8] BugFix include Syle_Mode --- .../de/doubleslash/usb_led_matrix/view/ConfigurationView.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/de/doubleslash/usb_led_matrix/view/ConfigurationView.java b/src/main/java/de/doubleslash/usb_led_matrix/view/ConfigurationView.java index 83b1701..c8df6d5 100644 --- a/src/main/java/de/doubleslash/usb_led_matrix/view/ConfigurationView.java +++ b/src/main/java/de/doubleslash/usb_led_matrix/view/ConfigurationView.java @@ -203,6 +203,8 @@ private void initialize() { if (!model.isLoggedIntoTeams()) { LOG.info("Start Device Code Flow."); final Alert alert = new Alert(AlertType.CONFIRMATION); + scene.getStylesheets().add("/CSS/Style_Mode.css"); + alert.setContentText("You need to log in."); final Optional optionalButtonType = alert.showAndWait(); @@ -414,6 +416,7 @@ void informationImageButton(final MouseEvent event) throws SerialPortException { final Parent root = fxmlLoader.load(); final VersionView versionView = fxmlLoader.getController(); final Scene scene = new Scene(root); + scene.getStylesheets().add("/CSS/Style_Mode.css"); versionView.setScene(scene); versionView.instantiate(usbAdapter.versionProperty()); From 3a43d967ffe7611e7a0ec9399b44652ec2e04186 Mon Sep 17 00:00:00 2001 From: Kilian Mair Date: Wed, 11 Oct 2023 10:22:28 +0200 Subject: [PATCH 4/8] IPTE-148: Bug Fix include java 17 und JavaFX 20 und mac-aarch64 --- pom.xml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index f2dd344..0bed736 100644 --- a/pom.xml +++ b/pom.xml @@ -10,6 +10,9 @@ 0.0.1-SNAPSHOT 5.10.0 5.4.0 + 17 + 20.0.1 + @@ -39,31 +42,32 @@ org.openjfx javafx-controls - 11.0.2 + ${javafx.version} org.openjfx javafx-fxml - 11.0.2 + ${javafx.version} + org.openjfx javafx-graphics - 11.0.2 + ${javafx.version} win org.openjfx javafx-graphics - 11.0.2 - mac + ${javafx.version} + mac-aarch64 org.openjfx javafx-graphics - 11.0.2 + ${javafx.version} linux @@ -138,8 +142,8 @@ maven-compiler-plugin 3.11.0 - 11 - 11 + 17 + 17 From a24317dbedbc1807df7c31d407f06fbef839ea98 Mon Sep 17 00:00:00 2001 From: Kilian Mair Date: Fri, 20 Oct 2023 09:40:49 +0200 Subject: [PATCH 5/8] Bugfix-Mac: Update JavaFX to 21 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0bed736..d432eb6 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ 5.10.0 5.4.0 17 - 20.0.1 + 21.0.1 From 0988a3fe6dc6015bd5c162de3e40b7a93d17d9fc Mon Sep 17 00:00:00 2001 From: Kilian Mair Date: Fri, 20 Oct 2023 10:03:57 +0200 Subject: [PATCH 6/8] BugFix: Pipeline java 17 --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a207f5e..c7db279 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,7 @@ variables: build: stage: build script: - - mvn clean package -Dproject.version=${VERSION} + - mvn clean package -Dproject.version=${VERSION} -Dmaven.compiler.source=17 -Dmaven.compiler.target=17 artifacts: name: "busylight_client.jar" reports: From 3f23d32edcd43575f1acf76b29207ed86a8df63c Mon Sep 17 00:00:00 2001 From: Kilian Mair Date: Fri, 20 Oct 2023 10:42:49 +0200 Subject: [PATCH 7/8] BugFix: Pipeline java 17 --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c7db279..3decace 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: maven:3-amazoncorretto-11 +image: maven:3-amazoncorretto-17 stages: - staticTest @@ -7,11 +7,12 @@ stages: variables: VERSION: 0.0.${CI_PIPELINE_ID} + # Jobs build: stage: build script: - - mvn clean package -Dproject.version=${VERSION} -Dmaven.compiler.source=17 -Dmaven.compiler.target=17 + - mvn clean package -Dproject.version=${VERSION} artifacts: name: "busylight_client.jar" reports: From 222e6c28733f4d3cd81c09c757bca6464373110a Mon Sep 17 00:00:00 2001 From: Kilian Mair Date: Fri, 20 Oct 2023 10:44:27 +0200 Subject: [PATCH 8/8] BugFix: Pipeline java 17 --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3decace..a42495a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,7 @@ variables: build: stage: build script: - - mvn clean package -Dproject.version=${VERSION} + - mvn clean package -Dproject.version=${VERSION} -Dmaven.compiler.source=17 -Dmaven.compiler.target=17 artifacts: name: "busylight_client.jar" reports: