Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix keyboard shortcuts not working for diff view when in dialog

Browse Source
This commit is contained in:
Kovid Goyal 2014-01-27 08:21:58 +05:30
parent 56807d7b3e
commit 520be76781
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/gui2/tweak_book/diff/main.py
View File

@ -231,6 +231,10 @@ class Diff(Dialog):
kwargs = {'syntax':syntax_map.get(name, None), 'context':self.context} kwargs = {'syntax':syntax_map.get(name, None), 'context':self.context}
add(args, kwargs) add(args, kwargs)
def keyPressEvent(self, ev):
if not self.view.handle_key(ev):
return Dialog.keyPressEvent(self, ev)
if __name__ == '__main__': if __name__ == '__main__':
import sys import sys
app = QApplication([]) app = QApplication([])

5
src/calibre/gui2/tweak_book/diff/view.py
View File

@ -910,7 +910,7 @@ class DiffView(QWidget): # {{{
self.changes, self.delta = changes, delta self.changes, self.delta = changes, delta
self.adjust_range() self.adjust_range()
def keyPressEvent(self, ev): def handle_key(self, ev):
amount, d = None, 1 amount, d = None, 1
key = ev.key() key = ev.key()
if key in (Qt.Key_Up, Qt.Key_Down, Qt.Key_J, Qt.Key_K): if key in (Qt.Key_Up, Qt.Key_Down, Qt.Key_J, Qt.Key_K):
@ -923,8 +923,11 @@ class DiffView(QWidget): # {{{
d = -1 d = -1
elif key in (Qt.Key_Home, Qt.Key_End): elif key in (Qt.Key_Home, Qt.Key_End):
self.scrollbar.setValue(0 if key == Qt.Key_Home else self.scrollbar.maximum()) self.scrollbar.setValue(0 if key == Qt.Key_Home else self.scrollbar.maximum())
return True
if amount is not None: if amount is not None:
self.scrollbar.setValue(self.scrollbar.value() + d * amount) self.scrollbar.setValue(self.scrollbar.value() + d * amount)
return True
return False
# }}} # }}}