diff options
Diffstat (limited to 'src/leap/bitmask')
| -rw-r--r-- | src/leap/bitmask/gui/app.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/leap/bitmask/gui/app.py b/src/leap/bitmask/gui/app.py index 2edb5bfd..03d5b5c4 100644 --- a/src/leap/bitmask/gui/app.py +++ b/src/leap/bitmask/gui/app.py @@ -35,6 +35,8 @@ from leap.bitmask.core.launcher import run_bitmaskd, pid from leap.bitmask.gui import app_rc from leap.common.config import get_path_prefix +from .systray import WithTrayIcon + if platform.system() == 'Windows': from multiprocessing import freeze_support from PySide import QtCore, QtGui @@ -59,9 +61,6 @@ else: from PyQt5.QtWebEngineWidgets import QWebEngineView as QWebView from PyQt5.QtWebEngineWidgets import QWebEngineSettings as QWebSettings -from .systray import WithTrayIcon - - IS_WIN = platform.system() == "Windows" DEBUG = os.environ.get("DEBUG", False) @@ -73,7 +72,6 @@ bitmaskd = None browser = None - class BrowserWindow(QWebView, WithTrayIcon): """ This qt-webkit window exposes a couple of callable objects through the @@ -86,6 +84,7 @@ class BrowserWindow(QWebView, WithTrayIcon): This BrowserWindow assumes that the backend is already running, since it is going to look for the authtoken in the configuration folder. """ + def __init__(self, *args, **kw): url = kw.pop('url', None) first = False @@ -128,7 +127,7 @@ class BrowserWindow(QWebView, WithTrayIcon): try: if os.environ.get('DEBUG'): self.settings().setAttribute( - QWebSettings.DeveloperExtrasEnabled, True) + QWebSettings.DeveloperExtrasEnabled, True) except Exception: pass @@ -243,7 +242,7 @@ def launch_gui(): timer.start(500) browser.show() - + sys.exit(qApp.exec_()) |