From 26e76f228d9c7b26f510e3e3fd97c40a227e9569 Mon Sep 17 00:00:00 2001 From: Jafea7 Date: Tue, 6 May 2025 14:40:06 +1000 Subject: [PATCH] Change Record later to Bookmark --- client/src/main/java/ctbrec/ui/RecordUntilDialog.java | 2 +- .../main/java/ctbrec/ui/action/LaterGroupAction.java | 2 +- .../ctbrec/ui/action/MarkForLaterRecordingAction.java | 4 ++-- .../java/ctbrec/ui/menu/ModelGroupMenuBuilder.java | 2 +- .../main/java/ctbrec/ui/menu/ModelMenuContributor.java | 4 ++-- .../java/ctbrec/ui/tabs/recorded/RecordLaterTab.java | 2 +- .../main/java/ctbrec/ui/tabs/recorded/RecordedTab.java | 2 +- .../java/ctbrec/recorder/server/RecorderServlet.java | 10 +++++----- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/client/src/main/java/ctbrec/ui/RecordUntilDialog.java b/client/src/main/java/ctbrec/ui/RecordUntilDialog.java index 301356a4..8138ebf3 100644 --- a/client/src/main/java/ctbrec/ui/RecordUntilDialog.java +++ b/client/src/main/java/ctbrec/ui/RecordUntilDialog.java @@ -60,7 +60,7 @@ public class RecordUntilDialog { removeButton = new RadioButton("remove model"); removeButton.setSelected(model.getRecordUntilSubsequentAction() == REMOVE); removeButton.setToggleGroup(toggleGroup); - RadioButton recordLaterButton = new RadioButton("mark for later"); + RadioButton recordLaterButton = new RadioButton("bookmark"); recordLaterButton.setSelected(model.getRecordUntilSubsequentAction() == RECORD_LATER); recordLaterButton.setToggleGroup(toggleGroup); var row = new VBox(); diff --git a/client/src/main/java/ctbrec/ui/action/LaterGroupAction.java b/client/src/main/java/ctbrec/ui/action/LaterGroupAction.java index 2e1751cf..565844b8 100644 --- a/client/src/main/java/ctbrec/ui/action/LaterGroupAction.java +++ b/client/src/main/java/ctbrec/ui/action/LaterGroupAction.java @@ -31,7 +31,7 @@ public class LaterGroupAction extends ModelMassEditAction { recorder.markForLaterRecording(m, true); } } catch (InvalidKeyException | NoSuchAlgorithmException | IOException e) { - Platform.runLater(() -> Dialogs.showError(source.getScene(), "Couldn't change model state", "Mark for later recording of " + m.getName() + " failed", e)); + Platform.runLater(() -> Dialogs.showError(source.getScene(), "Couldn't change model state", "Bookmark of " + m.getName() + " failed", e)); } }; } diff --git a/client/src/main/java/ctbrec/ui/action/MarkForLaterRecordingAction.java b/client/src/main/java/ctbrec/ui/action/MarkForLaterRecordingAction.java index 915cb952..dc1c78f0 100644 --- a/client/src/main/java/ctbrec/ui/action/MarkForLaterRecordingAction.java +++ b/client/src/main/java/ctbrec/ui/action/MarkForLaterRecordingAction.java @@ -16,8 +16,8 @@ public class MarkForLaterRecordingAction extends ModelMassEditAction { try { recorder.markForLaterRecording(m, recordLater); } catch (Exception e) { - Platform.runLater(() -> Dialogs.showError(source.getScene(), "Couldn't model mark model for later recording", - "Marking for later recording of " + m.getName() + " failed", e)); + Platform.runLater(() -> Dialogs.showError(source.getScene(), "Couldn't bookmark model for later recording", + "Bookmarking of " + m.getName() + " failed", e)); } }; } diff --git a/client/src/main/java/ctbrec/ui/menu/ModelGroupMenuBuilder.java b/client/src/main/java/ctbrec/ui/menu/ModelGroupMenuBuilder.java index 7a18b72a..55f8653b 100644 --- a/client/src/main/java/ctbrec/ui/menu/ModelGroupMenuBuilder.java +++ b/client/src/main/java/ctbrec/ui/menu/ModelGroupMenuBuilder.java @@ -59,7 +59,7 @@ public class ModelGroupMenuBuilder { var stopAllOfGroup = new MenuItem("Stop all in group"); stopAllOfGroup.setOnAction(e -> new StopGroupAction(source, recorder, model).execute(callback)); - var laterAllOfGroup = new MenuItem("Record later all in group"); + var laterAllOfGroup = new MenuItem("Bookmark all in group"); laterAllOfGroup.setOnAction(e -> new LaterGroupAction(source, recorder, model).execute(callback)); menu.getItems().addAll(editGroup, resumeAllOfGroup, pauseAllOfGroup, stopAllOfGroup, laterAllOfGroup); diff --git a/client/src/main/java/ctbrec/ui/menu/ModelMenuContributor.java b/client/src/main/java/ctbrec/ui/menu/ModelMenuContributor.java index 7e72a8b8..83d1c2e0 100644 --- a/client/src/main/java/ctbrec/ui/menu/ModelMenuContributor.java +++ b/client/src/main/java/ctbrec/ui/menu/ModelMenuContributor.java @@ -292,9 +292,9 @@ public class ModelMenuContributor { private void addRecordLater(ContextMenu menu, List selectedModels) { var first = selectedModels.get(0); - var recordLater = new MenuItem("Record Later"); + var recordLater = new MenuItem("Add bookmark"); recordLater.setOnAction(e -> recordLater(selectedModels, true)); - var removeRecordLater = new MenuItem("Forget Model"); + var removeRecordLater = new MenuItem("Remove bookmark"); removeRecordLater.setOnAction(e -> recordLater(selectedModels, false)); var addRemoveBookmark = recorder.isMarkedForLaterRecording(first) ? removeRecordLater : recordLater; if (recorder.isTracked(first)) { diff --git a/client/src/main/java/ctbrec/ui/tabs/recorded/RecordLaterTab.java b/client/src/main/java/ctbrec/ui/tabs/recorded/RecordLaterTab.java index a007ef25..cf1a33b7 100644 --- a/client/src/main/java/ctbrec/ui/tabs/recorded/RecordLaterTab.java +++ b/client/src/main/java/ctbrec/ui/tabs/recorded/RecordLaterTab.java @@ -115,7 +115,7 @@ public class RecordLaterTab extends AbstractRecordedModelsTab { return new Task<>() { @Override public List call() { - log.trace("Updating models marked for later recording"); + log.trace("Updating bookmarked models"); return recorder.getModels().stream().filter(Model::isMarkedForLaterRecording).map(JavaFxModel::new).toList(); } }; diff --git a/client/src/main/java/ctbrec/ui/tabs/recorded/RecordedTab.java b/client/src/main/java/ctbrec/ui/tabs/recorded/RecordedTab.java index 96284df4..0285ea45 100644 --- a/client/src/main/java/ctbrec/ui/tabs/recorded/RecordedTab.java +++ b/client/src/main/java/ctbrec/ui/tabs/recorded/RecordedTab.java @@ -22,7 +22,7 @@ public class RecordedTab extends Tab implements TabSelectionListener, ShutdownLi setClosable(false); recordedModelsTab = new RecordedModelsTab("Active", recorder, sites); - recordLaterTab = new RecordLaterTab("Later", recorder, sites); + recordLaterTab = new RecordLaterTab("Bookmarked", recorder, sites); tabPane = new TabPane(); tabPane.setSide(Side.LEFT); diff --git a/server/src/main/java/ctbrec/recorder/server/RecorderServlet.java b/server/src/main/java/ctbrec/recorder/server/RecorderServlet.java index 400e48e2..25ed3e81 100644 --- a/server/src/main/java/ctbrec/recorder/server/RecorderServlet.java +++ b/server/src/main/java/ctbrec/recorder/server/RecorderServlet.java @@ -85,7 +85,7 @@ public class RecorderServlet extends AbstractCtbrecServlet { switch (requestDto.getAction()) { case "start": log.debug("Starting recording for model {} - {}", model.getName(), model.getUrl()); - log.trace("Model marked: {}", model.isMarkedForLaterRecording()); + log.trace("Model bookmarked: {}", model.isMarkedForLaterRecording()); log.trace("Model paused: {}", model.isSuspended()); log.trace("Model forced: {}", model.isForcePriority()); log.trace("Model until: {}", model.getRecordUntil().equals(Instant.ofEpochMilli(Model.RECORD_INDEFINITELY)) ? "no limit" : model.getRecordUntil()); @@ -258,14 +258,14 @@ public class RecorderServlet extends AbstractCtbrecServlet { sendModelGroups(resp, recorder.getModelGroups()); break; case "markForLater": - log.debug("Mark model {} for later recording", model.getName()); - response = "{\"status\": \"success\", \"msg\": \"Model marked for later recording\"}"; + log.debug("Bookmark model {} for later recording", model.getName()); + response = "{\"status\": \"success\", \"msg\": \"Model bookmarked for later recording\"}"; responseWriter.write(response); recorder.markForLaterRecording(model, true); break; case "unmarkForLater": - log.debug("Unmark model {} for later recording", model.getName()); - response = "{\"status\": \"success\", \"msg\": \"Model has been unmarked\"}"; + log.debug("Unbookmark model {} for later recording", model.getName()); + response = "{\"status\": \"success\", \"msg\": \"Model has been unbookmarked\"}"; responseWriter.write(response); recorder.markForLaterRecording(model, false); break;