From b770768a77436425226542ba4d3fb8cd52cf3d25 Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Sat, 16 Apr 2011 05:55:42 +0900
Subject: [PATCH] modalize gencards & change model

---
 aqt/browser.py                             |  6 ++--
 designer/changemodel.ui                    | 12 +++++++
 designer/{addcardmodels.ui => gencards.ui} | 38 +++++++++++++---------
 3 files changed, 39 insertions(+), 17 deletions(-)
 rename designer/{addcardmodels.ui => gencards.ui} (58%)

diff --git a/aqt/browser.py b/aqt/browser.py
index 2e9b49831..ad573568d 100644
--- a/aqt/browser.py
+++ b/aqt/browser.py
@@ -1094,8 +1094,9 @@ class GenCards(QDialog):
         QDialog.__init__(self, browser)
         self.browser = browser
         self.fids = fids
-        self.form = aqt.forms.addcardmodels.Ui_Dialog()
+        self.form = aqt.forms.gencards.Ui_Dialog()
         self.form.setupUi(self)
+        self.setWindowModality(Qt.WindowModal)
         self.connect(self.form.buttonBox, SIGNAL("helpRequested()"),
                      self.onHelp)
         restoreGeom(self, "addCardModels")
@@ -1156,6 +1157,7 @@ class ChangeModel(QDialog):
         self.oldModel = browser.card.fact().model()
         self.form = aqt.forms.changemodel.Ui_Dialog()
         self.form.setupUi(self)
+        self.setWindowModality(Qt.WindowModal)
         self.setup()
         restoreGeom(self, "changeModel")
         addHook("reset", self.onReset)
@@ -1301,7 +1303,7 @@ Are you sure you want to continue?""")):
         b.onSearch(reset=False)
         b.model.endReset()
         b.mw.progress.finish()
-        b.requireReset()
+        b.mw.requireReset()
         self.cleanup()
         return QDialog.accept(self)
 
diff --git a/designer/changemodel.ui b/designer/changemodel.ui
index cc6f81415..3b497d691 100644
--- a/designer/changemodel.ui
+++ b/designer/changemodel.ui
@@ -81,6 +81,12 @@
       </property>
       <item>
        <widget class="QScrollArea" name="scrollArea">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
         <property name="widgetResizable">
          <bool>true</bool>
         </property>
@@ -116,6 +122,12 @@
       </property>
       <item>
        <widget class="QScrollArea" name="scrollArea_2">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
         <property name="widgetResizable">
          <bool>true</bool>
         </property>
diff --git a/designer/addcardmodels.ui b/designer/gencards.ui
similarity index 58%
rename from designer/addcardmodels.ui
rename to designer/gencards.ui
index 038b08cfe..d7472640f 100644
--- a/designer/addcardmodels.ui
+++ b/designer/gencards.ui
@@ -1,31 +1,39 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>Dialog</class>
- <widget class="QDialog" name="Dialog" >
-  <property name="geometry" >
+ <widget class="QDialog" name="Dialog">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>248</width>
+    <width>249</width>
     <height>268</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Generate Cards</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout" >
+  <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="QListWidget" name="list" >
-     <property name="selectionMode" >
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Select cards to generate:</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QListWidget" name="list">
+     <property name="selectionMode">
       <enum>QAbstractItemView::MultiSelection</enum>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="QDialogButtonBox" name="buttonBox" >
-     <property name="orientation" >
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="standardButtons" >
+     <property name="standardButtons">
       <set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
      </property>
     </widget>
@@ -40,11 +48,11 @@
    <receiver>Dialog</receiver>
    <slot>accept()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>248</x>
      <y>254</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>157</x>
      <y>274</y>
     </hint>
@@ -56,11 +64,11 @@
    <receiver>Dialog</receiver>
    <slot>reject()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>316</x>
      <y>260</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>286</x>
      <y>274</y>
     </hint>