From: Debayan Sutradhar <debayansutradhar3@gmail.com>
Date: Thu, 27 May 2021 23:33:48 +0530
Subject: Added icons in action box context menu, refactored action details pane ui (buttons)
---
Added icons in action box context menu, refactored action details pane ui (buttons)
---


--- '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
@@ -129,14 +129,14 @@ public class ActionDetailsPane extends V
         openFolderButton.setGraphic(folderOpenIcon);
         openFolderButton.setOnAction(event -> onOpenFolderButtonClicked());
 
-        saveButton = new Button("Apply Changes");
+        saveButton = new Button("Save");
         saveButton.getStyleClass().add("action_details_pane_save_button");
         FontIcon syncIcon = new FontIcon("far-save");
         syncIcon.getStyleClass().add("action_details_save_delete_button_icon");
         saveButton.setGraphic(syncIcon);
         saveButton.setOnAction(event -> onSaveButtonClicked());
 
-        deleteButton = new Button("Delete action");
+        deleteButton = new Button();
         deleteButton.getStyleClass().add("action_details_pane_delete_button");
         FontIcon deleteIcon = new FontIcon("fas-trash");
         deleteIcon.getStyleClass().add("action_details_pane_delete_button_icon");
@@ -165,7 +165,7 @@ public class ActionDetailsPane extends V
             }
         });
 
-        buttonBar = new HBox(openFolderButton, resetToDefaultsButton, deleteButton, returnButtonForCombineActionChild, saveButton);
+        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);

--- 'a/src/main/java/com/stream_pi/server/window/dashboard/actiongridpane/ActionBox.java'
+++ b/src/main/java/com/stream_pi/server/window/dashboard/actiongridpane/ActionBox.java
@@ -280,12 +280,24 @@ public class ActionBox extends StackPane
         actionContextMenu = new ContextMenu();
 
         MenuItem deleteActionMenuItem = new MenuItem("Delete Action");
+        deleteActionMenuItem.getStyleClass().add("action_box_delete_menu_item");
+        FontIcon deleteIcon = new FontIcon("fas-trash");
+        deleteIcon.getStyleClass().add("action_box_delete_menu_item_icon");
+        deleteActionMenuItem.setGraphic(deleteIcon);
         deleteActionMenuItem.setOnAction(event-> deleteAction());
 
         showToggleOffMenuItem = new MenuItem("Show Toggle OFF");
+        showToggleOffMenuItem.getStyleClass().add("action_box_toggle_on_menu_item");
+        FontIcon toggleOffIcon = new FontIcon("fas-toggle-on");
+        toggleOffIcon.getStyleClass().add("action_box_toggle_on_menu_item_icon");
+        showToggleOffMenuItem.setGraphic(toggleOffIcon);
         showToggleOffMenuItem.setOnAction(event-> fakeToggle(false));
 
-        showToggleOnMenuItem = new MenuItem("Show Toggle ON");
+        showToggleOnMenuItem = new MenuItem("Show Toggle OFF");
+        showToggleOnMenuItem.getStyleClass().add("action_box_toggle_off_menu_item");
+        FontIcon toggleOnIcon = new FontIcon("fas-toggle-off");
+        toggleOnIcon.getStyleClass().add("action_box_toggle_off_menu_item_icon");
+        showToggleOnMenuItem.setGraphic(toggleOnIcon);
         showToggleOnMenuItem.setOnAction(event-> fakeToggle(true));
 
         actionContextMenu.getItems().addAll(deleteActionMenuItem, showToggleOffMenuItem, showToggleOnMenuItem);

--- 'a/src/main/resources/com/stream_pi/server/default_icons.css'
+++ b/src/main/resources/com/stream_pi/server/default_icons.css
@@ -13,7 +13,7 @@
     -fx-icon-color: #ffcc00;
 }
 
-.action_details_pane_delete_button_icon
+.action_details_pane_delete_button_icon, .action_box_delete_menu_item_icon
 {
     -fx-icon-color:red;
 }

--- 'a/src/main/resources/com/stream_pi/server/style.css'
+++ b/src/main/resources/com/stream_pi/server/style.css
@@ -225,6 +225,11 @@
     -fx-text-fill : red;
 }
 
+.action_box_delete_menu_item .label
+{
+    -fx-text-fill: red;
+}
+
 .action_details_pane_reset_button
 {
     -fx-text-fill : orange;
@@ -286,6 +291,6 @@
 
 .action_box_selected
 {
-    -fx-border-width: 4;
+    -fx-border-width: 3;
     -fx-border-color:orange;
 }
\ No newline at end of file