From 312e1951dc8ede41bea8487f56aec686d4a7d91a Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 28 Jan 2011 14:12:55 -0700 Subject: [PATCH] ... --- src/calibre/gui2/__init__.py | 3 --- src/calibre/gui2/dialogs/message_box.py | 5 ++++- src/calibre/gui2/dialogs/metadata_single.py | 6 ++---- src/calibre/gui2/metadata/basic_widgets.py | 6 ++---- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py index a8f80ab35a..1d337c418b 100644 --- a/src/calibre/gui2/__init__.py +++ b/src/calibre/gui2/__init__.py @@ -202,9 +202,6 @@ def question_dialog(parent, title, msg, det_msg='', show_copy_button=False, from calibre.gui2.dialogs.message_box import MessageBox d = MessageBox(MessageBox.QUESTION, title, msg, det_msg, parent=parent, show_copy_button=show_copy_button) - if buttons is not None: - d.bb.setStandardButtons(buttons) - return d.exec_() == d.Accepted def info_dialog(parent, title, msg, det_msg='', show=False, diff --git a/src/calibre/gui2/dialogs/message_box.py b/src/calibre/gui2/dialogs/message_box.py index 45ab73f8a1..565fb147fc 100644 --- a/src/calibre/gui2/dialogs/message_box.py +++ b/src/calibre/gui2/dialogs/message_box.py @@ -92,7 +92,10 @@ class MessageBox(QDialog, Ui_Dialog): def showEvent(self, ev): ret = QDialog.showEvent(self, ev) if self.is_question: - self.bb.button(self.bb.Yes).setFocus(Qt.OtherFocusReason) + try: + self.bb.button(self.bb.Yes).setFocus(Qt.OtherFocusReason) + except: + pass# Buttons were changed else: self.bb.button(self.bb.Ok).setFocus(Qt.OtherFocusReason) return ret diff --git a/src/calibre/gui2/dialogs/metadata_single.py b/src/calibre/gui2/dialogs/metadata_single.py index 9156ef7101..7a8e4ea8d0 100644 --- a/src/calibre/gui2/dialogs/metadata_single.py +++ b/src/calibre/gui2/dialogs/metadata_single.py @@ -11,7 +11,7 @@ from functools import partial from threading import Thread from PyQt4.Qt import SIGNAL, QObject, Qt, QTimer, QDate, \ - QPixmap, QListWidgetItem, QDialog, pyqtSignal, QMessageBox, QIcon, \ + QPixmap, QListWidgetItem, QDialog, pyqtSignal, QIcon, \ QPushButton from calibre.gui2 import error_dialog, file_icon_provider, dynamic, \ @@ -770,9 +770,7 @@ class MetadataSingleDialog(ResizableDialog, Ui_MetadataSingleDialog): if question_dialog(self, _('Tags changed'), _('You have changed the tags. In order to use the tags' ' editor, you must either discard or apply these ' - 'changes'), show_copy_button=False, - buttons=QMessageBox.Apply|QMessageBox.Discard, - yes_button=QMessageBox.Apply): + 'changes. Apply changes?'), show_copy_button=False): self.apply_tags(commit=True, notify=True) self.original_tags = unicode(self.tags.text()) else: diff --git a/src/calibre/gui2/metadata/basic_widgets.py b/src/calibre/gui2/metadata/basic_widgets.py index dc85bad012..590a8be3bb 100644 --- a/src/calibre/gui2/metadata/basic_widgets.py +++ b/src/calibre/gui2/metadata/basic_widgets.py @@ -10,7 +10,7 @@ import textwrap, re, os from PyQt4.Qt import Qt, QDateEdit, QDate, \ QIcon, QToolButton, QWidget, QLabel, QGridLayout, \ QDoubleSpinBox, QListWidgetItem, QSize, QPixmap, \ - QPushButton, QSpinBox, QMessageBox, QLineEdit + QPushButton, QSpinBox, QLineEdit from calibre.gui2.widgets import EnLineEdit, CompleteComboBox, \ EnComboBox, FormatList, ImageView, CompleteLineEdit @@ -848,9 +848,7 @@ class TagsEdit(CompleteLineEdit): # {{{ if question_dialog(self, _('Tags changed'), _('You have changed the tags. In order to use the tags' ' editor, you must either discard or apply these ' - 'changes'), show_copy_button=False, - buttons=QMessageBox.Apply|QMessageBox.Discard, - yes_button=QMessageBox.Apply): + 'changes. Apply changes?'), show_copy_button=False): self.commit(db, id_) db.commit() self.original_val = self.current_val