瀏覽代碼

refined migration not possible dialogue

Armin Schrenk 5 年之前
父節點
當前提交
808223d58e

+ 10 - 8
main/ui/src/main/resources/fxml/migration_impossible.fxml

@@ -4,6 +4,7 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ButtonBar?>
+<?import javafx.scene.control.Hyperlink?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.StackPane?>
@@ -12,8 +13,6 @@
 <?import javafx.scene.text.Text?>
 <?import javafx.scene.text.TextFlow?>
 <?import org.cryptomator.ui.controls.FontAwesome5IconView?>
-
-<?import javafx.scene.control.Hyperlink?>
 <VBox xmlns="http://javafx.com/javafx"
 	  xmlns:fx="http://javafx.com/fxml"
 	  fx:controller="org.cryptomator.ui.migration.MigrationImpossibleController"
@@ -27,15 +26,18 @@
 
 	<HBox spacing="12" alignment="CENTER_LEFT" VBox.vgrow="ALWAYS">
 		<StackPane alignment="CENTER" HBox.hgrow="NEVER">
-			<Circle styleClass="glyph-icon-primary" radius="24"/>
+			<Circle styleClass="glyph-icon-red" radius="24"/>
 			<FontAwesome5IconView styleClass="glyph-icon-white" glyph="TIMES" glyphSize="24"/>
 		</StackPane>
-		<TextFlow>
+		<VBox spacing="12">
+			<Label styleClass="label-large" text="%migration.impossible.heading"/>
 			<Label text="%migration.impossible.reason" wrapText="true" HBox.hgrow="ALWAYS"/>
-			<Text text="%migration.impossible.nextStepsInstructions" wrappingWidth="382" HBox.hgrow="ALWAYS"/>
-			<Text  text="%migration.impossible.moreInfo"/>
-			<Hyperlink text="${controller.helpUri}" onAction="#getMigrationHelp"/>
-		</TextFlow>
+			<Label text="%migration.impossible.nextStepsInstructions" wrapText="true" HBox.hgrow="ALWAYS"/>
+			<TextFlow>
+				<Text text="%migration.impossible.moreInfo"/>
+				<Hyperlink text="${controller.helpUri}" onAction="#getMigrationHelp"/>
+			</TextFlow>
+		</VBox>
 	</HBox>
 
 	<VBox alignment="BOTTOM_CENTER" VBox.vgrow="ALWAYS">

+ 3 - 2
main/ui/src/main/resources/i18n/strings.properties

@@ -119,8 +119,9 @@ migration.error.missingFileSystemCapabilities.reason.LONG_PATHS=The file system
 migration.error.missingFileSystemCapabilities.reason.READ_ACCESS=The file system does not allow to be read.
 migration.error.missingFileSystemCapabilities.reason.WRITE_ACCESS=The file system does not allow to be written to.
 ## Impossible
-migration.impossible.reason=Cryptomator cannot automatically migrate this vault because the storage location or its access point are not fully-compatible with the newer vault version.
-migration.impossible.nextStepsInstructions=To use this vault with the current version, you either need to move the vault to a different, fully supported location or need to manually create a new vault and copy all files to it.
+migration.impossible.heading=Unable to migrate vault
+migration.impossible.reason=The vault cannot automatically migrated because its storage location or access point is not compatible.
+migration.impossible.nextStepsInstructions=To use this vault with the current version, you either need to move the vault to a fully supported location or need to manually create a new vault and copy all files to it.
 migration.impossible.moreInfo=For more information, please visit:
 
 # Preferences