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

make sure to update order when adding/deleting/changing option groups (#675)

Browse source
This commit is contained in:
Damien Elmes 2013-05-18 18:17:58 +09:00
parent 3326254eec
commit 9ca8c660b0
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
aqt/deckconf.py
View file

@ -1,6 +1,7 @@
# Copyright: Damien Elmes <anki@ichi2.net> # Copyright: Damien Elmes <anki@ichi2.net>
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
from anki.consts import NEW_CARDS_RANDOM
from aqt.qt import * from aqt.qt import *
import aqt import aqt
@ -15,6 +16,7 @@ class DeckConf(QDialog):
self.deck = deck self.deck = deck
self.childDids = [ self.childDids = [
d[1] for d in self.mw.col.decks.children(self.deck['id'])] d[1] for d in self.mw.col.decks.children(self.deck['id'])]
self._origNewOrder = None
self.form = aqt.forms.dconf.Ui_Dialog() self.form = aqt.forms.dconf.Ui_Dialog()
self.form.setupUi(self) self.form.setupUi(self)
self.mw.checkpoint(_("Options")) self.mw.checkpoint(_("Options"))
@ -61,6 +63,8 @@ class DeckConf(QDialog):
startOn = idx startOn = idx
self.ignoreConfChange = False self.ignoreConfChange = False
self.form.dconf.setCurrentIndex(startOn) self.form.dconf.setCurrentIndex(startOn)
if self._origNewOrder is None:
self._origNewOrder = self.confList[startOn]['new']['order']
self.onConfChange(startOn) self.onConfChange(startOn)
def confOpts(self): def confOpts(self):
@ -253,6 +257,12 @@ class DeckConf(QDialog):
c['order'] = f.newOrder.currentIndex() c['order'] = f.newOrder.currentIndex()
c['perDay'] = f.newPerDay.value() c['perDay'] = f.newPerDay.value()
c['separate'] = f.separate.isChecked() c['separate'] = f.separate.isChecked()
if self._origNewOrder != c['order']:
# order of current deck has changed, so have to resort
if c['order'] == NEW_CARDS_RANDOM:
self.mw.col.sched.randomizeCards(self.deck['id'])
else:
self.mw.col.sched.orderCards(self.deck['id'])
# rev # rev
c = self.conf['rev'] c = self.conf['rev']
c['perDay'] = f.revPerDay.value() c['perDay'] = f.revPerDay.value()