server
Clone or download
Modified Files
--- 'a/src/main/java/com/stream_pi/server/controller/Controller.java'
+++ b/src/main/java/com/stream_pi/server/controller/Controller.java
@@ -114,18 +114,12 @@ public class Controller extends Base imp
if(getConfig().isFirstTimeUse())
{
- Stage stage = new Stage();
- Scene s = new Scene(new FirstTimeUse(this, this),
- getConfig().getStartupWindowWidth(), getConfig().getStartupWindowHeight());
- stage.setScene(s);
- stage.setMinHeight(500);
- stage.setMinWidth(700);
- stage.getIcons().add(new Image(Objects.requireNonNull(Main.class.getResourceAsStream("app_icon.png"))));
- stage.setTitle("Stream-Pi Server Setup");
- stage.getScene().getStylesheets().addAll(getStylesheets());
- stage.initModality(Modality.APPLICATION_MODAL);
- stage.setOnCloseRequest(event->Platform.exit());
- stage.show();
+ firstTimeUse = new FirstTimeUse(this, this);
+
+ getChildren().add(firstTimeUse);
+
+ firstTimeUse.toFront();
+ getStage().show();
}
else
{
@@ -234,7 +228,6 @@ public class Controller extends Base imp
if(result)
{
- getStage().close();
init();
}
else
@@ -321,7 +314,7 @@ public class Controller extends Base imp
{
getLogger().info("Restarting ...");
- stopServerAndAllConnections();
+ onQuitApp();
Platform.runLater(this::init);
}
--- 'a/src/main/java/com/stream_pi/server/window/Base.java'
+++ b/src/main/java/com/stream_pi/server/window/Base.java
@@ -5,6 +5,7 @@ import com.stream_pi.server.io.Config;
import com.stream_pi.server.info.ServerInfo;
import com.stream_pi.server.Main;
import com.stream_pi.server.window.dashboard.DashboardBase;
+import com.stream_pi.server.window.firsttimeuse.FirstTimeUse;
import com.stream_pi.server.window.settings.SettingsBase;
import com.stream_pi.theme_api.Theme;
import com.stream_pi.theme_api.Themes;
@@ -38,6 +39,8 @@ public abstract class Base extends Stack
private StreamPiLogFileHandler logFileHandler = null;
private StreamPiLogFallbackHandler logFallbackHandler = null;
+ public FirstTimeUse firstTimeUse;
+
private Logger logger = null;
public Logger getLogger(){
return logger;
@@ -122,6 +125,8 @@ public abstract class Base extends Stack
alertStackPane = new StackPane();
alertStackPane.setVisible(false);
+
+
StreamPiAlert.setParent(alertStackPane);
getChildren().clear();
@@ -140,7 +145,6 @@ public abstract class Base extends Stack
stage.setWidth(config.getStartupWindowWidth());
stage.setHeight(config.getStartupWindowHeight());
- stage.centerOnScreen();
dashboardBase.setDividerPositions(config.getRightDividerPositions());
dashboardBase.getLeftSplitPane().setDividerPositions(config.getLeftDividerPositions());
--- 'a/src/main/java/com/stream_pi/server/window/firsttimeuse/FinalConfigPane.java'
+++ b/src/main/java/com/stream_pi/server/window/firsttimeuse/FinalConfigPane.java
@@ -91,10 +91,7 @@ public class FinalConfigPane extends VBo
Config.getInstance().setFirstTimeUse(false);
Config.getInstance().save();
- serverListener.othInit();
- serverListener.initLogger();
-
- ((Stage) getScene().getWindow()).close();
+ serverListener.restart();
}
catch(SevereException e)
{
Binary files 'a/src/main/resources/com/stream_pi/server/Default.zip' and b/src/main/resources/com/stream_pi/server/Default.zip differ