From: Debayan Sutradhar Date: Sun, 30 May 2021 08:33:43 +0530 Subject: Fix #53 --- Fix #53 --- --- 'a/src/main/java/com/stream_pi/server/io/Config.java' +++ b/src/main/java/com/stream_pi/server/io/Config.java @@ -407,4 +407,19 @@ public class Config config.save(); } + + public void setShowAlertsPopup(boolean value) + { + getOthersElement().getElementsByTagName("alerts-popup").item(0).setTextContent(value+""); + } + + public boolean isShowAlertsPopup() + { + return XMLConfigHelper.getBooleanProperty(getOthersElement(), "alerts-popup", getDefaultIsShowAlertsPopup(), false, true, document, configFile); + } + + public boolean getDefaultIsShowAlertsPopup() + { + return true; + } } --- 'a/src/main/java/com/stream_pi/server/window/settings/GeneralSettings.java' +++ b/src/main/java/com/stream_pi/server/window/settings/GeneralSettings.java @@ -48,6 +48,7 @@ public class GeneralSettings extends VBo private final TextField actionGridPaneActionBoxGap; private final ToggleButton startOnBootToggleButton; private final ToggleButton minimizeToSystemTrayOnCloseToggleButton; + private final ToggleButton showAlertsPopupToggleButton; private final Button saveButton; private final Button checkForUpdatesButton; @@ -83,6 +84,7 @@ public class GeneralSettings extends VBo startOnBootToggleButton = new ToggleButton("Start on Boot"); minimizeToSystemTrayOnCloseToggleButton = new ToggleButton("Minimise To Tray On Close"); + showAlertsPopupToggleButton = new ToggleButton("Show Popup On Alert"); checkForUpdatesButton = new Button("Check for updates"); checkForUpdatesButton.setOnAction(event->checkForUpdates()); @@ -104,7 +106,7 @@ public class GeneralSettings extends VBo serverNameTextField.setPrefWidth(200); - HBox toggleButtons = new HBox(minimizeToSystemTrayOnCloseToggleButton, startOnBootToggleButton); + HBox toggleButtons = new HBox(minimizeToSystemTrayOnCloseToggleButton, startOnBootToggleButton, showAlertsPopupToggleButton); toggleButtons.setSpacing(10.0); VBox.setMargin(toggleButtons, new Insets(30, 0 , 0,0)); toggleButtons.setAlignment(Pos.CENTER); @@ -192,6 +194,7 @@ public class GeneralSettings extends VBo actionGridPaneActionBoxGap.setText(config.getActionGridActionGap()+""); minimizeToSystemTrayOnCloseToggleButton.setSelected(config.getMinimiseToSystemTrayOnClose()); + showAlertsPopupToggleButton.setSelected(config.isShowAlertsPopup()); startOnBootToggleButton.setSelected(config.getStartOnBoot()); }); } @@ -213,6 +216,7 @@ public class GeneralSettings extends VBo portTextField.setDisable(true); minimizeToSystemTrayOnCloseToggleButton.setDisable(true); + showAlertsPopupToggleButton.setDisable(true); startOnBootToggleButton.setDisable(true); }); @@ -225,6 +229,7 @@ public class GeneralSettings extends VBo String actionGridActionBoxGap = actionGridPaneActionBoxGap.getText(); boolean minimizeToSystemTrayOnClose = minimizeToSystemTrayOnCloseToggleButton.isSelected(); + boolean showAlertsPopup = showAlertsPopupToggleButton.isSelected(); boolean startOnBoot = startOnBootToggleButton.isSelected(); Config config = Config.getInstance(); @@ -365,6 +370,8 @@ public class GeneralSettings extends VBo config.setThemesPath(themesPathStr); config.setMinimiseToSystemTrayOnClose(minimizeToSystemTrayOnClose); + StreamPiAlert.setIsShowPopup(showAlertsPopup); + config.setShowAlertsPopup(showAlertsPopup); config.setStartupOnBoot(startOnBoot); config.save(); @@ -420,6 +427,7 @@ public class GeneralSettings extends VBo portTextField.setDisable(false); minimizeToSystemTrayOnCloseToggleButton.setDisable(false); + showAlertsPopupToggleButton.setDisable(false); startOnBootToggleButton.setDisable(false); }); }