From 42f2e6cff5b9a5762ec07ac31d5af4a37c532424 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 29 Nov 2013 14:20:16 +0530 Subject: [PATCH] Workaround for pyqtSlot not accepting QList on windows --- resources/compiled_coffeescript.zip | Bin 77585 -> 77601 bytes src/calibre/ebooks/oeb/polish/preview.coffee | 2 +- src/calibre/gui2/tweak_book/preview.py | 5 +++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/resources/compiled_coffeescript.zip b/resources/compiled_coffeescript.zip index 275739a8afe4b6600769945780c39d0ce3c628e2..4b5ab2b97233cfe3c7769704a4ed62f8c2796061 100644 GIT binary patch delta 215 zcmbPuk7eOK7U=+QW)=|!5YQ~Db$*^1A#q-qfdPbNrrYQ+%5SuC5)}3d_V?2(E-A{) zOV3QJ)X2$C)@-g9++HupI8TZfMc;HS9mZ&8P7#Lb6Z9BGrq9t~G-dYGg77A1Y4J_} zro*VkC^ubEm(hc{sUNDWL6^~lxo##@+5DLt(=Y1+mA#n$52Q?YJygPPJ=^qTJ)nf` e^gcaCFJ=W<#_77Uj0)3#>oE$jDe5o+eE|R<@jM*> delta 199 zcmZ2@k7eRL7U=+QW)=|!5V#Xo?wru$+OS`kfdPbNru*nH%5SuC5@gQFPj2oP+}sGu(&C%Wrpu_s$T!_km(hc{s2{3q zf-a*8bKXp-vh_1LrauNLyD^oW?l3FG6Y diff --git a/src/calibre/ebooks/oeb/polish/preview.coffee b/src/calibre/ebooks/oeb/polish/preview.coffee index 514ea329ce..40fa2d4f97 100644 --- a/src/calibre/ebooks/oeb/polish/preview.coffee +++ b/src/calibre/ebooks/oeb/polish/preview.coffee @@ -95,7 +95,7 @@ class PreviewIntegration loc.push(num) parent = parent.parentNode loc.reverse() - window.py_bridge.request_split(loc) + window.py_bridge.request_split(JSON.stringify(loc)) onload: () => window.document.body.addEventListener('click', this.onclick, true) diff --git a/src/calibre/gui2/tweak_book/preview.py b/src/calibre/gui2/tweak_book/preview.py index c25dfc303a..a2b8ecf00e 100644 --- a/src/calibre/gui2/tweak_book/preview.py +++ b/src/calibre/gui2/tweak_book/preview.py @@ -6,7 +6,7 @@ from __future__ import (unicode_literals, division, absolute_import, __license__ = 'GPL v3' __copyright__ = '2013, Kovid Goyal ' -import time, textwrap +import time, textwrap, json from bisect import bisect_right from base64 import b64encode from future_builtins import map @@ -319,9 +319,10 @@ class WebPage(QWebPage): except (TypeError, ValueError, OverflowError, AttributeError): pass - @pyqtSlot('QList') + @pyqtSlot(str) def request_split(self, loc): actions['split-in-preview'].setChecked(False) + loc = json.loads(unicode(loc)) if not loc: return error_dialog(self.view(), _('Invalid location'), _('Cannot split on the body tag'), show=True)