Merge branch 'feature/firstrun-wizard' into develop

2 files changed, 81 insertions, 5 deletions

diff --git a/src/leap/baseapp/leap_app.py b/src/leap/baseapp/leap_app.py
index 98ca292e..460d1269 100644
--- a/src/leap/baseapp/leap_app.py
+++ b/src/leap/baseapp/leap_app.py
@@ -1,5 +1,9 @@
 import logging
 
+import sip
+sip.setapi('QVariant', 2)
+
+from PyQt4 import QtCore
 from PyQt4 import QtGui
 
 from leap.gui import mainwindow_rc
@@ -23,9 +27,9 @@ class MainWindowMixin(object):
         widget = QtGui.QWidget()
         self.setCentralWidget(widget)
 
+        mainLayout = QtGui.QVBoxLayout()
         # add widgets to layout
         #self.createWindowHeader()
-        mainLayout = QtGui.QVBoxLayout()
         #mainLayout.addWidget(self.headerBox)
         mainLayout.addWidget(self.statusIconBox)
         if self.debugmode:
@@ -33,11 +37,51 @@ class MainWindowMixin(object):
             mainLayout.addWidget(self.loggerBox)
         widget.setLayout(mainLayout)
 
+        self.createMainActions()
+        self.createMainMenus()
+
         self.setWindowTitle("LEAP Client")
         self.set_app_icon()
-        self.resize(400, 300)
         self.set_statusbarMessage('ready')
-        logger.debug('set ready.........')
+
+    def createMainActions(self):
+        #self.openAct = QtGui.QAction("&Open...", self, shortcut="Ctrl+O",
+                #triggered=self.open)
+
+        self.firstRunWizardAct = QtGui.QAction(
+            "&First run wizard...", self,
+            triggered=self.launch_first_run_wizard)
+        self.aboutAct = QtGui.QAction("&About", self, triggered=self.about)
+
+        #self.aboutQtAct = QtGui.QAction("About &Qt", self,
+                #triggered=QtGui.qApp.aboutQt)
+
+    def createMainMenus(self):
+        self.connMenu = QtGui.QMenu("&Connections", self)
+        #self.viewMenu.addSeparator()
+        self.connMenu.addAction(self.quitAction)
+
+        self.settingsMenu = QtGui.QMenu("&Settings", self)
+        self.settingsMenu.addAction(self.firstRunWizardAct)
+
+        self.helpMenu = QtGui.QMenu("&Help", self)
+        self.helpMenu.addAction(self.aboutAct)
+        #self.helpMenu.addAction(self.aboutQtAct)
+
+        self.menuBar().addMenu(self.connMenu)
+        self.menuBar().addMenu(self.settingsMenu)
+        self.menuBar().addMenu(self.helpMenu)
+
+    def 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()
 
     def set_app_icon(self):
         icon = QtGui.QIcon(APP_LOGO)
@@ -88,6 +132,10 @@ class MainWindowMixin(object):
         """
         cleans state before shutting down app.
         """
+        # save geometry for restoring
+        settings = QtCore.QSettings()
+        settings.setValue("Geometry", self.saveGeometry())
+
         # TODO:make sure to shutdown all child process / threads
         # in conductor
         # XXX send signal instead?
diff --git a/src/leap/baseapp/mainwindow.py b/src/leap/baseapp/mainwindow.py
index 55be55f7..1accac30 100644
--- a/src/leap/baseapp/mainwindow.py
+++ b/src/leap/baseapp/mainwindow.py
@@ -26,18 +26,26 @@ class LeapWindow(QtGui.QMainWindow,
 
     newLogLine = QtCore.pyqtSignal([str])
     statusChange = QtCore.pyqtSignal([object])
+    mainappReady = QtCore.pyqtSignal([])
+    initReady = QtCore.pyqtSignal([])
 
     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)
         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
@@ -51,8 +59,28 @@ class LeapWindow(QtGui.QMainWindow,
         self.timer.timeout.connect(
             lambda: self.onTimerTick())
 
-        # ... all ready. go!
+        # 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()