Skip to content
Snippets Groups Projects
Commit fa290674 authored by Robert Goldmann's avatar Robert Goldmann
Browse files

increade height of categories chart bars, renamed tab reports to month report,...

increade height of categories chart bars, renamed tab reports to month report, added missing icon for label filter active
parent 0af48126
Branches
Tags
2 merge requests!142merge v1_3_0 into master,!121Merge Reports into v1_3_0
......@@ -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;");
......
......@@ -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>
......
......@@ -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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment