From c19273afe4252c1ae6eb5513eabdef5103fbbad5 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 8 Jul 2010 09:51:40 -0600 Subject: [PATCH] Use cancel instead of no on autoconvert dialog --- src/calibre/gui2/__init__.py | 7 ++++--- src/calibre/gui2/device.py | 14 +++++++++----- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py index 607fe629f6..d922af0914 100644 --- a/src/calibre/gui2/__init__.py +++ b/src/calibre/gui2/__init__.py @@ -226,10 +226,11 @@ def error_dialog(parent, title, msg, det_msg='', show=False, return d.exec_() return d -def question_dialog(parent, title, msg, det_msg='', show_copy_button=True): - d = MessageBox(QMessageBox.Question, title, msg, QMessageBox.Yes|QMessageBox.No, +def question_dialog(parent, title, msg, det_msg='', show_copy_button=True, + buttons=QMessageBox.Yes|QMessageBox.No): + d = MessageBox(QMessageBox.Question, title, msg, buttons, parent, det_msg) - d.setIconPixmap(QPixmap(I('dialog_information.svg'))) + d.setIconPixmap(QPixmap(I('dialog_question.svg'))) d.setEscapeButton(QMessageBox.No) if not show_copy_button: d.cb.setVisible(False) diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py index 39a53002e2..e2a99864ec 100644 --- a/src/calibre/gui2/device.py +++ b/src/calibre/gui2/device.py @@ -10,7 +10,7 @@ from functools import partial from binascii import unhexlify from PyQt4.Qt import QMenu, QAction, QActionGroup, QIcon, SIGNAL, QPixmap, \ - Qt, pyqtSignal, QColor, QPainter, QDialog + Qt, pyqtSignal, QColor, QPainter, QDialog, QMessageBox from PyQt4.QtSvg import QSvgRenderer from calibre.customize.ui import available_input_formats, available_output_formats, \ @@ -952,7 +952,8 @@ class DeviceMixin(object): # {{{ autos = '\n'.join('%s'%i for i in autos) if question_dialog(self, _('No suitable formats'), _('Auto convert the following books before sending via ' - 'email?'), det_msg=autos): + 'email?'), det_msg=autos, + buttons=QMessageBox.Yes|QMessageBox.Cancel): self.auto_convert_mail(to, fmts, delete_from_library, auto, format) if bad: @@ -1051,7 +1052,8 @@ class DeviceMixin(object): # {{{ autos = '\n'.join('%s'%i for i in autos) if question_dialog(self, _('No suitable formats'), _('Auto convert the following books before uploading to ' - 'the device?'), det_msg=autos): + 'the device?'), det_msg=autos, + buttons=QMessageBox.Yes|QMessageBox.Cancel): self.auto_convert_catalogs(auto, format) files = [f for f in files if f is not None] if not files: @@ -1112,7 +1114,8 @@ class DeviceMixin(object): # {{{ autos = '\n'.join('%s'%i for i in autos) if question_dialog(self, _('No suitable formats'), _('Auto convert the following books before uploading to ' - 'the device?'), det_msg=autos): + 'the device?'), det_msg=autos, + buttons=QMessageBox.Yes|QMessageBox.Cancel): self.auto_convert_news(auto, format) files = [f for f in files if f is not None] for f in files: @@ -1230,7 +1233,8 @@ class DeviceMixin(object): # {{{ autos = '\n'.join('%s'%i for i in autos) if question_dialog(self, _('No suitable formats'), _('Auto convert the following books before uploading to ' - 'the device?'), det_msg=autos): + 'the device?'), det_msg=autos, + buttons=QMessageBox.Yes|QMessageBox.Cancel): self.auto_convert(auto, on_card, format) if bad: