update cram for new properties

This commit is contained in:
Damien Elmes 2012-05-24 14:19:25 +09:00
parent f836d8d9bb
commit 63a31dc7bd
3 changed files with 138 additions and 129 deletions

View file

@ -41,23 +41,28 @@ class DeckConf(QDialog):
def loadConf(self): def loadConf(self):
f = self.form f = self.form
d = self.deck d = self.deck
f.search.setText(d['search']) search, limit, order = d['terms'][0]
f.steps.setText(self.listToUser(d['delays'])) f.search.setText(search)
f.order.setCurrentIndex(d['order']) if d['delays']:
f.limit.setValue(d['limit']) f.steps.setText(self.listToUser(d['delays']))
f.fmult.setValue(d['fmult']*100) f.stepsOn.setChecked(True)
else:
f.steps.setText("1 10")
f.stepsOn.setChecked(False)
f.order.setCurrentIndex(order)
f.limit.setValue(limit)
def saveConf(self): def saveConf(self):
f = self.form f = self.form
d = self.deck d = self.deck
steps = self.userToList(f.steps) d['delays'] = None
if not steps: if f.stepsOn.isChecked():
return steps = self.userToList(f.steps)
d['delays'] = steps if steps:
d['search'] = f.search.text() d['delays'] = steps
d['order'] = f.order.currentIndex() d['terms'][0] = [f.search.text(),
d['limit'] = f.limit.value() f.limit.value(),
d['fmult'] = f.fmult.value() / 100.0 f.order.currentIndex()]
self.mw.col.decks.save(d) self.mw.col.decks.save(d)
return True return True

View file

@ -95,10 +95,10 @@ class Overview(object):
def _desc(self, deck): def _desc(self, deck):
if deck['dyn']: if deck['dyn']:
desc = "%s<br>%s<br>%s" % ( search, limit, order = deck['terms'][0]
_("Search: %s") % deck['search'], desc = "%s<br>%s" % (
_("Order: %s") % dynOrderLabels()[deck['order']], _("Search: %s") % search,
_("Steps: %s") % " ".join([str(x) for x in deck['delays']])) _("Order: %s") % dynOrderLabels()[order].lower())
else: else:
desc = deck.get("desc", "") desc = deck.get("desc", "")
if not desc: if not desc:

View file

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>397</width> <width>619</width>
<height>293</height> <height>300</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -15,109 +15,95 @@
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<layout class="QGridLayout" name="gridLayout"> <widget class="QComboBox" name="examples"/>
<item row="4" column="1"> </item>
<widget class="QSpinBox" name="limit"> <item>
<property name="minimum"> <widget class="QGroupBox" name="groupBox">
<number>1</number> <property name="title">
</property> <string>Create deck from search</string>
<property name="maximum"> </property>
<number>99999</number> <layout class="QGridLayout" name="gridLayout">
</property> <item row="1" column="0">
</widget> <widget class="QLabel" name="label_5">
</item> <property name="text">
<item row="4" column="2"> <string>Limit to</string>
<spacer name="horizontalSpacer_2"> </property>
<property name="orientation"> </widget>
<enum>Qt::Horizontal</enum> </item>
</property> <item row="0" column="0">
<property name="sizeHint" stdset="0"> <widget class="QLabel" name="label_2">
<size> <property name="text">
<width>40</width> <string>Search</string>
<height>20</height> </property>
</size> </widget>
</property> </item>
</spacer> <item row="1" column="1">
</item> <widget class="QSpinBox" name="limit">
<item row="0" column="0"> <property name="maximumSize">
<widget class="QLabel" name="label_2"> <size>
<property name="text"> <width>60</width>
<string>Search for:</string> <height>16777215</height>
</property> </size>
</widget> </property>
</item> <property name="minimum">
<item row="2" column="0"> <number>1</number>
<widget class="QLabel" name="label_4"> </property>
<property name="text"> <property name="maximum">
<string>Learning steps:</string> <number>9999</number>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item row="1" column="2">
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="label">
<property name="text"> <property name="text">
<string>Card limit:</string> <string>cards selected by</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="1"> <item row="0" column="1" colspan="6">
<widget class="QSpinBox" name="fmult"> <widget class="QLineEdit" name="search"/>
<property name="maximum"> </item>
<number>100</number> <item row="1" column="3" colspan="4">
</property> <widget class="QComboBox" name="order"/>
</widget> </item>
</item> </layout>
<item row="3" column="0"> </widget>
<widget class="QLabel" name="label_6"> </item>
<property name="text"> <item>
<string>Display order:</string> <widget class="QGroupBox" name="groupBox_2">
</property> <property name="title">
</widget> <string>Options</string>
</item> </property>
<item row="5" column="2"> <layout class="QGridLayout" name="gridLayout_2">
<widget class="QLabel" name="label_8"> <item row="0" column="0" colspan="2">
<property name="text"> <widget class="QCheckBox" name="resched">
<string>%</string> <property name="text">
</property> <string>Reschedule cards based on my answers in this deck</string>
</widget> </property>
</item> <property name="checked">
<item row="1" column="1" colspan="2"> <bool>true</bool>
<widget class="QLabel" name="label_3"> </property>
<property name="text"> </widget>
<string>Example: deck:french tag:hard</string> </item>
</property> <item row="1" column="0">
</widget> <widget class="QCheckBox" name="stepsOn">
</item> <property name="text">
<item row="5" column="0"> <string>Custom steps (in minutes)</string>
<widget class="QLabel" name="label_7"> </property>
<property name="text"> </widget>
<string>Interval on fail:</string> </item>
</property> <item row="1" column="1">
</widget> <widget class="QLineEdit" name="steps">
</item> <property name="enabled">
<item row="5" column="3"> <bool>false</bool>
<spacer name="horizontalSpacer"> </property>
<property name="orientation"> <property name="text">
<enum>Qt::Horizontal</enum> <string>1 10</string>
</property> </property>
<property name="sizeHint" stdset="0"> </widget>
<size> </item>
<width>40</width> </layout>
<height>20</height> </widget>
</size>
</property>
</spacer>
</item>
<item row="2" column="1" colspan="3">
<widget class="QLineEdit" name="steps"/>
</item>
<item row="0" column="1" colspan="3">
<widget class="QLineEdit" name="search"/>
</item>
<item row="3" column="1" colspan="3">
<widget class="QComboBox" name="order"/>
</item>
</layout>
</item> </item>
<item> <item>
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">
@ -146,11 +132,13 @@
</widget> </widget>
<tabstops> <tabstops>
<tabstop>search</tabstop> <tabstop>search</tabstop>
<tabstop>steps</tabstop>
<tabstop>order</tabstop>
<tabstop>limit</tabstop> <tabstop>limit</tabstop>
<tabstop>fmult</tabstop> <tabstop>order</tabstop>
<tabstop>resched</tabstop>
<tabstop>stepsOn</tabstop>
<tabstop>steps</tabstop>
<tabstop>buttonBox</tabstop> <tabstop>buttonBox</tabstop>
<tabstop>examples</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>
<connections> <connections>
@ -161,8 +149,8 @@
<slot>accept()</slot> <slot>accept()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>248</x> <x>254</x>
<y>254</y> <y>295</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>157</x> <x>157</x>
@ -177,8 +165,8 @@
<slot>reject()</slot> <slot>reject()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>316</x> <x>322</x>
<y>260</y> <y>295</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>286</x> <x>286</x>
@ -186,5 +174,21 @@
</hint> </hint>
</hints> </hints>
</connection> </connection>
<connection>
<sender>stepsOn</sender>
<signal>toggled(bool)</signal>
<receiver>steps</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>126</x>
<y>207</y>
</hint>
<hint type="destinationlabel">
<x>272</x>
<y>205</y>
</hint>
</hints>
</connection>
</connections> </connections>
</ui> </ui>