diff --git a/src/main/resources/view/IncomeAndExpenses.fxml b/src/main/resources/view/IncomeAndExpenses.fxml index e061b02f2a6b9cdbf4c1b9379895e1212be01902..c69b39775cb263add4bf62c2571d77f016ddbae1 100644 --- a/src/main/resources/view/IncomeAndExpenses.fxml +++ b/src/main/resources/view/IncomeAndExpenses.fxml @@ -53,11 +53,12 @@ <left> <Pane prefWidth="175.0" BorderPane.alignment="CENTER"> <children> - <Button fx:id="returnBtn" 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" text="Return to Main Menu"> <font> <Font name="Lucida Console" size="14.0" /> </font> </Button> + <Button fx:id="returnBtn" disable="true" layoutX="136.0" layoutY="117.0" mnemonicParsing="false" opacity="0.0" text="Button" /> </children> </Pane> </left> diff --git a/src/main/resources/view/dualList.fxml b/src/main/resources/view/dualList.fxml index 0b1597699908eeba5ccf0a1fe017c5aaeefcece7..eaf8cb97527a5984b41dc64cac4f4c082227d544 100644 --- a/src/main/resources/view/dualList.fxml +++ b/src/main/resources/view/dualList.fxml @@ -4,7 +4,6 @@ <?import javafx.scene.Cursor?> <?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?> @@ -56,7 +55,10 @@ <StackPane> <children> <Rectangle arcHeight="5.0" arcWidth="5.0" fill="#f8f8f8" height="18.0" stroke="#d9cccc" strokeType="INSIDE" width="300.0" /> - <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Income" /> + <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Fixed income"> + <font> + <Font size="14.0" /> + </font></Text> </children> </StackPane> <StackPane> @@ -108,7 +110,10 @@ <StackPane> <children> <Rectangle arcHeight="5.0" arcWidth="5.0" fill="#f8f8f8" height="18.0" stroke="#d9cccc" strokeType="INSIDE" width="300.0" /> - <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Expenses" /> + <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Fixed expense"> + <font> + <Font size="14.0" /> + </font></Text> </children> </StackPane> <StackPane> @@ -180,18 +185,7 @@ <Insets bottom="5.0" /> </padding> </HBox> - <VBox alignment="CENTER_LEFT" prefHeight="200.0" prefWidth="100.0" spacing="5.0" GridPane.columnIndex="1"> - <children> - <ComboBox fx:id="filter" prefHeight="39.0" prefWidth="119.0" promptText="Show"> - <opaqueInsets> - <Insets /> - </opaqueInsets> - <VBox.margin> - <Insets bottom="5.0" /> - </VBox.margin> - </ComboBox> - </children> - </VBox> + <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"> <GridPane.margin> <Insets bottom="5.0" /> @@ -224,12 +218,16 @@ </GridPane> </children> </VBox> - <Button fx:id="returnBtn" layoutX="14.0" layoutY="14.0" mnemonicParsing="false" onAction="#switchScene" text="Return" /> - <Text layoutX="197.0" layoutY="60.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Income/Expenses" textAlignment="CENTER"> + <Button fx:id="returnBtn" layoutX="14.0" layoutY="14.0" mnemonicParsing="false" onAction="#switchScene" text="Return to start"> + <font> + <Font size="14.0" /> + </font></Button> + <Text layoutX="146.0" layoutY="54.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Income and Expenses" textAlignment="CENTER"> <font> - <Font size="48.0" /> + <Font name="Lucida Console" size="40.0" /> </font> </Text> <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" /> </children> </AnchorPane>