Simplify WebPage signal sending

1.2
IceArmy 2011-06-03 13:51:37 -07:00
parent ff10a7af4d
commit 9b69c83e2a
1 changed files with 5 additions and 10 deletions

View File

@ -48,12 +48,12 @@ class CustomPage(QWebPage):
return False
def javaScriptAlert(self, originatingFrame, msg):
self.parent.emitAlert(msg)
self.parent.javaScriptAlertSent.emit(msg)
def javaScriptConsoleMessage(self, message, lineNumber, sourceID):
if sourceID:
message = '%s:%d %s' % (sourceID, lineNumber, message)
self.parent.emitConsoleMessage(message)
self.parent.javaScriptConsoleMessageSent.emit(message)
def userAgentForUrl(self, url):
return self.m_userAgent
@ -62,6 +62,9 @@ class CustomPage(QWebPage):
class WebPage(QObject):
javaScriptAlertSent = pyqtSignal(str)
javaScriptConsoleMessageSent = pyqtSignal(str)
def __init__(self, parent=None):
QObject.__init__(self, parent)
@ -106,14 +109,6 @@ class WebPage(QObject):
if 'userAgent' in defaults:
self.m_webPage.m_userAgent = defaults['userAgent']
javaScriptAlertSent = pyqtSignal(str)
def emitAlert(self, msg):
self.javaScriptAlertSent.emit(msg)
javaScriptConsoleMessageSent = pyqtSignal(str)
def emitConsoleMessage(self, msg):
self.javaScriptConsoleMessageSent.emit(msg)
loadStatusChanged = pyqtSignal(str)
def finish(self, ok):
status = 'success' if ok else 'fail'