From: rnayabed Date: Thu, 04 Feb 2021 22:51:33 +0530 Subject: work --- work --- --- 'a/pom.xml' +++ b/pom.xml @@ -131,10 +131,10 @@ client-maven-plugin ${client.plugin.version} - android + --initialize-at-build-time=com.sun.org.apache.xml.internal.serializer.ToXMLStream - -Dsvm.targetName=android + com.sun.org.apache.xerces.internal.impl.msg.XMLMessages --- 'a/src/main/java/com/stream_pi/client/controller/Controller.java' +++ b/src/main/java/com/stream_pi/client/controller/Controller.java @@ -47,6 +47,7 @@ public class Controller extends Base if(firstRun) initBase(); + applyDefaultTheme(); if(getClientInfo().getPlatformType()!= com.stream_pi.util.platform.Platform.ANDROID && getClientInfo().getPlatformType() != com.stream_pi.util.platform.Platform.IOS) { getStage().setWidth(getConfig().getStartupWindowWidth()); --- 'a/src/main/java/com/stream_pi/client/info/License.java' +++ b/src/main/java/com/stream_pi/client/info/License.java @@ -36,6 +36,7 @@ public class License { "1. JavaFX - GNU General Public License with Classpath Exception\nhttp://openjdk.java.net/legal/gplv2+ce.html\n\n"+ "2. Gluon Attach - GPL License\nhttps://github.com/gluonhq/attach/blob/master/LICENSE\n\n"+ "3. Gluon Client Maven Plugin - BSD-3 License\nhttps://github.com/gluonhq/client-maven-plugin/blob/master/LICENSE\n\n" + - "4. Ikonli - Apache License\nhttps://github.com/kordamp/ikonli/blob/master/LICENSE\n\n"; + "4. Ikonli - Apache License\nhttps://github.com/kordamp/ikonli/blob/master/LICENSE\n\n"+ + "5. Roboto Font - Apache License 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0\n\n"; } } --- 'a/src/main/java/com/stream_pi/client/window/Base.java' +++ b/src/main/java/com/stream_pi/client/window/Base.java @@ -148,8 +148,7 @@ public abstract class Base extends Stack getChildren().addAll(settingsBase, dashboardBase, alertStackPane); setStyle(null); - clearStylesheets(); - applyDefaultStylesheet(); + checkPrePathDirectory(); @@ -157,6 +156,9 @@ public abstract class Base extends Stack if(config.isFirstTimeUse()) { + clearStylesheets(); + applyDefaultStylesheet(); + getChildren().add(firstTimeUse); firstTimeUse.toFront(); } @@ -165,7 +167,7 @@ public abstract class Base extends Stack dashboardBase.toFront(); } - initThemes(); + registerThemes(); } private void checkPrePathDirectory() throws SevereException @@ -242,13 +244,6 @@ public abstract class Base extends Stack getStylesheets().clear(); } - public void initThemes() throws SevereException - { - registerThemes(); - - applyDefaultTheme(); - } - public void applyDefaultStylesheet() @@ -290,7 +285,10 @@ public abstract class Base extends Stack } } currentTheme = t; + + clearStylesheets(); getStylesheets().addAll(t.getStylesheets()); + applyDefaultStylesheet(); logger.info("... Done!"); } @@ -336,7 +334,6 @@ public abstract class Base extends Stack { logger.info("Applying default theme ..."); - boolean foundTheme = false; for(Theme t: themes.getThemeList()) { --- 'a/src/main/java/com/stream_pi/client/window/dashboard/DashboardBase.java' +++ b/src/main/java/com/stream_pi/client/window/dashboard/DashboardBase.java @@ -30,9 +30,11 @@ public class DashboardBase extends VBox fontIcon.getStyleClass().addAll("dashboard_settings_button_icon"); settingsButton = new Button(); + settingsButton.getStyleClass().addAll("dashboard_settings_button"); settingsButton.setGraphic(fontIcon); HBox hBox = new HBox(settingsButton); + hBox.getStyleClass().add("dashboard_settings_button_parent"); hBox.setPadding(new Insets(0,5,5,0)); hBox.setAlignment(Pos.CENTER_RIGHT); --- 'a/src/main/java/com/stream_pi/client/window/dashboard/actiongridpane/ActionBox.java' +++ b/src/main/java/com/stream_pi/client/window/dashboard/actiongridpane/ActionBox.java @@ -172,8 +172,7 @@ public class ActionBox extends StackPane try { ByteArrayInputStream is = new ByteArrayInputStream(buffer.array()); ObjectInputStream ois = new ObjectInputStream(is); - Action obj = (Action) ois.readObject(); - return obj; + return (Action) ois.readObject(); } catch (Exception e) { e.printStackTrace(); throw new RuntimeException(e); --- 'a/src/main/java/com/stream_pi/client/window/dashboard/actiongridpane/ActionGridPane.java' +++ b/src/main/java/com/stream_pi/client/window/dashboard/actiongridpane/ActionGridPane.java @@ -127,7 +127,7 @@ public class ActionGridPane extends Grid ); FontIcon fontIcon = new FontIcon("fas-chevron-left"); - + fontIcon.getStyleClass().add("folder_action_back_button_icon"); fontIcon.setIconSize(getClientProfile().getActionSize() - 30); stackPane.setAlignment(Pos.CENTER); --- 'a/src/main/java/com/stream_pi/client/window/settings/SettingsBase.java' +++ b/src/main/java/com/stream_pi/client/window/settings/SettingsBase.java @@ -188,7 +188,7 @@ public class SettingsBase extends VBox { ScrollPane scrollPane = new ScrollPane(); scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED); VBox.setVgrow(scrollPane, Priority.ALWAYS); - scrollPane.getStyleClass().add("settings_base_scrollpane"); + scrollPane.getStyleClass().add("settings_base_scroll_pane"); scrollPane.setContent(vBox); vBox.setMinWidth(300); @@ -196,9 +196,9 @@ public class SettingsBase extends VBox { vBox.prefWidthProperty().bind(scrollPane.widthProperty().subtract(25)); - Label settingsLabel = new Label("settings"); + Label settingsLabel = new Label("Settings"); settingsLabel.setPadding(new Insets(5,0,0,5)); - settingsLabel.getStyleClass().add("settings_heading"); + settingsLabel.getStyleClass().add("settings_heading_label"); saveButton = new Button("Save"); saveButton.setOnAction(event->onSaveButtonClicked()); @@ -215,6 +215,7 @@ public class SettingsBase extends VBox { exitButton.setOnAction(event -> onExitButtonClicked()); HBox buttonBar = new HBox(connectDisconnectButton, saveButton, exitButton, closeButton); + buttonBar.getStyleClass().add("settings_button_bar"); if(ClientInfo.getInstance().getPlatformType() == com.stream_pi.util.platform.Platform.LINUX && ClientInfo.getInstance().isShowShutDownButton()) @@ -281,8 +282,6 @@ public class SettingsBase extends VBox { Platform.runLater(()->{ setDisableStatus(false); - System.out.println("q24qwdqwd : "+clientListener.isConnected()); - if(clientListener.isConnected()) connectDisconnectButton.setText("Disconnect"); else --- 'a/src/main/resources/com/stream_pi/client/style.css' +++ b/src/main/resources/com/stream_pi/client/style.css @@ -25,28 +25,11 @@ } -.action_box_not_onclick -{ - -} - -.action_box_display_text_label -{ - -fx-font-size : 16; -} - -.action_box_icon -{ - -fx-arc-width:20px; - -fx-arc-height:20px; -} - -.settings_heading +.settings_heading_label { -fx-font-size: 20; } - .alert_header { -fx-padding: 5; @@ -54,8 +37,6 @@ .alert_pane { - -fx-background-color : white; - -fx-border-color : white; -fx-border-width : 5; -fx-border-radius : 5; -fx-background-radius : 5; @@ -85,7 +66,6 @@ .alert_content_pane { - -fx-background-color: white; -fx-padding: 5; } @@ -101,15 +81,12 @@ .alert_button_bar { - -fx-background-color: white; -fx-alignment: CENTER_RIGHT; -fx-spacing: 5; -fx-padding: 5; } .alert_scroll_pane { - -fx-background: #FFFFFF; - -fx-border-color:#FFFFFF; -fx-max-height : 300; /*-fx-focus-color: #FFFFFF; -fx-faint-focus-color:#FFFFFF;*/ @@ -133,15 +110,12 @@ -fx-background-radius : 5; -fx-max-height : 300; -fx-max-width : 410; - -fx-background: #FFFFFF; - -fx-border-color:#FFFFFF; -fx-effect: dropshadow( three-pass-box , rgba(0,0,0,0.6) , 5, 0.0 , 0.0 , 0 ); } .combo_box_popup_vbox { - -fx-background-color: white; - -fx-padding: 5; + -fx-padding: 5 5 0 5; -fx-spacing:5; } @@ -151,15 +125,9 @@ -fx-icon-size: 14; } -.settings_base -{ - -fx-background-color:white; -} - .first_time_use_pane { - -fx-padding : 5; - -fx-background-color: white; + -fx-padding : 5; } .first_time_use_pane_heading_label @@ -192,19 +160,6 @@ } -.scroll-pane{ - -fx-background-color:transparent; -} - - -.scroll-pane .viewport { - -fx-background-color: transparent; -} - -.dashboard{ - -fx-background-color: white; -} - .first_time_use_welcome_pane_welcome_label { -fx-font-size: 30; @@ -213,4 +168,10 @@ .first_time_use_welcome_pane_next_to_continue_label { -fx-font-size: 15; -} \ No newline at end of file +} + +.scroll-pane +{ + -fx-focus-color:transparent; + -fx-faint-focus-color:transparent; +} --- /dev/null +++ b/style_classes.txt @@ -0,0 +1,28 @@ +Dashboard - dashboard + Settings HBox Bar - dashboard_settings_button_parent + Settings Button - dashboard_settings_button + Icon - dashboard_settings_button_icon + + + Action Grid Pane - action_grid_pane + Action Box - action_box + if folder back button : + Icon : folder_action_back_button_icon + + Is Icon Present ? + yes : action_box_icon_present + no : action_box_icon_not_present + Is Action Valid (is plugin by module name found) ? + yes : action_box_valid + no : action_box_invalid + + Action On Click : action_box_onclick + + Display Text Label - action_box_display_text_label + +Settings - settings_base + Settings heading label - settings_heading_label + Scroll Pane - settings_base_scroll_pane + Base VBox - settings_base_vbox + + Button Bar - settings_button_bar \ No newline at end of file