summaryrefslogtreecommitdiff
path: root/src/leap/gui/firstrun
diff options
context:
space:
mode:
authorkali <kali@leap.se>2012-11-19 23:34:03 +0900
committerkali <kali@leap.se>2012-11-19 23:34:03 +0900
commita91001e9b84896e8df10ab13aad2dbccd3b6cf36 (patch)
treecf02c7a40b5b6f1cae99a2f748caa82cacc33fba /src/leap/gui/firstrun
parent7ab2ea1adb82d8c1c6bbae4dc58a157326f579a2 (diff)
add domain name to providerinfo page
Diffstat (limited to 'src/leap/gui/firstrun')
-rw-r--r--src/leap/gui/firstrun/providerinfo.py9
-rw-r--r--src/leap/gui/firstrun/providersetup.py5
2 files changed, 8 insertions, 6 deletions
diff --git a/src/leap/gui/firstrun/providerinfo.py b/src/leap/gui/firstrun/providerinfo.py
index 8a3243fc..c5f39938 100644
--- a/src/leap/gui/firstrun/providerinfo.py
+++ b/src/leap/gui/firstrun/providerinfo.py
@@ -79,8 +79,10 @@ class ProviderInfoPage(ValidationPage):
dn = pconfig.get('display_name')
display_name = dn[lang] if dn else ''
+ domain_name = self.field('provider_domain')
+
self.displayName.setText(
- "<b>%s</b>" % display_name)
+ "<b>%s</b> https://%s" % (display_name, domain_name))
desc = pconfig.get('description')
description_text = desc[lang] if desc else ''
@@ -239,17 +241,12 @@ class ProviderInfoPage(ValidationPage):
#return self.is_done()
def initializePage(self):
- logger.error('INITIALIZE PAGE --------------')
- logger.error('**')
- logger.error('**')
super(ProviderInfoPage, self).initializePage()
self.show_progress()
self.set_undone()
self.completeChanged.emit()
def cleanupPage(self):
- logger.error('CLEANUP PAGE --------------')
-
del self.wizard().providerconfig
if self.infoWidget:
diff --git a/src/leap/gui/firstrun/providersetup.py b/src/leap/gui/firstrun/providersetup.py
index 5b50db87..0f0bdbd0 100644
--- a/src/leap/gui/firstrun/providersetup.py
+++ b/src/leap/gui/firstrun/providersetup.py
@@ -172,3 +172,8 @@ class ProviderSetupValidationPage(ValidationPage):
# XXX bad name. change to connect again.
next_ = 'signupvalidation'
return wizard.get_page_index(next_)
+
+ def initializePage(self):
+ super(ProviderSetupValidationPage, self).initializePage()
+ self.set_undone()
+ self.completeChanged.emit()