drop useless start/end navigation keys; fix other keys to select properly

This commit is contained in:
Damien Elmes 2011-04-17 02:38:23 +09:00
parent a51d51bca6
commit 270bfab5a7
2 changed files with 7 additions and 54 deletions

View file

@ -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()

View file

@ -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">