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

add reposition tool, make sure to bump mod on setgroup, don't show 0 reviews

Browse source
This commit is contained in:
Damien Elmes 2011-04-21 10:49:01 +09:00
parent 591bc8444e
commit d89098b677
2 changed files with 194 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
aqt/browser.py
View file

@ -10,7 +10,7 @@ import time, types, sys, re
from operator import attrgetter, itemgetter from operator import attrgetter, itemgetter
import anki, anki.utils, aqt.forms import anki, anki.utils, aqt.forms
from anki.utils import fmtTimeSpan, parseTags, hasTag, addTags, delTags, \ from anki.utils import fmtTimeSpan, parseTags, hasTag, addTags, delTags, \
ids2str, stripHTMLMedia, isWin ids2str, stripHTMLMedia, isWin, intTime
from aqt.utils import saveGeom, restoreGeom, saveSplitter, restoreSplitter, \ from aqt.utils import saveGeom, restoreGeom, saveSplitter, restoreSplitter, \
saveHeader, restoreHeader, saveState, restoreState, applyStyles, getTag, \ saveHeader, restoreHeader, saveState, restoreState, applyStyles, getTag, \
showInfo, askUser, tooltip showInfo, askUser, tooltip
@ -345,6 +345,7 @@ class Browser(QMainWindow):
c(f.actionSetGroup, s, self.setGroup) c(f.actionSetGroup, s, self.setGroup)
c(f.actionAddTag, s, self.addTags) c(f.actionAddTag, s, self.addTags)
c(f.actionDeleteTag, s, self.deleteTags) c(f.actionDeleteTag, s, self.deleteTags)
c(f.actionReposition, s, self.reposition)
c(f.actionReschedule, s, self.reschedule) c(f.actionReschedule, s, self.reschedule)
c(f.actionCram, s, self.cram) c(f.actionCram, s, self.cram)
c(f.actionAddCards, s, self.genCards) c(f.actionAddCards, s, self.genCards)
@ -676,13 +677,13 @@ class Browser(QMainWindow):
def _systemTagTree(self, root): def _systemTagTree(self, root):
tags = ( tags = (
(_("All cards"), "stock_new_template", ""), (_("All cards"), "stock_new_template", ""),
(_("New"), "stock_new_template_blue.png", "is:new"),
(_("Learning"), "stock_new_template_red.png", "is:lrn"),
(_("Review"), "stock_new_template_green.png", "is:rev"),
(_("Marked"), "rating.png", "tag:marked"), (_("Marked"), "rating.png", "tag:marked"),
(_("Suspended"), "media-playback-pause.png", "is:suspended"), (_("Suspended"), "media-playback-pause.png", "is:suspended"),
(_("Leech"), "emblem-important.png", "tag:leech"), (_("Leech"), "emblem-important.png", "tag:leech"),
(_("Never seen"), "stock_new_template_blue.png", "is:new"), (_("Due"), "stock_new_template_green.png", "is:due"))
(_("In learning"), "stock_new_template_red.png", "is:lrn"),
(_("In review"), "stock_new_template_green.png", "is:rev"),
(_("Due reviews"), "stock_new_template_green.png", "is:due"))
for name, icon, cmd in tags: for name, icon, cmd in tags:
item = self.CallbackItem( item = self.CallbackItem(
name, lambda c=cmd: self.setFilter(c)) name, lambda c=cmd: self.setFilter(c))
@ -721,8 +722,9 @@ class Browser(QMainWindow):
extra = self.cardStats.makeLine( extra = self.cardStats.makeLine(
_("Sort Field"), "<a href=sort>%s</a>" % sortf) _("Sort Field"), "<a href=sort>%s</a>" % sortf)
# and revlog # and revlog
extra += self.cardStats.makeLine( if self.card.reps:
_("Reviews"), "<a href=revlog>%d</a>" % self.card.reps) extra += self.cardStats.makeLine(
_("Reviews"), "<a href=revlog>%d</a>" % self.card.reps)
rep = rep.replace("</table>", extra) rep = rep.replace("</table>", extra)
self.form.cardLabel.setText(rep) self.form.cardLabel.setText(rep)
@ -891,19 +893,20 @@ where id in %s""" % ids2str(sf))
def onSetGroup(self, frm, te): def onSetGroup(self, frm, te):
self.model.beginReset() self.model.beginReset()
self.mw.checkpoint(_("Set Group")) self.mw.checkpoint(_("Set Group"))
mod = intTime()
if frm.setCur.isChecked(): if frm.setCur.isChecked():
gid = self.deck.groupId(unicode(te.text())) gid = self.deck.groupId(unicode(te.text()))
self.deck.db.execute( self.deck.db.execute(
"update cards set gid = ? where id in " + ids2str( "update cards set mod=?, gid=? where id in " + ids2str(
self.selectedCards()), gid) self.selectedCards()), mod, gid)
if frm.setInitial.isChecked(): if frm.setInitial.isChecked():
self.deck.db.execute( self.deck.db.execute(
"update facts set gid = ? where id in " + ids2str( "update facts set mod=?, gid=? where id in " + ids2str(
self.selectedFacts()), gid) self.selectedFacts()), mod, gid)
else: else:
self.deck.db.execute(""" self.deck.db.execute("""
update cards set gid = (select gid from facts where id = cards.fid) update cards set mod=?, gid=(select gid from facts where id = cards.fid)
where id in %s""" % ids2str(self.selectedCards())) where id in %s""" % ids2str(self.selectedCards()), mod)
self.onSearch(reset=False) self.onSearch(reset=False)
self.mw.requireReset() self.mw.requireReset()
self.model.endReset() self.model.endReset()
@ -968,6 +971,35 @@ where id in %s""" % ids2str(self.selectedCards()))
else: else:
self.deleteTags(tags="marked", label=False) self.deleteTags(tags="marked", label=False)
# Repositioning
######################################################################
def reposition(self):
cids = self.selectedCards()
cids = self.deck.db.list(
"select id from cards where type = 0 and id in " + ids2str(cids))
if not cids:
return showInfo(_("Only new cards can be repositioned."))
d = QDialog(self)
d.setWindowModality(Qt.WindowModal)
frm = aqt.forms.reposition.Ui_Dialog()
frm.setupUi(d)
(pmin, pmax) = self.deck.db.first(
"select min(due), max(due) from cards where type=0")
txt = _("Queue top: %d") % pmin
txt += "\n" + _("Queue bottom: %d") % pmax
frm.label.setText(txt)
if not d.exec_():
return
self.model.beginReset()
self.mw.checkpoint(_("Reposition"))
self.deck.sched.sortCards(
cids, start=frm.start.value(), step=frm.step.value(),
shuffle=frm.randomize.isChecked(), shift=frm.shift.isChecked())
self.onSearch(reset=False)
self.mw.requireReset()
self.model.endReset()
# Rescheduling # Rescheduling
###################################################################### ######################################################################

149
designer/reposition.ui Normal file
View file

@ -0,0 +1,149 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>Dialog</class>
<widget class="QDialog" name="Dialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>272</width>
<height>229</height>
</rect>
</property>
<property name="windowTitle">
<string>Reposition New Cards</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Start position:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QSpinBox" name="start">
<property name="minimum">
<number>-20000000</number>
</property>
<property name="maximum">
<number>200000000</number>
</property>
<property name="value">
<number>0</number>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Step:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QSpinBox" name="step">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>10000</number>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QCheckBox" name="randomize">
<property name="text">
<string>Randomize order</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="shift">
<property name="text">
<string>Shift position of existing cards</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</widget>
<tabstops>
<tabstop>start</tabstop>
<tabstop>step</tabstop>
<tabstop>randomize</tabstop>
<tabstop>shift</tabstop>
<tabstop>buttonBox</tabstop>
</tabstops>
<resources/>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>Dialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>Dialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>316</x>
<y>260</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
</hint>
</hints>
</connection>
</connections>
</ui>