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

Prevent enter key from having any effect in metadata review dialog

Browse Source
This commit is contained in:
Kovid Goyal 2015-11-13 09:07:06 +05:30
parent 5f9e987b27
commit 94ea457109
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/calibre/gui2/metadata/diff.py
View File

@ -554,21 +554,22 @@ class CompareMany(QDialog):
sa.setWidgetResizable(True) sa.setWidgetResizable(True)
self.bb = bb = QDialogButtonBox(QDialogButtonBox.Cancel) self.bb = bb = QDialogButtonBox(QDialogButtonBox.Cancel)
bb.button(bb.Cancel).setAutoDefault(False)
bb.rejected.connect(self.reject) bb.rejected.connect(self.reject)
if self.total > 1: if self.total > 1:
self.aarb = b = bb.addButton(_('&Accept all remaining'), bb.YesRole) self.aarb = b = bb.addButton(_('&Accept all remaining'), bb.YesRole)
b.setIcon(QIcon(I('ok.png'))) b.setIcon(QIcon(I('ok.png'))), b.setAutoDefault(False)
if accept_all_tooltip: if accept_all_tooltip:
b.setToolTip(accept_all_tooltip) b.setToolTip(accept_all_tooltip)
b.clicked.connect(self.accept_all_remaining) b.clicked.connect(self.accept_all_remaining)
self.rarb = b = bb.addButton(_('Re&ject all remaining'), bb.NoRole) self.rarb = b = bb.addButton(_('Re&ject all remaining'), bb.NoRole)
b.setIcon(QIcon(I('minus.png'))) b.setIcon(QIcon(I('minus.png'))), b.setAutoDefault(False)
if reject_all_tooltip: if reject_all_tooltip:
b.setToolTip(reject_all_tooltip) b.setToolTip(reject_all_tooltip)
b.clicked.connect(self.reject_all_remaining) b.clicked.connect(self.reject_all_remaining)
self.sb = b = bb.addButton(_('&Reject'), bb.ActionRole) self.sb = b = bb.addButton(_('&Reject'), bb.ActionRole)
b.clicked.connect(partial(self.next_item, False)) b.clicked.connect(partial(self.next_item, False))
b.setIcon(QIcon(I('minus.png'))) b.setIcon(QIcon(I('minus.png'))), b.setAutoDefault(False)
if reject_button_tooltip: if reject_button_tooltip:
b.setToolTip(reject_button_tooltip) b.setToolTip(reject_button_tooltip)
self.next_action = ac = QAction(self) self.next_action = ac = QAction(self)
@ -585,7 +586,7 @@ class CompareMany(QDialog):
self.next_action.triggered.connect(b.click) self.next_action.triggered.connect(b.click)
b.setIcon(QIcon(I('forward.png' if self.total > 1 else 'ok.png'))) b.setIcon(QIcon(I('forward.png' if self.total > 1 else 'ok.png')))
b.clicked.connect(partial(self.next_item, True)) b.clicked.connect(partial(self.next_item, True))
b.setDefault(True) b.setDefault(True), b.setAutoDefault(True)
self.bbh = h = QHBoxLayout() self.bbh = h = QHBoxLayout()
h.setContentsMargins(0, 0, 0, 0) h.setContentsMargins(0, 0, 0, 0)
l.addLayout(h) l.addLayout(h)
@ -665,6 +666,12 @@ class CompareMany(QDialog):
self.ids = [] self.ids = []
self.accept() self.accept()
def keyPressEvent(self, ev):
if ev.key() in (Qt.Key_Enter, Qt.Key_Return):
ev.accept()
return
return QDialog.keyPressEvent(self, ev)
if __name__ == '__main__': if __name__ == '__main__':
app = QApplication([]) app = QApplication([])
from calibre.library import db from calibre.library import db