GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-18 22:12:21 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

make 'forget card' undoable; remove checkpoint() in set_due_date

Browse source
This commit is contained in:
Damien Elmes 2021-03-12 16:13:50 +10:00
parent 9ba02b5ca6
commit 24762261d9
4 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ftl/core/undo.ftl
View file

@ -17,3 +17,4 @@ undo-update-tag = Update Tag
undo-update-note = Update Note undo-update-note = Update Note
undo-update-card = Update Card undo-update-card = Update Card
undo-update-deck = Update Deck undo-update-deck = Update Deck
undo-forget-card = Forget Card

2
qt/aqt/scheduling.py
View file

@ -58,7 +58,6 @@ def set_due_date_dialog(
on_done() on_done()
mw.checkpoint(tr(TR.ACTIONS_SET_DUE_DATE))
mw.taskman.with_progress(set_due, after_set) mw.taskman.with_progress(set_due, after_set)
@ -78,7 +77,6 @@ def forget_cards(
on_done() on_done()
mw.checkpoint(tr(TR.ACTIONS_FORGET))
mw.taskman.with_progress( mw.taskman.with_progress(
lambda: mw.col.sched.schedule_cards_as_new(card_ids), on_done_wrapper lambda: mw.col.sched.schedule_cards_as_new(card_ids), on_done_wrapper
) )

3
rslib/src/scheduler/new.rs
View file

@ -9,6 +9,7 @@ use crate::{
notes::NoteID, notes::NoteID,
search::SortMode, search::SortMode,
types::Usn, types::Usn,
undo::UndoableOpKind,
}; };
use rand::seq::SliceRandom; use rand::seq::SliceRandom;
use std::collections::{HashMap, HashSet}; use std::collections::{HashMap, HashSet};
@ -105,7 +106,7 @@ impl Collection {
pub fn reschedule_cards_as_new(&mut self, cids: &[CardID], log: bool) -> Result<()> { pub fn reschedule_cards_as_new(&mut self, cids: &[CardID], log: bool) -> Result<()> {
let usn = self.usn()?; let usn = self.usn()?;
let mut position = self.get_next_card_position(); let mut position = self.get_next_card_position();
self.transact(None, |col| { self.transact(Some(UndoableOpKind::ScheduleAsNew), |col| {
col.storage.set_search_table_to_card_ids(cids, true)?; col.storage.set_search_table_to_card_ids(cids, true)?;
let cards = col.storage.all_searched_cards_in_search_order()?; let cards = col.storage.all_searched_cards_in_search_order()?;
for mut card in cards { for mut card in cards {

2
rslib/src/undo/ops.rs
View file

@ -12,6 +12,7 @@ pub enum UndoableOpKind {
RemoveDeck, RemoveDeck,
RemoveNote, RemoveNote,
RenameDeck, RenameDeck,
ScheduleAsNew,
SetDueDate, SetDueDate,
Suspend, Suspend,
UnburyUnsuspend, UnburyUnsuspend,
@ -38,6 +39,7 @@ impl Collection {
UndoableOpKind::RemoveDeck => TR::DecksDeleteDeck, UndoableOpKind::RemoveDeck => TR::DecksDeleteDeck,
UndoableOpKind::RemoveNote => TR::StudyingDeleteNote, UndoableOpKind::RemoveNote => TR::StudyingDeleteNote,
UndoableOpKind::RenameDeck => TR::ActionsRenameDeck, UndoableOpKind::RenameDeck => TR::ActionsRenameDeck,
UndoableOpKind::ScheduleAsNew => TR::UndoForgetCard,
UndoableOpKind::SetDueDate => TR::ActionsSetDueDate, UndoableOpKind::SetDueDate => TR::ActionsSetDueDate,
UndoableOpKind::Suspend => TR::StudyingSuspend, UndoableOpKind::Suspend => TR::StudyingSuspend,
UndoableOpKind::UnburyUnsuspend => TR::UndoUnburyUnsuspend, UndoableOpKind::UnburyUnsuspend => TR::UndoUnburyUnsuspend,