From d5a60f9fb97cbb8edc521aabe8d5d433b2dc11fa Mon Sep 17 00:00:00 2001 From: sirjonasxx <36828922+sirjonasxx@users.noreply.github.com> Date: Wed, 16 Feb 2022 00:59:49 +0100 Subject: [PATCH] styling scheduler, extensionconsole --- .../extensions/ExtensionItemContainer.java | 8 ++++---- .../logger/ExtensionLoggerController.java | 8 +++++--- .../subforms/scheduler/ScheduleItemContainer.java | 14 ++++++++++++-- .../extensions/logger/ExtensionLogger.fxml | 2 +- .../resources/gearth/ui/themes/G-Earth/styling.css | 12 +++++++++--- .../gearth/ui/themes/G-Earth_Dark/styling.css | 11 ++++++++--- .../resources/gearth/ui/themes/Tanji/styling.css | 11 ++++++++--- 7 files changed, 47 insertions(+), 19 deletions(-) diff --git a/G-Earth/src/main/java/gearth/ui/subforms/extensions/ExtensionItemContainer.java b/G-Earth/src/main/java/gearth/ui/subforms/extensions/ExtensionItemContainer.java index 62b2522..de1a9fa 100644 --- a/G-Earth/src/main/java/gearth/ui/subforms/extensions/ExtensionItemContainer.java +++ b/G-Earth/src/main/java/gearth/ui/subforms/extensions/ExtensionItemContainer.java @@ -143,11 +143,11 @@ public class ExtensionItemContainer extends GridPane { parent.getChildren().add(this); getStyleClass().clear(); - getStyleClass().add("connectedExtension"); + getStyleClass().add("tableRowActive"); if (item.extensionType() == ExtensionType.INTERNAL) { getStyleClass().clear(); - getStyleClass().add("internalExtension"); + getStyleClass().add("tableRowBlue"); } @@ -180,7 +180,7 @@ public class ExtensionItemContainer extends GridPane { item.getDeletedObservable().addListener(() -> Platform.runLater(() -> { if (item.isInstalledExtension()) { getStyleClass().clear(); - getStyleClass().add("disconnectedExtension"); + getStyleClass().add("tableRowInactive"); getChildren().remove(buttonsBox); add(additionalButtonBox, 4, 0); reloadButton.setVisible(true); @@ -196,7 +196,7 @@ public class ExtensionItemContainer extends GridPane { initExtension(); getStyleClass().clear(); - getStyleClass().add("connectedExtension"); + getStyleClass().add("tableRowActive"); getChildren().remove(additionalButtonBox); if (buttonsBox != null) { add(buttonsBox, 4, 0); diff --git a/G-Earth/src/main/java/gearth/ui/subforms/extensions/logger/ExtensionLoggerController.java b/G-Earth/src/main/java/gearth/ui/subforms/extensions/logger/ExtensionLoggerController.java index 9b00886..bafc3a8 100644 --- a/G-Earth/src/main/java/gearth/ui/subforms/extensions/logger/ExtensionLoggerController.java +++ b/G-Earth/src/main/java/gearth/ui/subforms/extensions/logger/ExtensionLoggerController.java @@ -24,12 +24,14 @@ public class ExtensionLoggerController implements Initializable { @Override public void initialize(URL arg0, ResourceBundle arg1) { area = new StyleClassedTextArea(); - area.getStyleClass().add("white"); + area.getStyleClass().add("themed-background"); area.setWrapText(true); area.setEditable(false); VirtualizedScrollPane vsPane = new VirtualizedScrollPane<>(area); borderPane.setCenter(vsPane); + vsPane.getStyleClass().add("themed-background"); + borderPane.getStyleClass().add("themed-background"); synchronized (appendOnLoad) { initialized = true; @@ -73,7 +75,7 @@ public class ExtensionLoggerController implements Initializable { text = s.substring(s.indexOf("]") + 1); } else { - classname = "black"; + classname = "label"; text = s; } @@ -81,7 +83,7 @@ public class ExtensionLoggerController implements Initializable { int index = text.indexOf(" --> ") + 5; String extensionAnnouncement = text.substring(0, index); text = text.substring(index); - elements.add(new Element(extensionAnnouncement, "black")); + elements.add(new Element(extensionAnnouncement, "label")); } elements.add(new Element(text + "\n", classname.toLowerCase())); diff --git a/G-Earth/src/main/java/gearth/ui/subforms/scheduler/ScheduleItemContainer.java b/G-Earth/src/main/java/gearth/ui/subforms/scheduler/ScheduleItemContainer.java index d041313..89bdaf7 100644 --- a/G-Earth/src/main/java/gearth/ui/subforms/scheduler/ScheduleItemContainer.java +++ b/G-Earth/src/main/java/gearth/ui/subforms/scheduler/ScheduleItemContainer.java @@ -83,11 +83,21 @@ public class ScheduleItemContainer extends GridPane { parent.getChildren().add(this); + getStyleClass().clear(); + getStyleClass().add("tableRowActive"); GridPane this2 = this; item.onDelete(() -> parent.getChildren().remove(this2)); - item.onIsBeingUpdated(() -> setStyle("-fx-background-color: #faebcc;")); - item.onIsupdated(() -> setStyle("-fx-background-color: #ffffff;")); + item.onIsBeingUpdated(() -> { + getStyleClass().clear(); + getStyleClass().add("tableRowBlue"); +// setStyle("-fx-background-color: #faebcc;") + }); + item.onIsupdated(() -> { + getStyleClass().clear(); + getStyleClass().add("tableRowActive"); +// setStyle("-fx-background-color: #ffffff;") + }); } private Label initNewLabelColumn(String text) { diff --git a/G-Earth/src/main/resources/gearth/ui/subforms/extensions/logger/ExtensionLogger.fxml b/G-Earth/src/main/resources/gearth/ui/subforms/extensions/logger/ExtensionLogger.fxml index f98429a..b6fc53e 100644 --- a/G-Earth/src/main/resources/gearth/ui/subforms/extensions/logger/ExtensionLogger.fxml +++ b/G-Earth/src/main/resources/gearth/ui/subforms/extensions/logger/ExtensionLogger.fxml @@ -3,7 +3,7 @@ - + diff --git a/G-Earth/src/main/resources/gearth/ui/themes/G-Earth/styling.css b/G-Earth/src/main/resources/gearth/ui/themes/G-Earth/styling.css index 247d66b..431f730 100644 --- a/G-Earth/src/main/resources/gearth/ui/themes/G-Earth/styling.css +++ b/G-Earth/src/main/resources/gearth/ui/themes/G-Earth/styling.css @@ -6,6 +6,12 @@ -fx-border-radius: 11; -fx-border-width: 0 1 1 1; } + +.themed-background { + -fx-background-color: white; + -fx-background-radius: 4; +} + .button,.menu-button,.toggle-button,.split-menu-button { -fx-font-size: 14; -fx-background-radius: 4; @@ -903,15 +909,15 @@ VBox > .split-menu-button.last > .arrow-button { -fx-text-fill: #0096c8; } -.internalExtension { +.tableRowBlue { -fx-background-color: #F0FFFF; } -.disconnectedExtension { +.tableRowInactive { -fx-background-color: #CCCCCC; } -.connectedExtension { +.tableRowActive { -fx-background-color: #FFFFFF; } diff --git a/G-Earth/src/main/resources/gearth/ui/themes/G-Earth_Dark/styling.css b/G-Earth/src/main/resources/gearth/ui/themes/G-Earth_Dark/styling.css index 9f78ffa..f6209c3 100644 --- a/G-Earth/src/main/resources/gearth/ui/themes/G-Earth_Dark/styling.css +++ b/G-Earth/src/main/resources/gearth/ui/themes/G-Earth_Dark/styling.css @@ -8,6 +8,11 @@ -fx-border-width: 0 1 1 1; } +.themed-background { + -fx-background-color: #363636; + -fx-background-radius: 4; +} + .button,.menu-button,.toggle-button,.split-menu-button { -fx-font-size: 14; -fx-background-radius: 4; @@ -925,15 +930,15 @@ VBox > .split-menu-button.last > .arrow-button { -fx-text-fill: #0096c8; } -.internalExtension { +.tableRowBlue { -fx-background-color: #3d5b69; } -.disconnectedExtension { +.tableRowInactive { -fx-background-color: #5e5e5e; } -.connectedExtension { +.tableRowActive { -fx-background-color: #525252; } diff --git a/G-Earth/src/main/resources/gearth/ui/themes/Tanji/styling.css b/G-Earth/src/main/resources/gearth/ui/themes/Tanji/styling.css index 96db9ba..080056c 100644 --- a/G-Earth/src/main/resources/gearth/ui/themes/Tanji/styling.css +++ b/G-Earth/src/main/resources/gearth/ui/themes/Tanji/styling.css @@ -7,6 +7,11 @@ -fx-border-width: 0 1 1 1; } +.themed-background { + -fx-background-color: white; + -fx-background-radius: 4; +} + .button,.menu-button,.toggle-button,.split-menu-button { -fx-font-size: 14; -fx-background-radius: 4; @@ -903,15 +908,15 @@ VBox > .split-menu-button.last > .arrow-button { -fx-text-fill: #c88600; } -.internalExtension { +.tableRowBlue { -fx-background-color: #fff0e3; } -.disconnectedExtension { +.tableRowInactive { -fx-background-color: #CCCCCC; } -.connectedExtension { +.tableRowActive { -fx-background-color: #FFFFFF; }