1 files changed, 72 insertions, 41 deletions
diff --git a/src/leap/baseapp/mainwindow.py b/src/leap/baseapp/mainwindow.py
index 3b6cb544..918f1568 100644
--- a/src/leap/baseapp/mainwindow.py
+++ b/src/leap/baseapp/mainwindow.py
@@ -2,6 +2,10 @@
 #!/usr/bin/env python
 import logging
 
+import sip
+sip.setapi('QString', 2)
+sip.setapi('QVariant', 2)
+
 from PyQt4 import QtCore
 from PyQt4 import QtGui
 
@@ -10,6 +14,7 @@ from leap.baseapp.log import LogPaneMixin
 from leap.baseapp.systray import StatusAwareTrayIconMixin
 from leap.baseapp.network import NetworkCheckerAppMixin
 from leap.baseapp.leap_app import MainWindowMixin
+from leap.gui.threads import FunThread
 
 logger = logging.getLogger(name=__name__)
 
@@ -35,11 +40,10 @@ class LeapWindow(QtGui.QMainWindow,
     triggerEIPError = QtCore.pyqtSignal([object])
     start_eipconnection = QtCore.pyqtSignal([])
 
-    # XXX fix nomenclature here
-    # this is eip status change got from vpn management
-    statusChange = QtCore.pyqtSignal([object])
-    # this is global leap status
-    changeLeapStatus = QtCore.pyqtSignal([str])
+    # this is status change got from openvpn management
+    openvpnStatusChange = QtCore.pyqtSignal([object])
+    # this is global eip status
+    eipStatusChange = QtCore.pyqtSignal([str])
 
     def __init__(self, opts):
         logger.debug('init leap window')
@@ -48,26 +52,32 @@ class LeapWindow(QtGui.QMainWindow,
         if self.debugmode:
             self.createLogBrowser()
 
-        EIPConductorAppMixin.__init__(self, opts=opts)
+        settings = QtCore.QSettings()
+        self.provider_domain = settings.value("provider_domain", None)
+        self.eip_username = settings.value("eip_username", None)
+
+        logger.debug('provider: %s', self.provider_domain)
+        logger.debug('eip_username: %s', self.eip_username)
+
+        EIPConductorAppMixin.__init__(
+            self, opts=opts, provider=self.provider_domain)
         StatusAwareTrayIconMixin.__init__(self)
         NetworkCheckerAppMixin.__init__(self)
         MainWindowMixin.__init__(self)
 
-        settings = QtCore.QSettings()
-
         geom_key = "DebugGeometry" if self.debugmode else "Geometry"
         geom = settings.value(geom_key)
-
-        geom = settings.value("Geometry")
         if geom:
             self.restoreGeometry(geom)
+
+        # XXX check for wizard
         self.wizard_done = settings.value("FirstRunWizardDone")
 
-        self.initchecks = InitChecksThread(self.run_eip_checks)
+        self.initchecks = FunThread(self.run_eip_checks)
 
         # bind signals
         self.initchecks.finished.connect(
-            lambda: logger.debug('Initial checks finished'))
+            lambda: logger.debug('Initial checks thread finished'))
         self.trayIcon.activated.connect(self.iconActivated)
         self.newLogLine.connect(
             lambda line: self.onLoggerNewLine(line))
@@ -86,44 +96,65 @@ class LeapWindow(QtGui.QMainWindow,
 
         # status change.
         # TODO unify
-        self.statusChange.connect(
-            lambda status: self.onStatusChange(status))
-        self.changeLeapStatus.connect(
-            lambda newstatus: self.onChangeLeapConnStatus(newstatus))
-
-        # do frwizard and init signals
+        self.openvpnStatusChange.connect(
+            lambda status: self.onOpenVPNStatusChange(status))
+        self.eipStatusChange.connect(
+            lambda newstatus: self.onEIPConnStatusChange(newstatus))
+        # can I connect 2 signals?
+        self.eipStatusChange.connect(
+            lambda newstatus: self.toggleEIPAct())
+
+        # do first run wizard and init signals
         self.mainappReady.connect(self.do_first_run_wizard_check)
         self.initReady.connect(self.runchecks_and_eipconnect)
 
         # ... all ready. go!
-        # calls do_first_run_wizard_check
+        # connected to do_first_run_wizard_check
         self.mainappReady.emit()
 
     def do_first_run_wizard_check(self):
+        """
+        checks whether first run wizard needs to be run
+        launches it if needed
+        and emits initReady signal if not.
+        """
+
         logger.debug('first run wizard check...')
-        if self.wizard_done:
-            self.initReady.emit()
-        else:
-            # need to run first-run-wizard
+        need_wizard = False
+
+        # do checks (can overlap if wizard was interrupted)
+        if not self.wizard_done:
+            need_wizard = True
+        if not self.provider_domain:
+            need_wizard = True
+
+        # launch wizard if needed
+        if need_wizard:
+            self.launch_first_run_wizard()
+        else:  # no wizard needed
             logger.debug('running first run wizard')
-            from leap.gui.firstrunwizard import FirstRunWizard
-            wizard = FirstRunWizard(
-                parent=self,
-                success_cb=self.initReady.emit)
-            wizard.show()
+            self.initReady.emit()
+
+    def launch_first_run_wizard(self):
+        """
+        launches wizard and blocks
+        """
+        from leap.gui.firstrun.wizard import FirstRunWizard
+        wizard = FirstRunWizard(
+            self.conductor,
+            parent=self,
+            eip_username=self.eip_username,
+            start_eipconnection_signal=self.start_eipconnection,
+            eip_statuschange_signal=self.eipStatusChange,
+            quitcallback=self.onWizardCancel)
+        wizard.show()
+
+    def onWizardCancel(self):
+        if not self.wizard_done:
+            logger.debug(
+                'clicked on Cancel during first '
+                'run wizard. shutting down')
+            self.cleanupAndQuit()
 
     def runchecks_and_eipconnect(self):
         self.initchecks.begin()
-
-
-class InitChecksThread(QtCore.QThread):
-
-    def __init__(self, fun, parent=None):
-        QtCore.QThread.__init__(self, parent)
-        self.fun = fun
-
-    def run(self):
-        self.fun()
-
-    def begin(self):
-        self.start()