浏览代码

removed message below the input field and inserted in the invalid message

Jan-Peter Klein 1 年之前
父节点
当前提交
5f62f038d5

+ 4 - 5
src/main/resources/fxml/addvault_new_expert_settings.fxml

@@ -51,22 +51,21 @@
 				</Hyperlink>
 			</HBox>
 			<HBox>
-				<NumericTextField fx:id="shorteningThresholdTextField"/>
-				<Region prefWidth="4" HBox.hgrow="NEVER"/>
+				<NumericTextField fx:id="shorteningThresholdTextField" maxWidth="60"/>
+				<Region minWidth="4" prefWidth="4" HBox.hgrow="NEVER"/>
 				<StackPane>
-					<Label styleClass="label-muted" text="%addvaultwizard.new.expertSettings.shorteningThreshold.invalid" textAlignment="RIGHT" alignment="CENTER_RIGHT" visible="${!controller.validShorteningThreshold}" graphicTextGap="6">
+					<Label styleClass="label-muted" text="%addvaultwizard.new.expertSettings.shorteningThreshold.invalid" textAlignment="RIGHT" alignment="CENTER_RIGHT" visible="${!controller.validShorteningThreshold}" managed="${!controller.validShorteningThreshold}" graphicTextGap="6">
 						<graphic>
 							<FontAwesome5IconView styleClass="glyph-icon-red" glyph="TIMES"/>
 						</graphic>
 					</Label>
-					<Label styleClass="label-muted" text="%addvaultwizard.new.expertSettings.shorteningThreshold.valid" textAlignment="RIGHT" alignment="CENTER_RIGHT" visible="${controller.validShorteningThreshold}" graphicTextGap="6">
+					<Label styleClass="label-muted" text="%addvaultwizard.new.expertSettings.shorteningThreshold.valid" textAlignment="RIGHT" alignment="CENTER_RIGHT" visible="${controller.validShorteningThreshold}" managed="${controller.validShorteningThreshold}" graphicTextGap="6">
 						<graphic>
 							<FontAwesome5IconView styleClass="glyph-icon-primary" glyph="CHECK"/>
 						</graphic>
 					</Label>
 				</StackPane>
 			</HBox>
-			<Label styleClass="label-muted" text="%addvaultwizard.new.expertSettings.shorteningThreshold.message" visible="${!controller.validShorteningThreshold}"/>
 		</VBox>
 		<Region VBox.vgrow="ALWAYS"/>
 

+ 1 - 2
src/main/resources/i18n/strings.properties

@@ -54,8 +54,7 @@ addvaultwizard.new.directoryPickerLabel=Custom location
 addvaultwizard.new.directoryPickerButton=Choose…
 addvaultwizard.new.directoryPickerTitle=Select Directory
 addvaultwizard.new.expertSettings.enableExpertSettingsCheckbox=Enable expert settings
-addvaultwizard.new.expertSettings.shorteningThreshold.invalid=Invalid
-addvaultwizard.new.expertSettings.shorteningThreshold.message=Enter a value between 36 and 220 (default 220).
+addvaultwizard.new.expertSettings.shorteningThreshold.invalid=Enter a value between 36 and 220 (default 220)
 addvaultwizard.new.expertSettings.shorteningThreshold.tooltip=Open the documentation to learn more.
 addvaultwizard.new.expertSettings.shorteningThreshold.title=Maximum length of encrypted file names
 addvaultwizard.new.expertSettings.shorteningThreshold.valid=Valid