From 61cdea48653eae7b6b85f14aec61a6b42f8dc712 Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Sat, 16 Apr 2011 02:45:29 +0900
Subject: [PATCH] make add card dialog window modal

---
 aqt/addcards.py | 3 ++-
 aqt/utils.py    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/aqt/addcards.py b/aqt/addcards.py
index ff0223607..f75049e1e 100644
--- a/aqt/addcards.py
+++ b/aqt/addcards.py
@@ -20,10 +20,11 @@ class AddCards(QDialog):
 
     def __init__(self, mw):
         windParent = None
-        QDialog.__init__(self, windParent, Qt.Window)
+        QDialog.__init__(self, mw)
         self.mw = mw
         self.form = aqt.forms.addcards.Ui_Dialog()
         self.form.setupUi(self)
+        self.setWindowModality(Qt.WindowModal)
         self.setWindowTitle(_("Add"))
         self.setupChooser()
         self.setupEditor()
diff --git a/aqt/utils.py b/aqt/utils.py
index 79cd4663b..96829d515 100644
--- a/aqt/utils.py
+++ b/aqt/utils.py
@@ -157,7 +157,7 @@ class GetTextDialog(QDialog):
 
 def getText(prompt, parent=None, help=None, edit=None, default=u"", title="Anki"):
     if not parent:
-        parent = aqt.mw
+        parent = aqt.mw.app.activeWindow() or aqt.mw.app.mw
     d = GetTextDialog(parent, prompt, help=help, edit=edit,
                       default=default, title=title)
     ret = d.exec_()