Merge pull request #136 from Roejames12/master

Updates
1.3
Ariya Hidayat 2011-08-23 12:31:41 -07:00
commit 6e4137f16c
4 changed files with 174 additions and 182 deletions

View File

@ -36,33 +36,33 @@ window.WebPage = function () {
defineSetter("onConsoleMessage", "javaScriptConsoleMessageSent");
page.open = function (url) {
page.open = function (url, arg1, arg2, arg3, arg4) {
if (arguments.length === 1) {
this.openUrl(url, 'get', this.settings);
return;
}
if (arguments.length === 2 && typeof arguments[1] === 'function') {
this.onLoadFinished = arguments[1];
if (arguments.length === 2 && typeof arg1 === 'function') {
this.onLoadFinished = arg1;
this.openUrl(url, 'get', this.settings);
return;
} else if (arguments.length === 2) {
this.openUrl(url, arguments[1], this.settings);
this.openUrl(url, arg1, this.settings);
return;
} else if (arguments.length === 3 && typeof arguments[2] === 'function') {
this.onLoadFinished = arguments[2];
this.openUrl(url, arguments[1], this.settings);
} else if (arguments.length === 3 && typeof arg2 === 'function') {
this.onLoadFinished = arg2;
this.openUrl(url, arg1, this.settings);
return;
} else if (arguments.length === 3) {
this.openUrl(url, {
operation: arguments[1],
data: arguments[2]
operation: arg1,
data: arg2
}, this.settings);
return;
} else if (arguments.length === 4) {
this.onLoadFinished = arguments[3];
this.onLoadFinished = arg3;
this.openUrl(url, {
operation: arguments[1],
data: arguments[2]
operation: arg1,
data: arg2
}, this.settings);
return;
}
@ -86,10 +86,6 @@ window.WebPage = function () {
this._appendScriptElement(scriptUrl);
};
page.release = function () {
phantom._release(page);
};
return page;
};

View File

@ -107,11 +107,6 @@ class Phantom(QObject):
# Properties and methods exposed to JavaScript
##
@pyqtSlot(WebPage)
def _release(self, page):
self.m_pages.remove(page)
sip.delete(page)
@pyqtProperty('QStringList')
def args(self):
return self.m_args

View File

@ -2,7 +2,7 @@
# Resource object code
#
# Created: Sun Aug 21 14:22:07 2011
# Created: Tue Aug 23 12:10:27 2011
# by: The Resource Compiler for PyQt (Qt v4.7.2)
#
# WARNING! All changes made in this file will be lost!
@ -10,7 +10,7 @@
from PyQt4 import QtCore
qt_resource_data = "\
\x00\x00\x12\x5f\
\x00\x00\x11\xd6\
\x2f\
\x2a\x6a\x73\x6c\x69\x6e\x74\x20\x73\x6c\x6f\x70\x70\x79\x3a\x20\
\x74\x72\x75\x65\x2c\x20\x6e\x6f\x6d\x65\x6e\x3a\x20\x74\x72\x75\
@ -91,74 +91,70 @@ qt_resource_data = "\
\x22\x6a\x61\x76\x61\x53\x63\x72\x69\x70\x74\x43\x6f\x6e\x73\x6f\
\x6c\x65\x4d\x65\x73\x73\x61\x67\x65\x53\x65\x6e\x74\x22\x29\x3b\
\x0a\x0a\x20\x20\x20\x20\x70\x61\x67\x65\x2e\x6f\x70\x65\x6e\x20\
\x3d\x20\x66\x75\x6e\x63\x74\x69\x6f\x6e\x20\x28\x75\x72\x6c\x29\
\x20\x7b\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x69\x66\x20\x28\x61\
\x72\x67\x75\x6d\x65\x6e\x74\x73\x2e\x6c\x65\x6e\x67\x74\x68\x20\
\x3d\x3d\x3d\x20\x31\x29\x20\x7b\x0a\x20\x20\x20\x20\x20\x20\x20\
\x20\x20\x20\x20\x20\x74\x68\x69\x73\x2e\x6f\x70\x65\x6e\x55\x72\
\x6c\x28\x75\x72\x6c\x2c\x20\x27\x67\x65\x74\x27\x2c\x20\x74\x68\
\x69\x73\x2e\x73\x65\x74\x74\x69\x6e\x67\x73\x29\x3b\x0a\x20\x20\
\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x72\x65\x74\x75\x72\x6e\
\x3b\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x7d\x0a\x20\x20\x20\x20\
\x20\x20\x20\x20\x69\x66\x20\x28\x61\x72\x67\x75\x6d\x65\x6e\x74\
\x73\x2e\x6c\x65\x6e\x67\x74\x68\x20\x3d\x3d\x3d\x20\x32\x20\x26\
\x26\x20\x74\x79\x70\x65\x6f\x66\x20\x61\x72\x67\x75\x6d\x65\x6e\
\x74\x73\x5b\x31\x5d\x20\x3d\x3d\x3d\x20\x27\x66\x75\x6e\x63\x74\
\x3d\x20\x66\x75\x6e\x63\x74\x69\x6f\x6e\x20\x28\x75\x72\x6c\x2c\
\x20\x61\x72\x67\x31\x2c\x20\x61\x72\x67\x32\x2c\x20\x61\x72\x67\
\x33\x2c\x20\x61\x72\x67\x34\x29\x20\x7b\x0a\x20\x20\x20\x20\x20\
\x20\x20\x20\x69\x66\x20\x28\x61\x72\x67\x75\x6d\x65\x6e\x74\x73\
\x2e\x6c\x65\x6e\x67\x74\x68\x20\x3d\x3d\x3d\x20\x31\x29\x20\x7b\
\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x74\x68\x69\
\x73\x2e\x6f\x70\x65\x6e\x55\x72\x6c\x28\x75\x72\x6c\x2c\x20\x27\
\x67\x65\x74\x27\x2c\x20\x74\x68\x69\x73\x2e\x73\x65\x74\x74\x69\
\x6e\x67\x73\x29\x3b\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\
\x20\x20\x72\x65\x74\x75\x72\x6e\x3b\x0a\x20\x20\x20\x20\x20\x20\
\x20\x20\x7d\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x69\x66\x20\x28\
\x61\x72\x67\x75\x6d\x65\x6e\x74\x73\x2e\x6c\x65\x6e\x67\x74\x68\
\x20\x3d\x3d\x3d\x20\x32\x20\x26\x26\x20\x74\x79\x70\x65\x6f\x66\
\x20\x61\x72\x67\x31\x20\x3d\x3d\x3d\x20\x27\x66\x75\x6e\x63\x74\
\x69\x6f\x6e\x27\x29\x20\x7b\x0a\x20\x20\x20\x20\x20\x20\x20\x20\
\x20\x20\x20\x20\x74\x68\x69\x73\x2e\x6f\x6e\x4c\x6f\x61\x64\x46\
\x69\x6e\x69\x73\x68\x65\x64\x20\x3d\x20\x61\x72\x67\x75\x6d\x65\
\x6e\x74\x73\x5b\x31\x5d\x3b\x0a\x20\x20\x20\x20\x20\x20\x20\x20\
\x20\x20\x20\x20\x74\x68\x69\x73\x2e\x6f\x70\x65\x6e\x55\x72\x6c\
\x28\x75\x72\x6c\x2c\x20\x27\x67\x65\x74\x27\x2c\x20\x74\x68\x69\
\x73\x2e\x73\x65\x74\x74\x69\x6e\x67\x73\x29\x3b\x0a\x20\x20\x20\
\x20\x20\x20\x20\x20\x20\x20\x20\x20\x72\x65\x74\x75\x72\x6e\x3b\
\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x7d\x20\x65\x6c\x73\x65\x20\
\x69\x66\x20\x28\x61\x72\x67\x75\x6d\x65\x6e\x74\x73\x2e\x6c\x65\
\x6e\x67\x74\x68\x20\x3d\x3d\x3d\x20\x32\x29\x20\x7b\x0a\x20\x20\
\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x74\x68\x69\x73\x2e\x6f\
\x70\x65\x6e\x55\x72\x6c\x28\x75\x72\x6c\x2c\x20\x61\x72\x67\x75\
\x6d\x65\x6e\x74\x73\x5b\x31\x5d\x2c\x20\x74\x68\x69\x73\x2e\x73\
\x69\x6e\x69\x73\x68\x65\x64\x20\x3d\x20\x61\x72\x67\x31\x3b\x0a\
\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x74\x68\x69\x73\
\x2e\x6f\x70\x65\x6e\x55\x72\x6c\x28\x75\x72\x6c\x2c\x20\x27\x67\
\x65\x74\x27\x2c\x20\x74\x68\x69\x73\x2e\x73\x65\x74\x74\x69\x6e\
\x67\x73\x29\x3b\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\
\x20\x72\x65\x74\x75\x72\x6e\x3b\x0a\x20\x20\x20\x20\x20\x20\x20\
\x20\x7d\x20\x65\x6c\x73\x65\x20\x69\x66\x20\x28\x61\x72\x67\x75\
\x6d\x65\x6e\x74\x73\x2e\x6c\x65\x6e\x67\x74\x68\x20\x3d\x3d\x3d\
\x20\x32\x29\x20\x7b\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\
\x20\x20\x74\x68\x69\x73\x2e\x6f\x70\x65\x6e\x55\x72\x6c\x28\x75\
\x72\x6c\x2c\x20\x61\x72\x67\x31\x2c\x20\x74\x68\x69\x73\x2e\x73\
\x65\x74\x74\x69\x6e\x67\x73\x29\x3b\x0a\x20\x20\x20\x20\x20\x20\
\x20\x20\x20\x20\x20\x20\x72\x65\x74\x75\x72\x6e\x3b\x0a\x20\x20\
\x20\x20\x20\x20\x20\x20\x7d\x20\x65\x6c\x73\x65\x20\x69\x66\x20\
\x28\x61\x72\x67\x75\x6d\x65\x6e\x74\x73\x2e\x6c\x65\x6e\x67\x74\
\x68\x20\x3d\x3d\x3d\x20\x33\x20\x26\x26\x20\x74\x79\x70\x65\x6f\
\x66\x20\x61\x72\x67\x75\x6d\x65\x6e\x74\x73\x5b\x32\x5d\x20\x3d\
\x3d\x3d\x20\x27\x66\x75\x6e\x63\x74\x69\x6f\x6e\x27\x29\x20\x7b\
\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x74\x68\x69\
\x73\x2e\x6f\x6e\x4c\x6f\x61\x64\x46\x69\x6e\x69\x73\x68\x65\x64\
\x20\x3d\x20\x61\x72\x67\x75\x6d\x65\x6e\x74\x73\x5b\x32\x5d\x3b\
\x66\x20\x61\x72\x67\x32\x20\x3d\x3d\x3d\x20\x27\x66\x75\x6e\x63\
\x74\x69\x6f\x6e\x27\x29\x20\x7b\x0a\x20\x20\x20\x20\x20\x20\x20\
\x20\x20\x20\x20\x20\x74\x68\x69\x73\x2e\x6f\x6e\x4c\x6f\x61\x64\
\x46\x69\x6e\x69\x73\x68\x65\x64\x20\x3d\x20\x61\x72\x67\x32\x3b\
\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x74\x68\x69\
\x73\x2e\x6f\x70\x65\x6e\x55\x72\x6c\x28\x75\x72\x6c\x2c\x20\x61\
\x72\x67\x75\x6d\x65\x6e\x74\x73\x5b\x31\x5d\x2c\x20\x74\x68\x69\
\x73\x2e\x73\x65\x74\x74\x69\x6e\x67\x73\x29\x3b\x0a\x20\x20\x20\
\x20\x20\x20\x20\x20\x20\x20\x20\x20\x72\x65\x74\x75\x72\x6e\x3b\
\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x7d\x20\x65\x6c\x73\x65\x20\
\x69\x66\x20\x28\x61\x72\x67\x75\x6d\x65\x6e\x74\x73\x2e\x6c\x65\
\x6e\x67\x74\x68\x20\x3d\x3d\x3d\x20\x33\x29\x20\x7b\x0a\x20\x20\
\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x74\x68\x69\x73\x2e\x6f\
\x70\x65\x6e\x55\x72\x6c\x28\x75\x72\x6c\x2c\x20\x7b\x0a\x20\x20\
\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x6f\x70\
\x65\x72\x61\x74\x69\x6f\x6e\x3a\x20\x61\x72\x67\x75\x6d\x65\x6e\
\x74\x73\x5b\x31\x5d\x2c\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\
\x72\x67\x31\x2c\x20\x74\x68\x69\x73\x2e\x73\x65\x74\x74\x69\x6e\
\x67\x73\x29\x3b\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\
\x20\x72\x65\x74\x75\x72\x6e\x3b\x0a\x20\x20\x20\x20\x20\x20\x20\
\x20\x7d\x20\x65\x6c\x73\x65\x20\x69\x66\x20\x28\x61\x72\x67\x75\
\x6d\x65\x6e\x74\x73\x2e\x6c\x65\x6e\x67\x74\x68\x20\x3d\x3d\x3d\
\x20\x33\x29\x20\x7b\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\
\x20\x20\x74\x68\x69\x73\x2e\x6f\x70\x65\x6e\x55\x72\x6c\x28\x75\
\x72\x6c\x2c\x20\x7b\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\
\x20\x20\x20\x20\x20\x20\x6f\x70\x65\x72\x61\x74\x69\x6f\x6e\x3a\
\x20\x61\x72\x67\x31\x2c\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\
\x20\x20\x20\x20\x20\x20\x20\x64\x61\x74\x61\x3a\x20\x61\x72\x67\
\x75\x6d\x65\x6e\x74\x73\x5b\x32\x5d\x0a\x20\x20\x20\x20\x20\x20\
\x20\x20\x20\x20\x20\x20\x7d\x2c\x20\x74\x68\x69\x73\x2e\x73\x65\
\x74\x74\x69\x6e\x67\x73\x29\x3b\x0a\x20\x20\x20\x20\x20\x20\x20\
\x20\x20\x20\x20\x20\x72\x65\x74\x75\x72\x6e\x3b\x0a\x20\x20\x20\
\x20\x20\x20\x20\x20\x7d\x20\x65\x6c\x73\x65\x20\x69\x66\x20\x28\
\x61\x72\x67\x75\x6d\x65\x6e\x74\x73\x2e\x6c\x65\x6e\x67\x74\x68\
\x20\x3d\x3d\x3d\x20\x34\x29\x20\x7b\x0a\x20\x20\x20\x20\x20\x20\
\x20\x20\x20\x20\x20\x20\x74\x68\x69\x73\x2e\x6f\x6e\x4c\x6f\x61\
\x64\x46\x69\x6e\x69\x73\x68\x65\x64\x20\x3d\x20\x61\x72\x67\x75\
\x6d\x65\x6e\x74\x73\x5b\x33\x5d\x3b\x0a\x20\x20\x20\x20\x20\x20\
\x32\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x7d\x2c\
\x20\x74\x68\x69\x73\x2e\x73\x65\x74\x74\x69\x6e\x67\x73\x29\x3b\
\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x72\x65\x74\
\x75\x72\x6e\x3b\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x7d\x20\x65\
\x6c\x73\x65\x20\x69\x66\x20\x28\x61\x72\x67\x75\x6d\x65\x6e\x74\
\x73\x2e\x6c\x65\x6e\x67\x74\x68\x20\x3d\x3d\x3d\x20\x34\x29\x20\
\x7b\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x74\x68\
\x69\x73\x2e\x6f\x6e\x4c\x6f\x61\x64\x46\x69\x6e\x69\x73\x68\x65\
\x64\x20\x3d\x20\x61\x72\x67\x33\x3b\x0a\x20\x20\x20\x20\x20\x20\
\x20\x20\x20\x20\x20\x20\x74\x68\x69\x73\x2e\x6f\x70\x65\x6e\x55\
\x72\x6c\x28\x75\x72\x6c\x2c\x20\x7b\x0a\x20\x20\x20\x20\x20\x20\
\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x6f\x70\x65\x72\x61\x74\
\x69\x6f\x6e\x3a\x20\x61\x72\x67\x75\x6d\x65\x6e\x74\x73\x5b\x31\
\x5d\x2c\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\
\x20\x20\x20\x64\x61\x74\x61\x3a\x20\x61\x72\x67\x75\x6d\x65\x6e\
\x74\x73\x5b\x32\x5d\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\
\x69\x6f\x6e\x3a\x20\x61\x72\x67\x31\x2c\x0a\x20\x20\x20\x20\x20\
\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x64\x61\x74\x61\x3a\
\x20\x61\x72\x67\x32\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\
\x20\x20\x7d\x2c\x20\x74\x68\x69\x73\x2e\x73\x65\x74\x74\x69\x6e\
\x67\x73\x29\x3b\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\
\x20\x72\x65\x74\x75\x72\x6e\x3b\x0a\x20\x20\x20\x20\x20\x20\x20\
@ -205,107 +201,103 @@ qt_resource_data = "\
\x6f\x64\x79\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x74\x68\x69\x73\
\x2e\x5f\x61\x70\x70\x65\x6e\x64\x53\x63\x72\x69\x70\x74\x45\x6c\
\x65\x6d\x65\x6e\x74\x28\x73\x63\x72\x69\x70\x74\x55\x72\x6c\x29\
\x3b\x0a\x20\x20\x20\x20\x7d\x3b\x0a\x0a\x20\x20\x20\x20\x70\x61\
\x67\x65\x2e\x72\x65\x6c\x65\x61\x73\x65\x20\x3d\x20\x66\x75\x6e\
\x63\x74\x69\x6f\x6e\x20\x28\x29\x20\x7b\x0a\x20\x20\x20\x20\x20\
\x20\x20\x20\x70\x68\x61\x6e\x74\x6f\x6d\x2e\x5f\x72\x65\x6c\x65\
\x61\x73\x65\x28\x70\x61\x67\x65\x29\x3b\x0a\x20\x20\x20\x20\x7d\
\x3b\x0a\x0a\x20\x20\x20\x20\x72\x65\x74\x75\x72\x6e\x20\x70\x61\
\x67\x65\x3b\x0a\x7d\x3b\x0a\x0a\x2f\x2f\x20\x77\x69\x6e\x64\x6f\
\x77\x2e\x66\x73\x0a\x2f\x2f\x20\x4a\x61\x76\x61\x53\x63\x72\x69\
\x70\x74\x20\x22\x73\x68\x69\x6d\x22\x20\x74\x6f\x20\x74\x68\x72\
\x6f\x77\x20\x65\x78\x63\x65\x70\x74\x69\x6f\x6e\x73\x20\x69\x6e\
\x20\x63\x61\x73\x65\x20\x61\x20\x63\x72\x69\x74\x69\x63\x61\x6c\
\x20\x6f\x70\x65\x72\x61\x74\x69\x6f\x6e\x20\x66\x61\x69\x6c\x73\
\x2e\x0a\x0a\x2f\x2a\x2a\x20\x4f\x70\x65\x6e\x20\x61\x6e\x64\x20\
\x72\x65\x74\x75\x72\x6e\x20\x61\x20\x22\x66\x69\x6c\x65\x22\x20\
\x6f\x62\x6a\x65\x63\x74\x2e\x0a\x20\x2a\x20\x49\x74\x20\x77\x69\
\x6c\x6c\x20\x74\x68\x72\x6f\x77\x20\x65\x78\x63\x65\x70\x74\x69\
\x3b\x0a\x20\x20\x20\x20\x7d\x3b\x0a\x0a\x20\x20\x20\x20\x72\x65\
\x74\x75\x72\x6e\x20\x70\x61\x67\x65\x3b\x0a\x7d\x3b\x0a\x0a\x2f\
\x2f\x20\x77\x69\x6e\x64\x6f\x77\x2e\x66\x73\x0a\x2f\x2f\x20\x4a\
\x61\x76\x61\x53\x63\x72\x69\x70\x74\x20\x22\x73\x68\x69\x6d\x22\
\x20\x74\x6f\x20\x74\x68\x72\x6f\x77\x20\x65\x78\x63\x65\x70\x74\
\x69\x6f\x6e\x73\x20\x69\x6e\x20\x63\x61\x73\x65\x20\x61\x20\x63\
\x72\x69\x74\x69\x63\x61\x6c\x20\x6f\x70\x65\x72\x61\x74\x69\x6f\
\x6e\x20\x66\x61\x69\x6c\x73\x2e\x0a\x0a\x2f\x2a\x2a\x20\x4f\x70\
\x65\x6e\x20\x61\x6e\x64\x20\x72\x65\x74\x75\x72\x6e\x20\x61\x20\
\x22\x66\x69\x6c\x65\x22\x20\x6f\x62\x6a\x65\x63\x74\x2e\x0a\x20\
\x2a\x20\x49\x74\x20\x77\x69\x6c\x6c\x20\x74\x68\x72\x6f\x77\x20\
\x65\x78\x63\x65\x70\x74\x69\x6f\x6e\x20\x69\x66\x20\x69\x74\x20\
\x66\x61\x69\x6c\x73\x2e\x0a\x20\x2a\x0a\x20\x2a\x20\x40\x70\x61\
\x72\x61\x6d\x20\x70\x61\x74\x68\x20\x50\x61\x74\x68\x20\x6f\x66\
\x20\x74\x68\x65\x20\x66\x69\x6c\x65\x20\x74\x6f\x20\x6f\x70\x65\
\x6e\x0a\x20\x2a\x20\x40\x70\x61\x72\x61\x6d\x20\x6d\x6f\x64\x65\
\x20\x4f\x70\x65\x6e\x20\x4d\x6f\x64\x65\x2e\x20\x41\x20\x73\x74\
\x72\x69\x6e\x67\x20\x6d\x61\x64\x65\x20\x6f\x66\x20\x27\x72\x27\
\x2c\x20\x27\x77\x27\x2c\x20\x27\x61\x2f\x2b\x27\x20\x63\x68\x61\
\x72\x61\x63\x74\x65\x72\x73\x2e\x0a\x20\x2a\x20\x40\x72\x65\x74\
\x75\x72\x6e\x20\x22\x66\x69\x6c\x65\x22\x20\x6f\x62\x6a\x65\x63\
\x74\x0a\x20\x2a\x2f\x0a\x77\x69\x6e\x64\x6f\x77\x2e\x66\x73\x2e\
\x6f\x70\x65\x6e\x20\x3d\x20\x66\x75\x6e\x63\x74\x69\x6f\x6e\x20\
\x28\x70\x61\x74\x68\x2c\x20\x6d\x6f\x64\x65\x29\x20\x7b\x0a\x20\
\x20\x20\x20\x76\x61\x72\x20\x66\x69\x6c\x65\x20\x3d\x20\x77\x69\
\x6e\x64\x6f\x77\x2e\x66\x73\x2e\x5f\x6f\x70\x65\x6e\x28\x70\x61\
\x74\x68\x2c\x20\x6d\x6f\x64\x65\x29\x3b\x0a\x20\x20\x20\x20\x69\
\x66\x20\x28\x66\x69\x6c\x65\x29\x20\x7b\x0a\x20\x20\x20\x20\x20\
\x20\x20\x20\x72\x65\x74\x75\x72\x6e\x20\x66\x69\x6c\x65\x3b\x0a\
\x20\x20\x20\x20\x7d\x0a\x20\x20\x20\x20\x74\x68\x72\x6f\x77\x20\
\x22\x55\x6e\x61\x62\x6c\x65\x20\x74\x6f\x20\x6f\x70\x65\x6e\x20\
\x66\x69\x6c\x65\x20\x27\x22\x20\x2b\x20\x70\x61\x74\x68\x20\x2b\
\x20\x22\x27\x22\x3b\x0a\x7d\x3b\x0a\x0a\x2f\x2a\x2a\x20\x4f\x70\
\x65\x6e\x2c\x20\x72\x65\x61\x64\x20\x61\x6e\x64\x20\x72\x65\x74\
\x75\x72\x6e\x20\x63\x6f\x6e\x74\x65\x6e\x74\x20\x6f\x66\x20\x61\
\x20\x66\x69\x6c\x65\x2e\x0a\x20\x2a\x20\x49\x74\x20\x77\x69\x6c\
\x6c\x20\x74\x68\x72\x6f\x77\x20\x61\x6e\x20\x65\x78\x63\x65\x70\
\x74\x69\x6f\x6e\x20\x69\x66\x20\x69\x74\x20\x66\x61\x69\x6c\x73\
\x2e\x0a\x20\x2a\x0a\x20\x2a\x20\x40\x70\x61\x72\x61\x6d\x20\x70\
\x61\x74\x68\x20\x50\x61\x74\x68\x20\x6f\x66\x20\x74\x68\x65\x20\
\x66\x69\x6c\x65\x20\x74\x6f\x20\x72\x65\x61\x64\x20\x66\x72\x6f\
\x6d\x0a\x20\x2a\x20\x40\x72\x65\x74\x75\x72\x6e\x20\x66\x69\x6c\
\x65\x20\x63\x6f\x6e\x74\x65\x6e\x74\x0a\x20\x2a\x2f\x0a\x77\x69\
\x6e\x64\x6f\x77\x2e\x66\x73\x2e\x72\x65\x61\x64\x20\x3d\x20\x66\
\x75\x6e\x63\x74\x69\x6f\x6e\x20\x28\x70\x61\x74\x68\x29\x20\x7b\
\x0a\x20\x20\x20\x20\x76\x61\x72\x20\x66\x20\x3d\x20\x66\x73\x2e\
\x6f\x70\x65\x6e\x28\x70\x61\x74\x68\x2c\x20\x27\x72\x27\x29\x2c\
\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x63\x6f\x6e\x74\x65\x6e\x74\
\x20\x3d\x20\x66\x2e\x72\x65\x61\x64\x28\x29\x3b\x0a\x0a\x20\x20\
\x20\x20\x66\x2e\x63\x6c\x6f\x73\x65\x28\x29\x3b\x0a\x20\x20\x20\
\x20\x72\x65\x74\x75\x72\x6e\x20\x63\x6f\x6e\x74\x65\x6e\x74\x3b\
\x0a\x7d\x3b\x0a\x0a\x2f\x2a\x2a\x20\x4f\x70\x65\x6e\x20\x61\x6e\
\x64\x20\x77\x72\x69\x74\x65\x20\x63\x6f\x6e\x74\x65\x6e\x74\x20\
\x74\x6f\x20\x61\x20\x66\x69\x6c\x65\x0a\x20\x2a\x20\x49\x74\x20\
\x77\x69\x6c\x6c\x20\x74\x68\x72\x6f\x77\x20\x61\x6e\x20\x65\x78\
\x63\x65\x70\x74\x69\x6f\x6e\x20\x69\x66\x20\x69\x74\x20\x66\x61\
\x69\x6c\x73\x2e\x0a\x20\x2a\x0a\x20\x2a\x20\x40\x70\x61\x72\x61\
\x6d\x20\x70\x61\x74\x68\x20\x50\x61\x74\x68\x20\x6f\x66\x20\x74\
\x68\x65\x20\x66\x69\x6c\x65\x20\x74\x6f\x20\x72\x65\x61\x64\x20\
\x66\x72\x6f\x6d\x0a\x20\x2a\x20\x40\x70\x61\x72\x61\x6d\x20\x63\
\x6f\x6e\x74\x65\x6e\x74\x20\x43\x6f\x6e\x74\x65\x6e\x74\x20\x74\
\x6f\x20\x77\x72\x69\x74\x65\x20\x74\x6f\x20\x74\x68\x65\x20\x66\
\x69\x6c\x65\x0a\x20\x2a\x20\x40\x70\x61\x72\x61\x6d\x20\x6d\x6f\
\x64\x65\x20\x4f\x70\x65\x6e\x20\x4d\x6f\x64\x65\x2e\x20\x41\x20\
\x73\x74\x72\x69\x6e\x67\x20\x6d\x61\x64\x65\x20\x6f\x66\x20\x27\
\x77\x27\x20\x6f\x72\x20\x27\x61\x20\x2f\x20\x2b\x27\x20\x63\x68\
\x61\x72\x61\x63\x74\x65\x72\x73\x2e\x0a\x20\x2a\x2f\x0a\x77\x69\
\x6e\x64\x6f\x77\x2e\x66\x73\x2e\x77\x72\x69\x74\x65\x20\x3d\x20\
\x66\x75\x6e\x63\x74\x69\x6f\x6e\x20\x28\x70\x61\x74\x68\x2c\x20\
\x63\x6f\x6e\x74\x65\x6e\x74\x2c\x20\x6d\x6f\x64\x65\x29\x20\x7b\
\x0a\x20\x20\x20\x20\x76\x61\x72\x20\x66\x20\x3d\x20\x66\x73\x2e\
\x6f\x70\x65\x6e\x28\x70\x61\x74\x68\x2c\x20\x6d\x6f\x64\x65\x29\
\x3b\x0a\x0a\x20\x20\x20\x20\x66\x2e\x77\x72\x69\x74\x65\x28\x63\
\x6f\x6e\x74\x65\x6e\x74\x29\x3b\x0a\x20\x20\x20\x20\x66\x2e\x63\
\x6c\x6f\x73\x65\x28\x29\x3b\x0a\x7d\x3b\x0a\x0a\x2f\x2a\x2a\x20\
\x52\x65\x74\x75\x72\x6e\x20\x74\x68\x65\x20\x73\x69\x7a\x65\x20\
\x6f\x66\x20\x61\x20\x66\x69\x6c\x65\x2c\x20\x69\x6e\x20\x62\x79\
\x74\x65\x73\x2e\x0a\x20\x2a\x20\x49\x74\x20\x77\x69\x6c\x6c\x20\
\x74\x68\x72\x6f\x77\x20\x61\x6e\x20\x65\x78\x63\x65\x70\x74\x69\
\x6f\x6e\x20\x69\x66\x20\x69\x74\x20\x66\x61\x69\x6c\x73\x2e\x0a\
\x20\x2a\x0a\x20\x2a\x20\x40\x70\x61\x72\x61\x6d\x20\x70\x61\x74\
\x68\x20\x50\x61\x74\x68\x20\x6f\x66\x20\x74\x68\x65\x20\x66\x69\
\x6c\x65\x20\x74\x6f\x20\x6f\x70\x65\x6e\x0a\x20\x2a\x20\x40\x70\
\x61\x72\x61\x6d\x20\x6d\x6f\x64\x65\x20\x4f\x70\x65\x6e\x20\x4d\
\x6f\x64\x65\x2e\x20\x41\x20\x73\x74\x72\x69\x6e\x67\x20\x6d\x61\
\x64\x65\x20\x6f\x66\x20\x27\x72\x27\x2c\x20\x27\x77\x27\x2c\x20\
\x27\x61\x2f\x2b\x27\x20\x63\x68\x61\x72\x61\x63\x74\x65\x72\x73\
\x2e\x0a\x20\x2a\x20\x40\x72\x65\x74\x75\x72\x6e\x20\x22\x66\x69\
\x6c\x65\x22\x20\x6f\x62\x6a\x65\x63\x74\x0a\x20\x2a\x2f\x0a\x77\
\x69\x6e\x64\x6f\x77\x2e\x66\x73\x2e\x6f\x70\x65\x6e\x20\x3d\x20\
\x66\x75\x6e\x63\x74\x69\x6f\x6e\x20\x28\x70\x61\x74\x68\x2c\x20\
\x6d\x6f\x64\x65\x29\x20\x7b\x0a\x20\x20\x20\x20\x76\x61\x72\x20\
\x66\x69\x6c\x65\x20\x3d\x20\x77\x69\x6e\x64\x6f\x77\x2e\x66\x73\
\x2e\x5f\x6f\x70\x65\x6e\x28\x70\x61\x74\x68\x2c\x20\x6d\x6f\x64\
\x65\x29\x3b\x0a\x20\x20\x20\x20\x69\x66\x20\x28\x66\x69\x6c\x65\
\x29\x20\x7b\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x72\x65\x74\x75\
\x72\x6e\x20\x66\x69\x6c\x65\x3b\x0a\x20\x20\x20\x20\x7d\x0a\x20\
\x20\x20\x20\x74\x68\x72\x6f\x77\x20\x22\x55\x6e\x61\x62\x6c\x65\
\x20\x74\x6f\x20\x6f\x70\x65\x6e\x20\x66\x69\x6c\x65\x20\x27\x22\
\x20\x2b\x20\x70\x61\x74\x68\x20\x2b\x20\x22\x27\x22\x3b\x0a\x7d\
\x3b\x0a\x0a\x2f\x2a\x2a\x20\x4f\x70\x65\x6e\x2c\x20\x72\x65\x61\
\x64\x20\x61\x6e\x64\x20\x72\x65\x74\x75\x72\x6e\x20\x63\x6f\x6e\
\x74\x65\x6e\x74\x20\x6f\x66\x20\x61\x20\x66\x69\x6c\x65\x2e\x0a\
\x20\x2a\x20\x49\x74\x20\x77\x69\x6c\x6c\x20\x74\x68\x72\x6f\x77\
\x20\x61\x6e\x20\x65\x78\x63\x65\x70\x74\x69\x6f\x6e\x20\x69\x66\
\x20\x69\x74\x20\x66\x61\x69\x6c\x73\x2e\x0a\x20\x2a\x0a\x20\x2a\
\x20\x40\x70\x61\x72\x61\x6d\x20\x70\x61\x74\x68\x20\x50\x61\x74\
\x68\x20\x6f\x66\x20\x74\x68\x65\x20\x66\x69\x6c\x65\x20\x74\x6f\
\x20\x72\x65\x61\x64\x20\x66\x72\x6f\x6d\x0a\x20\x2a\x20\x40\x72\
\x65\x74\x75\x72\x6e\x20\x66\x69\x6c\x65\x20\x63\x6f\x6e\x74\x65\
\x6e\x74\x0a\x20\x2a\x2f\x0a\x77\x69\x6e\x64\x6f\x77\x2e\x66\x73\
\x2e\x72\x65\x61\x64\x20\x3d\x20\x66\x75\x6e\x63\x74\x69\x6f\x6e\
\x20\x28\x70\x61\x74\x68\x29\x20\x7b\x0a\x20\x20\x20\x20\x76\x61\
\x72\x20\x66\x20\x3d\x20\x66\x73\x2e\x6f\x70\x65\x6e\x28\x70\x61\
\x74\x68\x2c\x20\x27\x72\x27\x29\x2c\x0a\x20\x20\x20\x20\x20\x20\
\x20\x20\x63\x6f\x6e\x74\x65\x6e\x74\x20\x3d\x20\x66\x2e\x72\x65\
\x61\x64\x28\x29\x3b\x0a\x0a\x20\x20\x20\x20\x66\x2e\x63\x6c\x6f\
\x73\x65\x28\x29\x3b\x0a\x20\x20\x20\x20\x72\x65\x74\x75\x72\x6e\
\x20\x63\x6f\x6e\x74\x65\x6e\x74\x3b\x0a\x7d\x3b\x0a\x0a\x2f\x2a\
\x2a\x20\x4f\x70\x65\x6e\x20\x61\x6e\x64\x20\x77\x72\x69\x74\x65\
\x20\x63\x6f\x6e\x74\x65\x6e\x74\x20\x74\x6f\x20\x61\x20\x66\x69\
\x6c\x65\x0a\x20\x2a\x20\x49\x74\x20\x77\x69\x6c\x6c\x20\x74\x68\
\x72\x6f\x77\x20\x61\x6e\x20\x65\x78\x63\x65\x70\x74\x69\x6f\x6e\
\x20\x69\x66\x20\x69\x74\x20\x66\x61\x69\x6c\x73\x2e\x0a\x20\x2a\
\x0a\x20\x2a\x20\x40\x70\x61\x72\x61\x6d\x20\x70\x61\x74\x68\x20\
\x50\x61\x74\x68\x20\x6f\x66\x20\x74\x68\x65\x20\x66\x69\x6c\x65\
\x20\x74\x6f\x20\x72\x65\x61\x64\x20\x66\x72\x6f\x6d\x0a\x20\x2a\
\x20\x40\x70\x61\x72\x61\x6d\x20\x63\x6f\x6e\x74\x65\x6e\x74\x20\
\x43\x6f\x6e\x74\x65\x6e\x74\x20\x74\x6f\x20\x77\x72\x69\x74\x65\
\x20\x74\x6f\x20\x74\x68\x65\x20\x66\x69\x6c\x65\x0a\x20\x2a\x20\
\x40\x70\x61\x72\x61\x6d\x20\x6d\x6f\x64\x65\x20\x4f\x70\x65\x6e\
\x20\x4d\x6f\x64\x65\x2e\x20\x41\x20\x73\x74\x72\x69\x6e\x67\x20\
\x6d\x61\x64\x65\x20\x6f\x66\x20\x27\x77\x27\x20\x6f\x72\x20\x27\
\x61\x20\x2f\x20\x2b\x27\x20\x63\x68\x61\x72\x61\x63\x74\x65\x72\
\x73\x2e\x0a\x20\x2a\x2f\x0a\x77\x69\x6e\x64\x6f\x77\x2e\x66\x73\
\x2e\x77\x72\x69\x74\x65\x20\x3d\x20\x66\x75\x6e\x63\x74\x69\x6f\
\x6e\x20\x28\x70\x61\x74\x68\x2c\x20\x63\x6f\x6e\x74\x65\x6e\x74\
\x2c\x20\x6d\x6f\x64\x65\x29\x20\x7b\x0a\x20\x20\x20\x20\x76\x61\
\x72\x20\x66\x20\x3d\x20\x66\x73\x2e\x6f\x70\x65\x6e\x28\x70\x61\
\x74\x68\x2c\x20\x6d\x6f\x64\x65\x29\x3b\x0a\x0a\x20\x20\x20\x20\
\x66\x2e\x77\x72\x69\x74\x65\x28\x63\x6f\x6e\x74\x65\x6e\x74\x29\
\x3b\x0a\x20\x20\x20\x20\x66\x2e\x63\x6c\x6f\x73\x65\x28\x29\x3b\
\x0a\x7d\x3b\x0a\x0a\x2f\x2a\x2a\x20\x52\x65\x74\x75\x72\x6e\x20\
\x74\x68\x65\x20\x73\x69\x7a\x65\x20\x6f\x66\x20\x61\x20\x66\x69\
\x6c\x65\x2c\x20\x69\x6e\x20\x62\x79\x74\x65\x73\x2e\x0a\x20\x2a\
\x20\x49\x74\x20\x77\x69\x6c\x6c\x20\x74\x68\x72\x6f\x77\x20\x61\
\x6e\x20\x65\x78\x63\x65\x70\x74\x69\x6f\x6e\x20\x69\x66\x20\x69\
\x74\x20\x66\x61\x69\x6c\x73\x2e\x0a\x20\x2a\x0a\x20\x2a\x20\x40\
\x70\x61\x72\x61\x6d\x20\x70\x61\x74\x68\x20\x50\x61\x74\x68\x20\
\x66\x6f\x20\x74\x68\x65\x20\x66\x69\x6c\x65\x20\x74\x6f\x20\x72\
\x65\x61\x64\x20\x74\x68\x65\x20\x73\x69\x7a\x65\x20\x6f\x66\x0a\
\x20\x2a\x20\x40\x72\x65\x74\x75\x72\x6e\x20\x46\x69\x6c\x65\x20\
\x73\x69\x7a\x65\x20\x69\x6e\x20\x62\x79\x74\x65\x73\x0a\x20\x2a\
\x2f\x0a\x77\x69\x6e\x64\x6f\x77\x2e\x66\x73\x2e\x73\x69\x7a\x65\
\x20\x3d\x20\x66\x75\x6e\x63\x74\x69\x6f\x6e\x20\x28\x70\x61\x74\
\x68\x29\x20\x7b\x0a\x20\x20\x20\x20\x76\x61\x72\x20\x73\x69\x7a\
\x65\x20\x3d\x20\x66\x73\x2e\x5f\x73\x69\x7a\x65\x28\x70\x61\x74\
\x68\x29\x3b\x0a\x20\x20\x20\x20\x69\x66\x20\x28\x73\x69\x7a\x65\
\x20\x21\x3d\x3d\x20\x2d\x31\x29\x20\x7b\x0a\x20\x20\x20\x20\x20\
\x20\x20\x20\x72\x65\x74\x75\x72\x6e\x20\x73\x69\x7a\x65\x3b\x0a\
\x20\x20\x20\x20\x7d\x0a\x20\x20\x20\x20\x74\x68\x72\x6f\x77\x20\
\x22\x55\x6e\x61\x62\x6c\x65\x20\x74\x6f\x20\x72\x65\x61\x64\x20\
\x66\x69\x6c\x65\x20\x27\x22\x20\x2b\x20\x70\x61\x74\x68\x20\x2b\
\x20\x22\x27\x20\x73\x69\x7a\x65\x22\x3b\x0a\x7d\x3b\x0a\
\x68\x20\x50\x61\x74\x68\x20\x66\x6f\x20\x74\x68\x65\x20\x66\x69\
\x6c\x65\x20\x74\x6f\x20\x72\x65\x61\x64\x20\x74\x68\x65\x20\x73\
\x69\x7a\x65\x20\x6f\x66\x0a\x20\x2a\x20\x40\x72\x65\x74\x75\x72\
\x6e\x20\x46\x69\x6c\x65\x20\x73\x69\x7a\x65\x20\x69\x6e\x20\x62\
\x79\x74\x65\x73\x0a\x20\x2a\x2f\x0a\x77\x69\x6e\x64\x6f\x77\x2e\
\x66\x73\x2e\x73\x69\x7a\x65\x20\x3d\x20\x66\x75\x6e\x63\x74\x69\
\x6f\x6e\x20\x28\x70\x61\x74\x68\x29\x20\x7b\x0a\x20\x20\x20\x20\
\x76\x61\x72\x20\x73\x69\x7a\x65\x20\x3d\x20\x66\x73\x2e\x5f\x73\
\x69\x7a\x65\x28\x70\x61\x74\x68\x29\x3b\x0a\x20\x20\x20\x20\x69\
\x66\x20\x28\x73\x69\x7a\x65\x20\x21\x3d\x3d\x20\x2d\x31\x29\x20\
\x7b\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x72\x65\x74\x75\x72\x6e\
\x20\x73\x69\x7a\x65\x3b\x0a\x20\x20\x20\x20\x7d\x0a\x20\x20\x20\
\x20\x74\x68\x72\x6f\x77\x20\x22\x55\x6e\x61\x62\x6c\x65\x20\x74\
\x6f\x20\x72\x65\x61\x64\x20\x66\x69\x6c\x65\x20\x27\x22\x20\x2b\
\x20\x70\x61\x74\x68\x20\x2b\x20\x22\x27\x20\x73\x69\x7a\x65\x22\
\x3b\x0a\x7d\x3b\x0a\
\x00\x00\x56\x27\
\x89\
\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
@ -4505,8 +4497,8 @@ qt_resource_struct = "\
\x00\x00\x00\x00\x00\x02\x00\x00\x00\x02\x00\x00\x00\x01\
\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
\x00\x00\x00\x1e\x00\x02\x00\x00\x00\x02\x00\x00\x00\x03\
\x00\x00\x00\x64\x00\x01\x00\x00\x00\x01\x00\x00\x68\x8e\
\x00\x00\x00\x36\x00\x00\x00\x00\x00\x01\x00\x00\x12\x63\
\x00\x00\x00\x64\x00\x01\x00\x00\x00\x01\x00\x00\x68\x05\
\x00\x00\x00\x36\x00\x00\x00\x00\x00\x01\x00\x00\x11\xda\
"
def qInitResources():

View File

@ -19,6 +19,7 @@
from math import ceil, floor
import sip
from PyQt4.QtCore import (pyqtProperty, pyqtSlot, pyqtSignal, Qt, QObject,
QRect, QPoint, QUrl, QFileInfo, QDir, QSize,
QSizeF, QByteArray, QEventLoop, QEvent, QFile)
@ -36,7 +37,8 @@ class CustomPage(QWebPage):
def __init__(self, parent):
QWebPage.__init__(self, parent)
self.parent = parent
self.m_parent = parent
self.m_userAgent = QWebPage.userAgentForUrl(self, QUrl())
self.m_scrollPosition = QPoint()
@ -52,10 +54,10 @@ class CustomPage(QWebPage):
return False
def javaScriptAlert(self, originatingFrame, msg):
self.parent.javaScriptAlertSent.emit(msg)
self.m_parent.javaScriptAlertSent.emit(msg)
def javaScriptConsoleMessage(self, message, lineNumber, sourceID):
self.parent.javaScriptConsoleMessageSent.emit(message, lineNumber, sourceID)
self.m_parent.javaScriptConsoleMessageSent.emit(message, lineNumber, sourceID)
def userAgentForUrl(self, url):
return self.m_userAgent
@ -75,6 +77,8 @@ class WebPage(QObject):
def __init__(self, parent):
QObject.__init__(self, parent)
self.m_parent = parent
# variable declarations
self.m_paperSize = {}
self.m_clipRect = QRect()
@ -396,6 +400,11 @@ class WebPage(QObject):
def paperSize(self, size):
self.m_paperSize = size
@pyqtSlot()
def release(self):
self.m_parent.m_pages.remove(self)
sip.delete(self)
@pyqtSlot(str, result=bool)
def render(self, fileName):
if self.m_mainFrame.contentsSize() == '':