From 91e176bcb2b6525236f5f258330d0a0544ef168b Mon Sep 17 00:00:00 2001
From: Harry Linrui XU <xulr0820@hotmail.com>
Date: Fri, 31 Mar 2023 17:53:13 +0200
Subject: [PATCH] Fixed incorrect addBtn id in scenebuilder. Income switches to
newest budget scene
---
.../no/ntnu/idatt1002/demo/controller/IncomeController.java | 2 +-
src/main/resources/view/BudgetNewest.fxml | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/main/java/no/ntnu/idatt1002/demo/controller/IncomeController.java b/src/main/java/no/ntnu/idatt1002/demo/controller/IncomeController.java
index d2981e60..d0daa30b 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/controller/IncomeController.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/controller/IncomeController.java
@@ -274,7 +274,7 @@ public class IncomeController {
} else if (event.getSource() == returnBtn) {
loader.setLocation(SceneController.class.getResource("/view/FirstMenu.fxml"));
} else if (event.getSource() == budgetBtn) {
- loader.setLocation(SceneController.class.getResource("/view/BudgetNew.fxml"));
+ loader.setLocation(SceneController.class.getResource("/view/BudgetNewest.fxml"));
}
Parent root = loader.load();
Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
diff --git a/src/main/resources/view/BudgetNewest.fxml b/src/main/resources/view/BudgetNewest.fxml
index 6a148dd7..4ec1bfc8 100644
--- a/src/main/resources/view/BudgetNewest.fxml
+++ b/src/main/resources/view/BudgetNewest.fxml
@@ -23,7 +23,6 @@
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>
-
<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="695.0" prefWidth="1130.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.BudgetController">
<children>
<ImageView fitHeight="695.0" fitWidth="1130.0" pickOnBounds="true">
@@ -75,7 +74,7 @@
<left>
<HBox prefHeight="100.0" prefWidth="200.0" spacing="10.0" BorderPane.alignment="CENTER">
<children>
- <Button fx:id="editBtn1" mnemonicParsing="false" onAction="#handleAddBtn" prefHeight="25.0" prefWidth="60.0">
+ <Button fx:id="addBtn" mnemonicParsing="false" onAction="#handleAddBtn" prefHeight="25.0" prefWidth="60.0">
<font>
<Font name="Lucida Console" size="12.0" />
</font>
--
GitLab