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

Replace deprecated __defineGetter__ and __defineSetter___

Browse Source 
__defineGetter__ was not working in Qt 5, this caused the following
regressions:

PDF Output: Header and footer templates not working in calibre 2.0.
Fixes #1361483 [Headers and footers don't appear EPUB to PDF](https://bugs.launchpad.net/calibre/+bug/1361483)

E-book viewer: The Table of Contents not displaying the currently viewed
section in bold if the section is a link to a location in the middle of
a file.
This commit is contained in:
Kovid Goyal 2014-08-26 13:08:47 +05:30
parent fb416ddffe
commit bad6acf8b3
4 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/ebooks/oeb/polish/stats.py
View File

@ -149,11 +149,9 @@ class Page(QWebPage): # {{{
self.mainFrame().addToJavaScriptWindowObject("py_bridge", self) self.mainFrame().addToJavaScriptWindowObject("py_bridge", self)
self.evaljs(self.js) self.evaljs(self.js)
self.evaljs(''' self.evaljs('''
py_bridge.__defineGetter__('value', function() { Object.defineProperty(py_bridge, 'value', {
return JSON.parse(this._pass_json_value); get : function() { return JSON.parse(this._pass_json_value); },
}); set : function(val) { this._pass_json_value = JSON.stringify(val); }
py_bridge.__defineSetter__('value', function(val) {
this._pass_json_value = JSON.stringify(val);
}); });
''') ''')
# }}} # }}}

8
src/calibre/ebooks/pdf/render/from_html.py
View File

@ -345,11 +345,9 @@ class PDFWriter(QObject):
self.load_mathjax() self.load_mathjax()
evaljs(''' evaljs('''
py_bridge.__defineGetter__('value', function() { Object.defineProperty(py_bridge, 'value', {
return JSON.parse(this._pass_json_value); get : function() { return JSON.parse(this._pass_json_value); },
}); set : function(val) { this._pass_json_value = JSON.stringify(val); }
py_bridge.__defineSetter__('value', function(val) {
this._pass_json_value = JSON.stringify(val);
}); });
document.body.style.backgroundColor = "white"; document.body.style.backgroundColor = "white";

8
src/calibre/ebooks/pdf/writer.py
View File

@ -250,11 +250,9 @@ class PDFWriter(QObject): # {{{
evaljs = self.view.page().mainFrame().evaluateJavaScript evaljs = self.view.page().mainFrame().evaluateJavaScript
evaljs(self.paged_js) evaljs(self.paged_js)
evaljs(''' evaljs('''
py_bridge.__defineGetter__('value', function() { Object.defineProperty(py_bridge, 'value', {
return JSON.parse(this._pass_json_value); get : function() { return JSON.parse(this._pass_json_value); },
}); set : function(val) { this._pass_json_value = JSON.stringify(val); }
py_bridge.__defineSetter__('value', function(val) {
this._pass_json_value = JSON.stringify(val);
}); });
document.body.style.backgroundColor = "white"; document.body.style.backgroundColor = "white";

10
src/calibre/gui2/viewer/documentview.py
View File

@ -180,12 +180,10 @@ class Document(QWebPage): # {{{
def add_window_objects(self): def add_window_objects(self):
self.mainFrame().addToJavaScriptWindowObject("py_bridge", self) self.mainFrame().addToJavaScriptWindowObject("py_bridge", self)
self.javascript(''' self.javascript('''
py_bridge.__defineGetter__('value', function() { Object.defineProperty(py_bridge, 'value', {
return JSON.parse(this._pass_json_value); get : function() { return JSON.parse(this._pass_json_value); },
}); set : function(val) { this._pass_json_value = JSON.stringify(val); }
py_bridge.__defineSetter__('value', function(val) { });
this._pass_json_value = JSON.stringify(val);
});
''') ''')
self.loaded_javascript = False self.loaded_javascript = False