summaryrefslogtreecommitdiff
path: root/src/leap/bitmask
diff options
context:
space:
mode:
Diffstat (limited to 'src/leap/bitmask')
-rw-r--r--src/leap/bitmask/gui/app.py10
-rw-r--r--src/leap/bitmask/gui/app2.py7
-rw-r--r--src/leap/bitmask/vpn/_control.py6
3 files changed, 10 insertions, 13 deletions
diff --git a/src/leap/bitmask/gui/app.py b/src/leap/bitmask/gui/app.py
index 3d380bc3..38a37c47 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):
diff --git a/src/leap/bitmask/gui/app2.py b/src/leap/bitmask/gui/app2.py
index f037a000..e540f492 100644
--- a/src/leap/bitmask/gui/app2.py
+++ b/src/leap/bitmask/gui/app2.py
@@ -17,8 +17,8 @@
"""
Main entrypoint for the Bitmask Qt GUI.
-It just launches a webview browser that runs the local web-ui served by bitmaskd
-when the web service is running.
+It just launches a webview browser that runs the local web-ui served by
+bitmaskd when the web service is running.
"""
import os
@@ -36,7 +36,6 @@ import psutil
from leap.bitmask.core.launcher import run_bitmaskd, pid
from leap.common.config import get_path_prefix
-#from leap.bitmask.gui import app_rc
DEBUG = os.environ.get("DEBUG", False)
@@ -83,7 +82,6 @@ class BrowserWindow(object):
webview.create_window('Bitmask', self.url)
-
def loadPage(self, web_page):
self.load(url)
@@ -101,7 +99,6 @@ class BrowserWindow(object):
print('[bitmask] shutting down gui...')
-
def launch_gui():
global bitmaskd
global browser
diff --git a/src/leap/bitmask/vpn/_control.py b/src/leap/bitmask/vpn/_control.py
index 7cf41d1f..ac683a2a 100644
--- a/src/leap/bitmask/vpn/_control.py
+++ b/src/leap/bitmask/vpn/_control.py
@@ -91,9 +91,9 @@ class VPNControl(object):
# generic watchers
poll_list = [
- LoopingCall(vpnproc.pollStatus),
- LoopingCall(vpnproc.pollState),
- LoopingCall(vpnproc.pollLog)]
+ LoopingCall(vpnproc.pollStatus),
+ LoopingCall(vpnproc.pollState),
+ LoopingCall(vpnproc.pollLog)]
self._pollers.extend(poll_list)
self._start_pollers()
return True