Merge branch 'feature/generic-wizard' into develop

The generic wizard (big) branch is now stabilised.
A bunch of refactors have gone together with this topic branch:

- client does not have any info included for default service providers.
- user has to run the first-run wizard and manually entry domain for sample provider.
- remove all remains of the older branding strategy for default provider.
- srp registration + authentication are integrated with the signup process.

4 files changed, 120 insertions, 68 deletions

diff --git a/src/leap/baseapp/eip.py b/src/leap/baseapp/eip.py
index 93dce3ac..54acbc0e 100644
--- a/src/leap/baseapp/eip.py
+++ b/src/leap/baseapp/eip.py
@@ -25,6 +25,7 @@ class EIPConductorAppMixin(object):
     def __init__(self, *args, **kwargs):
         opts = kwargs.pop('opts')
         config_file = getattr(opts, 'config_file', None)
+        provider = kwargs.pop('provider')
 
         self.eip_service_started = False
 
@@ -36,10 +37,11 @@ class EIPConductorAppMixin(object):
         self.conductor = EIPConnection(
             watcher_cb=self.newLogLine.emit,
             config_file=config_file,
-            checker_signals=(self.changeLeapStatus.emit, ),
-            status_signals=(self.statusChange.emit, ),
+            checker_signals=(self.eipStatusChange.emit, ),
+            status_signals=(self.openvpnStatusChange.emit, ),
             debug=self.debugmode,
-            ovpn_verbosity=opts.openvpn_verb)
+            ovpn_verbosity=opts.openvpn_verb,
+            provider=provider)
 
         self.skip_download = opts.no_provider_checks
         self.skip_verify = opts.no_ca_verify
@@ -137,14 +139,14 @@ class EIPConductorAppMixin(object):
             # is not ready yet.
             return
 
-        if self.conductor.with_errors:
+        #if self.conductor.with_errors:
             #XXX how to wait on pkexec???
             #something better that this workaround, plz!!
             #I removed the pkexec pass authentication at all.
             #time.sleep(5)
             #logger.debug('timeout')
-            logger.error('errors. disconnect')
-            self.start_or_stopVPN()  # is stop
+            #logger.error('errors. disconnect')
+            #self.start_or_stopVPN()  # is stop
 
         state = self.conductor.poll_connection_state()
         if not state:
diff --git a/src/leap/baseapp/leap_app.py b/src/leap/baseapp/leap_app.py
index 6ffb08a8..4b63dd2f 100644
--- a/src/leap/baseapp/leap_app.py
+++ b/src/leap/baseapp/leap_app.py
@@ -52,7 +52,7 @@ class MainWindowMixin(object):
 
         self.firstRunWizardAct = QtGui.QAction(
             "&First run wizard...", self,
-            triggered=self.launch_first_run_wizard)
+            triggered=self.stop_connection_and_launch_first_run_wizard)
         self.aboutAct = QtGui.QAction("&About", self, triggered=self.about)
 
         #self.aboutQtAct = QtGui.QAction("About &Qt", self,
@@ -74,16 +74,21 @@ class MainWindowMixin(object):
         self.menuBar().addMenu(self.settingsMenu)
         self.menuBar().addMenu(self.helpMenu)
 
-    def launch_first_run_wizard(self):
+    def stop_connection_and_launch_first_run_wizard(self):
         settings = QtCore.QSettings()
         settings.setValue('FirstRunWizardDone', False)
         logger.debug('should run first run wizard again...')
 
-        from leap.gui.firstrunwizard import FirstRunWizard
-        wizard = FirstRunWizard(
-            parent=self,
-            success_cb=self.initReady.emit)
-        wizard.show()
+        status = self.conductor.get_icon_name()
+        if status != "disconnected":
+            self.start_or_stopVPN()
+
+        self.launch_first_run_wizard()
+        #from leap.gui.firstrunwizard import FirstRunWizard
+        #wizard = FirstRunWizard(
+            #parent=self,
+            #success_cb=self.initReady.emit)
+        #wizard.show()
 
     def set_app_icon(self):
         icon = QtGui.QIcon(APP_LOGO)
@@ -127,8 +132,8 @@ class MainWindowMixin(object):
                 "context menu of the system tray entry.")
             self.hide()
             event.ignore()
-        if self.debugmode:
-            self.cleanupAndQuit()
+            return
+        self.cleanupAndQuit()
 
     def cleanupAndQuit(self):
         """
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()
diff --git a/src/leap/baseapp/systray.py b/src/leap/baseapp/systray.py
index cc5d89df..94a7a8f2 100644
--- a/src/leap/baseapp/systray.py
+++ b/src/leap/baseapp/systray.py
@@ -1,4 +1,7 @@
 import logging
+import sip
+sip.setapi('QString', 2)
+sip.setapi('QVariant', 2)
 
 from PyQt4 import QtCore
 from PyQt4 import QtGui
@@ -92,7 +95,9 @@ class StatusAwareTrayIconMixin(object):
         self.trayIconMenu.addAction(self.detailsAct)
         self.trayIconMenu.addSeparator()
         self.trayIconMenu.addAction(self.aboutAct)
-        self.trayIconMenu.addAction(self.aboutQtAct)
+        # we should get this hidden inside the "about" dialog
+        # (as a little button maybe)
+        #self.trayIconMenu.addAction(self.aboutQtAct)
         self.trayIconMenu.addSeparator()
         self.trayIconMenu.addAction(self.quitAction)
 
@@ -127,12 +132,21 @@ class StatusAwareTrayIconMixin(object):
 
     def toggleEIPAct(self):
         # this is too simple by now.
-        # XXX We need to get the REAL info for Encryption state.
-        # (now is ON as soon as vpn launched)
-        if self.eip_service_started is True:
+        # XXX get STATUS CONSTANTS INSTEAD
+
+        icon_status = self.conductor.get_icon_name()
+        if icon_status == "connected":
+            self.connAct.setEnabled(True)
             self.connAct.setText('Encryption ON    turn o&ff')
-        else:
+            return
+        if icon_status == "disconnected":
+            self.connAct.setEnabled(True)
             self.connAct.setText('Encryption OFF   turn &on')
+            return
+        if icon_status == "connecting":
+            self.connAct.setDisabled(True)
+            self.connAct.setText('connecting...')
+            return
 
     def detailsWin(self):
         visible = self.isVisible()
@@ -196,31 +210,31 @@ class StatusAwareTrayIconMixin(object):
         self.statusUpdate()
 
     @QtCore.pyqtSlot(object)
-    def onStatusChange(self, status):
+    def onOpenVPNStatusChange(self, status):
         """
-        updates icon
+        updates icon, according to the openvpn status change.
         """
         icon_name = self.conductor.get_icon_name()
 
         # XXX refactor. Use QStateMachine
 
         if icon_name in ("disconnected", "connected"):
-            self.changeLeapStatus.emit(icon_name)
+            self.eipStatusChange.emit(icon_name)
 
         if icon_name in ("connecting"):
             # let's see how it matches
             leap_status_name = self.conductor.get_leap_status()
-            self.changeLeapStatus.emit(leap_status_name)
+            self.eipStatusChange.emit(leap_status_name)
 
         self.setIcon(icon_name)
         # change connection pixmap widget
         self.setConnWidget(icon_name)
 
     @QtCore.pyqtSlot(str)
-    def onChangeLeapConnStatus(self, newstatus):
+    def onEIPConnStatusChange(self, newstatus):
         """
-        slot for LEAP status changes
-        not to be confused with onStatusChange.
+        slot for EIP status changes
+        not to be confused with onOpenVPNStatusChange.
         this only updates the non-debug LEAP Status line
         next to the connection icon.
         """