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

Edit book: Allow disabling the popup to show changes after running the Fix HTML and Beautify all files tools. Fixes #1789540 [Would like checkbox to disable completion popup in editor](https://bugs.launchpad.net/calibre/+bug/1789540)

Browse Source
This commit is contained in:
Kovid Goyal 2018-08-29 14:15:03 +05:30
parent 823a4216ad
commit 40302f5b83
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/calibre/gui2/tweak_book/boss.py
View File

@ -11,7 +11,7 @@ from functools import partial, wraps
from urlparse import urlparse from urlparse import urlparse
from PyQt5.Qt import ( from PyQt5.Qt import (
QObject, QApplication, QDialog, QGridLayout, QLabel, QSize, Qt, QObject, QApplication, QDialog, QGridLayout, QLabel, QSize, Qt, QCheckBox,
QDialogButtonBox, QIcon, QInputDialog, QUrl, pyqtSignal, QVBoxLayout) QDialogButtonBox, QIcon, QInputDialog, QUrl, pyqtSignal, QVBoxLayout)
from calibre import prints, isbytestring from calibre import prints, isbytestring
@ -774,11 +774,17 @@ class Boss(QObject):
d.container_diff(other, self.global_undo.current_container, d.container_diff(other, self.global_undo.current_container,
names=(self.global_undo.label_for_container(other), self.global_undo.label_for_container(self.global_undo.current_container))) names=(self.global_undo.label_for_container(other), self.global_undo.label_for_container(self.global_undo.current_container)))
def ask_to_show_current_diff(self, title, msg, allow_revert=True, to_container=None): def ask_to_show_current_diff(self, name, title, msg, allow_revert=True, to_container=None):
if tprefs.get('skip_ask_to_show_current_diff_for_' + name):
return
d = QDialog(self.gui) d = QDialog(self.gui)
k = QVBoxLayout(d) k = QVBoxLayout(d)
d.setWindowTitle(title) d.setWindowTitle(title)
k.addWidget(QLabel(msg)) k.addWidget(QLabel(msg))
k.confirm = cb = QCheckBox(_('Show this popup again'))
k.addWidget(cb)
cb.setChecked(True)
connect_lambda(cb.toggled, d, lambda d, checked: tprefs.set('skip_ask_to_show_current_diff_for_' + name, not checked))
d.bb = bb = QDialogButtonBox(QDialogButtonBox.Close, d) d.bb = bb = QDialogButtonBox(QDialogButtonBox.Close, d)
k.addWidget(bb) k.addWidget(bb)
bb.accepted.connect(d.accept) bb.accepted.connect(d.accept)
@ -842,7 +848,7 @@ class Boss(QObject):
fix_all_html(current_container()) fix_all_html(current_container())
self.update_editors_from_container() self.update_editors_from_container()
self.set_modified() self.set_modified()
self.ask_to_show_current_diff(_('Fixing done'), _('All HTML files fixed')) self.ask_to_show_current_diff('html-fix', _('Fixing done'), _('All HTML files fixed'))
def pretty_print(self, current): def pretty_print(self, current):
if current: if current:
@ -855,7 +861,7 @@ class Boss(QObject):
self.update_editors_from_container() self.update_editors_from_container()
self.set_modified() self.set_modified()
QApplication.alert(self.gui) QApplication.alert(self.gui)
self.ask_to_show_current_diff(_('Beautified'), _('All files beautified')) self.ask_to_show_current_diff('beautify', _('Beautified'), _('All files beautified'))
def mark_selected_text(self): def mark_selected_text(self):
ed = self.gui.central.current_editor ed = self.gui.central.current_editor

3
src/calibre/gui2/tweak_book/preferences.py
View File

@ -756,6 +756,9 @@ class Preferences(QDialog):
if key.endswith('_again') and tprefs.get(key) is False: if key.endswith('_again') and tprefs.get(key) is False:
del tprefs[key] del tprefs[key]
changed += 1 changed += 1
elif key.startswith('skip_ask_to_show_current_diff_for_'):
del tprefs[key]
changed += 1
msg = _('There are no disabled confirmation prompts') msg = _('There are no disabled confirmation prompts')
if changed: if changed:
msg = ngettext( msg = ngettext(