summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/gui/app.py
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2017-08-14 18:07:37 -0400
committerKali Kaneko <kali@leap.se>2017-08-14 18:10:50 -0400
commitabf688c7d643b89a1001a9f7c7ff24a4a3dab42c (patch)
tree215dde5eda1db9f82c472cc4144a3deab1d5295c /src/leap/bitmask/gui/app.py
parentaff9d2519e71e346459f697c9c1541acc60e9e52 (diff)
[style] pep8
Diffstat (limited to 'src/leap/bitmask/gui/app.py')
-rw-r--r--src/leap/bitmask/gui/app.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/leap/bitmask/gui/app.py b/src/leap/bitmask/gui/app.py
index 3d380bc..38a37c4 100644
--- a/src/leap/bitmask/gui/app.py
+++ b/src/leap/bitmask/gui/app.py
@@ -106,8 +106,8 @@ class BrowserWindow(QWebView):
self.loadPage(self.url)
self.proxy = AppProxy(self) if first else None
- #self.frame.addToJavaScriptWindowObject(
- # "bitmaskApp", self.proxy)
+ self.frame.addToJavaScriptWindowObject(
+ "bitmaskApp", self.proxy)
icon = QtGui.QIcon()
icon.addPixmap(
@@ -132,9 +132,9 @@ class BrowserWindow(QWebView):
url = QtCore.QUrl(web_page)
# TODO -- port this to QWebEngine
- #self.frame = self.page().mainFrame()
- #self.frame.addToJavaScriptWindowObject(
- # "bitmaskBrowser", self.bitmask_browser)
+ self.frame = self.page().mainFrame()
+ self.frame.addToJavaScriptWindowObject(
+ "bitmaskBrowser", self.bitmask_browser)
self.load(url)
def shutdown(self, *args):