Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
CityDoctor
CityDoctor2
Commits
0bc7e307
Commit
0bc7e307
authored
2 months ago
by
Riegel
Browse files
Options
Download
Email Patches
Plain Diff
Refactor: Restructure ZipEntryPicker layout
parent
4a0c88b5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CityDoctorParent/CityDoctorModel/src/main/resources/CityDoctorLocalization.properties
+2
-1
...odel/src/main/resources/CityDoctorLocalization.properties
CityDoctorParent/CityDoctorModel/src/main/resources/CityDoctorLocalization_de.properties
+2
-1
...l/src/main/resources/CityDoctorLocalization_de.properties
CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/ZipEntryPicker.java
+12
-1
...java/de/hft/stuttgart/citydoctor2/gui/ZipEntryPicker.java
with
16 additions
and
3 deletions
+16
-3
CityDoctorParent/CityDoctorModel/src/main/resources/CityDoctorLocalization.properties
+
2
-
1
View file @
0bc7e307
...
@@ -114,7 +114,8 @@ ZipEntryPicker.ioError=Unable to access file
...
@@ -114,7 +114,8 @@ ZipEntryPicker.ioError=Unable to access file
ZipEntryPicker.filesizeLbl
=
Filesize:
ZipEntryPicker.filesizeLbl
=
Filesize:
ZipEntryPicker.validatedLbl
=
Validated:
ZipEntryPicker.validatedLbl
=
Validated:
ZipEntryPicker.objectCountLbl
=
Object count:
ZipEntryPicker.objectCountLbl
=
Object count:
ZipEntryPicker.loadBtn
=
Load entry
ZipEntryPicker.loadBtn
=
Load CityGML model
ZipEntryPicker.decompressBtn
=
Unpack file
ZipEntryPicker.cancelBtn
=
Cancel
ZipEntryPicker.cancelBtn
=
Cancel
ZipEntryPicker.unknownValue
=
N/A
ZipEntryPicker.unknownValue
=
N/A
ZipEntryPicker.yes
=
Yes
ZipEntryPicker.yes
=
Yes
...
...
This diff is collapsed.
Click to expand it.
CityDoctorParent/CityDoctorModel/src/main/resources/CityDoctorLocalization_de.properties
+
2
-
1
View file @
0bc7e307
...
@@ -112,7 +112,8 @@ ZipEntryPicker.ioError=Dateizugriff fehlgeschlagen
...
@@ -112,7 +112,8 @@ ZipEntryPicker.ioError=Dateizugriff fehlgeschlagen
ZipEntryPicker.filesizeLbl
=
Dateigr
\u
00f6
\u
00DFe:
ZipEntryPicker.filesizeLbl
=
Dateigr
\u
00f6
\u
00DFe:
ZipEntryPicker.validatedLbl
=
Validiert:
ZipEntryPicker.validatedLbl
=
Validiert:
ZipEntryPicker.objectCountLbl
=
Objektanzahl:
ZipEntryPicker.objectCountLbl
=
Objektanzahl:
ZipEntryPicker.loadBtn
=
Eintrag laden
ZipEntryPicker.loadBtn
=
CityGML Modell laden
ZipEntryPicker.decompressBtn
=
Datei entpacken
ZipEntryPicker.cancelBtn
=
Abbruch
ZipEntryPicker.cancelBtn
=
Abbruch
ZipEntryPicker.unknownValue
=
Unbekannt
ZipEntryPicker.unknownValue
=
Unbekannt
ZipEntryPicker.yes
=
Ja
ZipEntryPicker.yes
=
Ja
...
...
This diff is collapsed.
Click to expand it.
CityDoctorParent/Extensions/CityDoctorGUI/src/main/java/de/hft/stuttgart/citydoctor2/gui/ZipEntryPicker.java
+
12
-
1
View file @
0bc7e307
...
@@ -15,7 +15,9 @@ import javafx.scene.control.Label;
...
@@ -15,7 +15,9 @@ import javafx.scene.control.Label;
import
javafx.scene.control.ListView
;
import
javafx.scene.control.ListView
;
import
javafx.scene.control.TextField
;
import
javafx.scene.control.TextField
;
import
javafx.scene.control.TitledPane
;
import
javafx.scene.control.TitledPane
;
import
javafx.scene.control.Tooltip
;
import
javafx.scene.image.Image
;
import
javafx.scene.image.Image
;
import
javafx.scene.image.ImageView
;
import
javafx.scene.input.KeyCode
;
import
javafx.scene.input.KeyCode
;
import
javafx.scene.input.KeyEvent
;
import
javafx.scene.input.KeyEvent
;
import
javafx.scene.layout.VBox
;
import
javafx.scene.layout.VBox
;
...
@@ -66,8 +68,16 @@ public class ZipEntryPicker {
...
@@ -66,8 +68,16 @@ public class ZipEntryPicker {
@FXML
@FXML
private
Button
cancelBtn
;
private
Button
cancelBtn
;
@FXML
@FXML
private
Button
loadBtn
;
private
Button
loadBtn
;
@FXML
private
ImageView
loadImageView
;
@FXML
private
Button
decompressBtn
;
@FXML
private
Button
decompressImageView
;
@FXML
@FXML
private
ListView
<
ZipEntryNode
>
entryList
;
private
ListView
<
ZipEntryNode
>
entryList
;
...
@@ -127,7 +137,8 @@ public class ZipEntryPicker {
...
@@ -127,7 +137,8 @@ public class ZipEntryPicker {
validatedValue
.
setText
(
unknownValueText
);
validatedValue
.
setText
(
unknownValueText
);
objectCountValue
.
setText
(
unknownValueText
);
objectCountValue
.
setText
(
unknownValueText
);
loadBtn
.
setText
(
Localization
.
getText
(
"ZipEntryPicker.loadBtn"
));
loadBtn
.
setTooltip
(
new
Tooltip
(
Localization
.
getText
(
"ZipEntryPicker.loadBtn"
)));
decompressBtn
.
setTooltip
(
new
Tooltip
(
Localization
.
getText
(
"ZipEntryPicker.decompressBtn"
)));
cancelBtn
.
setText
(
Localization
.
getText
(
"ZipEntryPicker.cancelBtn"
));
cancelBtn
.
setText
(
Localization
.
getText
(
"ZipEntryPicker.cancelBtn"
));
}
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment