Merge branch 'release-0.2.2'0.2.2

1 files changed, 0 insertions, 191 deletions

diff --git a/src/leap/baseapp/mainwindow.py b/src/leap/baseapp/mainwindow.py
deleted file mode 100644
index 91b0dc61..00000000
--- a/src/leap/baseapp/mainwindow.py
+++ /dev/null
@@ -1,191 +0,0 @@
-# vim: set fileencoding=utf-8 :
-#!/usr/bin/env python
-import logging
-
-import sip
-sip.setapi('QString', 2)
-sip.setapi('QVariant', 2)
-
-from PyQt4 import QtCore
-from PyQt4 import QtGui
-
-from leap.baseapp.eip import EIPConductorAppMixin
-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.eip.checks import ProviderCertChecker
-from leap.gui.threads import FunThread
-
-logger = logging.getLogger(name=__name__)
-
-
-class LeapWindow(QtGui.QMainWindow,
-                 MainWindowMixin, EIPConductorAppMixin,
-                 StatusAwareTrayIconMixin,
-                 NetworkCheckerAppMixin,
-                 LogPaneMixin):
-    """
-    main window for the leap app.
-    Initializes all of its base classes
-    We keep here some signal initialization
-    that gets tricky otherwise.
-    """
-
-    # signals
-
-    newLogLine = QtCore.pyqtSignal([str])
-    mainappReady = QtCore.pyqtSignal([])
-    initReady = QtCore.pyqtSignal([])
-    networkError = QtCore.pyqtSignal([object])
-    triggerEIPError = QtCore.pyqtSignal([object])
-    start_eipconnection = QtCore.pyqtSignal([])
-    shutdownSignal = QtCore.pyqtSignal([])
-    initNetworkChecker = QtCore.pyqtSignal([])
-
-    # 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')
-        self.debugmode = getattr(opts, 'debug', False)
-        super(LeapWindow, self).__init__()
-        if self.debugmode:
-            self.createLogBrowser()
-
-        settings = QtCore.QSettings()
-        self.provider_domain = settings.value("provider_domain", None)
-        self.username = settings.value("username", None)
-
-        logger.debug('provider: %s', self.provider_domain)
-        logger.debug('username: %s', self.username)
-
-        provider = self.provider_domain
-        EIPConductorAppMixin.__init__(
-            self, opts=opts, provider=provider)
-        StatusAwareTrayIconMixin.__init__(self)
-
-        # XXX network checker should probably not
-        # trigger run_checks on init... but wait
-        # for ready signal instead...
-        NetworkCheckerAppMixin.__init__(self, provider=provider)
-        MainWindowMixin.__init__(self)
-
-        geom_key = "DebugGeometry" if self.debugmode else "Geometry"
-        geom = settings.value(geom_key)
-        if geom:
-            self.restoreGeometry(geom)
-
-        # XXX check for wizard
-        self.wizard_done = settings.value("FirstRunWizardDone")
-
-        self.initchecks = FunThread(self.run_eip_checks)
-
-        # bind signals
-        self.initchecks.finished.connect(
-            lambda: logger.debug('Initial checks thread finished'))
-        self.trayIcon.activated.connect(self.iconActivated)
-        self.newLogLine.connect(
-            lambda line: self.onLoggerNewLine(line))
-        self.timer.timeout.connect(
-            lambda: self.onTimerTick())
-        self.networkError.connect(
-            lambda exc: self.onNetworkError(exc))
-        self.triggerEIPError.connect(
-            lambda exc: self.onEIPError(exc))
-
-        if self.debugmode:
-            self.startStopButton.clicked.connect(
-                lambda: self.start_or_stopVPN())
-        self.start_eipconnection.connect(
-            self.do_start_eipconnection)
-        self.shutdownSignal.connect(
-            self.cleanupAndQuit)
-        self.initNetworkChecker.connect(
-            lambda: self.init_network_checker(self.conductor.provider))
-
-        # status change.
-        # TODO unify
-        self.openvpnStatusChange.connect(
-            lambda status: self.onOpenVPNStatusChange(status))
-        self.eipStatusChange.connect(
-            lambda newstatus: self.onEIPConnStatusChange(newstatus))
-        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!
-        # 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...')
-        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
-        else:
-            pcertchecker = ProviderCertChecker(domain=self.provider_domain)
-            if not pcertchecker.is_cert_valid(do_raise=False):
-                logger.warning('missing valid client cert. need wizard')
-                need_wizard = True
-
-        # launch wizard if needed
-        if need_wizard:
-            logger.debug('running first run wizard')
-            self.launch_first_run_wizard()
-        else:  # no wizard needed
-            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,
-            username=self.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):
-        """
-        shows icon and run init checks
-        """
-        self.show_systray_icon()
-        self.initchecks.begin()
-
-    def do_start_eipconnection(self):
-        """
-        shows icon and init eip connection
-        called from the end of wizard
-        """
-        self.show_systray_icon()
-        # this will setup the command
-        self.conductor.run_openvpn_checks()
-        self.start_or_stopVPN()