Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-07 10:14:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1910904 [[Enhancement] Use a Cancel button instead of a Discard button](https://bugs.launchpad.net/calibre/+bug/1910904)

Browse Source
This commit is contained in:
Kovid Goyal 2021-01-10 16:42:34 +05:30
parent 312754acb6
commit 31a1ce8d4a
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/calibre/gui2/preferences/main.py
View File

@ -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)