From 771a3cfdd61ecc12306569d04b4cedd3ac852d07 Mon Sep 17 00:00:00 2001 From: Harry Linrui XU <xulr0820@hotmail.com> Date: Mon, 17 Apr 2023 12:20:00 +0200 Subject: [PATCH] First menu switches to main menu --- .../no/ntnu/idatt1002/demo/controller/SceneController.java | 2 +- src/main/resources/Economics/Expense.register | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/main/java/no/ntnu/idatt1002/demo/controller/SceneController.java b/src/main/java/no/ntnu/idatt1002/demo/controller/SceneController.java index dae0ae45..8a95589e 100644 --- a/src/main/java/no/ntnu/idatt1002/demo/controller/SceneController.java +++ b/src/main/java/no/ntnu/idatt1002/demo/controller/SceneController.java @@ -33,7 +33,7 @@ public class SceneController { } public void switchIncome(ActionEvent event) throws IOException { - FXMLLoader loader = new FXMLLoader(SceneController.class.getResource("/view/IncomeAndExpenses.fxml")); + FXMLLoader loader = new FXMLLoader(SceneController.class.getResource("/view/MainMenuNew.fxml")); Parent root = loader.load(); stage = (Stage)((Node)event.getSource()).getScene().getWindow(); scene = new Scene(root); diff --git a/src/main/resources/Economics/Expense.register b/src/main/resources/Economics/Expense.register index d8620527..6f1ef622 100644 --- a/src/main/resources/Economics/Expense.register +++ b/src/main/resources/Economics/Expense.register @@ -4,12 +4,6 @@ amount=12.0 isRecurring=Not recurring category=CLOTHES -date=2023-03-11 -description=1111 -amount=121.0 -isRecurring=Not recurring -category=OTHER - date=2023-03-26 amount=200.0 isRecurring=Not recurring -- GitLab