mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-04-20 01:26:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/redesign-mainwindow' into feature/condensed-vault-list

Browse Source
This commit is contained in:
Jan-Peter Klein
2024-09-17 18:06:14 +02:00
parent 7a913c89c9 32f266c721
commit 31e9f3a025
5 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/cryptomator/ui/mainwindow/MainWindowSceneFactory.java
View File

@@ -30,9 +30,7 @@ public class MainWindowSceneFactory extends DefaultSceneFactory {
@Override
protected void setupDefaultAccelerators(Scene scene, Stage stage) {
if (SystemUtils.IS_OS_WINDOWS) {
scene.getAccelerators().put(ALT_F4, window::close);
} else {
if (!SystemUtils.IS_OS_WINDOWS) {
scene.getAccelerators().put(SHORTCUT_W, window::close);
}
scene.getAccelerators().put(SHORTCUT_N, vaultListController.get()::didClickAddNewVault);

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

@@ -36,7 +36,6 @@ import javafx.scene.input.MouseEvent;
import javafx.scene.input.TransferMode;
import javafx.scene.layout.HBox;
import javafx.scene.layout.StackPane;
import javafx.scene.layout.VBox;
import javafx.stage.Stage;
import java.io.File;
import java.io.IOException;
@@ -75,9 +74,9 @@ public class VaultListController implements FxController {
private final BooleanBinding useCondensedMode;
public ListView<Vault> vaultList;
public VBox vbox;
public StackPane root;
public HBox addVaultButton;
@FXML
private HBox addVaultButton;
@FXML
private ContextMenu addVaultContextMenu;