From: rnayabed <debayansutradhar3@gmail.com>
Date: Fri, 26 Feb 2021 20:13:25 +0530
Subject: Renamed "Close on X" to "Minimize to system tray on close"
---
Renamed "Close on X" to "Minimize to system tray on close"
---


--- 'a/src/main/java/com/stream_pi/server/controller/Controller.java'
+++ b/src/main/java/com/stream_pi/server/controller/Controller.java
@@ -354,14 +354,12 @@ public class Controller extends Base imp
     {
         try
         {
-            if(!Config.getInstance().getCloseOnX())
+            if(Config.getInstance().getMinimiseToSystemTrayOnClose() &&
+                    SystemTray.isSupported())
             {
-                if(SystemTray.isSupported())
-                {
-                    minimiseApp();
-                    event.consume();
-                    return;
-                }
+                minimiseApp();
+                event.consume();
+                return;
             }
 
             getConfig().setStartupWindowSize(

--- 'a/src/main/java/com/stream_pi/server/io/Config.java'
+++ b/src/main/java/com/stream_pi/server/io/Config.java
@@ -207,10 +207,10 @@ public class Config
                 getDefaultStartOnBoot(), false, true, document, configFile);
     }
 
-    public boolean getCloseOnX()
+    public boolean getMinimiseToSystemTrayOnClose()
     {
-        return XMLConfigHelper.getBooleanProperty(getOthersElement(), "close-on-x",
-                getDefaultCloseOnX(), false, true, document, configFile);
+        return XMLConfigHelper.getBooleanProperty(getOthersElement(), "minimize-to-tray-on-close",
+                getDefaultMinimiseToSystemTrayOnClose(), false, true, document, configFile);
     }
 
     public boolean isFirstTimeUse()
@@ -229,9 +229,9 @@ public class Config
         return false;
     }
 
-    public boolean getDefaultCloseOnX()
+    public boolean getDefaultMinimiseToSystemTrayOnClose()
     {
-        return false;
+        return true;
     }
 
 
@@ -308,9 +308,9 @@ public class Config
         getOthersElement().getElementsByTagName("start-on-boot").item(0).setTextContent(value+"");
     }
 
-    public void setCloseOnX(boolean value)
+    public void setMinimiseToSystemTrayOnClose(boolean value)
     {
-        getOthersElement().getElementsByTagName("close-on-x").item(0).setTextContent(value+"");
+        getOthersElement().getElementsByTagName("minimize-to-tray-on-close").item(0).setTextContent(value+"");
     }
 
     public void setFirstTimeUse(boolean value)

--- 'a/src/main/java/com/stream_pi/server/window/settings/GeneralSettings.java'
+++ b/src/main/java/com/stream_pi/server/window/settings/GeneralSettings.java
@@ -43,7 +43,7 @@ public class GeneralSettings extends VBo
     private final TextField actionGridPaneActionBoxSize;
     private final TextField actionGridPaneActionBoxGap;
     private final ToggleButton startOnBootToggleButton;
-    private final ToggleButton closeOnXToggleButton;
+    private final ToggleButton minimizeToSystemTrayOnCloseToggleButton;
     private final Button saveButton;
     private final Button checkForUpdatesButton;
 
@@ -78,7 +78,7 @@ public class GeneralSettings extends VBo
         actionGridPaneActionBoxGap = new TextField();
 
         startOnBootToggleButton = new ToggleButton("Start on Boot");
-        closeOnXToggleButton = new ToggleButton("Quit On window Close");
+        minimizeToSystemTrayOnCloseToggleButton = new ToggleButton("Minimise To Tray On Close");
 
         checkForUpdatesButton = new Button("Check for updates");
         checkForUpdatesButton.setOnAction(event->checkForUpdates());
@@ -100,7 +100,7 @@ public class GeneralSettings extends VBo
 
         serverNameTextField.setPrefWidth(200);
 
-        HBox toggleButtons = new HBox(closeOnXToggleButton, startOnBootToggleButton);
+        HBox toggleButtons = new HBox(minimizeToSystemTrayOnCloseToggleButton, startOnBootToggleButton);
         toggleButtons.setSpacing(10.0);
         VBox.setMargin(toggleButtons, new Insets(30, 0 , 0,0));
         toggleButtons.setAlignment(Pos.CENTER);
@@ -182,7 +182,7 @@ public class GeneralSettings extends VBo
             actionGridPaneActionBoxSize.setText(config.getActionGridActionSize()+"");
             actionGridPaneActionBoxGap.setText(config.getActionGridActionGap()+"");
 
-            closeOnXToggleButton.setSelected(config.getCloseOnX());
+            minimizeToSystemTrayOnCloseToggleButton.setSelected(config.getMinimiseToSystemTrayOnClose());
             startOnBootToggleButton.setSelected(config.getStartOnBoot());
         });
     }
@@ -203,7 +203,7 @@ public class GeneralSettings extends VBo
                         serverNameTextField.setDisable(true);
                         portTextField.setDisable(true);
 
-                        closeOnXToggleButton.setDisable(true);
+                        minimizeToSystemTrayOnCloseToggleButton.setDisable(true);
                         startOnBootToggleButton.setDisable(true);
                     });
 
@@ -215,7 +215,7 @@ public class GeneralSettings extends VBo
                     String actionGridActionBoxSize = actionGridPaneActionBoxSize.getText();
                     String actionGridActionBoxGap = actionGridPaneActionBoxGap.getText();
 
-                    boolean closeOnX = closeOnXToggleButton.isSelected();
+                    boolean minimizeToSystemTrayOnClose = minimizeToSystemTrayOnCloseToggleButton.isSelected();
                     boolean startOnBoot = startOnBootToggleButton.isSelected();
 
                     Config config = Config.getInstance();
@@ -335,14 +335,14 @@ public class GeneralSettings extends VBo
                         }
                     }
 
-                    if(!closeOnX)
+                    if(!minimizeToSystemTrayOnClose)
                     {
                         if(!SystemTray.isSupported()) 
                         {
                             StreamPiAlert alert = new StreamPiAlert("Not Supported", "Tray System not supported on this platform ", StreamPiAlertType.ERROR);
                             alert.show();
 
-                            closeOnX = true;
+                            minimizeToSystemTrayOnClose = true;
                         }
                     }
 
@@ -353,7 +353,7 @@ public class GeneralSettings extends VBo
                     config.setPluginsPath(pluginsPathStr);
                     config.setThemesPath(themesPathStr);
 
-                    config.setCloseOnX(closeOnX);
+                    config.setMinimiseToSystemTrayOnClose(minimizeToSystemTrayOnClose);
                     config.setStartupOnBoot(startOnBoot);
 
                     config.save();
@@ -386,7 +386,7 @@ public class GeneralSettings extends VBo
                         serverNameTextField.setDisable(false);
                         portTextField.setDisable(false);
 
-                        closeOnXToggleButton.setDisable(false);
+                        minimizeToSystemTrayOnCloseToggleButton.setDisable(false);
                         startOnBootToggleButton.setDisable(false);
                     });
                 }

Binary files 'a/src/main/resources/com/stream_pi/server/Default.obj' and b/src/main/resources/com/stream_pi/server/Default.obj differ