Browse Source

Show errors in GUI during vault creation

Sebastian Stenzel 5 years ago
parent
commit
3f2f368dca

File diff suppressed because it is too large
+ 8 - 4
main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultLocationController.java


File diff suppressed because it is too large
+ 20 - 10
main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java


+ 0 - 1
main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordController.java

@@ -71,7 +71,6 @@ public class ChangePasswordController implements FxController {
 		} catch (IOException e) {
 			// TODO show generic error screen
 			LOG.error("IO error occured during password change. Unable to perform operation.", e);
-			e.printStackTrace();
 		} catch (InvalidPassphraseException e) {
 			Animations.createShakeWindowAnimation(window).play();
 			oldPasswordField.selectAll();

+ 1 - 4
main/ui/src/main/resources/fxml/addvault_generic_error.fxml

@@ -3,7 +3,6 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ButtonBar?>
-<?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.VBox?>
 <VBox xmlns="http://javafx.com/javafx"
 	  xmlns:fx="http://javafx.com/fxml"
@@ -16,9 +15,7 @@
 		<Insets topRightBottomLeft="24"/>
 	</padding>
 	<children>
-		<fx:include source="/fxml/stacktrace.fxml"/>
-		
-		<Region VBox.vgrow="ALWAYS"/>
+		<fx:include source="/fxml/stacktrace.fxml" VBox.vgrow="ALWAYS"/>
 
 		<ButtonBar buttonMinWidth="120" buttonOrder="B+C">
 			<buttons>

+ 2 - 2
main/ui/src/main/resources/fxml/stacktrace.fxml

@@ -13,7 +13,7 @@
 	  minWidth="300"
 	  spacing="12">
 	<children>
-		<HBox spacing="12" VBox.vgrow="ALWAYS">
+		<HBox spacing="12" VBox.vgrow="NEVER">
 			<StackPane alignment="CENTER" HBox.hgrow="NEVER">
 				<Circle styleClass="glyph-icon-primary" radius="24"/>
 				<FontAwesome5IconView styleClass="glyph-icon-white" glyph="EXCLAMATION" glyphSize="24"/>
@@ -24,6 +24,6 @@
 			</VBox>
 		</HBox>
 
-		<TextArea text="${controller.stackTrace}" prefRowCount="5" editable="false"/>
+		<TextArea VBox.vgrow="ALWAYS" text="${controller.stackTrace}" prefRowCount="5" editable="false"/>
 	</children>
 </VBox>