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

Bulk metadata: focus the Review instead of OK

Browse Source 
After a bulk metadata download, focus the review button on the
popup notification, instead of the OK button. Fixes #1190931 [Newly custom added columns keep disappearing on restart](https://bugs.launchpad.net/calibre/+bug/1190931)
This commit is contained in:
Kovid Goyal 2013-06-15 11:49:04 +05:30
parent ba0639c681
commit 58233b596c
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/calibre/gui2/proceed.py
View File

@ -19,7 +19,7 @@ from calibre.gui2.dialogs.message_box import ViewLog
Question = namedtuple('Question', 'payload callback cancel_callback ' Question = namedtuple('Question', 'payload callback cancel_callback '
'title msg html_log log_viewer_title log_is_file det_msg ' 'title msg html_log log_viewer_title log_is_file det_msg '
'show_copy_button checkbox_msg checkbox_checked action_callback ' 'show_copy_button checkbox_msg checkbox_checked action_callback '
'action_label action_icon') 'action_label action_icon focus_action')
class ProceedQuestion(QDialog): class ProceedQuestion(QDialog):
@ -155,13 +155,14 @@ class ProceedQuestion(QDialog):
self.checkbox.setChecked(question.checkbox_checked) self.checkbox.setChecked(question.checkbox_checked)
self.do_resize() self.do_resize()
self.show() self.show()
self.bb.button(self.bb.Yes).setDefault(True) button = self.action_button if question.focus_action and question.action_callback is not None else self.bb.button(self.bb.Yes)
self.bb.button(self.bb.Yes).setFocus(Qt.OtherFocusReason) button.setDefault(True)
button.setFocus(Qt.OtherFocusReason)
def __call__(self, callback, payload, html_log, log_viewer_title, title, def __call__(self, callback, payload, html_log, log_viewer_title, title,
msg, det_msg='', show_copy_button=False, cancel_callback=None, msg, det_msg='', show_copy_button=False, cancel_callback=None,
log_is_file=False, checkbox_msg=None, checkbox_checked=False, log_is_file=False, checkbox_msg=None, checkbox_checked=False,
action_callback=None, action_label=None, action_icon=None): action_callback=None, action_label=None, action_icon=None, focus_action=False):
''' '''
A non modal popup that notifies the user that a background task has A non modal popup that notifies the user that a background task has
been completed. This class guarantees that only a single popup is been completed. This class guarantees that only a single popup is
@ -192,13 +193,14 @@ class ProceedQuestion(QDialog):
exactly the same way as callback. exactly the same way as callback.
:param action_label: The text on the action button :param action_label: The text on the action button
:param action_icon: The icon for the action button, must be a QIcon object or None :param action_icon: The icon for the action button, must be a QIcon object or None
:param focus_action: If True, the action button will be focused instead of the Yes button
''' '''
question = Question( question = Question(
payload, callback, cancel_callback, title, msg, html_log, payload, callback, cancel_callback, title, msg, html_log,
log_viewer_title, log_is_file, det_msg, show_copy_button, log_viewer_title, log_is_file, det_msg, show_copy_button,
checkbox_msg, checkbox_checked, action_callback, action_label, checkbox_msg, checkbox_checked, action_callback, action_label,
action_icon) action_icon, focus_action)
self.questions.append(question) self.questions.append(question)
self.show_question() self.show_question()