diff --git a/src/tourplaner/business/ConfigHelper.java b/src/tourplaner/business/ConfigHelper.java index d052aa1..79d5960 100644 --- a/src/tourplaner/business/ConfigHelper.java +++ b/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); @@ -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); } } diff --git a/src/tourplaner/business/DirectionMap.java b/src/tourplaner/business/DirectionMap.java index 9adad5a..1035dde 100644 --- a/src/tourplaner/business/DirectionMap.java +++ b/src/tourplaner/business/DirectionMap.java @@ -31,7 +31,9 @@ public class DirectionMap { FileHelper.saveImage(this.map, "jpg", new File(this.file)); FileHelper.saveImage(this.mappdf, "jpg", new File(this.filepdf)); getDirections(start, ende); - FileHelper.openDefault(file); + if(ConfigHelper.getIniInt(ConfigHelper.getStandartConfig(), "settings", "openmap") == 1) { + FileHelper.openDefault(file); + } } /** diff --git a/src/tourplaner/business/Reporter.java b/src/tourplaner/business/Reporter.java index d630e65..8f55552 100644 --- a/src/tourplaner/business/Reporter.java +++ b/src/tourplaner/business/Reporter.java @@ -53,7 +53,9 @@ public class Reporter { } catch (DocumentException | FileNotFoundException e) { LogHelper.error(e.getMessage(), e.getClass().getName()); } - FileHelper.openDefault(file); + if(ConfigHelper.getIniInt(ConfigHelper.getStandartConfig(), "settings", "openpdf") == 1) { + FileHelper.openDefault(file); + } } /** @@ -109,7 +111,9 @@ public class Reporter { } catch (DocumentException | FileNotFoundException e) { LogHelper.error(e.getMessage(), e.getClass().getName()); } - FileHelper.openDefault(file); + 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 diff --git a/src/tourplaner/business/TourPlaner.java b/src/tourplaner/business/TourPlaner.java index 2054fc4..e27e09a 100644 --- a/src/tourplaner/business/TourPlaner.java +++ b/src/tourplaner/business/TourPlaner.java @@ -119,7 +119,9 @@ public class TourPlaner{ * @param tourname Tourname */ public static void openImage(String tourname){ - FileHelper.openDefault(getImagePath(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 diff --git a/src/tourplaner/tourplaner.fxml b/src/tourplaner/tourplaner.fxml index 5fecea0..faf1d06 100644 --- a/src/tourplaner/tourplaner.fxml +++ b/src/tourplaner/tourplaner.fxml @@ -58,8 +58,8 @@ - - + + diff --git a/src/tourplaner/ui/TourplanerController.java b/src/tourplaner/ui/TourplanerController.java index 8a2f173..a55ac82 100644 --- a/src/tourplaner/ui/TourplanerController.java +++ b/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,8 @@ public class TourplanerController implements Initializable { //Log -> rechts unten public TableView logTableView; public TableColumn logDauerCol, logStreckeCol, logDatumCol, logAvgCol, logHightCol, logPauseCol, logGegangenCol, logBemerkungCol; + //Menue + public CheckMenuItem openmap, openpdf; @FXML private void tourReport(){ @@ -234,7 +238,30 @@ 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); + } + } + @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(){ diff --git a/src/tourplaner/viewmodels/ViewModel.java b/src/tourplaner/viewmodels/ViewModel.java index 81f1a2d..cd646b4 100644 --- a/src/tourplaner/viewmodels/ViewModel.java +++ b/src/tourplaner/viewmodels/ViewModel.java @@ -612,7 +612,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();