From 04b010a6d1224b36ea3ed2f1f9712ea45d82676c Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Wed, 22 May 2013 12:54:29 +0900
Subject: [PATCH] make sure we focus first field when adding next note (#605)

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

diff --git a/aqt/addcards.py b/aqt/addcards.py
index ccfab18d1..de8a41a89 100644
--- a/aqt/addcards.py
+++ b/aqt/addcards.py
@@ -76,7 +76,7 @@ class AddCards(QDialog):
     def setupNewNote(self, set=True):
         f = self.mw.col.newNote()
         if set:
-            self.editor.setNote(f)
+            self.editor.setNote(f, focus=True)
         return f
 
     def onReset(self, model=None, keep=False):
@@ -96,7 +96,7 @@ class AddCards(QDialog):
                 except IndexError:
                     break
         self.editor.currentField = 0
-        self.editor.setNote(note)
+        self.editor.setNote(note, focus=True)
 
     def removeTempNote(self, note):
         if not note or not note.id:
diff --git a/aqt/editor.py b/aqt/editor.py
index e7db09907..94c6811c9 100644
--- a/aqt/editor.py
+++ b/aqt/editor.py
@@ -538,7 +538,6 @@ class Editor(object):
                     def onUpdate():
                         self.stealFocus = True
                         self.loadNote()
-                        self.stealFocus = False
                         self.checkValid()
                     self.mw.progress.timer(100, onUpdate, False)
                 else:
@@ -584,6 +583,8 @@ class Editor(object):
         self.note = note
         self.currentField = 0
         self.disableButtons()
+        if focus:
+            self.stealFocus = True
         # change timer
         if self.note:
             self.web.setHtml(_html % (
@@ -617,6 +618,7 @@ class Editor(object):
         self.widget.show()
         if self.stealFocus:
             self.web.setFocus()
+            self.stealFocus = False
 
     def focus(self):
         self.web.setFocus()