From c5c1a6f07d552b34c9b766a6e669bea2e2e3f6e3 Mon Sep 17 00:00:00 2001
From: Harry Linrui XU <xulr0820@hotmail.com>
Date: Mon, 17 Apr 2023 14:17:56 +0200
Subject: [PATCH] Renamed method + Implemented new buttons in BudgetNewest.fxml
---
.../ntnu/idatt1002/demo/controller/FinanceController.java | 5 ++---
.../idatt1002/demo/controller/IncomeExpenseController.java | 2 +-
src/main/resources/view/BudgetNewest.fxml | 4 +++-
src/main/resources/view/newBudgetBudgert.fxml | 6 +++---
4 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/main/java/no/ntnu/idatt1002/demo/controller/FinanceController.java b/src/main/java/no/ntnu/idatt1002/demo/controller/FinanceController.java
index 4e635944..0c67d8e1 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/controller/FinanceController.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/controller/FinanceController.java
@@ -51,9 +51,8 @@ public interface FinanceController {
void saveDataToFile() throws IOException;
/**
- * Switches scenes back to main menu, by loading a new FXML file and setting the scene to this location.
+ * Switches scenes, by loading a new FXML file and setting the scene to this location.
* @param event A button click on the return to main menu button
- * @throws IOException If an error occurs with loading any of the FXML files.
*/
- void returnToMainMenu(javafx.event.ActionEvent event) throws IOException;
+ void switchScene(javafx.event.ActionEvent event);
}
diff --git a/src/main/java/no/ntnu/idatt1002/demo/controller/IncomeExpenseController.java b/src/main/java/no/ntnu/idatt1002/demo/controller/IncomeExpenseController.java
index 95e4519a..f66b3fa6 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/controller/IncomeExpenseController.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/controller/IncomeExpenseController.java
@@ -581,7 +581,7 @@ public class IncomeExpenseController implements FinanceController {
* @param event A button click on the return to main menu button
*/
@FXML
- public void returnToMainMenu(javafx.event.ActionEvent event) {
+ public void switchScene(javafx.event.ActionEvent event) {
try {
saveDataToFile();
FXMLLoader loader = new FXMLLoader();
diff --git a/src/main/resources/view/BudgetNewest.fxml b/src/main/resources/view/BudgetNewest.fxml
index 4999c3a5..44900e21 100644
--- a/src/main/resources/view/BudgetNewest.fxml
+++ b/src/main/resources/view/BudgetNewest.fxml
@@ -51,7 +51,7 @@
<left>
<Pane prefWidth="175.0" BorderPane.alignment="CENTER">
<children>
- <Button fx:id="returnBtn" alignment="CENTER" layoutX="-2.0" layoutY="58.0" mnemonicParsing="false" onAction="#returnToMainMenu" text="Return to Main Menu">
+ <Button fx:id="returnBtn" alignment="CENTER" layoutX="-2.0" layoutY="58.0" mnemonicParsing="false" onAction="#switchScene" text="Return to Main Menu">
<font>
<Font name="Lucida Console" size="14.0" />
</font>
@@ -177,6 +177,8 @@
<Insets top="10.0" />
</VBox.margin>
</TableView>
+ <Button fx:id="backBtn" mnemonicParsing="false" text="back" />
+ <Button fx:id="continueBtn" mnemonicParsing="false" text="continue" />
</children>
<GridPane.margin>
<Insets top="30.0" />
diff --git a/src/main/resources/view/newBudgetBudgert.fxml b/src/main/resources/view/newBudgetBudgert.fxml
index 6ecdfb43..c148ca4b 100644
--- a/src/main/resources/view/newBudgetBudgert.fxml
+++ b/src/main/resources/view/newBudgetBudgert.fxml
@@ -85,12 +85,12 @@
</StackPane>
<HBox alignment="CENTER_RIGHT" GridPane.columnIndex="1" GridPane.rowIndex="2">
<children>
- <Button fx:id="returnBtn1" mnemonicParsing="false" onAction="#returnToMainMenu" prefWidth="100.0" text="Back">
+ <Button fx:id="backBtn" mnemonicParsing="false" onAction="#switchScene" prefWidth="100.0" text="Back">
<font>
<Font size="14.0" />
</font>
</Button>
- <Button fx:id="returnBtn2" mnemonicParsing="false" onAction="#returnToMainMenu" prefWidth="100.0" text="Continue">
+ <Button fx:id="continueBtn" mnemonicParsing="false" onAction="#switchScene" prefWidth="100.0" text="Continue">
<font>
<Font size="14.0" />
</font>
@@ -200,7 +200,7 @@
<RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
- <Button fx:id="returnBtn" alignment="CENTER" mnemonicParsing="false" onAction="#returnToMainMenu" text="Return to Main Menu">
+ <Button fx:id="returnBtn" alignment="CENTER" mnemonicParsing="false" onAction="#switchScene" text="Return to Main Menu">
<font>
<Font size="14.0" />
</font>
--
GitLab