Magic-Mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2024-11-27 05:50:26 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

fixed focus traversing ("tab order") of form fields

Browse Source
This commit is contained in:
Sebastian Stenzel 2014-12-06 16:31:24 +01:00
parent 8abd5ebc01
commit ebb3207854
2 changed files with 21 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
main/ui/src/main/java/org/cryptomator/ui/MainController.java
View File

@ -154,10 +154,8 @@ public class MainController implements Initializable {
private void showUsernameField() {
messageLabel.setText(rb.getString("main.messageLabel.initVaultMessage"));
if (rootPane.getChildren().contains(usernameBox)) {
rootPane.getChildren().remove(usernameBox);
rootPane.getChildren().add(usernameField);
}
usernameBox.setVisible(false);
usernameField.setVisible(true);
Platform.runLater(usernameField::requestFocus);
}
@ -184,10 +182,8 @@ public class MainController implements Initializable {
private void showUsernameBox(Iterator<Path> foundMasterKeys) {
messageLabel.setText(rb.getString("main.messageLabel.openVaultMessage"));
if (rootPane.getChildren().contains(usernameField)) {
rootPane.getChildren().remove(usernameField);
rootPane.getChildren().add(usernameBox);
}
usernameField.setVisible(false);
usernameBox.setVisible(true);
// update usernameBox options:
usernameBox.getItems().clear();
@ -245,10 +241,8 @@ public class MainController implements Initializable {
// ****************************************
private void showInitializeButton() {
if (rootPane.getChildren().contains(openButton)) {
rootPane.getChildren().remove(openButton);
rootPane.getChildren().add(initializeButton);
}
openButton.setVisible(false);
initializeButton.setVisible(true);
}
@FXML
@ -293,10 +287,8 @@ public class MainController implements Initializable {
// ****************************************
private void showOpenButton() {
if (rootPane.getChildren().contains(initializeButton)) {
rootPane.getChildren().remove(initializeButton);
rootPane.getChildren().add(openButton);
}
initializeButton.setVisible(false);
openButton.setVisible(true);
}
@FXML

35
main/ui/src/main/resources/main.fxml
View File

@ -1,12 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2014 Sebastian Stenzel
This file is licensed under the terms of the MIT license.
See the LICENSE.txt file for more info.
Contributors:
Sebastian Stenzel - initial API and implementation
-->
<!-- Copyright (c) 2014 Sebastian Stenzel This file is licensed under the terms of the MIT license. See the LICENSE.txt file for more info. Contributors: Sebastian Stenzel - initial API and implementation -->
<?import java.net.*?>
<?import javafx.geometry.*?>
<?import javafx.scene.control.*?>
@ -27,20 +20,6 @@
<Insets top="12.0" right="12.0" bottom="12.0" left="12.0" />
</padding>
<fx:define>
<ComboBox fx:id="usernameBox" GridPane.rowIndex="2" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.hgrow="ALWAYS" maxWidth="Infinity" promptText="$access.label.username" disable="true" focusTraversable="false" />
<SplitMenuButton fx:id="openButton" GridPane.rowIndex="4" GridPane.columnIndex="0" GridPane.columnSpan="3" prefWidth="120.0" GridPane.halignment="CENTER" text="%main.primaryButton.openVault" onAction="#openVault">
<styleClass>
<String fx:value="green" />
</styleClass>
<items>
<MenuItem text="Add User" />
<MenuItem text="Change Password" />
</items>
</SplitMenuButton>
</fx:define>
<columnConstraints>
<ColumnConstraints minWidth="100" />
<ColumnConstraints minWidth="200" />
@ -59,6 +38,8 @@
<!-- Row 2 -->
<Label GridPane.rowIndex="2" GridPane.columnIndex="0" text="%main.label.username" GridPane.halignment="RIGHT" />
<TextField fx:id="usernameField" GridPane.rowIndex="2" GridPane.columnIndex="1" GridPane.columnSpan="2" disable="true" />
<ComboBox fx:id="usernameBox" visible="false" GridPane.rowIndex="2" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.hgrow="ALWAYS" maxWidth="Infinity" promptText="$access.label.username" disable="true" />
<!-- Row 3 -->
<Label GridPane.rowIndex="3" GridPane.columnIndex="0" text="%main.label.password" GridPane.halignment="RIGHT" />
@ -71,6 +52,16 @@
<String fx:value="green" />
</styleClass>
</Button>
<SplitMenuButton fx:id="openButton" visible="false" GridPane.rowIndex="4" GridPane.columnIndex="0" GridPane.columnSpan="3" prefWidth="120.0" GridPane.halignment="CENTER" text="%main.primaryButton.openVault"
onAction="#openVault" focusTraversable="false">
<styleClass>
<String fx:value="green" />
</styleClass>
<items>
<MenuItem text="Add User" />
<MenuItem text="Change Password" />
</items>
</SplitMenuButton>
</children>
</GridPane>