From bf28c66e2bfe13edccce9b7740138662dc3054bf Mon Sep 17 00:00:00 2001 From: Alex Dev Sm Date: Tue, 18 Jun 2019 20:28:54 +0300 Subject: [PATCH 1/3] =?UTF-8?q?[FEUTURE]=20=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20jfoenix=20=D0=B8=D0=B7=20=D0=B7=D0=B0?= =?UTF-8?q?=D0=B2=D0=B8=D1=81=D0=B8=D0=BC=D0=BE=D1=81=D1=82=D0=B5=D0=B9,?= =?UTF-8?q?=20=D0=B8=20=D0=B7=D0=B0=D0=BC=D0=B5=D0=BD=D0=B0=20=D0=B2=D1=81?= =?UTF-8?q?=D0=B5=D1=85=20=D0=B5=D0=B3=D0=BE=20=D1=84=D1=83=D0=BD=D0=BA?= =?UTF-8?q?=D1=86=D0=B8=D0=B9=20=D0=BD=D0=B0=20=D1=81=D1=82=D0=B0=D0=BD?= =?UTF-8?q?=D0=B4=D0=B0=D1=80=D1=82=D0=BD=D1=8B=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Launcher/build.gradle | 1 - Launcher/runtime/dialog/dialog.js | 2 +- .../runtime/dialog/overlay/debug/debug.fxml | 12 +++--- .../dialog/overlay/processing/processing.fxml | 4 +- .../dialog/overlay/settings/settings.fxml | 26 ++++++------- .../runtime/dialog/overlay/update/update.fxml | 4 +- .../dialog/scenes/console/console.fxml | 28 +++++++------- .../runtime/dialog/scenes/login/login.fxml | 37 +++++++++---------- .../dialog/scenes/mainmenu/mainmenu.fxml | 36 +++++++++--------- .../dialog/scenes/options/options.fxml | 14 +++---- .../runtime/dialog/scenes/options/options.js | 4 +- 11 files changed, 83 insertions(+), 85 deletions(-) diff --git a/Launcher/build.gradle b/Launcher/build.gradle index 6e1553e9..1cd76ea4 100644 --- a/Launcher/build.gradle +++ b/Launcher/build.gradle @@ -39,7 +39,6 @@ dependencies { pack project(':LauncherAuthlib') bundle 'com.github.oshi:oshi-core:3.13.0' - bundle 'com.jfoenix:jfoenix:8.0.8' bundle 'de.jensd:fontawesomefx:8.9' bundle 'org.apache.httpcomponents:httpclient:4.5.7' pack 'io.netty:netty-codec-http:4.1.36.Final' diff --git a/Launcher/runtime/dialog/dialog.js b/Launcher/runtime/dialog/dialog.js index acd7ba4b..f1e11f91 100644 --- a/Launcher/runtime/dialog/dialog.js +++ b/Launcher/runtime/dialog/dialog.js @@ -255,7 +255,7 @@ function verifyLauncher(e) { var iter = 0; authTypes = {}; result.list.forEach(function(auth_type, i, arr) { - var serverAuth = new com.jfoenix.controls.JFXComboBox(); + var serverAuth = new javafx.scene.control.ComboBox(); serverAuth.getStyleClass().add("authOptions"); authOptions.getItems().add(auth_type.displayName); authTypes[auth_type.displayName] = auth_type.name; diff --git a/Launcher/runtime/dialog/overlay/debug/debug.fxml b/Launcher/runtime/dialog/overlay/debug/debug.fxml index 89efbb21..9666c28e 100644 --- a/Launcher/runtime/dialog/overlay/debug/debug.fxml +++ b/Launcher/runtime/dialog/overlay/debug/debug.fxml @@ -1,7 +1,7 @@ - - + + @@ -16,12 +16,12 @@ - + + - + + - - + + + + diff --git a/Launcher/runtime/dialog/scenes/mainmenu/mainmenu.fxml b/Launcher/runtime/dialog/scenes/mainmenu/mainmenu.fxml index 70e6b20c..c5dd660f 100644 --- a/Launcher/runtime/dialog/scenes/mainmenu/mainmenu.fxml +++ b/Launcher/runtime/dialog/scenes/mainmenu/mainmenu.fxml @@ -1,6 +1,6 @@ - + @@ -22,10 +22,10 @@ - + @@ -46,15 +46,15 @@ - + + - + + + + + diff --git a/Launcher/runtime/dialog/scenes/options/options.fxml b/Launcher/runtime/dialog/scenes/options/options.fxml index a0bb1ef0..4884c670 100644 --- a/Launcher/runtime/dialog/scenes/options/options.fxml +++ b/Launcher/runtime/dialog/scenes/options/options.fxml @@ -1,6 +1,6 @@ - + @@ -38,21 +38,21 @@ - + + + diff --git a/Launcher/runtime/dialog/scenes/options/options.js b/Launcher/runtime/dialog/scenes/options/options.js index 112c8c9c..98c28232 100644 --- a/Launcher/runtime/dialog/scenes/options/options.js +++ b/Launcher/runtime/dialog/scenes/options/options.js @@ -83,7 +83,7 @@ var options = { var nodelist = new java.util.ArrayList; modlist.getChildren().forEach(function(node,i,arr) { - if(node instanceof com.jfoenix.controls.JFXCheckBox) + if(node instanceof javafx.scene.control.CheckBox) nodelist.add(node); }); nodelist.forEach(function(node,i,arr) { @@ -109,7 +109,7 @@ var options = { modDescription = modFile.info; if(modFile.subTreeLevel != null && modFile.subTreeLevel > 1) subLevel = modFile.subTreeLevel; - var testMod = new com.jfoenix.controls.JFXCheckBox(modName); + var testMod = new javafx.scene.control.CheckBox(modName); testMod.getStyleClass().add("checkboxOpt"); if(subLevel > 1) From 8b0a53032470313c088590cd2609ad79aed87dc4 Mon Sep 17 00:00:00 2001 From: Alex Dev Sm Date: Tue, 18 Jun 2019 21:00:56 +0300 Subject: [PATCH 2/3] =?UTF-8?q?[FIX]=D0=92=D0=B5=D1=80=D0=BD=D1=83=D0=BB?= =?UTF-8?q?=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BE=D1=87=D0=BA=D0=B0=D0=BC=20?= =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B7=D1=80=D0=B0=D1=87=D0=BD=D0=BE=D1=81?= =?UTF-8?q?=D1=82=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Launcher/runtime/dialog/styles.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Launcher/runtime/dialog/styles.css b/Launcher/runtime/dialog/styles.css index d26cc8e4..7fe88772 100644 --- a/Launcher/runtime/dialog/styles.css +++ b/Launcher/runtime/dialog/styles.css @@ -2,7 +2,11 @@ Button, CheckBox, ComboBox, RadioButton { -fx-cursor: hand; } - +Button { + -fx-background-color: TRANSPARENT, TRANSPARENT, TRANSPARENT, TRANSPARENT; + -fx-background-radius: 3px; + -fx-background-insets: 0px; +} /* Backgrounds */ #layout { From 2828a6df64a96fb6845ca3bbafb4fac992745539 Mon Sep 17 00:00:00 2001 From: Alex Dev Sm Date: Tue, 18 Jun 2019 21:37:34 +0300 Subject: [PATCH 3/3] =?UTF-8?q?[FIX]=D0=92=D0=B5=D1=80=D0=BD=D1=83=D0=BB?= =?UTF-8?q?=20=D0=B3=D0=B0=D0=BB=D0=BE=D1=87=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Launcher/runtime/dialog/styles.css | 66 ++++++++++++++++++++++++++---- 1 file changed, 57 insertions(+), 9 deletions(-) diff --git a/Launcher/runtime/dialog/styles.css b/Launcher/runtime/dialog/styles.css index 7fe88772..b2b2f356 100644 --- a/Launcher/runtime/dialog/styles.css +++ b/Launcher/runtime/dialog/styles.css @@ -1,13 +1,66 @@ -/*-- DrLeonardo Design --*/ -Button, CheckBox, ComboBox, RadioButton { - -fx-cursor: hand; -} +/*-- Without jfoenix --*/ Button { -fx-background-color: TRANSPARENT, TRANSPARENT, TRANSPARENT, TRANSPARENT; -fx-background-radius: 3px; -fx-background-insets: 0px; } +CheckBox .box-container { + -fx-shape: "M 400 100 L 400 100 A 50 50 0 1 1 400 250 A 50 50 0 1 1 400 100 "; + -fx-padding: 10; +} + +CheckBox .box, +CheckBox:indeterminate .box, +CheckBox:indeterminate:selected .box{ + -fx-pref-width: 18; + -fx-pref-height: 18; + + -fx-background-color: TRANSPARENT; + -fx-background-radius: 2; + + -fx-border-color: #909090; + -fx-border-style: solid; + -fx-border-radius: 2; + -fx-border-width: 2; +} + +CheckBox:selected .box { + -fx-border-color: #5fd97a; + -fx-background-color: #5fd97a; +} + +CheckBox .mark { + -fx-background-color: TRANSPARENT; +} + +CheckBox:selected .mark { + -fx-shape: "M384 690l452-452 60 60-512 512-238-238 60-60z"; + -fx-max-width: 15; + -fx-max-height: 12; + + -fx-background-color: WHITE; + + -fx-border-color: WHITE; + -fx-border-width: 2; + -fx-border-radius: 2; +} + +CheckBox .indeterminate-mark{ + -fx-background-color: #5fd97a; + -fx-background-radius: 2; + -fx-border-width: 0; + -fx-max-width: 10; + -fx-max-height: 10; +} + + +/*-- DrLeonardo Design --*/ +Button, CheckBox, ComboBox, RadioButton { + -fx-cursor: hand; +} + + /* Backgrounds */ #layout { -fx-background-color: transparent; @@ -317,11 +370,6 @@ .description-text { -fx-font-size: 12px; } -.checkboxOpt { - -jfx-checked-color: #5fd97a; - -jfx-unchecked-color: #909090; -} - .modname { -fx-text-fill: #323232; }