{
private final Parent node;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java
index d1aecb19f..0533cf50f 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java
@@ -1,13 +1,6 @@
package org.cryptomator.ui.mainwindow;
import com.tobiasdiez.easybind.EasyBind;
-import javafx.beans.binding.Bindings;
-import javafx.beans.binding.BooleanBinding;
-import javafx.beans.property.ObjectProperty;
-import javafx.collections.ListChangeListener;
-import javafx.collections.ObservableList;
-import javafx.fxml.FXML;
-import javafx.scene.control.ListView;
import org.cryptomator.common.vaults.Vault;
import org.cryptomator.common.vaults.VaultListManager;
import org.cryptomator.ui.addvaultwizard.AddVaultWizardComponent;
@@ -17,6 +10,13 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.inject.Inject;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.BooleanBinding;
+import javafx.beans.property.ObjectProperty;
+import javafx.collections.ListChangeListener;
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
+import javafx.scene.control.ListView;
@MainWindowScoped
public class VaultListController implements FxController {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/WelcomeController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/WelcomeController.java
index 95a65f6ac..34e5af125 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/WelcomeController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/WelcomeController.java
@@ -1,20 +1,20 @@
package org.cryptomator.ui.mainwindow;
-import javafx.application.Application;
-import javafx.beans.binding.Bindings;
-import javafx.beans.binding.BooleanBinding;
-import javafx.collections.ObservableList;
-import javafx.fxml.FXML;
import org.cryptomator.common.vaults.Vault;
import org.cryptomator.ui.common.FxController;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.inject.Inject;
+import javafx.application.Application;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.BooleanBinding;
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
@MainWindowScoped
public class WelcomeController implements FxController {
-
+
private static final Logger LOG = LoggerFactory.getLogger(WelcomeController.class);
private static final String GETTING_STARTED_URI = "https://docs.cryptomator.org/en/1.5/desktop/getting-started/";
@@ -42,5 +42,5 @@ public class WelcomeController implements FxController {
public boolean isNoVaultPresent() {
return noVaultPresent.get();
}
-
+
}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationCapabilityErrorController.java b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationCapabilityErrorController.java
index e6c31b7a0..a65c9ebb3 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationCapabilityErrorController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationCapabilityErrorController.java
@@ -1,13 +1,6 @@
package org.cryptomator.ui.migration;
import dagger.Lazy;
-import javafx.beans.binding.Bindings;
-import javafx.beans.binding.StringBinding;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.ReadOnlyObjectProperty;
-import javafx.fxml.FXML;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
import org.cryptomator.cryptofs.common.FileSystemCapabilityChecker;
import org.cryptomator.ui.common.FxController;
import org.cryptomator.ui.common.FxmlFile;
@@ -15,6 +8,13 @@ import org.cryptomator.ui.common.FxmlScene;
import javax.inject.Inject;
import javax.inject.Named;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.StringBinding;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.ReadOnlyObjectProperty;
+import javafx.fxml.FXML;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
import java.util.ResourceBundle;
@MigrationScoped
diff --git a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationComponent.java b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationComponent.java
index 98507a2f9..831955ece 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationComponent.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationComponent.java
@@ -3,12 +3,13 @@ package org.cryptomator.ui.migration;
import dagger.BindsInstance;
import dagger.Lazy;
import dagger.Subcomponent;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
import org.cryptomator.common.vaults.Vault;
import org.cryptomator.ui.common.FxmlFile;
import org.cryptomator.ui.common.FxmlScene;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+
@MigrationScoped
@Subcomponent(modules = {MigrationModule.class})
public interface MigrationComponent {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationImpossibleController.java b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationImpossibleController.java
index 76d462113..191fc7a8f 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationImpossibleController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationImpossibleController.java
@@ -1,12 +1,12 @@
package org.cryptomator.ui.migration;
-import javafx.fxml.FXML;
-import javafx.stage.Stage;
import org.cryptomator.common.vaults.Vault;
import org.cryptomator.ui.common.FxController;
import org.cryptomator.ui.fxapp.FxApplication;
import javax.inject.Inject;
+import javafx.fxml.FXML;
+import javafx.stage.Stage;
public class MigrationImpossibleController implements FxController {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationModule.java b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationModule.java
index 79803f861..9f41b497e 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationModule.java
@@ -4,12 +4,6 @@ import dagger.Binds;
import dagger.Module;
import dagger.Provides;
import dagger.multibindings.IntoMap;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.scene.Scene;
-import javafx.scene.image.Image;
-import javafx.stage.Modality;
-import javafx.stage.Stage;
import org.cryptomator.cryptofs.common.FileSystemCapabilityChecker;
import org.cryptomator.ui.common.DefaultSceneFactory;
import org.cryptomator.ui.common.FXMLLoaderFactory;
@@ -22,7 +16,11 @@ import org.cryptomator.ui.mainwindow.MainWindow;
import javax.inject.Named;
import javax.inject.Provider;
-import java.util.List;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.scene.Scene;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
import java.util.Map;
import java.util.ResourceBundle;
@@ -47,7 +45,7 @@ abstract class MigrationModule {
stage.initOwner(owner);
return stage;
}
-
+
@Provides
@Named("capabilityErrorCause")
@MigrationScoped
diff --git a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationRunController.java b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationRunController.java
index 5233d979b..2bf4f49a1 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationRunController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationRunController.java
@@ -1,19 +1,6 @@
package org.cryptomator.ui.migration;
import dagger.Lazy;
-import javafx.application.Platform;
-import javafx.beans.binding.Bindings;
-import javafx.beans.binding.ObjectBinding;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.DoubleProperty;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.ReadOnlyDoubleProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleDoubleProperty;
-import javafx.fxml.FXML;
-import javafx.scene.Scene;
-import javafx.scene.control.ContentDisplay;
-import javafx.stage.Stage;
import org.cryptomator.common.vaults.Vault;
import org.cryptomator.common.vaults.VaultState;
import org.cryptomator.cryptofs.FileNameTooLongException;
@@ -36,6 +23,19 @@ import org.slf4j.LoggerFactory;
import javax.inject.Inject;
import javax.inject.Named;
+import javafx.application.Platform;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.ObjectBinding;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.DoubleProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.ReadOnlyDoubleProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleDoubleProperty;
+import javafx.fxml.FXML;
+import javafx.scene.Scene;
+import javafx.scene.control.ContentDisplay;
+import javafx.stage.Stage;
import java.util.Arrays;
import java.util.Optional;
import java.util.concurrent.ExecutorService;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationStartController.java b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationStartController.java
index 260b43823..27ad96d26 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationStartController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationStartController.java
@@ -1,15 +1,15 @@
package org.cryptomator.ui.migration;
import dagger.Lazy;
-import javafx.fxml.FXML;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
import org.cryptomator.common.vaults.Vault;
import org.cryptomator.ui.common.FxController;
import org.cryptomator.ui.common.FxmlFile;
import org.cryptomator.ui.common.FxmlScene;
import javax.inject.Inject;
+import javafx.fxml.FXML;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
@MigrationScoped
public class MigrationStartController implements FxController {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationSuccessController.java b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationSuccessController.java
index e0135f8b9..1a5de5647 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationSuccessController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationSuccessController.java
@@ -1,13 +1,13 @@
package org.cryptomator.ui.migration;
-import javafx.fxml.FXML;
-import javafx.stage.Stage;
import org.cryptomator.common.vaults.Vault;
import org.cryptomator.ui.common.FxController;
import org.cryptomator.ui.fxapp.FxApplication;
import org.cryptomator.ui.mainwindow.MainWindow;
import javax.inject.Inject;
+import javafx.fxml.FXML;
+import javafx.stage.Stage;
import java.util.Optional;
@MigrationScoped
diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartStrategy.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartStrategy.java
index 99b21b4cd..64ad27abc 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartStrategy.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartStrategy.java
@@ -19,6 +19,6 @@ public interface AutoStartStrategy {
public TogglingAutoStartFailedException(String message, Throwable cause) {
super(message, cause);
}
-
+
}
}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/DonationKeyPreferencesController.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/DonationKeyPreferencesController.java
index 21a2d3d9a..e7708af81 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/DonationKeyPreferencesController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/DonationKeyPreferencesController.java
@@ -1,15 +1,15 @@
package org.cryptomator.ui.preferences;
-import javafx.application.Application;
-import javafx.beans.value.ObservableValue;
-import javafx.fxml.FXML;
-import javafx.scene.control.TextArea;
import org.cryptomator.common.LicenseHolder;
import org.cryptomator.common.settings.Settings;
import org.cryptomator.common.settings.UiTheme;
import org.cryptomator.ui.common.FxController;
import javax.inject.Inject;
+import javafx.application.Application;
+import javafx.beans.value.ObservableValue;
+import javafx.fxml.FXML;
+import javafx.scene.control.TextArea;
@PreferencesScoped
public class DonationKeyPreferencesController implements FxController {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
index 0cdfd4a5a..4e4abfbc9 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
@@ -1,18 +1,5 @@
package org.cryptomator.ui.preferences;
-import javafx.application.Application;
-import javafx.application.Platform;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.value.ObservableValue;
-import javafx.concurrent.Task;
-import javafx.fxml.FXML;
-import javafx.geometry.NodeOrientation;
-import javafx.scene.control.CheckBox;
-import javafx.scene.control.ChoiceBox;
-import javafx.scene.control.RadioButton;
-import javafx.scene.control.Toggle;
-import javafx.scene.control.ToggleGroup;
-import javafx.util.StringConverter;
import org.apache.commons.lang3.SystemUtils;
import org.cryptomator.common.Environment;
import org.cryptomator.common.LicenseHolder;
@@ -27,6 +14,20 @@ import org.slf4j.LoggerFactory;
import javax.inject.Inject;
import javax.inject.Named;
+import javafx.application.Application;
+import javafx.application.Platform;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.value.ObservableValue;
+import javafx.concurrent.Task;
+import javafx.fxml.FXML;
+import javafx.geometry.NodeOrientation;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.ChoiceBox;
+import javafx.scene.control.RadioButton;
+import javafx.scene.control.Toggle;
+import javafx.scene.control.ToggleGroup;
+import javafx.util.StringConverter;
+
import java.util.Arrays;
import java.util.EnumSet;
import java.util.Optional;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesComponent.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesComponent.java
index 320b8c63f..8dcb11fd8 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesComponent.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesComponent.java
@@ -7,11 +7,12 @@ package org.cryptomator.ui.preferences;
import dagger.Lazy;
import dagger.Subcomponent;
+import org.cryptomator.ui.common.FxmlFile;
+import org.cryptomator.ui.common.FxmlScene;
+
import javafx.beans.property.ObjectProperty;
import javafx.scene.Scene;
import javafx.stage.Stage;
-import org.cryptomator.ui.common.FxmlFile;
-import org.cryptomator.ui.common.FxmlScene;
@PreferencesScoped
@Subcomponent(modules = {PreferencesModule.class})
diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesController.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesController.java
index 2b58eda30..64d5c991b 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesController.java
@@ -1,5 +1,11 @@
package org.cryptomator.ui.preferences;
+import org.cryptomator.ui.common.FxController;
+import org.cryptomator.ui.fxapp.UpdateChecker;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
import javafx.beans.binding.BooleanBinding;
import javafx.beans.property.ObjectProperty;
import javafx.fxml.FXML;
@@ -7,12 +13,6 @@ import javafx.scene.control.Tab;
import javafx.scene.control.TabPane;
import javafx.stage.Stage;
import javafx.stage.WindowEvent;
-import org.cryptomator.ui.common.FxController;
-import org.cryptomator.ui.fxapp.UpdateChecker;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.inject.Inject;
@PreferencesScoped
public class PreferencesController implements FxController {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesModule.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesModule.java
index 7a9dc2027..2558582fd 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesModule.java
@@ -4,11 +4,6 @@ import dagger.Binds;
import dagger.Module;
import dagger.Provides;
import dagger.multibindings.IntoMap;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.scene.Scene;
-import javafx.scene.image.Image;
-import javafx.stage.Stage;
import org.cryptomator.ui.common.DefaultSceneFactory;
import org.cryptomator.ui.common.FXMLLoaderFactory;
import org.cryptomator.ui.common.FxController;
@@ -17,9 +12,11 @@ import org.cryptomator.ui.common.FxmlFile;
import org.cryptomator.ui.common.FxmlScene;
import org.cryptomator.ui.common.StageFactory;
-import javax.inject.Named;
import javax.inject.Provider;
-import java.util.List;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
import java.util.Map;
import java.util.ResourceBundle;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/UpdatesPreferencesController.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/UpdatesPreferencesController.java
index 60edc4f12..bb0f43edd 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/UpdatesPreferencesController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/UpdatesPreferencesController.java
@@ -1,5 +1,10 @@
package org.cryptomator.ui.preferences;
+import org.cryptomator.common.settings.Settings;
+import org.cryptomator.ui.common.FxController;
+import org.cryptomator.ui.fxapp.UpdateChecker;
+
+import javax.inject.Inject;
import javafx.application.Application;
import javafx.beans.binding.Bindings;
import javafx.beans.binding.BooleanBinding;
@@ -8,17 +13,12 @@ import javafx.beans.property.ReadOnlyStringProperty;
import javafx.fxml.FXML;
import javafx.scene.control.CheckBox;
import javafx.scene.control.ContentDisplay;
-import org.cryptomator.common.settings.Settings;
-import org.cryptomator.ui.common.FxController;
-import org.cryptomator.ui.fxapp.UpdateChecker;
-
-import javax.inject.Inject;
@PreferencesScoped
public class UpdatesPreferencesController implements FxController {
private static final String DOWNLOADS_URI = "https://cryptomator.org/downloads";
-
+
private final Application application;
private final Settings settings;
private final UpdateChecker updateChecker;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java
index 5faf5b694..4af86dc85 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java
@@ -1,12 +1,5 @@
package org.cryptomator.ui.preferences;
-import javafx.beans.binding.Bindings;
-import javafx.beans.binding.BooleanBinding;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.scene.control.Button;
-import javafx.scene.control.ChoiceBox;
-import javafx.scene.control.TextField;
-import javafx.util.StringConverter;
import org.apache.commons.lang3.SystemUtils;
import org.cryptomator.common.settings.Settings;
import org.cryptomator.common.settings.VolumeImpl;
@@ -15,6 +8,13 @@ import org.cryptomator.common.vaults.Volume;
import org.cryptomator.ui.common.FxController;
import javax.inject.Inject;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.BooleanBinding;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.scene.control.Button;
+import javafx.scene.control.ChoiceBox;
+import javafx.scene.control.TextField;
+import javafx.util.StringConverter;
/**
* TODO: if WebDAV is selected under Windows, show warning that specific mount options (like selecting a directory as mount point) are _not_ supported
diff --git a/main/ui/src/main/java/org/cryptomator/ui/quit/QuitComponent.java b/main/ui/src/main/java/org/cryptomator/ui/quit/QuitComponent.java
index 0b8f9a729..23ddf311a 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/quit/QuitComponent.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/quit/QuitComponent.java
@@ -8,11 +8,11 @@ package org.cryptomator.ui.quit;
import dagger.BindsInstance;
import dagger.Lazy;
import dagger.Subcomponent;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
import org.cryptomator.ui.common.FxmlFile;
import org.cryptomator.ui.common.FxmlScene;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
import java.awt.desktop.QuitResponse;
@QuitScoped
diff --git a/main/ui/src/main/java/org/cryptomator/ui/quit/QuitController.java b/main/ui/src/main/java/org/cryptomator/ui/quit/QuitController.java
index 7255115ea..130556ef2 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/quit/QuitController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/quit/QuitController.java
@@ -1,11 +1,5 @@
package org.cryptomator.ui.quit;
-import javafx.collections.ObservableList;
-import javafx.concurrent.Task;
-import javafx.fxml.FXML;
-import javafx.scene.control.Button;
-import javafx.scene.control.ContentDisplay;
-import javafx.stage.Stage;
import org.cryptomator.common.vaults.Vault;
import org.cryptomator.ui.common.FxController;
import org.cryptomator.ui.common.VaultService;
@@ -13,6 +7,12 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.inject.Inject;
+import javafx.collections.ObservableList;
+import javafx.concurrent.Task;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.ContentDisplay;
+import javafx.stage.Stage;
import java.awt.desktop.QuitResponse;
import java.util.Collection;
import java.util.concurrent.ExecutorService;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/quit/QuitModule.java b/main/ui/src/main/java/org/cryptomator/ui/quit/QuitModule.java
index d79cabfcb..e73fa9d46 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/quit/QuitModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/quit/QuitModule.java
@@ -4,13 +4,6 @@ import dagger.Binds;
import dagger.Module;
import dagger.Provides;
import dagger.multibindings.IntoMap;
-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.cryptomator.ui.common.DefaultSceneFactory;
import org.cryptomator.ui.common.FXMLLoaderFactory;
import org.cryptomator.ui.common.FxController;
@@ -19,9 +12,10 @@ import org.cryptomator.ui.common.FxmlFile;
import org.cryptomator.ui.common.FxmlScene;
import org.cryptomator.ui.common.StageFactory;
-import javax.inject.Named;
import javax.inject.Provider;
-import java.util.List;
+import javafx.scene.Scene;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
import java.util.Map;
import java.util.ResourceBundle;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/AutoCompleter.java b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/AutoCompleter.java
index 4ca6d58ce..5c747261b 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/AutoCompleter.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/AutoCompleter.java
@@ -37,10 +37,10 @@ public class AutoCompleter {
/**
* Find the index of the first word in {@link #dictionary} that starts with a given prefix.
- *
+ *
* This method performs an "unsuccessful" binary search (it doesn't return when encountering an exact match).
* Instead it continues searching in the left half (which includes the exact match) until only one element is left.
- *
+ *
* If the dictionary doesn't contain a word "left" of the given prefix, this method returns an invalid index, though.
*
* @param begin Index of first element (inclusive)
diff --git a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyComponent.java b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyComponent.java
index b9ab0fe37..cfec43e3e 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyComponent.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyComponent.java
@@ -3,15 +3,13 @@ package org.cryptomator.ui.recoverykey;
import dagger.BindsInstance;
import dagger.Lazy;
import dagger.Subcomponent;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
import org.cryptomator.common.vaults.Vault;
import org.cryptomator.ui.common.FxmlFile;
import org.cryptomator.ui.common.FxmlScene;
-import javax.annotation.Nullable;
import javax.inject.Named;
-import java.util.Optional;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
@RecoveryKeyScoped
@Subcomponent(modules = {RecoveryKeyModule.class})
diff --git a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java
index f5b002cbf..de756d899 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java
@@ -1,11 +1,6 @@
package org.cryptomator.ui.recoverykey;
import dagger.Lazy;
-import javafx.beans.property.StringProperty;
-import javafx.concurrent.Task;
-import javafx.fxml.FXML;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
import org.cryptomator.common.vaults.Vault;
import org.cryptomator.cryptolib.api.InvalidPassphraseException;
import org.cryptomator.ui.common.Animations;
@@ -17,6 +12,11 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.inject.Inject;
+import javafx.beans.property.StringProperty;
+import javafx.concurrent.Task;
+import javafx.fxml.FXML;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
import java.io.IOException;
import java.util.concurrent.ExecutorService;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyDisplayController.java b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyDisplayController.java
index 40d3657ff..033d94b2b 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyDisplayController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyDisplayController.java
@@ -1,5 +1,9 @@
package org.cryptomator.ui.recoverykey;
+import org.cryptomator.ui.common.FxController;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import javafx.fxml.FXML;
import javafx.print.PageLayout;
import javafx.print.Printer;
@@ -13,14 +17,10 @@ import javafx.scene.text.FontWeight;
import javafx.scene.text.Text;
import javafx.scene.text.TextFlow;
import javafx.stage.Stage;
-import org.cryptomator.ui.common.FxController;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import java.util.ResourceBundle;
public class RecoveryKeyDisplayController implements FxController {
-
+
private static final Logger LOG = LoggerFactory.getLogger(RecoveryKeyDisplayController.class);
private final Stage window;
@@ -41,7 +41,7 @@ public class RecoveryKeyDisplayController implements FxController {
PrinterJob job = PrinterJob.createPrinterJob();
if (job != null && job.showPrintDialog(window)) {
PageLayout pageLayout = job.getJobSettings().getPageLayout();
-
+
String headingText = String.format(localization.getString("recoveryKey.printout.heading"), vaultName);
Text heading = new Text(headingText);
heading.setFont(Font.font("serif", FontWeight.BOLD, 20));
diff --git a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyFactory.java b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyFactory.java
index c07bd3bd3..15d4e651e 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyFactory.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyFactory.java
@@ -18,14 +18,14 @@ import static org.cryptomator.common.Constants.MASTERKEY_FILENAME;
public class RecoveryKeyFactory {
private static final byte[] PEPPER = new byte[0];
-
+
private final WordEncoder wordEncoder;
-
+
@Inject
public RecoveryKeyFactory(WordEncoder wordEncoder) {
this.wordEncoder = wordEncoder;
}
-
+
public Collection getDictionary() {
return wordEncoder.getWords();
}
@@ -62,6 +62,7 @@ public class RecoveryKeyFactory {
/**
* Creates a completely new masterkey using a recovery key.
+ *
* @param vaultPath Path to the storage location of a vault
* @param recoveryKey A recovery key for this vault
* @param newPassword The new password used to encrypt the keys
@@ -80,6 +81,7 @@ public class RecoveryKeyFactory {
/**
* Checks whether a String is a syntactically correct recovery key with a valid checksum
+ *
* @param recoveryKey A word sequence which might be a recovery key
* @return true if this seems to be a legitimate recovery key
*/
@@ -92,7 +94,7 @@ public class RecoveryKeyFactory {
return false;
}
}
-
+
private byte[] decodeRecoveryKey(String recoveryKey) throws IllegalArgumentException {
byte[] paddedKey = new byte[0];
try {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java
index 9ad3d73ad..c6f502886 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java
@@ -4,13 +4,6 @@ import dagger.Binds;
import dagger.Module;
import dagger.Provides;
import dagger.multibindings.IntoMap;
-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.stage.Modality;
-import javafx.stage.Stage;
import org.cryptomator.common.vaults.Vault;
import org.cryptomator.ui.common.DefaultSceneFactory;
import org.cryptomator.ui.common.FXMLLoaderFactory;
@@ -24,6 +17,13 @@ import org.cryptomator.ui.common.StageFactory;
import javax.inject.Named;
import javax.inject.Provider;
+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.stage.Modality;
+import javafx.stage.Stage;
import java.util.Map;
import java.util.ResourceBundle;
@@ -48,7 +48,7 @@ abstract class RecoveryKeyModule {
stage.initOwner(owner);
return stage;
}
-
+
@Provides
@RecoveryKeyWindow
@RecoveryKeyScoped
@@ -129,5 +129,5 @@ abstract class RecoveryKeyModule {
static FxController provideNewPasswordController(ResourceBundle resourceBundle, PasswordStrengthUtil strengthRater, @Named("newPassword") ObjectProperty password) {
return new NewPasswordController(resourceBundle, strengthRater, password);
}
-
+
}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyRecoverController.java b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyRecoverController.java
index 8b9e1cdfb..7e40a833b 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyRecoverController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyRecoverController.java
@@ -3,6 +3,12 @@ package org.cryptomator.ui.recoverykey;
import com.google.common.base.CharMatcher;
import com.google.common.base.Strings;
import dagger.Lazy;
+import org.cryptomator.common.vaults.Vault;
+import org.cryptomator.ui.common.FxController;
+import org.cryptomator.ui.common.FxmlFile;
+import org.cryptomator.ui.common.FxmlScene;
+
+import javax.inject.Inject;
import javafx.beans.binding.Bindings;
import javafx.beans.binding.BooleanBinding;
import javafx.beans.property.StringProperty;
@@ -13,12 +19,6 @@ import javafx.scene.control.TextFormatter;
import javafx.scene.input.KeyCode;
import javafx.scene.input.KeyEvent;
import javafx.stage.Stage;
-import org.cryptomator.common.vaults.Vault;
-import org.cryptomator.ui.common.FxController;
-import org.cryptomator.ui.common.FxmlFile;
-import org.cryptomator.ui.common.FxmlScene;
-
-import javax.inject.Inject;
import java.util.Optional;
@RecoveryKeyScoped
diff --git a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyResetPasswordController.java b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyResetPasswordController.java
index 8f626a652..cdf54990f 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyResetPasswordController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyResetPasswordController.java
@@ -1,17 +1,7 @@
package org.cryptomator.ui.recoverykey;
import dagger.Lazy;
-import javafx.beans.binding.Bindings;
-import javafx.beans.binding.BooleanBinding;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.StringProperty;
-import javafx.concurrent.Task;
-import javafx.fxml.FXML;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
import org.cryptomator.common.vaults.Vault;
-import org.cryptomator.cryptolib.api.InvalidPassphraseException;
-import org.cryptomator.ui.common.Animations;
import org.cryptomator.ui.common.ErrorComponent;
import org.cryptomator.ui.common.FxController;
import org.cryptomator.ui.common.FxmlFile;
@@ -21,12 +11,20 @@ import org.slf4j.LoggerFactory;
import javax.inject.Inject;
import javax.inject.Named;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.BooleanBinding;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.StringProperty;
+import javafx.concurrent.Task;
+import javafx.fxml.FXML;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
import java.io.IOException;
import java.util.concurrent.ExecutorService;
@RecoveryKeyScoped
public class RecoveryKeyResetPasswordController implements FxController {
-
+
private static final Logger LOG = LoggerFactory.getLogger(RecoveryKeyResetPasswordController.class);
private final Stage window;
@@ -40,7 +38,7 @@ public class RecoveryKeyResetPasswordController implements FxController {
private final ErrorComponent.Builder errorComponent;
@Inject
- public RecoveryKeyResetPasswordController(@RecoveryKeyWindow Stage window, @RecoveryKeyWindow Vault vault, RecoveryKeyFactory recoveryKeyFactory, ExecutorService executor, @RecoveryKeyWindow StringProperty recoveryKey, @Named("newPassword")ObjectProperty newPassword, @FxmlScene(FxmlFile.RECOVERYKEY_RECOVER) Lazy recoverScene, ErrorComponent.Builder errorComponent) {
+ public RecoveryKeyResetPasswordController(@RecoveryKeyWindow Stage window, @RecoveryKeyWindow Vault vault, RecoveryKeyFactory recoveryKeyFactory, ExecutorService executor, @RecoveryKeyWindow StringProperty recoveryKey, @Named("newPassword") ObjectProperty newPassword, @FxmlScene(FxmlFile.RECOVERYKEY_RECOVER) Lazy recoverScene, ErrorComponent.Builder errorComponent) {
this.window = window;
this.vault = vault;
this.recoveryKeyFactory = recoveryKeyFactory;
@@ -88,7 +86,7 @@ public class RecoveryKeyResetPasswordController implements FxController {
}
}
-
+
/* Getter/Setter */
public BooleanBinding invalidNewPasswordProperty() {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeySuccessController.java b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeySuccessController.java
index ae9e2e70f..568a6c16e 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeySuccessController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeySuccessController.java
@@ -1,10 +1,10 @@
package org.cryptomator.ui.recoverykey;
-import javafx.fxml.FXML;
-import javafx.stage.Stage;
import org.cryptomator.ui.common.FxController;
import javax.inject.Inject;
+import javafx.fxml.FXML;
+import javafx.stage.Stage;
@RecoveryKeyScoped
public class RecoveryKeySuccessController implements FxController {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/WordEncoder.java b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/WordEncoder.java
index d5e7e667c..ba4753879 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/WordEncoder.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/WordEncoder.java
@@ -12,7 +12,6 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
import java.nio.charset.StandardCharsets;
-import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -24,19 +23,19 @@ class WordEncoder {
private static final String DEFAULT_WORD_FILE = "/i18n/4096words_en.txt";
private static final int WORD_COUNT = 4096;
private static final char DELIMITER = ' ';
-
+
private final List words;
private final Map indices;
-
+
@Inject
public WordEncoder() {
this(DEFAULT_WORD_FILE);
}
-
+
public List getWords() {
return words;
}
-
+
public WordEncoder(String wordFile) {
try (InputStream in = getClass().getResourceAsStream(wordFile); //
Reader reader = new InputStreamReader(in, StandardCharsets.US_ASCII.newDecoder()); //
@@ -53,6 +52,7 @@ class WordEncoder {
/**
* Encodes the given input as a sequence of words.
+ *
* @param input A multiple of three bytes
* @return A String that can be {@link #decode(String) decoded} to the input again.
* @throws IllegalArgumentException If input is not a multiple of three bytes
@@ -60,10 +60,10 @@ class WordEncoder {
public String encodePadded(byte[] input) {
Preconditions.checkArgument(input.length % 3 == 0, "input needs to be padded to a multipe of three");
StringBuilder sb = new StringBuilder();
- for (int i = 0; i < input.length; i+=3) {
+ for (int i = 0; i < input.length; i += 3) {
byte b1 = input[i];
- byte b2 = input[i+1];
- byte b3 = input[i+2];
+ byte b2 = input[i + 1];
+ byte b3 = input[i + 2];
int firstWordIndex = (0xFF0 & (b1 << 4)) + (0x00F & (b2 >> 4)); // 0xFFF000
int secondWordIndex = (0xF00 & (b2 << 8)) + (0x0FF & b3); // 0x000FFF
assert firstWordIndex < WORD_COUNT;
@@ -79,6 +79,7 @@ class WordEncoder {
/**
* Decodes a String that has previously been {@link #encodePadded(byte[]) encoded} to a word sequence.
+ *
* @param encoded The word sequence
* @return Decoded bytes
* @throws IllegalArgumentException If the encoded string doesn't consist of a multiple of two words or one of the words is unknown to this encoder.
@@ -87,9 +88,9 @@ class WordEncoder {
List splitted = Splitter.on(DELIMITER).omitEmptyStrings().splitToList(Strings.nullToEmpty(encoded));
Preconditions.checkArgument(splitted.size() % 2 == 0, "%s needs to be a multiple of two words", encoded);
byte[] result = new byte[splitted.size() / 2 * 3];
- for (int i = 0; i < splitted.size(); i+=2) {
+ for (int i = 0; i < splitted.size(); i += 2) {
String w1 = splitted.get(i);
- String w2 = splitted.get(i+1);
+ String w2 = splitted.get(i + 1);
int firstWordIndex = indices.getOrDefault(w1, -1);
int secondWordIndex = indices.getOrDefault(w2, -1);
Preconditions.checkArgument(firstWordIndex != -1, "%s not in dictionary", w1);
@@ -97,12 +98,12 @@ class WordEncoder {
byte b1 = (byte) (0xFF & (firstWordIndex >> 4));
byte b2 = (byte) ((0xF0 & (firstWordIndex << 4)) + (0x0F & (secondWordIndex >> 8)));
byte b3 = (byte) (0xFF & secondWordIndex);
- result[i/2*3] = b1;
- result[i/2*3+1] = b2;
- result[i/2*3+2] = b3;
+ result[i / 2 * 3] = b1;
+ result[i / 2 * 3 + 1] = b2;
+ result[i / 2 * 3 + 2] = b3;
}
return result;
}
-
+
}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultComponent.java b/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultComponent.java
index 55e7daf4e..c8b3fd574 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultComponent.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultComponent.java
@@ -3,12 +3,13 @@ package org.cryptomator.ui.removevault;
import dagger.BindsInstance;
import dagger.Lazy;
import dagger.Subcomponent;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
import org.cryptomator.common.vaults.Vault;
import org.cryptomator.ui.common.FxmlFile;
import org.cryptomator.ui.common.FxmlScene;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+
@RemoveVaultScoped
@Subcomponent(modules = {RemoveVaultModule.class})
public interface RemoveVaultComponent {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultController.java b/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultController.java
index 836ed519f..e486d65f0 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultController.java
@@ -1,14 +1,14 @@
package org.cryptomator.ui.removevault;
-import javafx.collections.ObservableList;
-import javafx.fxml.FXML;
-import javafx.stage.Stage;
import org.cryptomator.common.vaults.Vault;
import org.cryptomator.ui.common.FxController;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.inject.Inject;
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
+import javafx.stage.Stage;
@RemoveVaultScoped
public class RemoveVaultController implements FxController {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultModule.java b/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultModule.java
index 5f61ec7ed..5e717c431 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultModule.java
@@ -4,13 +4,6 @@ import dagger.Binds;
import dagger.Module;
import dagger.Provides;
import dagger.multibindings.IntoMap;
-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.cryptomator.ui.common.DefaultSceneFactory;
import org.cryptomator.ui.common.FXMLLoaderFactory;
import org.cryptomator.ui.common.FxController;
@@ -20,9 +13,10 @@ import org.cryptomator.ui.common.FxmlScene;
import org.cryptomator.ui.common.StageFactory;
import org.cryptomator.ui.mainwindow.MainWindow;
-import javax.inject.Named;
import javax.inject.Provider;
-import java.util.List;
+import javafx.scene.Scene;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
import java.util.Map;
import java.util.ResourceBundle;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayMenuController.java b/main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayMenuController.java
index 1610c6862..51f7c2225 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayMenuController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayMenuController.java
@@ -1,14 +1,14 @@
package org.cryptomator.ui.traymenu;
-import javafx.application.Platform;
-import javafx.beans.Observable;
-import javafx.collections.ObservableList;
import org.cryptomator.common.vaults.Vault;
import org.cryptomator.ui.launcher.AppLifecycleListener;
import org.cryptomator.ui.launcher.FxApplicationStarter;
import org.cryptomator.ui.preferences.SelectedPreferencesTab;
import javax.inject.Inject;
+import javafx.application.Platform;
+import javafx.beans.Observable;
+import javafx.collections.ObservableList;
import java.awt.Menu;
import java.awt.MenuItem;
import java.awt.PopupMenu;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockComponent.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockComponent.java
index 18ae3b5f0..9c0338c5b 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockComponent.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockComponent.java
@@ -7,10 +7,10 @@ package org.cryptomator.ui.unlock;
import dagger.BindsInstance;
import dagger.Subcomponent;
-import javafx.stage.Stage;
import org.cryptomator.common.vaults.Vault;
import javax.inject.Named;
+import javafx.stage.Stage;
import java.util.Optional;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockController.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockController.java
index 537eba9a8..b64195d9a 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockController.java
@@ -1,5 +1,17 @@
package org.cryptomator.ui.unlock;
+import org.cryptomator.common.vaults.Vault;
+import org.cryptomator.keychain.KeychainManager;
+import org.cryptomator.ui.common.FxController;
+import org.cryptomator.ui.common.UserInteractionLock;
+import org.cryptomator.ui.common.WeakBindings;
+import org.cryptomator.ui.controls.NiceSecurePasswordField;
+import org.cryptomator.ui.forgetPassword.ForgetPasswordComponent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
+import javax.inject.Named;
import javafx.animation.Animation;
import javafx.animation.Interpolator;
import javafx.animation.KeyFrame;
@@ -20,18 +32,6 @@ import javafx.scene.transform.Rotate;
import javafx.scene.transform.Translate;
import javafx.stage.Stage;
import javafx.util.Duration;
-import org.cryptomator.common.vaults.Vault;
-import org.cryptomator.keychain.KeychainManager;
-import org.cryptomator.ui.common.FxController;
-import org.cryptomator.ui.common.UserInteractionLock;
-import org.cryptomator.ui.common.WeakBindings;
-import org.cryptomator.ui.controls.NiceSecurePasswordField;
-import org.cryptomator.ui.forgetPassword.ForgetPasswordComponent;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.inject.Inject;
-import javax.inject.Named;
import java.util.Arrays;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -88,7 +88,7 @@ public class UnlockController implements FxController {
passwordField.setPassword(password.get());
}
unlockButtonDisabled.bind(userInteractionDisabled.or(passwordField.textProperty().isEmpty()));
-
+
var leftArmTranslation = new Translate(24, 0);
var leftArmRotation = new Rotate(60, 16, 30, 0);
var leftArmRetracted = new KeyValue(leftArmTranslation.xProperty(), 24);
@@ -116,15 +116,15 @@ public class UnlockController implements FxController {
var faceVisible = new KeyValue(face.opacityProperty(), 1.0, Interpolator.LINEAR);
face.setOpacity(0);
- unlockAnimation = new Timeline(
- new KeyFrame(Duration.ZERO, leftArmRetracted, leftArmHorizontal, rightArmRetracted, rightArmHorizontal, legsRetractedY, legsRetractedX, faceHidden),
- new KeyFrame(Duration.millis(200), leftArmExtended, leftArmHorizontal, rightArmRetracted, rightArmHorizontal),
- new KeyFrame(Duration.millis(400), leftArmExtended, leftArmHanging, rightArmExtended, rightArmHorizontal),
- new KeyFrame(Duration.millis(600), leftArmExtended, leftArmHanging, rightArmExtended, rightArmHanging),
- new KeyFrame(Duration.millis(800), legsExtendedY, legsExtendedX, faceHidden),
- new KeyFrame(Duration.millis(1000), faceVisible)
+ unlockAnimation = new Timeline( //
+ new KeyFrame(Duration.ZERO, leftArmRetracted, leftArmHorizontal, rightArmRetracted, rightArmHorizontal, legsRetractedY, legsRetractedX, faceHidden), //
+ new KeyFrame(Duration.millis(200), leftArmExtended, leftArmHorizontal, rightArmRetracted, rightArmHorizontal), //
+ new KeyFrame(Duration.millis(400), leftArmExtended, leftArmHanging, rightArmExtended, rightArmHorizontal), //
+ new KeyFrame(Duration.millis(600), leftArmExtended, leftArmHanging, rightArmExtended, rightArmHanging), //
+ new KeyFrame(Duration.millis(800), legsExtendedY, legsExtendedX, faceHidden), //
+ new KeyFrame(Duration.millis(1000), faceVisible) //
);
-
+
passwordEntryLock.awaitingInteraction().addListener(observable -> stopUnlockAnimation());
}
@@ -152,7 +152,7 @@ public class UnlockController implements FxController {
passwordEntryLock.interacted(UnlockModule.PasswordEntry.PASSWORD_ENTERED);
startUnlockAnimation();
}
-
+
private void startUnlockAnimation() {
leftArm.setVisible(true);
rightArm.setVisible(true);
@@ -184,7 +184,7 @@ public class UnlockController implements FxController {
public String getVaultName() {
return vaultName.get();
}
-
+
public StringBinding vaultNameProperty() {
return vaultName;
}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java
index 792edbf91..1850953c9 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java
@@ -1,9 +1,6 @@
package org.cryptomator.ui.unlock;
import dagger.Lazy;
-import javafx.fxml.FXML;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
import org.cryptomator.common.vaults.MountPointRequirement;
import org.cryptomator.common.vaults.Vault;
import org.cryptomator.ui.common.FxController;
@@ -11,6 +8,9 @@ import org.cryptomator.ui.common.FxmlFile;
import org.cryptomator.ui.common.FxmlScene;
import javax.inject.Inject;
+import javafx.fxml.FXML;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
//At the current point in time only the CustomMountPointChooser may cause this window to be shown.
@UnlockScoped
diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockModule.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockModule.java
index bef612dc1..102743e7f 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockModule.java
@@ -4,9 +4,6 @@ import dagger.Binds;
import dagger.Module;
import dagger.Provides;
import dagger.multibindings.IntoMap;
-import javafx.scene.Scene;
-import javafx.stage.Modality;
-import javafx.stage.Stage;
import org.cryptomator.common.vaults.Vault;
import org.cryptomator.keychain.KeychainAccessException;
import org.cryptomator.keychain.KeychainManager;
@@ -24,6 +21,9 @@ import org.slf4j.LoggerFactory;
import javax.inject.Named;
import javax.inject.Provider;
+import javafx.scene.Scene;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
import java.util.Map;
import java.util.Optional;
import java.util.ResourceBundle;
@@ -35,7 +35,10 @@ abstract class UnlockModule {
private static final Logger LOG = LoggerFactory.getLogger(UnlockModule.class);
- public enum PasswordEntry {PASSWORD_ENTERED, CANCELED}
+ public enum PasswordEntry {
+ PASSWORD_ENTERED,
+ CANCELED
+ }
@Provides
@UnlockScoped
diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockSuccessController.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockSuccessController.java
index f7952ad9f..ee3ffc5ae 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockSuccessController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockSuccessController.java
@@ -1,5 +1,13 @@
package org.cryptomator.ui.unlock;
+import org.cryptomator.common.settings.WhenUnlocked;
+import org.cryptomator.common.vaults.Vault;
+import org.cryptomator.ui.common.FxController;
+import org.cryptomator.ui.common.VaultService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
import javafx.beans.property.BooleanProperty;
import javafx.beans.property.ObjectProperty;
import javafx.beans.property.ReadOnlyObjectProperty;
@@ -10,14 +18,6 @@ import javafx.fxml.FXML;
import javafx.scene.control.CheckBox;
import javafx.scene.control.ContentDisplay;
import javafx.stage.Stage;
-import org.cryptomator.common.settings.WhenUnlocked;
-import org.cryptomator.common.vaults.Vault;
-import org.cryptomator.ui.common.FxController;
-import org.cryptomator.ui.common.VaultService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.inject.Inject;
import java.util.concurrent.ExecutorService;
@UnlockScoped
diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
index 12633452a..bdefb4ad3 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
@@ -1,11 +1,6 @@
package org.cryptomator.ui.unlock;
import dagger.Lazy;
-import javafx.application.Platform;
-import javafx.concurrent.Task;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
-import javafx.stage.Window;
import org.cryptomator.common.mountpoint.InvalidMountPointException;
import org.cryptomator.common.vaults.MountPointRequirement;
import org.cryptomator.common.vaults.Vault;
@@ -26,6 +21,11 @@ import org.slf4j.LoggerFactory;
import javax.inject.Inject;
import javax.inject.Named;
+import javafx.application.Platform;
+import javafx.concurrent.Task;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+import javafx.stage.Window;
import java.io.IOException;
import java.nio.CharBuffer;
import java.nio.file.DirectoryNotEmptyException;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/GeneralVaultOptionsController.java b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/GeneralVaultOptionsController.java
index 9849b0513..4425139f3 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/GeneralVaultOptionsController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/GeneralVaultOptionsController.java
@@ -1,16 +1,15 @@
package org.cryptomator.ui.vaultoptions;
-import javafx.fxml.FXML;
-import javafx.scene.control.CheckBox;
-import javafx.scene.control.ChoiceBox;
-import javafx.scene.control.TextField;
-import javafx.util.StringConverter;
-import org.cryptomator.common.settings.UiTheme;
import org.cryptomator.common.settings.WhenUnlocked;
import org.cryptomator.common.vaults.Vault;
import org.cryptomator.ui.common.FxController;
import javax.inject.Inject;
+import javafx.fxml.FXML;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.ChoiceBox;
+import javafx.scene.control.TextField;
+import javafx.util.StringConverter;
import java.util.ResourceBundle;
@VaultOptionsScoped
@@ -39,7 +38,7 @@ public class GeneralVaultOptionsController implements FxController {
}
private static class WhenUnlockedConverter extends StringConverter {
-
+
private final ResourceBundle resourceBundle;
public WhenUnlockedConverter(ResourceBundle resourceBundle) {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MasterkeyOptionsController.java b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MasterkeyOptionsController.java
index 6ec7576dd..4c08ad75a 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MasterkeyOptionsController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MasterkeyOptionsController.java
@@ -1,10 +1,5 @@
package org.cryptomator.ui.vaultoptions;
-import javafx.beans.binding.Bindings;
-import javafx.beans.binding.BooleanExpression;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.fxml.FXML;
-import javafx.stage.Stage;
import org.cryptomator.common.vaults.Vault;
import org.cryptomator.keychain.KeychainAccessException;
import org.cryptomator.keychain.KeychainManager;
@@ -13,6 +8,11 @@ import org.cryptomator.ui.common.FxController;
import org.cryptomator.ui.recoverykey.RecoveryKeyComponent;
import javax.inject.Inject;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.BooleanExpression;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.fxml.FXML;
+import javafx.stage.Stage;
import java.util.Optional;
@VaultOptionsScoped
diff --git a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java
index ff0f178dc..5d65107d0 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java
@@ -1,6 +1,15 @@
package org.cryptomator.ui.vaultoptions;
import com.google.common.base.Strings;
+import org.apache.commons.lang3.SystemUtils;
+import org.cryptomator.common.Environment;
+import org.cryptomator.common.settings.Settings;
+import org.cryptomator.common.settings.VolumeImpl;
+import org.cryptomator.common.vaults.Vault;
+import org.cryptomator.common.vaults.WindowsDriveLetters;
+import org.cryptomator.ui.common.FxController;
+
+import javax.inject.Inject;
import javafx.beans.binding.Bindings;
import javafx.beans.binding.BooleanBinding;
import javafx.beans.property.BooleanProperty;
@@ -17,15 +26,6 @@ import javafx.scene.control.ToggleGroup;
import javafx.stage.DirectoryChooser;
import javafx.stage.Stage;
import javafx.util.StringConverter;
-import org.apache.commons.lang3.SystemUtils;
-import org.cryptomator.common.Environment;
-import org.cryptomator.common.settings.Settings;
-import org.cryptomator.common.settings.VolumeImpl;
-import org.cryptomator.common.vaults.Vault;
-import org.cryptomator.common.vaults.WindowsDriveLetters;
-import org.cryptomator.ui.common.FxController;
-
-import javax.inject.Inject;
import java.io.File;
import java.nio.file.Path;
import java.util.ResourceBundle;
@@ -73,7 +73,7 @@ public class MountOptionsController implements FxController {
// readonly:
readOnlyCheckbox.selectedProperty().bindBidirectional(vault.getVaultSettings().usesReadOnlyMode());
- if(getRestrictToStableFuseOnWindows()) {
+ if (getRestrictToStableFuseOnWindows()) {
readOnlyCheckbox.setSelected(false); // to prevent invalid states
}
readOnlyCheckbox.disableProperty().bind(customMountFlagsCheckbox.selectedProperty().or(restrictToStableFuseOnWindows));
diff --git a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsComponent.java b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsComponent.java
index 578219aa5..09b362aff 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsComponent.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsComponent.java
@@ -8,12 +8,13 @@ package org.cryptomator.ui.vaultoptions;
import dagger.BindsInstance;
import dagger.Lazy;
import dagger.Subcomponent;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
import org.cryptomator.common.vaults.Vault;
import org.cryptomator.ui.common.FxmlFile;
import org.cryptomator.ui.common.FxmlScene;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+
@VaultOptionsScoped
@Subcomponent(modules = {VaultOptionsModule.class})
public interface VaultOptionsComponent {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsModule.java b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsModule.java
index f39af7e34..0e65ed0d2 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsModule.java
@@ -4,9 +4,6 @@ import dagger.Binds;
import dagger.Module;
import dagger.Provides;
import dagger.multibindings.IntoMap;
-import javafx.scene.Scene;
-import javafx.stage.Modality;
-import javafx.stage.Stage;
import org.cryptomator.common.vaults.Vault;
import org.cryptomator.ui.changepassword.ChangePasswordComponent;
import org.cryptomator.ui.common.DefaultSceneFactory;
@@ -20,6 +17,9 @@ import org.cryptomator.ui.mainwindow.MainWindow;
import org.cryptomator.ui.recoverykey.RecoveryKeyComponent;
import javax.inject.Provider;
+import javafx.scene.Scene;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
import java.util.Map;
import java.util.ResourceBundle;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertComponent.java b/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertComponent.java
index a79567f9d..f21a7a91a 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertComponent.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertComponent.java
@@ -2,11 +2,12 @@ package org.cryptomator.ui.wrongfilealert;
import dagger.Lazy;
import dagger.Subcomponent;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
import org.cryptomator.ui.common.FxmlFile;
import org.cryptomator.ui.common.FxmlScene;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+
@WrongFileAlertScoped
@Subcomponent(modules = {WrongFileAlertModule.class})
public interface WrongFileAlertComponent {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertController.java b/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertController.java
index 292486a6a..7f05e5287 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertController.java
@@ -1,13 +1,13 @@
package org.cryptomator.ui.wrongfilealert;
-import javafx.application.Application;
-import javafx.fxml.FXML;
-import javafx.scene.image.Image;
-import javafx.stage.Stage;
import org.apache.commons.lang3.SystemUtils;
import org.cryptomator.ui.common.FxController;
import javax.inject.Inject;
+import javafx.application.Application;
+import javafx.fxml.FXML;
+import javafx.scene.image.Image;
+import javafx.stage.Stage;
import java.io.IOException;
import java.io.InputStream;
import java.io.UncheckedIOException;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertModule.java b/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertModule.java
index cca3b0269..4d26a371c 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertModule.java
@@ -4,10 +4,6 @@ import dagger.Binds;
import dagger.Module;
import dagger.Provides;
import dagger.multibindings.IntoMap;
-import javafx.scene.Scene;
-import javafx.scene.image.Image;
-import javafx.stage.Modality;
-import javafx.stage.Stage;
import org.cryptomator.ui.common.DefaultSceneFactory;
import org.cryptomator.ui.common.FXMLLoaderFactory;
import org.cryptomator.ui.common.FxController;
@@ -17,9 +13,10 @@ import org.cryptomator.ui.common.FxmlScene;
import org.cryptomator.ui.common.StageFactory;
import org.cryptomator.ui.mainwindow.MainWindow;
-import javax.inject.Named;
import javax.inject.Provider;
-import java.util.List;
+import javafx.scene.Scene;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
import java.util.Map;
import java.util.ResourceBundle;
diff --git a/main/ui/src/main/resources/css/dark_theme.css b/main/ui/src/main/resources/css/dark_theme.css
index c96527374..997cc233a 100644
--- a/main/ui/src/main/resources/css/dark_theme.css
+++ b/main/ui/src/main/resources/css/dark_theme.css
@@ -82,8 +82,8 @@
PROGRESS_BAR_BG: GRAY_2;
-fx-background-color: MAIN_BG;
- -fx-text-fill: TEXT_FILL;
- -fx-font-family: 'Open Sans';
+ -fx-text-fill: TEXT_FILL;
+ -fx-font-family: 'Open Sans';
}
/*******************************************************************************
@@ -191,7 +191,7 @@
-fx-background-color: white, RED_5;
-fx-background-insets: 1px, 2px;
-fx-background-radius: 6px, 5px;
- -fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.8), 2, 0, 0, 0);
+ -fx-effect: dropshadow(three-pass-box, rgba(0, 0, 0, 0.8), 2, 0, 0, 0);
}
.main-window .drag-n-drop-indicator {
@@ -443,7 +443,7 @@
-fx-font-size: 0.8em;
-fx-background-color: CONTROL_BG_NORMAL;
-fx-padding: 0.2em 0.4em 0.2em 0.4em;
- -fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.5), 2, 0, 0, 0);
+ -fx-effect: dropshadow(three-pass-box, rgba(0, 0, 0, 0.5), 2, 0, 0, 0);
}
/*******************************************************************************
@@ -488,7 +488,7 @@
******************************************************************************/
.text-area {
- -fx-cursor: default;
+ -fx-cursor: default;
-fx-background-color: CONTROL_BORDER_NORMAL, CONTROL_BG_NORMAL;
-fx-background-insets: 0, 1px;
-fx-background-radius: 4px;
@@ -505,7 +505,7 @@
}
.text-area > .scroll-pane > .scroll-bar {
- -fx-padding: 2px;
+ -fx-padding: 2px;
}
.text-area .content {
@@ -514,7 +514,7 @@
-fx-text-fill: TEXT_FILL;
-fx-highlight-fill: PRIMARY;
-fx-prompt-text-fill: TEXT_FILL_MUTED;
- -fx-background-color: null;
+ -fx-background-color: null;
}
/*******************************************************************************
@@ -748,7 +748,7 @@
-fx-background-insets: 0, 1px;
-fx-background-radius: 4px;
-fx-padding: 0.2em 0 0.2em 0;
- -fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.2), 8, 0, 0, 0);
+ -fx-effect: dropshadow(three-pass-box, rgba(0, 0, 0, 0.2), 8, 0, 0, 0);
}
/*******************************************************************************
@@ -775,7 +775,7 @@
}
.menu-item > .label {
- -fx-padding: 1px 0.5em 1px 0.5em;
+ -fx-padding: 1px 0.5em 1px 0.5em;
}
.menu-item:disabled > .label {
@@ -801,7 +801,7 @@
}
.progress-indicator:indeterminate > .spinner {
- -fx-padding: 0.083333em;
+ -fx-padding: 0.083333em;
}
.progress-indicator:indeterminate .segment {
@@ -810,51 +810,51 @@
}
.progress-indicator:indeterminate .segment0 {
- -fx-shape:"m 12.007729,4.9541827 c -0.49762,0.7596865 0.893181,1.6216808 1.327833,0.7666252 L 15.456199,2.0477574 C 15.942094,1.2061627 14.61426,0.43953765 14.128365,1.2811324 z";
+ -fx-shape: "m 12.007729,4.9541827 c -0.49762,0.7596865 0.893181,1.6216808 1.327833,0.7666252 L 15.456199,2.0477574 C 15.942094,1.2061627 14.61426,0.43953765 14.128365,1.2811324 z";
}
.progress-indicator:indeterminate .segment1 {
- -fx-shape:"m 9.2224559,4.62535 c -0.051108,0.9067177 1.5843581,0.957826 1.5332501,0 l 0,-4.24127319 c 0,-0.9717899 -1.5332501,-0.9717899 -1.5332501,0 z";
+ -fx-shape: "m 9.2224559,4.62535 c -0.051108,0.9067177 1.5843581,0.957826 1.5332501,0 l 0,-4.24127319 c 0,-0.9717899 -1.5332501,-0.9717899 -1.5332501,0 z";
}
.progress-indicator:indeterminate .segment2 {
- -fx-shape:"M 8.0465401,4.9030617 C 8.5441601,5.6627485 7.1533584,6.5247425 6.7187068,5.6696872 L 4.5980702,1.9966363 C 4.1121752,1.1550418 5.4400085,0.38841683 5.9259035,1.2300114 z";
+ -fx-shape: "M 8.0465401,4.9030617 C 8.5441601,5.6627485 7.1533584,6.5247425 6.7187068,5.6696872 L 4.5980702,1.9966363 C 4.1121752,1.1550418 5.4400085,0.38841683 5.9259035,1.2300114 z";
}
.progress-indicator:indeterminate .segment3 {
- -fx-shape:"M 5.7330066,6.5305598 C 6.5579512,6.9103162 5.8366865,8.3790371 5.0144939,7.8850315 L 1.2677551,5.8974832 C 0.409277,5.4420823 1.1277888,4.0876101 1.9862674,4.5430105 z";
+ -fx-shape: "M 5.7330066,6.5305598 C 6.5579512,6.9103162 5.8366865,8.3790371 5.0144939,7.8850315 L 1.2677551,5.8974832 C 0.409277,5.4420823 1.1277888,4.0876101 1.9862674,4.5430105 z";
}
.progress-indicator:indeterminate .segment4 {
- -fx-shape:"m 0.42171041,9.2083842 c -0.90671825,-0.051108 -0.95782608,1.5843588 0,1.5332498 l 4.24127319,0 c 0.9717899,0 0.9717899,-1.5332498 0,-1.5332498 z";
+ -fx-shape: "m 0.42171041,9.2083842 c -0.90671825,-0.051108 -0.95782608,1.5843588 0,1.5332498 l 4.24127319,0 c 0.9717899,0 0.9717899,-1.5332498 0,-1.5332498 z";
}
.progress-indicator:indeterminate .segment5 {
- -fx-shape:"M 5.7330066,13.443113 C 6.5579512,13.063356 5.8366865,11.594635 5.0144939,12.088641 L 1.2677551,14.076189 C 0.409277,14.53159 1.1277888,15.886062 1.9862674,15.430662 z";
+ -fx-shape: "M 5.7330066,13.443113 C 6.5579512,13.063356 5.8366865,11.594635 5.0144939,12.088641 L 1.2677551,14.076189 C 0.409277,14.53159 1.1277888,15.886062 1.9862674,15.430662 z";
}
.progress-indicator:indeterminate .segment6 {
- -fx-shape:"M 8.0465401,15.070611 C 8.5441601,14.310924 7.1533584,13.44893 6.7187068,14.303985 l -2.1206366,3.673051 c -0.485895,0.841595 0.8419383,1.60822 1.3278333,0.766625 z";
+ -fx-shape: "M 8.0465401,15.070611 C 8.5441601,14.310924 7.1533584,13.44893 6.7187068,14.303985 l -2.1206366,3.673051 c -0.485895,0.841595 0.8419383,1.60822 1.3278333,0.766625 z";
}
.progress-indicator:indeterminate .segment7 {
- -fx-shape:"m 9.2224559,19.539943 c -0.051108,0.906718 1.5843581,0.957826 1.5332501,0 l 0,-4.241273 c 0,-0.97179 -1.5332501,-0.97179 -1.5332501,0 z";
+ -fx-shape: "m 9.2224559,19.539943 c -0.051108,0.906718 1.5843581,0.957826 1.5332501,0 l 0,-4.241273 c 0,-0.97179 -1.5332501,-0.97179 -1.5332501,0 z";
}
.progress-indicator:indeterminate .segment8 {
- -fx-shape:"m 12.10997,15.070611 c -0.49762,-0.759687 0.893182,-1.621681 1.327834,-0.766626 l 2.120636,3.673051 c 0.485895,0.841595 -0.841938,1.60822 -1.327833,0.766625 z";
+ -fx-shape: "m 12.10997,15.070611 c -0.49762,-0.759687 0.893182,-1.621681 1.327834,-0.766626 l 2.120636,3.673051 c 0.485895,0.841595 -0.841938,1.60822 -1.327833,0.766625 z";
}
.progress-indicator:indeterminate .segment9 {
- -fx-shape:"m 14.423504,13.443113 c -0.824945,-0.379757 -0.10368,-1.848478 0.718512,-1.354472 l 3.746739,1.987548 c 0.858478,0.455401 0.139967,1.809873 -0.718512,1.354473 z";
+ -fx-shape: "m 14.423504,13.443113 c -0.824945,-0.379757 -0.10368,-1.848478 0.718512,-1.354472 l 3.746739,1.987548 c 0.858478,0.455401 0.139967,1.809873 -0.718512,1.354473 z";
}
.progress-indicator:indeterminate .segment10 {
- -fx-shape:"m 15.372451,9.2445322 c -0.906719,-0.051108 -0.957826,1.5843588 0,1.5332498 l 4.241273,0 c 0.97179,0 0.97179,-1.5332498 0,-1.5332498 z";
+ -fx-shape: "m 15.372451,9.2445322 c -0.906719,-0.051108 -0.957826,1.5843588 0,1.5332498 l 4.241273,0 c 0.97179,0 0.97179,-1.5332498 0,-1.5332498 z";
}
.progress-indicator:indeterminate .segment11 {
- -fx-shape:"m 14.321262,6.5816808 c -0.824944,0.3797564 -0.10368,1.8484772 0.718513,1.3544717 L 18.786514,5.9486042 C 19.644992,5.4932031 18.92648,4.1387308 18.068001,4.5941315 z";
+ -fx-shape: "m 14.321262,6.5816808 c -0.824944,0.3797564 -0.10368,1.8484772 0.718513,1.3544717 L 18.786514,5.9486042 C 19.644992,5.4932031 18.92648,4.1387308 18.068001,4.5941315 z";
}
/*******************************************************************************
diff --git a/main/ui/src/main/resources/css/light_theme.css b/main/ui/src/main/resources/css/light_theme.css
index c16fbe1a6..606198cbc 100644
--- a/main/ui/src/main/resources/css/light_theme.css
+++ b/main/ui/src/main/resources/css/light_theme.css
@@ -190,7 +190,7 @@
-fx-background-color: white, RED_5;
-fx-background-insets: 1px, 2px;
-fx-background-radius: 6px, 5px;
- -fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.8), 2, 0, 0, 0);
+ -fx-effect: dropshadow(three-pass-box, rgba(0, 0, 0, 0.8), 2, 0, 0, 0);
}
.main-window .drag-n-drop-indicator {
@@ -441,7 +441,7 @@
-fx-font-size: 0.8em;
-fx-background-color: CONTROL_BG_NORMAL;
-fx-padding: 0.2em 0.4em 0.2em 0.4em;
- -fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.5), 2, 0, 0, 0);
+ -fx-effect: dropshadow(three-pass-box, rgba(0, 0, 0, 0.5), 2, 0, 0, 0);
}
/*******************************************************************************
@@ -486,7 +486,7 @@
******************************************************************************/
.text-area {
- -fx-cursor: default;
+ -fx-cursor: default;
-fx-background-color: CONTROL_BORDER_NORMAL, CONTROL_BG_NORMAL;
-fx-background-insets: 0, 1px;
-fx-background-radius: 4px;
@@ -503,7 +503,7 @@
}
.text-area > .scroll-pane > .scroll-bar {
- -fx-padding: 2px;
+ -fx-padding: 2px;
}
.text-area .content {
@@ -512,7 +512,7 @@
-fx-text-fill: TEXT_FILL;
-fx-highlight-fill: PRIMARY;
-fx-prompt-text-fill: TEXT_FILL_MUTED;
- -fx-background-color: null;
+ -fx-background-color: null;
}
/*******************************************************************************
@@ -746,7 +746,7 @@
-fx-background-insets: 0, 1px;
-fx-background-radius: 4px;
-fx-padding: 0.2em 0 0.2em 0;
- -fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.2), 8, 0, 0, 0);
+ -fx-effect: dropshadow(three-pass-box, rgba(0, 0, 0, 0.2), 8, 0, 0, 0);
}
/*******************************************************************************
@@ -773,7 +773,7 @@
}
.menu-item > .label {
- -fx-padding: 1px 0.5em 1px 0.5em;
+ -fx-padding: 1px 0.5em 1px 0.5em;
}
.menu-item:disabled > .label {
@@ -799,7 +799,7 @@
}
.progress-indicator:indeterminate > .spinner {
- -fx-padding: 0.083333em;
+ -fx-padding: 0.083333em;
}
.progress-indicator:indeterminate .segment {
@@ -808,51 +808,51 @@
}
.progress-indicator:indeterminate .segment0 {
- -fx-shape:"m 12.007729,4.9541827 c -0.49762,0.7596865 0.893181,1.6216808 1.327833,0.7666252 L 15.456199,2.0477574 C 15.942094,1.2061627 14.61426,0.43953765 14.128365,1.2811324 z";
+ -fx-shape: "m 12.007729,4.9541827 c -0.49762,0.7596865 0.893181,1.6216808 1.327833,0.7666252 L 15.456199,2.0477574 C 15.942094,1.2061627 14.61426,0.43953765 14.128365,1.2811324 z";
}
.progress-indicator:indeterminate .segment1 {
- -fx-shape:"m 9.2224559,4.62535 c -0.051108,0.9067177 1.5843581,0.957826 1.5332501,0 l 0,-4.24127319 c 0,-0.9717899 -1.5332501,-0.9717899 -1.5332501,0 z";
+ -fx-shape: "m 9.2224559,4.62535 c -0.051108,0.9067177 1.5843581,0.957826 1.5332501,0 l 0,-4.24127319 c 0,-0.9717899 -1.5332501,-0.9717899 -1.5332501,0 z";
}
.progress-indicator:indeterminate .segment2 {
- -fx-shape:"M 8.0465401,4.9030617 C 8.5441601,5.6627485 7.1533584,6.5247425 6.7187068,5.6696872 L 4.5980702,1.9966363 C 4.1121752,1.1550418 5.4400085,0.38841683 5.9259035,1.2300114 z";
+ -fx-shape: "M 8.0465401,4.9030617 C 8.5441601,5.6627485 7.1533584,6.5247425 6.7187068,5.6696872 L 4.5980702,1.9966363 C 4.1121752,1.1550418 5.4400085,0.38841683 5.9259035,1.2300114 z";
}
.progress-indicator:indeterminate .segment3 {
- -fx-shape:"M 5.7330066,6.5305598 C 6.5579512,6.9103162 5.8366865,8.3790371 5.0144939,7.8850315 L 1.2677551,5.8974832 C 0.409277,5.4420823 1.1277888,4.0876101 1.9862674,4.5430105 z";
+ -fx-shape: "M 5.7330066,6.5305598 C 6.5579512,6.9103162 5.8366865,8.3790371 5.0144939,7.8850315 L 1.2677551,5.8974832 C 0.409277,5.4420823 1.1277888,4.0876101 1.9862674,4.5430105 z";
}
.progress-indicator:indeterminate .segment4 {
- -fx-shape:"m 0.42171041,9.2083842 c -0.90671825,-0.051108 -0.95782608,1.5843588 0,1.5332498 l 4.24127319,0 c 0.9717899,0 0.9717899,-1.5332498 0,-1.5332498 z";
+ -fx-shape: "m 0.42171041,9.2083842 c -0.90671825,-0.051108 -0.95782608,1.5843588 0,1.5332498 l 4.24127319,0 c 0.9717899,0 0.9717899,-1.5332498 0,-1.5332498 z";
}
.progress-indicator:indeterminate .segment5 {
- -fx-shape:"M 5.7330066,13.443113 C 6.5579512,13.063356 5.8366865,11.594635 5.0144939,12.088641 L 1.2677551,14.076189 C 0.409277,14.53159 1.1277888,15.886062 1.9862674,15.430662 z";
+ -fx-shape: "M 5.7330066,13.443113 C 6.5579512,13.063356 5.8366865,11.594635 5.0144939,12.088641 L 1.2677551,14.076189 C 0.409277,14.53159 1.1277888,15.886062 1.9862674,15.430662 z";
}
.progress-indicator:indeterminate .segment6 {
- -fx-shape:"M 8.0465401,15.070611 C 8.5441601,14.310924 7.1533584,13.44893 6.7187068,14.303985 l -2.1206366,3.673051 c -0.485895,0.841595 0.8419383,1.60822 1.3278333,0.766625 z";
+ -fx-shape: "M 8.0465401,15.070611 C 8.5441601,14.310924 7.1533584,13.44893 6.7187068,14.303985 l -2.1206366,3.673051 c -0.485895,0.841595 0.8419383,1.60822 1.3278333,0.766625 z";
}
.progress-indicator:indeterminate .segment7 {
- -fx-shape:"m 9.2224559,19.539943 c -0.051108,0.906718 1.5843581,0.957826 1.5332501,0 l 0,-4.241273 c 0,-0.97179 -1.5332501,-0.97179 -1.5332501,0 z";
+ -fx-shape: "m 9.2224559,19.539943 c -0.051108,0.906718 1.5843581,0.957826 1.5332501,0 l 0,-4.241273 c 0,-0.97179 -1.5332501,-0.97179 -1.5332501,0 z";
}
.progress-indicator:indeterminate .segment8 {
- -fx-shape:"m 12.10997,15.070611 c -0.49762,-0.759687 0.893182,-1.621681 1.327834,-0.766626 l 2.120636,3.673051 c 0.485895,0.841595 -0.841938,1.60822 -1.327833,0.766625 z";
+ -fx-shape: "m 12.10997,15.070611 c -0.49762,-0.759687 0.893182,-1.621681 1.327834,-0.766626 l 2.120636,3.673051 c 0.485895,0.841595 -0.841938,1.60822 -1.327833,0.766625 z";
}
.progress-indicator:indeterminate .segment9 {
- -fx-shape:"m 14.423504,13.443113 c -0.824945,-0.379757 -0.10368,-1.848478 0.718512,-1.354472 l 3.746739,1.987548 c 0.858478,0.455401 0.139967,1.809873 -0.718512,1.354473 z";
+ -fx-shape: "m 14.423504,13.443113 c -0.824945,-0.379757 -0.10368,-1.848478 0.718512,-1.354472 l 3.746739,1.987548 c 0.858478,0.455401 0.139967,1.809873 -0.718512,1.354473 z";
}
.progress-indicator:indeterminate .segment10 {
- -fx-shape:"m 15.372451,9.2445322 c -0.906719,-0.051108 -0.957826,1.5843588 0,1.5332498 l 4.241273,0 c 0.97179,0 0.97179,-1.5332498 0,-1.5332498 z";
+ -fx-shape: "m 15.372451,9.2445322 c -0.906719,-0.051108 -0.957826,1.5843588 0,1.5332498 l 4.241273,0 c 0.97179,0 0.97179,-1.5332498 0,-1.5332498 z";
}
.progress-indicator:indeterminate .segment11 {
- -fx-shape:"m 14.321262,6.5816808 c -0.824944,0.3797564 -0.10368,1.8484772 0.718513,1.3544717 L 18.786514,5.9486042 C 19.644992,5.4932031 18.92648,4.1387308 18.068001,4.5941315 z";
+ -fx-shape: "m 14.321262,6.5816808 c -0.824944,0.3797564 -0.10368,1.8484772 0.718513,1.3544717 L 18.786514,5.9486042 C 19.644992,5.4932031 18.92648,4.1387308 18.068001,4.5941315 z";
}
/*******************************************************************************
diff --git a/main/ui/src/main/resources/fxml/addvault_existing.fxml b/main/ui/src/main/resources/fxml/addvault_existing.fxml
index be780d03c..c46ad6355 100644
--- a/main/ui/src/main/resources/fxml/addvault_existing.fxml
+++ b/main/ui/src/main/resources/fxml/addvault_existing.fxml
@@ -7,8 +7,8 @@
-
+
@@ -10,9 +11,8 @@
-
-
+
@@ -8,9 +9,8 @@
-
-
-
-
+
-
-
+
+
diff --git a/main/ui/src/main/resources/fxml/addvault_new_recoverykey.fxml b/main/ui/src/main/resources/fxml/addvault_new_recoverykey.fxml
index ecfc1441a..956461fe9 100644
--- a/main/ui/src/main/resources/fxml/addvault_new_recoverykey.fxml
+++ b/main/ui/src/main/resources/fxml/addvault_new_recoverykey.fxml
@@ -5,8 +5,8 @@
-
+
+
@@ -8,10 +10,8 @@
-
-
-
+
-
-
+
+
-
-
-
-
+
diff --git a/main/ui/src/main/resources/fxml/error.fxml b/main/ui/src/main/resources/fxml/error.fxml
index 267c65ac3..adcebdb67 100644
--- a/main/ui/src/main/resources/fxml/error.fxml
+++ b/main/ui/src/main/resources/fxml/error.fxml
@@ -1,17 +1,17 @@
+
-
-
-
-
-
-
+
+
+
+
-
+
diff --git a/main/ui/src/main/resources/fxml/forget_password.fxml b/main/ui/src/main/resources/fxml/forget_password.fxml
index 077a587d2..10b085185 100644
--- a/main/ui/src/main/resources/fxml/forget_password.fxml
+++ b/main/ui/src/main/resources/fxml/forget_password.fxml
@@ -1,5 +1,6 @@
+
@@ -8,9 +9,8 @@
-
-
+
-
-
-
+
diff --git a/main/ui/src/main/resources/fxml/main_window_resize.fxml b/main/ui/src/main/resources/fxml/main_window_resize.fxml
index c6d025ff5..b4eb46916 100644
--- a/main/ui/src/main/resources/fxml/main_window_resize.fxml
+++ b/main/ui/src/main/resources/fxml/main_window_resize.fxml
@@ -1,8 +1,8 @@
-
diff --git a/main/ui/src/main/resources/fxml/main_window_title.fxml b/main/ui/src/main/resources/fxml/main_window_title.fxml
index 54ee8b238..624d64936 100644
--- a/main/ui/src/main/resources/fxml/main_window_title.fxml
+++ b/main/ui/src/main/resources/fxml/main_window_title.fxml
@@ -1,3 +1,4 @@
+
@@ -6,9 +7,8 @@
-
-
+
@@ -9,9 +10,8 @@
-
-
+
@@ -12,9 +13,8 @@
-
-
+
+
@@ -7,10 +9,8 @@
-
-
-
+
+
@@ -8,10 +10,8 @@
-
-
-
-
+
diff --git a/main/ui/src/main/resources/fxml/migration_success.fxml b/main/ui/src/main/resources/fxml/migration_success.fxml
index 9fd081757..c04068a9d 100644
--- a/main/ui/src/main/resources/fxml/migration_success.fxml
+++ b/main/ui/src/main/resources/fxml/migration_success.fxml
@@ -1,5 +1,7 @@
+
+
@@ -7,10 +9,8 @@
-
-
-
-
-
-
-
+
+
+
diff --git a/main/ui/src/main/resources/fxml/preferences.fxml b/main/ui/src/main/resources/fxml/preferences.fxml
index 92ee7c3a9..c0cd2b6c7 100644
--- a/main/ui/src/main/resources/fxml/preferences.fxml
+++ b/main/ui/src/main/resources/fxml/preferences.fxml
@@ -1,10 +1,10 @@
+
-
-
+
@@ -7,9 +8,8 @@
-
-
diff --git a/main/ui/src/main/resources/fxml/preferences_donationkey.fxml b/main/ui/src/main/resources/fxml/preferences_donationkey.fxml
index 8e192cd9f..087d9da26 100644
--- a/main/ui/src/main/resources/fxml/preferences_donationkey.fxml
+++ b/main/ui/src/main/resources/fxml/preferences_donationkey.fxml
@@ -1,5 +1,7 @@
+
+
@@ -8,10 +10,8 @@
-
-
-
@@ -26,7 +26,7 @@
-
+
@@ -42,7 +42,7 @@
-
+
diff --git a/main/ui/src/main/resources/fxml/preferences_general.fxml b/main/ui/src/main/resources/fxml/preferences_general.fxml
index 0e19ac470..1f1de67ad 100644
--- a/main/ui/src/main/resources/fxml/preferences_general.fxml
+++ b/main/ui/src/main/resources/fxml/preferences_general.fxml
@@ -9,8 +9,8 @@
-
diff --git a/main/ui/src/main/resources/fxml/preferences_updates.fxml b/main/ui/src/main/resources/fxml/preferences_updates.fxml
index 1e7890a3c..11d35ac3d 100644
--- a/main/ui/src/main/resources/fxml/preferences_updates.fxml
+++ b/main/ui/src/main/resources/fxml/preferences_updates.fxml
@@ -1,15 +1,15 @@
+
+
-
-
-
@@ -29,7 +29,7 @@
-
+
diff --git a/main/ui/src/main/resources/fxml/preferences_volume.fxml b/main/ui/src/main/resources/fxml/preferences_volume.fxml
index 1ac27fd85..1fa2ac222 100644
--- a/main/ui/src/main/resources/fxml/preferences_volume.fxml
+++ b/main/ui/src/main/resources/fxml/preferences_volume.fxml
@@ -1,14 +1,14 @@
+
-
-
diff --git a/main/ui/src/main/resources/fxml/quit.fxml b/main/ui/src/main/resources/fxml/quit.fxml
index cba3b32e9..0aba3bd10 100644
--- a/main/ui/src/main/resources/fxml/quit.fxml
+++ b/main/ui/src/main/resources/fxml/quit.fxml
@@ -1,5 +1,6 @@
+
@@ -9,9 +10,8 @@
-
-
+
+
-
-
-
-
+
diff --git a/main/ui/src/main/resources/fxml/recoverykey_display.fxml b/main/ui/src/main/resources/fxml/recoverykey_display.fxml
index 0be6c1c4c..e0c934cfb 100644
--- a/main/ui/src/main/resources/fxml/recoverykey_display.fxml
+++ b/main/ui/src/main/resources/fxml/recoverykey_display.fxml
@@ -1,15 +1,15 @@
+
+
-
-
-
+
+
+
+
-
-
-
-
-
-
+