Skip to content
Snippets Groups Projects
Commit 159bc542 authored by Anders Emil Bergan's avatar Anders Emil Bergan Committed by Harry Linrui XU
Browse files

new budget window for better usecase

parent b3b4fcdf
No related branches found
No related tags found
10 merge requests!43Merging frontend-testing into master,!38"Made progressbar dynamic in accordance to spending. Added balance field....,!37Made the sub progress bars respond to changes in expense,!32Added input validation to add dialog boxes.,!30Redesigned scenes,!29Redesigned scenes,!28Redesigned scenes,!26Redesigned Main menu and expense/income windows,!24Merging frontend-testing with master,!23Merging frontend-testing and master
Hide whitespace changes
Inline Side-by-side
src/main/resources/view/BudgetNew.fxml
+ 9
− 10
View file @ 159bc542
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<?import javafx.scene.text.Font?> <?import javafx.scene.text.Font?>
<?import javafx.scene.text.Text?> <?import javafx.scene.text.Text?>
<AnchorPane xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.IncomeController"> <AnchorPane xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.BudgetController">
<children> <children>
<ImageView fitHeight="400.0" fitWidth="600.0" pickOnBounds="true"> <ImageView fitHeight="400.0" fitWidth="600.0" pickOnBounds="true">
<image> <image>
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
</HBox.margin> </HBox.margin>
</Button> </Button>
<Region prefHeight="70.0" prefWidth="141.0" /> <Region prefHeight="70.0" prefWidth="141.0" />
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Income" textAlignment="CENTER" wrappingWidth="174.6796875"> <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Budget" textAlignment="CENTER" wrappingWidth="174.6796875">
<HBox.margin> <HBox.margin>
<Insets /> <Insets />
</HBox.margin> </HBox.margin>
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
<children> <children>
<HBox alignment="BOTTOM_LEFT" prefWidth="410.0" spacing="5.0"> <HBox alignment="BOTTOM_LEFT" prefWidth="410.0" spacing="5.0">
<children> <children>
<Button fx:id="addBtn" alignment="TOP_CENTER" mnemonicParsing="false" onAction="#handleAddButton" text="Add" textAlignment="CENTER"> <Button fx:id="addBtn" alignment="TOP_CENTER" mnemonicParsing="false" onAction="#switchAddBudget" text="Add" textAlignment="CENTER">
<graphic> <graphic>
<ImageView fitHeight="19.0" fitWidth="16.0" pickOnBounds="true" preserveRatio="true"> <ImageView fitHeight="19.0" fitWidth="16.0" pickOnBounds="true" preserveRatio="true">
<image> <image>
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
</ImageView> </ImageView>
</graphic> </graphic>
</Button> </Button>
<Button fx:id="editBtn" alignment="TOP_CENTER" mnemonicParsing="false" onAction="#handleEditButton" text="Edit" textAlignment="CENTER"> <Button fx:id="editBtn" alignment="TOP_CENTER" mnemonicParsing="false" onAction="#switchAddBudget" text="Edit" textAlignment="CENTER">
<graphic> <graphic>
<ImageView fitHeight="19.0" fitWidth="16.0" pickOnBounds="true" preserveRatio="true"> <ImageView fitHeight="19.0" fitWidth="16.0" pickOnBounds="true" preserveRatio="true">
<image> <image>
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
</ImageView> </ImageView>
</graphic> </graphic>
</Button> </Button>
<Button fx:id="deleteBtn" alignment="TOP_CENTER" mnemonicParsing="false" onAction="#handleDeleteBtn" text="Delete" textAlignment="CENTER"> <Button fx:id="deleteBtn" alignment="TOP_CENTER" mnemonicParsing="false" onAction="#deleteButton" text="Delete" textAlignment="CENTER">
<graphic> <graphic>
<ImageView fitHeight="19.0" fitWidth="16.0" pickOnBounds="true" preserveRatio="true"> <ImageView fitHeight="19.0" fitWidth="16.0" pickOnBounds="true" preserveRatio="true">
<image> <image>
...@@ -122,8 +122,8 @@ ...@@ -122,8 +122,8 @@
</VBox> </VBox>
<HBox prefHeight="100.0" prefWidth="200.0" GridPane.columnSpan="2" GridPane.rowIndex="2"> <HBox prefHeight="100.0" prefWidth="200.0" GridPane.columnSpan="2" GridPane.rowIndex="2">
<children> <children>
<Button disable="true" mnemonicParsing="false" text="Income" /> <Button mnemonicParsing="false" text="Income" />
<Button fx:id="budgetBtn" mnemonicParsing="false" onAction="#switchScene" text="Budget" /> <Button fx:id="budgetBtn" disable="true" mnemonicParsing="false" onAction="#switchScene" text="Budget" />
<Button fx:id="expenseBtn" mnemonicParsing="false" onAction="#switchScene" text="Expenses" /> <Button fx:id="expenseBtn" mnemonicParsing="false" onAction="#switchScene" text="Expenses" />
<Button mnemonicParsing="false" onAction="#switchScene" text="Next"> <Button mnemonicParsing="false" onAction="#switchScene" text="Next">
<HBox.margin> <HBox.margin>
...@@ -137,11 +137,10 @@ ...@@ -137,11 +137,10 @@
</HBox> </HBox>
<TableView fx:id="incomeTableView" prefHeight="260.0" prefWidth="485.0" GridPane.columnSpan="2" GridPane.rowIndex="1"> <TableView fx:id="incomeTableView" prefHeight="260.0" prefWidth="485.0" GridPane.columnSpan="2" GridPane.rowIndex="1">
<columns> <columns>
<TableColumn fx:id="dateColumn" prefWidth="75.0" text="Date" /> <TableColumn fx:id="categoryColumn" prefWidth="75.0" text="Category/Title" />
<TableColumn fx:id="percentageColumn" prefWidth="75.0" text="Percentage" />
<TableColumn fx:id="amountColumn" prefWidth="75.0" text="Amount" /> <TableColumn fx:id="amountColumn" prefWidth="75.0" text="Amount" />
<TableColumn fx:id="categoryColumn" prefWidth="75.0" text="Category" />
<TableColumn fx:id="descriptionColumn" prefWidth="75.0" text="Description" /> <TableColumn fx:id="descriptionColumn" prefWidth="75.0" text="Description" />
<TableColumn fx:id="recurringColumn" prefWidth="75.0" text="Recurring" />
</columns> </columns>
<columnResizePolicy> <columnResizePolicy>
<TableView fx:constant="CONSTRAINED_RESIZE_POLICY" /> <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment