mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Edit Book: Workaround for Qt 5 regression that caused the "See what changed" tool to freeze the editor when closing the window showing the changes.
This commit is contained in:
parent
fc3626aca2
commit
14bcb87ae8
@ -6,10 +6,10 @@ from __future__ import (unicode_literals, division, absolute_import,
|
|||||||
__license__ = 'GPL v3'
|
__license__ = 'GPL v3'
|
||||||
__copyright__ = '2014, Kovid Goyal <kovid at kovidgoyal.net>'
|
__copyright__ = '2014, Kovid Goyal <kovid at kovidgoyal.net>'
|
||||||
|
|
||||||
from functools import partial
|
|
||||||
|
|
||||||
from PyQt5.Qt import (
|
from PyQt5.Qt import (
|
||||||
QTextBrowser, QVBoxLayout, QDialog, QDialogButtonBox, QIcon, QLabel, QCheckBox)
|
QTextBrowser, QVBoxLayout, QDialog, QDialogButtonBox, QIcon, QLabel,
|
||||||
|
QCheckBox, Qt)
|
||||||
|
|
||||||
from calibre.ebooks.oeb.polish.main import CUSTOMIZATION
|
from calibre.ebooks.oeb.polish.main import CUSTOMIZATION
|
||||||
from calibre.gui2.tweak_book import tprefs
|
from calibre.gui2.tweak_book import tprefs
|
||||||
@ -63,7 +63,7 @@ def show_report(changed, title, report, parent, show_current_diff):
|
|||||||
if changed:
|
if changed:
|
||||||
b = d.b = d.bb.addButton(_('See what &changed'), d.bb.AcceptRole)
|
b = d.b = d.bb.addButton(_('See what &changed'), d.bb.AcceptRole)
|
||||||
b.setIcon(QIcon(I('diff.png'))), b.setAutoDefault(False)
|
b.setIcon(QIcon(I('diff.png'))), b.setAutoDefault(False)
|
||||||
b.clicked.connect(partial(show_current_diff, allow_revert=True))
|
b.clicked.connect(lambda : show_current_diff(allow_revert=True), type=Qt.QueuedConnection)
|
||||||
d.bb.button(d.bb.Close).setDefault(True)
|
d.bb.button(d.bb.Close).setDefault(True)
|
||||||
d.l.addWidget(d.bb)
|
d.l.addWidget(d.bb)
|
||||||
d.bb.rejected.connect(d.reject)
|
d.bb.rejected.connect(d.reject)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user