From: rnayabed Date: Thu, 04 Feb 2021 22:51:21 +0530 Subject: work --- work --- --- 'a/src/main/java/com/stream_pi/server/controller/Controller.java' +++ b/src/main/java/com/stream_pi/server/controller/Controller.java @@ -68,7 +68,6 @@ public class Controller extends Base imp try { File filex = new File(ServerInfo.getInstance().getPrePath()); - System.out.println("SAX : "+filex.exists()); if(!filex.exists()) { filex.mkdirs(); --- 'a/src/main/java/com/stream_pi/server/info/License.java' +++ b/src/main/java/com/stream_pi/server/info/License.java @@ -38,6 +38,7 @@ public class License { "Opensource Libraries used :\n"+ "1. JavaFX - GNU General Public License with Classpath Exception\nhttp://openjdk.java.net/legal/gplv2+ce.html\n\n"+ "2. JSON - The JSON License\nhttps://www.json.org/license.html\n\n"+ - "3. Ikonli - Apache License\nhttps://github.com/kordamp/ikonli/blob/master/LICENSE\n\n"; + "3. Ikonli - Apache License\nhttps://github.com/kordamp/ikonli/blob/master/LICENSE\n\n"+ + "4. Roboto Font - Apache License 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0\n\n"; } } --- 'a/src/main/java/com/stream_pi/server/window/Base.java' +++ b/src/main/java/com/stream_pi/server/window/Base.java @@ -123,10 +123,9 @@ public abstract class Base extends Stack public void initThemes() throws SevereException { clearStylesheets(); - registerThemes(); - applyDefaultStylesheet(); applyDefaultTheme(); + applyDefaultStylesheet(); } public Stage getStage() --- 'a/src/main/java/com/stream_pi/server/window/dashboard/PluginsPane.java' +++ b/src/main/java/com/stream_pi/server/window/dashboard/PluginsPane.java @@ -146,8 +146,9 @@ public class PluginsPane extends VBox { if(eachAction.getHelpLink() != null) { Button helpButton = new Button(); + helpButton.getStyleClass().add("plugins_pane_each_plugin_button_help_icon"); FontIcon questionIcon = new FontIcon("fas-question"); - questionIcon.getStyleClass().add("dashboard_plugins_pane_action_help_icon"); + questionIcon.getStyleClass().add("plugins_pane_each_plugin_button_help_button_icon"); helpButton.setGraphic(questionIcon); helpButton.setOnAction(event -> hostServices.showDocument(eachAction.getHelpLink())); --- 'a/src/main/java/com/stream_pi/server/window/dashboard/actiondetailpane/ActionDetailsPane.java' +++ b/src/main/java/com/stream_pi/server/window/dashboard/actiondetailpane/ActionDetailsPane.java @@ -36,6 +36,7 @@ import javafx.scene.paint.Color; import javafx.scene.paint.Paint; import javafx.stage.FileChooser; import javafx.stage.Window; +import javafx.util.Callback; import org.kordamp.ikonli.javafx.FontIcon; import java.io.File; @@ -111,9 +112,9 @@ public class ActionDetailsPane extends V saveButton.setOnAction(event -> onSaveButtonClicked()); deleteButton = new Button("Delete action"); + deleteButton.getStyleClass().add("action_details_pane_delete_button"); FontIcon deleteIcon = new FontIcon("fas-trash"); - deleteIcon.setIconColor(Paint.valueOf("#FF0000")); - deleteButton.setTextFill(Paint.valueOf("#FF0000")); + deleteIcon.getStyleClass().add("action_details_pane_delete_button_icon"); deleteButton.setGraphic(deleteIcon); deleteButton.setOnAction(event -> onDeleteButtonClicked()); @@ -151,6 +152,24 @@ public class ActionDetailsPane extends V displayTextAlignmentComboBox.managedProperty().bind(displayTextAlignmentComboBox.visibleProperty()); + Callback, ListCell> displayTextAlignmentComboBoxFactory = new Callback<>() { + @Override + public ListCell call(ListView displayTextAlignment) { + return new ListCell<>() { + @Override + protected void updateItem(DisplayTextAlignment displayTextAlignment, boolean b) { + super.updateItem(displayTextAlignment, b); + + if (displayTextAlignment != null) { + setText(displayTextAlignment.getUIName()); + } + } + }; + } + }; + displayTextAlignmentComboBox.setCellFactory(displayTextAlignmentComboBoxFactory); + displayTextAlignmentComboBox.setButtonCell(displayTextAlignmentComboBoxFactory.call(null)); + actionClientProperties = new ArrayList<>(); displayNameTextField = new TextField(); --- 'a/src/main/java/com/stream_pi/server/window/dashboard/actiongridpane/ActionGridPane.java' +++ b/src/main/java/com/stream_pi/server/window/dashboard/actiongridpane/ActionGridPane.java @@ -97,7 +97,7 @@ public class ActionGridPane extends Scro ); FontIcon fontIcon = new FontIcon("fas-chevron-left"); - + fontIcon.getStyleClass().add("folder_action_back_button_icon"); fontIcon.setIconSize(Config.getInstance().getActionGridActionSize() - 30); stackPane.setAlignment(Pos.CENTER); --- 'a/src/main/java/com/stream_pi/server/window/settings/About.java' +++ b/src/main/java/com/stream_pi/server/window/settings/About.java @@ -41,7 +41,7 @@ public class About extends VBox{ licenseTextArea.getStyleClass().add("about_license_text_area"); licenseTextArea.setWrapText(false); licenseTextArea.setEditable(false); - licenseTextArea.setMaxWidth(550); + licenseTextArea.setMaxWidth(600); VBox.setVgrow(licenseTextArea, Priority.ALWAYS); Binary files 'a/src/main/resources/com/stream_pi/server/Default.obj' and b/src/main/resources/com/stream_pi/server/Default.obj differ --- 'a/src/main/resources/com/stream_pi/server/style.css' +++ b/src/main/resources/com/stream_pi/server/style.css @@ -79,8 +79,6 @@ .alert_pane { - -fx-background-color : white; - -fx-border-color : white; -fx-border-width : 5; -fx-border-radius : 5; -fx-background-radius : 5; @@ -110,7 +108,6 @@ .alert_content_pane { - -fx-background-color: white; -fx-padding: 5; } @@ -126,20 +123,22 @@ .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;*/ } +.plugins_pane +{ + -fx-spacing: 5; +} + .plugins_pane_each_plugin_button_imageview { -fx-width:20; @@ -196,4 +195,52 @@ .first_time_use_welcome_pane_next_to_continue_label { -fx-font-size: 15; +} + +.scroll-pane +{ + -fx-focus-color:transparent; + -fx-faint-focus-color:transparent; +} + +.plugins_settings_scroll_pane, .themes_settings_scroll_pane, .clients_settings_scroll_pane +{ + -fx-padding: 10 0 0 0; +} + +.plugins_settings_each_plugin_box, .theme_settings_each_theme_box, .clients_settings_each_client_box +{ + -fx-spacing : 5; + -fx-padding : 0 0 5 0; +} + +.plugins_pane_each_plugin_box_parent, .plugins_pane_each_plugin_box +{ + -fx-spacing : 5; +} + +.about +{ + -fx-spacing : 5; +} + +.about_links_box +{ + -fx-spacing : 15; +} + + +.action_details_pane_delete_button +{ + -fx-text-fill : red; +} + +.action_details_pane_delete_button_icon +{ + -fx-icon-color:red; +} + +.client_and_profile_selector_pane_stack +{ + -fx-spacing: 5; } \ No newline at end of file --- 'a/style_classes.txt' +++ b/style_classes.txt @@ -1,15 +1,20 @@ dashboard - Action Detail Pane - action_details_pane + Action Details Pane - action_details_pane Heading HBox - action_details_pane_heading_box Heading Label - action_details_pane_heading_label Scroll Pane - action_details_pane_scroll_pane VBox (Content Pane) - action_details_pane_vbox Bottom Button Bar - action_details_pane_button_bar + Delete Button - action_details_pane_delete_button + Icon - action_details_pane_delete_button_icon Action Grid Pane (Scroll Pane) - action_grid_pane_parent Main 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 @@ -35,7 +40,10 @@ dashboard Each Plugin Button - plugins_pane_each_plugin_button Icon - plugins_pane_each_plugin_button_icon OR - ImageView (NOT RECOMMENDED FOR USE) - plugins_pane_each_plugin_button_imageview + ImageView (NOT RECOMMENDED FOR USE) - plugins_pane_each_plugin_button_imageview] + + Help Button - plugins_pane_each_plugin_button_help_icon + Icon - plugins_pane_each_plugin_button_help_button_icon HBox - plugins_pane_settings_button Settings Button - plugins_pane_settings_button