From 1e18a1188624a282ab2232dd723dc168d07bed9b Mon Sep 17 00:00:00 2001 From: Tobias Hagemann Date: Thu, 29 Oct 2015 19:04:38 +0100 Subject: [PATCH] release 0.10.0 - fixes #92 - fixes #84 - improves #76 - improves #66 (fewer WebDAV requests needed for file creation) - might solve a few problems of #68 --- main/core/pom.xml | 2 +- main/crypto-aes/pom.xml | 2 +- main/crypto-api/pom.xml | 2 +- main/installer-debian/pom.xml | 2 +- main/installer-osx/pom.xml | 2 +- main/installer-win-portable/pom.xml | 2 +- main/installer-win/pom.xml | 2 +- main/pom.xml | 2 +- main/uber-jar/pom.xml | 2 +- main/ui/pom.xml | 2 +- .../org/cryptomator/ui/controllers/UnlockController.java | 6 ++++++ main/ui/src/main/resources/fxml/unlock.fxml | 2 +- 12 files changed, 17 insertions(+), 11 deletions(-) diff --git a/main/core/pom.xml b/main/core/pom.xml index 07aed583b..579732a69 100644 --- a/main/core/pom.xml +++ b/main/core/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 0.10.0-SNAPSHOT + 0.10.0 core Cryptomator WebDAV and I/O module diff --git a/main/crypto-aes/pom.xml b/main/crypto-aes/pom.xml index 9ec229603..fc7dd0958 100644 --- a/main/crypto-aes/pom.xml +++ b/main/crypto-aes/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 0.10.0-SNAPSHOT + 0.10.0 crypto-aes Cryptomator cryptographic module (AES) diff --git a/main/crypto-api/pom.xml b/main/crypto-api/pom.xml index 012e93272..7b5276c81 100644 --- a/main/crypto-api/pom.xml +++ b/main/crypto-api/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 0.10.0-SNAPSHOT + 0.10.0 crypto-api Cryptomator cryptographic module API diff --git a/main/installer-debian/pom.xml b/main/installer-debian/pom.xml index 4771812e9..005d79d67 100644 --- a/main/installer-debian/pom.xml +++ b/main/installer-debian/pom.xml @@ -3,7 +3,7 @@ org.cryptomator main - 0.10.0-SNAPSHOT + 0.10.0 installer-debian pom diff --git a/main/installer-osx/pom.xml b/main/installer-osx/pom.xml index 13dc44fb4..29830090a 100644 --- a/main/installer-osx/pom.xml +++ b/main/installer-osx/pom.xml @@ -3,7 +3,7 @@ org.cryptomator main - 0.10.0-SNAPSHOT + 0.10.0 installer-osx pom diff --git a/main/installer-win-portable/pom.xml b/main/installer-win-portable/pom.xml index ea1675b21..3afe132e4 100644 --- a/main/installer-win-portable/pom.xml +++ b/main/installer-win-portable/pom.xml @@ -3,7 +3,7 @@ org.cryptomator main - 0.10.0-SNAPSHOT + 0.10.0 installer-win-portable pom diff --git a/main/installer-win/pom.xml b/main/installer-win/pom.xml index c060a1393..1663dcc46 100644 --- a/main/installer-win/pom.xml +++ b/main/installer-win/pom.xml @@ -3,7 +3,7 @@ org.cryptomator main - 0.10.0-SNAPSHOT + 0.10.0 installer-win pom diff --git a/main/pom.xml b/main/pom.xml index f2838da7b..f3e4ca069 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -11,7 +11,7 @@ 4.0.0 org.cryptomator main - 0.10.0-SNAPSHOT + 0.10.0 pom Cryptomator diff --git a/main/uber-jar/pom.xml b/main/uber-jar/pom.xml index c40bcece4..be91464ac 100644 --- a/main/uber-jar/pom.xml +++ b/main/uber-jar/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 0.10.0-SNAPSHOT + 0.10.0 uber-jar pom diff --git a/main/ui/pom.xml b/main/ui/pom.xml index 3d6353dc1..57e1e20d0 100644 --- a/main/ui/pom.xml +++ b/main/ui/pom.xml @@ -12,7 +12,7 @@ org.cryptomator main - 0.10.0-SNAPSHOT + 0.10.0 ui Cryptomator GUI diff --git a/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java b/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java index 424a92695..ec66a12c8 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java @@ -29,6 +29,7 @@ import javafx.fxml.FXML; import javafx.scene.control.Button; import javafx.scene.control.ChoiceBox; import javafx.scene.control.Hyperlink; +import javafx.scene.control.Label; import javafx.scene.control.ProgressIndicator; import javafx.scene.control.TextField; import javafx.scene.input.KeyEvent; @@ -65,6 +66,9 @@ public class UnlockController extends AbstractFXMLViewController { @FXML private TextField mountName; + @FXML + private Label winDriveLetterLabel; + @FXML private ChoiceBox winDriveLetter; @@ -117,6 +121,8 @@ public class UnlockController extends AbstractFXMLViewController { if (SystemUtils.IS_OS_WINDOWS) { winDriveLetter.setConverter(new WinDriveLetterLabelConverter()); } else { + winDriveLetterLabel.setVisible(false); + winDriveLetterLabel.setManaged(false); winDriveLetter.setVisible(false); winDriveLetter.setManaged(false); } diff --git a/main/ui/src/main/resources/fxml/unlock.fxml b/main/ui/src/main/resources/fxml/unlock.fxml index a96d15b39..fdb489fa9 100644 --- a/main/ui/src/main/resources/fxml/unlock.fxml +++ b/main/ui/src/main/resources/fxml/unlock.fxml @@ -72,7 +72,7 @@ -