mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-18 18:51:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

new stage titles for addNewVault and addExistingVault

Browse Source
This commit is contained in:
Jan-Peter Klein
2023-08-23 13:36:41 +02:00
parent 820d4ff573
commit ef24141713
4 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultModule.java
View File

@@ -45,9 +45,8 @@ public abstract class AddVaultModule {
@Provides
@AddVaultWizardWindow
@AddVaultWizardScoped
static Stage provideStage(StageFactory factory, @PrimaryStage Stage primaryStage, ResourceBundle resourceBundle) {
static Stage provideStage(StageFactory factory, @PrimaryStage Stage primaryStage) {
Stage stage = factory.create();
stage.setTitle(resourceBundle.getString("addvaultwizard.title"));
stage.setResizable(false);
stage.initModality(Modality.WINDOW_MODAL);
stage.initOwner(primaryStage);

7
src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWizardComponent.java
View File

@@ -12,6 +12,7 @@ import org.cryptomator.ui.common.FxmlScene;
import javafx.scene.Scene;
import javafx.stage.Stage;
import java.util.ResourceBundle;
@AddVaultWizardScoped
@Subcomponent(modules = {AddVaultModule.class})
@@ -25,16 +26,18 @@ public interface AddVaultWizardComponent {
@FxmlScene(FxmlFile.ADDVAULT_EXISTING)
Lazy<Scene> sceneExisting();
default void showAddNewVaultWizard() {
default void showAddNewVaultWizard(ResourceBundle resourceBundle) {
Stage stage = window();
stage.setScene(sceneNew().get());
stage.setTitle(resourceBundle.getString("addvaultwizard.new.title"));
stage.sizeToScene();
stage.show();
}
default void showAddExistingVaultWizard() {
default void showAddExistingVaultWizard(ResourceBundle resourceBundle) {
Stage stage = window();
stage.setScene(sceneExisting().get());
stage.setTitle(resourceBundle.getString("addvaultwizard.existing.title"));
stage.sizeToScene();
stage.show();
}

16
src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java
View File

@@ -156,16 +156,16 @@ public class VaultListController implements FxController {
newIcon.setTextAlignment(TextAlignment.CENTER);
newIcon.setWrappingWidth(14);
MenuItem newVaultMenuItem = new MenuItem(resourceBundle.getString("addvaultwizard.welcome.newButton"), newIcon);
MenuItem newVaultMenuItem = new MenuItem(resourceBundle.getString("main.vaultlist.addVaultBtn.menuItemNew"), newIcon);
newVaultMenuItem.setOnAction(event -> didClickAddNewVault());
newVaultMenuItem.getStyleClass().add("add-vault-menu-item");
FontAwesome5IconView addIcon = new FontAwesome5IconView();
addIcon.setGlyph(FontAwesome5Icon.FOLDER_OPEN);
addIcon.setTextAlignment(TextAlignment.CENTER);
addIcon.setWrappingWidth(14);
FontAwesome5IconView existingIcon = new FontAwesome5IconView();
existingIcon.setGlyph(FontAwesome5Icon.FOLDER_OPEN);
existingIcon.setTextAlignment(TextAlignment.CENTER);
existingIcon.setWrappingWidth(14);
MenuItem existingVaultMenuItem = new MenuItem(resourceBundle.getString("addvaultwizard.welcome.existingButton"), addIcon);
MenuItem existingVaultMenuItem = new MenuItem(resourceBundle.getString("main.vaultlist.addVaultBtn.menuItemExisting"), existingIcon);
existingVaultMenuItem.setOnAction(event -> didClickAddExistingVault());
existingVaultMenuItem.getStyleClass().add("add-vault-menu-item");
@@ -198,12 +198,12 @@ public class VaultListController implements FxController {
@FXML
public void didClickAddNewVault() {
addVaultWizard.build().showAddNewVaultWizard();
addVaultWizard.build().showAddNewVaultWizard(resourceBundle);
}
@FXML
public void didClickAddExistingVault() {
addVaultWizard.build().showAddExistingVaultWizard();
addVaultWizard.build().showAddExistingVaultWizard(resourceBundle);
}
private void pressedShortcutToRemoveVault() {