From: Debayan Sutradhar <debayansutradhar3@gmail.com>
Date: Fri, 30 Apr 2021 01:03:07 +0530
Subject: removed col/row warning because action grid is now inside scrollpane in client, lots of minor bug fixes
---
removed col/row warning because action grid is now inside scrollpane in client, lots of minor bug fixes
---


--- 'a/src/main/java/com/stream_pi/server/controller/Controller.java'
+++ b/src/main/java/com/stream_pi/server/controller/Controller.java
@@ -34,6 +34,7 @@ import javafx.application.Platform;
 import javafx.concurrent.Task;
 import javafx.scene.Node;
 import javafx.scene.Scene;
+import javafx.scene.image.Image;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
@@ -45,6 +46,7 @@ import java.awt.SystemTray;
 import java.awt.Toolkit;
 import java.awt.TrayIcon;
 import java.net.SocketAddress;
+import java.util.Objects;
 import java.util.Random;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -77,7 +79,8 @@ public class Controller extends Base imp
     @Override
     public void init()
     {
-        try {
+        try
+        {
 
             initBase();
             setupDashWindow();
@@ -107,7 +110,8 @@ public class Controller extends Base imp
                 Stage stage = new Stage();
                 Scene s = new Scene(new FirstTimeUse(this, this),
                         getConfig().getStartupWindowWidth(), getConfig().getStartupWindowHeight());
-                stage.setScene(s); 
+                stage.setScene(s);
+                stage.getIcons().add(new Image(Objects.requireNonNull(Main.class.getResourceAsStream("app_icon.png"))));
                 stage.setTitle("Stream-Pi Server Setup");
                 stage.initModality(Modality.APPLICATION_MODAL);
                 stage.setOnCloseRequest(event->Platform.exit());
@@ -123,7 +127,6 @@ public class Controller extends Base imp
 
                 othInit();
             }
-
         }
         catch (SevereException e)
         {

--- 'a/src/main/java/com/stream_pi/server/window/Base.java'
+++ b/src/main/java/com/stream_pi/server/window/Base.java
@@ -26,6 +26,7 @@ import javafx.stage.Stage;
 
 import java.awt.*;
 import java.io.File;
+import java.util.Objects;
 import java.util.logging.Logger;
 
 public abstract class Base extends StackPane implements ExceptionAndAlertHandler, ServerListener {
@@ -104,7 +105,7 @@ public abstract class Base extends Stack
     {
         stage = (Stage) getScene().getWindow();
 
-        getStage().getIcons().add(new Image(Main.class.getResourceAsStream("app_icon.png")));
+        getStage().getIcons().add(new Image(Objects.requireNonNull(Main.class.getResourceAsStream("app_icon.png"))));
         
         getStage().setMinWidth(710);
         getStage().setMinHeight(530);

--- 'a/src/main/java/com/stream_pi/server/window/settings/ClientsSettings.java'
+++ b/src/main/java/com/stream_pi/server/window/settings/ClientsSettings.java
@@ -117,41 +117,6 @@ public class ClientsSettings extends VBo
                                 errors2.append("        Must have integer action Gap. \n");
                             }
 
-
-                            try {
-                                int rows = Integer.parseInt(clientProfileVBox.getRows());
-
-                                int actionsSize = Integer.parseInt(clientProfileVBox.getActionSize());
-                                int actionsGap = Integer.parseInt(clientProfileVBox.getActionGap());
-
-                                if((rows*(actionsSize+actionsGap)) > clientSettingsVBox.getDisplayHeight())
-                                {
-                                    errors2.append("        Rows out of bounds of screen size. \n");
-                                }
-                            }
-                            catch (NumberFormatException e)
-                            {
-                                errors2.append("        Must have integer Rows. \n");
-                            }
-
-
-                            try {
-                                int cols = Integer.parseInt(clientProfileVBox.getCols());
-
-                                int actionsSize = Integer.parseInt(clientProfileVBox.getActionSize());
-                                int actionsGap = Integer.parseInt(clientProfileVBox.getActionGap());
-
-                                if((cols*(actionsSize+actionsGap)) > clientSettingsVBox.getDisplayWidth())
-                                {
-                                    errors2.append("        Cols out of bounds of screen size. \n");
-                                }
-                            }
-                            catch (NumberFormatException e)
-                            {
-                                errors2.append("        Must have integer Columns. \n");
-                            }
-
-
                             if(!errors2.toString().isEmpty())
                             {
                                 errors.append("    ")