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

@@ -43,7 +43,7 @@ public class ConfigHelper {
         try {
             ini = new Wini(new File(filename));
         } catch (IOException e) {
-            LogHelper.error(e.getMessage(), e.getClass().getName());
+            LogHelper.error(e);
         }
         assert ini != null;
         return ini.get(sectionName, optionName, String.class);
@@ -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);
     }
 
     /**
@@ -92,7 +92,7 @@ public class ConfigHelper {
             ini.put(sectionName, optionName, value);
             ini.store();
         } catch (IOException e) {
-            LogHelper.error(e.getMessage(), e.getClass().getName());
+            LogHelper.error(e);
         }
     }
 

src/tourplaner/business/DirectionMap.java

@@ -31,8 +31,10 @@ public class DirectionMap {
         FileHelper.saveImage(this.map, "jpg", new File(this.file));
         FileHelper.saveImage(this.mappdf, "jpg", new File(this.filepdf));
         getDirections(start, ende);
+        if(ConfigHelper.getIniInt(ConfigHelper.getStandartConfig(), "settings", "openmap") == 1) {
             FileHelper.openDefault(file);
         }
+    }
 
     /**
      * Get berechnete Dauer in Minuten

src/tourplaner/business/Reporter.java

@@ -53,8 +53,10 @@ public class Reporter {
         } catch (DocumentException | FileNotFoundException e) {
             LogHelper.error(e.getMessage(), e.getClass().getName());
         }
+        if(ConfigHelper.getIniInt(ConfigHelper.getStandartConfig(), "settings", "openpdf") == 1) {
             FileHelper.openDefault(file);
         }
+    }
 
     /**
      * Content des Sumary reports
@@ -109,8 +111,10 @@ public class Reporter {
         } catch (DocumentException | FileNotFoundException e) {
             LogHelper.error(e.getMessage(), e.getClass().getName());
         }
+        if(ConfigHelper.getIniInt(ConfigHelper.getStandartConfig(), "settings", "openpdf") == 1) {
             FileHelper.openDefault(file);
         }
+    }
 
     // iText allows to add metadata to the PDF which can be viewed in your Adobe
     // Reader

src/tourplaner/business/TourPlaner.java

@@ -119,8 +119,10 @@ public class TourPlaner{
      * @param tourname Tourname
      */
     public static void openImage(String tourname){
+        if(ConfigHelper.getIniInt(ConfigHelper.getStandartConfig(), "settings", "openmap") == 1) {
             FileHelper.openDefault(getImagePath(tourname));
         }
+    }
 
 
     /**
@@ -181,17 +183,6 @@ public class TourPlaner{
         return new DbConnect().editLog(tourname, log);
     }
 
-    /**
-     * Exportiert die Daten
-     * @param path Path zu den Daten
-     * @throws IOException Fehler beim schreiben der Daten
-     */
-    public static void exportData(String path) throws IOException {
-            Exporter exporter = new Exporter(path);
-            exporter.doExport();
-            FileHelper.openDefault(path);
-    }
-
     /**
      * Sucht alle touren die den gegebenen tournamen enthalten
      * @param tourname Name der zu suchen ist

src/tourplaner/tourplaner.fxml

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

src/tourplaner/ui/TourplanerController.java

@@ -1,6 +1,8 @@
 package tourplaner.ui;
 
 import javafx.collections.ObservableList;
+import javafx.event.ActionEvent;
+import javafx.event.EventHandler;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
 import javafx.geometry.Orientation;
@@ -43,6 +45,20 @@ public class TourplanerController implements Initializable {
     //Log -> rechts unten
     public TableView<Log> logTableView;
     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(){
@@ -234,7 +250,40 @@ public class TourplanerController implements Initializable {
         TourListView.setOrientation(Orientation.VERTICAL);
         syncTourNamen();
         deselectAll();
+        if(ConfigHelper.getIniInt(ConfigHelper.getStandartConfig(), "settings", "openpdf") == 1){
+            this.openpdf.setSelected(true);
+        }else {
+            this.openpdf.setSelected(false);
+        }
+        if(ConfigHelper.getIniInt(ConfigHelper.getStandartConfig(), "settings", "openmap") == 1){
+            this.openmap.setSelected(true);
+        }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
+    private void openpdfaction(){
+        int selected = 0;
+        if(this.openpdf.isSelected()) selected = 1;
+        ConfigHelper.setIniInt(ConfigHelper.getStandartConfig(), "settings", "openpdf", selected);
+    }
+
+    @FXML
+    private void openmapaction(){
+        int selected = 0;
+        if(this.openmap.isSelected()) selected = 1;
+        ConfigHelper.setIniInt(ConfigHelper.getStandartConfig(), "settings", "openmap", selected);
     }
 
     private void deselectAll(){

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();
+            try {
                 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"));
+                setSelectedTour(null);
+            } catch (NullPointerException e) {
+                LogHelper.error(e);
+            }
+        }else {
             AlertHelper.warn(ConfigHelper.getLangIniString("achtung"),
                     ConfigHelper.getLangIniString("keinetourselected"),
                     ConfigHelper.getLangIniString("deltournoselectmsg"));
@@ -612,7 +614,6 @@ public class ViewModel {
      */
     public void exportData(){
         String file = AlertHelper.fileChooser("Exportiere");
-        System.out.println("EXPORT: " + file);
         if(file != null){
             try {
                 new Exporter(file).doExport();