summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkali <kali@leap.se>2012-10-24 06:49:51 +0900
committerkali <kali@leap.se>2012-10-24 06:49:51 +0900
commitff02a21ed6ef879c054b01134744068bdfeda664 (patch)
tree5c2a934139f980e7c5b331c0944ff6221cdc72c6
parent691b40fd6d593d1b9af316d1108258f02a305a70 (diff)
last page of wizard displays the connection steps
-rw-r--r--src/leap/baseapp/eip.py4
-rw-r--r--src/leap/baseapp/mainwindow.py24
-rw-r--r--src/leap/baseapp/systray.py14
-rwxr-xr-xsrc/leap/gui/firstrunwizard.py89
4 files changed, 101 insertions, 30 deletions
diff --git a/src/leap/baseapp/eip.py b/src/leap/baseapp/eip.py
index 26a2a1fb..54acbc0e 100644
--- a/src/leap/baseapp/eip.py
+++ b/src/leap/baseapp/eip.py
@@ -37,8 +37,8 @@ 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,
provider=provider)
diff --git a/src/leap/baseapp/mainwindow.py b/src/leap/baseapp/mainwindow.py
index 752dba51..c5f956fb 100644
--- a/src/leap/baseapp/mainwindow.py
+++ b/src/leap/baseapp/mainwindow.py
@@ -35,12 +35,10 @@ class LeapWindow(QtGui.QMainWindow,
triggerEIPError = QtCore.pyqtSignal([object])
start_eipconnection = QtCore.pyqtSignal([])
- # XXX fix nomenclature here:
- # eipStatusChange vs. leapStatusChange
- # 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')
@@ -93,10 +91,10 @@ class LeapWindow(QtGui.QMainWindow,
# status change.
# TODO unify
- self.statusChange.connect(
- lambda status: self.onStatusChange(status))
- self.changeLeapStatus.connect(
- lambda newstatus: self.onChangeLeapConnStatus(newstatus))
+ self.openvpnStatusChange.connect(
+ lambda status: self.onOpenVPNStatusChange(status))
+ self.eipStatusChange.connect(
+ lambda newstatus: self.onEIPConnStatusChange(newstatus))
# do first run wizard and init signals
self.mainappReady.connect(self.do_first_run_wizard_check)
@@ -109,10 +107,9 @@ class LeapWindow(QtGui.QMainWindow,
def do_first_run_wizard_check(self):
"""
checks whether first run wizard needs to be run
- launches it if needed (with initReady signal as a success callback)
+ launches it if needed
and emits initReady signal if not.
"""
- # XXX change DOC string after I remove the success callbac!!!
logger.debug('first run wizard check...')
need_wizard = False
@@ -130,7 +127,8 @@ class LeapWindow(QtGui.QMainWindow,
self.conductor,
parent=self,
eip_username=self.eip_username,
- start_eipconnection_signal=self.start_eipconnection)
+ start_eipconnection_signal=self.start_eipconnection,
+ eip_statuschange_signal=self.eipStatusChange)
wizard.show()
else: # no wizard needed
logger.debug('running first run wizard')
diff --git a/src/leap/baseapp/systray.py b/src/leap/baseapp/systray.py
index cc5d89df..061de98e 100644
--- a/src/leap/baseapp/systray.py
+++ b/src/leap/baseapp/systray.py
@@ -196,31 +196,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.
"""
diff --git a/src/leap/gui/firstrunwizard.py b/src/leap/gui/firstrunwizard.py
index c7531d16..52f00be8 100755
--- a/src/leap/gui/firstrunwizard.py
+++ b/src/leap/gui/firstrunwizard.py
@@ -20,6 +20,7 @@ from leap.crypto import leapkeyring
from leap.eip import checks as eipchecks
from leap.eip import exceptions as eipexceptions
from leap.gui import mainwindow_rc
+from leap.util.coroutines import coroutine
try:
from collections import OrderedDict
@@ -55,7 +56,8 @@ class FirstRunWizard(QtGui.QWizard):
netchecker=basechecks.LeapNetworkChecker,
providercertchecker=eipchecks.ProviderCertChecker,
eipconfigchecker=eipchecks.EIPConfigChecker,
- start_eipconnection_signal=None):
+ start_eipconnection_signal=None,
+ eip_statuschange_signal=None):
super(FirstRunWizard, self).__init__(
parent,
QtCore.Qt.WindowStaysOnTopHint)
@@ -87,9 +89,11 @@ class FirstRunWizard(QtGui.QWizard):
self.providercertchecker = providercertchecker
self.eipconfigchecker = eipconfigchecker
- # signal for starting eip connection
+ # Signals
# will be emitted in connecting page
self.start_eipconnection_signal = start_eipconnection_signal
+ self.eip_statuschange_signal = eip_statuschange_signal
+
self.providerconfig = None
@@ -965,11 +969,15 @@ class ConnectingPage(QtGui.QWizardPage):
self.progress.setMaximum(100)
self.progress.hide()
+ # for pre-checks
self.status_line_1 = QtGui.QLabel()
self.status_line_2 = QtGui.QLabel()
self.status_line_3 = QtGui.QLabel()
self.status_line_4 = QtGui.QLabel()
+ # for connecting signals...
+ self.status_line_5 = QtGui.QLabel()
+
layout = QtGui.QGridLayout()
layout.addWidget(self.status, 0, 1)
layout.addWidget(self.progress, 5, 1)
@@ -984,15 +992,21 @@ class ConnectingPage(QtGui.QWizardPage):
self.status.setText(status)
self.status.setWordWrap(True)
+ def set_status_line(self, line, status):
+ line = getattr(self, 'status_line_%s' % line)
+ if line:
+ line.setText(status)
+
def get_donemsg(self, msg):
return "%s ... done" % msg
- def run_eip_checks_for_provider(self, domain):
+ def run_eip_checks_for_provider_and_connect(self, domain):
wizard = self.wizard()
conductor = wizard.conductor
start_eip_signal = getattr(
wizard,
'start_eipconnection_signal', None)
+
conductor.set_provider_domain(domain)
conductor.run_checks()
self.conductor = conductor
@@ -1011,6 +1025,15 @@ class ConnectingPage(QtGui.QWizardPage):
errq = self.conductor.error_queue
# XXX missing!
+ #@coroutine
+ #def wait_for_validation_block(self):
+ #try:
+ #while True:
+ #(yield)
+ #break
+ #except GeneratorExit:
+ #pass
+#
def fetch_and_validate(self):
# Fake... till you make it...
import time
@@ -1065,11 +1088,16 @@ class ConnectingPage(QtGui.QWizardPage):
time.sleep(3)
# here we go! :)
- self.run_eip_checks_for_provider(domain)
+ self.run_eip_checks_for_provider_and_connect(domain)
+
+ #self.validation_block = self.wait_for_validation_block()
+ # XXX signal timeout!
return True
+ #
# pagewizard methods
+ #
def initializePage(self):
# XXX if we're coming from signup page
@@ -1094,7 +1122,7 @@ class LastPage(QtGui.QWizardPage):
def __init__(self, parent=None):
super(LastPage, self).__init__(parent)
- self.setTitle("Ready to go!")
+ self.setTitle("Connecting...")
self.setPixmap(
QtGui.QWizard.LogoPixmap,
@@ -1107,17 +1135,62 @@ class LastPage(QtGui.QWizardPage):
self.label = QtGui.QLabel()
self.label.setWordWrap(True)
+ self.status_line_1 = QtGui.QLabel()
+ self.status_line_2 = QtGui.QLabel()
+ self.status_line_3 = QtGui.QLabel()
+ self.status_line_4 = QtGui.QLabel()
+
layout = QtGui.QVBoxLayout()
layout.addWidget(self.label)
+
+ # make loop
+ layout.addWidget(self.status_line_1)
+ layout.addWidget(self.status_line_2)
+ layout.addWidget(self.status_line_3)
+ layout.addWidget(self.status_line_4)
+
self.setLayout(layout)
- def initializePage(self):
+ def set_status_line(self, line, status):
+ statusline = getattr(self, 'status_line_%s' % line)
+ if statusline:
+ statusline.setText(status)
+
+ def set_finished_status(self):
+ self.setTitle('You are using an encrypted connection!')
finishText = self.wizard().buttonText(
QtGui.QWizard.FinishButton)
finishText = finishText.replace('&', '')
self.label.setText(
- "Click '<i>%s</i>' to end the wizard and start "
- "encrypting your connection." % finishText)
+ "Click '<i>%s</i>' to end the wizard and "
+ "save your settings." % finishText)
+
+ @coroutine
+ def eip_status_handler(self):
+ logger.debug('logging status in last page')
+ self.validation_done = False
+ status_count = 0
+ try:
+ while True:
+ status = (yield)
+ status_count += 1
+ # XXX add to line...
+ logger.debug('status --> %s', status)
+ self.set_status_line(status_count, status)
+ if status == "connected":
+ self.set_finished_status()
+ break
+ except GeneratorExit:
+ pass
+
+ def initializePage(self):
+ wizard = self.wizard()
+ if not wizard:
+ return
+ eip_status_handler = self.eip_status_handler()
+ eip_statuschange_signal = wizard.eip_statuschange_signal
+ eip_statuschange_signal.connect(
+ lambda status: eip_status_handler.send(status))
if __name__ == '__main__':