diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ddd5f5d..a804ec92 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ * Fix LiveJasmin followed tab * Add buttons to settings to delete cookies per site * Fix bug in minimal browser +* Added model notes to the recordings table * Model placeholders can now be used for player params ${modelName} ${modelDisplayName} diff --git a/client/src/main/java/ctbrec/ui/tabs/RecordingsTab.java b/client/src/main/java/ctbrec/ui/tabs/RecordingsTab.java index 53e183b2..e3465102 100644 --- a/client/src/main/java/ctbrec/ui/tabs/RecordingsTab.java +++ b/client/src/main/java/ctbrec/ui/tabs/RecordingsTab.java @@ -59,6 +59,7 @@ import ctbrec.ui.menu.ModelMenuContributor; import ctbrec.ui.tabs.recorded.ModelName; import javafx.application.Platform; import javafx.beans.property.SimpleObjectProperty; +import javafx.beans.property.SimpleStringProperty; import javafx.collections.FXCollections; import javafx.collections.ObservableList; import javafx.concurrent.ScheduledService; @@ -174,8 +175,12 @@ public class RecordingsTab extends Tab implements TabSelectionListener, Shutdown notes.setId("notes"); notes.setPrefWidth(400); notes.setCellValueFactory(cdf -> cdf.getValue().getNoteProperty()); + TableColumn modelNotes = new TableColumn<>("Model Notes"); + modelNotes.setId("modelNotes"); + modelNotes.setPrefWidth(400); + modelNotes.setCellValueFactory(cdf -> new SimpleStringProperty(config.getModelNotes(cdf.getValue().getModel()))); - table.getColumns().addAll(name, date, status, progress, size, notes); + table.getColumns().addAll(name, date, status, progress, size, notes, modelNotes); table.setItems(observableRecordings); table.addEventHandler(ContextMenuEvent.CONTEXT_MENU_REQUESTED, this::onContextMenuRequested); table.addEventHandler(MouseEvent.MOUSE_PRESSED, this::onMousePressed);