diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py index 78b68a8bfb..c8b2a47b0e 100644 --- a/src/calibre/gui2/__init__.py +++ b/src/calibre/gui2/__init__.py @@ -205,11 +205,14 @@ def error_dialog(parent, title, msg, det_msg='', show=False, return d.exec_() return d -def question_dialog(parent, title, msg, det_msg=''): +def question_dialog(parent, title, msg, det_msg='', show_copy_button=True): d = MessageBox(QMessageBox.Question, title, msg, QMessageBox.Yes|QMessageBox.No, parent, det_msg) d.setIconPixmap(QPixmap(I('dialog_information.svg'))) d.setEscapeButton(QMessageBox.No) + if not show_copy_button: + d.cb.setVisible(False) + return d.exec_() == QMessageBox.Yes def info_dialog(parent, title, msg, det_msg='', show=False): diff --git a/src/calibre/gui2/dialogs/config/__init__.py b/src/calibre/gui2/dialogs/config/__init__.py index b5d145dfc5..731c7b7f12 100644 --- a/src/calibre/gui2/dialogs/config/__init__.py +++ b/src/calibre/gui2/dialogs/config/__init__.py @@ -656,7 +656,7 @@ class ConfigDialog(ResizableDialog, Ui_Dialog): _('The selected column is not a custom column'), show=True) if not question_dialog(self, _('Are you sure?'), _('Do you really want to delete column %s and all its data?') % - self.custcols[col]['name']): + self.custcols[col]['name'], show_copy_button=False): return self.columns.item(idx).setCheckState(False) self.columns.takeItem(idx) diff --git a/src/calibre/gui2/dialogs/config/create_custom_column.ui b/src/calibre/gui2/dialogs/config/create_custom_column.ui index 3e0556b815..247fbd9537 100644 --- a/src/calibre/gui2/dialogs/config/create_custom_column.ui +++ b/src/calibre/gui2/dialogs/config/create_custom_column.ui @@ -20,7 +20,7 @@ - Create a custom column + Create or edit custom columns @@ -126,7 +126,7 @@ - Create and edit custom columns + Create or edit custom columns