diff --git a/src/main/java/com/application/GUI/InputPopUpWindow.java b/src/main/java/com/application/GUI/InputPopUpWindow.java index 71bfe5897889b3147cc507ccbd11378868c136fe..7e2f1b4de3cb19045310b0d2acf160374286c152 100644 --- a/src/main/java/com/application/GUI/InputPopUpWindow.java +++ b/src/main/java/com/application/GUI/InputPopUpWindow.java @@ -91,7 +91,7 @@ public class InputPopUpWindow { sawsetInputLabel, sawsetInputText, moistureGoalInputLabel, moistureGoalInputText, startButton); layout.setAlignment(Pos.CENTER); - Scene scene = new Scene(layout, 600, 600); + Scene scene = new Scene(layout, 600, 500); scene.getStylesheets().add(InputPopUpWindow.class.getResource("/com.application/CSS/styleSheet.css").toExternalForm()); window.setScene(scene); window.showAndWait(); diff --git a/src/main/java/com/application/Main.java b/src/main/java/com/application/Main.java index d6d7bbc4c8b845c69aeb4e56b4ad3a5918695012..54c95fd55da7b5e529e1fa98d6640d5c19841943 100644 --- a/src/main/java/com/application/Main.java +++ b/src/main/java/com/application/Main.java @@ -111,6 +111,9 @@ public class Main extends Application { primaryStage.setMinWidth(1200); primaryStage.setScene(scene); primaryStage.show(); + + // Displays the input parameters popup window + InputPopUpWindow.display(); } /** diff --git a/target/classes/com.application/CSS/styleSheet.css b/target/classes/com.application/CSS/styleSheet.css index 54b83c3aa452a8106d95786adbda1fc6490ad038..76111b5e69c7085c3fc25b6f99d29126621ace76 100644 --- a/target/classes/com.application/CSS/styleSheet.css +++ b/target/classes/com.application/CSS/styleSheet.css @@ -17,6 +17,10 @@ -fx-alignment: center; } + +/* + Sidebar styling + */ #sideBar { -fx-pref-width: 250; } @@ -39,11 +43,21 @@ -fx-font-family: Arial; } -#sideBarButtonFinish { +#sideBarButtonInputParameters { -fx-translate-x: 5; -fx-translate-y: 20; -fx-pref-width: infinity; -fx-pref-height: 25; + -fx-font-size: 16; + -fx-font-weight: 200; + -fx-font-family: Arial; +} + +#sideBarButtonFinish { + -fx-translate-x: 5; + -fx-translate-y: 50; + -fx-pref-width: infinity; + -fx-pref-height: 25; -fx-font-size: 20; -fx-font-family: Arial; -fx-background-color: rgba(104, 229, 59, 1); diff --git a/target/classes/com/application/GUI/InputPopUpWindow.class b/target/classes/com/application/GUI/InputPopUpWindow.class index 6d5867cd2617d66b840aed7ac25dce4b744bcf28..98332e735b1b7bbf70ce791e6114ac983ba0c3dd 100644 Binary files a/target/classes/com/application/GUI/InputPopUpWindow.class and b/target/classes/com/application/GUI/InputPopUpWindow.class differ diff --git a/target/classes/com/application/Main$1WorkerThread.class b/target/classes/com/application/Main$1WorkerThread.class index 9abb12eca1a252de3954b0675b49e8a0237e772b..cdef169a0661776404a1cbb470ab1ca6757528dc 100644 Binary files a/target/classes/com/application/Main$1WorkerThread.class and b/target/classes/com/application/Main$1WorkerThread.class differ diff --git a/target/classes/com/application/Main.class b/target/classes/com/application/Main.class index 39fa3937ebc8e1f685f160bf072975ffcae6a97d..71eeb5ead13fb84c7ab9e631dbf0ef1482c293cc 100644 Binary files a/target/classes/com/application/Main.class and b/target/classes/com/application/Main.class differ