server

Renamed "Close on X" to "Minimize to system tray on close"

Download Browse

+22 −24

Author

Debayan Sutradhar (rnayabed) 2021-02-26 20:13

Committer

Debayan Sutradhar (rnayabed) 2021-02-26 20:13

Hash e058417fb9fe0198a1d6bb56c76562c58471145f

Parent cbfcf6f4be210003161614eeb8c7651ecc871184

Reference git #server/e058417fb9fe0198a1d6bb56c76562c58471145f

Modified Files

List

Side by side diff

Inline diff

M src/main/java/com/stream_pi/server/controller/Controller.java

+5 −7

package com.stream_pi.server.controller;

import com.stream_pi.action_api.action.ServerConnection;

import com.stream_pi.action_api.action.PropertySaver;

import com.stream_pi.action_api.normalaction.NormalAction;

import com.stream_pi.server.Main;

import com.stream_pi.server.action.NormalActionPlugins;

import com.stream_pi.server.connection.ClientConnections;

import com.stream_pi.server.connection.MainServer;

import com.stream_pi.server.io.Config;

import com.stream_pi.server.info.ServerInfo;

import com.stream_pi.server.window.Base;

import com.stream_pi.server.window.dashboard.DonatePopupContent;

import com.stream_pi.server.window.firsttimeuse.FirstTimeUse;

import com.stream_pi.util.alert.StreamPiAlert;

import com.stream_pi.util.alert.StreamPiAlertListener;

import com.stream_pi.util.alert.StreamPiAlertType;

import com.stream_pi.util.exception.MinorException;

import com.stream_pi.util.exception.SevereException;

import com.stream_pi.util.iohelper.IOHelper;

import javafx.animation.Interpolator;

import javafx.animation.KeyFrame;

import javafx.animation.KeyValue;

import javafx.animation.Timeline;

import javafx.application.Platform;

import javafx.concurrent.Task;

import javafx.event.EventHandler;

import javafx.scene.Node;

import javafx.scene.Scene;

import javafx.stage.Modality;

import javafx.stage.Stage;

import javafx.stage.WindowEvent;

import java.awt.SystemTray;

import javafx.util.Duration;

import java.awt.Toolkit;

import java.awt.TrayIcon;

import java.awt.PopupMenu;

import java.awt.MenuItem;

import java.io.File;

import java.net.Inet4Address;

import java.net.InetAddress;

import java.net.NetworkInterface;

import java.net.UnknownHostException;

import java.util.Enumeration;

import java.util.Random;

import java.util.logging.Level;

public class Controller extends Base implements PropertySaver, ServerConnection

{

MainServer mainServer;

public void setupDashWindow() throws SevereException

{

try

{

StringBuilder ips = new StringBuilder();

Enumeration<NetworkInterface> e = NetworkInterface.getNetworkInterfaces();

while(e.hasMoreElements())

{

NetworkInterface n = e.nextElement();

Enumeration<InetAddress> ee = n.getInetAddresses();

while (ee.hasMoreElements())

{

InetAddress i = ee.nextElement();

String hostAddress = i.getHostAddress();

if(i instanceof Inet4Address)

{

ips.append(hostAddress);

if(e.hasMoreElements())

ips.append(" / ");

}

getStage().setTitle("Stream-Pi Server - IP(s): "+ips.toString()+" | Port: "+ Config.getInstance().getPort()); //Sets title

getStage().setOnCloseRequest(this::onCloseRequest);

}

catch (Exception e)

{

e.printStackTrace();

throw new SevereException(e.getMessage());

}

@Override

public void init()

{

try {

initBase();

setupDashWindow();

setupSettingsWindowsAnimations();

NormalActionPlugins.getInstance().setPropertySaver(this);

NormalActionPlugins.getInstance().setServerConnection(this);

getDashboardPane().getPluginsPane().getSettingsButton().setOnAction(event -> {

openSettingsTimeLine.play();

});

getSettingsPane().getCloseButton().setOnAction(event -> {

closeSettingsTimeLine.play();

});

getSettingsPane().getThemesSettings().setController(this);

mainServer = new MainServer(this, this);

if(getConfig().isFirstTimeUse())

{

Stage stage = new Stage();

Scene s = new Scene(new FirstTimeUse(this, this), 512, 300);

stage.setResizable(false);

stage.setScene(s);

stage.setTitle("Stream-Pi Server Setup");

stage.initModality(Modality.APPLICATION_MODAL);

stage.setOnCloseRequest(event->Platform.exit());

stage.show();

}

else

{

if(getConfig().isAllowDonatePopup())

{

if(new Random().nextInt(5) == 3)

new DonatePopupContent(getHostServices(), this).show();

}

othInit();

}

catch (SevereException e)

{

handleSevereException(e);

}

@Override

public void othInit()

{

try

{

if(ServerInfo.getInstance().isStartMinimised() && SystemTray.isSupported())

minimiseApp();

else

getStage().show();

}

catch(MinorException e)

{

handleMinorException(e);

}

new Thread(new Task<Void>() {

@Override

protected Void call()

{

try

{

getSettingsPane().getGeneralSettings().loadDataFromConfig();

//themes

getSettingsPane().getThemesSettings().setThemes(getThemes());

getSettingsPane().getThemesSettings().setCurrentThemeFullName(getCurrentTheme().getFullName());

getSettingsPane().getThemesSettings().loadThemes();

//clients

getSettingsPane().getClientsSettings().loadData();

try

{

//Plugins

Platform.runLater(()->{

getDashboardPane().getPluginsPane().clearData();

getDashboardPane().getPluginsPane().loadOtherActions();

});

NormalActionPlugins.setPluginsLocation(getConfig().getPluginsPath());

NormalActionPlugins.getInstance().init();

Platform.runLater(()->getDashboardPane().getPluginsPane().loadData());

getSettingsPane().getPluginsSettings().loadPlugins();

}

catch (MinorException e)

{

getSettingsPane().getPluginsSettings().showPluginInitError();

handleMinorException(e);

}

//Server

mainServer.setPort(getConfig().getPort());

mainServer.start();

}

catch (SevereException e)

{

handleSevereException(e);

}

return null;

}

}).start();

}

private void setupSettingsWindowsAnimations()

{

Node settingsNode = getSettingsPane();

Node dashboardNode = getDashboardPane();

openSettingsTimeLine = new Timeline();

openSettingsTimeLine.setCycleCount(1);

openSettingsTimeLine.getKeyFrames().addAll(

new KeyFrame(Duration.millis(0.0D),

new KeyValue(settingsNode.opacityProperty(),

0.0D, Interpolator.EASE_IN),

new KeyValue(settingsNode.scaleXProperty(),

1.1D, Interpolator.EASE_IN),

new KeyValue(settingsNode.scaleYProperty(),

1.1D, Interpolator.EASE_IN),

new KeyValue(settingsNode.scaleZProperty(),

1.1D, Interpolator.EASE_IN)),

new KeyFrame(Duration.millis(90.0D),

new KeyValue(settingsNode.opacityProperty(),

1.0D, Interpolator.LINEAR),

new KeyValue(settingsNode.scaleXProperty(),

1.0D, Interpolator.LINEAR),

new KeyValue(settingsNode.scaleYProperty(),

1.0D, Interpolator.LINEAR),

new KeyValue(settingsNode.scaleZProperty(),

1.0D, Interpolator.LINEAR)),

new KeyFrame(Duration.millis(0.0D),

new KeyValue(dashboardNode.opacityProperty(),

1.0D, Interpolator.LINEAR),

new KeyValue(dashboardNode.scaleXProperty(),

1.0D, Interpolator.LINEAR),

new KeyValue(dashboardNode.scaleYProperty(),

1.0D, Interpolator.LINEAR),

new KeyValue(dashboardNode.scaleZProperty(),

1.0D, Interpolator.LINEAR)),

new KeyFrame(Duration.millis(90.0D),

new KeyValue(dashboardNode.opacityProperty(),

0.0D, Interpolator.LINEAR),

new KeyValue(dashboardNode.scaleXProperty(),

0.9D, Interpolator.LINEAR),

new KeyValue(dashboardNode.scaleYProperty(),

0.9D, Interpolator.LINEAR),

new KeyValue(dashboardNode.scaleZProperty(),

0.9D, Interpolator.LINEAR))

);

openSettingsTimeLine.setOnFinished(event1 -> {

settingsNode.toFront();

});

closeSettingsTimeLine = new Timeline();

closeSettingsTimeLine.setCycleCount(1);

closeSettingsTimeLine.getKeyFrames().addAll(

new KeyFrame(Duration.millis(0.0D),

new KeyValue(settingsNode.opacityProperty(),

1.0D, Interpolator.LINEAR),

new KeyValue(settingsNode.scaleXProperty(),

1.0D, Interpolator.LINEAR),

new KeyValue(settingsNode.scaleYProperty(),

1.0D, Interpolator.LINEAR),

new KeyValue(settingsNode.scaleZProperty(),

1.0D, Interpolator.LINEAR)),

new KeyFrame(Duration.millis(90.0D),

new KeyValue(settingsNode.opacityProperty(),

0.0D, Interpolator.LINEAR),

new KeyValue(settingsNode.scaleXProperty(),

1.1D, Interpolator.LINEAR),

new KeyValue(settingsNode.scaleYProperty(),

1.1D, Interpolator.LINEAR),

new KeyValue(settingsNode.scaleZProperty(),

1.1D, Interpolator.LINEAR)),

new KeyFrame(Duration.millis(0.0D),

new KeyValue(dashboardNode.opacityProperty(),

0.0D, Interpolator.LINEAR),

new KeyValue(dashboardNode.scaleXProperty(),

0.9D, Interpolator.LINEAR),

new KeyValue(dashboardNode.scaleYProperty(),

0.9D, Interpolator.LINEAR),

new KeyValue(dashboardNode.scaleZProperty(),

0.9D, Interpolator.LINEAR)),

new KeyFrame(Duration.millis(90.0D),

new KeyValue(dashboardNode.opacityProperty(),

1.0D, Interpolator.LINEAR),

new KeyValue(dashboardNode.scaleXProperty(),

1.0D, Interpolator.LINEAR),

new KeyValue(dashboardNode.scaleYProperty(),

1.0D, Interpolator.LINEAR),

new KeyValue(dashboardNode.scaleZProperty(),

1.0D, Interpolator.LINEAR))

);

closeSettingsTimeLine.setOnFinished(event1 -> {

dashboardNode.toFront();

new Thread(new Task<Void>() {

@Override

protected Void call() {

try {

getSettingsPane().getClientsSettings().loadData();

getSettingsPane().getGeneralSettings().loadDataFromConfig();

getSettingsPane().getPluginsSettings().loadPlugins();

getSettingsPane().getThemesSettings().setThemes(getThemes());

getSettingsPane().getThemesSettings().setCurrentThemeFullName(getCurrentTheme().getFullName());

getSettingsPane().getThemesSettings().loadThemes();

getSettingsPane().setDefaultTabToGeneral();

}

catch (SevereException e)

{

handleSevereException(e);

}

catch (MinorException e)

{

handleMinorException(e);

}

return null;

}

}).start();

});

}

private Timeline openSettingsTimeLine;

private Timeline closeSettingsTimeLine;

public Controller(){

mainServer = null;

}

public void onCloseRequest(WindowEvent event)

{

try

{

if(!Config.getInstance().getCloseOnX())

if(Config.getInstance().getMinimiseToSystemTrayOnClose() &&

SystemTray.isSupported())

{

if(SystemTray.isSupported())

minimiseApp();

{

event.consume();

minimiseApp();

return;

event.consume();

return;

}

getConfig().setStartupWindowSize(

getWidth(),

getHeight()

);

getConfig().save();

onQuitApp();

NormalActionPlugins.getInstance().shutDownActions();

Platform.exit();

}

catch (SevereException e)

{

handleSevereException(e);

}

catch (MinorException e)

{

handleMinorException(e);

}

finally

{

closeLogger();

}

public void onQuitApp()

{

if(mainServer!=null)

mainServer.stopListeningForConnections();

ClientConnections.getInstance().disconnectAll();

getLogger().info("Shutting down ...");

}

public void minimiseApp() throws MinorException

{

try

{

SystemTray systemTray = SystemTray.getSystemTray();

if(getTrayIcon() == null)

initIconTray(systemTray);

systemTray.add(getTrayIcon());

getStage().hide();

getStage().setOnShown(windowEvent -> {

systemTray.remove(getTrayIcon());

});

}

catch(Exception e)

{

throw new MinorException(e.getMessage());

}

public void initIconTray(SystemTray systemTray)

{

Platform.setImplicitExit(false);

PopupMenu popup = new PopupMenu();

MenuItem showItem = new MenuItem("Show");

showItem.addActionListener(l->{

Platform.runLater(()->{

getStage().show();

});

MenuItem exitItem = new MenuItem("Exit");

exitItem.addActionListener(l->{

systemTray.remove(getTrayIcon());

onQuitApp();

Platform.exit();

});

popup.add(showItem);

popup.addSeparator();

popup.add(exitItem);

TrayIcon trayIcon = new TrayIcon(

Toolkit.getDefaultToolkit().getImage(Main.class.getResource("app_icon.png")),

"Stream-Pi Server",

popup

);

trayIcon.setImageAutoSize(true);

this.trayIcon = trayIcon;

}

private TrayIcon trayIcon = null;

public TrayIcon getTrayIcon()

{

return trayIcon;

}

@Override

public void handleMinorException(MinorException e) {

getLogger().log(Level.SEVERE, e.getMessage(), e);

e.printStackTrace();

Platform.runLater(()->{

new StreamPiAlert(e.getTitle(), e.getShortMessage(), StreamPiAlertType.WARNING).show();

});

}

@Override

public void handleSevereException(SevereException e) {

getLogger().log(Level.SEVERE, e.getMessage(), e);

e.printStackTrace();

Platform.runLater(()->{

StreamPiAlert alert = new StreamPiAlert(e.getTitle(), e.getShortMessage(), StreamPiAlertType.ERROR);

alert.setOnClicked(new StreamPiAlertListener()

{

@Override

public void onClick(String txt)

{

onQuitApp();

Platform.exit();

}

});

alert.show();

});

}

@Override

public synchronized boolean onNormalActionClicked(NormalAction action) {

try{

getLogger().info("action "+action.getID()+" clicked!");

action.onActionClicked();

return true;

}

catch (Exception e)

{

//check if its windows UAC related

if(e.getMessage().contains("operation requires elevation"))

{

handleMinorException(new MinorException(

"Action Execution Failed!",

"Error running action at ["+action.getLocation().getRow()+","+action.getLocation().getCol()+"] ("+action.getDisplayText()+")\n"+

"This action requires higher UAC privileges. Re-launch Stream-Pi Server with 'Administrator Privileges' in order to run this command.")

);

}

else

{

handleMinorException(new MinorException(

"Action Execution Failed!",

"Error running action at ["+action.getLocation().getRow()+","+action.getLocation().getCol()+"] ("+action.getDisplayText()+")\n"+

"Check stacktrace/log to know what exactly happened\n\nMessage : \n"+e.getMessage() )

);

}

return false;

}

@Override

public void clearTemp() {

Platform.runLater(() -> {

getDashboardPane().getClientDetailsPane().refresh();

getDashboardPane().getActionGridPane().clear();

getDashboardPane().getActionGridPane().setFreshRender(true);

getDashboardPane().getActionDetailsPane().clear();

getSettingsPane().getClientsSettings().loadData();

});

}

@Override

public void saveServerProperties() {

try {

NormalActionPlugins.getInstance().saveServerSettings();

getSettingsPane().getPluginsSettings().loadPlugins();

} catch (MinorException e) {

e.printStackTrace();

handleMinorException(e);

}

@Override

public com.stream_pi.util.platform.Platform getPlatform() {

return ServerInfo.getInstance().getPlatformType();

}

M src/main/java/com/stream_pi/server/io/Config.java

+7 −7

Config.java

Contributor(s) : Debayan Sutradhar (@rnayabed)

handler for config.xml

package com.stream_pi.server.io;

import java.io.File;

import java.util.logging.Logger;

import javax.xml.parsers.DocumentBuilder;

import javax.xml.parsers.DocumentBuilderFactory;

import javax.xml.transform.Result;

import javax.xml.transform.Source;

import javax.xml.transform.Transformer;

import javax.xml.transform.TransformerFactory;

import javax.xml.transform.dom.DOMSource;

import javax.xml.transform.stream.StreamResult;

import com.stream_pi.server.info.ServerInfo;

import com.stream_pi.util.exception.SevereException;

import com.stream_pi.util.xmlconfighelper.XMLConfigHelper;

import org.w3c.dom.Document;

import org.w3c.dom.Element;

public class Config

{

private static Config instance = null;

private final File configFile;

private Document document;

private Config() throws SevereException {

try {

configFile = new File(ServerInfo.getInstance().getPrePath()+"config.xml");

DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();

DocumentBuilder docBuilder = docFactory.newDocumentBuilder();

document = docBuilder.parse(configFile);

} catch (Exception e) {

e.printStackTrace();

throw new SevereException("Config", "unable to read config.xml");

}

public static synchronized Config getInstance() throws SevereException

{

if(instance == null)

instance = new Config();

return instance;

}

Logger logger = Logger.getLogger(Config.class.getName());

public void save() throws SevereException {

try {

logger.info("Saving config ...");

Transformer transformer = TransformerFactory.newInstance().newTransformer();

Result output = new StreamResult(configFile);

Source input = new DOMSource(document);

transformer.transform(input, output);

logger.info("... Done!");

} catch (Exception e) {

throw new SevereException("Config", "unable to save config.xml");

}

//Getters

//comms

private Element getCommsElement()

{

return (Element) document.getElementsByTagName("comms").item(0);

}

public String getServerName()

{

return XMLConfigHelper.getStringProperty(getCommsElement(), "name",

getDefaultServerName(), false, true, document, configFile);

}

public int getPort()

{

return XMLConfigHelper.getIntProperty(getCommsElement(), "port",

getDefaultPort(), false, true, document, configFile);

}

//default getters

public String getDefaultServerName()

{

return "Stream-Pi Server";

}

public int getDefaultPort()

{

return 2004;

}

private Element getServerElement()

{

return (Element) document.getElementsByTagName("server").item(0);

}

//server

private Element getActionGridElement()

{

return (Element) getServerElement().getElementsByTagName("action-grid").item(0);

}

public int getActionGridActionGap()

{

return XMLConfigHelper.getIntProperty(getActionGridElement(), "gap",

getDefaultActionGridActionGap(), false, true, document, configFile);

}

public int getActionGridActionSize()

{

return XMLConfigHelper.getIntProperty(getActionGridElement(), "size",

getDefaultActionGridSize(), false, true, document, configFile);

}

public String getCurrentThemeFullName()

{

return XMLConfigHelper.getStringProperty(getServerElement(), "current-theme-full-name",

getDefaultCurrentThemeFullName(), false, true, document, configFile);

}

public String getThemesPath()

{

return XMLConfigHelper.getStringProperty(getServerElement(), "themes-path",

getDefaultThemesPath(), false, true, document, configFile);

}

public String getPluginsPath()

{

return XMLConfigHelper.getStringProperty(getServerElement(), "plugins-path",

getDefaultPluginsPath(), false, true, document, configFile);

}

//default getters

public String getDefaultCurrentThemeFullName()

{

return "com.stream_pi.defaultlight";

}

public String getDefaultThemesPath()

{

return "Themes/";

}

public String getDefaultPluginsPath()

{

return "Plugins/";

}

//server > startup-window-size

private Element getStartupWindowSizeElement()

{

return (Element) getServerElement().getElementsByTagName("startup-window-size").item(0);

}

public double getStartupWindowWidth()

{

return XMLConfigHelper.getDoubleProperty(getStartupWindowSizeElement(), "width",

getDefaultStartupWindowWidth(), false, true, document, configFile);

}

public double getStartupWindowHeight()

{

return XMLConfigHelper.getDoubleProperty(getStartupWindowSizeElement(), "height",

getDefaultStartupWindowHeight(), false, true, document, configFile);

}

//default getters

public int getDefaultStartupWindowWidth()

{

return 1024;

}

public int getDefaultStartupWindowHeight()

{

return 768;

}

//others

private Element getOthersElement()

{

return (Element) document.getElementsByTagName("others").item(0);

}

public boolean getStartOnBoot()

{

return XMLConfigHelper.getBooleanProperty(getOthersElement(), "start-on-boot",

getDefaultStartOnBoot(), false, true, document, configFile);

}

public boolean getCloseOnX()

public boolean getMinimiseToSystemTrayOnClose()

{

return XMLConfigHelper.getBooleanProperty(getOthersElement(), "close-on-x",

return XMLConfigHelper.getBooleanProperty(getOthersElement(), "minimize-to-tray-on-close",

getDefaultCloseOnX(), false, true, document, configFile);

getDefaultMinimiseToSystemTrayOnClose(), false, true, document, configFile);

}

public boolean isFirstTimeUse()

{

return XMLConfigHelper.getBooleanProperty(getOthersElement(), "first-time-use", true, false, true, document, configFile);

}

public boolean isAllowDonatePopup()

{

return XMLConfigHelper.getBooleanProperty(getOthersElement(), "allow-donate-popup", true, false, true, document, configFile);

}

//default getters

public boolean getDefaultStartOnBoot()

{

return false;

}

public boolean getDefaultCloseOnX()

public boolean getDefaultMinimiseToSystemTrayOnClose()

{

return false;

return true;

}

//Setters

//comms

public void setServerName(String name)

{

getCommsElement().getElementsByTagName("name").item(0).setTextContent(name);

}

public void setServerPort(int port)

{

getCommsElement().getElementsByTagName("port").item(0).setTextContent(port+"");

}

//server

public int getDefaultActionGridActionGap()

{

return 5;

}

public int getDefaultActionGridSize()

{

return 100;

}

public void setActionGridSize(int size)

{

getActionGridElement().getElementsByTagName("size").item(0).setTextContent(size+"");

}

public void setActionGridGap(int size)

{

getActionGridElement().getElementsByTagName("gap").item(0).setTextContent(size+"");

}

public void setPluginsPath(String path)

{

getServerElement().getElementsByTagName("plugins-path").item(0).setTextContent(path);

}

public void setThemesPath(String path)

{

getServerElement().getElementsByTagName("themes-path").item(0).setTextContent(path);

}

public void setCurrentThemeFullName(String themeName)

{

getServerElement().getElementsByTagName("current-theme-full-name").item(0).setTextContent(themeName);

}

//server > startup-window-size

public void setStartupWindowSize(double width, double height)

{

setStartupWindowWidth(width);

setStartupWindowHeight(height);

}

public void setStartupWindowWidth(double width)

{

getStartupWindowSizeElement().getElementsByTagName("width").item(0).setTextContent(width+"");

}

public void setStartupWindowHeight(double height)

{

getStartupWindowSizeElement().getElementsByTagName("height").item(0).setTextContent(height+"");

}

//others

public void setStartupOnBoot(boolean value)

{

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)

{

getOthersElement().getElementsByTagName("first-time-use").item(0).setTextContent(value+"");

}

public void setAllowDonatePopup(boolean value)

{

getOthersElement().getElementsByTagName("allow-donate-popup").item(0).setTextContent(value+"");

}

M src/main/java/com/stream_pi/server/window/settings/GeneralSettings.java

+10 −10

package com.stream_pi.server.window.settings;

import com.stream_pi.server.connection.ServerListener;

import com.stream_pi.server.io.Config;

import com.stream_pi.server.window.ExceptionAndAlertHandler;

import com.stream_pi.server.info.ServerInfo;

import com.stream_pi.util.alert.StreamPiAlert;

import com.stream_pi.util.alert.StreamPiAlertType;

import com.stream_pi.util.checkforupdates.CheckForUpdates;

import com.stream_pi.util.exception.MinorException;

import com.stream_pi.util.exception.SevereException;

import com.stream_pi.util.platform.PlatformType;

import com.stream_pi.util.startatboot.StartAtBoot;

import com.stream_pi.util.version.Version;

import javafx.application.HostServices;

import javafx.application.Platform;

import javafx.concurrent.Task;

import javafx.geometry.Insets;

import javafx.geometry.Pos;

import javafx.scene.control.*;

import javafx.scene.control.Button;

import javafx.scene.control.Label;

import javafx.scene.control.ScrollPane;

import javafx.scene.control.TextField;

import javafx.scene.layout.*;

import javafx.stage.DirectoryChooser;

import org.kordamp.ikonli.javafx.FontIcon;

import java.awt.SystemTray;

import java.io.BufferedReader;

import java.io.File;

import java.io.InputStreamReader;

import java.net.URL;

import java.util.logging.Logger;

public class GeneralSettings extends VBox {

private final TextField serverNameTextField;

private final TextField portTextField;

private final TextField pluginsPathTextField;

private final TextField themesPathTextField;

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;

private Logger logger;

private ExceptionAndAlertHandler exceptionAndAlertHandler;

private ServerListener serverListener;

private HostServices hostServices;

public GeneralSettings(ExceptionAndAlertHandler exceptionAndAlertHandler, ServerListener serverListener, HostServices hostServices)

{

this.hostServices = hostServices;

this.exceptionAndAlertHandler = exceptionAndAlertHandler;

this.serverListener = serverListener;

logger = Logger.getLogger(GeneralSettings.class.getName());

serverNameTextField = new TextField();

portTextField = new TextField();

pluginsPathTextField = new TextField();

themesPathTextField = new TextField();

actionGridPaneActionBoxSize = new TextField();

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());

getStyleClass().add("general_settings");

prefWidthProperty().bind(widthProperty());

setAlignment(Pos.CENTER);

setSpacing(5);

getChildren().addAll(

getUIInputBox("Server Name", serverNameTextField),

getUIInputBox("Port", portTextField),

getUIInputBox("Grid Pane - Box Size", actionGridPaneActionBoxSize),

getUIInputBox("Grid Pane - Box Gap", actionGridPaneActionBoxGap),

getUIInputBoxWithDirectoryChooser("Plugins Path", pluginsPathTextField),

getUIInputBoxWithDirectoryChooser("Themes Path", themesPathTextField)

);

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);

saveButton = new Button("Save");

saveButton.setOnAction(event->save());

getChildren().addAll(toggleButtons, checkForUpdatesButton, saveButton);

setPadding(new Insets(10));

}

private void checkForUpdates()

{

new CheckForUpdates(checkForUpdatesButton, hostServices,

PlatformType.SERVER, ServerInfo.getInstance().getVersion());

}

private HBox getUIInputBoxWithDirectoryChooser(String labelText, TextField textField)

{

HBox hBox = getUIInputBox(labelText, textField);

hBox.setSpacing(5.0);

TextField tf = (TextField) hBox.getChildren().get(2);

tf.setPrefWidth(300);

tf.setDisable(true);

Button button = new Button();

FontIcon fontIcon = new FontIcon("far-folder");

button.setGraphic(fontIcon);

button.setOnAction(event -> {

DirectoryChooser directoryChooser = new DirectoryChooser();

try {

File selectedDirectory = directoryChooser.showDialog(getScene().getWindow());

textField.setText(selectedDirectory.getAbsolutePath());

}

catch (NullPointerException e)

{

logger.info("No folder selected");

}

});

hBox.getChildren().add(button);

return hBox;

}

private HBox getUIInputBox(String labelText, TextField textField)

{

textField.setPrefWidth(100);

Label label = new Label(labelText);

Region region = new Region();

HBox.setHgrow(region, Priority.ALWAYS);

return new HBox(label, region, textField);

}

public void loadDataFromConfig() throws SevereException {

Config config = Config.getInstance();

Platform.runLater(()->

{

serverNameTextField.setText(config.getServerName());

portTextField.setText(config.getPort()+"");

pluginsPathTextField.setText(config.getPluginsPath());

themesPathTextField.setText(config.getThemesPath());

actionGridPaneActionBoxSize.setText(config.getActionGridActionSize()+"");

actionGridPaneActionBoxGap.setText(config.getActionGridActionGap()+"");

closeOnXToggleButton.setSelected(config.getCloseOnX());

minimizeToSystemTrayOnCloseToggleButton.setSelected(config.getMinimiseToSystemTrayOnClose());

startOnBootToggleButton.setSelected(config.getStartOnBoot());

});

}

public void save()

{

new Thread(new Task<Void>() {

@Override

protected Void call()

{

try {

boolean toBeReloaded = false;

boolean dashToBeReRendered = false;

Platform.runLater(()->{

saveButton.setDisable(true);

serverNameTextField.setDisable(true);

portTextField.setDisable(true);

closeOnXToggleButton.setDisable(true);

minimizeToSystemTrayOnCloseToggleButton.setDisable(true);

startOnBootToggleButton.setDisable(true);

});

String serverNameStr = serverNameTextField.getText();

String serverPortStr = portTextField.getText();

String pluginsPathStr = pluginsPathTextField.getText();

String themesPathStr = themesPathTextField.getText();

String actionGridActionBoxSize = actionGridPaneActionBoxSize.getText();

String actionGridActionBoxGap = actionGridPaneActionBoxGap.getText();

boolean closeOnX = closeOnXToggleButton.isSelected();

boolean minimizeToSystemTrayOnClose = minimizeToSystemTrayOnCloseToggleButton.isSelected();

boolean startOnBoot = startOnBootToggleButton.isSelected();

Config config = Config.getInstance();

StringBuilder errors = new StringBuilder();

if(serverNameStr.isBlank())

{

errors.append("* Server Name cannot be blank.\n");

}

else

{

if(!config.getServerName().equals(serverNameStr))

{

toBeReloaded = true;

}

int serverPort=-1;

try {

serverPort = Integer.parseInt(serverPortStr);

if (serverPort < 1024)

errors.append("* Server Port must be more than 1024");

if(config.getPort()!=serverPort)

{

toBeReloaded = true;

}

catch (NumberFormatException e)

{

errors.append("* Server Port must be integer.\n");

}

int actionSize=-1;

try {

actionSize = Integer.parseInt(actionGridActionBoxSize);

if(config.getActionGridActionSize() != actionSize)

{

dashToBeReRendered = true;

}

catch (NumberFormatException e)

{

errors.append("* action Size must be integer.\n");

}

int actionGap=-1;

try {

actionGap = Integer.parseInt(actionGridActionBoxGap);

if(config.getActionGridActionGap() != actionGap)

{

dashToBeReRendered = true;

}

catch (NumberFormatException e)

{

errors.append("* action Gap must be integer.\n");

}

if(pluginsPathStr.isBlank())

{

errors.append("* Plugins Path must not be blank.\n");

}

else

{

if(!config.getPluginsPath().equals(pluginsPathStr))

{

toBeReloaded = true;

}

if(themesPathStr.isBlank())

{

errors.append("* Themes Path must not be blank.\n");

}

else

{

if(!config.getThemesPath().equals(themesPathStr))

{

toBeReloaded = true;

}

if(!errors.toString().isEmpty())

{

throw new MinorException("settings", "Please rectify the following errors and try again :\n"+errors.toString());

}

if(config.getStartOnBoot() != startOnBoot)

{

if(ServerInfo.getInstance().getRunnerFileName() == null)

{

new StreamPiAlert("Uh Oh", "No Runner File Name Specified as startup arguments. Cant set run at boot.", StreamPiAlertType.ERROR).show();

startOnBoot = false;

}

else

{

StartAtBoot startAtBoot = new StartAtBoot(PlatformType.SERVER, ServerInfo.getInstance().getPlatformType());

if(startOnBoot)

{

startAtBoot.create(new File(ServerInfo.getInstance().getRunnerFileName()));

}

else

{

boolean result = startAtBoot.delete();

if(!result)

new StreamPiAlert("Uh Oh!", "Unable to delete starter file", StreamPiAlertType.ERROR).show();

}

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;

}

config.setServerName(serverNameStr);

config.setServerPort(serverPort);

config.setActionGridGap(actionGap);

config.setActionGridSize(actionSize);

config.setPluginsPath(pluginsPathStr);

config.setThemesPath(themesPathStr);

config.setCloseOnX(closeOnX);

config.setMinimiseToSystemTrayOnClose(minimizeToSystemTrayOnClose);

config.setStartupOnBoot(startOnBoot);

config.save();

loadDataFromConfig();

if(toBeReloaded)

{

new StreamPiAlert("Restart","Restart to see changes", StreamPiAlertType.INFORMATION).show();

}

if(dashToBeReRendered)

{

serverListener.clearTemp();

}

catch (MinorException e)

{

exceptionAndAlertHandler.handleMinorException(e);

}

catch (SevereException e)

{

exceptionAndAlertHandler.handleSevereException(e);

}

finally {

Platform.runLater(()->{

saveButton.setDisable(false);

serverNameTextField.setDisable(false);

portTextField.setDisable(false);

closeOnXToggleButton.setDisable(false);

minimizeToSystemTrayOnCloseToggleButton.setDisable(false);

startOnBootToggleButton.setDisable(false);

});

}

return null;

}

}).start();

}

M src/main/resources/com/stream_pi/server/Default.obj

+- −-

PKϮPR�

config.xmlUT ��+`��+`��+`ux��uR�n� ��+,� N�G��z��\Ѱ��0 Mԯ��}�<��f0�pt�>(k��f��t��Bvu�0Rhk`_[��]�iU�WU�p1?Eb GU��5��.

g}�ۦy`4�с�-X��V�N�@��=�"

z,��c,��L�x9)Zq�X�t^�g�O��a4��㏌��K-�K�L$� �&�I��!_ǛSk �H:j��K��S��}L�\��J�%�*�E6�/��y��͟�v�Nx��7�,F�a�`�wk#o�0��ɩ��F�ƣO(ZE�*��)��AN�Ek'��.�I�� #�o��/PKq��T�PK霟Q Plugins/UT ��_w�+`w�+`ux��PK霟Qm Plugins/config.xmlUT ��_u�`w�+`ux��Q(K-*��ϳU2�3PRH�K�O��K�U

qӵPR(.I�KI��K�U��W��I��K�L/-J,j��RP�IL1��l�a,.}4ePK��TXmPK��PR Themes/UT ��+`��+`��+`ux��PK��DR! Themes/com.stream_pi.defaultdark/UT k`��+`��+`ux��PK�DR% Themes/com.stream_pi.defaultdark/res/UT �2`w�+`w�+`ux��PK�DR� . Themes/com.stream_pi.defaultdark/res/style.cssUT �2`�7`w�+`ux��Vێ�0}G�,��*�[u�/�,��9�B��F��$r��<�|e��V

�Z` ��a��o�~�ٿ>�'��ݏ��Z��j�ǌ�N�9�E ��:j0�*wxΩz��D��,��v@/��.��/!�,m��k�k��kO�" NQ�E�J�B)�t�3�( �t��ai�N%�쒋��]C��y�{��M�i[�\Xx�g��h_76�~n>M�P��elZvp�:U�H��i��z�8�K�<i*��@�6r��'\��d �6��]��S �M�\(��aYwZ�e!^4�L�԰��ᒣ��ANآn��:�k{�.�H۬��9� �E� Ñ��!r��z7Ͱ�=�J��pK��6|��E�t��~g�Xm��9K,��m�~��`��F:�P��=F��%��y)j`1wi4 8�߰�N�Xn��󙅎E�E��{��3��SV^E�%��w)�t�a �g�>�ՏL�-a�V�ῷ.��PKЛ�E$� PK��DR�* Themes/com.stream_pi.defaultdark/theme.xmlUT k`��+`w�+`ux��uP�� M��Ni�� ]�89��>��/VZ��ݽ˽c�K�� F�p��nL;��)�ÑU|�c��r�&+|��a��1

/�U$��a��a��Dd�]o�'Z(�5H1��M�D.&pn�� ZF#�H6��)M�O�2�y�x��[ptY��9F&��^��O�t]�PK}��PK��DR" Themes/com.stream_pi.defaultlight/UT k`��+`��+`ux��PK��DR�+ Themes/com.stream_pi.defaultlight/theme.xmlUT k`��+`w�+`ux��uPA�0��{)L0)��ă/��@hM��{(��3��k��SF�I�f ]�F�Lη+-�Ñ� ��~�k�[�MV��{��1Hl�i0�+�8��~o��ҭ Ȳ��X�Z� N��i@rQ]��EL��z\X-gy��D�M�u΢�W�P8�zt��ǖ5��,b"+��-�PK�|��PK#�DR& Themes/com.stream_pi.defaultlight/res/UT ;1`w�+`w�+`ux��PK#�DR� / Themes/com.stream_pi.defaultlight/res/style.cssUT ;1`�7`w�+`ux��VM�� G�@꭪��^�{N��AK�&��b�m��ժ��}�#�Ix�Th�@R��|��j��YZ��_��~AmDm;��Yx��"AeIa�VX�p�aoG��()P��QPg��?��ﺊ/��W��<��-\.(�� ڞg%��N��57X�c�B��"��W�J6��ImC7�qkz�BU��%-��xz$�_C �t�S�3�&��Z�a�xRB�i'��ge�J�472�,�Ǹ0a�%I�]��Hk�.��H��+mN(�G��Lm5p�]��3�L��W3��bYOlܲ.w��OqMj8��p/��ư��i��:�kG�.�Z��rL��l�p��٘�9��4�#�>��A6ê��1R��]l�,��I��Vb�s�XY��hm�np�K

��&�᪂m��S^��

��ް�NoH��BǢ,�ܽN�ˌ��{�%)�Qxe��w��z�a�7�.�ÍT�;a�]�鿷>��PK�F;�� PKͺDR) Themes/com.stream_pi.defaulthighcontrast/UT Z4`��+`��+`ux��PKѸDR- Themes/com.stream_pi.defaulthighcontrast/res/UT �0`w�+`w�+`ux��PKѸDR" 6 Themes/com.stream_pi.defaulthighcontrast/res/style.cssUT �0`�7`w�+`ux��UK��0��.�`��ƹB� ��8Bѐ�I�A�^ſHYN��,D��톅�N�;�=��B��͖��L��5/ �'/�^�σ�n�DI��v��v3�=�&`k�6E�="%GT];xU��P

R�PE�HL�\{윞2^3�N�Κ�t/9��A7dnlW��F8�Xfƞ*��5�V.��aZ�"�,(B�2V��(t��F��χy�|��Q�g(QL�Z�A�N��;+z%*'MHk a��*��5<w'Z��!nO걘k��( ��k�~�":y�ڡ��ԏ<ވ��"��6�\`�:lB޼н/�އ��u�DL��N�y�-�+R�M��m��B�q�;��m��M<K�l�YA\A��0��`b��<��R��Gn��l.K#�w�b?�p_��_��]vDa��eΙ�/C�[؅��h��PK��" PKͺDR�2 Themes/com.stream_pi.defaulthighcontrast/theme.xmlUT Z4`��+`w�+`ux��uP1�0ܑ�C� �40 ��x�)n�&(q��R�|w>�O��]�n輶��,chJ{֦.��Ŋ�3�V�,��t�;� #��x4S�+�I��Fm*��Pm��%��u�6֐Ol�w�J��s�)��x� �RD �|��" �>9�H�}�H>��(�Ћ��K�0��:�ҟPKGzK��PKϮPRq��T�

��config.xmlUT ��+`��+`��+`ux��PK霟Q �A�Plugins/UT ��_w�+`w�+`ux��PK霟Q��TXm ��Plugins/config.xmlUT ��_u�`w�+`ux��PK��PR �A�Themes/UT ��+`��+`��+`ux��PK��DR! �A�Themes/com.stream_pi.defaultdark/UT k`��+`��+`ux��PK�DR% �ANThemes/com.stream_pi.defaultdark/res/UT �2`w�+`w�+`ux��PK�DRЛ�E$� . ��Themes/com.stream_pi.defaultdark/res/style.cssUT �2`�7`w�+`ux��PK��DR}��* ��QThemes/com.stream_pi.defaultdark/theme.xmlUT k`��+`w�+`ux��PK��DR" �A�Themes/com.stream_pi.defaultlight/UT k`��+`��+`ux��PK��DR�|��+ ��Themes/com.stream_pi.defaultlight/theme.xmlUT k`��+`w�+`ux��PK#�DR& �A& Themes/com.stream_pi.defaultlight/res/UT ;1`w�+`w�+`ux��PK#�DR�F;�� / �� Themes/com.stream_pi.defaultlight/res/style.cssUT ;1`�7`w�+`ux��PKͺDR) �A&Themes/com.stream_pi.defaulthighcontrast/UT Z4`��+`��+`ux��PKѸDR- �A�Themes/com.stream_pi.defaulthighcontrast/res/UT �0`w�+`w�+`ux��PKѸDR��" 6 ��Themes/com.stream_pi.defaulthighcontrast/res/style.cssUT �0`�7`w�+`ux��PKͺDRGzK��2 ��jThemes/com.stream_pi.defaulthighcontrast/theme.xmlUT Z4`��+`w�+`ux��PK �

Public

server

Clone or download

Renamed "Close on X" to "Minimize to system tray on close"

Modified Files