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

Linux: ToC Editor: Fix a regression in 7.17 that broke using the Create new entry button. Fixes #2085576 [Book editor crashes when adding new entry in ToC editor](https://bugs.launchpad.net/calibre/+bug/2085576)

Browse Source 
Apparently as of Qt 6.7 having a webview in a dialog run with exec()
breaks. So run the dialog with open() instead.
This commit is contained in:
Kovid Goyal 2024-10-29 07:13:04 +05:30
parent a961ddbfcb
commit 60a22179e9
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/calibre/gui2/toc/main.py
View File

@ -1194,13 +1194,15 @@ class TOCEditor(QDialog): # {{{
def develop(): def develop():
from calibre.utils.webengine import setup_fake_protocol
setup_fake_protocol()
from calibre.gui2 import Application from calibre.gui2 import Application
app = Application([]) app = Application([])
from calibre.utils.webengine import setup_default_profile, setup_fake_protocol
setup_fake_protocol()
setup_default_profile()
d = TOCEditor(sys.argv[-1]) d = TOCEditor(sys.argv[-1])
d.start() d.start()
d.exec() d.open()
app.exec()
del app del app
@ -1234,9 +1236,10 @@ def main(shm_name=None):
setup_default_profile() setup_default_profile()
d = TOCEditor(path, title=title, write_result_to=path + '.result') d = TOCEditor(path, title=title, write_result_to=path + '.result')
d.start() d.start()
ok = 0 # Using d.exec() causes showing the webview to hide the dialog
if d.exec() == QDialog.DialogCode.Accepted: d.open()
ok = 1 app.exec()
ok = 1 if d.result() == QDialog.DialogCode.Accepted else 0
s = struct.pack('>II', 2, ok) s = struct.pack('>II', 2, ok)
shm.seek(0), shm.write(s), shm.flush() shm.seek(0), shm.write(s), shm.flush()
@ -1246,5 +1249,4 @@ def main(shm_name=None):
if __name__ == '__main__': if __name__ == '__main__':
main(path=sys.argv[-1], title='test') develop()
os.remove(sys.argv[-1] + '.lock')

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

@ -630,8 +630,14 @@ class Boss(QObject):
if not self.ensure_book(_('You must open a book before trying to edit the Table of Contents.')): if not self.ensure_book(_('You must open a book before trying to edit the Table of Contents.')):
return return
self.add_savepoint(_('Before: Edit Table of Contents')) self.add_savepoint(_('Before: Edit Table of Contents'))
d = TOCEditor(title=self.current_metadata.title, parent=self.gui) self.__current_toc_editor = d = TOCEditor(title=self.current_metadata.title, parent=self.gui)
if d.exec() != QDialog.DialogCode.Accepted: d.finished.connect(self.toc_edit_finished)
# Using d.exec() causes showing the webview to hide the dialog
d.open()
def toc_edit_finished(self, retcode: int):
self.__current_toc_editor = None
if retcode != QDialog.DialogCode.Accepted:
self.rewind_savepoint() self.rewind_savepoint()
return return
with BusyCursor(): with BusyCursor():