From a18b5c50755a6a1054ee100f895c9d02cc33c1f7 Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Thu, 21 Apr 2011 10:56:26 +0900
Subject: [PATCH] fix study options saving & randomize/order; update reschedule

---
 aqt/browser.py         | 29 +++++----------
 aqt/studyopts.py       |  7 +++-
 designer/reschedule.ui | 84 +++++++++++++++++++++++-------------------
 3 files changed, 62 insertions(+), 58 deletions(-)

diff --git a/aqt/browser.py b/aqt/browser.py
index 57c3c39b1..03e684906 100644
--- a/aqt/browser.py
+++ b/aqt/browser.py
@@ -1004,31 +1004,22 @@ where id in %s""" % ids2str(self.selectedCards()), mod)
     ######################################################################
 
     def reschedule(self):
-        return showInfo("not yet implemented")
-        n = _("Reschedule")
         d = QDialog(self)
+        d.setWindowModality(Qt.WindowModal)
         frm = aqt.forms.reschedule.Ui_Dialog()
         frm.setupUi(d)
         if not d.exec_():
             return
-        self.deck.setUndoStart(n)
-        try:
-            if frm.asNew.isChecked():
-                self.deck.resetCards(self.selectedCards())
-            else:
-                try:
-                    min = float(frm.rangeMin.value())
-                    max = float(frm.rangeMax.value())
-                except ValueError:
-                    ui.utils.showInfo(
-                        _("Please enter a valid range."),
-                        parent=self)
-                    return
-                self.deck.rescheduleCards(self.selectedCards(), min, max)
-        finally:
-            self.deck.reset()
-            self.deck.setUndoEnd(n)
+        self.model.beginReset()
+        self.mw.checkpoint(_("Reschedule"))
+        if frm.asNew.isChecked():
+            self.deck.sched.forgetCards(self.selectedCards())
+        else:
+            self.deck.sched.reschedCards(
+                self.selectedCards(), frm.min.value(), frm.max.value())
+        self.onSearch(reset=False)
         self.mw.requireReset()
+        self.model.endReset()
 
     # Edit: selection
     ######################################################################
diff --git a/aqt/studyopts.py b/aqt/studyopts.py
index 4fcebd15f..6593da229 100644
--- a/aqt/studyopts.py
+++ b/aqt/studyopts.py
@@ -43,6 +43,9 @@ class StudyOptions(QDialog):
         f.dayOffset.setValue(self.startDate.hour)
         f.lrnCutoff.setValue(qc['collapseTime']/60.0)
 
+    def reject(self):
+        self.accept()
+
     def accept(self):
         f = self.form
         d = self.mw.deck
@@ -69,7 +72,7 @@ class StudyOptions(QDialog):
             return
         self.mw.progress.start()
         if new == 1:
-            self.deck.orderNewCards()
+            self.mw.deck.sched.orderCards()
         else:
-            self.deck.randomizeNewCards()
+            self.mw.deck.sched.randomizeCards()
         self.mw.progress.finish()
diff --git a/designer/reschedule.ui b/designer/reschedule.ui
index fb748370c..26e9d9cfb 100644
--- a/designer/reschedule.ui
+++ b/designer/reschedule.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>255</width>
-    <height>158</height>
+    <width>325</width>
+    <height>144</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -17,7 +17,7 @@
    <item>
     <widget class="QRadioButton" name="asNew">
      <property name="text">
-      <string>Reschedule as new cards</string>
+      <string>Place at end of new card queue</string>
      </property>
      <property name="checked">
       <bool>true</bool>
@@ -25,9 +25,9 @@
     </widget>
    </item>
    <item>
-    <widget class="QRadioButton" name="inRange">
+    <widget class="QRadioButton" name="asRev">
      <property name="text">
-      <string>Reschedule with initial interval in range:</string>
+      <string>Place in review queue with interval between:</string>
      </property>
     </widget>
    </item>
@@ -38,39 +38,48 @@
      </property>
      <layout class="QVBoxLayout" name="verticalLayout">
       <property name="leftMargin">
-       <number>30</number>
+       <number>20</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
       </property>
       <item>
        <layout class="QGridLayout" name="gridLayout">
-        <item row="0" column="0">
-         <widget class="QLabel" name="label">
+        <item row="0" column="1">
+         <widget class="QLabel" name="label_3">
           <property name="text">
-           <string>Min</string>
+           <string>~</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="0">
+         <widget class="QSpinBox" name="min">
+          <property name="maximum">
+           <number>9999</number>
           </property>
          </widget>
         </item>
         <item row="0" column="2">
-         <widget class="QLabel" name="label_3">
-          <property name="text">
-           <string>days</string>
+         <widget class="QSpinBox" name="max">
+          <property name="maximum">
+           <number>9999</number>
           </property>
          </widget>
         </item>
-        <item row="1" column="0">
-         <widget class="QLabel" name="label_2">
-          <property name="text">
-           <string>Max</string>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="2">
+        <item row="0" column="3">
          <widget class="QLabel" name="label_4">
           <property name="text">
            <string>days</string>
           </property>
          </widget>
         </item>
-        <item row="0" column="3">
+        <item row="0" column="4">
          <spacer name="horizontalSpacer">
           <property name="orientation">
            <enum>Qt::Horizontal</enum>
@@ -83,25 +92,24 @@
           </property>
          </spacer>
         </item>
-        <item row="0" column="1">
-         <widget class="QDoubleSpinBox" name="rangeMin">
-          <property name="maximum">
-           <double>99999.000000000000000</double>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="1">
-         <widget class="QDoubleSpinBox" name="rangeMax">
-          <property name="maximum">
-           <double>99999.000000000000000</double>
-          </property>
-         </widget>
-        </item>
        </layout>
       </item>
      </layout>
     </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">
@@ -116,7 +124,9 @@
  </widget>
  <tabstops>
   <tabstop>asNew</tabstop>
-  <tabstop>inRange</tabstop>
+  <tabstop>asRev</tabstop>
+  <tabstop>min</tabstop>
+  <tabstop>max</tabstop>
   <tabstop>buttonBox</tabstop>
  </tabstops>
  <resources/>
@@ -154,7 +164,7 @@
    </hints>
   </connection>
   <connection>
-   <sender>inRange</sender>
+   <sender>asRev</sender>
    <signal>toggled(bool)</signal>
    <receiver>rangebox</receiver>
    <slot>setEnabled(bool)</slot>