Setting -> Deutsch / Englisch

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:

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);
     }
 
     /**

src/tourplaner/tourplaner.fxml

@@ -62,8 +62,8 @@
                   <CheckMenuItem fx:id="openpdf" mnemonicParsing="false" onAction="#openpdfaction" text="Report automatisch öffnen" />
                   <Menu mnemonicParsing="false" text="Sprache">
                     <items>
-                        <RadioMenuItem mnemonicParsing="false" text="Deutsch" />
+                        <RadioMenuItem fx:id="langdeutsch" mnemonicParsing="false" onAction="#onlangdeutsch" text="Deutsch" />
-                        <RadioMenuItem mnemonicParsing="false" text="Englisch" />
+                        <RadioMenuItem fx:id="langenglisch" mnemonicParsing="false" onAction="#onlangenglisch" text="Englisch" />
                     </items>
                   </Menu>
                </items>

src/tourplaner/ui/TourplanerController.java

@@ -47,6 +47,18 @@ public class TourplanerController implements Initializable {
     public TableColumn<Log, String> 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

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));
+            try {
-            tourNamen.removeIf(s -> s.equals(tourname));
+                tourData.removeIf(s -> s.getName().equals(tourname));
-            logData.removeIf(s -> true);
+                tourNamen.removeIf(s -> s.equals(tourname));
-            setSelectedTour(null);
+                logData.removeIf(s -> true);
-            TourPlaner.delTour(tourname);
+                TourPlaner.delTour(tourname);
-        }catch (NullPointerException e){
+                setSelectedTour(null);
-            LogHelper.error(ConfigHelper.getLangIniString("keinetourselected"),
+            } catch (NullPointerException e) {
-                    ConfigHelper.getLangIniString("deltournoselect"));
+                LogHelper.error(e);
+            }
+        }else {
             AlertHelper.warn(ConfigHelper.getLangIniString("achtung"),
                     ConfigHelper.getLangIniString("keinetourselected"),
                     ConfigHelper.getLangIniString("deltournoselectmsg"));