modalize gencards & change model

This commit is contained in:
Damien Elmes 2011-04-16 05:55:42 +09:00
parent fdeb092a8d
commit b770768a77
3 changed files with 39 additions and 17 deletions

View file

@ -1094,8 +1094,9 @@ class GenCards(QDialog):
QDialog.__init__(self, browser) QDialog.__init__(self, browser)
self.browser = browser self.browser = browser
self.fids = fids self.fids = fids
self.form = aqt.forms.addcardmodels.Ui_Dialog() self.form = aqt.forms.gencards.Ui_Dialog()
self.form.setupUi(self) self.form.setupUi(self)
self.setWindowModality(Qt.WindowModal)
self.connect(self.form.buttonBox, SIGNAL("helpRequested()"), self.connect(self.form.buttonBox, SIGNAL("helpRequested()"),
self.onHelp) self.onHelp)
restoreGeom(self, "addCardModels") restoreGeom(self, "addCardModels")
@ -1156,6 +1157,7 @@ class ChangeModel(QDialog):
self.oldModel = browser.card.fact().model() self.oldModel = browser.card.fact().model()
self.form = aqt.forms.changemodel.Ui_Dialog() self.form = aqt.forms.changemodel.Ui_Dialog()
self.form.setupUi(self) self.form.setupUi(self)
self.setWindowModality(Qt.WindowModal)
self.setup() self.setup()
restoreGeom(self, "changeModel") restoreGeom(self, "changeModel")
addHook("reset", self.onReset) addHook("reset", self.onReset)
@ -1301,7 +1303,7 @@ Are you sure you want to continue?""")):
b.onSearch(reset=False) b.onSearch(reset=False)
b.model.endReset() b.model.endReset()
b.mw.progress.finish() b.mw.progress.finish()
b.requireReset() b.mw.requireReset()
self.cleanup() self.cleanup()
return QDialog.accept(self) return QDialog.accept(self)

View file

@ -81,6 +81,12 @@
</property> </property>
<item> <item>
<widget class="QScrollArea" name="scrollArea"> <widget class="QScrollArea" name="scrollArea">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="widgetResizable"> <property name="widgetResizable">
<bool>true</bool> <bool>true</bool>
</property> </property>
@ -116,6 +122,12 @@
</property> </property>
<item> <item>
<widget class="QScrollArea" name="scrollArea_2"> <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"> <property name="widgetResizable">
<bool>true</bool> <bool>true</bool>
</property> </property>

View file

@ -1,31 +1,39 @@
<ui version="4.0" > <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>Dialog</class> <class>Dialog</class>
<widget class="QDialog" name="Dialog" > <widget class="QDialog" name="Dialog">
<property name="geometry" > <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>248</width> <width>249</width>
<height>268</height> <height>268</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle">
<string>Generate Cards</string> <string>Generate Cards</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout" > <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<widget class="QListWidget" name="list" > <widget class="QLabel" name="label">
<property name="selectionMode" > <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> <enum>QAbstractItemView::MultiSelection</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QDialogButtonBox" name="buttonBox" > <widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation" > <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="standardButtons" > <property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
</property> </property>
</widget> </widget>
@ -40,11 +48,11 @@
<receiver>Dialog</receiver> <receiver>Dialog</receiver>
<slot>accept()</slot> <slot>accept()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel">
<x>248</x> <x>248</x>
<y>254</y> <y>254</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel">
<x>157</x> <x>157</x>
<y>274</y> <y>274</y>
</hint> </hint>
@ -56,11 +64,11 @@
<receiver>Dialog</receiver> <receiver>Dialog</receiver>
<slot>reject()</slot> <slot>reject()</slot>
<hints> <hints>
<hint type="sourcelabel" > <hint type="sourcelabel">
<x>316</x> <x>316</x>
<y>260</y> <y>260</y>
</hint> </hint>
<hint type="destinationlabel" > <hint type="destinationlabel">
<x>286</x> <x>286</x>
<y>274</y> <y>274</y>
</hint> </hint>