From 5f80f45dd72ca08dd43fa394f9a8d77d64799685 Mon Sep 17 00:00:00 2001 From: Robert Goldmann <deadlocker@gmx.de> Date: Thu, 16 Nov 2017 11:09:53 +0100 Subject: [PATCH] adapted to updated FontIcon class in Tools repo --- .../budgetmasterclient/ui/cells/CategoryCell.java | 6 +++--- .../budgetmasterclient/ui/cells/PaymentCell.java | 11 ++++++----- .../budgetmasterclient/ui/cells/SearchCell.java | 7 ++++--- .../cells/report/table/ReportTableRatingCell.java | 6 +++--- .../report/table/ReportTableRepeatingCell.java | 6 +++--- .../ui/controller/CategoryController.java | 4 ++-- .../ui/controller/ChartController.java | 9 +++++---- .../ui/controller/Controller.java | 10 +++++----- .../ui/controller/DatePickerController.java | 5 +++-- .../ui/controller/ExportChartController.java | 8 ++++---- .../ui/controller/FilterController.java | 8 ++++---- .../ui/controller/NewCategoryController.java | 5 +++-- .../ui/controller/NewPaymentController.java | 7 ++++--- .../ui/controller/PaymentController.java | 11 ++++++----- .../ui/controller/ReportController.java | 7 ++++--- .../ui/controller/SearchController.java | 6 +++--- .../ui/controller/SettingsController.java | 1 - .../ui/controller/SplashScreenController.java | 3 ++- .../budgetmasterclient/ui/tagField/TagField.java | 4 ++-- .../budgetmaster/logic/utils/Helpers.java | 13 +------------ .../deadlocker8/budgetmasterserver/_en.properties | 2 +- 21 files changed, 68 insertions(+), 71 deletions(-) diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/cells/CategoryCell.java b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/cells/CategoryCell.java index 908c651eb..71d184205 100644 --- a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/cells/CategoryCell.java +++ b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/cells/CategoryCell.java @@ -3,9 +3,9 @@ package de.deadlocker8.budgetmasterclient.ui.cells; import java.util.Optional; import de.deadlocker8.budgetmaster.logic.category.Category; -import de.deadlocker8.budgetmaster.logic.utils.Helpers; import de.deadlocker8.budgetmaster.logic.utils.Strings; import de.deadlocker8.budgetmasterclient.ui.controller.CategoryController; +import fontAwesome.FontIcon; import fontAwesome.FontIconType; import javafx.geometry.Insets; import javafx.geometry.Pos; @@ -64,7 +64,7 @@ public class CategoryCell extends ListCell<Category> HBox.setHgrow(r, Priority.ALWAYS); Button buttonEdit = new Button(); - buttonEdit.setGraphic(Helpers.getFontIcon(FontIconType.PENCIL, 16, Color.web("#212121"))); + buttonEdit.setGraphic(new FontIcon(FontIconType.PENCIL, 16, Color.web("#212121"))); buttonEdit.setPrefHeight(HEIGHT); buttonEdit.getStyleClass().add("greylabel"); buttonEdit.setStyle("-fx-background-color: transparent"); @@ -75,7 +75,7 @@ public class CategoryCell extends ListCell<Category> HBox.setMargin(buttonEdit, new Insets(0, 0, 0, 25)); Button buttonDelete = new Button(); - buttonDelete.setGraphic(Helpers.getFontIcon(FontIconType.TRASH, 16, Color.web("#212121"))); + buttonDelete.setGraphic(new FontIcon(FontIconType.TRASH, 16, Color.web("#212121"))); buttonDelete.setPrefHeight(HEIGHT); buttonDelete.getStyleClass().add("greylabel"); buttonDelete.setStyle("-fx-background-color: transparent"); diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/cells/PaymentCell.java b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/cells/PaymentCell.java index 6219baf6b..cb20223ae 100644 --- a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/cells/PaymentCell.java +++ b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/cells/PaymentCell.java @@ -15,6 +15,7 @@ import de.deadlocker8.budgetmaster.logic.utils.Colors; import de.deadlocker8.budgetmaster.logic.utils.Helpers; import de.deadlocker8.budgetmaster.logic.utils.Strings; import de.deadlocker8.budgetmasterclient.ui.controller.PaymentController; +import fontAwesome.FontIcon; import fontAwesome.FontIconType; import javafx.animation.FadeTransition; import javafx.geometry.Insets; @@ -23,13 +24,13 @@ import javafx.scene.Node; import javafx.scene.control.Alert; import javafx.scene.control.Button; import javafx.scene.control.ButtonBar.ButtonData; -import javafx.scene.input.KeyCode; -import javafx.scene.input.KeyEvent; import javafx.scene.control.ButtonType; import javafx.scene.control.DialogPane; import javafx.scene.control.Label; import javafx.scene.control.ListCell; import javafx.scene.control.Tooltip; +import javafx.scene.input.KeyCode; +import javafx.scene.input.KeyEvent; import javafx.scene.layout.HBox; import javafx.scene.layout.Priority; import javafx.scene.layout.Region; @@ -86,11 +87,11 @@ public class PaymentCell extends ListCell<Payment> Label labelRepeating = new Label(); if(item instanceof RepeatingPaymentEntry) { - labelRepeating.setGraphic(Helpers.getFontIcon(FontIconType.CALENDAR, 18, Color.web("#212121"))); + labelRepeating.setGraphic(new FontIcon(FontIconType.CALENDAR, 18, Color.web("#212121"))); } else { - labelRepeating.setGraphic(Helpers.getFontIcon(FontIconType.CALENDAR, 18, Color.TRANSPARENT)); + labelRepeating.setGraphic(new FontIcon(FontIconType.CALENDAR, 18, Color.TRANSPARENT)); } labelRepeating.setPrefHeight(HEIGHT); labelRepeating.setStyle("-fx-font-size: 15; -fx-text-fill: #212121"); @@ -158,7 +159,7 @@ public class PaymentCell extends ListCell<Payment> } Button buttonDelete = new Button(); - buttonDelete.setGraphic(Helpers.getFontIcon(FontIconType.TRASH, 16, Color.web("#212121"))); + buttonDelete.setGraphic(new FontIcon(FontIconType.TRASH, 16, Color.web("#212121"))); buttonDelete.setPrefHeight(HEIGHT); buttonDelete.getStyleClass().add("greylabel"); buttonDelete.setStyle("-fx-background-color: transparent"); diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/cells/SearchCell.java b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/cells/SearchCell.java index a639e3f8c..9500ffcc0 100644 --- a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/cells/SearchCell.java +++ b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/cells/SearchCell.java @@ -14,6 +14,7 @@ import de.deadlocker8.budgetmaster.logic.payment.RepeatingPayment; import de.deadlocker8.budgetmaster.logic.utils.Colors; import de.deadlocker8.budgetmaster.logic.utils.Helpers; import de.deadlocker8.budgetmasterclient.ui.controller.SearchController; +import fontAwesome.FontIcon; import fontAwesome.FontIconType; import javafx.geometry.Insets; import javafx.geometry.Pos; @@ -74,11 +75,11 @@ public class SearchCell extends ListCell<Payment> Label labelRepeating = new Label(); if(item instanceof RepeatingPayment) { - labelRepeating.setGraphic(Helpers.getFontIcon(FontIconType.CALENDAR, 18, Color.web("#212121"))); + labelRepeating.setGraphic(new FontIcon(FontIconType.CALENDAR, 18, Color.web("#212121"))); } else { - labelRepeating.setGraphic(Helpers.getFontIcon(FontIconType.CALENDAR, 18, Color.TRANSPARENT)); + labelRepeating.setGraphic(new FontIcon(FontIconType.CALENDAR, 18, Color.TRANSPARENT)); } labelRepeating.setPrefHeight(HEIGHT); labelRepeating.setStyle("-fx-font-size: 15; -fx-text-fill: #212121"); @@ -146,7 +147,7 @@ public class SearchCell extends ListCell<Payment> } Button buttonGoto = new Button(); - buttonGoto.setGraphic(Helpers.getFontIcon(FontIconType.EXTERNAL_LINK_SQUARE, 16, Color.web("#212121"))); + buttonGoto.setGraphic(new FontIcon(FontIconType.EXTERNAL_LINK_SQUARE, 16, Color.web("#212121"))); buttonGoto.setPrefHeight(HEIGHT); buttonGoto.getStyleClass().add("greylabel"); buttonGoto.setStyle("-fx-background-color: transparent"); diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/cells/report/table/ReportTableRatingCell.java b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/cells/report/table/ReportTableRatingCell.java index 3131ef8d8..e8bda03af 100644 --- a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/cells/report/table/ReportTableRatingCell.java +++ b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/cells/report/table/ReportTableRatingCell.java @@ -2,7 +2,7 @@ package de.deadlocker8.budgetmasterclient.ui.cells.report.table; import de.deadlocker8.budgetmaster.logic.report.ReportItem; import de.deadlocker8.budgetmaster.logic.utils.Colors; -import de.deadlocker8.budgetmaster.logic.utils.Helpers; +import fontAwesome.FontIcon; import fontAwesome.FontIconType; import javafx.geometry.Pos; import javafx.scene.control.Label; @@ -18,11 +18,11 @@ public class ReportTableRatingCell extends TableCell<ReportItem, Integer> Label labelRepeating = new Label(); if(item > 0) { - labelRepeating.setGraphic(Helpers.getFontIcon(FontIconType.PLUS, 14, Colors.TEXT)); + labelRepeating.setGraphic(new FontIcon(FontIconType.PLUS, 14, Colors.TEXT)); } else { - labelRepeating.setGraphic(Helpers.getFontIcon(FontIconType.MINUS, 14, Colors.TEXT)); + labelRepeating.setGraphic(new FontIcon(FontIconType.MINUS, 14, Colors.TEXT)); } labelRepeating.setStyle("-fx-font-weight: bold; -fx-font-size: 14; -fx-text-fill: #212121"); labelRepeating.setAlignment(Pos.CENTER); diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/cells/report/table/ReportTableRepeatingCell.java b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/cells/report/table/ReportTableRepeatingCell.java index c608583ec..a9841bc98 100644 --- a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/cells/report/table/ReportTableRepeatingCell.java +++ b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/cells/report/table/ReportTableRepeatingCell.java @@ -2,7 +2,7 @@ package de.deadlocker8.budgetmasterclient.ui.cells.report.table; import de.deadlocker8.budgetmaster.logic.report.ReportItem; import de.deadlocker8.budgetmaster.logic.utils.Colors; -import de.deadlocker8.budgetmaster.logic.utils.Helpers; +import fontAwesome.FontIcon; import fontAwesome.FontIconType; import javafx.geometry.Pos; import javafx.scene.control.Label; @@ -19,11 +19,11 @@ public class ReportTableRepeatingCell extends TableCell<ReportItem, Boolean> Label labelRepeating = new Label(); if(item) { - labelRepeating.setGraphic(Helpers.getFontIcon(FontIconType.CALENDAR, 16, Colors.TEXT)); + labelRepeating.setGraphic(new FontIcon(FontIconType.CALENDAR, 16, Colors.TEXT)); } else { - labelRepeating.setGraphic(Helpers.getFontIcon(FontIconType.CALENDAR, 16, Color.TRANSPARENT)); + labelRepeating.setGraphic(new FontIcon(FontIconType.CALENDAR, 16, Color.TRANSPARENT)); } labelRepeating.setStyle("-fx-font-weight: bold; -fx-font-size: 14; -fx-text-fill: #212121"); labelRepeating.setAlignment(Pos.CENTER); diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/CategoryController.java b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/CategoryController.java index a4c587b2f..7c58c7dd2 100644 --- a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/CategoryController.java +++ b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/CategoryController.java @@ -7,11 +7,11 @@ import de.deadlocker8.budgetmaster.logic.category.Category; import de.deadlocker8.budgetmaster.logic.serverconnection.ExceptionHandler; import de.deadlocker8.budgetmaster.logic.serverconnection.ServerConnection; import de.deadlocker8.budgetmaster.logic.utils.Colors; -import de.deadlocker8.budgetmaster.logic.utils.Helpers; import de.deadlocker8.budgetmaster.logic.utils.Strings; import de.deadlocker8.budgetmasterclient.ui.Refreshable; import de.deadlocker8.budgetmasterclient.ui.Styleable; import de.deadlocker8.budgetmasterclient.ui.cells.CategoryCell; +import fontAwesome.FontIcon; import fontAwesome.FontIconType; import javafx.application.Platform; import javafx.beans.value.ChangeListener; @@ -118,7 +118,7 @@ public class CategoryController extends BaseController implements Refreshable, S @Override public void applyStyle() { - buttonCategory.setGraphic(Helpers.getFontIcon(FontIconType.PLUS, 18, Color.WHITE)); + buttonCategory.setGraphic(new FontIcon(FontIconType.PLUS, 18, Color.WHITE)); anchorPaneMain.setStyle("-fx-background-color: " + ConvertTo.toRGBHexWithoutOpacity(Colors.BACKGROUND)); buttonCategory.setStyle("-fx-background-color: " + ConvertTo.toRGBHexWithoutOpacity(Colors.BACKGROUND_BUTTON_BLUE) + "; -fx-text-fill: white; -fx-font-weight: bold; -fx-font-size: 16;"); diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/ChartController.java b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/ChartController.java index 8ddc95345..f6149de7c 100644 --- a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/ChartController.java +++ b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/ChartController.java @@ -22,6 +22,7 @@ import de.deadlocker8.budgetmaster.logic.utils.Strings; import de.deadlocker8.budgetmasterclient.ui.Refreshable; import de.deadlocker8.budgetmasterclient.ui.Styleable; import de.deadlocker8.budgetmasterclient.utils.UIHelpers; +import fontAwesome.FontIcon; import fontAwesome.FontIconType; import javafx.application.Platform; import javafx.collections.FXCollections; @@ -286,15 +287,15 @@ public class ChartController implements Refreshable, Styleable vboxChartMonth.setStyle("-fx-background-color: " + ConvertTo.toRGBHexWithoutOpacity(Colors.BACKGROUND)); buttonChartCategoriesShow.setStyle("-fx-background-color: " + ConvertTo.toRGBHexWithoutOpacity(Colors.BACKGROUND_BUTTON_BLUE)); - buttonChartCategoriesShow.setGraphic(Helpers.getFontIcon(FontIconType.CHECK, 16, Color.WHITE)); + buttonChartCategoriesShow.setGraphic(new FontIcon(FontIconType.CHECK, 16, Color.WHITE)); buttonChartCategoriesExport.setStyle("-fx-background-color: " + ConvertTo.toRGBHexWithoutOpacity(Colors.BACKGROUND_BUTTON_BLUE)); - buttonChartCategoriesExport.setGraphic(Helpers.getFontIcon(FontIconType.SAVE, 16, Color.WHITE)); + buttonChartCategoriesExport.setGraphic(new FontIcon(FontIconType.SAVE, 16, Color.WHITE)); buttonChartMonthShow.setStyle("-fx-background-color: " + ConvertTo.toRGBHexWithoutOpacity(Colors.BACKGROUND_BUTTON_BLUE)); - buttonChartMonthShow.setGraphic(Helpers.getFontIcon(FontIconType.CHECK, 16, Color.WHITE)); + buttonChartMonthShow.setGraphic(new FontIcon(FontIconType.CHECK, 16, Color.WHITE)); buttonChartMonthExport.setStyle("-fx-background-color: " + ConvertTo.toRGBHexWithoutOpacity(Colors.BACKGROUND_BUTTON_BLUE)); - buttonChartMonthExport.setGraphic(Helpers.getFontIcon(FontIconType.SAVE, 16, Color.WHITE)); + buttonChartMonthExport.setGraphic(new FontIcon(FontIconType.SAVE, 16, Color.WHITE)); } } \ No newline at end of file diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/Controller.java b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/Controller.java index 25da0855b..f349f5f2e 100644 --- a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/Controller.java +++ b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/Controller.java @@ -27,11 +27,11 @@ import de.deadlocker8.budgetmaster.logic.tag.TagHandler; import de.deadlocker8.budgetmaster.logic.updater.Updater; import de.deadlocker8.budgetmaster.logic.updater.VersionInformation; import de.deadlocker8.budgetmaster.logic.utils.Colors; -import de.deadlocker8.budgetmaster.logic.utils.Helpers; import de.deadlocker8.budgetmaster.logic.utils.Strings; import de.deadlocker8.budgetmasterclient.ui.commandLine.CommandBundle; import de.deadlocker8.budgetmasterclient.ui.commandLine.CommandLine; import de.deadlocker8.budgetmasterclient.utils.UIHelpers; +import fontAwesome.FontIcon; import fontAwesome.FontIconType; import javafx.animation.FadeTransition; import javafx.animation.SequentialTransition; @@ -233,10 +233,10 @@ public class Controller extends BaseController }); } - buttonLeft.setGraphic(Helpers.getFontIcon(FontIconType.CHEVRON_LEFT, 20, Colors.TEXT)); - buttonRight.setGraphic(Helpers.getFontIcon(FontIconType.CHEVRON_RIGHT, 20, Colors.TEXT)); - buttonToday.setGraphic(Helpers.getFontIcon(FontIconType.CALENDAR_ALT, 20, Colors.TEXT)); - buttonAbout.setGraphic(Helpers.getFontIcon(FontIconType.INFO, 20, Colors.TEXT)); + buttonLeft.setGraphic(new FontIcon(FontIconType.CHEVRON_LEFT, 20, Colors.TEXT)); + buttonRight.setGraphic(new FontIcon(FontIconType.CHEVRON_RIGHT, 20, Colors.TEXT)); + buttonToday.setGraphic(new FontIcon(FontIconType.CALENDAR_ALT, 20, Colors.TEXT)); + buttonAbout.setGraphic(new FontIcon(FontIconType.INFO, 20, Colors.TEXT)); // apply theme anchorPaneMain.setStyle("-fx-background-color: " + ConvertTo.toRGBHexWithoutOpacity(Colors.BACKGROUND_MAIN)); diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/DatePickerController.java b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/DatePickerController.java index 7de27b30b..8420aba70 100644 --- a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/DatePickerController.java +++ b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/DatePickerController.java @@ -7,6 +7,7 @@ import de.deadlocker8.budgetmaster.logic.utils.Colors; import de.deadlocker8.budgetmaster.logic.utils.Helpers; import de.deadlocker8.budgetmaster.logic.utils.Strings; import de.deadlocker8.budgetmasterclient.ui.Styleable; +import fontAwesome.FontIcon; import fontAwesome.FontIconType; import javafx.fxml.FXML; import javafx.scene.control.Alert.AlertType; @@ -114,8 +115,8 @@ public class DatePickerController extends BaseController implements Styleable @Override public void applyStyle() { - buttonCancel.setGraphic(Helpers.getFontIcon(FontIconType.TIMES, 17, Color.WHITE)); - buttonConfirm.setGraphic(Helpers.getFontIcon(FontIconType.SAVE, 17, Color.WHITE)); + buttonCancel.setGraphic(new FontIcon(FontIconType.TIMES, 17, Color.WHITE)); + buttonConfirm.setGraphic(new FontIcon(FontIconType.SAVE, 17, Color.WHITE)); buttonCancel.setStyle("-fx-background-color: " + ConvertTo.toRGBHexWithoutOpacity(Colors.BACKGROUND_BUTTON_BLUE) + "; -fx-text-fill: white; -fx-font-weight: bold; -fx-font-size: 15;"); buttonConfirm.setStyle("-fx-background-color: " + ConvertTo.toRGBHexWithoutOpacity(Colors.BACKGROUND_BUTTON_BLUE) + "; -fx-text-fill: white; -fx-font-weight: bold; -fx-font-size: 15;"); diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/ExportChartController.java b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/ExportChartController.java index 43ebe49ac..3d511ac6f 100644 --- a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/ExportChartController.java +++ b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/ExportChartController.java @@ -9,9 +9,9 @@ import javax.imageio.ImageIO; import de.deadlocker8.budgetmaster.logic.charts.ChartExportable; import de.deadlocker8.budgetmaster.logic.utils.Colors; -import de.deadlocker8.budgetmaster.logic.utils.Helpers; import de.deadlocker8.budgetmaster.logic.utils.Strings; import de.deadlocker8.budgetmasterclient.ui.Styleable; +import fontAwesome.FontIcon; import fontAwesome.FontIconType; import javafx.embed.swing.SwingFXUtils; import javafx.fxml.FXML; @@ -315,12 +315,12 @@ public class ExportChartController extends BaseController implements Styleable anchorPaneMain.setStyle("-fx-background-color: " + ConvertTo.toRGBHexWithoutOpacity(Colors.BACKGROUND)); buttonChooseFile.setStyle("-fx-background-color: " + ConvertTo.toRGBHexWithoutOpacity(Colors.BACKGROUND_BUTTON_BLUE) + "; -fx-text-fill: white; -fx-font-weight: bold; -fx-font-size: 14;"); - buttonChooseFile.setGraphic(Helpers.getFontIcon(FontIconType.FOLDER_OPEN, 14, Color.WHITE)); + buttonChooseFile.setGraphic(new FontIcon(FontIconType.FOLDER_OPEN, 14, Color.WHITE)); buttonExport.setStyle("-fx-background-color: " + ConvertTo.toRGBHexWithoutOpacity(Colors.BACKGROUND_BUTTON_BLUE) + "; -fx-text-fill: white; -fx-font-weight: bold; -fx-font-size: 14;"); - buttonExport.setGraphic(Helpers.getFontIcon(FontIconType.SAVE, 14, Color.WHITE)); + buttonExport.setGraphic(new FontIcon(FontIconType.SAVE, 14, Color.WHITE)); buttonCancel.setStyle("-fx-background-color: " + ConvertTo.toRGBHexWithoutOpacity(Colors.BACKGROUND_BUTTON_BLUE) + "; -fx-text-fill: white; -fx-font-weight: bold; -fx-font-size: 14;"); - buttonCancel.setGraphic(Helpers.getFontIcon(FontIconType.TIMES, 14, Color.WHITE)); + buttonCancel.setGraphic(new FontIcon(FontIconType.TIMES, 14, Color.WHITE)); } } \ No newline at end of file diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/FilterController.java b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/FilterController.java index 870246f41..c092a851c 100644 --- a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/FilterController.java +++ b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/FilterController.java @@ -8,9 +8,9 @@ import de.deadlocker8.budgetmaster.logic.serverconnection.ExceptionHandler; import de.deadlocker8.budgetmaster.logic.serverconnection.ServerTagConnection; import de.deadlocker8.budgetmaster.logic.tag.Tag; import de.deadlocker8.budgetmaster.logic.utils.Colors; -import de.deadlocker8.budgetmaster.logic.utils.Helpers; import de.deadlocker8.budgetmaster.logic.utils.Strings; import de.deadlocker8.budgetmasterclient.ui.Styleable; +import fontAwesome.FontIcon; import fontAwesome.FontIconType; import javafx.fxml.FXML; import javafx.scene.Node; @@ -253,9 +253,9 @@ public class FilterController extends BaseController implements Styleable @Override public void applyStyle() { - buttonCancel.setGraphic(Helpers.getFontIcon(FontIconType.TIMES, 17, Color.WHITE)); - buttonReset.setGraphic(Helpers.getFontIcon(FontIconType.UNDO, 17, Color.WHITE)); - buttonFilter.setGraphic(Helpers.getFontIcon(FontIconType.FILTER, 17, Color.WHITE)); + buttonCancel.setGraphic(new FontIcon(FontIconType.TIMES, 17, Color.WHITE)); + buttonReset.setGraphic(new FontIcon(FontIconType.UNDO, 17, Color.WHITE)); + buttonFilter.setGraphic(new FontIcon(FontIconType.FILTER, 17, Color.WHITE)); scrollPane.setStyle("-fx-background-color: transparent"); diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/NewCategoryController.java b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/NewCategoryController.java index d5a37d753..91dfbd525 100644 --- a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/NewCategoryController.java +++ b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/NewCategoryController.java @@ -13,6 +13,7 @@ import de.deadlocker8.budgetmaster.logic.utils.Helpers; import de.deadlocker8.budgetmaster.logic.utils.Strings; import de.deadlocker8.budgetmasterclient.ui.Styleable; import de.deadlocker8.budgetmasterclient.ui.colorPick.ColorView; +import fontAwesome.FontIcon; import fontAwesome.FontIconType; import javafx.fxml.FXML; import javafx.scene.control.Alert.AlertType; @@ -203,8 +204,8 @@ public class NewCategoryController extends BaseController implements Styleable @Override public void applyStyle() { - buttonCancel.setGraphic(Helpers.getFontIcon(FontIconType.TIMES, 17, Color.WHITE)); - buttonSave.setGraphic(Helpers.getFontIcon(FontIconType.SAVE, 17, Color.WHITE)); + buttonCancel.setGraphic(new FontIcon(FontIconType.TIMES, 17, Color.WHITE)); + buttonSave.setGraphic(new FontIcon(FontIconType.SAVE, 17, Color.WHITE)); buttonCancel.setStyle("-fx-background-color: " + ConvertTo.toRGBHexWithoutOpacity(Colors.BACKGROUND_BUTTON_BLUE) + "; -fx-text-fill: white; -fx-font-weight: bold; -fx-font-size: 15;"); buttonSave.setStyle("-fx-background-color: " + ConvertTo.toRGBHexWithoutOpacity(Colors.BACKGROUND_BUTTON_BLUE) + "; -fx-text-fill: white; -fx-font-weight: bold; -fx-font-size: 15;"); diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/NewPaymentController.java b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/NewPaymentController.java index e2e5f75e8..0dcd07c18 100644 --- a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/NewPaymentController.java +++ b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/NewPaymentController.java @@ -22,6 +22,7 @@ import de.deadlocker8.budgetmasterclient.ui.cells.ButtonCategoryCell; import de.deadlocker8.budgetmasterclient.ui.cells.RepeatingDayCell; import de.deadlocker8.budgetmasterclient.ui.cells.SmallCategoryCell; import de.deadlocker8.budgetmasterclient.ui.tagField.TagField; +import fontAwesome.FontIcon; import fontAwesome.FontIconType; import javafx.fxml.FXML; import javafx.geometry.Insets; @@ -679,9 +680,9 @@ public class NewPaymentController extends BaseController implements Styleable @Override public void applyStyle() { - buttonTagsHelp.setGraphic(Helpers.getFontIcon(FontIconType.QUESTION, 13, Colors.TEXT)); - buttonCancel.setGraphic(Helpers.getFontIcon(FontIconType.TIMES, 17, Color.WHITE)); - buttonSave.setGraphic(Helpers.getFontIcon(FontIconType.SAVE, 17, Color.WHITE)); + buttonTagsHelp.setGraphic(new FontIcon(FontIconType.QUESTION, 13, Colors.TEXT)); + buttonCancel.setGraphic(new FontIcon(FontIconType.TIMES, 17, Color.WHITE)); + buttonSave.setGraphic(new FontIcon(FontIconType.SAVE, 17, Color.WHITE)); scrollPane.setStyle("-fx-background-color: transparent"); buttonTagsHelp.setStyle("-fx-background-color: transparent; -fx-border-radius: 50%; -fx-border-color: " + ConvertTo.toRGBHexWithoutOpacity(Colors.TEXT)); diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/PaymentController.java b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/PaymentController.java index c489114a8..c05c1822a 100644 --- a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/PaymentController.java +++ b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/PaymentController.java @@ -16,6 +16,7 @@ import de.deadlocker8.budgetmaster.logic.utils.Strings; import de.deadlocker8.budgetmasterclient.ui.Refreshable; import de.deadlocker8.budgetmasterclient.ui.Styleable; import de.deadlocker8.budgetmasterclient.ui.cells.PaymentCell; +import fontAwesome.FontIcon; import fontAwesome.FontIconType; import javafx.application.Platform; import javafx.beans.value.ChangeListener; @@ -205,11 +206,11 @@ public class PaymentController implements Refreshable, Styleable @Override public void applyStyle() { - buttonNewIncome.setGraphic(Helpers.getFontIcon(FontIconType.DOWNLOAD, 18, Color.WHITE)); - buttonFilter.setGraphic(Helpers.getFontIcon(FontIconType.FILTER, 18, Color.WHITE)); - buttonNewPayment.setGraphic(Helpers.getFontIcon(FontIconType.UPLOAD, 18, Color.WHITE)); - labelFilterActive.setGraphic(Helpers.getFontIcon(FontIconType.WARNING, 13, Colors.TEXT)); - buttonSearch.setGraphic(Helpers.getFontIcon(FontIconType.SEARCH, 18, Color.WHITE)); + buttonNewIncome.setGraphic(new FontIcon(FontIconType.DOWNLOAD, 18, Color.WHITE)); + buttonFilter.setGraphic(new FontIcon(FontIconType.FILTER, 18, Color.WHITE)); + buttonNewPayment.setGraphic(new FontIcon(FontIconType.UPLOAD, 18, Color.WHITE)); + labelFilterActive.setGraphic(new FontIcon(FontIconType.WARNING, 13, Colors.TEXT)); + buttonSearch.setGraphic(new FontIcon(FontIconType.SEARCH, 18, Color.WHITE)); anchorPaneMain.setStyle("-fx-background-color: " + ConvertTo.toRGBHexWithoutOpacity(Colors.BACKGROUND)); labelIncome.setStyle("-fx-text-fill: " + ConvertTo.toRGBHexWithoutOpacity(Colors.TEXT)); diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/ReportController.java b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/ReportController.java index a4fec0e9a..60e77dd17 100644 --- a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/ReportController.java +++ b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/ReportController.java @@ -35,6 +35,7 @@ import de.deadlocker8.budgetmasterclient.ui.Styleable; import de.deadlocker8.budgetmasterclient.ui.cells.report.table.ReportTableRatingCell; import de.deadlocker8.budgetmasterclient.ui.cells.report.table.ReportTableRepeatingCell; import de.deadlocker8.budgetmasterclient.utils.UIHelpers; +import fontAwesome.FontIcon; import fontAwesome.FontIconType; import javafx.application.Platform; import javafx.beans.property.SimpleStringProperty; @@ -801,9 +802,9 @@ public class ReportController implements Refreshable, Styleable @Override public void applyStyle() { - buttonFilter.setGraphic(Helpers.getFontIcon(FontIconType.FILTER, 18, Color.WHITE)); - buttonGenerate.setGraphic(Helpers.getFontIcon(FontIconType.COGS, 18, Color.WHITE)); - labelFilterActive.setGraphic(Helpers.getFontIcon(FontIconType.WARNING, 16, Colors.TEXT)); + buttonFilter.setGraphic(new FontIcon(FontIconType.FILTER, 18, Color.WHITE)); + buttonGenerate.setGraphic(new FontIcon(FontIconType.COGS, 18, Color.WHITE)); + labelFilterActive.setGraphic(new FontIcon(FontIconType.WARNING, 16, Colors.TEXT)); anchorPaneMain.setStyle("-fx-background-color: " + ConvertTo.toRGBHexWithoutOpacity(Colors.BACKGROUND)); labelFilterActive.setStyle("-fx-text-fill: " + ConvertTo.toRGBHexWithoutOpacity(Colors.TEXT)); diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/SearchController.java b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/SearchController.java index 1fab017b8..39be054fa 100644 --- a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/SearchController.java +++ b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/SearchController.java @@ -9,11 +9,11 @@ import de.deadlocker8.budgetmaster.logic.search.SearchPreferences; import de.deadlocker8.budgetmaster.logic.serverconnection.ExceptionHandler; import de.deadlocker8.budgetmaster.logic.serverconnection.ServerConnection; import de.deadlocker8.budgetmaster.logic.utils.Colors; -import de.deadlocker8.budgetmaster.logic.utils.Helpers; import de.deadlocker8.budgetmaster.logic.utils.Strings; import de.deadlocker8.budgetmasterclient.ui.Styleable; import de.deadlocker8.budgetmasterclient.ui.cells.SearchCell; import de.deadlocker8.budgetmasterclient.utils.UIHelpers; +import fontAwesome.FontIcon; import fontAwesome.FontIconType; import javafx.application.Platform; import javafx.beans.value.ChangeListener; @@ -323,8 +323,8 @@ public class SearchController extends BaseController implements Styleable labelSeparator.setMinHeight(1); labelSeparator.setMaxHeight(1); - buttonCancel.setGraphic(Helpers.getFontIcon(FontIconType.TIMES, 17, Color.WHITE)); - buttonSearch.setGraphic(Helpers.getFontIcon(FontIconType.SEARCH, 17, Color.WHITE)); + buttonCancel.setGraphic(new FontIcon(FontIconType.TIMES, 17, Color.WHITE)); + buttonSearch.setGraphic(new FontIcon(FontIconType.SEARCH, 17, Color.WHITE)); buttonCancel.setStyle("-fx-background-color: " + ConvertTo.toRGBHexWithoutOpacity(Colors.BACKGROUND_BUTTON_BLUE) + "; -fx-text-fill: white; -fx-font-weight: bold; -fx-font-size: 15;"); buttonSearch.setStyle("-fx-background-color: " + ConvertTo.toRGBHexWithoutOpacity(Colors.BACKGROUND_BUTTON_BLUE) + "; -fx-text-fill: white; -fx-font-weight: bold; -fx-font-size: 15;"); diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/SettingsController.java b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/SettingsController.java index c481192e7..21f167626 100644 --- a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/SettingsController.java +++ b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/SettingsController.java @@ -372,7 +372,6 @@ public class SettingsController implements Styleable try { database = FileHelper.loadDatabaseJSON(file); - System.out.println(database); if(database.getCategories() == null || database.getNormalPayments() == null || database.getRepeatingPayments() == null diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/SplashScreenController.java b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/SplashScreenController.java index 28071b535..def12fbc8 100644 --- a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/SplashScreenController.java +++ b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/SplashScreenController.java @@ -9,6 +9,7 @@ import de.deadlocker8.budgetmaster.logic.utils.Helpers; import de.deadlocker8.budgetmaster.logic.utils.Strings; import de.deadlocker8.budgetmasterclient.ui.Styleable; import de.deadlocker8.budgetmasterclient.ui.customAlert.CustomAlertController; +import fontAwesome.FontIcon; import fontAwesome.FontIconType; import javafx.application.Platform; import javafx.fxml.FXML; @@ -188,7 +189,7 @@ public class SplashScreenController extends BaseController implements Styleable @Override public void applyStyle() { - buttonLogin.setGraphic(Helpers.getFontIcon(FontIconType.SIGN_IN, 18, Color.WHITE)); + buttonLogin.setGraphic(new FontIcon(FontIconType.SIGN_IN, 18, Color.WHITE)); buttonLogin.setStyle("-fx-background-color: " + ConvertTo.toRGBHexWithoutOpacity(Colors.BACKGROUND_BUTTON_BLUE) + "; -fx-text-fill: white; -fx-font-weight: bold; -fx-font-size: 16;"); buttonLogin.setPadding(new Insets(3, 7, 3, 7)); } diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/tagField/TagField.java b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/tagField/TagField.java index 536a52cdc..84b6e2de2 100644 --- a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/tagField/TagField.java +++ b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/tagField/TagField.java @@ -8,9 +8,9 @@ import org.controlsfx.control.textfield.TextFields; import de.deadlocker8.budgetmaster.logic.tag.Tag; import de.deadlocker8.budgetmaster.logic.utils.Colors; -import de.deadlocker8.budgetmaster.logic.utils.Helpers; import de.deadlocker8.budgetmaster.logic.utils.Strings; import de.deadlocker8.budgetmasterclient.ui.controller.NewPaymentController; +import fontAwesome.FontIcon; import fontAwesome.FontIconType; import javafx.geometry.Insets; import javafx.geometry.Pos; @@ -210,7 +210,7 @@ public class TagField extends VBox hboxTag.getChildren().add(labelTagName); Button buttonDelete = new Button(); - buttonDelete.setGraphic(Helpers.getFontIcon(FontIconType.TIMES, 13, Colors.TEXT)); + buttonDelete.setGraphic(new FontIcon(FontIconType.TIMES, 13, Colors.TEXT)); buttonDelete.setStyle("-fx-background-color: transparent;"); buttonDelete.getStyleClass().add("button-hoverable"); buttonDelete.setOnAction((event)->{ diff --git a/BudgetMasterCore/src/main/java/de/deadlocker8/budgetmaster/logic/utils/Helpers.java b/BudgetMasterCore/src/main/java/de/deadlocker8/budgetmaster/logic/utils/Helpers.java index 9f031cf91..6bd8a0a6c 100644 --- a/BudgetMasterCore/src/main/java/de/deadlocker8/budgetmaster/logic/utils/Helpers.java +++ b/BudgetMasterCore/src/main/java/de/deadlocker8/budgetmaster/logic/utils/Helpers.java @@ -7,8 +7,6 @@ import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.ArrayList; -import fontAwesome.FontIcon; -import fontAwesome.FontIconType; import javafx.scene.paint.Color; import tools.Localization; @@ -98,16 +96,7 @@ public class Helpers colors.add(Colors.CATEGORIES_DARK_GREEN); return colors; - } - - public static FontIcon getFontIcon(FontIconType type, int size, Color color) - { - FontIcon icon = new FontIcon(type); - icon.setSize(size); - icon.setColor(color); - - return icon; - } + } /** * Replaces line breaks and tabs with spaces diff --git a/BudgetMasterServer/src/main/resources/de/deadlocker8/budgetmasterserver/_en.properties b/BudgetMasterServer/src/main/resources/de/deadlocker8/budgetmasterserver/_en.properties index 59c2f78bb..80fd0317a 100644 --- a/BudgetMasterServer/src/main/resources/de/deadlocker8/budgetmasterserver/_en.properties +++ b/BudgetMasterServer/src/main/resources/de/deadlocker8/budgetmasterserver/_en.properties @@ -1,5 +1,5 @@ app.name=BudgetMasterServer -version.code=12 +version.code=13 version.name=1.8.0_alpha version.date=03.11.17 author=Robert Goldmann -- GitLab