strip duplicate stuff from deck properties

This commit is contained in:
Damien Elmes 2009-01-05 13:55:52 +09:00
parent bcfb876664
commit 890bbb8c0d
2 changed files with 51 additions and 188 deletions

View file

@ -27,12 +27,6 @@ class DeckProperties(QDialog):
self.origMod = self.d.modified self.origMod = self.d.modified
self.dialog = ankiqt.forms.deckproperties.Ui_DeckProperties() self.dialog = ankiqt.forms.deckproperties.Ui_DeckProperties()
self.dialog.setupUi(self) self.dialog.setupUi(self)
self.dialog.newCardOrder.insertItems(
0, QStringList(newCardOrderLabels().values()))
self.dialog.newCardScheduling.insertItems(
0, QStringList(newCardSchedulingLabels().values()))
self.dialog.revCardOrder.insertItems(
0, QStringList(revCardOrderLabels().values()))
self.readData() self.readData()
self.connect(self.dialog.modelsAdd, SIGNAL("clicked()"), self.onAdd) self.connect(self.dialog.modelsAdd, SIGNAL("clicked()"), self.onAdd)
self.connect(self.dialog.modelsEdit, SIGNAL("clicked()"), self.onEdit) self.connect(self.dialog.modelsEdit, SIGNAL("clicked()"), self.onEdit)
@ -69,10 +63,6 @@ class DeckProperties(QDialog):
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.failedCardMax.setText(unicode(self.d.failedCardMax)) self.dialog.failedCardMax.setText(unicode(self.d.failedCardMax))
self.dialog.newCardsPerDay.setText(unicode(self.d.newCardsPerDay))
self.dialog.newCardOrder.setCurrentIndex(self.d.newCardOrder)
self.dialog.newCardScheduling.setCurrentIndex(self.d.newCardSpacing)
self.dialog.revCardOrder.setCurrentIndex(self.d.revCardOrder)
# sources # sources
self.sources = self.d.s.all("select id, name from sources") self.sources = self.d.s.all("select id, name from sources")
self.sourcesToRemove = [] self.sourcesToRemove = []
@ -240,8 +230,6 @@ class DeckProperties(QDialog):
self.updateField(self.d, 'delay2', v) self.updateField(self.d, 'delay2', v)
v = int(self.dialog.failedCardMax.text()) v = int(self.dialog.failedCardMax.text())
self.updateField(self.d, 'failedCardMax', max(v, 5)) self.updateField(self.d, 'failedCardMax', max(v, 5))
v = int(self.dialog.newCardsPerDay.text())
self.updateField(self.d, 'newCardsPerDay', v)
except ValueError: except ValueError:
pass pass
# hour shift # hour shift
@ -265,13 +253,6 @@ class DeckProperties(QDialog):
self.updateField(self.d, self.updateField(self.d,
"suspended", "suspended",
unicode(self.dialog.postponing.text())) unicode(self.dialog.postponing.text()))
# new card order
self.updateField(self.d, "newCardOrder",
self.dialog.newCardOrder.currentIndex())
self.updateField(self.d, "newCardSpacing",
self.dialog.newCardScheduling.currentIndex())
self.updateField(self.d, "revCardOrder",
self.dialog.revCardOrder.currentIndex())
# sources # sources
d = {} d = {}
d.update(self.sources) d.update(self.sources)

View file

@ -8,7 +8,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>394</width> <width>335</width>
<height>400</height> <height>400</height>
</rect> </rect>
</property> </property>
@ -29,79 +29,22 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>378</width> <width>319</width>
<height>334</height> <height>334</height>
</rect> </rect>
</property> </property>
<attribute name="title" > <attribute name="title" >
<string>Scheduling</string> <string>Models &amp;&amp; Scheduling</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_6" > <layout class="QGridLayout" name="gridLayout_6" >
<item row="0" column="0" > <item row="4" column="0" >
<layout class="QGridLayout" name="gridLayout_2" >
<item row="3" column="1" >
<widget class="QLabel" name="label_15" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text" >
<string>&lt;h1>Basic Scheduling&lt;/h1></string>
</property>
</widget>
</item>
<item row="4" column="1" >
<layout class="QGridLayout" name="gridLayout_3" >
<item row="0" column="1" >
<spacer name="horizontalSpacer" >
<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="QLineEdit" name="newCardsPerDay" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="label_11" >
<property name="text" >
<string>&lt;b>Number of new cards per day</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
<item row="1" column="0" >
<widget class="QComboBox" name="newCardOrder" />
</item>
<item row="3" column="0" >
<widget class="QComboBox" name="newCardScheduling" />
</item>
<item row="8" column="0" >
<widget class="QLabel" name="label_16" > <widget class="QLabel" name="label_16" >
<property name="text" > <property name="text" >
<string>&lt;h1>Priorities&lt;/h1></string> <string>&lt;h1>Priorities&lt;/h1></string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="9" column="0" > <item row="5" column="0" >
<layout class="QGridLayout" name="gridLayout_4" > <layout class="QGridLayout" name="gridLayout_4" >
<item row="0" column="0" > <item row="0" column="0" >
<widget class="QLabel" name="label_21" > <widget class="QLabel" name="label_21" >
@ -157,7 +100,7 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="10" column="0" > <item row="6" column="0" >
<spacer name="verticalSpacer_2" > <spacer name="verticalSpacer_2" >
<property name="orientation" > <property name="orientation" >
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
@ -170,41 +113,49 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="4" column="0" > <item row="1" column="0" >
<widget class="QComboBox" name="revCardOrder" /> <widget class="QLabel" name="label_14" >
</item> <property name="text" >
<item row="6" column="0" > <string>&lt;h1>Models&lt;/h1></string>
<widget class="Line" name="line_2" > </property>
<property name="orientation" > <property name="wordWrap" >
<enum>Qt::Horizontal</enum> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0" > <item row="2" column="0" >
<spacer name="verticalSpacer_3" > <widget class="QListWidget" name="modelsList" />
<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>
<item row="7" column="0" > <item row="3" column="0" >
<spacer name="verticalSpacer_5" > <layout class="QHBoxLayout" name="_2" >
<property name="orientation" > <property name="spacing" >
<enum>Qt::Vertical</enum> <number>6</number>
</property> </property>
<property name="sizeHint" stdset="0" > <property name="margin" >
<size> <number>0</number>
<width>20</width>
<height>40</height>
</size>
</property> </property>
</spacer> <item>
<widget class="QPushButton" name="modelsAdd" >
<property name="text" >
<string>&amp;Add</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="modelsEdit" >
<property name="text" >
<string>&amp;Edit</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="modelsDelete" >
<property name="text" >
<string>&amp;Delete</string>
</property>
</widget>
</item>
</layout>
</item> </item>
</layout> </layout>
</widget> </widget>
@ -213,8 +164,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>378</width> <width>346</width>
<height>334</height> <height>356</height>
</rect> </rect>
</property> </property>
<attribute name="title" > <attribute name="title" >
@ -348,78 +299,13 @@ p, li { white-space: pre-wrap; }
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="tab_3" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>378</width>
<height>334</height>
</rect>
</property>
<attribute name="title" >
<string>Models</string>
</attribute>
<layout class="QVBoxLayout" >
<property name="spacing" >
<number>6</number>
</property>
<property name="margin" >
<number>6</number>
</property>
<item>
<widget class="QLabel" name="label_14" >
<property name="text" >
<string>&lt;h1>Models&lt;/h1></string>
</property>
<property name="wordWrap" >
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QListWidget" name="modelsList" />
</item>
<item>
<layout class="QHBoxLayout" >
<property name="spacing" >
<number>6</number>
</property>
<property name="margin" >
<number>0</number>
</property>
<item>
<widget class="QPushButton" name="modelsAdd" >
<property name="text" >
<string>&amp;Add</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="modelsEdit" >
<property name="text" >
<string>&amp;Edit</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="modelsDelete" >
<property name="text" >
<string>&amp;Delete</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_4" > <widget class="QWidget" name="tab_4" >
<property name="geometry" > <property name="geometry" >
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>378</width> <width>346</width>
<height>334</height> <height>356</height>
</rect> </rect>
</property> </property>
<attribute name="title" > <attribute name="title" >
@ -743,10 +629,10 @@ p, li { white-space: pre-wrap; }
</widget> </widget>
<tabstops> <tabstops>
<tabstop>qtabwidget</tabstop> <tabstop>qtabwidget</tabstop>
<tabstop>newCardsPerDay</tabstop> <tabstop>modelsList</tabstop>
<tabstop>newCardOrder</tabstop> <tabstop>modelsAdd</tabstop>
<tabstop>newCardScheduling</tabstop> <tabstop>modelsEdit</tabstop>
<tabstop>revCardOrder</tabstop> <tabstop>modelsDelete</tabstop>
<tabstop>highPriority</tabstop> <tabstop>highPriority</tabstop>
<tabstop>medPriority</tabstop> <tabstop>medPriority</tabstop>
<tabstop>lowPriority</tabstop> <tabstop>lowPriority</tabstop>
@ -756,10 +642,6 @@ p, li { white-space: pre-wrap; }
<tabstop>sourcesTable</tabstop> <tabstop>sourcesTable</tabstop>
<tabstop>addSource</tabstop> <tabstop>addSource</tabstop>
<tabstop>deleteSource</tabstop> <tabstop>deleteSource</tabstop>
<tabstop>modelsList</tabstop>
<tabstop>modelsAdd</tabstop>
<tabstop>modelsEdit</tabstop>
<tabstop>modelsDelete</tabstop>
<tabstop>delay0</tabstop> <tabstop>delay0</tabstop>
<tabstop>delay1</tabstop> <tabstop>delay1</tabstop>
<tabstop>delay2</tabstop> <tabstop>delay2</tabstop>