From 3bb33aa5a28356a264ac23b48d83971cb795e82f Mon Sep 17 00:00:00 2001 From: Riegel Date: Fri, 20 Dec 2024 11:27:12 +0100 Subject: [PATCH] Feat: Add zipButton to GUI --- .../citydoctor2/gui/MainToolBar.java | 19 ++++++++++++++++++ .../citydoctor2/gui/OpenFileDialog.java | 1 + .../citydoctor2/gui/MainToolBar.fxml | 15 +++++++++++--- .../stuttgart/citydoctor2/gui/icons/zip.png | Bin 0 -> 18681 bytes 4 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 CityDoctorParent/Extensions/CityDoctorGUI/src/main/resources/de/hft/stuttgart/citydoctor2/gui/icons/zip.png 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 3993c617..ff6808b3 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 ccd3d586..8d745589 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 ece119e4..ef0fde8a 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 @@ + +