diff --git a/src/main/java/no/ntnu/idatt1002/demo/view/FinanceDialog.java b/src/main/java/no/ntnu/idatt1002/demo/view/FinanceDialog.java
new file mode 100644
index 0000000000000000000000000000000000000000..c7c5dc20c822c6938f447a3c78282eaaddc0ed19
--- /dev/null
+++ b/src/main/java/no/ntnu/idatt1002/demo/view/FinanceDialog.java
@@ -0,0 +1,2 @@
+package no.ntnu.idatt1002.demo.view;public class FinanceDialog {
+}
diff --git a/src/main/resources/Images/add.png b/src/main/resources/Images/add.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4957672e9a429a49fca6e83ac549ddfd3ff99cd
Binary files /dev/null and b/src/main/resources/Images/add.png differ
diff --git a/src/main/resources/Images/delete.png b/src/main/resources/Images/delete.png
index b23937817cfa4976c74f73288a6c34451934f16b..28a19aca76f168bcdec447a4d724a27de53f4564 100644
Binary files a/src/main/resources/Images/delete.png and b/src/main/resources/Images/delete.png differ
diff --git a/src/main/resources/Images/edit.png b/src/main/resources/Images/edit.png
index 833b336008545736084b8b7178591740a5bd7ac7..b68f795730330f1ca42c331d5597c7a8abf5c84d 100644
Binary files a/src/main/resources/Images/edit.png and b/src/main/resources/Images/edit.png differ
diff --git a/src/main/resources/Images/incomeExpense.png b/src/main/resources/Images/incomeExpense.png
new file mode 100644
index 0000000000000000000000000000000000000000..e9b445f1d9be0a5f47a7c54734a28462f813a92c
Binary files /dev/null and b/src/main/resources/Images/incomeExpense.png differ
diff --git a/src/main/resources/view/IncomeAndExpenses.fxml b/src/main/resources/view/IncomeAndExpenses.fxml
index c251b4969bca23ef12f36f1d8a6dc68c4606b126..33e549227e073c2de0f379fe7c8bfc1041cf778e 100644
--- a/src/main/resources/view/IncomeAndExpenses.fxml
+++ b/src/main/resources/view/IncomeAndExpenses.fxml
@@ -5,8 +5,10 @@
<?import javafx.scene.chart.PieChart?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.ContextMenu?>
<?import javafx.scene.control.DatePicker?>
<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.MenuItem?>
<?import javafx.scene.control.ProgressBar?>
<?import javafx.scene.control.TableColumn?>
<?import javafx.scene.control.TableView?>
@@ -22,10 +24,9 @@
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>
-
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="695.0" prefWidth="1100.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.IncomeExpenseController">
+<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.IncomeExpenseController">
<children>
- <ImageView fitHeight="695.0" fitWidth="1100.0" pickOnBounds="true">
+ <ImageView fitHeight="695.0" fitWidth="1130.0" pickOnBounds="true">
<image>
<Image url="@../Images/backgroundMini.jpg" />
</image>
@@ -66,30 +67,78 @@
</font>
</Label>
</center>
- <padding>
- <Insets left="15.0" right="15.0" />
- </padding>
+ <VBox.margin>
+ <Insets left="15.0" />
+ </VBox.margin>
</BorderPane>
<BorderPane prefHeight="64.0" prefWidth="1100.0">
<left>
- <HBox prefHeight="100.0" prefWidth="200.0" BorderPane.alignment="CENTER">
+ <HBox prefHeight="100.0" prefWidth="200.0" spacing="10.0" BorderPane.alignment="CENTER">
<children>
- <Button fx:id="addBtn" mnemonicParsing="false" text="Button">
+ <Button fx:id="addBtn" mnemonicParsing="false" prefHeight="25.0" prefWidth="60.0">
<font>
<Font name="Lucida Console" size="12.0" />
</font>
+ <graphic>
+ <ImageView fitHeight="30.0" fitWidth="50.0" pickOnBounds="true" preserveRatio="true">
+ <image>
+ <Image url="@../Images/add.png" />
+ </image>
+ </ImageView>
+ </graphic>
+ <contextMenu>
+ <ContextMenu>
+ <items>
+ <MenuItem mnemonicParsing="false" text="Unspecified Action" />
+ <MenuItem mnemonicParsing="false" text="Unspecified Action" />
+ </items>
+ </ContextMenu>
+ </contextMenu>
</Button>
- <Button fx:id="editBtn" mnemonicParsing="false" text="Button">
+ <Button fx:id="editBtn" mnemonicParsing="false" prefHeight="25.0" prefWidth="60.0">
<font>
<Font name="Lucida Console" size="12.0" />
</font>
+ <graphic>
+ <ImageView fitHeight="30.0" fitWidth="50.0" pickOnBounds="true" preserveRatio="true">
+ <image>
+ <Image url="@../Images/edit.png" />
+ </image>
+ </ImageView>
+ </graphic>
+ <contextMenu>
+ <ContextMenu>
+ <items>
+ <MenuItem mnemonicParsing="false" text="Unspecified Action" />
+ <MenuItem mnemonicParsing="false" text="Unspecified Action" />
+ </items>
+ </ContextMenu>
+ </contextMenu>
</Button>
- <Button fx:id="deleteBtn" mnemonicParsing="false" text="Button">
+ <Button fx:id="deleteBtn" mnemonicParsing="false" prefHeight="25.0" prefWidth="50.0">
<font>
<Font name="Lucida Console" size="12.0" />
</font>
+ <graphic>
+ <ImageView fitHeight="30.0" fitWidth="50.0" pickOnBounds="true" preserveRatio="true">
+ <image>
+ <Image url="@../Images/delete.png" />
+ </image>
+ </ImageView>
+ </graphic>
+ <contextMenu>
+ <ContextMenu>
+ <items>
+ <MenuItem mnemonicParsing="false" text="Unspecified Action" />
+ <MenuItem mnemonicParsing="false" text="Unspecified Action" />
+ </items>
+ </ContextMenu>
+ </contextMenu>
</Button>
</children>
+ <BorderPane.margin>
+ <Insets left="30.0" />
+ </BorderPane.margin>
</HBox>
</left>
<right>
@@ -103,12 +152,12 @@
<Insets />
</opaqueInsets>
<VBox.margin>
- <Insets left="15.0" right="15.0" />
+ <Insets left="10.0" right="15.0" />
</VBox.margin>
<center>
<Pane BorderPane.alignment="CENTER">
<children>
- <ComboBox fx:id="filter" layoutX="169.0" layoutY="2.0" prefWidth="150.0" promptText="Show">
+ <ComboBox fx:id="filter" layoutX="134.0" layoutY="2.0" prefWidth="150.0" promptText="Show">
<opaqueInsets>
<Insets />
</opaqueInsets>
@@ -191,12 +240,12 @@
</GridPane>
<Pane GridPane.columnIndex="1">
<children>
- <PieChart fx:id="incomePieChart" layoutX="4.0" layoutY="-18.0" legendSide="RIGHT" maxHeight="226.0" maxWidth="512.0" prefHeight="214.0" prefWidth="350.0" />
+ <PieChart fx:id="incomePieChart" layoutX="4.0" layoutY="-18.0" legendSide="RIGHT" maxHeight="226.0" maxWidth="512.0" prefHeight="214.0" prefWidth="350.0" title="Income" />
</children>
</Pane>
<Pane GridPane.columnIndex="1" GridPane.rowIndex="1">
<children>
- <PieChart fx:id="expensePieChart" layoutX="-2.0" layoutY="-27.0" legendSide="RIGHT" maxHeight="247.0" maxWidth="519.0" prefHeight="227.0" prefWidth="350.0" />
+ <PieChart fx:id="expensePieChart" layoutX="-2.0" layoutY="-27.0" legendSide="RIGHT" maxHeight="247.0" maxWidth="519.0" prefHeight="227.0" prefWidth="350.0" title="Expenses" />
</children>
</Pane>
</children>