diff --git a/src/main/java/org/cryptomator/ui/eventview/EventListCellController.java b/src/main/java/org/cryptomator/ui/eventview/EventListCellController.java index 5e39670ec..ebec6d3de 100644 --- a/src/main/java/org/cryptomator/ui/eventview/EventListCellController.java +++ b/src/main/java/org/cryptomator/ui/eventview/EventListCellController.java @@ -58,6 +58,7 @@ public class EventListCellController implements FxController { private final StringProperty eventMessage; private final StringProperty eventDescription; private final ObjectProperty eventIcon; + private final ObservableValue eventCount; private final ObservableValue vaultUnlocked; private final ObservableValue readableTime; private final ObservableValue readableDate; @@ -83,6 +84,7 @@ public class EventListCellController implements FxController { this.eventMessage = new SimpleStringProperty(); this.eventDescription = new SimpleStringProperty(); this.eventIcon = new SimpleObjectProperty<>(); + this.eventCount = ObservableUtil.mapWithDefault(event, e -> e.count() == 1? "" : "("+ e.count() +")", ""); this.vaultUnlocked = ObservableUtil.mapWithDefault(event.flatMap(e -> e.v().unlockedProperty()), Function.identity(), false); this.readableTime = ObservableUtil.mapWithDefault(event, e -> LOCAL_TIME_FORMATTER.format(e.timestamp()), ""); this.readableDate = ObservableUtil.mapWithDefault(event, e -> LOCAL_DATE_FORMATTER.format(e.timestamp()), ""); @@ -261,6 +263,14 @@ public class EventListCellController implements FxController { return message.getValue(); } + public ObservableValue countProperty() { + return eventCount; + } + + public String getCount() { + return eventCount.getValue(); + } + public ObservableValue descriptionProperty() { return description; } diff --git a/src/main/resources/css/light_theme.css b/src/main/resources/css/light_theme.css index d4800c4f5..b4376eaf5 100644 --- a/src/main/resources/css/light_theme.css +++ b/src/main/resources/css/light_theme.css @@ -321,6 +321,10 @@ -fx-font-size: 1.0em; } +.list-cell .header-misc { + -fx-font-size: 1.0em; +} + .list-cell .detail-label { -fx-text-fill: TEXT_FILL_MUTED; -fx-font-size: 0.8em; diff --git a/src/main/resources/fxml/eventview_cell.fxml b/src/main/resources/fxml/eventview_cell.fxml index 3a6c84bf9..02ee1ddd5 100644 --- a/src/main/resources/fxml/eventview_cell.fxml +++ b/src/main/resources/fxml/eventview_cell.fxml @@ -23,7 +23,10 @@ -