diff --git a/src/de/deadlocker8/budgetmaster/logic/chartGenerators/CategoriesChartGenerator.java b/src/de/deadlocker8/budgetmaster/logic/chartGenerators/CategoriesChartGenerator.java index 77efcd715afaed985db53c936ea3e37041b3d6fc..aee3f4950023c9190f84cb3d3f2b0f7913023e18 100644 --- a/src/de/deadlocker8/budgetmaster/logic/chartGenerators/CategoriesChartGenerator.java +++ b/src/de/deadlocker8/budgetmaster/logic/chartGenerators/CategoriesChartGenerator.java @@ -42,7 +42,7 @@ public class CategoriesChartGenerator { VBox generatedChart = new VBox(); HBox chart = new HBox(); - chart.setMinHeight(30); + chart.setMinHeight(50); Label labelTitle = new Label(title); labelTitle.setStyle("-fx-font-size: 16; -fx-font-weight: bold;"); diff --git a/src/de/deadlocker8/budgetmaster/ui/GUI.fxml b/src/de/deadlocker8/budgetmaster/ui/GUI.fxml index f03bed8b617016d960640f19face3c7be5f76669..6d80efc5c0a459f0410712714afe31b33955b23e 100644 --- a/src/de/deadlocker8/budgetmaster/ui/GUI.fxml +++ b/src/de/deadlocker8/budgetmaster/ui/GUI.fxml @@ -11,7 +11,7 @@ <?import javafx.scene.layout.VBox?> <?import javafx.scene.text.Font?> -<AnchorPane fx:id="anchorPaneMain" prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.deadlocker8.budgetmaster.ui.Controller"> +<AnchorPane fx:id="anchorPaneMain" prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.deadlocker8.budgetmaster.ui.Controller"> <children> <VBox alignment="TOP_CENTER" layoutY="24.0" prefHeight="562.0" prefWidth="772.0" spacing="15.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="14.0"> <children> @@ -39,7 +39,7 @@ <Tab fx:id="tabPayments" closable="false" text="Buchungen" /> <Tab fx:id="tabCategories" closable="false" text="Kategorien" /> <Tab fx:id="tabCharts" closable="false" text="Diagramme" /> - <Tab fx:id="tabReports" closable="false" text="Berichte" /> + <Tab fx:id="tabReports" closable="false" text="Monatsbericht" /> <Tab fx:id="tabSettings" closable="false" text="Einstellungen" /> </tabs> </TabPane> diff --git a/src/de/deadlocker8/budgetmaster/ui/ReportController.java b/src/de/deadlocker8/budgetmaster/ui/ReportController.java index 9685ed3975fdb23991c4142eaaa753884621e093..02cb431106464e42ec648ede1edb2ec0bd543ccd 100644 --- a/src/de/deadlocker8/budgetmaster/ui/ReportController.java +++ b/src/de/deadlocker8/budgetmaster/ui/ReportController.java @@ -64,6 +64,10 @@ public class ReportController implements Refreshable iconPayment.setSize(18); iconPayment.setStyle("-fx-text-fill: white"); buttonGenerate.setGraphic(iconPayment); + FontIcon iconWarning = new FontIcon(FontIconType.WARNING); + iconWarning.setSize(13); + iconWarning.setStyle("-fx-text-fill: " + controller.getBundle().getString("color.text")); + labelFilterActive.setGraphic(iconWarning); checkBoxDescending.setSelected(true); @@ -358,7 +362,7 @@ public class ReportController implements Refreshable public void generate() { - + } public Controller getController()