Skip to content
Snippets Groups Projects
Commit 0b30b1a9 authored by HSoreide's avatar HSoreide
Browse files

Add some css style to the views and remove labels from pie-charts so that they do not resize

parent df86ca19
No related branches found
No related tags found
1 merge request!49Improve UI based on customer feedback(21/4-23) and add help-button to the 'Add...
Hide whitespace changes
Inline Side-by-side
Showing
with 203 additions and 267 deletions
src/main/resources/style.css
+ 44
− 14
View file @ 0b30b1a9
.font {
-fx-font-family: "JetBrains Mono Medium";
}
.head-line {
-fx-font-family: "JetBrains Mono ExtraBold";
-fx-font-weight: normal;
-fx-font-size: 40;
}
.button-style { .button-style {
//-fx-background-color: linear-gradient(#8ca45b, #1e5b5b); //-fx-background-color: linear-gradient(#8ca45b, #1e5b5b);
-fx-background-color: white; -fx-background-color: white;
-fx-text-fill: black; -fx-text-fill: black;
-fx-background-radius: 30; -fx-background-radius: 30;
-fx-background-insets: 0; -fx-background-insets: 0;
-fx-font-family: "JetBrains Mono";
-fx-font-size: 16; -fx-font-size: 16;
//-fx-text-fill: white; //-fx-text-fill: white;
} }
.welcome-button {
-fx-background-color: white;
-fx-text-fill: black;
-fx-border-width: 10;
-fx-border-fill: #1e5b5b;
-fx-background-radius: 30;
-fx-font-size: 20;
}
#small-button {
-fx-font-size: 12;
}
#on-white {
-fx-background-color: #79b2b2;
-fx-text-fill: black;
}
.square-button-style {
-fx-background-color: white;
-fx-text-fill: black;
-fx-background-radius: 10;
-fx-background-insets: 0;
-fx-font-size: 16;
}
.button-style:hover { .button-style:hover {
-fx-scale-x: 1.05; -fx-scale-x: 1.05;
-fx-scale-y: 1.05; -fx-scale-y: 1.05;
...@@ -22,6 +61,7 @@ ...@@ -22,6 +61,7 @@
-fx-border-color: white; -fx-border-color: white;
-fx-border-width: 6px; -fx-border-width: 6px;
-fx-border-radius: 25; -fx-border-radius: 25;
-fx-text-alignment: center;
} }
.recipe-tile:hover { .recipe-tile:hover {
...@@ -32,7 +72,6 @@ ...@@ -32,7 +72,6 @@
.dialog-pane { .dialog-pane {
-fx-background-color: rgba(151, 175, 151, 0.8); -fx-background-color: rgba(151, 175, 151, 0.8);
} }
.list-cell:filled:selected:focused, .list-cell:filled:selected { .list-cell:filled:selected:focused, .list-cell:filled:selected {
...@@ -44,12 +83,12 @@ ...@@ -44,12 +83,12 @@
-fx-font-size:18.0; -fx-font-size:18.0;
} }
.list-cell:even { /* <=== changed to even */ .list-cell:even {
-fx-background-color: white; -fx-background-color: rgba(255, 255, 255, 0.7);
} }
.list-cell:odd { /* <=== changed to even */ .list-cell:odd {
-fx-background-color: rgba(190, 217, 190, 0.8); -fx-background-color: rgba(190, 217, 190, 0.7);
} }
.list-cell:filled:hover { .list-cell:filled:hover {
...@@ -80,15 +119,6 @@ ...@@ -80,15 +119,6 @@
-fx-border-radius: 20; -fx-border-radius: 20;
} }
/*.main-bar {
-fx-accent: green;
}*/
/*
.mini-bars {
-fx-accent: #1e5b5b;
}*/
.scroll-pane > .viewport { .scroll-pane > .viewport {
-fx-background-color: transparent; -fx-background-color: transparent;
} }
......
src/main/resources/view/AddBudgetNew.fxml
+ 7
− 15
View file @ 0b30b1a9
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.Insets?> <?import javafx.geometry.*?>
<?import javafx.scene.control.Button?> <?import javafx.scene.control.*?>
<?import javafx.scene.control.ComboBox?> <?import javafx.scene.layout.*?>
<?import javafx.scene.control.DialogPane?> <?import javafx.scene.text.*?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.TextField?>
<?import javafx.scene.layout.ColumnConstraints?>
<?import javafx.scene.layout.GridPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.RowConstraints?>
<?import javafx.scene.text.Font?>
<?import javafx.scene.text.Text?>
<DialogPane prefHeight="295.0" prefWidth="360.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.AddBudgetController"> <DialogPane prefHeight="295.0" prefWidth="360.0" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.AddBudgetController">
<content> <content>
<GridPane> <GridPane>
<columnConstraints> <columnConstraints>
...@@ -48,12 +40,12 @@ ...@@ -48,12 +40,12 @@
<TextField fx:id="descriptionVariable" promptText="(optional)" GridPane.columnIndex="1" GridPane.rowIndex="2" /> <TextField fx:id="descriptionVariable" promptText="(optional)" GridPane.columnIndex="1" GridPane.rowIndex="2" />
<HBox alignment="BOTTOM_RIGHT" prefHeight="100.0" prefWidth="200.0" spacing="10.0" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="4"> <HBox alignment="BOTTOM_RIGHT" prefHeight="100.0" prefWidth="200.0" spacing="10.0" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="4">
<children> <children>
<Button fx:id="cancelBtn" mnemonicParsing="false" onAction="#pressCancelBtn" prefHeight="25.0" prefWidth="60.0" text="Cancel"> <Button id="on-white" fx:id="cancelBtn" mnemonicParsing="false" onAction="#pressCancelBtn" prefHeight="25.0" prefWidth="78.0" styleClass="button-style" stylesheets="@../style.css" text="Cancel">
<font> <font>
<Font name="Lucida Console" size="12.0" /> <Font name="Lucida Console" size="12.0" />
</font> </font>
</Button> </Button>
<Button fx:id="okBtn" mnemonicParsing="false" onAction="#pressOkBtn" prefHeight="25.0" prefWidth="60.0" text="OK"> <Button id="on-white" fx:id="okBtn" mnemonicParsing="false" onAction="#pressOkBtn" prefHeight="25.0" prefWidth="60.0" styleClass="button-style" stylesheets="@../style.css" text="OK">
<font> <font>
<Font name="Lucida Console" size="12.0" /> <Font name="Lucida Console" size="12.0" />
</font> </font>
......
src/main/resources/view/AddExpense.fxml
+ 7
− 16
View file @ 0b30b1a9
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.Insets?> <?import javafx.geometry.*?>
<?import javafx.scene.control.Button?> <?import javafx.scene.control.*?>
<?import javafx.scene.control.ComboBox?> <?import javafx.scene.layout.*?>
<?import javafx.scene.control.DatePicker?> <?import javafx.scene.text.*?>
<?import javafx.scene.control.DialogPane?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.TextField?>
<?import javafx.scene.layout.ColumnConstraints?>
<?import javafx.scene.layout.GridPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.RowConstraints?>
<?import javafx.scene.text.Font?>
<?import javafx.scene.text.Text?>
<DialogPane expanded="true" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.AddExpenseController"> <DialogPane expanded="true" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.AddExpenseController">
<content> <content>
<GridPane> <GridPane>
<columnConstraints> <columnConstraints>
...@@ -59,11 +50,11 @@ ...@@ -59,11 +50,11 @@
<ComboBox fx:id="recurringBox" prefWidth="150.0" promptText="No" GridPane.columnIndex="1" GridPane.rowIndex="4" /> <ComboBox fx:id="recurringBox" prefWidth="150.0" promptText="No" GridPane.columnIndex="1" GridPane.rowIndex="4" />
<HBox alignment="BOTTOM_RIGHT" prefHeight="100.0" prefWidth="200.0" spacing="10.0" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="7"> <HBox alignment="BOTTOM_RIGHT" prefHeight="100.0" prefWidth="200.0" spacing="10.0" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="7">
<children> <children>
<Button fx:id="cancelBtn" mnemonicParsing="false" onAction="#pressCancelBtn" prefHeight="25.0" prefWidth="60.0" text="Cancel"> <Button id="on-white" fx:id="cancelBtn" mnemonicParsing="false" onAction="#pressCancelBtn" prefHeight="30.0" prefWidth="82.0" styleClass="button-style" stylesheets="@../style.css" text="Cancel">
<font> <font>
<Font name="Lucida Console" size="12.0" /> <Font name="Lucida Console" size="12.0" />
</font></Button> </font></Button>
<Button fx:id="okBtn" mnemonicParsing="false" onAction="#pressOkBtn" prefHeight="25.0" prefWidth="60.0" text="OK"> <Button id="on-white" fx:id="okBtn" mnemonicParsing="false" onAction="#pressOkBtn" prefHeight="25.0" prefWidth="60.0" styleClass="button-style" stylesheets="@../style.css" text="OK">
<font> <font>
<Font name="Lucida Console" size="12.0" /> <Font name="Lucida Console" size="12.0" />
</font></Button> </font></Button>
......
src/main/resources/view/AddIncome.fxml
+ 7
− 16
View file @ 0b30b1a9
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.Insets?> <?import javafx.geometry.*?>
<?import javafx.scene.control.Button?> <?import javafx.scene.control.*?>
<?import javafx.scene.control.ComboBox?> <?import javafx.scene.layout.*?>
<?import javafx.scene.control.DatePicker?> <?import javafx.scene.text.*?>
<?import javafx.scene.control.DialogPane?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.TextField?>
<?import javafx.scene.layout.ColumnConstraints?>
<?import javafx.scene.layout.GridPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.RowConstraints?>
<?import javafx.scene.text.Font?>
<?import javafx.scene.text.Text?>
<DialogPane expanded="true" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.AddIncomeController"> <DialogPane expanded="true" prefWidth="322.0" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.AddIncomeController">
<content> <content>
<GridPane> <GridPane>
<columnConstraints> <columnConstraints>
...@@ -64,12 +55,12 @@ ...@@ -64,12 +55,12 @@
<ComboBox fx:id="recurringBox" prefWidth="150.0" promptText="No" GridPane.columnIndex="1" GridPane.rowIndex="4" /> <ComboBox fx:id="recurringBox" prefWidth="150.0" promptText="No" GridPane.columnIndex="1" GridPane.rowIndex="4" />
<HBox alignment="BOTTOM_RIGHT" prefHeight="100.0" prefWidth="200.0" spacing="10.0" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="7"> <HBox alignment="BOTTOM_RIGHT" prefHeight="100.0" prefWidth="200.0" spacing="10.0" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="7">
<children> <children>
<Button fx:id="cancelBtn" mnemonicParsing="false" onAction="#pressCancelBtn" prefHeight="25.0" prefWidth="60.0" text="Cancel"> <Button id="on-white" fx:id="cancelBtn" mnemonicParsing="false" onAction="#pressCancelBtn" prefHeight="30.0" prefWidth="82.0" styleClass="button-style" stylesheets="@../style.css" text="Cancel">
<font> <font>
<Font name="Lucida Console" size="12.0" /> <Font name="Lucida Console" size="12.0" />
</font> </font>
</Button> </Button>
<Button fx:id="okBtn" mnemonicParsing="false" onAction="#pressOkBtn" prefHeight="25.0" prefWidth="60.0" text="OK"> <Button id="on-white" fx:id="okBtn" mnemonicParsing="false" onAction="#pressOkBtn" prefHeight="25.0" prefWidth="60.0" styleClass="button-style" stylesheets="@../style.css" text="OK">
<font> <font>
<Font name="Lucida Console" size="12.0" /> <Font name="Lucida Console" size="12.0" />
</font> </font>
......
src/main/resources/view/AddIngredient.fxml
+ 1
− 1
View file @ 0b30b1a9
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
</children></AnchorPane> </children></AnchorPane>
</content> </content>
<header> <header>
<Label fx:id="addIngredientPane" alignment="CENTER" contentDisplay="CENTER" text="Add an ingredient to the fridge"> <Label fx:id="addIngredientPane" alignment="CENTER" contentDisplay="CENTER" styleClass="font" stylesheets="@../style.css" text="Add an ingredient to the fridge">
<font> <font>
<Font size="24.0" /> <Font size="24.0" />
</font> </font>
......
src/main/resources/view/AllRecipes.fxml
+ 1
− 1
View file @ 0b30b1a9
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</Pane> </Pane>
<Pane prefHeight="100.0" prefWidth="623.0"> <Pane prefHeight="100.0" prefWidth="623.0">
<children> <children>
<Label layoutX="115.0" layoutY="24.0" text="All recipes"> <Label layoutX="115.0" layoutY="24.0" styleClass="head-line" stylesheets="@../style.css" text="All recipes">
<font> <font>
<Font size="48.0" /> <Font size="48.0" />
</font> </font>
......
src/main/resources/view/BudgetBar.fxml
+ 2
− 2
View file @ 0b30b1a9
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<children> <children>
<Pane prefHeight="87.0" prefWidth="167.0"> <Pane prefHeight="87.0" prefWidth="167.0">
<children> <children>
<Label fx:id="nameTag" alignment="CENTER" contentDisplay="CENTER" prefHeight="87.0" prefWidth="167.0" text="BudgetName" textAlignment="CENTER" wrapText="true"> <Label fx:id="nameTag" alignment="CENTER" contentDisplay="CENTER" prefHeight="87.0" prefWidth="167.0" styleClass="font" stylesheets="@../style.css" text="BudgetName" textAlignment="CENTER" wrapText="true">
<font> <font>
<Font size="20.0" /> <Font size="20.0" />
</font> </font>
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
</children></Pane> </children></Pane>
<Pane prefHeight="200.0" prefWidth="200.0"> <Pane prefHeight="200.0" prefWidth="200.0">
<children> <children>
<Label fx:id="leftoverTag" layoutY="-1.0" prefHeight="87.0" prefWidth="200.0" text="LeftOver" textAlignment="CENTER" wrapText="true"> <Label fx:id="leftoverTag" layoutY="-1.0" prefHeight="87.0" prefWidth="200.0" styleClass="font" stylesheets="@../style.css" text="LeftOver" textAlignment="CENTER" wrapText="true">
<font> <font>
<Font size="20.0" /> <Font size="20.0" />
</font> </font>
......
src/main/resources/view/BudgetNewest.fxml
+ 18
− 33
View file @ 0b30b1a9
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.Insets?> <?import javafx.geometry.*?>
<?import javafx.scene.Cursor?> <?import javafx.scene.*?>
<?import javafx.scene.chart.PieChart?> <?import javafx.scene.chart.*?>
<?import javafx.scene.control.Button?> <?import javafx.scene.control.*?>
<?import javafx.scene.control.ComboBox?> <?import javafx.scene.image.*?>
<?import javafx.scene.control.ContextMenu?> <?import javafx.scene.layout.*?>
<?import javafx.scene.control.DatePicker?> <?import javafx.scene.text.*?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.MenuItem?>
<?import javafx.scene.control.TableColumn?>
<?import javafx.scene.control.TableView?>
<?import javafx.scene.image.Image?>
<?import javafx.scene.image.ImageView?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.ColumnConstraints?>
<?import javafx.scene.layout.GridPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.Pane?>
<?import javafx.scene.layout.RowConstraints?>
<?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"> <AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="695.0" prefWidth="1130.0" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.BudgetController">
<children> <children>
<ImageView fitHeight="695.0" fitWidth="1130.0" pickOnBounds="true"> <ImageView fitHeight="695.0" fitWidth="1130.0" pickOnBounds="true">
<image> <image>
...@@ -39,7 +24,7 @@ ...@@ -39,7 +24,7 @@
<right> <right>
<Pane BorderPane.alignment="CENTER"> <Pane BorderPane.alignment="CENTER">
<children> <children>
<Label fx:id="daysLeftLbl" layoutX="27.0" layoutY="83.0" text="Days left: 31"> <Label fx:id="daysLeftLbl" layoutX="27.0" layoutY="83.0" styleClass="font" stylesheets="@../style.css" text="Days left: 31">
<font> <font>
<Font name="Lucida Console" size="14.0" /> <Font name="Lucida Console" size="14.0" />
</font> </font>
...@@ -51,7 +36,7 @@ ...@@ -51,7 +36,7 @@
<left> <left>
<Pane prefWidth="175.0" BorderPane.alignment="CENTER"> <Pane prefWidth="175.0" BorderPane.alignment="CENTER">
<children> <children>
<Button fx:id="returnToMainMenuBtn" alignment="CENTER" layoutX="-2.0" layoutY="58.0" mnemonicParsing="false" onAction="#switchScene" text="Return to Main Menu"> <Button fx:id="returnToMainMenuBtn" alignment="CENTER" layoutX="-2.0" layoutY="58.0" mnemonicParsing="false" onAction="#switchScene" styleClass="button-style" stylesheets="@../style.css" text="Return to Main Menu">
<font> <font>
<Font name="Lucida Console" size="14.0" /> <Font name="Lucida Console" size="14.0" />
</font> </font>
...@@ -60,7 +45,7 @@ ...@@ -60,7 +45,7 @@
</Pane> </Pane>
</left> </left>
<center> <center>
<Label fx:id="title" text="BUDGET" textAlignment="CENTER" BorderPane.alignment="CENTER"> <Label fx:id="title" styleClass="head-line" stylesheets="@../style.css" text="BUDGET" textAlignment="CENTER" BorderPane.alignment="CENTER">
<font> <font>
<Font name="Lucida Console" size="48.0" /> <Font name="Lucida Console" size="48.0" />
</font> </font>
...@@ -74,7 +59,7 @@ ...@@ -74,7 +59,7 @@
<left> <left>
<HBox prefHeight="64.0" prefWidth="326.0" spacing="10.0" BorderPane.alignment="CENTER"> <HBox prefHeight="64.0" prefWidth="326.0" spacing="10.0" BorderPane.alignment="CENTER">
<children> <children>
<Button fx:id="addBtn" mnemonicParsing="false" onAction="#handleAddBtn" prefHeight="25.0" prefWidth="60.0" text="Add"> <Button id="small-button" fx:id="addBtn" mnemonicParsing="false" onAction="#handleAddBtn" prefHeight="38.0" prefWidth="75.0" styleClass="button-style" stylesheets="@../style.css" text="Add">
<font> <font>
<Font name="Lucida Console" size="14.0" /> <Font name="Lucida Console" size="14.0" />
</font> </font>
...@@ -86,7 +71,7 @@ ...@@ -86,7 +71,7 @@
</ImageView> </ImageView>
</graphic> </graphic>
</Button> </Button>
<Button fx:id="editBtn" mnemonicParsing="false" onAction="#handleEditBtn" prefHeight="39.0" prefWidth="91.0" text="Edit"> <Button id="small-button" fx:id="editBtn" mnemonicParsing="false" onAction="#handleEditBtn" prefHeight="39.0" prefWidth="91.0" styleClass="button-style" stylesheets="@../style.css" text="Edit">
<font> <font>
<Font name="Lucida Console" size="14.0" /> <Font name="Lucida Console" size="14.0" />
</font> </font>
...@@ -98,7 +83,7 @@ ...@@ -98,7 +83,7 @@
</ImageView> </ImageView>
</graphic> </graphic>
</Button> </Button>
<Button fx:id="deleteBtn" mnemonicParsing="false" onAction="#handleDeleteBtn" prefHeight="39.0" prefWidth="119.0" text="Delete"> <Button id="small-button" fx:id="deleteBtn" mnemonicParsing="false" onAction="#handleDeleteBtn" prefHeight="39.0" prefWidth="119.0" styleClass="button-style" stylesheets="@../style.css" text="Delete">
<font> <font>
<Font name="Lucida Console" size="14.0" /> <Font name="Lucida Console" size="14.0" />
</font> </font>
...@@ -150,7 +135,7 @@ ...@@ -150,7 +135,7 @@
<children> <children>
<Pane> <Pane>
<children> <children>
<Label alignment="CENTER" layoutX="135.0" text="Max amount: 1000"> <Label alignment="CENTER" layoutX="135.0" styleClass="font" stylesheets="@../style.css" text="Max amount: 1000">
<font> <font>
<Font name="Lucida Console" size="24.0" /> <Font name="Lucida Console" size="24.0" />
</font> </font>
...@@ -179,8 +164,8 @@ ...@@ -179,8 +164,8 @@
</TableView> </TableView>
<HBox alignment="TOP_RIGHT"> <HBox alignment="TOP_RIGHT">
<children> <children>
<Button fx:id="backBtn" mnemonicParsing="false" text="back" /> <Button fx:id="backBtn" mnemonicParsing="false" styleClass="button-style" stylesheets="@../style.css" text="back" />
<Button fx:id="continueBtn" mnemonicParsing="false" text="continue" /> <Button fx:id="continueBtn" mnemonicParsing="false" styleClass="button-style" stylesheets="@../style.css" text="continue" />
</children> </children>
</HBox> </HBox>
</children> </children>
...@@ -190,7 +175,7 @@ ...@@ -190,7 +175,7 @@
</VBox> </VBox>
<Pane GridPane.columnIndex="1"> <Pane GridPane.columnIndex="1">
<children> <children>
<PieChart fx:id="budgetPieChart" layoutX="105.0" layoutY="33.0" legendSide="RIGHT" maxHeight="444.0" maxWidth="512.0" prefHeight="302.0" prefWidth="354.0" /> <PieChart fx:id="budgetPieChart" labelsVisible="false" layoutX="105.0" layoutY="33.0" legendSide="RIGHT" maxHeight="444.0" maxWidth="512.0" prefHeight="302.0" prefWidth="354.0" />
</children> </children>
</Pane> </Pane>
</children> </children>
......
src/main/resources/view/CreateBudget.fxml
+ 7
− 16
View file @ 0b30b1a9
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.Insets?> <?import javafx.geometry.*?>
<?import javafx.scene.control.Button?> <?import javafx.scene.control.*?>
<?import javafx.scene.control.DialogPane?> <?import javafx.scene.layout.*?>
<?import javafx.scene.control.Label?> <?import javafx.scene.text.*?>
<?import javafx.scene.control.TextField?>
<?import javafx.scene.layout.ColumnConstraints?>
<?import javafx.scene.layout.GridPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.Pane?>
<?import javafx.scene.layout.RowConstraints?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>
<?import javafx.scene.text.Text?>
<DialogPane prefHeight="113.0" prefWidth="327.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.CreateBudgetController"> <DialogPane prefHeight="113.0" prefWidth="327.0" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.CreateBudgetController">
<content> <content>
<VBox> <VBox>
<children> <children>
...@@ -36,8 +27,8 @@ ...@@ -36,8 +27,8 @@
<Label fx:id="errorMsg" alignment="CENTER_RIGHT" opacity="0.0" prefHeight="315.0" prefWidth="315.0" text="Please fill in the name field" textAlignment="CENTER" textFill="RED" /> <Label fx:id="errorMsg" alignment="CENTER_RIGHT" opacity="0.0" prefHeight="315.0" prefWidth="315.0" text="Please fill in the name field" textAlignment="CENTER" textFill="RED" />
<HBox alignment="CENTER_RIGHT" prefHeight="100.0" prefWidth="200.0" spacing="5.0"> <HBox alignment="CENTER_RIGHT" prefHeight="100.0" prefWidth="200.0" spacing="5.0">
<children> <children>
<Button fx:id="cancelBtn" mnemonicParsing="false" onAction="#pressCancelBtn" prefWidth="70.0" text="Cancel" /> <Button id="on-white" fx:id="cancelBtn" mnemonicParsing="false" onAction="#pressCancelBtn" prefHeight="30.0" prefWidth="83.0" styleClass="button-style" stylesheets="@../style.css" text="Cancel" />
<Button fx:id="okBtn" mnemonicParsing="false" onAction="#pressOkBtn" prefWidth="70.0" text="OK" /> <Button id="on-white" fx:id="okBtn" mnemonicParsing="false" onAction="#pressOkBtn" prefWidth="70.0" styleClass="button-style" stylesheets="@../style.css" text="OK" />
</children> </children>
<VBox.margin> <VBox.margin>
<Insets top="10.0" /> <Insets top="10.0" />
......
src/main/resources/view/FirstMenu.fxml
+ 7
− 9
View file @ 0b30b1a9
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.control.Button?> <?import javafx.scene.control.*?>
<?import javafx.scene.control.Label?> <?import javafx.scene.image.*?>
<?import javafx.scene.image.Image?> <?import javafx.scene.layout.*?>
<?import javafx.scene.image.ImageView?> <?import javafx.scene.text.*?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.text.Font?>
<AnchorPane maxHeight="600" maxWidth="607.0" minHeight="406.0" minWidth="600" prefHeight="406.0" prefWidth="607.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.SceneController"> <AnchorPane maxHeight="600" maxWidth="607.0" minHeight="406.0" minWidth="600" prefHeight="406.0" prefWidth="607.0" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.SceneController">
<ImageView fitHeight="412.0" fitWidth="614.0" layoutX="-7.0" layoutY="-6.0" pickOnBounds="true" smooth="false"> <ImageView fitHeight="412.0" fitWidth="614.0" layoutX="-7.0" layoutY="-6.0" pickOnBounds="true" smooth="false">
<Image url="@../Images/backgroundMini.jpg" /> <Image url="@../Images/backgroundMini.jpg" />
</ImageView> </ImageView>
...@@ -21,12 +19,12 @@ ...@@ -21,12 +19,12 @@
<Font name="Verdana" size="18.0" /> <Font name="Verdana" size="18.0" />
</font> </font>
</Label> </Label>
<Button layoutX="69.0" layoutY="212.0" mnemonicParsing="false" onAction="#switchIncome" text="New Budget"> <Button layoutX="69.0" layoutY="212.0" mnemonicParsing="false" onAction="#switchIncome" styleClass="welcome-button" stylesheets="@../style.css" text="New Budget">
<font> <font>
<Font size="24.0" /> <Font size="24.0" />
</font> </font>
</Button> </Button>
<Button layoutX="380.0" layoutY="212.0" mnemonicParsing="false" onAction="#switchMainMenu" text="Old Budget"> <Button layoutX="380.0" layoutY="212.0" mnemonicParsing="false" onAction="#switchMainMenu" styleClass="welcome-button" stylesheets="@../style.css" text="Old Budget">
<font> <font>
<Font size="24.0" /> <Font size="24.0" />
</font> </font>
......
src/main/resources/view/IncomeAndExpenses.fxml
+ 20
− 37
View file @ 0b30b1a9
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.Insets?> <?import javafx.geometry.*?>
<?import javafx.scene.Cursor?> <?import javafx.scene.*?>
<?import javafx.scene.chart.PieChart?> <?import javafx.scene.chart.*?>
<?import javafx.scene.control.Button?> <?import javafx.scene.control.*?>
<?import javafx.scene.control.ComboBox?> <?import javafx.scene.image.*?>
<?import javafx.scene.control.ContextMenu?> <?import javafx.scene.layout.*?>
<?import javafx.scene.control.DatePicker?> <?import javafx.scene.text.*?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.MenuButton?>
<?import javafx.scene.control.MenuItem?>
<?import javafx.scene.control.TableColumn?>
<?import javafx.scene.control.TableView?>
<?import javafx.scene.image.Image?>
<?import javafx.scene.image.ImageView?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.ColumnConstraints?>
<?import javafx.scene.layout.GridPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.Pane?>
<?import javafx.scene.layout.RowConstraints?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>
<?import javafx.scene.text.Text?>
<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"> <AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="695.0" prefWidth="1130.0" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.IncomeExpenseController">
<children> <children>
<ImageView fitHeight="695.0" fitWidth="1130.0" pickOnBounds="true"> <ImageView fitHeight="695.0" fitWidth="1130.0" pickOnBounds="true">
<image> <image>
...@@ -41,7 +24,7 @@ ...@@ -41,7 +24,7 @@
<right> <right>
<Pane BorderPane.alignment="CENTER"> <Pane BorderPane.alignment="CENTER">
<children> <children>
<Label fx:id="daysLeftLbl" layoutX="27.0" layoutY="83.0" text="Days left: 31"> <Label fx:id="daysLeftLbl" layoutX="27.0" layoutY="83.0" styleClass="font" stylesheets="@../style.css" text="Days left: 31">
<font> <font>
<Font name="Lucida Console" size="14.0" /> <Font name="Lucida Console" size="14.0" />
</font> </font>
...@@ -53,7 +36,7 @@ ...@@ -53,7 +36,7 @@
<left> <left>
<Pane prefWidth="175.0" BorderPane.alignment="CENTER"> <Pane prefWidth="175.0" BorderPane.alignment="CENTER">
<children> <children>
<Button fx:id="returnToMainMenuBtn" alignment="CENTER" layoutX="-2.0" layoutY="58.0" mnemonicParsing="false" onAction="#switchScene" text="Return to Main Menu"> <Button fx:id="returnToMainMenuBtn" alignment="CENTER" layoutX="-2.0" layoutY="58.0" mnemonicParsing="false" onAction="#switchScene" styleClass="button-style" stylesheets="@../style.css" text="Return to Main Menu">
<font> <font>
<Font name="Lucida Console" size="14.0" /> <Font name="Lucida Console" size="14.0" />
</font> </font>
...@@ -65,7 +48,7 @@ ...@@ -65,7 +48,7 @@
<center> <center>
<Pane BorderPane.alignment="CENTER"> <Pane BorderPane.alignment="CENTER">
<children> <children>
<Label fx:id="title" layoutX="100.0" layoutY="47.0" text="INCOME AND EXPENSES" textAlignment="CENTER"> <Label fx:id="title" layoutX="100.0" layoutY="47.0" styleClass="head-line" stylesheets="@../style.css" text="INCOME AND EXPENSES" textAlignment="CENTER">
<font> <font>
<Font name="Lucida Console" size="48.0" /> <Font name="Lucida Console" size="48.0" />
</font> </font>
...@@ -82,7 +65,7 @@ ...@@ -82,7 +65,7 @@
<left> <left>
<HBox alignment="CENTER_LEFT" prefHeight="64.0" prefWidth="261.0" spacing="10.0" BorderPane.alignment="CENTER"> <HBox alignment="CENTER_LEFT" prefHeight="64.0" prefWidth="261.0" spacing="10.0" BorderPane.alignment="CENTER">
<children> <children>
<MenuButton mnemonicParsing="false" prefHeight="38.0" prefWidth="101.0" text="ADD"> <MenuButton mnemonicParsing="false" prefHeight="40.0" prefWidth="114.0" styleClass="button-style" stylesheets="@../style.css" text="ADD">
<items> <items>
<MenuItem fx:id="addIncome" mnemonicParsing="false" onAction="#handleAddBtn" text="Income" /> <MenuItem fx:id="addIncome" mnemonicParsing="false" onAction="#handleAddBtn" text="Income" />
<MenuItem fx:id="addExpense" mnemonicParsing="false" onAction="#handleAddBtn" text="Expense" /> <MenuItem fx:id="addExpense" mnemonicParsing="false" onAction="#handleAddBtn" text="Expense" />
...@@ -98,7 +81,7 @@ ...@@ -98,7 +81,7 @@
<Font name="Lucida Console" size="14.0" /> <Font name="Lucida Console" size="14.0" />
</font> </font>
</MenuButton> </MenuButton>
<Button mnemonicParsing="false" /> <Button mnemonicParsing="false" styleClass="button-style" stylesheets="@../style.css" />
</children> </children>
<BorderPane.margin> <BorderPane.margin>
<Insets left="30.0" /> <Insets left="30.0" />
...@@ -112,7 +95,7 @@ ...@@ -112,7 +95,7 @@
<Insets /> <Insets />
</opaqueInsets> </opaqueInsets>
<VBox.margin> <VBox.margin>
<Insets left="10.0" right="15.0" /> <Insets left="50.0" right="15.0" />
</VBox.margin> </VBox.margin>
<center> <center>
<Pane BorderPane.alignment="CENTER"> <Pane BorderPane.alignment="CENTER">
...@@ -126,10 +109,10 @@ ...@@ -126,10 +109,10 @@
</Pane> </Pane>
</center> </center>
</BorderPane> </BorderPane>
<GridPane prefHeight="473.0" prefWidth="1055.0"> <GridPane prefHeight="473.0" prefWidth="1029.0">
<columnConstraints> <columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" /> <ColumnConstraints hgrow="SOMETIMES" maxWidth="563.0" minWidth="10.0" prefWidth="550.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" /> <ColumnConstraints hgrow="SOMETIMES" maxWidth="495.0" minWidth="10.0" prefWidth="455.0" />
</columnConstraints> </columnConstraints>
<rowConstraints> <rowConstraints>
<RowConstraints minHeight="10.0" percentHeight="5.0" prefHeight="30.0" vgrow="SOMETIMES" /> <RowConstraints minHeight="10.0" percentHeight="5.0" prefHeight="30.0" vgrow="SOMETIMES" />
...@@ -164,12 +147,12 @@ ...@@ -164,12 +147,12 @@
</VBox> </VBox>
<Pane GridPane.columnIndex="1" GridPane.rowIndex="1"> <Pane GridPane.columnIndex="1" GridPane.rowIndex="1">
<children> <children>
<PieChart fx:id="incomePieChart" layoutX="4.0" layoutY="-41.0" legendSide="RIGHT" maxHeight="244.0" maxWidth="512.0" prefHeight="244.0" prefWidth="350.0" title="Income" /> <PieChart fx:id="incomePieChart" labelsVisible="false" layoutX="4.0" layoutY="-41.0" legendSide="RIGHT" maxHeight="244.0" maxWidth="512.0" prefHeight="244.0" prefWidth="350.0" title="Income" />
</children> </children>
</Pane> </Pane>
<Pane GridPane.columnIndex="1" GridPane.rowIndex="3"> <Pane GridPane.columnIndex="1" GridPane.rowIndex="3">
<children> <children>
<PieChart fx:id="expensePieChart" layoutX="-2.0" layoutY="-37.0" legendSide="RIGHT" maxHeight="261.0" maxWidth="519.0" prefHeight="237.0" prefWidth="350.0" title="Expenses" /> <PieChart fx:id="expensePieChart" labelsVisible="false" layoutX="-2.0" layoutY="-37.0" legendSide="RIGHT" maxHeight="261.0" maxWidth="519.0" prefHeight="237.0" prefWidth="350.0" title="Expenses" />
</children> </children>
</Pane> </Pane>
<Pane prefHeight="20.0" prefWidth="1046.0"> <Pane prefHeight="20.0" prefWidth="1046.0">
...@@ -229,7 +212,7 @@ ...@@ -229,7 +212,7 @@
<Insets left="10.0" /> <Insets left="10.0" />
</padding> </padding>
<VBox.margin> <VBox.margin>
<Insets left="30.0" right="30.0" /> <Insets left="60.0" right="50.0" />
</VBox.margin> </VBox.margin>
</GridPane> </GridPane>
</children> </children>
......
src/main/resources/view/IngredientTile.fxml
+ 2
− 2
View file @ 0b30b1a9
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
<Pane fx:id="ingredientPane" styleClass="ingredient" stylesheets="@../style.css" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.IngredientTileController"> <Pane fx:id="ingredientPane" styleClass="ingredient" stylesheets="@../style.css" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.IngredientTileController">
<children> <children>
<Label fx:id="text" prefHeight="40.0" prefWidth="250.0" text="Ingredient"> <Label fx:id="text" prefHeight="40.0" prefWidth="250.0" styleClass="font" stylesheets="@../style.css" text="Ingredient">
<font> <font>
<Font name="System Italic" size="14.0" /> <Font name="Ani" size="14.0" />
</font> </font>
<padding> <padding>
<Insets left="15.0" /> <Insets left="15.0" />
......
src/main/resources/view/MainMenuNew.fxml
+ 21
− 8
View file @ 0b30b1a9
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?import java.lang.*?>
<?import javafx.geometry.*?> <?import javafx.geometry.*?>
<?import javafx.scene.control.*?> <?import javafx.scene.control.*?>
<?import javafx.scene.image.*?> <?import javafx.scene.image.*?>
...@@ -19,7 +20,7 @@ ...@@ -19,7 +20,7 @@
<left> <left>
<Pane prefWidth="175.0" BorderPane.alignment="CENTER"> <Pane prefWidth="175.0" BorderPane.alignment="CENTER">
<children> <children>
<Button fx:id="returnBtn" alignment="CENTER" layoutX="-2.0" layoutY="58.0" mnemonicParsing="false" onAction="#switchScene" text="Return to start"> <Button fx:id="returnBtn" alignment="CENTER" layoutX="-2.0" layoutY="58.0" mnemonicParsing="false" onAction="#switchScene" styleClass="button-style" stylesheets="@../style.css" text="Return to start">
<font> <font>
<Font name="Lucida Console" size="14.0" /> <Font name="Lucida Console" size="14.0" />
</font> </font>
...@@ -28,7 +29,7 @@ ...@@ -28,7 +29,7 @@
</Pane> </Pane>
</left> </left>
<center> <center>
<Label fx:id="title" text="BUDGET JANUARY" textAlignment="CENTER" BorderPane.alignment="CENTER"> <Label fx:id="title" styleClass="head-line" stylesheets="@../style.css" text="BUDGET JANUARY" textAlignment="CENTER" BorderPane.alignment="CENTER">
<font> <font>
<Font name="Lucida Console" size="48.0" /> <Font name="Lucida Console" size="48.0" />
</font> </font>
...@@ -37,7 +38,7 @@ ...@@ -37,7 +38,7 @@
<right> <right>
<Pane BorderPane.alignment="CENTER"> <Pane BorderPane.alignment="CENTER">
<children> <children>
<Label fx:id="daysLeftLbl" layoutX="27.0" layoutY="83.0" text="Days left: 31"> <Label fx:id="daysLeftLbl" layoutX="27.0" layoutY="83.0" styleClass="font" stylesheets="@../style.css" text="Days left: 31">
<font> <font>
<Font name="Lucida Console" size="14.0" /> <Font name="Lucida Console" size="14.0" />
</font> </font>
...@@ -50,7 +51,7 @@ ...@@ -50,7 +51,7 @@
<Insets left="15.0" right="15.0" /> <Insets left="15.0" right="15.0" />
</VBox.margin> </VBox.margin>
<bottom> <bottom>
<Label fx:id="balanceLbl" text="Balance: xxx" BorderPane.alignment="CENTER"> <Label fx:id="balanceLbl" styleClass="font" stylesheets="@../style.css" text="Balance: xxx" BorderPane.alignment="CENTER">
<font> <font>
<Font name="Lucida Console" size="24.0" /> <Font name="Lucida Console" size="24.0" />
</font> </font>
...@@ -66,7 +67,7 @@ ...@@ -66,7 +67,7 @@
<Insets top="5.0" /> <Insets top="5.0" />
</StackPane.margin> </StackPane.margin>
</ProgressBar> </ProgressBar>
<Label fx:id="usageLbl" prefHeight="49.0" prefWidth="287.0" text="You have used xxx out of xxx this month"> <Label fx:id="usageLbl" prefHeight="49.0" prefWidth="287.0" styleClass="font" stylesheets="@../style.css" text="You have used xxx out of xxx this month">
<font> <font>
<Font name="Lucida Console" size="14.0" /> <Font name="Lucida Console" size="14.0" />
</font> </font>
...@@ -96,7 +97,7 @@ ...@@ -96,7 +97,7 @@
</BorderPane> </BorderPane>
<TilePane alignment="CENTER" hgap="50.0" prefHeight="127.0" prefWidth="1130.0"> <TilePane alignment="CENTER" hgap="50.0" prefHeight="127.0" prefWidth="1130.0">
<children> <children>
<Button fx:id="foodBtn" alignment="TOP_CENTER" contentDisplay="TOP" mnemonicParsing="false" onAction="#switchScene" prefHeight="100.0" prefWidth="150.0" text="Food"> <Button fx:id="foodBtn" alignment="TOP_CENTER" contentDisplay="TOP" mnemonicParsing="false" onAction="#switchScene" prefHeight="100.0" prefWidth="175.0" stylesheets="@../style.css" text="Food">
<graphic> <graphic>
<ImageView fitHeight="75.0" fitWidth="75.0" pickOnBounds="true" preserveRatio="true"> <ImageView fitHeight="75.0" fitWidth="75.0" pickOnBounds="true" preserveRatio="true">
<image> <image>
...@@ -107,8 +108,12 @@ ...@@ -107,8 +108,12 @@
<font> <font>
<Font name="Lucida Console" size="14.0" /> <Font name="Lucida Console" size="14.0" />
</font> </font>
<styleClass>
<String fx:value="square-button-style" />
<String fx:value="font" />
</styleClass>
</Button> </Button>
<Button fx:id="incomeBtn" alignment="TOP_CENTER" contentDisplay="TOP" mnemonicParsing="false" onAction="#switchScene" prefHeight="100.0" prefWidth="150.0" text="Income/expenses"> <Button fx:id="incomeBtn" alignment="TOP_CENTER" contentDisplay="TOP" mnemonicParsing="false" onAction="#switchScene" prefHeight="100.0" prefWidth="175.0" stylesheets="@../style.css" text="Income/expenses">
<graphic> <graphic>
<ImageView fitHeight="75.0" fitWidth="75.0" pickOnBounds="true" preserveRatio="true"> <ImageView fitHeight="75.0" fitWidth="75.0" pickOnBounds="true" preserveRatio="true">
<image> <image>
...@@ -119,8 +124,12 @@ ...@@ -119,8 +124,12 @@
<font> <font>
<Font name="Lucida Console" size="14.0" /> <Font name="Lucida Console" size="14.0" />
</font> </font>
<styleClass>
<String fx:value="square-button-style" />
<String fx:value="font" />
</styleClass>
</Button> </Button>
<Button fx:id="budgetBtn" contentDisplay="TOP" mnemonicParsing="false" onAction="#switchScene" prefHeight="100.0" prefWidth="150.0" text="View budget"> <Button fx:id="budgetBtn" contentDisplay="TOP" mnemonicParsing="false" onAction="#switchScene" prefHeight="100.0" prefWidth="175.0" stylesheets="@../style.css" text="View budget">
<graphic> <graphic>
<ImageView fitHeight="75.0" fitWidth="75.0" pickOnBounds="true" preserveRatio="true"> <ImageView fitHeight="75.0" fitWidth="75.0" pickOnBounds="true" preserveRatio="true">
<image> <image>
...@@ -131,6 +140,10 @@ ...@@ -131,6 +140,10 @@
<font> <font>
<Font name="Lucida Console" size="14.0" /> <Font name="Lucida Console" size="14.0" />
</font> </font>
<styleClass>
<String fx:value="square-button-style" />
<String fx:value="font" />
</styleClass>
</Button> </Button>
</children> </children>
</TilePane> </TilePane>
......
src/main/resources/view/Recipe.fxml
+ 1
− 1
View file @ 0b30b1a9
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</Pane> </Pane>
<Pane prefHeight="103.0" prefWidth="853.0"> <Pane prefHeight="103.0" prefWidth="853.0">
<children> <children>
<Label fx:id="recipeName" alignment="CENTER" contentDisplay="CENTER" layoutX="44.0" layoutY="38.0" text="RecipeName" textAlignment="CENTER"> <Label fx:id="recipeName" alignment="CENTER" contentDisplay="CENTER" layoutX="44.0" layoutY="38.0" styleClass="head-line" stylesheets="@../style.css" text="RecipeName" textAlignment="CENTER">
<font> <font>
<Font size="36.0" /> <Font size="36.0" />
</font> </font>
......
src/main/resources/view/SelectBudget.fxml
+ 7
− 11
View file @ 0b30b1a9
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.control.Button?> <?import javafx.scene.control.*?>
<?import javafx.scene.control.DialogPane?> <?import javafx.scene.layout.*?>
<?import javafx.scene.control.Label?> <?import javafx.scene.text.*?>
<?import javafx.scene.control.ListView?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>
<DialogPane prefHeight="300.0" prefWidth="400.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.SelectBudgetController"> <DialogPane prefHeight="300.0" prefWidth="400.0" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.SelectBudgetController">
<content> <content>
<VBox alignment="CENTER" prefWidth="362.0" spacing="5.0"> <VBox alignment="CENTER" prefWidth="362.0" spacing="5.0">
<children> <children>
<Label text="Select budget project"> <Label styleClass="font" stylesheets="@../style.css" text="Select budget project">
<font> <font>
<Font name="Lucida Console" size="24.0" /> <Font name="Lucida Console" size="24.0" />
</font> </font>
...@@ -25,8 +21,8 @@ ...@@ -25,8 +21,8 @@
</Label> </Label>
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" spacing="5.0"> <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" spacing="5.0">
<children> <children>
<Button mnemonicParsing="false" onAction="#exitWindow" prefWidth="70.0" text="Cancel" /> <Button id="on-white" mnemonicParsing="false" onAction="#exitWindow" prefHeight="24.0" prefWidth="92.0" styleClass="button-style" stylesheets="@../style.css" text="Cancel" />
<Button fx:id="okBtn" mnemonicParsing="false" onAction="#selectBudget" prefWidth="70.0" text="OK" /> <Button id="on-white" fx:id="okBtn" mnemonicParsing="false" onAction="#selectBudget" prefWidth="70.0" styleClass="button-style" stylesheets="@../style.css" text="OK" />
</children> </children>
</HBox> </HBox>
<Label text="Click on an entry to select it"> <Label text="Click on an entry to select it">
......
src/main/resources/view/SuggestRecipes.fxml
+ 15
− 19
View file @ 0b30b1a9
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.Insets?> <?import java.lang.*?>
<?import javafx.scene.control.Button?> <?import javafx.geometry.*?>
<?import javafx.scene.control.Label?> <?import javafx.scene.control.*?>
<?import javafx.scene.control.ListView?> <?import javafx.scene.image.*?>
<?import javafx.scene.image.Image?> <?import javafx.scene.layout.*?>
<?import javafx.scene.image.ImageView?> <?import javafx.scene.text.*?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.ColumnConstraints?>
<?import javafx.scene.layout.GridPane?>
<?import javafx.scene.layout.Pane?>
<?import javafx.scene.layout.RowConstraints?>
<?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.SuggestRecipesController"> <AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="695.0" prefWidth="1130.0" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.SuggestRecipesController">
<children> <children>
<ImageView fitHeight="695.0" fitWidth="1130.0" pickOnBounds="true"> <ImageView fitHeight="695.0" fitWidth="1130.0" pickOnBounds="true">
<image> <image>
...@@ -28,7 +20,7 @@ ...@@ -28,7 +20,7 @@
<children> <children>
<Pane prefHeight="64.0" prefWidth="421.0"> <Pane prefHeight="64.0" prefWidth="421.0">
<children> <children>
<Label layoutX="101.0" layoutY="17.0" text="Food in the Fridge" underline="true"> <Label layoutX="101.0" layoutY="17.0" styleClass="font" stylesheets="@../style.css" text="Food in the Fridge" underline="true">
<font> <font>
<Font size="24.0" /> <Font size="24.0" />
</font> </font>
...@@ -66,13 +58,17 @@ ...@@ -66,13 +58,17 @@
<children> <children>
<Pane layoutX="72.0" prefHeight="45.0" prefWidth="891.0"> <Pane layoutX="72.0" prefHeight="45.0" prefWidth="891.0">
<children> <children>
<Label fx:id="missingList" styleClass="information-label" stylesheets="@../style.css"> <Label fx:id="missingList" stylesheets="@../style.css">
<font> <font>
<Font name="System Bold" size="14.0" /> <Font name="System Bold" size="14.0" />
</font> </font>
<padding> <padding>
<Insets left="20.0" right="20.0" /> <Insets left="20.0" right="20.0" />
</padding></Label> </padding>
<styleClass>
<String fx:value="information-label" />
<String fx:value="font" />
</styleClass></Label>
</children> </children>
</Pane> </Pane>
</children></Pane> </children></Pane>
...@@ -91,7 +87,7 @@ ...@@ -91,7 +87,7 @@
</Pane> </Pane>
</left> </left>
<center> <center>
<Label text="Recipe Suggestions" BorderPane.alignment="CENTER"> <Label styleClass="head-line" stylesheets="@../style.css" text="Recipe Suggestions" BorderPane.alignment="CENTER">
<font> <font>
<Font size="48.0" /> <Font size="48.0" />
</font> </font>
......
src/main/resources/view/dualList.fxml
+ 15
− 31
View file @ 0b30b1a9
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.Insets?> <?import javafx.geometry.*?>
<?import javafx.scene.Cursor?> <?import javafx.scene.*?>
<?import javafx.scene.chart.PieChart?> <?import javafx.scene.chart.*?>
<?import javafx.scene.control.Button?> <?import javafx.scene.control.*?>
<?import javafx.scene.control.ContextMenu?> <?import javafx.scene.image.*?>
<?import javafx.scene.control.DatePicker?> <?import javafx.scene.layout.*?>
<?import javafx.scene.control.Label?> <?import javafx.scene.shape.*?>
<?import javafx.scene.control.MenuButton?> <?import javafx.scene.text.*?>
<?import javafx.scene.control.MenuItem?>
<?import javafx.scene.control.TableColumn?>
<?import javafx.scene.control.TableView?>
<?import javafx.scene.image.Image?>
<?import javafx.scene.image.ImageView?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.ColumnConstraints?>
<?import javafx.scene.layout.GridPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.Region?>
<?import javafx.scene.layout.RowConstraints?>
<?import javafx.scene.layout.StackPane?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.shape.Rectangle?>
<?import javafx.scene.text.Font?>
<?import javafx.scene.text.Text?>
<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="500.0" prefWidth="750.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="500.0" prefWidth="750.0" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.IncomeExpenseController">
<children> <children>
<ImageView fitHeight="500.0" fitWidth="750.0" pickOnBounds="true"> <ImageView fitHeight="500.0" fitWidth="750.0" pickOnBounds="true">
<image> <image>
...@@ -164,7 +148,7 @@ ...@@ -164,7 +148,7 @@
</HBox> </HBox>
<HBox alignment="CENTER_LEFT" prefWidth="410.0" spacing="5.0"> <HBox alignment="CENTER_LEFT" prefWidth="410.0" spacing="5.0">
<children> <children>
<MenuButton mnemonicParsing="false" prefHeight="42.0" prefWidth="105.0" text="Add"> <MenuButton mnemonicParsing="false" prefHeight="40.0" prefWidth="122.0" styleClass="button-style" stylesheets="@../style.css" text="Add">
<items> <items>
<MenuItem fx:id="addIncome" mnemonicParsing="false" onAction="#handleAddBtn" text="Income" /> <MenuItem fx:id="addIncome" mnemonicParsing="false" onAction="#handleAddBtn" text="Income" />
<MenuItem fx:id="addExpense" mnemonicParsing="false" onAction="#handleAddBtn" text="Expense" /> <MenuItem fx:id="addExpense" mnemonicParsing="false" onAction="#handleAddBtn" text="Expense" />
...@@ -186,7 +170,7 @@ ...@@ -186,7 +170,7 @@
</padding> </padding>
</HBox> </HBox>
<VBox alignment="CENTER_LEFT" prefHeight="200.0" prefWidth="100.0" spacing="5.0" GridPane.columnIndex="1" /> <VBox alignment="CENTER_LEFT" prefHeight="200.0" prefWidth="100.0" spacing="5.0" GridPane.columnIndex="1" />
<Button fx:id="continueBtn" mnemonicParsing="false" onAction="#switchScene" prefWidth="150.0" text="Continue" GridPane.columnIndex="1" GridPane.rowIndex="2"> <Button id="small-button" fx:id="continueBtn" mnemonicParsing="false" onAction="#switchScene" prefHeight="30.0" prefWidth="103.0" styleClass="button-style" stylesheets="@../style.css" text="Continue" GridPane.columnIndex="1" GridPane.rowIndex="2">
<GridPane.margin> <GridPane.margin>
<Insets bottom="5.0" /> <Insets bottom="5.0" />
</GridPane.margin> </GridPane.margin>
...@@ -218,15 +202,15 @@ ...@@ -218,15 +202,15 @@
</GridPane> </GridPane>
</children> </children>
</VBox> </VBox>
<Button fx:id="returnBtn" layoutX="14.0" layoutY="14.0" mnemonicParsing="false" onAction="#switchScene" text="Return to start"> <Button fx:id="returnBtn" layoutX="14.0" layoutY="14.0" mnemonicParsing="false" onAction="#switchScene" styleClass="button-style" stylesheets="@../style.css" text="Return to start">
<font> <font>
<Font size="14.0" /> <Font size="14.0" />
</font></Button> </font></Button>
<Text layoutX="146.0" layoutY="54.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Income and Expenses" textAlignment="CENTER"> <Label layoutX="192.0" layoutY="14.0" styleClass="head-line" stylesheets="@../style.css" text="Income and Expenses">
<font> <font>
<Font name="Lucida Console" size="40.0" /> <Font size="40.0" />
</font> </font>
</Text> </Label>
<DatePicker fx:id="date" disable="true" layoutX="340.0" layoutY="473.0" visible="false" /> <DatePicker fx:id="date" disable="true" layoutX="340.0" layoutY="473.0" visible="false" />
<Button fx:id="returnToMainMenuBtn" disable="true" layoutX="99.0" layoutY="14.0" mnemonicParsing="false" opacity="0.0" text="Button" /> <Button fx:id="returnToMainMenuBtn" disable="true" layoutX="99.0" layoutY="14.0" mnemonicParsing="false" opacity="0.0" text="Button" />
</children> </children>
......
src/main/resources/view/newBudgetBudgert.fxml
+ 21
− 35
View file @ 0b30b1a9
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.Insets?> <?import javafx.geometry.*?>
<?import javafx.scene.Cursor?> <?import javafx.scene.*?>
<?import javafx.scene.chart.PieChart?> <?import javafx.scene.chart.*?>
<?import javafx.scene.control.Button?> <?import javafx.scene.control.*?>
<?import javafx.scene.control.ComboBox?> <?import javafx.scene.image.*?>
<?import javafx.scene.control.DatePicker?> <?import javafx.scene.layout.*?>
<?import javafx.scene.control.Label?> <?import javafx.scene.shape.*?>
<?import javafx.scene.control.TableColumn?> <?import javafx.scene.text.*?>
<?import javafx.scene.control.TableView?>
<?import javafx.scene.image.Image?>
<?import javafx.scene.image.ImageView?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.ColumnConstraints?>
<?import javafx.scene.layout.GridPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.Pane?>
<?import javafx.scene.layout.RowConstraints?>
<?import javafx.scene.layout.StackPane?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.shape.Rectangle?>
<?import javafx.scene.text.Font?>
<?import javafx.scene.text.Text?>
<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="500.0" prefWidth="750.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.BudgetController"> <AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="500.0" prefWidth="750.0" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.BudgetController">
<children> <children>
<ImageView fitHeight="500.0" fitWidth="750.0" pickOnBounds="true"> <ImageView fitHeight="500.0" fitWidth="750.0" pickOnBounds="true">
<image> <image>
...@@ -84,7 +70,7 @@ ...@@ -84,7 +70,7 @@
</StackPane> </StackPane>
<HBox alignment="CENTER_RIGHT" GridPane.columnIndex="1" GridPane.rowIndex="2"> <HBox alignment="CENTER_RIGHT" GridPane.columnIndex="1" GridPane.rowIndex="2">
<children> <children>
<Button fx:id="continueBtn" mnemonicParsing="false" onAction="#switchScene" prefWidth="100.0" text="Continue"> <Button fx:id="continueBtn" mnemonicParsing="false" onAction="#switchScene" prefWidth="100.0" styleClass="button-style" stylesheets="@../style.css" text="Continue">
<font> <font>
<Font size="14.0" /> <Font size="14.0" />
</font> </font>
...@@ -102,7 +88,7 @@ ...@@ -102,7 +88,7 @@
<children> <children>
<HBox alignment="CENTER_LEFT" prefHeight="42.0" prefWidth="243.0" spacing="10.0"> <HBox alignment="CENTER_LEFT" prefHeight="42.0" prefWidth="243.0" spacing="10.0">
<children> <children>
<Button fx:id="addBtn" mnemonicParsing="false" onAction="#handleAddBtn" prefHeight="28.0" prefWidth="38.0" text="Add"> <Button id="small-button" fx:id="addBtn" mnemonicParsing="false" onAction="#handleAddBtn" prefHeight="28.0" prefWidth="86.0" styleClass="button-style" stylesheets="@../style.css" text="Add">
<font> <font>
<Font name="Lucida Console" size="12.0" /> <Font name="Lucida Console" size="12.0" />
</font> </font>
...@@ -114,7 +100,7 @@ ...@@ -114,7 +100,7 @@
</ImageView> </ImageView>
</graphic> </graphic>
</Button> </Button>
<Button fx:id="editBtn" mnemonicParsing="false" onAction="#handleEditBtn" prefHeight="28.0" prefWidth="86.0" text="Edit"> <Button id="small-button" fx:id="editBtn" mnemonicParsing="false" onAction="#handleEditBtn" prefHeight="28.0" prefWidth="92.0" styleClass="button-style" stylesheets="@../style.css" text="Edit">
<font> <font>
<Font name="Lucida Console" size="12.0" /> <Font name="Lucida Console" size="12.0" />
</font> </font>
...@@ -126,7 +112,7 @@ ...@@ -126,7 +112,7 @@
</ImageView> </ImageView>
</graphic> </graphic>
</Button> </Button>
<Button fx:id="deleteBtn" mnemonicParsing="false" onAction="#handleDeleteBtn" prefHeight="28.0" prefWidth="109.0" text="Delete"> <Button id="small-button" fx:id="deleteBtn" mnemonicParsing="false" onAction="#handleDeleteBtn" prefHeight="28.0" prefWidth="109.0" styleClass="button-style" stylesheets="@../style.css" text="Delete">
<font> <font>
<Font name="Lucida Console" size="12.0" /> <Font name="Lucida Console" size="12.0" />
</font> </font>
...@@ -153,9 +139,9 @@ ...@@ -153,9 +139,9 @@
</GridPane> </GridPane>
<HBox alignment="CENTER" GridPane.columnIndex="1"> <HBox alignment="CENTER" GridPane.columnIndex="1">
<children> <children>
<Label alignment="CENTER" prefHeight="20.0" prefWidth="533.0" text="Amount at disposal: 1000"> <Label alignment="CENTER" prefHeight="20.0" prefWidth="533.0" styleClass="font" stylesheets="@../style.css" text="Amount at disposal: 1000">
<font> <font>
<Font size="24.0" /> <Font size="18.0" />
</font> </font>
</Label> </Label>
</children> </children>
...@@ -179,15 +165,15 @@ ...@@ -179,15 +165,15 @@
</VBox> </VBox>
<GridPane> <GridPane>
<columnConstraints> <columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" /> <ColumnConstraints hgrow="SOMETIMES" maxWidth="223.0" minWidth="10.0" prefWidth="167.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" /> <ColumnConstraints hgrow="SOMETIMES" maxWidth="368.0" minWidth="10.0" prefWidth="334.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" /> <ColumnConstraints hgrow="SOMETIMES" maxWidth="221.0" minWidth="10.0" prefWidth="158.0" />
</columnConstraints> </columnConstraints>
<rowConstraints> <rowConstraints>
<RowConstraints minHeight="10.0" vgrow="SOMETIMES" /> <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
</rowConstraints> </rowConstraints>
<children> <children>
<Label fx:id="title" text="Budget Setup" textAlignment="CENTER" GridPane.columnIndex="1"> <Label fx:id="title" styleClass="head-line" stylesheets="@../style.css" text="Budget Setup" textAlignment="CENTER" GridPane.columnIndex="1">
<font> <font>
<Font size="36.0" /> <Font size="36.0" />
</font> </font>
...@@ -195,7 +181,7 @@ ...@@ -195,7 +181,7 @@
<Pane GridPane.columnIndex="2"> <Pane GridPane.columnIndex="2">
<children> <children>
<StackPane /> <StackPane />
<Label fx:id="daysLeftLbl" layoutX="33.0" layoutY="62.0" text="Days left: 31"> <Label fx:id="daysLeftLbl" layoutX="33.0" layoutY="62.0" styleClass="font" stylesheets="@../style.css" text="Days left: 31">
<font> <font>
<Font name="Lucida Console" size="14.0" /> <Font name="Lucida Console" size="14.0" />
</font> </font>
...@@ -204,7 +190,7 @@ ...@@ -204,7 +190,7 @@
</children> </children>
</Pane> </Pane>
<Button fx:id="returnToMainMenuBtn" disable="true" mnemonicParsing="false" onAction="#switchScene" opacity="0.0" text="Button" /> <Button fx:id="returnToMainMenuBtn" disable="true" mnemonicParsing="false" onAction="#switchScene" opacity="0.0" text="Button" />
<Button fx:id="backBtn" mnemonicParsing="false" onAction="#switchScene" prefWidth="100.0" text="Go back"> <Button fx:id="backBtn" mnemonicParsing="false" onAction="#switchScene" prefWidth="100.0" styleClass="button-style" stylesheets="@../style.css" text="Go back">
<font> <font>
<Font size="14.0" /> <Font size="14.0" />
</font> </font>
......
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