From: Debayan Sutradhar Date: Tue, 25 May 2021 20:05:25 +0530 Subject: Fixed major action icon related bug --- Fixed major action icon related bug Replaced "StreamPi" runtime argument to "Stream-Pi" --- --- 'a/pom.xml' +++ b/pom.xml @@ -108,7 +108,7 @@ javafx-maven-plugin 0.0.5 - -DStreamPi.startupRunnerFileName=run_min -DStreamPi.startupMode=maximise + -DStream-Pi.startupRunnerFileName=run_min -DStream-Pi.startupMode=maximise --- 'a/src/main/java/com/stream_pi/server/Main.java' +++ b/src/main/java/com/stream_pi/server/Main.java @@ -32,16 +32,16 @@ public class Main extends Application { public void start(Stage stage) { for(String eachArg : getParameters().getRaw()) { - if(!eachArg.startsWith("-DStreamPi")) + if(!eachArg.startsWith("-DStream-Pi")) continue; String[] r = eachArg.split("="); String arg = r[0]; String val = r[1]; - if(arg.equals("-DStreamPi.startupRunnerFileName")) + if(arg.equals("-DStream-Pi.startupRunnerFileName")) ServerInfo.getInstance().setRunnerFileName(val); - else if(arg.equals("-DStreamPi.startupMode")) + else if(arg.equals("-DStream-Pi.startupMode")) ServerInfo.getInstance().setStartMinimised(val.equals("min")); } --- 'a/src/main/java/com/stream_pi/server/connection/ClientConnection.java' +++ b/src/main/java/com/stream_pi/server/connection/ClientConnection.java @@ -144,8 +144,14 @@ public class ClientConnection extends Th ClientConnections.getInstance().removeConnection(this); } + public Logger getLogger() + { + return logger; + } + public void sendIcon(String profileID, String actionID, String state, byte[] icon) throws SevereException { + getLogger().info("Sending icon "+state+" len "+icon.length+"; profile:"+profileID+"; actionid:"+actionID+"\n\n\n\n"); try { Thread.sleep(50); --- '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 @@ -61,7 +61,7 @@ public class ActionDetailsPane extends V private Button saveButton; private Button deleteButton; private Button openFolderButton; - private Button resetToDefaultsFolderButton; + private Button resetToDefaultsButton; private HBox buttonBar; @@ -141,13 +141,13 @@ public class ActionDetailsPane extends V deleteButton.setOnAction(event -> onDeleteButtonClicked()); - resetToDefaultsFolderButton = new Button("Reset"); - resetToDefaultsFolderButton.managedProperty().bind(resetToDefaultsFolderButton.visibleProperty()); - resetToDefaultsFolderButton.getStyleClass().add("action_details_pane_reset_button"); + resetToDefaultsButton = new Button("Reset"); + resetToDefaultsButton.managedProperty().bind(resetToDefaultsButton.visibleProperty()); + resetToDefaultsButton.getStyleClass().add("action_details_pane_reset_button"); FontIcon resetToDefaultsIcon = new FontIcon("fas-sync-alt"); resetToDefaultsIcon.getStyleClass().add("action_details_pane_reset_button_icon"); - resetToDefaultsFolderButton.setGraphic(resetToDefaultsIcon); - resetToDefaultsFolderButton.setOnAction(event -> onResetToDefaultsButtonClicked()); + resetToDefaultsButton.setGraphic(resetToDefaultsIcon); + resetToDefaultsButton.setOnAction(event -> onResetToDefaultsButtonClicked()); returnButtonForCombineActionChild = new Button("Return"); returnButtonForCombineActionChild.setGraphic(new FontIcon("fas-caret-left")); @@ -161,7 +161,7 @@ public class ActionDetailsPane extends V } }); - buttonBar = new HBox(openFolderButton, resetToDefaultsFolderButton, returnButtonForCombineActionChild, saveButton, deleteButton); + buttonBar = new HBox(openFolderButton, resetToDefaultsButton, returnButtonForCombineActionChild, saveButton, deleteButton); buttonBar.getStyleClass().add("action_details_pane_button_bar"); buttonBar.setPadding(new Insets(10, 10, 10, 0)); buttonBar.setAlignment(Pos.CENTER_RIGHT); @@ -590,7 +590,7 @@ public class ActionDetailsPane extends V toggleActionsPropsVBox.setVisible(false); saveButton.setVisible(false); openFolderButton.setVisible(false); - resetToDefaultsFolderButton.setVisible(false); + resetToDefaultsButton.setVisible(false); returnButtonForCombineActionChild.setVisible(false); clearIconButton.setVisible(false); @@ -724,7 +724,7 @@ public class ActionDetailsPane extends V hideDisplayTextCheckBox.setVisible(true); setFolderButtonVisible(getAction().getActionType().equals(ActionType.FOLDER)); - setResetToDefaultsFolderButtonVisible(!(getAction().getActionType().equals(ActionType.FOLDER) || getAction().getActionType().equals(ActionType.COMBINE))); + setResetToDefaultsButtonVisible(!(getAction().getActionType().equals(ActionType.FOLDER) || getAction().getActionType().equals(ActionType.COMBINE))); clearIconButton.setDisable(!getAction().isHasIcon()); } @@ -1022,7 +1022,7 @@ public class ActionDetailsPane extends V "#" + actionBackgroundColourPicker.getValue().toString().substring(2), getCombineActionPropertiesPane(), clientProfile, sendIcon, actionBox, actionClientProperties, exceptionAndAlertHandler, - saveButton, deleteButton, runOnActionSavedFromServer, runAsync, this + saveButton, deleteButton, resetToDefaultsButton, runOnActionSavedFromServer, runAsync, this ); } @@ -1037,9 +1037,9 @@ public class ActionDetailsPane extends V openFolderButton.setVisible(visible); } - public void setResetToDefaultsFolderButtonVisible(boolean visible) + public void setResetToDefaultsButtonVisible(boolean visible) { - resetToDefaultsFolderButton.setVisible(visible); + resetToDefaultsButton.setVisible(visible); } public void validateForm() throws MinorException --- 'a/src/main/java/com/stream_pi/server/window/dashboard/actiondetailpane/OnSaveActionTask.java' +++ b/src/main/java/com/stream_pi/server/window/dashboard/actiondetailpane/OnSaveActionTask.java @@ -33,13 +33,14 @@ public class OnSaveActionTask extends Ta boolean isShowDisplayText, boolean isDefaultDisplayTextColour, String displayTextFontColour, boolean isClearIcon, boolean isHideDefaultIcon, boolean isHideToggleOffIcon, boolean isHideToggleOnIcon, DisplayTextAlignment displayTextAlignment, boolean isTransparentBackground, String backgroundColour, CombineActionPropertiesPane combineActionPropertiesPane, ClientProfile clientProfile, boolean sendIcon, ActionBox actionBox, - ArrayList actionClientProperties, ExceptionAndAlertHandler exceptionAndAlertHandler, Button saveButton, Button deleteButton, + ArrayList actionClientProperties, ExceptionAndAlertHandler exceptionAndAlertHandler, Button saveButton, Button deleteButton, Button resetButton, boolean runOnActionSavedFromServer, boolean runAsync, ActionDetailsPaneListener actionDetailsPaneListener) { this.saveButton = saveButton; this.deleteButton = deleteButton; - this.delayBeforeRunningString = delayBeforeRunningString; + this.resetButton = resetButton; + this.delayBeforeRunningString = delayBeforeRunningString; this.connection = connection; this.action = action; this.displayNameText = displayNameText; @@ -78,6 +79,7 @@ public class OnSaveActionTask extends Ta private Button saveButton; private Button deleteButton; + private Button resetButton; private String delayBeforeRunningString; private boolean isShowDisplayText; private boolean isCombineChild; @@ -100,9 +102,10 @@ public class OnSaveActionTask extends Ta private Action action; private ClientConnection connection; - private void setSaveDeleteButtonState(boolean state) + private void setSaveDeleteResetButtonState(boolean state) { Platform.runLater(()->{ + resetButton.setDisable(state); saveButton.setDisable(state); deleteButton.setDisable(state); }); @@ -115,7 +118,7 @@ public class OnSaveActionTask extends Ta if(!isCombineChild) { - setSaveDeleteButtonState(true); + setSaveDeleteResetButtonState(true); action.setShowDisplayText(isShowDisplayText); @@ -136,16 +139,20 @@ public class OnSaveActionTask extends Ta } + logger.info("isHideDEfaultIcon : "+isHideDefaultIcon); + logger.info("isHideDEfaultIcon : "+isHideToggleOffIcon); + logger.info("isHideDEfaultIcon : "+isHideToggleOnIcon); + if(action.getActionType() == ActionType.NORMAL) { if(isHideDefaultIcon) { - if(action.getIcon("default") != null) - action.setCurrentIconState("default"); + action.setCurrentIconState(""); } else { - action.setCurrentIconState(""); + if(action.getIcon("default") != null) + action.setCurrentIconState("default"); } } else if (action.getActionType() == ActionType.TOGGLE) @@ -233,7 +240,7 @@ public class OnSaveActionTask extends Ta actionBox.init(); }); - setSaveDeleteButtonState(false); + setSaveDeleteResetButtonState(false); } clientProfile.removeActionByID(action.getID());