From 270bfab5a7c19d1cc748e400f5607f99a1f8df02 Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Sun, 17 Apr 2011 02:38:23 +0900
Subject: [PATCH] drop useless start/end navigation keys; fix other keys to
 select properly

---
 aqt/browser.py      | 35 +++++++----------------------------
 designer/browser.ui | 26 --------------------------
 2 files changed, 7 insertions(+), 54 deletions(-)

diff --git a/aqt/browser.py b/aqt/browser.py
index a0fcfdbbe..fc000f460 100644
--- a/aqt/browser.py
+++ b/aqt/browser.py
@@ -344,8 +344,6 @@ class Browser(QMainWindow):
         c(f.actionFindReplace, s, self.onFindReplace)
         c(f.actionFindDuplicates, s, self.onFindDupes)
         # jumps
-        c(f.actionFirstCard, s, self.onFirstCard)
-        c(f.actionLastCard, s, self.onLastCard)
         c(f.actionPreviousCard, s, self.onPreviousCard)
         c(f.actionNextCard, s, self.onNextCard)
         c(f.actionFind, s, self.onFind)
@@ -1048,39 +1046,20 @@ select fm.id, fm.name from fieldmodels fm""")
     # Jumping
     ######################################################################
 
-    def onFirstCard(self):
+    def _moveCur(self, dir):
         if not self.model.cards:
             return
         self.editor.saveNow()
-        self.form.tableView.selectionModel().clear()
-        self.form.tableView.selectRow(0)
-
-    def onLastCard(self):
-        if not self.model.cards:
-            return
-        self.editor.saveNow()
-        self.form.tableView.selectionModel().clear()
-        self.form.tableView.selectRow(len(self.model.cards) - 1)
+        tv = self.form.tableView
+        idx = tv.moveCursor(dir, Qt.NoModifier)
+        tv.selectionModel().clear()
+        tv.setCurrentIndex(idx)
 
     def onPreviousCard(self):
-        if not self.model.cards:
-            return
-        self.editor.saveNow()
-        row = self.form.tableView.currentIndex().row()
-        row = max(0, row - 1)
-        self.form.tableView.selectionModel().clear()
-        self.form.tableView.selectRow(row)
-        self.onFact()
+        self._moveCur(QAbstractItemView.MoveUp)
 
     def onNextCard(self):
-        if not self.model.cards:
-            return
-        self.editor.saveNow()
-        row = self.form.tableView.currentIndex().row()
-        row = min(len(self.model.cards) - 1, row + 1)
-        self.form.tableView.selectionModel().clear()
-        self.form.tableView.selectRow(row)
-        self.onFact()
+        self._moveCur(QAbstractItemView.MoveDown)
 
     def onFind(self):
         self.form.searchEdit.setFocus()
diff --git a/designer/browser.ui b/designer/browser.ui
index aa6905b4c..80c8a5212 100644
--- a/designer/browser.ui
+++ b/designer/browser.ui
@@ -233,10 +233,8 @@
     <addaction name="actionFact"/>
     <addaction name="actionCardList"/>
     <addaction name="separator"/>
-    <addaction name="actionFirstCard"/>
     <addaction name="actionPreviousCard"/>
     <addaction name="actionNextCard"/>
-    <addaction name="actionLastCard"/>
    </widget>
    <widget class="QMenu" name="menu_Help">
     <property name="title">
@@ -401,30 +399,6 @@
     <string>Ctrl+P</string>
    </property>
   </action>
-  <action name="actionFirstCard">
-   <property name="icon">
-    <iconset resource="icons.qrc">
-     <normaloff>:/icons/go-first.png</normaloff>:/icons/go-first.png</iconset>
-   </property>
-   <property name="text">
-    <string>F&amp;irst Card</string>
-   </property>
-   <property name="shortcut">
-    <string>Ctrl+Home</string>
-   </property>
-  </action>
-  <action name="actionLastCard">
-   <property name="icon">
-    <iconset resource="icons.qrc">
-     <normaloff>:/icons/go-last.png</normaloff>:/icons/go-last.png</iconset>
-   </property>
-   <property name="text">
-    <string>&amp;Last Card</string>
-   </property>
-   <property name="shortcut">
-    <string>Ctrl+End</string>
-   </property>
-  </action>
   <action name="actionGuide">
    <property name="icon">
     <iconset resource="icons.qrc">