GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-24 16:56:36 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

move Rating up a level

Browse source 
More ergonomic, and will allow reuse if we expose prop:rated in
the future.
This commit is contained in:
Damien Elmes 2021-01-30 11:54:39 +10:00
parent 082b807c2e
commit 705012164b
4 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
qt/aqt/browser.py
View file

@ -1001,7 +1001,7 @@ QTableView {{ gridline-color: {grid} }}
tr(TR.BROWSING_AGAIN_TODAY), tr(TR.BROWSING_AGAIN_TODAY),
SearchTerm( SearchTerm(
rated=SearchTerm.Rated( rated=SearchTerm.Rated(
days=1, rating=SearchTerm.Rated.Rating.ANSWER_BUTTON_1 days=1, rating=SearchTerm.Rating.ANSWER_BUTTON_1
) )
), ),
), ),

2
qt/aqt/customstudy.py
View file

@ -163,7 +163,7 @@ class CustomStudy(QDialog):
search = self.mw.col.build_search_string( search = self.mw.col.build_search_string(
SearchTerm( SearchTerm(
rated=SearchTerm.Rated( rated=SearchTerm.Rated(
days=spin, rating=SearchTerm.Rated.Rating.ANSWER_BUTTON_1 days=spin, rating=SearchTerm.Rating.ANSWER_BUTTON_1
) )
) )
) )

16
rslib/backend.proto
View file

@ -777,15 +777,15 @@ message SearchTerm {
GREEN = 4; GREEN = 4;
BLUE = 5; BLUE = 5;
} }
enum Rating {
ANY_ANSWER_BUTTON = 0;
ANSWER_BUTTON_1 = 1;
ANSWER_BUTTON_2 = 2;
ANSWER_BUTTON_3 = 3;
ANSWER_BUTTON_4 = 4;
MANUAL_RESCHEDULE = 5;
}
message Rated { message Rated {
enum Rating {
ANY_ANSWER_BUTTON = 0;
ANSWER_BUTTON_1 = 1;
ANSWER_BUTTON_2 = 2;
ANSWER_BUTTON_3 = 3;
ANSWER_BUTTON_4 = 4;
MANUAL_RESCHEDULE = 5;
}
uint32 days = 1; uint32 days = 1;
Rating rating = 2; Rating rating = 2;
} }

16
rslib/src/backend/mod.rs
View file

@ -355,15 +355,15 @@ impl From<BoolSeparatorProto> for BoolSeparator {
} }
} }
impl From<pb::search_term::rated::Rating> for EaseKind { impl From<pb::search_term::Rating> for EaseKind {
fn from(r: pb::search_term::rated::Rating) -> Self { fn from(r: pb::search_term::Rating) -> Self {
match r { match r {
pb::search_term::rated::Rating::AnswerButton1 => EaseKind::AnswerButton(1), pb::search_term::Rating::AnswerButton1 => EaseKind::AnswerButton(1),
pb::search_term::rated::Rating::AnswerButton2 => EaseKind::AnswerButton(2), pb::search_term::Rating::AnswerButton2 => EaseKind::AnswerButton(2),
pb::search_term::rated::Rating::AnswerButton3 => EaseKind::AnswerButton(3), pb::search_term::Rating::AnswerButton3 => EaseKind::AnswerButton(3),
pb::search_term::rated::Rating::AnswerButton4 => EaseKind::AnswerButton(4), pb::search_term::Rating::AnswerButton4 => EaseKind::AnswerButton(4),
pb::search_term::rated::Rating::AnyAnswerButton => EaseKind::AnyAnswerButton, pb::search_term::Rating::AnyAnswerButton => EaseKind::AnyAnswerButton,
pb::search_term::rated::Rating::ManualReschedule => EaseKind::ManualReschedule, pb::search_term::Rating::ManualReschedule => EaseKind::ManualReschedule,
} }
} }
} }