diff --git a/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java b/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java index 5a375e9b1..508f833f0 100644 --- a/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java +++ b/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java @@ -11,6 +11,7 @@ import org.cryptomator.cryptofs.CryptoFileSystemProvider; import org.cryptomator.cryptofs.DirStructure; import org.cryptomator.cryptofs.common.Constants; import org.cryptomator.cryptofs.event.BrokenDirFileEvent; +import org.cryptomator.cryptofs.event.ConflictResolvedEvent; import org.cryptomator.integrations.mount.MountService; import org.cryptomator.ui.addvaultwizard.AddVaultWizardComponent; import org.cryptomator.ui.common.FxController; @@ -211,6 +212,7 @@ public class VaultListController implements FxController { @FXML private void toggleMenu() { notificationRadar.getEventsRequiringNotification().add(new BrokenDirFileEvent(Path.of("C:\\Your\\Momma\\Does\\Things"))); + notificationRadar.getEventsRequiringNotification().add(new ConflictResolvedEvent(Path.of("a"), Path.of("b"), Path.of("c"), Path.of("d"))); appWindows.showNotification(); /* if (addVaultContextMenu.isShowing()) { diff --git a/src/main/java/org/cryptomator/ui/notification/NotificationController.java b/src/main/java/org/cryptomator/ui/notification/NotificationController.java index 72c940d9e..571b89dc0 100644 --- a/src/main/java/org/cryptomator/ui/notification/NotificationController.java +++ b/src/main/java/org/cryptomator/ui/notification/NotificationController.java @@ -26,8 +26,8 @@ import java.util.concurrent.ExecutorService; @NotificationScoped public class NotificationController implements FxController { - private static final String LOREM_IPSUM = """ - Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam"""; + private static final String LOREM_IPSUM = "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam"; + private static final String LOREM_BOB = "Let's do it again then, what the heck. Let that brush dance around there and play. In your world you have total and absolute power."; private final Stage window; private final SimpleListProperty notificationsProp; @@ -61,11 +61,16 @@ public class NotificationController implements FxController { private void adjustTexts(ObservableValue observable, FilesystemEvent oldEvent, FilesystemEvent newEvent) { switch (newEvent) { - default -> { + case BrokenDirFileEvent bdfe -> { message.set("BABA"); description.set(LOREM_IPSUM); actionText.set("ACTION"); } + default -> { + message.set("YAGA"); + description.set(LOREM_BOB); + actionText.set("ACTION2"); + } } }