diff --git a/proto/anki/frontend.proto b/proto/anki/frontend.proto index 586c40cd7..c9dde4e8d 100644 --- a/proto/anki/frontend.proto +++ b/proto/anki/frontend.proto @@ -34,7 +34,7 @@ service FrontendService { // Plays the listed AV tags rpc PlayAVTags(PlayAVTagsRequest) returns (generic.Empty); - rpc OpenReviewerMenu(OpenReviewerMenuRequest) returns (generic.Empty); + rpc ReviewerAction(ReviewerActionRequest) returns (generic.Empty); } service BackendFrontendService {} @@ -53,8 +53,8 @@ message PlayAVTagsRequest { repeated card_rendering.AVTag tags = 1; } -message OpenReviewerMenuRequest { - enum ReviewerMenu { +message ReviewerActionRequest { + enum ReviewerAction { EditCurrent = 0; SetDueDate = 1; CardInfo = 2; @@ -68,7 +68,7 @@ message OpenReviewerMenuRequest { Overview = 7; }; - ReviewerMenu menu = 1; + ReviewerAction menu = 1; // In case the card isn't set in a next_card_data intercept function optional int64 current_card_id = 2; } \ No newline at end of file diff --git a/qt/aqt/mediasrv.py b/qt/aqt/mediasrv.py index ee1eba1aa..15c3456f7 100644 --- a/qt/aqt/mediasrv.py +++ b/qt/aqt/mediasrv.py @@ -31,7 +31,7 @@ from anki import hooks from anki.cards import Card from anki.collection import OpChanges, OpChangesOnly, Progress, SearchNode from anki.decks import UpdateDeckConfigs -from anki.frontend_pb2 import OpenReviewerMenuRequest, PlayAVTagsRequest +from anki.frontend_pb2 import PlayAVTagsRequest, ReviewerActionRequest from anki.scheduler.v3 import SchedulingStatesWithContext, SetSchedulingStatesRequest from anki.scheduler_pb2 import NextCardDataResponse from anki.template import ( @@ -726,14 +726,14 @@ def play_avtags(): play_tags(av_tags_to_native(req.tags)) -def open_reviewer_menu(): +def reviewer_action(): reviewer = aqt.mw.reviewer - MENU_ENUM = OpenReviewerMenuRequest.ReviewerMenu + MENU_ENUM = ReviewerActionRequest.ReviewerAction def overview(): aqt.mw.moveToState("overview") - REVIEWER_MENUS = { + REVIEWER_ACTIONS = { MENU_ENUM.EditCurrent: aqt.mw.onEditCurrent, MENU_ENUM.SetDueDate: reviewer.on_set_due, MENU_ENUM.CardInfo: reviewer.on_card_info, @@ -744,8 +744,8 @@ def open_reviewer_menu(): MENU_ENUM.Overview: overview, } - req = OpenReviewerMenuRequest.FromString(request.data) - aqt.mw.taskman.run_on_main(REVIEWER_MENUS[req.menu]) + req = ReviewerActionRequest.FromString(request.data) + aqt.mw.taskman.run_on_main(REVIEWER_ACTIONS[req.menu]) post_handler_list = [ @@ -766,7 +766,7 @@ post_handler_list = [ save_custom_colours, next_card_data, play_avtags, - open_reviewer_menu, + reviewer_action, ] diff --git a/ts/routes/reviewer/reviewer.ts b/ts/routes/reviewer/reviewer.ts index 7a0a09712..b61e0e791 100644 --- a/ts/routes/reviewer/reviewer.ts +++ b/ts/routes/reviewer/reviewer.ts @@ -1,7 +1,7 @@ // Copyright: Ankitects Pty Ltd and contributors // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html import type { UndoStatus } from "@generated/anki/collection_pb"; -import { OpenReviewerMenuRequest_ReviewerMenu } from "@generated/anki/frontend_pb"; +import { ReviewerActionRequest_ReviewerAction } from "@generated/anki/frontend_pb"; import { BuryOrSuspendCardsRequest_Mode, CardAnswer, @@ -13,11 +13,11 @@ import { compareAnswer, getConfigJson, nextCardData, - openReviewerMenu, playAvtags, redo, removeNotes, removeNoteTags, + reviewerAction, setConfigJson, undo, } from "@generated/backend"; @@ -106,40 +106,40 @@ export class ReviewerState { this.showQuestion(null); } - displayMenu(menu: OpenReviewerMenuRequest_ReviewerMenu) { - openReviewerMenu({ menu, currentCardId: this.currentCard?.card?.id }); + reviewerAction(menu: ReviewerActionRequest_ReviewerAction) { + reviewerAction({ menu, currentCardId: this.currentCard?.card?.id }); } public displayEditMenu() { - this.displayMenu(OpenReviewerMenuRequest_ReviewerMenu.EditCurrent); + this.reviewerAction(ReviewerActionRequest_ReviewerAction.EditCurrent); } public displaySetDueDateMenu() { - this.displayMenu(OpenReviewerMenuRequest_ReviewerMenu.SetDueDate); + this.reviewerAction(ReviewerActionRequest_ReviewerAction.SetDueDate); } public displayCardInfoMenu() { - this.displayMenu(OpenReviewerMenuRequest_ReviewerMenu.CardInfo); + this.reviewerAction(ReviewerActionRequest_ReviewerAction.CardInfo); } public displayPreviousCardInfoMenu() { - this.displayMenu(OpenReviewerMenuRequest_ReviewerMenu.PreviousCardInfo); + this.reviewerAction(ReviewerActionRequest_ReviewerAction.PreviousCardInfo); } public displayCreateCopyMenu() { - this.displayMenu(OpenReviewerMenuRequest_ReviewerMenu.CreateCopy); + this.reviewerAction(ReviewerActionRequest_ReviewerAction.CreateCopy); } public displayForgetMenu() { - this.displayMenu(OpenReviewerMenuRequest_ReviewerMenu.Forget); + this.reviewerAction(ReviewerActionRequest_ReviewerAction.Forget); } public displayOptionsMenu() { - this.displayMenu(OpenReviewerMenuRequest_ReviewerMenu.Options); + this.reviewerAction(ReviewerActionRequest_ReviewerAction.Options); } public displayOverview() { - this.displayMenu(OpenReviewerMenuRequest_ReviewerMenu.Overview); + this.reviewerAction(ReviewerActionRequest_ReviewerAction.Overview); } public toggleMarked() {