Skip to content
Snippets Groups Projects
Commit 160dcda2 authored by Harry Linrui XU's avatar Harry Linrui XU
Browse files

Added new images. Buttons in IncomeAndExpense now have images

parent be651aa0
No related branches found
No related tags found
8 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
Pipeline #213989 passed
Stage: build
Stage: test
Stage: package
Hide whitespace changes
Inline Side-by-side
src/main/java/no/ntnu/idatt1002/demo/view/FinanceDialog.java 0 → 100644
+ 2
− 0
View file @ 160dcda2
package no.ntnu.idatt1002.demo.view;public class FinanceDialog {
}
src/main/resources/Images/add.png 0 → 100644
+ 0
− 0
View file @ 160dcda2
src/main/resources/Images/add.png

26.4 KiB

src/main/resources/Images/delete.png
+ 0
− 0
View replaced file @ be651aa0 View file @ 160dcda2
src/main/resources/Images/delete.png

10.4 KiB | W: | H:

src/main/resources/Images/delete.png

9.75 KiB | W: | H:

src/main/resources/Images/delete.png
src/main/resources/Images/delete.png
src/main/resources/Images/delete.png
src/main/resources/Images/delete.png
  • 2-up
  • Swipe
  • Onion skin
src/main/resources/Images/edit.png
+ 0
− 0
View replaced file @ be651aa0 View file @ 160dcda2
src/main/resources/Images/edit.png

6.27 KiB | W: | H:

src/main/resources/Images/edit.png

11.7 KiB | W: | H:

src/main/resources/Images/edit.png
src/main/resources/Images/edit.png
src/main/resources/Images/edit.png
src/main/resources/Images/edit.png
  • 2-up
  • Swipe
  • Onion skin
src/main/resources/Images/incomeExpense.png 0 → 100644
+ 0
− 0
View file @ 160dcda2
src/main/resources/Images/incomeExpense.png

42.7 KiB

src/main/resources/view/IncomeAndExpenses.fxml
+ 63
− 14
View file @ 160dcda2
......@@ -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>
......
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