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

tweak deck properties layout; add deck-level spacing options

Browse source
This commit is contained in:
Damien Elmes 2010-12-02 03:55:39 +09:00
parent ef27280b08
commit 4fa5c0d432
2 changed files with 328 additions and 149 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ankiqt/ui/deckproperties.py
View file

@ -54,7 +54,7 @@ class DeckProperties(QDialog):
getattr(self.dialog, type + "Max").setText(str(v)) getattr(self.dialog, type + "Max").setText(str(v))
self.dialog.delay0.setText(unicode(self.d.delay0/60.0)) self.dialog.delay0.setText(unicode(self.d.delay0/60.0))
self.dialog.delay1.setText(unicode(self.d.delay1)) self.dialog.delay1.setText(unicode(self.d.delay1))
self.dialog.delay2.setText(unicode(self.d.delay2)) self.dialog.delay2.setText(unicode(int(self.d.delay2*100)))
self.dialog.collapse.setCheckState(self.d.collapseTime self.dialog.collapse.setCheckState(self.d.collapseTime
and Qt.Checked or Qt.Unchecked) and Qt.Checked or Qt.Unchecked)
self.dialog.perDay.setCheckState(self.d.getBool("perDay") self.dialog.perDay.setCheckState(self.d.getBool("perDay")
@ -67,6 +67,9 @@ class DeckProperties(QDialog):
# leeches # leeches
self.dialog.suspendLeeches.setChecked(self.d.getBool("suspendLeeches")) self.dialog.suspendLeeches.setChecked(self.d.getBool("suspendLeeches"))
self.dialog.leechFails.setValue(self.d.getInt("leechFails")) self.dialog.leechFails.setValue(self.d.getInt("leechFails"))
# spacing
self.dialog.newSpacing.setText(unicode(self.d.getFloat("newSpacing")/60.0))
self.dialog.revSpacing.setText(unicode(int(self.d.getFloat("revSpacing")*100)))
def updateModelsList(self): def updateModelsList(self):
idx = self.dialog.modelsList.currentRow() idx = self.dialog.modelsList.currentRow()
@ -187,8 +190,8 @@ class DeckProperties(QDialog):
v2 = int(self.dialog.delay1.text()) v2 = int(self.dialog.delay1.text())
v2 = max(0, v2) v2 = max(0, v2)
self.updateField(self.d, 'delay1', v2) self.updateField(self.d, 'delay1', v2)
v = float(self.dialog.delay2.text()) v = float(self.dialog.delay2.text()) / 100.0
self.updateField(self.d, 'delay2', min(v, 1)) self.updateField(self.d, 'delay2', max(0, min(100, v)))
except ValueError: except ValueError:
pass pass
try: try:
@ -198,6 +201,12 @@ class DeckProperties(QDialog):
int(self.dialog.leechFails.value())) int(self.dialog.leechFails.value()))
except ValueError: except ValueError:
pass pass
try:
self.d.setVar("newSpacing", float(self.dialog.newSpacing.text()) * 60)
self.d.setVar("revSpacing", float(
self.dialog.revSpacing.text()) / 100.0)
except ValueError:
pass
# hour shift # hour shift
try: try:
offset = float(str(self.dialog.timeOffset.text())) offset = float(str(self.dialog.timeOffset.text()))

444
designer/deckproperties.ui
View file

@ -9,8 +9,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>379</width> <width>373</width>
<height>396</height> <height>452</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -208,7 +208,7 @@
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<item row="6" column="3"> <item row="6" column="2">
<widget class="QLineEdit" name="easyMin"> <widget class="QLineEdit" name="easyMin">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@ -216,23 +216,15 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
</widget> <property name="maximumSize">
</item> <size>
<item row="5" column="2"> <width>50</width>
<widget class="QLabel" name="label_6"> <height>16777215</height>
<property name="text"> </size>
<string>Min</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="2"> <item row="5" column="4">
<widget class="QLabel" name="label_7">
<property name="text">
<string>Min</string>
</property>
</widget>
</item>
<item row="5" column="5">
<widget class="QLineEdit" name="midMax"> <widget class="QLineEdit" name="midMax">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@ -240,6 +232,12 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="maximumSize">
<size>
<width>50</width>
<height>16777215</height>
</size>
</property>
</widget> </widget>
</item> </item>
<item row="6" column="0"> <item row="6" column="0">
@ -256,14 +254,17 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="4"> <item row="6" column="3">
<widget class="QLabel" name="label_10"> <widget class="QLabel" name="label_10">
<property name="text"> <property name="text">
<string>Max</string> <string>~</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="3"> <item row="4" column="2">
<widget class="QLineEdit" name="hardMin"> <widget class="QLineEdit" name="hardMin">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@ -271,9 +272,21 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize">
<size>
<width>50</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>50</width>
<height>16777215</height>
</size>
</property>
</widget> </widget>
</item> </item>
<item row="5" column="3"> <item row="5" column="2">
<widget class="QLineEdit" name="midMin"> <widget class="QLineEdit" name="midMin">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@ -281,16 +294,25 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
</widget> <property name="maximumSize">
</item> <size>
<item row="4" column="4"> <width>50</width>
<widget class="QLabel" name="label_8"> <height>16777215</height>
<property name="text"> </size>
<string>Max</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="5"> <item row="4" column="3">
<widget class="QLabel" name="label_8">
<property name="text">
<string>~</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="6" column="4">
<widget class="QLineEdit" name="easyMax"> <widget class="QLineEdit" name="easyMax">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@ -298,9 +320,15 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="maximumSize">
<size>
<width>50</width>
<height>16777215</height>
</size>
</property>
</widget> </widget>
</item> </item>
<item row="4" column="5"> <item row="4" column="4">
<widget class="QLineEdit" name="hardMax"> <widget class="QLineEdit" name="hardMax">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@ -308,19 +336,27 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
</widget> <property name="minimumSize">
</item> <size>
<item row="4" column="2"> <width>50</width>
<widget class="QLabel" name="label_5"> <height>0</height>
<property name="text"> </size>
<string>Min</string> </property>
<property name="maximumSize">
<size>
<width>50</width>
<height>16777215</height>
</size>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="4"> <item row="5" column="3">
<widget class="QLabel" name="label_9"> <widget class="QLabel" name="label_9">
<property name="text"> <property name="text">
<string>Max</string> <string>~</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
@ -331,16 +367,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="5">
<widget class="QLineEdit" name="delay0">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_20"> <widget class="QLabel" name="label_20">
<property name="text"> <property name="text">
@ -348,28 +374,21 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="6"> <item row="4" column="5">
<widget class="QLabel" name="label">
<property name="text">
<string>mins</string>
</property>
</widget>
</item>
<item row="4" column="6">
<widget class="QLabel" name="label_30"> <widget class="QLabel" name="label_30">
<property name="text"> <property name="text">
<string>days</string> <string>days</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="6"> <item row="5" column="5">
<widget class="QLabel" name="label_31"> <widget class="QLabel" name="label_31">
<property name="text"> <property name="text">
<string>days</string> <string>days</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="6"> <item row="6" column="5">
<widget class="QLabel" name="label_32"> <widget class="QLabel" name="label_32">
<property name="text"> <property name="text">
<string>days</string> <string>days</string>
@ -412,14 +431,43 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="6"> <item row="3" column="0" colspan="6">
<widget class="QLabel" name="label_25"> <widget class="Line" name="line_2">
<property name="text"> <property name="orientation">
<string>days</string> <enum>Qt::Horizontal</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="5"> <item row="0" column="2">
<widget class="QLineEdit" name="delay0">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>50</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>50</width>
<height>16777215</height>
</size>
</property>
</widget>
</item>
<item row="0" column="3" colspan="2">
<widget class="QLabel" name="label">
<property name="text">
<string>minutes</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QLineEdit" name="delay2"> <widget class="QLineEdit" name="delay2">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@ -427,9 +475,15 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="maximumSize">
<size>
<width>50</width>
<height>16777215</height>
</size>
</property>
</widget> </widget>
</item> </item>
<item row="2" column="5"> <item row="2" column="2">
<widget class="QLineEdit" name="delay1"> <widget class="QLineEdit" name="delay1">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@ -437,50 +491,36 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
</widget> <property name="maximumSize">
</item> <size>
<item row="3" column="0" colspan="7"> <width>50</width>
<widget class="Line" name="line_2"> <height>16777215</height>
<property name="orientation"> </size>
<enum>Qt::Horizontal</enum>
</property> </property>
</widget> </widget>
</item> </item>
</layout> <item row="2" column="3" colspan="2">
<widget class="QLabel" name="label_25">
<property name="text">
<string>days</string>
</property>
</widget>
</item> </item>
<item> <item row="7" column="0" colspan="6">
<widget class="Line" name="line"> <widget class="Line" name="line">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="12" column="0" colspan="6">
<layout class="QGridLayout" name="gridLayout_5"> <widget class="Line" name="line_3">
<item row="2" column="0">
<widget class="QLabel" name="label_29">
<property name="text">
<string>New day starts at</string>
</property>
</widget>
</item>
<item row="2" column="1">
<spacer name="horizontalSpacer_3">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0"> </widget>
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item> </item>
<item row="2" column="2"> <item row="13" column="0">
<widget class="QLineEdit" name="timeOffset"/>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_26"> <widget class="QLabel" name="label_26">
<property name="text"> <property name="text">
<string>Show failed cards early</string> <string>Show failed cards early</string>
@ -490,64 +530,192 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="13" column="2">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="2">
<widget class="QCheckBox" name="collapse"> <widget class="QCheckBox" name="collapse">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="15" column="0">
<widget class="QLabel" name="label_11">
<property name="text">
<string>Suspend leeches</string>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QCheckBox" name="suspendLeeches">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_15">
<property name="text">
<string>Leech failure threshold</string>
</property>
</widget>
</item>
<item row="4" column="2">
<widget class="QSpinBox" name="leechFails"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_23"> <widget class="QLabel" name="label_23">
<property name="text"> <property name="text">
<string>Per-day scheduling</string> <string>Per-day scheduling</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="2"> <item row="15" column="2">
<widget class="QCheckBox" name="perDay"> <widget class="QCheckBox" name="perDay">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="0">
<widget class="QLabel" name="label_15">
<property name="text">
<string>Leech threshold</string>
</property>
</widget>
</item>
<item row="8" column="2">
<widget class="QSpinBox" name="leechFails">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>50</width>
<height>16777215</height>
</size>
</property>
</widget>
</item>
<item row="9" column="0">
<widget class="QLabel" name="label_29">
<property name="text">
<string>Shift midnight by</string>
</property>
</widget>
</item>
<item row="9" column="2">
<widget class="QLineEdit" name="timeOffset">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>50</width>
<height>16777215</height>
</size>
</property>
</widget>
</item>
<item row="10" column="0">
<widget class="QLabel" name="label_12">
<property name="text">
<string>New card spacing</string>
</property>
</widget>
</item>
<item row="10" column="2">
<widget class="QLineEdit" name="newSpacing">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>50</width>
<height>16777215</height>
</size>
</property>
</widget>
</item>
<item row="10" column="3" colspan="2">
<widget class="QLabel" name="label_27">
<property name="text">
<string>minutes</string>
</property>
</widget>
</item>
<item row="14" column="0">
<widget class="QLabel" name="label_11">
<property name="text">
<string>Suspend leeches</string>
</property>
</widget>
</item>
<item row="14" column="2">
<widget class="QCheckBox" name="suspendLeeches">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="11" column="0">
<widget class="QLabel" name="label_18">
<property name="text">
<string>Review card spacing</string>
</property>
</widget>
</item>
<item row="11" column="2">
<widget class="QLineEdit" name="revSpacing">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>50</width>
<height>16777215</height>
</size>
</property>
</widget>
</item>
<item row="11" column="3">
<widget class="QLabel" name="label_28">
<property name="text">
<string>%</string>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QLabel" name="label_33">
<property name="text">
<string>%</string>
</property>
</widget>
</item>
<item row="9" column="3" colspan="3">
<widget class="QLabel" name="label_34">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>hours</string>
</property>
</widget>
</item>
<item row="8" column="3" colspan="2">
<widget class="QLabel" name="label_35">
<property name="text">
<string>failures</string>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
<item> <item>
@ -599,11 +767,13 @@
<tabstop>midMax</tabstop> <tabstop>midMax</tabstop>
<tabstop>easyMin</tabstop> <tabstop>easyMin</tabstop>
<tabstop>easyMax</tabstop> <tabstop>easyMax</tabstop>
<tabstop>collapse</tabstop>
<tabstop>perDay</tabstop>
<tabstop>timeOffset</tabstop>
<tabstop>suspendLeeches</tabstop>
<tabstop>leechFails</tabstop> <tabstop>leechFails</tabstop>
<tabstop>timeOffset</tabstop>
<tabstop>newSpacing</tabstop>
<tabstop>revSpacing</tabstop>
<tabstop>collapse</tabstop>
<tabstop>suspendLeeches</tabstop>
<tabstop>perDay</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>
<connections> <connections>