diff --git a/src/main/java/org/cryptomator/ui/notification/NotificationController.java b/src/main/java/org/cryptomator/ui/notification/NotificationController.java index 156227e4f..d538409bd 100644 --- a/src/main/java/org/cryptomator/ui/notification/NotificationController.java +++ b/src/main/java/org/cryptomator/ui/notification/NotificationController.java @@ -31,6 +31,7 @@ public class NotificationController implements FxController { private final IntegerProperty selectionIndex; private final ObservableStringValue paging; private final ObjectProperty selectedEvent; + private final StringProperty vaultName; private final StringProperty message; private final StringProperty description; private final StringProperty actionText; @@ -43,6 +44,7 @@ public class NotificationController implements FxController { this.selectionIndex = new SimpleIntegerProperty(-1); this.selectedEvent = new SimpleObjectProperty<>(); this.paging = Bindings.createStringBinding(() -> selectionIndex.get() + 1 + "/" + events.size(), selectionIndex, events); + this.vaultName = new SimpleStringProperty(); this.message = new SimpleStringProperty(); this.description = new SimpleStringProperty(); this.actionText = new SimpleStringProperty(); @@ -64,6 +66,7 @@ public class NotificationController implements FxController { //TODO: Translations! private void selectTexts(ObservableValue observable, VaultEvent oldEvent, VaultEvent newEvent) { if (newEvent == null) { + vaultName.set(""); message.set("NO CONTENT"); description.set(BUG_MSG); actionText.set(null); @@ -72,6 +75,7 @@ public class NotificationController implements FxController { switch (newEvent.actualEvent()) { default -> { + vaultName.set(newEvent.v().getDisplayName()); message.set("NO CONTENT"); description.set(BUG_MSG); actionText.set(null); @@ -130,6 +134,13 @@ public class NotificationController implements FxController { //FXML bindings + public ObservableValue vaultNameProperty() { + return vaultName; + } + + public String getVaultName() { + return vaultName.get(); + } public ObservableValue messageProperty() { return message; } diff --git a/src/main/resources/css/light_theme.css b/src/main/resources/css/light_theme.css index 9bdea8e0a..2439000b6 100644 --- a/src/main/resources/css/light_theme.css +++ b/src/main/resources/css/light_theme.css @@ -113,6 +113,11 @@ -fx-font-size: 1.2em; } +.label-window-title { + -fx-font-family: 'Open Sans SemiBold'; + -fx-font-size: 1.0em; +} + .label-small { -fx-font-size: 0.8em; } diff --git a/src/main/resources/fxml/notification.fxml b/src/main/resources/fxml/notification.fxml index b21524d94..2b0b9431b 100644 --- a/src/main/resources/fxml/notification.fxml +++ b/src/main/resources/fxml/notification.fxml @@ -3,6 +3,7 @@ + @@ -19,42 +20,44 @@ - - - - - + + + + + + + +
- + + + + + -
- - - - - + +