From 31a1ce8d4ad61d223f135046de03b1b1ab5ca7a4 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 10 Jan 2021 16:42:34 +0530
Subject: [PATCH] Fix #1910904 [[Enhancement] Use a Cancel button instead of a
 Discard button](https://bugs.launchpad.net/calibre/+bug/1910904)

---
 src/calibre/gui2/preferences/main.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/calibre/gui2/preferences/main.py b/src/calibre/gui2/preferences/main.py
index 943b4f158a..a62b774732 100644
--- a/src/calibre/gui2/preferences/main.py
+++ b/src/calibre/gui2/preferences/main.py
@@ -238,10 +238,10 @@ class Preferences(QDialog):
         self.stack = QStackedWidget(self)
         self.bb = QDialogButtonBox(
             QDialogButtonBox.StandardButton.Close | QDialogButtonBox.StandardButton.Apply |
-            QDialogButtonBox.StandardButton.Discard | QDialogButtonBox.StandardButton.RestoreDefaults
+            QDialogButtonBox.StandardButton.Cancel | QDialogButtonBox.StandardButton.RestoreDefaults
         )
         self.bb.button(QDialogButtonBox.StandardButton.Apply).clicked.connect(self.accept)
-        self.bb.button(QDialogButtonBox.StandardButton.Discard).clicked.connect(self.reject)
+        self.bb.button(QDialogButtonBox.StandardButton.Cancel).clicked.connect(self.reject)
         self.bb.button(QDialogButtonBox.StandardButton.RestoreDefaults).setIcon(QIcon(I('clear_left.png')))
         self.bb.button(QDialogButtonBox.StandardButton.RestoreDefaults).clicked.connect(self.restore_defaults)
         self.wizard_button = self.bb.addButton(_('Run Welcome &wizard'), QDialogButtonBox.ButtonRole.ActionRole)
@@ -259,7 +259,7 @@ class Preferences(QDialog):
         self.setContextMenuPolicy(Qt.ContextMenuPolicy.NoContextMenu)
         self.title_bar = TitleBar(self)
         for ac, tt in [(QDialogButtonBox.StandardButton.Apply, _('Save changes')),
-                (QDialogButtonBox.StandardButton.Discard, _('Cancel and return to overview'))]:
+                (QDialogButtonBox.StandardButton.Cancel, _('Cancel and return to overview'))]:
             self.bb.button(ac).setToolTip(tt)
 
         l.addWidget(self.title_bar), l.addWidget(self.stack), l.addWidget(self.bb)
@@ -323,7 +323,7 @@ class Preferences(QDialog):
 
         self.bb.button(QDialogButtonBox.StandardButton.Close).setVisible(False)
         self.wizard_button.setVisible(False)
-        for button in (QDialogButtonBox.StandardButton.Apply, QDialogButtonBox.StandardButton.RestoreDefaults, QDialogButtonBox.StandardButton.Discard):
+        for button in (QDialogButtonBox.StandardButton.Apply, QDialogButtonBox.StandardButton.RestoreDefaults, QDialogButtonBox.StandardButton.Cancel):
             button = self.bb.button(button)
             button.setVisible(True)
 
@@ -353,7 +353,7 @@ class Preferences(QDialog):
         self.title_bar.show_plugin()
         self.setWindowIcon(QIcon(I('config.png')))
 
-        for button in (QDialogButtonBox.StandardButton.Apply, QDialogButtonBox.StandardButton.RestoreDefaults, QDialogButtonBox.StandardButton.Discard):
+        for button in (QDialogButtonBox.StandardButton.Apply, QDialogButtonBox.StandardButton.RestoreDefaults, QDialogButtonBox.StandardButton.Cancel):
             button = self.bb.button(button)
             button.setVisible(False)