mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-09-28 02:44:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

changed mainWindow StageStyle to UNDECORATED

Browse Source 
removed main_window_title area
moved main_window_resize functions to MainWindowController
put add vault button under the vault list and wrapped both in a ScrollPane
bound vault list height properties to amount of entries and width to scroll pane width
add listener to scroll down after adding a vault
moved preferences button under vault list
new style classes for new elements
changed wording
This commit is contained in:
Jan-Peter Klein
2024-05-28 21:56:03 +02:00
parent 8c7dd8c74f
commit e038348dca
8 changed files with 132 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/css/dark_theme.css
+21
View File
@@ -341,6 +341,27 @@
-fx-background-color: CONTROL_BG_ARMED;
}
.vault-list-box {
-fx-background-color: CONTROL_BG_NORMAL;
}
.add-vault-btn {
-fx-background-color: CONTROL_BG_NORMAL;
}
.add-vault-btn .icon {
-fx-fill: TEXT_FILL_MUTED;
}
.add-vault-btn-label {
-fx-font-family: 'Open Sans SemiBold';
-fx-font-size: 1.0em;
}
.preferences-btn {
-fx-background-color: MAIN_BG;
-fx-border-color: CONTROL_BORDER_NORMAL transparent transparent transparent;
-fx-border-width: 1px 0 0 0;
}
/*******************************************************************************
* *
* ScrollBar *
src/main/resources/css/light_theme.css
+20
View File
@@ -340,6 +340,26 @@
-fx-background-color: CONTROL_BG_ARMED;
}
.vault-list-box {
-fx-background-color: CONTROL_BG_NORMAL;
}
.add-vault-btn {
-fx-background-color: CONTROL_BG_NORMAL;
}
.add-vault-btn .icon {
-fx-fill: GRAY_4;
}
.add-vault-btn-label {
-fx-font-family: 'Open Sans SemiBold';
-fx-font-size: 1.0em;
}
.preferences-btn {
-fx-border-color: CONTROL_BORDER_NORMAL transparent transparent transparent;
-fx-border-width: 1px 0 0 0;
}
/*******************************************************************************
* *
* ScrollBar *
src/main/resources/fxml/main_window.fxml
-2
View File
@@ -9,11 +9,9 @@
fx:controller="org.cryptomator.ui.mainwindow.MainWindowController"
styleClass="main-window">
<VBox minWidth="650">
<fx:include source="main_window_title.fxml" VBox.vgrow="NEVER"/>
<SplitPane dividerPositions="0.33" orientation="HORIZONTAL" VBox.vgrow="ALWAYS">
<fx:include source="vault_list.fxml" SplitPane.resizableWithParent="false"/>
<fx:include source="vault_detail.fxml" SplitPane.resizableWithParent="true"/>
</SplitPane>
</VBox>
<fx:include source="main_window_resize.fxml"/>
</StackPane>
src/main/resources/fxml/vault_list.fxml
+35 -19
View File
@@ -1,38 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.ListView?>
<?import javafx.scene.layout.Region?>
<?import javafx.scene.layout.StackPane?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.shape.Arc?>
<?import javafx.scene.control.ContextMenu?>
<?import javafx.scene.control.MenuItem?>
<?import javafx.scene.layout.HBox?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.ScrollPane?>
<StackPane xmlns:fx="http://javafx.com/fxml"
xmlns="http://javafx.com/javafx"
fx:id="root"
fx:controller="org.cryptomator.ui.mainwindow.VaultListController"
minWidth="206">
<VBox>
<StackPane VBox.vgrow="ALWAYS">
<ListView fx:id="vaultList" editable="true" fixedCellSize="60">
<contextMenu>
<fx:include source="vault_list_contextmenu.fxml"/>
</contextMenu>
</ListView>
<VBox visible="${controller.emptyVaultList}" spacing="6" alignment="CENTER">
<Region VBox.vgrow="ALWAYS"/>
<Label VBox.vgrow="NEVER" text="%main.vaultlist.emptyList.onboardingInstruction" textAlignment="CENTER" wrapText="true"/>
<Arc VBox.vgrow="NEVER" styleClass="onboarding-overlay-arc" type="OPEN" centerX="50" centerY="0" radiusY="100" radiusX="50" startAngle="0" length="-60" strokeWidth="1"/>
<VBox styleClass="vault-list-box">
<ScrollPane fx:id="scrollPane" hbarPolicy="NEVER">
<VBox fx:id="vbox">
<ListView fx:id="vaultList" editable="true" fixedCellSize="60">
<contextMenu>
<fx:include source="vault_list_contextmenu.fxml"/>
</contextMenu>
</ListView>
<HBox fx:id="addVaultArea" styleClass="add-vault-btn" spacing="12" onMouseClicked="#toggleMenu">
<padding>
<Insets topRightBottomLeft="12"/>
</padding>
<VBox alignment="CENTER" minWidth="20">
<FontAwesome5IconView glyph="PLUS" styleClass="icon" HBox.hgrow="NEVER" glyphSize="16"/>
</VBox>
<VBox spacing="4" HBox.hgrow="ALWAYS" >
<Label styleClass="add-vault-btn-label" text="%main.vaultlist.addVaultBtn" />
</VBox>
</HBox>
</VBox>
</StackPane>
<Button fx:id="addVaultBtn" onAction="#toggleMenu" styleClass="toolbar-button" text="%main.vaultlist.addVaultBtn" alignment="BASELINE_CENTER" maxWidth="Infinity" contentDisplay="RIGHT">
<graphic>
<FontAwesome5IconView glyph="CARET_DOWN"/>
</graphic>
</Button>
</ScrollPane>
<Region VBox.vgrow="ALWAYS"/>
<HBox spacing="12" styleClass="preferences-btn" onMouseClicked="#showPreferences">
<padding>
<Insets topRightBottomLeft="12"/>
</padding>
<VBox alignment="CENTER" minWidth="20">
<FontAwesome5IconView glyph="COG" HBox.hgrow="NEVER" glyphSize="16"/>
</VBox>
<VBox spacing="4" HBox.hgrow="ALWAYS">
<Label styleClass="header-label" text="%preferences.title"/>
</VBox>
</HBox>
<fx:define>
<ContextMenu fx:id="addVaultContextMenu">
<items>
src/main/resources/i18n/strings.properties
+1 -1
View File
@@ -389,7 +389,7 @@ main.vaultlist.contextMenu.unlock=Unlock…
main.vaultlist.contextMenu.unlockNow=Unlock Now
main.vaultlist.contextMenu.vaultoptions=Show Vault Options
main.vaultlist.contextMenu.reveal=Reveal Drive
main.vaultlist.addVaultBtn=Add
main.vaultlist.addVaultBtn=Add Vault
main.vaultlist.addVaultBtn.menuItemNew=New Vault...
main.vaultlist.addVaultBtn.menuItemExisting=Existing Vault...
## Vault Detail