diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index a407d0a07cab89debea28920bad302a9d30f8ced..7f6a32604d7343cfb94f5c165f69f76a3740668f 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -5,10 +5,18 @@ CropShot
=========
>>> start-date: 30.06.15
->>> status-date: 08.07.16
+>>> status-date: 26.04.17
____________________________________________________
+v.2.2.1 - (9)
+===============
+
+-fixed bug that prevented user from clicking on selectFolder
+
+>>> end-work: 26.04.17
+
+
v.2.2.0 - (8)
===============
diff --git a/build/CropShot.exe b/build/CropShot.exe
index 37b6741bc6a181686513291d4c1a4c27d89adbab..5a4e80d3366e33b47bde3e9aeaa01fe80da5b4ec 100644
Binary files a/build/CropShot.exe and b/build/CropShot.exe differ
diff --git a/build/CropShot.xml b/build/CropShot.xml
index c1d6965c7c8d3277c04bfd996785ea434c4fded8..14dcc6a4327b00acac872f48303cb4647da6bd36 100644
--- a/build/CropShot.xml
+++ b/build/CropShot.xml
@@ -2,8 +2,8 @@
<launch4jConfig>
<dontWrapJar>false</dontWrapJar>
<headerType>gui</headerType>
- <jar>C:\Users\ROGO2\Documents\Programmierung\eclipse\workspace\CropShot\build\CropShot.jar</jar>
- <outfile>C:\Users\ROGO2\Documents\Programmierung\eclipse\workspace\CropShot\build\CropShot.exe</outfile>
+ <jar>C:\Programmierung\eclipse\workspace\CropShot\build\CropShot.jar</jar>
+ <outfile>C:\Programmierung\eclipse\workspace\CropShot\build\CropShot.exe</outfile>
<errTitle></errTitle>
<cmdLine></cmdLine>
<chdir>.</chdir>
@@ -13,7 +13,7 @@
<stayAlive>false</stayAlive>
<restartOnCrash>false</restartOnCrash>
<manifest></manifest>
- <icon>C:\Users\ROGO2\Documents\Programmierung\eclipse\workspace\CropShot\build\crop.ico</icon>
+ <icon>C:\Programmierung\eclipse\workspace\CropShot\build\crop.ico</icon>
<classPath>
<mainClass>application.Main</mainClass>
<cp>.</cp>
diff --git a/build/Cropshot.jar b/build/Cropshot.jar
index 094696fc980fb837b4b6c7c7802271cc68c21cca..53f8e17c1f1ce0bd30cd6c59e1433f9fbbdbdcb0 100644
Binary files a/build/Cropshot.jar and b/build/Cropshot.jar differ
diff --git a/class/application/Controller.class b/class/application/Controller.class
index ae521dde194407a5bbb87cd50a814909838eab2b..a8e1a97d5aa524cbb2abc585fe0fb3aea8f22154 100644
Binary files a/class/application/Controller.class and b/class/application/Controller.class differ
diff --git a/class/application/_de.properties b/class/application/_de.properties
index b0267086c8d6c4744c724a51254568b1797ba9a8..33980cb563a0baf12a518e92c39b6700a742a03f 100644
--- a/class/application/_de.properties
+++ b/class/application/_de.properties
@@ -1,4 +1,4 @@
app.name=CropShot
-version.code=8
-version.name=2.2.0
-version.date=08.07.15
\ No newline at end of file
+version.code=9
+version.name=2.2.1
+version.date=26.04.17
\ No newline at end of file
diff --git a/src/application/Controller.java b/src/application/Controller.java
index 0e993018e99beebc2d89a0b0345182cb9f5897fb..e180317048f169735dba546e6c7c784530fdc409 100644
--- a/src/application/Controller.java
+++ b/src/application/Controller.java
@@ -96,17 +96,17 @@ public class Controller implements Initializable
public void chooseButton(ActionEvent e)
{
FileChooser chooser = new FileChooser();
- File prefDirectory = new File(System.getProperty("user.home") + "/Pictures/Screenshots/");
+ File prefDirectory = new File(System.getProperty("user.home") + "/Pictures/Screenshots/");
if(lastFolder != null)
{
chooser.setInitialDirectory(lastFolder);
}
- else
- {
+ else if(prefDirectory.exists())
+ {
chooser.setInitialDirectory(prefDirectory);
}
chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter("Image Files", "*.png", "*.jpg"));
- chooser.setTitle("Dateien ausw�hlen");
+ chooser.setTitle("Dateien auswählen");
List<File> choosenFiles = chooser.showOpenMultipleDialog(stage);
if(choosenFiles != null)
@@ -150,7 +150,7 @@ public class Controller implements Initializable
Alert alert = new Alert(AlertType.WARNING);
alert.setTitle("Warnung");
alert.setHeaderText("");
- alert.setContentText("Kein Speicherort ausgew�hlt!");
+ alert.setContentText("Kein Speicherort ausgewählt!");
alert.initOwner(stage);
Stage dialogStage = (Stage)alert.getDialogPane().getScene().getWindow();
dialogStage.getIcons().add(new Image(this.getClass().getResource("/application/crop.png").toString()));
@@ -161,12 +161,12 @@ public class Controller implements Initializable
public void setLabel()
{
- label.setText(files.size() + " Dateien ausgew�hlt");
+ label.setText(files.size() + " Dateien ausgewählt");
}
public void setLabelZero()
{
- label.setText("0 Dateien ausgew�hlt");
+ label.setText("0 Dateien ausgewählt");
}
public void clearList()
@@ -191,7 +191,7 @@ public class Controller implements Initializable
if(files.size() == 0)
{
- Label placeHolder = new Label("Keine Dateien ausgew�hlt");
+ Label placeHolder = new Label("Keine Dateien ausgewählt");
placeHolder.setStyle("-fx-font-size: 16;");
list.setPlaceholder(placeHolder);
}
@@ -239,7 +239,7 @@ public class Controller implements Initializable
loadSettings();
pane.setStyle("-fx-background-color: #FFFFFF;");
- label.setText("0 Dateien ausgew�hlt");
+ label.setText("0 Dateien ausgewählt");
progressLabel.setText("");
Image icon = new Image("/application/crop.png");
@@ -420,7 +420,7 @@ public class Controller implements Initializable
alert.setTitle("Warnung");
alert.setHeaderText("");
alert.getDialogPane().setPrefSize(350, 150);
- alert.setContentText("Bildausschnitt liegt au�erhalb des Bildes! \n\nX + Breite > Bildbreite \n" + Cropper.x + " + " + Cropper.width + " > " + result[1]);
+ alert.setContentText("Bildausschnitt liegt außerhalb des Bildes! \n\nX + Breite > Bildbreite \n" + Cropper.x + " + " + Cropper.width + " > " + result[1]);
alert.initOwner(stage);
alert.showAndWait();
}
@@ -430,7 +430,7 @@ public class Controller implements Initializable
alert.setTitle("Warnung");
alert.setHeaderText("");
alert.getDialogPane().setPrefSize(350, 150);
- alert.setContentText("Bildausschnitt liegt au�erhalb des Bildes! \n\nY + H�he > Bildh�he \n" + Cropper.y + " + " + Cropper.height + " > " + result[1]);
+ alert.setContentText("Bildausschnitt liegt außerhalb des Bildes! \n\nY + Höhe > Bildhöhe \n" + Cropper.y + " + " + Cropper.height + " > " + result[1]);
alert.initOwner(stage);
alert.showAndWait();
}
@@ -471,7 +471,7 @@ public class Controller implements Initializable
public void clearPreview()
{
previewPane.getChildren().remove(previewLabel);
- previewLabel = new Label("Bild in Liste anklicken f�r Vorschau");
+ previewLabel = new Label("Bild in Liste anklicken für Vorschau");
previewLabel.setPrefWidth(250);
previewLabel.setPrefHeight(190);
previewLabel.setAlignment(Pos.CENTER);
@@ -496,7 +496,7 @@ public class Controller implements Initializable
newStage.setMinHeight(250);
newStage.setMinWidth(250);
- newStage.setTitle("Bereich ausw�hlen");
+ newStage.setTitle("Bereich auswählen");
newStage.getIcons().add(new Image("/application/crop.png"));
@@ -521,7 +521,7 @@ public class Controller implements Initializable
Alert alert = new Alert(AlertType.WARNING);
alert.setTitle("Warnung");
alert.setHeaderText("");
- alert.setContentText("Kein Bild ausgew�hlt.\nBitte w�hle ein Bild aus der Liste.");
+ alert.setContentText("Kein Bild ausgewählt.\nBitte wähle ein Bild aus der Liste.");
alert.initOwner(stage);
Stage dialogStage = (Stage)alert.getDialogPane().getScene().getWindow();
dialogStage.getIcons().add(new Image(this.getClass().getResource("/application/crop.png").toString()));
@@ -551,12 +551,12 @@ public class Controller implements Initializable
}
else
{
- labelSavePath.setText("<Nicht ausgew�hlt>");
+ labelSavePath.setText("<Nicht ausgewählt>");
}
}
else
{
- labelSavePath.setText("<Nicht ausgew�hlt>");
+ labelSavePath.setText("<Nicht ausgewählt>");
}
}
else
@@ -567,7 +567,7 @@ public class Controller implements Initializable
labelHeight.setText("10");
Cropper.setValues(0, 0, 10, 10);
- labelSavePath.setText("<Nicht ausgew�hlt>");
+ labelSavePath.setText("<Nicht ausgewählt>");
}
}
@@ -595,7 +595,7 @@ public class Controller implements Initializable
public void about(ActionEvent e)
{
Alert alert = new Alert(AlertType.INFORMATION);
- alert.setTitle("�ber " + bundle.getString("app.name"));
+ alert.setTitle("Über " + bundle.getString("app.name"));
alert.setHeaderText(bundle.getString("app.name"));
alert.setContentText("Version: " + bundle.getString("version.name") + "\r\nDatum: " + bundle.getString("version.date") + "\r\nAutor: Robert Goldmann\r\n");
alert.initOwner(stage);
diff --git a/src/application/_de.properties b/src/application/_de.properties
index b0267086c8d6c4744c724a51254568b1797ba9a8..33980cb563a0baf12a518e92c39b6700a742a03f 100644
--- a/src/application/_de.properties
+++ b/src/application/_de.properties
@@ -1,4 +1,4 @@
app.name=CropShot
-version.code=8
-version.name=2.2.0
-version.date=08.07.15
\ No newline at end of file
+version.code=9
+version.name=2.2.1
+version.date=26.04.17
\ No newline at end of file