From 0fd0cfbfc6082c8a83206373b30b28c4e77909a8 Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Thu, 24 May 2012 12:41:11 +0900
Subject: [PATCH] start focused on current deck/model in quick search

---
 aqt/modelchooser.py |  3 ++-
 aqt/studydeck.py    | 21 +++++++++++++++------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/aqt/modelchooser.py b/aqt/modelchooser.py
index d6dbf486d..c166824ac 100644
--- a/aqt/modelchooser.py
+++ b/aqt/modelchooser.py
@@ -71,9 +71,10 @@ class ModelChooser(QHBoxLayout):
 
     def onModelChange(self):
         from aqt.studydeck import StudyDeck
+        current = self.deck.models.current()['name']
         ret = StudyDeck(self.mw, names=sorted(self.deck.models.allNames()),
                         accept=_("Select"), title=_("Choose Note Type"),
-                        help="_notes", parent=self.widget)
+                        help="_notes", current=current, parent=self.widget)
         if not ret.name:
             return
         m = self.deck.models.byName(ret.name)
diff --git a/aqt/studydeck.py b/aqt/studydeck.py
index dfdb6a2d8..99661d6c3 100644
--- a/aqt/studydeck.py
+++ b/aqt/studydeck.py
@@ -10,7 +10,7 @@ from operator import itemgetter
 
 class StudyDeck(QDialog):
     def __init__(self, mw, names=None, accept=None, title=None,
-                 help="studydeck", parent=None):
+                 help="studydeck", current=None, parent=None):
         QDialog.__init__(self, parent or mw)
         self.mw = mw
         self.form = aqt.forms.studydeck.Ui_Dialog()
@@ -20,6 +20,7 @@ class StudyDeck(QDialog):
             self.setWindowTitle(title)
         if not names:
             names = sorted(self.mw.col.decks.allNames())
+            current = self.mw.col.decks.current()['name']
         self.origNames = names
         self.name = None
         self.ok = self.form.buttonBox.addButton(
@@ -31,7 +32,9 @@ class StudyDeck(QDialog):
         self.connect(self.form.filter,
                      SIGNAL("textEdited(QString)"),
                      self.redraw)
-        self.redraw("")
+        self.show()
+        # redraw after show so position at center correct
+        self.redraw("", current)
         self.exec_()
 
     def eventFilter(self, obj, evt):
@@ -52,11 +55,17 @@ class StudyDeck(QDialog):
                 return True
         return False
 
-    def redraw(self, filt):
+    def redraw(self, filt, focus=None):
         self.names = [n for n in self.origNames if self._matches(n, filt)]
-        self.form.list.clear()
-        self.form.list.addItems(self.names)
-        self.form.list.setCurrentRow(0)
+        l = self.form.list
+        l.clear()
+        l.addItems(self.names)
+        if focus in self.names:
+            idx = self.names.index(focus)
+        else:
+            idx = 0
+        l.setCurrentRow(idx)
+        l.scrollToItem(l.item(idx), QAbstractItemView.PositionAtCenter)
 
     def _matches(self, name, filt):
         name = name.lower()