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

Continued working on implementing several budgets

parent 28f63fa0
No related branches found
No related tags found
1 merge request!43Merging frontend-testing into master
......@@ -142,15 +142,15 @@
</HBox>
<HBox alignment="CENTER_LEFT" prefWidth="410.0" spacing="5.0">
<children>
<MenuButton mnemonicParsing="false" text="MenuButton">
<MenuButton mnemonicParsing="false" prefHeight="42.0" prefWidth="105.0" text="Add">
<items>
<MenuItem fx:id="addIncome" mnemonicParsing="false" onAction="#handleAddBtn" text="Income" />
<MenuItem fx:id="addExpense" mnemonicParsing="false" onAction="#handleAddBtn" text="Expense" />
</items>
<graphic>
<ImageView fitHeight="19.0" fitWidth="16.0" pickOnBounds="true" preserveRatio="true">
<ImageView fitHeight="30.0" fitWidth="50.0" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../Images/add_image.png" />
<Image url="@../Images/add.png" />
</image>
</ImageView>
</graphic>
......@@ -165,7 +165,7 @@
</HBox>
<VBox alignment="CENTER_LEFT" prefHeight="200.0" prefWidth="100.0" spacing="5.0" GridPane.columnIndex="1">
<children>
<ComboBox fx:id="filter" prefWidth="150.0" promptText="Show">
<ComboBox fx:id="filter" prefHeight="39.0" prefWidth="119.0" promptText="Show">
<opaqueInsets>
<Insets />
</opaqueInsets>
......
......@@ -17,6 +17,7 @@
<?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?>
......@@ -106,9 +107,9 @@
<RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<HBox alignment="CENTER_LEFT" prefHeight="100.0" prefWidth="200.0" spacing="10.0">
<HBox alignment="CENTER_LEFT" prefHeight="42.0" prefWidth="243.0" spacing="10.0">
<children>
<Button fx:id="addBtn" mnemonicParsing="false" onAction="#handleAddBtn" prefHeight="25.0" prefWidth="60.0">
<Button fx:id="addBtn" mnemonicParsing="false" onAction="#handleAddBtn" prefHeight="28.0" prefWidth="38.0" text="Add">
<font>
<Font name="Lucida Console" size="12.0" />
</font>
......@@ -120,7 +121,7 @@
</ImageView>
</graphic>
</Button>
<Button fx:id="editBtn" mnemonicParsing="false" onAction="#handleEditBtn" prefHeight="25.0" prefWidth="60.0">
<Button fx:id="editBtn" mnemonicParsing="false" onAction="#handleEditBtn" prefHeight="28.0" prefWidth="86.0" text="Edit">
<font>
<Font name="Lucida Console" size="12.0" />
</font>
......@@ -132,7 +133,7 @@
</ImageView>
</graphic>
</Button>
<Button fx:id="deleteBtn" mnemonicParsing="false" onAction="#handleDeleteBtn" prefHeight="25.0" prefWidth="60.0">
<Button fx:id="deleteBtn" mnemonicParsing="false" onAction="#handleDeleteBtn" prefHeight="28.0" prefWidth="109.0" text="Delete">
<font>
<Font name="Lucida Console" size="12.0" />
</font>
......@@ -146,9 +147,9 @@
</Button>
</children>
</HBox>
<HBox alignment="CENTER_LEFT" GridPane.columnIndex="1">
<HBox alignment="CENTER_RIGHT" prefHeight="42.0" prefWidth="106.0" GridPane.columnIndex="1">
<children>
<ComboBox fx:id="filter" prefHeight="20.0" prefWidth="180.0" promptText="Show">
<ComboBox fx:id="filter" prefHeight="25.0" prefWidth="80.0" promptText="Show">
<opaqueInsets>
<Insets />
</opaqueInsets>
......@@ -210,16 +211,17 @@
<Font size="36.0" />
</font>
</Label>
<StackPane GridPane.columnIndex="2">
<Pane GridPane.columnIndex="2">
<children>
<DatePicker fx:id="date" prefWidth="175.0" />
<Label fx:id="daysLeftLbl" text="Days left: 31">
<StackPane />
<Label fx:id="daysLeftLbl" layoutX="33.0" layoutY="62.0" text="Days left: 31">
<font>
<Font name="Lucida Console" size="14.0" />
</font>
</Label>
<DatePicker fx:id="date" layoutX="3.0" layoutY="32.0" prefWidth="175.0" />
</children>
</StackPane>
</Pane>
</children>
</GridPane>
</children>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment