Merge lp:~mandel/ubuntu-sso-client/windows_ui_3 into lp:ubuntu-sso-client

[Manuel de la Peña]

Provides the UI with the required controllers that will ensure that the navigation in the Wizard is the correct one. This branch does not yet provide the sso functionality.

[lp:~mandel/ubuntu-sso-client/windows_ui_3]

742. By Manuel de la Peña on 2011-03-30

Merged with windows_ui_3

743. By Manuel de la Peña on 2011-03-30

Removed the last old school QObject connect call.

744. By Manuel de la Peña on 2011-03-30

Removed unused import.

745. By Manuel de la Peña on 2011-04-05

Fixed as per reviewers request. Mainly fixed the foloowing:
* Typos.
* Made colors a contant.

746. By Manuel de la Peña on 2011-04-05

Fixed mock test.

Unmerged revisions

=== modified file '.bzrignore'
--- .bzrignore	2010-11-22 15:06:52 +0000
+++ .bzrignore	2011-03-30 14:55:45 +0000
@@ -4,3 +4,9 @@
 dist/
 MANIFEST
 po/ubuntu-sso-client.pot
+ubuntu_sso/qt/captcha_ui.py
+ubuntu_sso/qt/choose_sign_in_ui.py
+ubuntu_sso/qt/current_user_sign_in_ui.py
+ubuntu_sso/qt/email_verification_ui.py
+ubuntu_sso/qt/setup_account_ui.py
+ubuntu_sso/qt/terms_and_conditions_ui.py

=== added directory 'data/gtk'
=== renamed file 'data/ui.glade' => 'data/gtk/ui.glade'
=== added directory 'data/qt'
=== added file 'data/qt/choose_sign_in.ui'
--- data/qt/choose_sign_in.ui	1970-01-01 00:00:00 +0000
+++ data/qt/choose_sign_in.ui	2011-03-30 14:55:45 +0000
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ChooseSingInPage</class>
+ <widget class="QWizardPage" name="ChooseSingInPage">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>WizardPage</string>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Expanding</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <spacer name="verticalSpacer_3">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_2">
+         <item>
+          <widget class="QPushButton" name="existing_account_button">
+           <property name="text">
+            <string/>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::Fixed</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>10</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QPushButton" name="setup_account_button">
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Expanding</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

=== added file 'data/qt/current_user_sign_in.ui'
--- data/qt/current_user_sign_in.ui	1970-01-01 00:00:00 +0000
+++ data/qt/current_user_sign_in.ui	2011-03-30 14:55:45 +0000
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>CurrentUserSignInPage</class>
+ <widget class="QWizardPage" name="CurrentUserSignInPage">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>WizardPage</string>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <spacer name="verticalSpacer_3">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QFrame" name="_signInFrame">
+         <property name="frameShape">
+          <enum>QFrame::NoFrame</enum>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_3">
+          <item>
+           <layout class="QVBoxLayout" name="verticalLayout_2">
+            <item>
+             <widget class="QLineEdit" name="email_edit">
+              <property name="placeholderText">
+               <string/>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLineEdit" name="password_edit">
+              <property name="echoMode">
+               <enum>QLineEdit::Password</enum>
+              </property>
+              <property name="placeholderText">
+               <string/>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLabel" name="forgot_label">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string/>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <layout class="QHBoxLayout" name="horizontalLayout_4">
+              <item>
+               <spacer name="horizontalSpacer_3">
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>40</width>
+                  <height>20</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
+              <item>
+               <widget class="QPushButton" name="sign_in_button">
+                <property name="text">
+                 <string/>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

=== added file 'data/qt/email_verification.ui'
--- data/qt/email_verification.ui	1970-01-01 00:00:00 +0000
+++ data/qt/email_verification.ui	2011-03-30 14:55:45 +0000
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>EmailVerificationPage</class>
+ <widget class="QWizardPage" name="EmailVerificationPage">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>WizardPage</string>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <widget class="QLineEdit" name="verification_code_edit">
+         <property name="placeholderText">
+          <string/>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_2">
+         <item>
+          <spacer name="horizontalSpacer_3">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QPushButton" name="next_button">
+           <property name="text">
+            <string>Next</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <spacer name="verticalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

=== added file 'data/qt/setup_account.ui'
--- data/qt/setup_account.ui	1970-01-01 00:00:00 +0000
+++ data/qt/setup_account.ui	2011-03-30 14:55:45 +0000
@@ -0,0 +1,413 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>SetUpAccountPage</class>
+ <widget class="QWizardPage" name="SetUpAccountPage">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>415</width>
+    <height>359</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>WizardPage</string>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <item>
+    <layout class="QVBoxLayout" name="verticalLayout">
+     <item>
+      <spacer name="verticalSpacer_3">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>40</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QFrame" name="_signInFrame">
+       <property name="frameShape">
+        <enum>QFrame::NoFrame</enum>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_3">
+        <item>
+         <layout class="QVBoxLayout" name="verticalLayout_2">
+          <item>
+           <layout class="QVBoxLayout" name="verticalLayout_7">
+            <item>
+             <layout class="QHBoxLayout" name="horizontalLayout_10">
+              <item>
+               <widget class="QLineEdit" name="first_name_edit">
+                <property name="placeholderText">
+                 <string/>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLineEdit" name="last_name_edit">
+                <property name="placeholderText">
+                 <string/>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+            <item>
+             <layout class="QHBoxLayout" name="horizontalLayout_11">
+              <item>
+               <widget class="QLineEdit" name="email_edit">
+                <property name="placeholderText">
+                 <string/>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLineEdit" name="confirm_email_edit">
+                <property name="placeholderText">
+                 <string/>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+            <item>
+             <layout class="QHBoxLayout" name="horizontalLayout_12">
+              <item>
+               <layout class="QVBoxLayout" name="verticalLayout_32">
+                <item>
+                 <widget class="QLineEdit" name="password_edit">
+                  <property name="toolTip">
+                   <string>Your password must be at least 8 characters long and at least contain one number and one upper later.</string>
+                  </property>
+                  <property name="statusTip">
+                   <string/>
+                  </property>
+                  <property name="echoMode">
+                   <enum>QLineEdit::Password</enum>
+                  </property>
+                  <property name="placeholderText">
+                   <string/>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QFrame" name="strenght_frame">
+                  <property name="sizePolicy">
+                   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                   </sizepolicy>
+                  </property>
+                  <property name="minimumSize">
+                   <size>
+                    <width>0</width>
+                    <height>20</height>
+                   </size>
+                  </property>
+                  <property name="maximumSize">
+                   <size>
+                    <width>16777215</width>
+                    <height>30</height>
+                   </size>
+                  </property>
+                  <property name="locale">
+                   <locale language="English" country="UnitedStates"/>
+                  </property>
+                  <property name="frameShape">
+                   <enum>QFrame::StyledPanel</enum>
+                  </property>
+                  <property name="frameShadow">
+                   <enum>QFrame::Raised</enum>
+                  </property>
+                  <layout class="QHBoxLayout" name="horizontalLayout_15">
+                   <property name="spacing">
+                    <number>3</number>
+                   </property>
+                   <property name="leftMargin">
+                    <number>2</number>
+                   </property>
+                   <property name="topMargin">
+                    <number>0</number>
+                   </property>
+                   <property name="rightMargin">
+                    <number>2</number>
+                   </property>
+                   <property name="bottomMargin">
+                    <number>2</number>
+                   </property>
+                   <item>
+                    <widget class="QFrame" name="weak_frame">
+                     <property name="maximumSize">
+                      <size>
+                       <width>16777215</width>
+                       <height>10</height>
+                      </size>
+                     </property>
+                     <property name="frameShape">
+                      <enum>QFrame::StyledPanel</enum>
+                     </property>
+                     <property name="frameShadow">
+                      <enum>QFrame::Plain</enum>
+                     </property>
+                     <layout class="QVBoxLayout" name="verticalLayout_33">
+                      <property name="margin">
+                       <number>0</number>
+                      </property>
+                     </layout>
+                    </widget>
+                   </item>
+                   <item>
+                    <widget class="QFrame" name="medium_frame">
+                     <property name="maximumSize">
+                      <size>
+                       <width>16777215</width>
+                       <height>10</height>
+                      </size>
+                     </property>
+                     <property name="frameShape">
+                      <enum>QFrame::StyledPanel</enum>
+                     </property>
+                     <property name="frameShadow">
+                      <enum>QFrame::Plain</enum>
+                     </property>
+                     <layout class="QVBoxLayout" name="verticalLayout_34">
+                      <property name="margin">
+                       <number>0</number>
+                      </property>
+                     </layout>
+                    </widget>
+                   </item>
+                   <item>
+                    <widget class="QFrame" name="strong_frame">
+                     <property name="maximumSize">
+                      <size>
+                       <width>16777215</width>
+                       <height>10</height>
+                      </size>
+                     </property>
+                     <property name="frameShape">
+                      <enum>QFrame::StyledPanel</enum>
+                     </property>
+                     <property name="frameShadow">
+                      <enum>QFrame::Plain</enum>
+                     </property>
+                     <layout class="QVBoxLayout" name="verticalLayout_35">
+                      <property name="margin">
+                       <number>0</number>
+                      </property>
+                     </layout>
+                    </widget>
+                   </item>
+                  </layout>
+                 </widget>
+                </item>
+                <item>
+                 <spacer name="_strenghSpacer">
+                  <property name="orientation">
+                   <enum>Qt::Vertical</enum>
+                  </property>
+                  <property name="sizeHint" stdset="0">
+                   <size>
+                    <width>20</width>
+                    <height>5</height>
+                   </size>
+                  </property>
+                 </spacer>
+                </item>
+               </layout>
+              </item>
+              <item>
+               <layout class="QVBoxLayout" name="verticalLayout_8">
+                <item>
+                 <widget class="QLineEdit" name="confirm_password_edit">
+                  <property name="echoMode">
+                   <enum>QLineEdit::Password</enum>
+                  </property>
+                  <property name="placeholderText">
+                   <string/>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <spacer name="verticalSpacer_6">
+                  <property name="orientation">
+                   <enum>Qt::Vertical</enum>
+                  </property>
+                  <property name="sizeHint" stdset="0">
+                   <size>
+                    <width>20</width>
+                    <height>10</height>
+                   </size>
+                  </property>
+                 </spacer>
+                </item>
+               </layout>
+              </item>
+             </layout>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <widget class="QLabel" name="password_info_label">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text">
+             <string/>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <layout class="QVBoxLayout" name="verticalLayout_9">
+            <item>
+             <widget class="QFrame" name="frame_2">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="frameShape">
+               <enum>QFrame::StyledPanel</enum>
+              </property>
+              <property name="frameShadow">
+               <enum>QFrame::Raised</enum>
+              </property>
+              <layout class="QHBoxLayout" name="horizontalLayout_16">
+               <property name="leftMargin">
+                <number>0</number>
+               </property>
+               <item>
+                <widget class="QLabel" name="captcha_view">
+                 <property name="frameShape">
+                  <enum>QFrame::Box</enum>
+                 </property>
+                 <property name="text">
+                  <string/>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QLabel" name="refresh_label">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                 <property name="locale">
+                  <locale language="English" country="UnitedStates"/>
+                 </property>
+                 <property name="text">
+                  <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;If you can't read this then &lt;/span&gt;&lt;a href=&quot;example.com&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;refresh&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; this page&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                 </property>
+                 <property name="wordWrap">
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLineEdit" name="captcha_solution_edit">
+              <property name="locale">
+               <locale language="English" country="UnitedStates"/>
+              </property>
+              <property name="inputMask">
+               <string/>
+              </property>
+              <property name="text">
+               <string/>
+              </property>
+              <property name="placeholderText">
+               <string/>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="terms_checkbox">
+            <property name="text">
+             <string/>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout_4">
+            <property name="spacing">
+             <number>0</number>
+            </property>
+            <item>
+             <widget class="QPushButton" name="terms_button">
+              <property name="text">
+               <string/>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="horizontalSpacer_3">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <widget class="QPushButton" name="set_up_button">
+              <property name="enabled">
+               <bool>false</bool>
+              </property>
+              <property name="text">
+               <string/>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <spacer name="verticalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>40</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

=== added file 'data/qt/terms_and_conditions.ui'
--- data/qt/terms_and_conditions.ui	1970-01-01 00:00:00 +0000
+++ data/qt/terms_and_conditions.ui	2011-03-30 14:55:45 +0000
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>TosPage</class>
+ <widget class="QWizardPage" name="TosPage">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>WizardPage</string>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <spacer name="verticalSpacer_3">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::Fixed</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QScrollArea" name="scrollArea">
+         <property name="widgetResizable">
+          <bool>true</bool>
+         </property>
+         <widget class="QWidget" name="scrollAreaWidgetContents">
+          <property name="geometry">
+           <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>284</width>
+            <height>184</height>
+           </rect>
+          </property>
+          <layout class="QHBoxLayout" name="horizontalLayout_2">
+           <item>
+            <widget class="QWebView" name="terms_webkit">
+             <property name="url">
+              <url>
+               <string>about:blank</string>
+              </url>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::Fixed</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QWebView</class>
+   <extends>QWidget</extends>
+   <header>QtWebKit/QWebView</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

=== modified file 'setup.py'
--- setup.py	2011-03-22 22:32:28 +0000
+++ setup.py	2011-03-30 14:55:45 +0000
@@ -2,6 +2,7 @@
 # setup.py - Build system for Ubuntu SSO Client package
 #
 # Author: Natalia B. Bidart <[e-mail]>
+# Author: Manuel de la Pena <[e-mail]>
 #
 # Copyright 2010 Canonical Ltd.
 #
@@ -18,6 +19,7 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 """setup.py"""
 
+import cgi
 import os
 import sys
 
@@ -31,17 +33,19 @@
 assert DistUtilsExtra.auto.__version__ >= '2.18', \
        'needs DistUtilsExtra.auto >= 2.18'
 
+from distutils import log
+from distutils.command import clean
 from distutils.spawn import find_executable
-from distutils.command import clean
 
 # Defining variables for various rules here, similar to a Makefile.am
-CLEANFILES = ['data/com.ubuntu.sso.service', 'po/ubuntu-sso-client.pot',
+LINUX_CLEANFILES = ['data/com.ubuntu.sso.service', 'po/ubuntu-sso-client.pot',
               'MANIFEST']
 
 
+# pylint: disable=W0511
 # This needs some serious cleanup
-class SSOBuild(build_extra.build_extra):
-    """Class to build the extra files."""
+class SSOLinuxBuild(build_extra.build_extra):
+    """Build  the extra files required on Linux.."""
 
     description = 'build extra files needed by ubuntu-sso-client'
 
@@ -69,14 +73,14 @@
         build_extra.build_extra.run(self)
 
 
-class SSOClean(clean.clean):
+class SSOLinuxClean(clean.clean):
     """Class to clean up after the build."""
 
     description = 'Clean up built files.'
 
     def run(self):
         """Clean up the built files."""
-        for built_file in CLEANFILES:
+        for built_file in LINUX_CLEANFILES:
             if os.path.exists(built_file):
                 os.unlink(built_file)
 
@@ -84,6 +88,7 @@
         clean.clean.run(self)
 
 
+<<<<<<< TREE
 DistUtilsExtra.auto.setup(
     name='ubuntu-sso-client',
     version='1.1.12',
@@ -104,3 +109,247 @@
     cmdclass={
         'build' : SSOBuild,
         'clean' : SSOClean})
+=======
+class SSOWindowsBuild(build_extra.build_extra):
+    """Build PyQt (.ui) files and resources."""
+
+    description = "build PyQt GUIs (.ui) and resources (.qrc)"
+
+    def compile_ui(self, ui_file, py_file=None):
+        """Compile the .ui files to python modules."""
+        # Search for pyuic4 in python bin dir, then in the $Path.
+        if py_file is None:
+            # go from the ui_file in the data folder to the
+            # python file in the qt moodule
+            py_file = os.path.split(ui_file)[1]
+            py_file = os.path.splitext(py_file)[0] + '_ui.py'
+            py_file = os.path.join('ubuntu_sso', 'qt', py_file)
+        # we indeed want to catch Exception, is ugle but w need it
+        # pylint: disable=W0703
+        try:
+            # import the uic compiler from pyqt and generate the .py files
+            # something similar could be done with pyside but that is left
+            # as an exercise for the reader.
+            from PyQt4 import uic
+            fp = open(py_file, 'w')
+            uic.compileUi(ui_file, fp)
+            fp.close()
+            log.info('Compiled %s into %s', ui_file, py_file)
+        except Exception, e:
+            self.warn('Unable to compile user interface %s: %s', py_file, e)
+            if not os.path.exists(py_file) or not file(py_file).read():
+                raise SystemExit(1)
+            return
+        # pylint: enable=W0703
+
+    def compile_rc(self, qrc_file, py_file=None):
+        """Compile the resources that will be included with the project."""
+        import PyQt4
+        # Search for pyuic4 in python bin dir, then in the $Path.
+        if py_file is None:
+            py_file = os.path.split(qrc_file)[1]
+            py_file = os.path.splitext(py_file)[0] + '_rc.py'
+            py_file = os.path.join('ubuntu_sso', 'qt', py_file)
+        path = os.getenv('PATH')
+        os.putenv('PATH', path + ';' + os.path.join(
+                  os.path.dirname(PyQt4.__file__),'bin'))
+        if os.system('pyrcc4 "%s" -o "%s"' % (qrc_file, py_file)) > 0:
+            self.warn('Unable to generate python module %s '
+                      + 'for resource file %s', py_file, qrc_file)
+            if not os.path.exists(py_file) or not file(py_file).read():
+                raise SystemExit(1)
+        else:
+            log.info('compiled %s into %s' % (qrc_file, py_file))
+        os.putenv('PATH', path)
+
+    def _generate_qrc(self, qrc_file, srcfiles, prefix):
+        """Generate the qrc file for the given src files."""
+        basedir = os.path.dirname(qrc_file)
+        f = open(qrc_file, 'w')
+        try:
+            f.write('<!DOCTYPE RCC><RCC version="1.0">\n')
+            f.write('  <qresource prefix="%s">\n' % cgi.escape(prefix))
+            for e in srcfiles:
+                relpath = e[len(basedir) + 1:]
+                f.write('    <file>%s</file>\n'
+                        % cgi.escape(relpath.replace(os.path.sep, '/')))
+            f.write('  </qresource>\n')
+            f.write('</RCC>\n')
+        finally:
+            f.close()
+
+    def build_rc(self, py_file, basedir, prefix='/'):
+        """Generate compiled resource including any files under basedir"""
+        # For details, see http://doc.qt.nokia.com/latest/resources.html
+        qrc_file = os.path.join(basedir, '%s.qrc' % os.path.basename(basedir))
+        srcfiles = [os.path.join(root, e)
+                    for root, _dirs, files in os.walk(basedir) for e in files]
+        # NOTE: Here we cannot detect deleted files. In such case, we need
+        # to remove .qrc manually.
+        try:
+            self._generate_qrc(qrc_file, srcfiles, prefix)
+            self.compile_rc(qrc_file, py_file)
+        finally:
+            os.unlink(qrc_file)
+
+    def run(self):
+        """Execute the command."""
+        self._wrapuic()
+        basepath = os.path.join('data',  'qt')
+        # TODO: build the resource files so that we can include them
+        #self.build_rc(os.path.join(basepath, 'icons_rc.py'),
+        #              os.path.join(os.path.dirname(__file__), 'icons'),
+        #              '/icons')
+        for dirpath, _, filenames in os.walk(basepath):
+            for filename in filenames:
+                if filename.endswith('.ui'):
+                    self.compile_ui(os.path.join(dirpath, filename))
+                elif filename.endswith('.qrc'):
+                    self.compile_rc(os.path.join(dirpath, filename))
+
+    # pylint: disable=E1002
+    _wrappeduic = False
+    @classmethod
+    def _wrapuic(cls):
+        """Wrap uic to use gettext's _() in place of tr()"""
+        if cls._wrappeduic:
+            return
+
+        from PyQt4.uic.Compiler import compiler, qtproxies, indenter
+
+        # pylint: disable=C0103
+        class _UICompiler(compiler.UICompiler):
+            """Speciallized compiler for qt .ui files."""
+            def createToplevelWidget(self, classname, widgetname):
+                o = indenter.getIndenter()
+                o.level = 0
+                o.write('from ubuntu_sso.utils.ui import _')
+                return super(_UICompiler, self).createToplevelWidget(classname,
+                    widgetname)
+        compiler.UICompiler = _UICompiler
+
+        class _i18n_string(qtproxies.i18n_string):
+            """Provide a trnalated text."""
+
+            def __str__(self):
+                return "_('%s')" % self.string.encode('string-escape')
+
+        qtproxies.i18n_string = _i18n_string
+
+        cls._wrappeduic = True
+        # pylint: enable=C0103
+    # pylint: enable=E1002
+
+class SSOWindowsClean(clean.clean):
+    """Clean the files from a Windows build."""
+
+    description = 'Clean up built files.'
+
+    def run(self):
+        """Clean up the built files."""
+        # remove the generated ui files
+        for dirpath, _, filenames in os.walk(os.path.join('ubuntu_sso', 'qt')):
+            for current_file in filenames:
+                if current_file.endswith('_ui.py') or\
+                                current_file.endswith('_rc.py'):
+                    os.unlink(os.path.join(dirpath, current_file))
+
+# pylint: disable=W0621
+def setup_windows():
+    """Provide the required info to setup the project on windows."""
+    scripts = []
+    data_files = []
+    packages = ['ubuntu_sso', 'ubuntu_sso.qt', 'ubuntu_sso.utils',
+                'ubuntu_sso.keyring', 'ubuntu_sso.networkstate',
+                'ubuntu_sso.main']
+    extra = {}
+    cmdclass = {'build' : SSOWindowsBuild,
+                'clean' : SSOWindowsClean}
+
+    # for PyQt, see http://www.py2exe.org/index.cgi/Py2exeAndPyQt
+    includes = ['sip',]
+
+    # Qt4 plugins, see http://stackoverflow.com/questions/2206406/
+    def qt4_plugins(subdir, *dlls):
+        """Add the required plugin so that we can package them."""
+        import PyQt4
+        pluginsdir = os.path.join(os.path.dirname(PyQt4.__file__), 'plugins')
+        return (subdir, [os.path.join(pluginsdir, subdir, e) for e in dlls])
+
+    data_files.append(qt4_plugins('imageformats', 'qico4.dll',
+                                       'qsvg4.dll'))
+    # ModuleFinder can't handle runtime changes to __path__,
+    # but win32com uses them
+    try:
+        # py2exe 0.6.4 introduced a replacement modulefinder.
+        # This means we have to add package paths there,
+        # not to the built-in one.  If this new modulefinder gets
+        # integrated into Python, then we might be able to revert
+        # this some day. If this doesn't work, try import modulefinder
+        # pylint: disable=F0401
+        try:
+            import py2exe.mf as modulefinder
+        except ImportError:
+            import modulefinder
+
+        import win32com
+        # pylint: enable=F0401
+        for package_path in win32com.__path__[1:]:
+            modulefinder.AddPackagePath("win32com", package_path)
+        for extra_mod in ["win32com.server" ,"win32com.client"]: 
+            __import__(extra_mod)
+            module = sys.modules[extra_mod]
+            for module_path in module.__path__[1:]:
+                modulefinder.AddPackagePath(extra_mod, module_path)
+    except ImportError:
+        # no build path setup, no worries.
+        pass
+
+    extra['options'] = {
+           'py2exe' : {
+               'skip_archive' : 0,
+               'includes' : includes,
+               'optimize' : 1
+           }
+        }
+    return scripts, data_files, packages, extra, cmdclass
+
+def setup_linux():
+    """Provide the required infor to setup the project on linux."""
+    scripts = []
+    data_files = [('share/dbus-1/services', ['data/com.ubuntu.sso.service']),
+                   ('lib/ubuntu-sso-client', ['bin/ubuntu-sso-login']),
+                   ('share/ubuntu-sso-client/data', ['data/gtk/ui.glade'])]
+    packages = ['ubuntu_sso', 'ubuntu_sso.gtk', 'ubuntu_sso.utils',
+                'ubuntu_sso.keyring', 'ubuntu_sso.networkstate',
+                'ubuntu_sso.main']
+    extra = {}
+    cmdclass = {'build' : SSOLinuxBuild,
+                'clean' : SSOLinuxClean}
+    return scripts, data_files, packages, extra, cmdclass
+
+if __name__ == "__main__":
+
+    # pylint: disable=C0103
+    scripts = data_files = packages = extra = cmdclass = None
+    if sys.platform == 'win32':
+        scripts, data_files, packages, extra, cmdclass = setup_windows()
+    else:
+        scripts, data_files, packages, extra, cmdclass = setup_linux()
+
+    DistUtilsExtra.auto.setup(
+        name='ubuntu-sso-client',
+        version='1.1.11',
+        license='GPL v3',
+        author='Natalia Bidart',
+        author_email='[e-mail]',
+        description='Ubuntu Single Sign-On client',
+        long_description='Desktop service to allow applications to sign in' \
+            'to Ubuntu services via SSO',
+        url='https://launchpad.net/ubuntu-sso-client',
+        scripts=scripts,
+        data_files = data_files,
+        packages=packages,
+        cmdclass=cmdclass,
+        **extra)
+>>>>>>> MERGE-SOURCE

=== modified file 'ubuntu_sso/gtk/gui.py'
--- ubuntu_sso/gtk/gui.py	2011-03-16 01:36:07 +0000
+++ ubuntu_sso/gtk/gui.py	2011-03-30 14:55:45 +0000
@@ -29,9 +29,7 @@
 from functools import wraps
 
 import dbus
-import gettext
 import gtk
-import xdg
 
 from dbus.mainloop.glib import DBusGMainLoop
 from twisted.internet.defer import inlineCallbacks
@@ -39,15 +37,12 @@
 from ubuntu_sso import (DBUS_ACCOUNT_PATH, DBUS_BUS_NAME, DBUS_IFACE_USER_NAME,
     NO_OP)
 from ubuntu_sso.logger import setup_logging
-
+from ubuntu_sso.utils.ui import get_data_file, _
 
 # Instance of 'UbuntuSSOClientGUI' has no 'yyy' member
 # pylint: disable=E1101
 
 
-_ = gettext.gettext
-gettext.textdomain('ubuntu-sso-client')
-
 DBusGMainLoop(set_as_default=True)
 logger = setup_logging('ubuntu_sso.gui')
 
@@ -73,38 +68,6 @@
 WARNING_TEXT_COLOR = gtk.gdk.Color("red")
 
 
-def get_data_dir():
-    """Build absolute path to  the 'data' directory."""
-    module = os.path.dirname(__file__)
-    result = os.path.abspath(os.path.join(module, os.pardir,
-                                          os.pardir, 'data'))
-    logger.debug('get_data_file: trying to load from %r (exists? %s)',
-                 result, os.path.exists(result))
-    if os.path.exists(result):
-        logger.info('get_data_file: returning data dir located at %r.', result)
-        return result
-
-    # no local data dir, looking within system data dirs
-    data_dirs = xdg.BaseDirectory.xdg_data_dirs
-    for path in data_dirs:
-        result = os.path.join(path, 'ubuntu-sso-client', 'data')
-        result = os.path.abspath(result)
-        logger.debug('get_data_file: trying to load from %r (exists? %s)',
-                     result, os.path.exists(result))
-        if os.path.exists(result):
-            logger.info('get_data_file: data dir located at %r.', result)
-            return result
-    else:
-        msg = 'get_data_file: can not build a valid data path. Giving up.' \
-              '__file__ is %r, data_dirs are %r'
-        logger.error(msg, __file__, data_dirs)
-
-
-def get_data_file(filename):
-    """Build absolute path to 'filename' within the 'data' directory."""
-    return os.path.join(get_data_dir(), filename)
-
-
 def log_call(f):
     """Decorator to log call funtions."""
 
@@ -265,7 +228,7 @@
         self.user_email = None
         self.user_password = None
 
-        ui_filename = get_data_file('ui.glade')
+        ui_filename = get_data_file('gtk', 'ui.glade')
         builder = gtk.Builder()
         builder.add_from_file(ui_filename)
         builder.connect_signals(self)

=== added directory 'ubuntu_sso/qt'
=== added file 'ubuntu_sso/qt/__init__.py'
--- ubuntu_sso/qt/__init__.py	1970-01-01 00:00:00 +0000
+++ ubuntu_sso/qt/__init__.py	2011-03-30 14:55:45 +0000
@@ -0,0 +1,1 @@
+"""Qt Ui."""

=== added file 'ubuntu_sso/qt/controllers.py'
--- ubuntu_sso/qt/controllers.py	1970-01-01 00:00:00 +0000
+++ ubuntu_sso/qt/controllers.py	2011-03-30 14:55:45 +0000
@@ -0,0 +1,260 @@
+# -*- coding: utf-8 -*-
+# Author: Manuel de la Pena <[e-mail]>
+#
+# Copyright 2011 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+"""Controllers with the logic of the UI."""
+
+from PyQt4.QtCore import QUrl
+
+from ubuntu_sso.logger import setup_logging
+from ubuntu_sso.utils.ui import (
+    CAPTCHA_SOLUTION_ENTRY,
+    EMAIL1_ENTRY,
+    EMAIL2_ENTRY,
+    EXISTING_ACCOUNT_CHOICE_BUTTON,
+    FORGOTTEN_PASSWORD_BUTTON,
+    JOIN_HEADER_LABEL,
+    NAME_ENTRY,
+    PASSWORD1_ENTRY,
+    PASSWORD2_ENTRY,
+    PASSWORD_HELP,
+    SET_UP_ACCOUNT_CHOICE_BUTTON,
+    SET_UP_ACCOUNT_BUTTON,
+    SIGN_IN_BUTTON,
+    SURNAME_ENTRY,
+    TC_BUTTON,
+    VERIFY_EMAIL_TITLE,
+    VERIFY_EMAIL_CONTENT,
+    YES_TO_TC,
+    get_password_strength,
+    is_min_required_password)
+
+
+logger = setup_logging('ubuntu_sso.controllers')
+
+
+class ChooseSignInController(object):
+    """Controlled to the ChooseSignIn view/widget."""
+
+    def __init__(self, title='', existing_account_id=1,
+                 new_account_id=2):
+        """Create a new instance to manage the view."""
+        self._title = title
+        self._existing_account_id = existing_account_id
+        self._new_account_id = new_account_id
+
+    # use an ugly name just so have a simlar api as found in PyQt
+    #pylint: disable=C0103
+    def setupUi(self, view):
+        """Perform the required actions to set up the ui."""
+        view.setTitle(self._title)
+        self._set_up_translated_strings(view)
+        self._connect_buttons(view)
+    #pylint: enable=C0103
+
+    def _set_up_translated_strings(self, view):
+        """Set the correct strings for the UI."""
+        view.existing_account_button.setText(EXISTING_ACCOUNT_CHOICE_BUTTON)
+        view.new_account_button.setText(SET_UP_ACCOUNT_CHOICE_BUTTON)
+
+    def _connect_buttons(self, view):
+        """Connect the buttons to the actions to perform."""
+        view.existing_account_button.clicked.connect(
+                                        lambda: self._set_next_existing(view))
+        view.new_account_button.clicked.connect(
+                                             lambda: self._set_next_new(view))
+
+    def _set_next_existing(self, view):
+        """Set the next id and fire signal."""
+        view.next = self._existing_account_id
+        view.wizard().next()
+
+    def _set_next_new(self, view):
+        """Set the next id and fire signal."""
+        view.next = self._new_account_id
+        view.wizard().next()
+
+
+class CurrentUserController(object):
+    """Controller used in the view that is used to allow the signin."""
+
+    def __init__(self, title=''):
+        """Create a new instance."""
+        self._title = title
+
+    def _set_translated_strings(self, view):
+        """Set the translated strings."""
+        logger.debug('Setting tranlated strings.')
+        view.email_edit.setPlaceholderText(EMAIL1_ENTRY)
+        view.password_edit.setPlaceholderText(PASSWORD1_ENTRY)
+        view.forgot_password_label.setText(FORGOTTEN_PASSWORD_BUTTON)
+        view.sign_in_button.setText(SIGN_IN_BUTTON)
+
+    # use an ugly name just so have a simlar api as found in PyQt
+    #pylint: disable=C0103
+    def setupUi(self, view):
+        """Setup the view."""
+        view.setTitle(self._title)
+        self._set_translated_strings(view)
+    #pylint: enable=C0103
+
+
+class SetUpAccountController(object):
+    """Conroller for the setup account view."""
+
+    def __init__(self, tos_id=0, validation_id=1, app_name='',
+                 help_message=''):
+        """Create a new instance."""
+        self._tos_id = tos_id
+        self._validation_id = validation_id
+        self._app_name = app_name
+        self._help_message = help_message
+
+    def _set_translated_strings(self, view):
+        """Set the different gettext translated strings."""
+        logger.debug('Setting tranlated strings.')
+        # set the translated string
+        view.name_edit.setPlaceholderText(NAME_ENTRY)
+        view.last_name_edit.setPlaceholderText(SURNAME_ENTRY)
+        view.email_edit.setPlaceholderText(EMAIL1_ENTRY)
+        view.confirm_email_edit.setPlaceholderText(EMAIL2_ENTRY)
+        view.password_edit.setPlaceholderText(PASSWORD1_ENTRY)
+        view.confirm_password_edit.setPlaceholderText(PASSWORD2_ENTRY)
+        view.password_info_label.setText(PASSWORD_HELP)
+        view.captcha_solution_edit.setPlaceholderText(CAPTCHA_SOLUTION_ENTRY)
+        view.terms_and_conditions_check_box.setText(YES_TO_TC)
+        view.terms_and_conditions_button.setText(TC_BUTTON)
+        view.set_up_button.setText(SET_UP_ACCOUNT_BUTTON)
+
+    def _set_line_edits_validations(self, view):
+        """Set the validations to be performed on the edits."""
+        view.set_line_edit_validation_rule(view.email_edit,
+                                           self.is_correct_email)
+        # set the validation rule for the email confirmation
+        view.set_line_edit_validation_rule(view.confirm_email_edit,
+                         lambda x: self.is_correct_email_confirmation(x, view))
+        # connect the changed text of the password to trigger a changed text
+        # in the confirm so that the validation is redone
+        view.email_edit.textChanged.connect(
+                                      view.confirm_email_edit.textChanged.emit)
+        view.set_line_edit_validation_rule(view.password_edit,
+                                           is_min_required_password)
+        view.set_line_edit_validation_rule(view.confirm_password_edit,
+                      lambda x: self.is_correct_password_confirmation(x, view))
+        # same as the above case, lets connect a signal to a signal
+        view.password_edit.textChanged.connect(
+                                   view.confirm_password_edit.textChanged.emit)
+
+    def _connect_ui_elements(self, view):
+        """Set the connection of signals."""
+        view.terms_and_conditions_button.clicked.connect(
+                                               lambda: self.set_next_tos(view))
+        view.set_up_button.clicked.connect(lambda: self.set_next_validation(
+                                                                         view))
+        view.password_edit.textChanged.connect(
+                              lambda x: self.update_password_strength(x, view))
+        view.terms_and_conditions_check_box.stateChanged.connect(
+                                                 view.set_up_button.setEnabled)
+
+    def _set_titles(self, view):
+        """Set the diff titles of the view."""
+        view.setTitle(JOIN_HEADER_LABEL % {'app_name': self._app_name})
+        view.setSubTitle(self._help_message)
+
+    def set_next_tos(self, view):
+        """Set the tos page as the next one."""
+        view.next = self._tos_id
+        view.wizard().next()
+
+    def set_next_validation(self, view):
+        """Set the validation as the enxt page."""
+        view.next = self._validation_id
+        view.wizard().next()
+
+    def update_password_strength(self, password, view):
+        """Callback used to update the password strenght UI code."""
+        # get the strengh and then according to it color the frames
+        strengh = get_password_strength(password)
+        logger.info('Password strengh is %s', strengh)
+        view.set_strengh_level(strengh, password)
+
+    def is_correct_email(self, email_address):
+        """Return if the email is correct."""
+        return '@' in email_address
+
+    def is_correct_email_confirmation(self, email_address, view):
+        """Return that the email is the same."""
+        return view.email_edit.text() == email_address
+
+    def is_correct_password_confirmation(self, password, view):
+        """Return that the passwords are correct."""
+        return view.password_edit.text() == password
+
+    #pylint: disable=C0103
+    def setupUi(self, view):
+        """Setup the view."""
+        self._set_titles(view)
+        self._set_translated_strings(view)
+        self._set_line_edits_validations(view)
+        self._connect_ui_elements(view)
+    #pylint: enable=C0103
+
+
+class TosController(object):
+    """Controller used for the tos page."""
+
+    def __init__(self, title='', subtitle='', tos_url='http://www.ubuntu.com'):
+        """Create a new instance."""
+        self._title = title
+        self._subtitle = subtitle
+        self._tos_url = tos_url
+
+    #pylint: disable=C0103
+    def setupUi(self, view):
+        """Set up the ui."""
+        view.setTitle(self._title)
+        view.setSubTitle(self._subtitle)
+        # load the tos page
+        view.webkit.load(QUrl(self._tos_url))
+    #pylint: enable=C0103
+
+
+class EmailVerificationController(object):
+    """Controller used for the verification page."""
+
+    def _set_translated_strings(self, view):
+        """Set the trnaslated strings."""
+        view.verification_code_edit.setPlaceholderText(VERIFY_EMAIL_TITLE)
+
+    def _connect_ui_elements(self, view):
+        """Set the connection of signals."""
+        view.next_button.clicked.connect(lambda: self.next_page(view))
+
+    def _set_titles(self, view):
+        """Set the different titles."""
+        view.setTitle(VERIFY_EMAIL_TITLE)
+        view.setSubTitle(VERIFY_EMAIL_CONTENT)
+
+    #pylint: disable=C0103
+    def setupUi(self, view):
+        """Setup the view."""
+        self._set_titles(view)
+        self._set_translated_strings(view)
+        self._connect_ui_elements(view)
+    #pylint: enable=C0103
+
+    def next_page(self, view):
+        """Call the next action."""
+        view.wizard().next()

=== added file 'ubuntu_sso/qt/gui.py'
--- ubuntu_sso/qt/gui.py	1970-01-01 00:00:00 +0000
+++ ubuntu_sso/qt/gui.py	2011-03-30 14:55:45 +0000
@@ -0,0 +1,461 @@
+# -*- coding: utf-8 -*-
+# Author: Manuel de la Pena <[e-mail]>
+#
+# Copyright 2011 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+"""Qt implementation of the UI."""
+
+from PyQt4 import Qt
+from PyQt4.QtCore import QObject, SIGNAL
+from PyQt4.QtGui import (
+    QApplication,
+    QColor,
+    QCursor,
+    QHBoxLayout,
+    QPalette,
+    QPixmap,
+    QPushButton,
+    QStyle,
+    QWizard,
+    QWizardPage,
+    QGraphicsScene)
+
+from ubuntu_sso.logger import setup_logging
+# pylint: disable=F0401,E0611
+from ubuntu_sso.qt.choose_sign_in_ui import Ui_ChooseSingInPage
+from ubuntu_sso.qt.current_user_sign_in_ui import Ui_CurrentUserSignInPage
+from ubuntu_sso.qt.email_verification_ui import Ui_EmailVerificationPage
+from ubuntu_sso.qt.setup_account_ui import Ui_SetUpAccountPage
+from ubuntu_sso.qt.terms_and_conditions_ui import Ui_TosPage
+# pylint: enable=F0401,E0611
+from ubuntu_sso.qt.controllers import (
+    ChooseSignInController,
+    CurrentUserController,
+    EmailVerificationController,
+    SetUpAccountController,
+    TosController)
+
+
+logger = setup_logging('ubuntu_sso.gui')
+
+
+class ChooseSignInPage(QWizardPage):
+    """Widget that allows the user to choose how to sign in."""
+
+    def __init__(self, ui, controller, parent=None):
+        """Create a new widget to be used."""
+        QWizardPage.__init__(self, parent)
+        self.ui = ui
+        self.controller = controller
+        ui.setupUi(self)
+        controller.setupUi(self)
+        self.next = -1
+
+    # pylint: disable=C0103
+    def nextId(self):
+        """Provide the next id."""
+        return self.next
+    # pylint: enable=C0103
+
+    # allow to access to the different useful children
+    @property
+    def existing_account_button(self):
+        """Return the button used to sign in using an existing account."""
+        return self.ui.existing_account_button
+
+    @property
+    def new_account_button(self):
+        """Return the button used to sign in with a new account."""
+        return self.ui.setup_account_button
+
+
+class CurrentUserSignInPage(QWizardPage):
+    """Widget that allows to get the data of user to sign in."""
+
+    def __init__(self, ui, controller, parent=None):
+        """Create a new widget to be used."""
+        QWizardPage.__init__(self, parent)
+        self.ui = ui
+        self.controller = controller
+        self.ui.setupUi(self)
+        self.controller.setupUi(self)
+
+    # allow to access to the different useful data
+    @property
+    def email(self):
+        """Return the email data in the edit field."""
+        return str(self.ui.email_edit.text())
+
+    @property
+    def email_edit(self):
+        """Return the email edit that is used in the view."""
+        return self.ui.email_edit
+
+    @property
+    def password(self):
+        """Return the password data in the edit field."""
+        return str(self.ui.password_edit.text())
+
+    @property
+    def password_edit(self):
+        """Return the password edit used in the view."""
+        return self.ui.password_edit
+
+    @property
+    def forgot_password_label(self):
+        """Return the forgot password label."""
+        return self.ui.forgot_label
+
+    @property
+    def sign_in_button(self):
+        """Return the sign in button."""
+        return self.ui.sign_in_button
+
+
+class EmailVerificationPage(QWizardPage):
+    """Widget used to input the email verification code."""
+
+    def __init__(self, ui, controller, parent=None):
+        """Create a new widget to be used."""
+        QWizardPage.__init__(self, parent)
+        self.ui = ui
+        self.ui.setupUi(self)
+        self.controller = controller
+        self.controller.setupUi(self)
+
+    @property
+    def verification_code(self):
+        """Return the content of the verification code edit."""
+        return str(self.ui.verification_code_edit)
+
+    @property
+    def verification_code_edit(self):
+        """Return the edit used for the verification code."""
+        return self.ui.verification_code_edit
+
+    @property
+    def next_button(self):
+        """Return the button that move to the next stage."""
+        return self.ui.next_button
+
+
+class TosPage(QWizardPage):
+    """Widget used to show the tos."""
+
+    def __init__(self, ui, controller, parent=None):
+        """Create a new instance."""
+        QWizardPage.__init__(self, parent)
+        self.ui = ui
+        self.ui.setupUi(self)
+        self.controller = controller
+        self.controller.setupUi(self)
+
+    # pylint: disable=C0103
+    def nextId(self):
+        """Return the next page id."""
+        return -1
+    # pylint: enable=C0103
+
+    @property
+    def webkit(self):
+        """Return the webkit widget used to load the terms."""
+        return self.ui.terms_webkit
+
+
+class EnhancedLineEdit(object):
+    """Represents and enhanced lineedit.
+
+    This class works on an already added lineedit to the widget so
+    that we are just adding extra items to it.
+    """
+
+    def __init__(self, line_edit, valid_cb=lambda x: False):
+        """Create an instance."""
+        self._line_edit = line_edit
+        layout = QHBoxLayout(self._line_edit)
+        layout.setMargin(0)
+        self._line_edit.setLayout(layout)
+        self.valid_cb = valid_cb
+        layout.addStretch()
+        self.clear_button = QPushButton(self._line_edit)
+        layout.addWidget(self.clear_button)
+        self.clear_button.setMinimumSize(16, 16)
+        self.clear_button.setVisible(False)
+        self.clear_button.setFlat(True)
+        self.clear_button.setCursor(QCursor(0))
+        self.clear_button.setIcon(QApplication.style().standardIcon(
+                                                QStyle.SP_MessageBoxWarning))
+        # connect the change of text to the cation that will check if the
+        # text is valid and if the icon should be shown.
+        QObject.connect(self._line_edit, SIGNAL('textChanged(QString)'),
+                        self.show_button)
+
+    def show_button(self, string):
+        """Decide if we show the button or not."""
+        if not self.valid_cb(string):
+            self.clear_button.setVisible(True)
+        else:
+            self.clear_button.setVisible(False)
+
+
+class SetupAccountPage(QWizardPage):
+    """Widget used to create a new account."""
+
+    def __init__(self, ui, controller, parent=None):
+        """Create a new widget to be used."""
+        QWizardPage.__init__(self, parent)
+        self._enhanced_edits = {}
+        self.ui = ui
+        self.ui.setupUi(self)
+        # palettes that will be used to set the colors of the password strengh
+        original_palette = self.ui.strenght_frame.palette()
+        self._original_color = original_palette.background().color()
+        self._weak_color = QColor(220, 20, 60)
+        self._medium_color = QColor(255, 215, 0)
+        self._strong_color = QColor(50, 205, 50)
+        self.controller = controller
+        self.controller.setupUi(self)
+        self.next = -1
+        # create the scene to be used to show the captcha
+        self.image = None
+        self.image_file = None
+        self.scene = QGraphicsScene(self.ui.captcha_view)
+        #self.scene.setSceneRect(self.ui._captchaView.rect())
+        #self.ui._captchaView.setScene(self.scene)
+
+    def set_strengh_level(self, level, password):
+        """Set the strengh level colors."""
+        if password != '':
+            if level <= 1:
+                # low password
+                self._set_frame_color(self.ui.weak_frame, self._weak_color)
+                self._set_frame_color(self.ui.medium_frame,
+                                      self._original_color)
+                self._set_frame_color(self.ui.strong_frame,
+                                      self._original_color)
+            elif level <= 3:
+                # medium password
+                self._set_frame_color(self.ui.weak_frame, self._medium_color)
+                self._set_frame_color(self.ui.medium_frame, self._medium_color)
+                self._set_frame_color(self.ui.strong_frame,
+                                      self._original_color)
+            else:
+                # nice!
+                self._set_frame_color(self.ui.weak_frame, self._strong_color)
+                self._set_frame_color(self.ui.medium_frame, self._strong_color)
+                self._set_frame_color(self.ui.strong_frame, self._strong_color)
+        else:
+            # set it to the minimum
+            self._set_frame_color(self.ui.weak_frame, self._original_color)
+            self._set_frame_color(self.ui.medium_frame, self._original_color)
+            self._set_frame_color(self.ui.strong_frame, self._original_color)
+
+    def _set_frame_color(self, frame, color):
+        """Set the color of a frame to indicated a strenght."""
+        # change the color background for the given frame
+        palette = frame.palette()
+        palette.setColor(QPalette.Background, color)
+        frame.setPalette(palette)
+        frame.setAutoFillBackground(True)
+
+    # pylint: disable=C0103
+    def nextId(self):
+        """Return the next page id."""
+        return self.next
+    # pylint: enable=C0103
+
+    def set_line_edit_validation_rule(self, edit, cb):
+        """Set a new enhanced edit so that we can show an icon."""
+        if edit in self._enhanced_edits:
+            self._enhanced_edits[edit].valid_cb = cb
+        else:
+            # create a new enhanced edit
+            enhanced_edit = EnhancedLineEdit(edit, cb)
+            self._enhanced_edits[edit] = enhanced_edit
+
+    @property
+    def name(self):
+        """Return the name input."""
+        return str(self.ui.first_name_edit.text())
+
+    @property
+    def name_edit(self):
+        """Return the edit used for the name."""
+        return self.ui.first_name_edit
+
+    @property
+    def last_name(self):
+        """Return the last name input."""
+        return str(self.ui.last_name_edit.text())
+
+    @property
+    def last_name_edit(self):
+        """Return the edit used for the last name."""
+        return self.ui.last_name_edit
+
+    @property
+    def email(self):
+        """Return the email input."""
+        return str(self.ui.email_edit.text())
+
+    @property
+    def email_edit(self):
+        """Return the edit used for the email."""
+        return self.ui.email_edit
+
+    @property
+    def retyped_email(self):
+        """Return the retyped email."""
+        return str(self.ui.confirm_email_edit.text())
+
+    @property
+    def confirm_email_edit(self):
+        """Return the edit used for the retype of the email."""
+        return self.ui.confirm_email_edit
+
+    @property
+    def password_info_label(self):
+        """Return the password used to show the info of the label."""
+        return self.ui.password_info_label
+
+    @property
+    def password(self):
+        """Return the password data."""
+        return str(self.ui.password_edit.text())
+
+    @property
+    def password_edit(self):
+        """Return the edit used for the password."""
+        return self.ui.password_edit
+
+    @property
+    def retyped_password(self):
+        """Return the retyped password."""
+        return str(self.ui.confirm_password_edit.text())
+
+    @property
+    def confirm_password_edit(self):
+        """Return the edit used to confirm the password."""
+        return self.ui.confirm_password_edit
+
+    @property
+    def captcha_solution(self):
+        """Return the provided captcha solution."""
+        return str(self.ui.captcha_solution_edit.text())
+
+    @property
+    def captcha_solution_edit(self):
+        """Return the edit used for the captcha solution."""
+        return self.ui.captcha_solution_edit
+
+    def get_captcha_image(self):
+        """Return the path to the captcha image."""
+        return self.image_file
+
+    def set_captcha_image(self, file_path):
+        """Set the new image of the captcha."""
+        if self.image:
+            self.scene.removeItem(self.image)
+        self.image_file = file_path
+        pix = QPixmap(self.image_file)
+        self.image = self.scene.addPixmap(pix)
+
+    captcha_image = property(get_captcha_image, set_captcha_image)
+
+    @property
+    def terms_and_conditions_agreed(self):
+        """Return if the user agreed the terms."""
+        return self.ui.terms_checkbox.isChecked()
+
+    @property
+    def terms_and_conditions_check_box(self):
+        """Return the terms and codition item."""
+        return self.ui.terms_checkbox
+
+    @property
+    def terms_and_conditions_button(self):
+        """Return the terms and conditions button."""
+        return self.ui.terms_button
+
+    @property
+    def set_up_button(self):
+        """Return the set up button."""
+        return self.ui.set_up_button
+
+
+class UbuntuSSOWizard(QWizard):
+    """Wizard used to create or use sso."""
+
+    def __init__(self, parent=None, app_name='', tos_url='', help_text=''):
+        """Create a new wizard."""
+        QWizard.__init__(self, parent)
+        # set the diff pages of the QWizard
+        self.sign_in_controller = ChooseSignInController(title='Sign In',
+                                                         existing_account_id=4,
+                                                         new_account_id=1)
+        self.sign_in_page = ChooseSignInPage(Ui_ChooseSingInPage(),
+                                             self.sign_in_controller,
+                                             parent=self)
+        self.setup_controller = SetUpAccountController(tos_id=2,
+                                                       validation_id=3,
+                                                       app_name=app_name,
+                                                       help_message='')
+        self.setup_account = SetupAccountPage(Ui_SetUpAccountPage(),
+                                              self.setup_controller,
+                                              parent=self)
+        self.tos = TosPage(Ui_TosPage(), TosController())
+        self.email_verification = EmailVerificationPage(
+                                                Ui_EmailVerificationPage(),
+                                                EmailVerificationController())
+        self.current_user_controller = CurrentUserController(title='Sign in')
+        self.current_user = CurrentUserSignInPage(Ui_CurrentUserSignInPage(),
+                                                  self.current_user_controller,
+                                                  parent=self)
+        for page in [self.sign_in_page, self.setup_account, self.tos,
+                     self.email_verification, self.current_user]:
+            self.addPage(page)
+        # set the buttons layout to only have cancel and back since the next
+        # buttons are the ones used in the diff pages.
+        buttons_layout = []
+        buttons_layout.append(QWizard.Stretch)
+        buttons_layout.append(QWizard.BackButton)
+        buttons_layout.append(QWizard.CancelButton)
+        self.setButtonLayout(buttons_layout)
+        self.setWindowTitle(app_name)
+
+
+class UbuntuSSOWizardController(object):
+    """Performs the loginc of the sso wizard."""
+
+    def __init__(self, app_name, tc_url='', help_text='',
+                 window_id=0, login_only=False):
+        """Create a new instance."""
+       # create a new wizard and show it
+        self.wizard = None
+
+
+class UbuntuSSOClientGUI(object):
+    """Ubuntu single sign-on GUI."""
+
+if __name__ == '__main__':
+    # pylint: disable=C0103
+    # show the ui
+    import sys
+
+    app = Qt.QApplication(sys.argv)
+
+    wizard = UbuntuSSOWizard()
+    wizard.show()
+    # Now we can start it.
+    app.exec_()

=== added directory 'ubuntu_sso/qt/tests'
=== added file 'ubuntu_sso/qt/tests/__init__.py'
--- ubuntu_sso/qt/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ ubuntu_sso/qt/tests/__init__.py	2011-03-30 14:55:45 +0000
@@ -0,0 +1,1 @@
+"""Test the Ui code."""

=== added file 'ubuntu_sso/qt/tests/test_controllers.py'
--- ubuntu_sso/qt/tests/test_controllers.py	1970-01-01 00:00:00 +0000
+++ ubuntu_sso/qt/tests/test_controllers.py	2011-03-30 14:55:45 +0000
@@ -0,0 +1,318 @@
+# -*- coding: utf-8 -*-
+# Author: Manuel de la Pena <[e-mail]>
+#
+# Copyright 2011 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+"""Test the ui controllers."""
+
+from mocker import ANY, MATCH, MockerTestCase
+
+from ubuntu_sso.qt.controllers import (
+    ChooseSignInController,
+    CurrentUserController,
+    EmailVerificationController,
+    SetUpAccountController,
+    TosController)
+from ubuntu_sso.utils.ui import (
+    CAPTCHA_SOLUTION_ENTRY,
+    EMAIL1_ENTRY,
+    EMAIL2_ENTRY,
+    EXISTING_ACCOUNT_CHOICE_BUTTON,
+    FORGOTTEN_PASSWORD_BUTTON,
+    JOIN_HEADER_LABEL,
+    NAME_ENTRY,
+    PASSWORD1_ENTRY,
+    PASSWORD2_ENTRY,
+    PASSWORD_HELP,
+    SET_UP_ACCOUNT_CHOICE_BUTTON,
+    SET_UP_ACCOUNT_BUTTON,
+    SIGN_IN_BUTTON,
+    SURNAME_ENTRY,
+    TC_BUTTON,
+    VERIFY_EMAIL_TITLE,
+    VERIFY_EMAIL_CONTENT,
+    YES_TO_TC,
+    is_min_required_password)
+
+#ignore the comon mocker issues with lint
+# pylint: disable=W0212,W0104
+
+
+class ChooseSignInControllerTestCase(MockerTestCase):
+    """Test the choose sign in controller."""
+
+    def setUp(self):
+        """Set tests."""
+        super(ChooseSignInControllerTestCase, self).setUp()
+        self.view = self.mocker.mock()
+        self.controller = ChooseSignInController()
+
+    def test_set_up_translated_strings(self):
+        """Ensure that the translations are used."""
+        self.view.existing_account_button.setText(
+                                            EXISTING_ACCOUNT_CHOICE_BUTTON)
+        self.view.new_account_button.setText(SET_UP_ACCOUNT_CHOICE_BUTTON)
+        self.mocker.replay()
+        self.controller._set_up_translated_strings(self.view)
+
+    def test_connect_buttons(self):
+        """Ensure that all the buttons are correcly connected."""
+        self.view.existing_account_button.clicked.connect(MATCH(callable))
+        self.view.new_account_button.clicked.connect(MATCH(callable))
+        self.mocker.replay()
+        self.controller._connect_buttons(self.view)
+
+    def test_set_next_existing(self):
+        """Test the execution of the callback."""
+        self.view.next = self.controller._existing_account_id
+        self.view.wizard().next()
+        self.mocker.replay()
+        self.controller._set_next_existing(self.view)
+
+    def test_set_next_new(self):
+        """Test the execution of the callback."""
+        self.view.next = self.controller._new_account_id
+        self.view.wizard().next()
+        self.mocker.replay()
+        self.controller._set_next_new(self.view)
+
+
+class CurrentUserControllerTestCase(MockerTestCase):
+    """Test the current user controller."""
+
+    def setUp(self):
+        """Setup tests."""
+        super(CurrentUserControllerTestCase, self).setUp()
+        self.view = self.mocker.mock()
+        self.controller = CurrentUserController(title='the title')
+
+    def test_setup_ui(self):
+        """test that the ui is correctly set up."""
+        self.view.setTitle(self.controller._title)
+        self.view.email_edit.setPlaceholderText(EMAIL1_ENTRY)
+        self.view.password_edit.setPlaceholderText(PASSWORD1_ENTRY)
+        self.view.forgot_password_label.setText(FORGOTTEN_PASSWORD_BUTTON)
+        self.view.sign_in_button.setText(SIGN_IN_BUTTON)
+        self.mocker.replay()
+        self.controller.setupUi(self.view)
+
+
+class SetUpAccountControllerTestCase(MockerTestCase):
+    """test the controller used to setup a new account."""
+
+    def setUp(self):
+        """Set the different tests."""
+        super(SetUpAccountControllerTestCase, self).setUp()
+        self.view = self.mocker.mock()
+        self.get_password_strength = self.mocker.replace(
+                                 'ubuntu_sso.utils.ui.get_password_strength')
+        self.app_name = 'test'
+        self.help = 'help'
+        self.controller = SetUpAccountController(app_name=self.app_name,
+                                                 help_message=self.help)
+
+    def test_set_translated_strings(self):
+        """Ensure all the strings are set."""
+        self.view.name_edit.setPlaceholderText(NAME_ENTRY)
+        self.view.last_name_edit.setPlaceholderText(SURNAME_ENTRY)
+        self.view.email_edit.setPlaceholderText(EMAIL1_ENTRY)
+        self.view.confirm_email_edit.setPlaceholderText(EMAIL2_ENTRY)
+        self.view.password_edit.setPlaceholderText(PASSWORD1_ENTRY)
+        self.view.confirm_password_edit.setPlaceholderText(PASSWORD2_ENTRY)
+        self.view.password_info_label.setText(PASSWORD_HELP)
+        self.view.captcha_solution_edit.setPlaceholderText(
+                                                    CAPTCHA_SOLUTION_ENTRY)
+        self.view.terms_and_conditions_check_box.setText(YES_TO_TC)
+        self.view.terms_and_conditions_button.setText(TC_BUTTON)
+        self.view.set_up_button.setText(SET_UP_ACCOUNT_BUTTON)
+        self.mocker.replay()
+        self.controller._set_translated_strings(self.view)
+
+    def test_set_titles(self):
+        """Test how the different titles are set."""
+        self.view.setTitle(JOIN_HEADER_LABEL % {'app_name': self.app_name})
+        self.view.setSubTitle(self.help)
+        self.mocker.replay()
+        self.controller._set_titles(self.view)
+
+    def test_connect_ui_elements(self):
+        """Test that the ui elements are correctly connect."""
+        self.view.terms_and_conditions_button.clicked.connect(MATCH(callable))
+        self.view.set_up_button.clicked.connect(MATCH(callable))
+        self.view.password_edit.textChanged.connect(MATCH(callable))
+        self.view.set_up_button.setEnabled
+        self.mocker.result(lambda:None)
+        self.view.terms_and_conditions_check_box.stateChanged.connect(
+                                                             MATCH(callable))
+        self.mocker.replay()
+        self.controller._connect_ui_elements(self.view)
+
+    def test_is_correct_password_confirmation_false(self):
+        """Test when the password is not correct."""
+        password = 'test'
+        self.view.password_edit.text()
+        self.mocker.result('other')
+        self.mocker.replay()
+        self.assertFalse(
+                    self.controller.is_correct_password_confirmation(password,
+                                                                   self.view))
+
+    def test_is_correct_password_confirmation_true(self):
+        """Test when the password is correct."""
+        password = 'test'
+        self.view.password_edit.text()
+        self.mocker.result(password)
+        self.mocker.replay()
+        self.assertTrue(
+                    self.controller.is_correct_password_confirmation(password,
+                                                                   self.view))
+
+    def test_is_correct_email_confirmation_false(self):
+        """Test when the emails are not the same."""
+        email_address = 'address'
+        self.view.email_edit.text()
+        self.mocker.result('other')
+        self.mocker.replay()
+        self.assertFalse(
+                self.controller.is_correct_email_confirmation(email_address,
+                                                              self.view))
+
+    def test_is_correct_email_confirmation_true(self):
+        """Test when the emails are the same."""
+        email_address = 'address'
+        self.view.email_edit.text()
+        self.mocker.result(email_address)
+        self.mocker.replay()
+        self.assertTrue(
+                self.controller.is_correct_email_confirmation(email_address,
+                                                              self.view))
+
+    def test_is_correct_email_true(self):
+        """Test when the email is correct."""
+        email = '[e-mail]'
+        self.mocker.replay()
+        self.assertTrue(self.controller.is_correct_email(email))
+
+    def test_is_correct_email_false(self):
+        """Test when the email is not correct."""
+        email = 'manuelcanonical.com'
+        self.mocker.replay()
+        self.assertFalse(self.controller.is_correct_email(email))
+
+    def test_set_next_tos(self):
+        """Test the callback."""
+        self.view.next = self.controller._tos_id
+        self.view.wizard().next()
+        self.mocker.replay()
+        self.controller.set_next_tos(self.view)
+
+    def test_set_next_validation(self):
+        """Test the callback."""
+        self.view.next = self.controller._validation_id
+        self.view.wizard().next()
+        self.mocker.replay()
+        self.controller.set_next_validation(self.view)
+
+    def test_update_password_strength(self):
+        """Test the callback."""
+        password = 'test'
+        strength = 4
+        self.get_password_strength(password)
+        self.mocker.result(strength)
+        self.view.set_strengh_level(strength, password)
+        self.mocker.replay()
+        self.controller.update_password_strength(password, self.view)
+
+    def test_set_line_edits_validations(self):
+        """Set the validations to be performed on the edits."""
+        self.view.email_edit
+        self.mocker.result(self.view)
+        self.view.set_line_edit_validation_rule(self.view,
+                                            self.controller.is_correct_email)
+        self.view.confirm_email_edit
+        self.mocker.result(self.view)
+        self.view.set_line_edit_validation_rule(self.view, MATCH(callable))
+        self.view.confirm_email_edit.textChanged.emit
+        self.mocker.result(lambda: None)
+        self.view.email_edit.textChanged.connect(MATCH(callable))
+        self.view.password_edit
+        self.mocker.result(self.view)
+        self.view.set_line_edit_validation_rule(self.view,
+                                                is_min_required_password)
+        self.view.confirm_password_edit
+        self.mocker.result(self.view)
+        self.view.set_line_edit_validation_rule(self.view, MATCH(callable))
+        self.view.confirm_password_edit.textChanged.emit
+        self.mocker.result(lambda: None)
+        self.view.password_edit.textChanged.connect(MATCH(callable))
+        self.mocker.replay()
+        self.controller._set_line_edits_validations(self.view)
+
+
+class TosControllerTestCase(MockerTestCase):
+    """Test the tos controller."""
+
+    def setUp(self):
+        """Set the tests."""
+        super(TosControllerTestCase, self).setUp()
+        self.view = self.mocker.mock()
+        self.title = 'title'
+        self.subtitle = 'sub'
+        self.url = 'url'
+        self.controller = TosController(title=self.title,
+                                        subtitle=self.subtitle,
+                                        tos_url=self.url)
+
+    def test_setup_ui(self):
+        """Test the set up of the ui."""
+        self.view.setTitle(self.title)
+        self.view.setSubTitle(self.subtitle)
+        self.view.webkit.load(ANY)
+        self.mocker.replay()
+        self.controller.setupUi(self.view)
+
+
+class EmailVerificationControllerTestCase(MockerTestCase):
+    """Test the controller."""
+
+    def setUp(self):
+        """Set tests."""
+        super(EmailVerificationControllerTestCase, self).setUp()
+        self.view = self.mocker.mock()
+        self.controller = EmailVerificationController()
+
+    def test_set_translated_strings(self):
+        """Test that strings are translated."""
+        self.view.verification_code_edit.setPlaceholderText(VERIFY_EMAIL_TITLE)
+        self.mocker.replay()
+        self.controller._set_translated_strings(self.view)
+
+    def test_connect_ui_elements(self):
+        """Set the ui connections."""
+        self.view.next_button.clicked.connect(MATCH(callable))
+        self.mocker.replay()
+        self.controller._connect_ui_elements(self.view)
+
+    def test_set_titles(self):
+        """Test that the titles are set."""
+        self.view.setTitle(VERIFY_EMAIL_TITLE)
+        self.view.setSubTitle(VERIFY_EMAIL_CONTENT)
+        self.mocker.replay()
+        self.controller._set_titles(self.view)
+
+    def test_next_page(self):
+        """Test the callback."""
+        self.view.wizard().next()
+        self.mocker.replay()
+        self.controller.next_page(self.view)

=== added file 'ubuntu_sso/utils/tests/test_ui.py'
--- ubuntu_sso/utils/tests/test_ui.py	1970-01-01 00:00:00 +0000
+++ ubuntu_sso/utils/tests/test_ui.py	2011-03-30 14:55:45 +0000
@@ -0,0 +1,110 @@
+# -*- coding: utf-8 -*-
+# Author: Manuel de la Pena <[e-mail]>
+#
+# Copyright 2011 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+"""Test the ui functions."""
+
+from unittest import TestCase
+
+from ubuntu_sso.utils.ui import (get_password_strength,
+                                 is_min_required_password)
+
+
+class GetPasswordStrengTestCase(TestCase):
+    """Test the function that returns the strengh of a password."""
+
+    def test_too_small_password(self):
+        """Test the points given to a very small password."""
+        password = 'abc'
+        self.assertEqual(1, get_password_strength(password))
+
+    def test_small_password(self):
+        """Test the points given to a small passwod 4 or more chars."""
+        password = 'testtwe'
+        self.assertEqual(0, get_password_strength(password))
+
+    def test_eight_chars_password(self):
+        """Test the points given to a normal 8 chars password."""
+        password = 'abcdabcd'
+        self.assertEqual(1, get_password_strength(password))
+
+    def test_eight_chars_and_num(self):
+        """Test the points given to a 8 chars password with a num."""
+        password = 'abcdabc8'
+        self.assertEqual(2, get_password_strength(password))
+
+    def test_eight_chars_low_and_cap(self):
+        """Test the points given to a 8 chars password with a capital."""
+        password = 'abcdabcD'
+        self.assertEqual(2, get_password_strength(password))
+
+    def test_eight_chars_low_canp_num(self):
+        """Test the points given to a 8 chars password with capitals & num."""
+        password = 'abcdab7D'
+        self.assertEqual(3, get_password_strength(password))
+
+    def test_eiqgh_chars_and_special(self):
+        """Test the points given to a 8 chars password with special chars."""
+        password = 'abcdabc*'
+        self.assertEqual(2, get_password_strength(password))
+
+    def test_long_password(self):
+        """Test the points goven to a long password."""
+        password = 'abcdabcdabcd'
+        self.assertEqual(2, get_password_strength(password))
+
+    def test_eleven_chars_and_num(self):
+        """Test the points of a loong password with a num."""
+        password = 'abcdabcdabcd99'
+        self.assertEqual(3, get_password_strength(password))
+
+    def test_eleven_chars_low_cap(self):
+        """Test the points of a long password with low and cap."""
+        password = 'abcdabcdabcdbABCD'
+        self.assertEqual(3, get_password_strength(password))
+
+    def test_eleven_num_low_cap(self):
+        """Test the points of a long password with num and diff cap."""
+        password = 'ABCDabcdacbd723'
+        self.assertEqual(4, get_password_strength(password))
+
+    def test_eleven_num_special(self):
+        """Test the point of a long password with a number and special char."""
+        password = 'abcdabcdabcd*9'
+        self.assertEqual(4, get_password_strength(password))
+
+
+class IsMinRequiredPasswordTestCase(TestCase):
+    """Test the fnction that returns if the password is the min required."""
+
+    def test_no_enough_chars(self):
+        """Test a password that does not have enough chars."""
+        password = 'Test8'
+        self.assertFalse(is_min_required_password(password))
+
+    def test_no_uppercase(self):
+        """Test a password that does not have an uppercase."""
+        password = 'longenoughtobeapassword8'
+        self.assertFalse(is_min_required_password(password))
+
+    def test_no_number(self):
+        """Test a password that does not have a number."""
+        password = 'longenoughtobeapassworD'
+        self.assertFalse(is_min_required_password(password))
+
+    def test_correct_password(self):
+        """Test a password that is correct."""
+        password = 'TodasLasPaswordPasan88'
+        self.assertTrue(is_min_required_password(password))

=== added file 'ubuntu_sso/utils/ui.py'
--- ubuntu_sso/utils/ui.py	1970-01-01 00:00:00 +0000
+++ ubuntu_sso/utils/ui.py	2011-03-30 14:55:45 +0000
@@ -0,0 +1,168 @@
+# -*- coding: utf-8 -*-
+# Author: Manuel de la Pena <[e-mail]>
+#
+# Copyright 2011 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+"""Utils to be used by the UI modules."""
+
+import os
+import re
+import xdg
+import gettext
+
+from ubuntu_sso.logger import setup_logging
+
+logger = setup_logging('ubuntu_sso.utils.ui')
+
+
+gettext.textdomain('ubuntu-sso-client')
+_ = gettext.gettext
+
+# all the text that is used in the gui
+CAPTCHA_SOLUTION_ENTRY = _('Type the characters above')
+CAPTCHA_LOAD_ERROR = _('There was a problem getting the captcha, '
+                       'reloading...')
+CONNECT_HELP_LABEL = _('To connect this computer to %(app_name)s ' \
+                       'enter your details below.')
+EMAIL1_ENTRY = _('Email address')
+EMAIL2_ENTRY = _('Re-type Email address')
+EMAIL_MISMATCH = _('The email addresses don\'t match, please double check '
+                       'and try entering them again.')
+EMAIL_INVALID = _('The email must be a valid email address.')
+EMAIL_TOKEN_ENTRY = _('Enter code verification here')
+ERROR = _('The process did not finish successfully.')
+EXISTING_ACCOUNT_CHOICE_BUTTON = _('Sign me in with my existing account')
+FIELD_REQUIRED = _('This field is required.')
+FORGOTTEN_PASSWORD_BUTTON = _('I\'ve forgotten my password')
+JOIN_HEADER_LABEL = _('Create %(app_name)s account')
+LOADING = _('Loading...')
+LOGIN_BUTTON_LABEL = _('Already have an account? Click here to sign in')
+LOGIN_EMAIL_ENTRY = _('Email address')
+LOGIN_HEADER_LABEL = _('Connect to %(app_name)s')
+LOGIN_PASSWORD_ENTRY = _('Password')
+NAME_ENTRY = _('Name')
+NEXT = _('Next')
+ONE_MOMENT_PLEASE = _('One moment please...')
+PASSWORD_CHANGED = _('Your password was successfully changed.')
+PASSWORD1_ENTRY = RESET_PASSWORD1_ENTRY = _('Password')
+PASSWORD2_ENTRY = RESET_PASSWORD2_ENTRY = _('Re-type Password')
+PASSWORD_HELP = _('The password must have a minimum of 8 characters and ' \
+                  'include one uppercase character and one number.')
+PASSWORD_MISMATCH = _('The passwords don\'t match, please double check ' \
+                      'and try entering them again.')
+PASSWORD_TOO_WEAK = _('The password is too weak.')
+REQUEST_PASSWORD_TOKEN_LABEL = _('To reset your %(app_name)s password,'
+                                 ' enter your email address below:')
+RESET_PASSWORD = _('Reset password')
+RESET_CODE_ENTRY = _('Reset code')
+RESET_EMAIL_ENTRY = _('Email address')
+SET_NEW_PASSWORD_LABEL = _('A password reset code has been sent to ' \
+                           '%(email)s.\nPlease enter the code below ' \
+                           'along with your new password.')
+SET_UP_ACCOUNT_CHOICE_BUTTON = _('I don\'t have an account yet - sign me up')
+SET_UP_ACCOUNT_BUTTON = _('Set up Account')
+SIGN_IN_BUTTON = _('Sign In')
+SUCCESS = _('The process finished successfully. Congratulations!')
+SURNAME_ENTRY = _('Surname')
+TC_BUTTON = _('Show Terms & Conditions')
+TC_NOT_ACCEPTED = _('Agreeing to the Ubuntu One Terms & Conditions is ' \
+                        'required to subscribe.')
+UNKNOWN_ERROR = _('There was an error when trying to complete the ' \
+                      'process. Please check the information and try again.')
+VERIFY_EMAIL_TITLE = _('Enter verification code')
+VERIFY_EMAIL_CONTENT = _('Check %(email)s for an email from'
+                         ' Ubuntu Single Sign On.'
+                         ' This message contains a verification code.'
+                         ' Enter the code in the field below and click OK'
+                         ' to complete creating your %(app_name)s account')
+VERIFY_EMAIL_LABEL = ('<b>%s</b>\n\n' % VERIFY_EMAIL_TITLE +
+                      VERIFY_EMAIL_CONTENT)
+YES_TO_TC = _('I agree with the %(app_name)s terms and conditions')
+YES_TO_UPDATES = _('Yes! Email me %(app_name)s tips and updates.')
+CAPTCHA_RELOAD_TOOLTIP = _('Reload')
+
+
+def get_data_dir():
+    """Build absolute path to  the 'data' directory."""
+    module = os.path.dirname(__file__)
+    result = os.path.abspath(os.path.join(module, os.pardir,
+                                          os.pardir, 'data'))
+    logger.debug('get_data_file: trying to load from %r (exists? %s)',
+                 result, os.path.exists(result))
+    if os.path.exists(result):
+        logger.info('get_data_file: returning data dir located at %r.', result)
+        return result
+
+    # no local data dir, looking within system data dirs
+    data_dirs = xdg.BaseDirectory.xdg_data_dirs
+    for path in data_dirs:
+        result = os.path.join(path, 'ubuntu-sso-client', 'data')
+        result = os.path.abspath(result)
+        logger.debug('get_data_file: trying to load from %r (exists? %s)',
+                     result, os.path.exists(result))
+        if os.path.exists(result):
+            logger.info('get_data_file: data dir located at %r.', result)
+            return result
+    else:
+        msg = 'get_data_file: can not build a valid data path. Giving up.' \
+              '__file__ is %r, data_dirs are %r'
+        logger.error(msg, __file__, data_dirs)
+
+
+def get_data_file(*args):
+    """Build absolute path to the path within the 'data' directory."""
+    return os.path.join(get_data_dir(), *args)
+
+
+def get_password_strength(password):
+    """Return the strenght of the password.
+
+    This function returns the strenght of the password so that ui elements
+    can show the user how good his password is. The logic used is the
+    following:
+
+    * 1 extra point for 4 chars passwords
+    * 1 extra point for 8 chars passwords
+    * 1 extra point for more than 11 chars passwords.
+    * 1 extra point for passwords with at least one number.
+    * 1 extra point for passwords for lwer and capital chars.
+    * 1 extra point for passwords with a special char.
+
+    A passwords starts with 0 and the extra points are added accordingly.
+    """
+    score = 0
+    if len(password) < 1:
+        return 0
+    if len(password) < 4:
+        score = 1
+    if len(password) >= 8:
+        score += 1
+    if len(password) >= 11:
+        score += 1
+    if re.search('\d+', password):
+        score += 1
+    if re.search('[a-z]', password) and re.search('[A-Z]', password):
+        score += 1
+    if re.search('.[!,@,#,$,%,^,&,*,?,_,~,-,£,(,)]', password):
+        score += 1
+    return score
+
+
+def is_min_required_password(password):
+    """Return if the password meets the minimun requirements."""
+    if (len(password) < 8 or
+        re.search('[A-Z]', password) is None or
+        re.search('\d+', password) is None):
+        return False
+    return True