|
@@ -1,23 +1,17 @@
|
|
|
package org.cryptomator.ui.addvaultwizard;
|
|
|
|
|
|
import dagger.Binds;
|
|
|
-import dagger.Lazy;
|
|
|
import dagger.Module;
|
|
|
import dagger.Provides;
|
|
|
import dagger.multibindings.IntoMap;
|
|
|
-import dagger.multibindings.IntoSet;
|
|
|
import javafx.beans.property.ObjectProperty;
|
|
|
import javafx.beans.property.SimpleObjectProperty;
|
|
|
import javafx.beans.property.SimpleStringProperty;
|
|
|
import javafx.beans.property.StringProperty;
|
|
|
import javafx.scene.Scene;
|
|
|
import javafx.scene.image.Image;
|
|
|
-import javafx.scene.input.KeyCode;
|
|
|
-import javafx.scene.input.KeyCodeCombination;
|
|
|
-import javafx.scene.input.KeyCombination;
|
|
|
import javafx.stage.Modality;
|
|
|
import javafx.stage.Stage;
|
|
|
-import org.apache.commons.lang3.SystemUtils;
|
|
|
import org.cryptomator.common.vaults.Vault;
|
|
|
import org.cryptomator.ui.common.DefaultSceneFactory;
|
|
|
import org.cryptomator.ui.common.FXMLLoaderFactory;
|
|
@@ -33,7 +27,6 @@ import java.nio.file.Path;
|
|
|
import java.util.Map;
|
|
|
import java.util.Optional;
|
|
|
import java.util.ResourceBundle;
|
|
|
-import java.util.Set;
|
|
|
|
|
|
@Module
|
|
|
public abstract class AddVaultModule {
|
|
@@ -91,49 +84,49 @@ public abstract class AddVaultModule {
|
|
|
@FxmlScene(FxmlFile.ADDVAULT_WELCOME)
|
|
|
@AddVaultWizardScoped
|
|
|
static Scene provideWelcomeScene(@AddVaultWizardWindow FXMLLoaderFactory fxmlLoaders) {
|
|
|
- return fxmlLoaders.createScene("/fxml/addvault_welcome.fxml");
|
|
|
+ return fxmlLoaders.createScene(FxmlFile.ADDVAULT_WELCOME.getRessourcePathString());
|
|
|
}
|
|
|
|
|
|
@Provides
|
|
|
@FxmlScene(FxmlFile.ADDVAULT_EXISTING)
|
|
|
@AddVaultWizardScoped
|
|
|
static Scene provideChooseExistingVaultScene(@AddVaultWizardWindow FXMLLoaderFactory fxmlLoaders) {
|
|
|
- return fxmlLoaders.createScene("/fxml/addvault_existing.fxml");
|
|
|
+ return fxmlLoaders.createScene(FxmlFile.ADDVAULT_EXISTING.getRessourcePathString());
|
|
|
}
|
|
|
|
|
|
@Provides
|
|
|
@FxmlScene(FxmlFile.ADDVAULT_NEW_NAME)
|
|
|
@AddVaultWizardScoped
|
|
|
static Scene provideCreateNewVaultNameScene(@AddVaultWizardWindow FXMLLoaderFactory fxmlLoaders) {
|
|
|
- return fxmlLoaders.createScene("/fxml/addvault_new_name.fxml");
|
|
|
+ return fxmlLoaders.createScene(FxmlFile.ADDVAULT_NEW_NAME.getRessourcePathString());
|
|
|
}
|
|
|
|
|
|
@Provides
|
|
|
@FxmlScene(FxmlFile.ADDVAULT_NEW_LOCATION)
|
|
|
@AddVaultWizardScoped
|
|
|
static Scene provideCreateNewVaultLocationScene(@AddVaultWizardWindow FXMLLoaderFactory fxmlLoaders) {
|
|
|
- return fxmlLoaders.createScene("/fxml/addvault_new_location.fxml");
|
|
|
+ return fxmlLoaders.createScene(FxmlFile.ADDVAULT_NEW_LOCATION.getRessourcePathString());
|
|
|
}
|
|
|
|
|
|
@Provides
|
|
|
@FxmlScene(FxmlFile.ADDVAULT_NEW_PASSWORD)
|
|
|
@AddVaultWizardScoped
|
|
|
static Scene provideCreateNewVaultPasswordScene(@AddVaultWizardWindow FXMLLoaderFactory fxmlLoaders) {
|
|
|
- return fxmlLoaders.createScene("/fxml/addvault_new_password.fxml");
|
|
|
+ return fxmlLoaders.createScene(FxmlFile.ADDVAULT_NEW_PASSWORD.getRessourcePathString());
|
|
|
}
|
|
|
|
|
|
@Provides
|
|
|
@FxmlScene(FxmlFile.ADDVAULT_NEW_RECOVERYKEY)
|
|
|
@AddVaultWizardScoped
|
|
|
static Scene provideCreateNewVaultRecoveryKeyScene(@AddVaultWizardWindow FXMLLoaderFactory fxmlLoaders) {
|
|
|
- return fxmlLoaders.createScene("/fxml/addvault_new_recoverykey.fxml");
|
|
|
+ return fxmlLoaders.createScene(FxmlFile.ADDVAULT_NEW_RECOVERYKEY.getRessourcePathString());
|
|
|
}
|
|
|
|
|
|
@Provides
|
|
|
@FxmlScene(FxmlFile.ADDVAULT_SUCCESS)
|
|
|
@AddVaultWizardScoped
|
|
|
static Scene provideCreateNewVaultSuccessScene(@AddVaultWizardWindow FXMLLoaderFactory fxmlLoaders) {
|
|
|
- return fxmlLoaders.createScene("/fxml/addvault_success.fxml");
|
|
|
+ return fxmlLoaders.createScene(FxmlFile.ADDVAULT_SUCCESS.getRessourcePathString());
|
|
|
}
|
|
|
|
|
|
// ------------------
|