From 58e94e6cbd7d9bd93dca933458d9886db15005d0 Mon Sep 17 00:00:00 2001 From: Georg-Notebook Date: Sat, 17 Apr 2021 18:43:24 +0200 Subject: [PATCH] Setting -> Deutsch / Englisch --- langen.ini | 62 +++++++++++++++++++++ src/tourplaner/business/ConfigHelper.java | 2 +- src/tourplaner/tourplaner.fxml | 4 +- src/tourplaner/ui/TourplanerController.java | 22 ++++++++ src/tourplaner/viewmodels/ViewModel.java | 20 ++++--- 5 files changed, 98 insertions(+), 12 deletions(-) create mode 100644 langen.ini diff --git a/langen.ini b/langen.ini new file mode 100644 index 0000000..320ce3b --- /dev/null +++ b/langen.ini @@ -0,0 +1,62 @@ +[langen] +achtung = ATTENTION +openbrowsererror = TourplanerController -> Browser: +browserexception = Browser Exception +browserexceptionmsg = Error at opening Browser +suchfeldleer = Search field is empty! +suchtextzuerst = Please enter search term first! +keinetourselected = No Tour selected +tournametitle = Tour name +tournameheader = Please enter a Tourname! +tournamemsg = Name: +namevergebenheader = Name is already occupied! +namevergebenmsg1 = The name ' +namevergebenmsg2 = ' is already in use! +startpunkttitle = Tour start +startpunktheader = Please enter the start of the Tour +startpunktmsg = Start: +zielpunkttitle = Tour destination: +zielpunktheader = Please enter the tour destination! +zielpunktmsg = Destination: +deltournoselect = ViewModel -> DelTour +deltournoselectmsg = Please select a tour first! +exceptionstackheader = Exception stacktrace: +keinelogsvorhanden = First add a Log! +datum = Date +dauer = Duration +strecke = Distance +streckemsg = Distance of the log entry +dauermsg = Duration of the log entry +doppelpunkt = : +fktnichtimplementiert = Not implementet jet +vergessenodernochnichtsoweit = Not implementet jet +logtournotselectedmsg = Please select a tour first! +keintextimfeld = Please enter a text! +nurzahlen = Only numbers! +nurpositivezahlen = Only positiv numbers! +pause = Break +pausemsg = Duration of the break +hightmeter = Vertical meters +hightmetermsg = Vertical meters of the etape +bemerkung = Comment +bemerkungheader = Please enter a Comment, can also be empty! +tourreportvon = Tour Report from -> +tourplanervon = Tourplaner by DerGeorg +reportkeywords = Tourplaner, Tour, Report +tourplaner = Tourplaner +tour = Tour +reportvon = Report created by: +reportstart = Start of the tour: +reportziel = Destination of the tour: +reportdauercal = Calculated duration of the tour: +reportstreckecal = Calculated distance of the tour: +logs = Logs +countlog = Number of log entries: +logvom = Log from: +logdauer = Duration: +logpause = Break from that: +loggegangen = Gone away: +logavg = Calculated averrage speed: +logstrecke = Distance: +loghight = Vertical meters: +logbemerkung = Comment: \ No newline at end of file diff --git a/src/tourplaner/business/ConfigHelper.java b/src/tourplaner/business/ConfigHelper.java index 79d5960..a96278b 100644 --- a/src/tourplaner/business/ConfigHelper.java +++ b/src/tourplaner/business/ConfigHelper.java @@ -56,7 +56,7 @@ public class ConfigHelper { * @return Den angeforderten String */ public static String getLangIniString(String optionName){ - return ConfigHelper.getIniString(ConfigHelper.getStandartLangde(), ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "lang", "lang"),optionName); + return ConfigHelper.getIniString(getIniString(getStandartConfig(), "lang", "lang") + ".ini", ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "lang", "lang"),optionName); } /** diff --git a/src/tourplaner/tourplaner.fxml b/src/tourplaner/tourplaner.fxml index faf1d06..1d57ad6 100644 --- a/src/tourplaner/tourplaner.fxml +++ b/src/tourplaner/tourplaner.fxml @@ -62,8 +62,8 @@ - - + + diff --git a/src/tourplaner/ui/TourplanerController.java b/src/tourplaner/ui/TourplanerController.java index a55ac82..ae07c5d 100644 --- a/src/tourplaner/ui/TourplanerController.java +++ b/src/tourplaner/ui/TourplanerController.java @@ -47,6 +47,18 @@ public class TourplanerController implements Initializable { public TableColumn logDauerCol, logStreckeCol, logDatumCol, logAvgCol, logHightCol, logPauseCol, logGegangenCol, logBemerkungCol; //Menue public CheckMenuItem openmap, openpdf; + public RadioMenuItem langenglisch, langdeutsch; + public ToggleGroup langgroup; + + @FXML + private void onlangenglisch(){ + ConfigHelper.setIniString(ConfigHelper.getStandartConfig(), "lang", "lang", "langen"); + } + + @FXML + private void onlangdeutsch(){ + ConfigHelper.setIniString(ConfigHelper.getStandartConfig(), "lang", "lang", "langde"); + } @FXML private void tourReport(){ @@ -248,6 +260,16 @@ public class TourplanerController implements Initializable { }else { this.openmap.setSelected(false); } + this.langgroup = new ToggleGroup(); + this.langdeutsch.setToggleGroup(this.langgroup); + this.langenglisch.setToggleGroup(this.langgroup); + if(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "lang", "lang").equals("langde")){ + this.langdeutsch.setSelected(true); + this.langenglisch.setSelected(false); + }else if(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "lang", "lang").equals("langen")){ + this.langdeutsch.setSelected(false); + this.langenglisch.setSelected(true); + } } @FXML diff --git a/src/tourplaner/viewmodels/ViewModel.java b/src/tourplaner/viewmodels/ViewModel.java index cd646b4..7db3d76 100644 --- a/src/tourplaner/viewmodels/ViewModel.java +++ b/src/tourplaner/viewmodels/ViewModel.java @@ -500,16 +500,18 @@ public class ViewModel { * Entfernt eine Tour anhand der ausgewählten Tour */ public void delTour(){ - try { + if (this.selectedTour != null) { String tourname = this.selectedTour.getName(); - tourData.removeIf(s -> s.getName().equals(tourname)); - tourNamen.removeIf(s -> s.equals(tourname)); - logData.removeIf(s -> true); - setSelectedTour(null); - TourPlaner.delTour(tourname); - }catch (NullPointerException e){ - LogHelper.error(ConfigHelper.getLangIniString("keinetourselected"), - ConfigHelper.getLangIniString("deltournoselect")); + try { + tourData.removeIf(s -> s.getName().equals(tourname)); + tourNamen.removeIf(s -> s.equals(tourname)); + logData.removeIf(s -> true); + TourPlaner.delTour(tourname); + setSelectedTour(null); + } catch (NullPointerException e) { + LogHelper.error(e); + } + }else { AlertHelper.warn(ConfigHelper.getLangIniString("achtung"), ConfigHelper.getLangIniString("keinetourselected"), ConfigHelper.getLangIniString("deltournoselectmsg"));