diff --git a/CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/MainToolBar.java b/CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/MainToolBar.java index 3993c617c0e08aec82f750255bf86c18e9c6dc1b..ff6808b3bcf712544dc17831b0618cce424dd8e7 100644 --- a/CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/MainToolBar.java +++ b/CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/MainToolBar.java @@ -85,6 +85,12 @@ public class MainToolBar { @FXML private ImageView lod4View; + @FXML + private Button zipBtn; + + @FXML + private ImageView zipView; + @FXML private Button aboutBtn; @@ -147,6 +153,7 @@ public class MainToolBar { setupReportButton(); setupResetCameraButton(); setupHideRoofButton(); + setupZipButton(); loadImages(); gridButton.setOnAction(ae -> renderer.showWireFrame(gridButton.isSelected())); @@ -225,6 +232,10 @@ public class MainToolBar { Image img = new Image(inStream); hideRoofView.setImage(img); } + try (InputStream inStream = MainWindow.class.getResourceAsStream("icons/zip.png")) { + Image img = new Image(inStream); + zipView.setImage(img); + } } catch (IOException e) { // ignore close exception } @@ -336,6 +347,14 @@ public class MainToolBar { } + private void setupZipButton() { + zipBtn.setDisable(true); + zipBtn.setTooltip(new Tooltip(Localization.getText("MainToolBar.zip"))); + zipBtn.setOnAction(ae -> { + //TODO: Implement Zipfile viewer + }); + } + public Button getCheckButton() { return checkBtn; } diff --git a/CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/OpenFileDialog.java b/CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/OpenFileDialog.java index ccd3d586809ad7c7b71539836a351b747421627c..8d745589dd4450191d51e05033826d24b69f12d6 100644 --- a/CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/OpenFileDialog.java +++ b/CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/OpenFileDialog.java @@ -121,6 +121,7 @@ public class OpenFileDialog { fc = new FileChooser(); fc.setTitle(Localization.getText("OpenFileDialog.select")); fc.getExtensionFilters().add(new ExtensionFilter("GML/XML", "*.gml", "*.xml")); + fc.getExtensionFilters().add(new ExtensionFilter("ZIP", "*.zip")); fc.getExtensionFilters().add(new ExtensionFilter(Localization.getText("MainWindow.all"), "*.*")); } File dir = new File(Settings.get(Settings.LAST_OPEN_FOLDER, "")); diff --git a/CityDoctorParent/Extensions/CityDoctorGUI/src/main/resources/de/hft/stuttgart/citydoctor2/gui/MainToolBar.fxml b/CityDoctorParent/Extensions/CityDoctorGUI/src/main/resources/de/hft/stuttgart/citydoctor2/gui/MainToolBar.fxml index ece119e4a02d62c0516e3c6546df696b9b842ae6..ef0fde8aee0e88120a4e91f73b3b2836e26e4ea5 100644 --- a/CityDoctorParent/Extensions/CityDoctorGUI/src/main/resources/de/hft/stuttgart/citydoctor2/gui/MainToolBar.fxml +++ b/CityDoctorParent/Extensions/CityDoctorGUI/src/main/resources/de/hft/stuttgart/citydoctor2/gui/MainToolBar.fxml @@ -1,9 +1,12 @@ - - - + + + + + + @@ -75,6 +78,12 @@ + +