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 4e63594465fe17a9985f94c7274956aaa7e40064..0c67d8e16ed8d7959a0106d2d28dc13e50983119 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 95e4519a34430e1540da2a44b37f8c128047147a..f66b3fa68d24874e769fa01f0df2e44c3360fc6f 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 4999c3a596dddcbf7794d029d43408e6b97985ce..44900e215a28a587dba130e10ac112bf76ab5875 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 6ecdfb435715aeb506a3d9c4b9afb31d204557a5..c148ca4bf42899246a53dd951785d868c122e9e3 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>