From a0afcd379202d2622ff55b7c4b302d6f310a08b5 Mon Sep 17 00:00:00 2001 From: Robert Goldmann <deadlocker@gmx.de> Date: Thu, 31 Aug 2017 11:34:26 +0200 Subject: [PATCH] added notification if no update is available, --- src/de/deadlocker8/budgetmaster/logic/utils/Strings.java | 1 + .../budgetmaster/resources/languages/_de.properties | 3 ++- .../budgetmaster/resources/languages/_en.properties | 1 + src/de/deadlocker8/budgetmaster/ui/controller/Controller.java | 4 ++++ .../budgetmaster/ui/controller/SettingsController.java | 1 + 5 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/de/deadlocker8/budgetmaster/logic/utils/Strings.java b/src/de/deadlocker8/budgetmaster/logic/utils/Strings.java index bf70bfde8..1da9cedd5 100644 --- a/src/de/deadlocker8/budgetmaster/logic/utils/Strings.java +++ b/src/de/deadlocker8/budgetmaster/logic/utils/Strings.java @@ -99,6 +99,7 @@ public class Strings public static final String NOTIFICATION_CHART_EXPORT = "notification.chart.export"; public static final String NOTIFICATION_REPORT_SAVE = "notification.report.save"; public static final String NOTIFICATION_SETTINGS_SAVE = "notification.settings.save"; + public static final String NOTIFICATION_NO_UPDATE_AVAILABLE = "notification.no.update.available"; //INFO public static final String INFO_TITLE_CATEGORY_DELETE = "info.title.category.delete"; diff --git a/src/de/deadlocker8/budgetmaster/resources/languages/_de.properties b/src/de/deadlocker8/budgetmaster/resources/languages/_de.properties index 9dc5a1fda..562ebe1ed 100644 --- a/src/de/deadlocker8/budgetmaster/resources/languages/_de.properties +++ b/src/de/deadlocker8/budgetmaster/resources/languages/_de.properties @@ -95,7 +95,8 @@ month.december=Dezember # NOTIFICATION notification.chart.export=Diagramm erfolgreich exportiert. notification.report.save=Bericht erfolgreich gespeichert. -notification.settings.save=Erfolgreich gespeichert +notification.settings.save=Erfolgreich gespeichert. +notification.no.update.available=Kein Update verf�gbar. # INFO info.title.category.delete=Kategorie l�schen diff --git a/src/de/deadlocker8/budgetmaster/resources/languages/_en.properties b/src/de/deadlocker8/budgetmaster/resources/languages/_en.properties index 13aab3aba..71b5e6e9f 100644 --- a/src/de/deadlocker8/budgetmaster/resources/languages/_en.properties +++ b/src/de/deadlocker8/budgetmaster/resources/languages/_en.properties @@ -96,6 +96,7 @@ month.december=December notification.chart.export=Chart successfully exported. notification.report.save=Report successfully saved. notification.settings.save=Successfully saved. +notification.no.update.available=No update available. # INFO info.title.category.delete=Delete Category diff --git a/src/de/deadlocker8/budgetmaster/ui/controller/Controller.java b/src/de/deadlocker8/budgetmaster/ui/controller/Controller.java index ef7f808a8..841b5c1bd 100644 --- a/src/de/deadlocker8/budgetmaster/ui/controller/Controller.java +++ b/src/de/deadlocker8/budgetmaster/ui/controller/Controller.java @@ -355,7 +355,10 @@ public class Controller String changes = updater.getChangelog(updater.getLatestVersion().getVersionCode()); if(!updateAvailable) + { + showNotification(Localization.getString(Strings.NOTIFICATION_NO_UPDATE_AVAILABLE)); return; + } Platform.runLater(()->{ Alert alert = new Alert(AlertType.INFORMATION); @@ -488,6 +491,7 @@ public class Controller toggleAllTabsExceptSettings(true); tabPane.getSelectionModel().select(tabSettings); }); + return; } diff --git a/src/de/deadlocker8/budgetmaster/ui/controller/SettingsController.java b/src/de/deadlocker8/budgetmaster/ui/controller/SettingsController.java index 30edabc73..41bbcdca7 100644 --- a/src/de/deadlocker8/budgetmaster/ui/controller/SettingsController.java +++ b/src/de/deadlocker8/budgetmaster/ui/controller/SettingsController.java @@ -90,6 +90,7 @@ public class SettingsController comboBoxLanguage.setButtonCell(new LanguageCell(false)); comboBoxLanguage.setValue(LanguageType.ENGLISH); previousLanguage = LanguageType.ENGLISH; + checkboxEnableAutoUpdate.setSelected(true); if(controller.getSettings().isComplete()) { -- GitLab