mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-21 20:21:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adjust notification dialog

Browse Source 
* add scrollbar to description content
* move filename to own visual element
* move vaultName above message

Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
This commit is contained in:
Armin Schrenk
2025-12-21 11:40:02 +01:00
parent 7718445f7c
commit aaf921afcf
2 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/org/cryptomator/ui/notification/NotificationController.java
View File

@@ -44,6 +44,7 @@ public class NotificationController implements FxController {
private final ObservableStringValue paging;
private final ObjectProperty<VaultEvent> selectedEvent;
private final ObservableValue<Boolean> singleEvent;
private final StringProperty fileName;
private final StringProperty vaultName;
private final StringProperty eventTimestamp;
private final StringProperty message;
@@ -66,6 +67,7 @@ public class NotificationController implements FxController {
this.vaultName = new SimpleStringProperty();
this.eventTimestamp = new SimpleStringProperty();
this.message = new SimpleStringProperty();
this.fileName = new SimpleStringProperty("");
this.description = new SimpleStringProperty();
this.actionText = new SimpleStringProperty();
this.executorService = executorService;
@@ -98,10 +100,11 @@ public class NotificationController implements FxController {
var userAndDevice = fiiue.owner().split(Constants.HUB_USER_DEVICE_SEPARATOR);
var user = userAndDevice[0];
var device = userAndDevice.length == 1 ? userAndDevice[0] : userAndDevice[1];
var squashedName = convertPathStringToShortenedFileName(fiiue.cleartextPath());
var cleartextFileName = fiiue.cleartextPath().substring(fiiue.cleartextPath().lastIndexOf('/') + 1);
eventTimestamp.set(localizedTimeFormatter.format(fiiue.lastUpdated()));
message.set("File %s is locked".formatted(squashedName));
description.set("Currently this file is opened by %s on device %s. Ask the user to close the file and trigger a sync. Otherwise, you can ignore the lock and open it anyway, but be aware of the data loss risk.".formatted(user, device));
message.set("File is opened on another device");
fileName.set(cleartextFileName);
description.set("The file is opened by %s on device %s. Ask the user to close the file and sync again. Otherwise, you can ignore the lock and open it anyway.".formatted(user, device));
actionText.set("Ignore Lock");
/* TODO: Once feature is out of beta, activate translations
message.set(resourceBundle.getString("notification.inUse.message"));
@@ -117,22 +120,6 @@ public class NotificationController implements FxController {
}
}
/**
* Extracts the filename of a (string) path and possibly shortens it.
*
* @param path a string path containing a filename. Must not end with "/"
* @return the filename of the path, possibly shortened with an ellipsis
*/
private String convertPathStringToShortenedFileName(String path) {
var filename = path.substring(path.lastIndexOf("/") + 1);
if (filename.length() < 20) {
return filename;
} else {
return filename.substring(0, 14) + "…" + filename.substring(filename.length() - 6);
}
}
@FXML
public void processSelectedEvent() {
try {
@@ -208,6 +195,14 @@ public class NotificationController implements FxController {
return vaultName.get();
}
public ObservableValue<String> fileNameProperty() {
return fileName;
}
public String getFileName() {
return fileName.get();
}
public ObservableValue<String> messageProperty() {
return message;
}

10
src/main/resources/fxml/notification.fxml
View File

@@ -11,6 +11,7 @@
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.Region?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.control.ScrollPane?>
<BorderPane xmlns="http://javafx.com/javafx"
xmlns:fx="http://javafx.com/fxml"
fx:controller="org.cryptomator.ui.notification.NotificationController"
@@ -56,13 +57,16 @@
<Insets top="6"/>
</padding>
<HBox>
<Label text="${controller.message}" styleClass="label-large" wrapText="true"/>
<Label text="${controller.vaultName}" styleClass="label-small" wrapText="true"/>
<Region minWidth="12" HBox.hgrow="ALWAYS"/>
<Label text="${controller.eventTime}" styleClass="label-small" />
</HBox>
<Label text="${controller.vaultName}" styleClass="label-small" wrapText="true"/>
<Label text="${controller.message}" styleClass="label-large" wrapText="true"/>
<Label text="${controller.fileName}" styleClass="label" textOverrun="CENTER_ELLIPSIS" visible="${!controller.fileName.empty}" managed="${!controller.fileName.empty}"/>
<Region minHeight="6"/>
<Label text="${controller.description}" styleClass="label" wrapText="true"/>
<ScrollPane minViewportWidth="370" minViewportHeight="50">
<Label text="${controller.description}" styleClass="label" wrapText="true" maxWidth="370"/>
</ScrollPane>
<Region VBox.vgrow="ALWAYS"/>
<Button text="${controller.actionText}" onAction="#processSelectedEvent"
visible="${!controller.actionText.empty}" managed="${!controller.actionText.empty}"/>