1 files changed, 60 insertions, 12 deletions
diff --git a/src/leap/baseapp/mainwindow.py b/src/leap/baseapp/mainwindow.py
index fdbaf693..09e0c0bb 100644
--- a/src/leap/baseapp/mainwindow.py
+++ b/src/leap/baseapp/mainwindow.py
@@ -29,22 +29,33 @@ class LeapWindow(QtGui.QMainWindow,
 
     newLogLine = QtCore.pyqtSignal([str])
     statusChange = QtCore.pyqtSignal([object])
+    mainappReady = QtCore.pyqtSignal([])
+    initReady = QtCore.pyqtSignal([])
     networkError = QtCore.pyqtSignal([object])
 
     def __init__(self, opts):
         logger.debug('init leap window')
         self.debugmode = getattr(opts, 'debug', False)
-
         super(LeapWindow, self).__init__()
         if self.debugmode:
             self.createLogBrowser()
+
         EIPConductorAppMixin.__init__(self, opts=opts)
         StatusAwareTrayIconMixin.__init__(self)
         NetworkCheckerAppMixin.__init__(self)
         MainWindowMixin.__init__(self)
 
+        settings = QtCore.QSettings()
+        geom = settings.value("Geometry")
+        if geom:
+            self.restoreGeometry(geom)
+        self.wizard_done = settings.value("FirstRunWizardDone")
+
+        self.initchecks = InitChecksThread(self.run_eip_checks)
+
         # bind signals
-        # XXX move to parent classes init??
+        self.initchecks.finished.connect(
+            lambda: logger.debug('Initial checks finished'))
         self.trayIcon.activated.connect(self.iconActivated)
         self.newLogLine.connect(
             lambda line: self.onLoggerNewLine(line))
@@ -55,22 +66,59 @@ class LeapWindow(QtGui.QMainWindow,
         self.networkError.connect(
             lambda exc: self.onNetworkError(exc))
 
+        # do frwizard 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
+        self.mainappReady.emit()
+
+    def do_first_run_wizard_check(self):
+        logger.debug('first run wizard check...')
+        if self.wizard_done:
+            self.initReady.emit()
+        else:
+            # need to run first-run-wizard
+            logger.debug('running first run wizard')
+            from leap.gui.firstrunwizard import FirstRunWizard
+            wizard = FirstRunWizard(
+                parent=self,
+                success_cb=self.initReady.emit)
+            wizard.show()
+
+    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()
+
+#<<<<<<< HEAD
+    def begin(self):
+        self.start()
+#=======
         # could send "ready" signal instead
         # eipapp should catch that
-        if self.conductor.autostart:
-            self.start_or_stopVPN()
-
+        #if self.conductor.autostart:
+            #self.start_or_stopVPN()
+#
     #TODO: Put all Dialogs in one place
-    @QtCore.pyqtSlot()
-    def raise_Network_Error(self, exc):
-        message = exc.message
-
+    #@QtCore.pyqtSlot()
+    #def raise_Network_Error(self, exc):
+        #message = exc.message
+#
         # XXX
         # check headless = False before
         # launching dialog.
         # (so Qt tests can assert stuff)
-
-        dialog = dialogs.ErrorDialog()
-        dialog.warningMessage(message, 'error')
+#
+        #dialog = dialogs.ErrorDialog()
+        #dialog.warningMessage(message, 'error')
+#>>>>>>> feature/network_check