From ad16a72f60ecc84524c22e8912df4eb8a48a2a42 Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Tue, 6 Nov 2012 16:26:10 +0900
Subject: split wizard into separate files

so we don't go nuts yet.
---
 src/leap/gui/firstrun/__init__.py | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 src/leap/gui/firstrun/__init__.py

(limited to 'src/leap/gui/firstrun/__init__.py')

diff --git a/src/leap/gui/firstrun/__init__.py b/src/leap/gui/firstrun/__init__.py
new file mode 100644
index 00000000..bf8d0df9
--- /dev/null
+++ b/src/leap/gui/firstrun/__init__.py
@@ -0,0 +1,24 @@
+import sip
+sip.setapi('QString', 2)
+sip.setapi('QVariant', 2)
+
+import connect
+import intro
+import last
+import login
+import mixins
+import providerinfo
+import providersetup
+import register
+import selectprovider
+
+__all__ = [
+    'connect',
+    'intro',
+    'last',
+    'login',
+    'mixins',
+    'providerinfo',
+    'providersetup',
+    'register',
+    'selectprovider']
-- 
cgit v1.2.3


From b3c0634dc6e01656422a6c70297fc46d808f303f Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Thu, 8 Nov 2012 06:02:36 +0900
Subject: selectprovider rename + fix onComplete function for provider entry

---
 src/leap/gui/firstrun/__init__.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/leap/gui/firstrun/__init__.py')

diff --git a/src/leap/gui/firstrun/__init__.py b/src/leap/gui/firstrun/__init__.py
index bf8d0df9..477e7269 100644
--- a/src/leap/gui/firstrun/__init__.py
+++ b/src/leap/gui/firstrun/__init__.py
@@ -8,9 +8,10 @@ import last
 import login
 import mixins
 import providerinfo
+import providerselect
 import providersetup
 import register
-import selectprovider
+import regvalidation
 
 __all__ = [
     'connect',
@@ -19,6 +20,7 @@ __all__ = [
     'login',
     'mixins',
     'providerinfo',
+    'providerselect',
     'providersetup',
     'register',
-    'selectprovider']
+    'regvalidation']
-- 
cgit v1.2.3


From d24c7328fa845737dbb83d512e4b3f287634c4cc Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Wed, 14 Nov 2012 00:33:05 +0900
Subject: make tests pass + pep8

They were breaking mainly because I did not bother to have a pass
over them to change the PROVIDER settings from the branding case.
All good now, although much testing is yet needed and some refactor
could be used.

long live green tests!
---
 src/leap/gui/firstrun/__init__.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/leap/gui/firstrun/__init__.py')

diff --git a/src/leap/gui/firstrun/__init__.py b/src/leap/gui/firstrun/__init__.py
index 477e7269..8a70d90e 100644
--- a/src/leap/gui/firstrun/__init__.py
+++ b/src/leap/gui/firstrun/__init__.py
@@ -1,6 +1,9 @@
-import sip
-sip.setapi('QString', 2)
-sip.setapi('QVariant', 2)
+try:
+    import sip
+    sip.setapi('QString', 2)
+    sip.setapi('QVariant', 2)
+except ValueError:
+    pass
 
 import connect
 import intro
-- 
cgit v1.2.3