From dd03d354b282b754890a10a6b5d5c734d6dc1dc1 Mon Sep 17 00:00:00 2001
From: Harry Linrui XU <xulr0820@hotmail.com>
Date: Thu, 20 Apr 2023 11:20:58 +0200
Subject: [PATCH] Removed returnToStartMenuBtn. Created a thread through all
scenes up till main menu
---
.../demo/data/Budget/FileHandlingBudget.java | 1 +
src/main/resources/view/BudgetNewest.fxml | 1 -
src/main/resources/view/newBudgetBudgert.fxml | 17 ++++++-----------
3 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/src/main/java/no/ntnu/idatt1002/demo/data/Budget/FileHandlingBudget.java b/src/main/java/no/ntnu/idatt1002/demo/data/Budget/FileHandlingBudget.java
index e9706d65..2017bfea 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/data/Budget/FileHandlingBudget.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/data/Budget/FileHandlingBudget.java
@@ -35,6 +35,7 @@ public class FileHandlingBudget {
//try (BufferedWriter bw = new BufferedWriter(new FileWriter(filePath + fileTitle + fileType))) {
bw.write(generalBudget.toString());
} catch (IOException ex) {
+ ex.printStackTrace();
throw new IOException("Error writing to file: " + fileTitle);
}
}
diff --git a/src/main/resources/view/BudgetNewest.fxml b/src/main/resources/view/BudgetNewest.fxml
index fc28d282..3f679d03 100644
--- a/src/main/resources/view/BudgetNewest.fxml
+++ b/src/main/resources/view/BudgetNewest.fxml
@@ -56,7 +56,6 @@
<Font name="Lucida Console" size="14.0" />
</font>
</Button>
- <Button fx:id="returnBtn" disable="true" layoutX="150.0" layoutY="104.0" mnemonicParsing="false" onAction="#switchScene" opacity="0.0" text="Button" />
</children>
</Pane>
</left>
diff --git a/src/main/resources/view/newBudgetBudgert.fxml b/src/main/resources/view/newBudgetBudgert.fxml
index 83fd3890..7d19693d 100644
--- a/src/main/resources/view/newBudgetBudgert.fxml
+++ b/src/main/resources/view/newBudgetBudgert.fxml
@@ -84,11 +84,6 @@
</StackPane>
<HBox alignment="CENTER_RIGHT" GridPane.columnIndex="1" GridPane.rowIndex="2">
<children>
- <Button fx:id="backBtn" mnemonicParsing="false" onAction="#switchScene" prefWidth="100.0" text="Back">
- <font>
- <Font size="14.0" />
- </font>
- </Button>
<Button fx:id="continueBtn" mnemonicParsing="false" onAction="#switchScene" prefWidth="100.0" text="Continue">
<font>
<Font size="14.0" />
@@ -192,11 +187,6 @@
<RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
- <Button fx:id="returnToStartMenuBtn" alignment="CENTER" mnemonicParsing="false" onAction="#switchScene" text="Return to start">
- <font>
- <Font size="14.0" />
- </font>
- </Button>
<Label fx:id="title" text="Budget Setup" textAlignment="CENTER" GridPane.columnIndex="1">
<font>
<Font size="36.0" />
@@ -213,7 +203,12 @@
<DatePicker fx:id="date" layoutX="3.0" layoutY="32.0" prefWidth="175.0" />
</children>
</Pane>
- <Button fx:id="returnBtn" disable="true" mnemonicParsing="false" onAction="#switchScene" opacity="0.0" text="Button" />
+ <Button fx:id="returnToMainMenuBtn" disable="true" mnemonicParsing="false" onAction="#switchScene" opacity="0.0" text="Button" />
+ <Button fx:id="backBtn" mnemonicParsing="false" onAction="#switchScene" prefWidth="100.0" text="Go back">
+ <font>
+ <Font size="14.0" />
+ </font>
+ </Button>
</children>
</GridPane>
</children>
--
GitLab