Merge lp:~diegosarmentero/ubuntuone-windows-installer/installer-ui-style into lp:ubuntuone-windows-installer

[Diego Sarmentero]

Several improves in Windows Installer UI.
Rearrange buttons positions.
Fixing some imports issues involving credentials.

Several improves in Windows Installer UI.
Rearrange buttons positions.
Fixing some imports issues involving credentials.

[Roberto Alsina (ralsina)]

+1

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

There was a problem validating some authors of the branch. Authors must be either one of the listed Launchpad users, or a member of one of the listed teams on Launchpad.

Persons or Teams:

    contributor-agreement-canonical
    ubuntuone-hackers

Unaccepted Authors:

    Diego Sarmentero <email address hidden>

[Ubuntu One Auto Pilot (otto-pilot)]

There was a problem validating some authors of the branch. Authors must be either one of the listed Launchpad users, or a member of one of the listed teams on Launchpad.

Persons or Teams:

    contributor-agreement-canonical
    ubuntuone-hackers

Unaccepted Authors:

    Diego Sarmentero <email address hidden>

[Ubuntu One Auto Pilot (otto-pilot)]

There was a problem validating some authors of the branch. Authors must be either one of the listed Launchpad users, or a member of one of the listed teams on Launchpad.

Persons or Teams:

    contributor-agreement-canonical
    ubuntuone-hackers

Unaccepted Authors:

    Diego Sarmentero <email address hidden>
    Diego Sarmentero <email address hidden>

=== added file 'data/Ubuntu-B.ttf'
Binary files data/Ubuntu-B.ttf	1970-01-01 00:00:00 +0000 and data/Ubuntu-B.ttf	2011-07-28 18:40:32 +0000 differ
=== modified file 'data/qt/choose_sign_in.ui'
--- data/qt/choose_sign_in.ui	2011-07-13 03:14:18 +0000
+++ data/qt/choose_sign_in.ui	2011-07-28 18:40:32 +0000
@@ -15,6 +15,22 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Preferred</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>10</width>
+       <height>30</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
       <spacer name="horizontalSpacer_3">
@@ -77,6 +93,13 @@
    </item>
    <item>
     <widget class="QLabel" name="message_label">
+     <property name="font">
+      <font>
+       <pointsize>11</pointsize>
+       <weight>50</weight>
+       <bold>false</bold>
+      </font>
+     </property>
      <property name="text">
       <string>Ubuntu One has installed!</string>
      </property>
@@ -144,14 +167,14 @@
     </layout>
    </item>
    <item>
-    <spacer name="verticalSpacer">
+    <spacer name="verticalSpacer_2">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
-       <height>76</height>
+       <height>50</height>
       </size>
      </property>
     </spacer>

=== modified file 'data/qt/images.qrc'
--- data/qt/images.qrc	2011-07-13 03:14:18 +0000
+++ data/qt/images.qrc	2011-07-28 18:40:32 +0000
@@ -4,6 +4,7 @@
     <file>../password_hint_ok.png</file>
     <file>../password_hint_warning.png</file>
     <file>../Ubuntu-R.ttf</file>
+    <file>../Ubuntu-B.ttf</file>
     <file>ubuntuone.qss</file>
     <file>../progress_arrow_grey.png</file>
     <file>../u1_logo.png</file>

=== modified file 'data/qt/setup_account.ui'
--- data/qt/setup_account.ui	2011-07-22 18:53:04 +0000
+++ data/qt/setup_account.ui	2011-07-28 18:40:32 +0000
@@ -6,16 +6,19 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>631</width>
-    <height>527</height>
+    <width>569</width>
+    <height>521</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>WizardPage</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
    <item>
-    <layout class="QGridLayout" name="gridLayout" columnminimumwidth="1,250">
+    <layout class="QGridLayout" name="gridLayout" columnminimumwidth="300,250">
      <item row="0" column="0">
       <widget class="QLabel" name="password_info_label">
        <property name="sizePolicy">
@@ -33,23 +36,83 @@
       </widget>
      </item>
      <item row="1" column="0">
-      <widget class="QLabel" name="name_label">
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <property name="spacing">
+        <number>3</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="name_label">
+         <property name="font">
+          <font>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>name_label</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLineEdit" name="name_edit">
+         <property name="font">
+          <font>
+           <pointsize>11</pointsize>
+          </font>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item row="1" column="1">
+      <widget class="QLabel" name="name_assistance">
        <property name="text">
-        <string>If you can't read this then &lt;a href=&quot;example.com&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#dd4814;&quot;&gt;refresh&lt;/span&gt;&lt;/a&gt; this page&lt;/span&gt;</string>
+        <string>name_assistance</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+       </property>
+       <property name="indent">
+        <number>20</number>
        </property>
       </widget>
      </item>
      <item row="2" column="0">
-      <widget class="QLineEdit" name="name_edit">
-       <property name="placeholderText">
-        <string/>
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <property name="spacing">
+        <number>3</number>
        </property>
-      </widget>
+       <item>
+        <widget class="QLabel" name="email_label">
+         <property name="font">
+          <font>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>email_label</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLineEdit" name="email_edit">
+         <property name="font">
+          <font>
+           <pointsize>11</pointsize>
+          </font>
+         </property>
+         <property name="placeholderText">
+          <string/>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </item>
      <item row="2" column="1">
-      <widget class="QLabel" name="name_assistance">
+      <widget class="QLabel" name="email_assistance">
        <property name="text">
-        <string>If you can't read this then &lt;a href=&quot;example.com&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#dd4814;&quot;&gt;refresh&lt;/span&gt;&lt;/a&gt; this page&lt;/span&gt;</string>
+        <string>email_assistance</string>
        </property>
        <property name="indent">
         <number>20</number>
@@ -57,145 +120,187 @@
       </widget>
      </item>
      <item row="3" column="0">
-      <widget class="QLabel" name="email_label">
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <property name="spacing">
+        <number>3</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="confirm_email_label">
+         <property name="font">
+          <font>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>confirm_email_label</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLineEdit" name="confirm_email_edit">
+         <property name="font">
+          <font>
+           <pointsize>11</pointsize>
+          </font>
+         </property>
+         <property name="placeholderText">
+          <string/>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item row="3" column="1">
+      <widget class="QLabel" name="confirm_email_assistance">
        <property name="text">
-        <string>If you can't read this then &lt;a href=&quot;example.com&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#dd4814;&quot;&gt;refresh&lt;/span&gt;&lt;/a&gt; this page&lt;/span&gt;</string>
+        <string>confirm_email_assistance</string>
+       </property>
+       <property name="indent">
+        <number>20</number>
        </property>
       </widget>
      </item>
      <item row="4" column="0">
-      <widget class="QLineEdit" name="email_edit">
-       <property name="placeholderText">
-        <string/>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="1">
-      <widget class="QLabel" name="email_assistance">
-       <property name="text">
-        <string>If you can't read this then &lt;a href=&quot;example.com&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#dd4814;&quot;&gt;refresh&lt;/span&gt;&lt;/a&gt; this page&lt;/span&gt;</string>
-       </property>
-       <property name="indent">
-        <number>20</number>
-       </property>
-      </widget>
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <property name="spacing">
+        <number>3</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="password_label">
+         <property name="font">
+          <font>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>password_label</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLineEdit" name="password_edit">
+         <property name="font">
+          <font>
+           <pointsize>11</pointsize>
+          </font>
+         </property>
+         <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>
+      </layout>
      </item>
      <item row="5" column="0">
-      <widget class="QLabel" name="confirm_email_label">
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <property name="spacing">
+        <number>3</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="confirm_password_label">
+         <property name="font">
+          <font>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>confirm_password_label</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLineEdit" name="confirm_password_edit">
+         <property name="font">
+          <font>
+           <pointsize>11</pointsize>
+          </font>
+         </property>
+         <property name="echoMode">
+          <enum>QLineEdit::Password</enum>
+         </property>
+         <property name="placeholderText">
+          <string/>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item row="4" column="1" rowspan="2">
+      <widget class="QLabel" name="password_assistance">
        <property name="text">
-        <string>If you can't read this then &lt;a href=&quot;example.com&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#dd4814;&quot;&gt;refresh&lt;/span&gt;&lt;/a&gt; this page&lt;/span&gt;</string>
+        <string>password_assistance</string>
+       </property>
+       <property name="indent">
+        <number>20</number>
        </property>
       </widget>
      </item>
      <item row="6" column="0">
-      <widget class="QLineEdit" name="confirm_email_edit">
-       <property name="placeholderText">
-        <string/>
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <property name="spacing">
+        <number>3</number>
        </property>
-      </widget>
+       <item>
+        <widget class="QLabel" name="captcha_view">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>300</width>
+           <height>57</height>
+          </size>
+         </property>
+         <property name="styleSheet">
+          <string notr="true">background-color: white</string>
+         </property>
+         <property name="frameShape">
+          <enum>QFrame::Box</enum>
+         </property>
+         <property name="text">
+          <string>If you can't read this then &lt;a href=&quot;example.com&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#dd4814;&quot;&gt;refresh&lt;/span&gt;&lt;/a&gt; this page&lt;/span&gt;</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLineEdit" name="captcha_solution_edit">
+         <property name="font">
+          <font>
+           <pointsize>11</pointsize>
+          </font>
+         </property>
+         <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 row="6" column="1">
-      <widget class="QLabel" name="confirm_email_assistance">
-       <property name="text">
-        <string>If you can't read this then &lt;a href=&quot;example.com&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#dd4814;&quot;&gt;refresh&lt;/span&gt;&lt;/a&gt; this page&lt;/span&gt;</string>
-       </property>
-       <property name="indent">
-        <number>20</number>
-       </property>
-      </widget>
-     </item>
-     <item row="7" column="0">
-      <widget class="QLabel" name="password_label">
-       <property name="text">
-        <string>If you can't read this then &lt;a href=&quot;example.com&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#dd4814;&quot;&gt;refresh&lt;/span&gt;&lt;/a&gt; this page&lt;/span&gt;</string>
-       </property>
-      </widget>
-     </item>
-     <item row="8" column="0">
-      <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 row="9" column="0">
-      <widget class="QLabel" name="confirm_password_label">
-       <property name="text">
-        <string>If you can't read this then &lt;a href=&quot;example.com&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#dd4814;&quot;&gt;refresh&lt;/span&gt;&lt;/a&gt; this page&lt;/span&gt;</string>
-       </property>
-      </widget>
-     </item>
-     <item row="8" column="1" rowspan="3">
-      <widget class="QLabel" name="password_assistance">
-       <property name="text">
-        <string>If you can't read this then &lt;a href=&quot;example.com&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#dd4814;&quot;&gt;refresh&lt;/span&gt;&lt;/a&gt; this page&lt;/span&gt;</string>
-       </property>
-       <property name="indent">
-        <number>20</number>
-       </property>
-      </widget>
-     </item>
-     <item row="10" column="0">
-      <widget class="QLineEdit" name="confirm_password_edit">
-       <property name="echoMode">
-        <enum>QLineEdit::Password</enum>
-       </property>
-       <property name="placeholderText">
-        <string/>
-       </property>
-      </widget>
-     </item>
-     <item row="11" column="0">
-      <widget class="QLabel" name="captcha_view">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>300</width>
-         <height>57</height>
-        </size>
-       </property>
-       <property name="styleSheet">
-        <string notr="true">background-color: white</string>
-       </property>
-       <property name="frameShape">
-        <enum>QFrame::Box</enum>
-       </property>
-       <property name="text">
-        <string>If you can't read this then &lt;a href=&quot;example.com&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#dd4814;&quot;&gt;refresh&lt;/span&gt;&lt;/a&gt; this page&lt;/span&gt;</string>
-       </property>
-      </widget>
-     </item>
-     <item row="12" column="0" colspan="2">
-      <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>
-     <item row="11" column="1">
       <widget class="QLabel" name="refresh_label">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -256,9 +361,15 @@
        <property name="enabled">
         <bool>false</bool>
        </property>
+       <property name="styleSheet">
+        <string notr="true"/>
+       </property>
        <property name="text">
         <string>Set Up Account</string>
        </property>
+       <property name="DisabledState" stdset="0">
+        <bool>true</bool>
+       </property>
       </widget>
      </item>
     </layout>

=== modified file 'data/qt/sign_in.ui'
--- data/qt/sign_in.ui	2011-06-22 19:23:02 +0000
+++ data/qt/sign_in.ui	2011-07-28 18:40:32 +0000
@@ -46,6 +46,9 @@
      <property name="text">
       <string>Sign me in with my existing Ubuntu one account</string>
      </property>
+     <property name="default">
+      <bool>false</bool>
+     </property>
     </widget>
    </item>
    <item>

=== modified file 'data/qt/ubuntuone.qss'
--- data/qt/ubuntuone.qss	2011-07-15 22:59:41 +0000
+++ data/qt/ubuntuone.qss	2011-07-28 18:40:32 +0000
@@ -1,3 +1,8 @@
+QWidget{
+    font-family: "Ubuntu";
+    color: #333333;
+}
+
 QFrame#SideWidget {
     background-color: white;
     border-style: dotted;
@@ -19,7 +24,10 @@
 QLabel#password_assistance,
 QLabel#refresh_label{
     border-image: url(":/balloon_shape.png");
-    padding-right: 2px;
+}
+
+QLineEdit{
+    border: 1px solid #aea79f;
 }
 
 QLabel#install_label,
@@ -35,62 +43,82 @@
     border: none;
 }
 
-QPushButton[enabled="false"] {
-    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-        stop: 0 #fecfc2,stop: 1.0 #df4d1a);
+QPushButton{
     border-radius: 5px;
     border-style: solid;
     padding: 6px;
     padding-left: 20px;
     padding-right: 20px;
-    color: white;
-    border-color: #939389;
     border-width: 1px;
     height: 14px;
-    font-size: 12px;
-}
-
-QPushButton[enabled="true"] {
+}
+
+QPushButton[default="true"] {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+        stop: 0 #fe9e84,stop: 1.0 #dd4814);
+    color: white;
+    border-color: #999999;
+}
+
+QPushButton:hover[default="true"] {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+        stop: 0 #ffb19c,stop: 1.0 #dd4814);
+    color: white;
+    border-color: #999999;
+}
+
+QPushButton:pressed[default="true"] {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+        stop: 0 #b93f14,stop: 1.0 #dd4814);
+    color: white;
+    border-color: #999999;
+}
+
+QPushButton[default="false"] {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+        stop: 0 #ffffff,stop: 1.0 #e6e6e6);
+    color: #333333;
+    border-color: #999999;
+}
+
+QPushButton:hover[default="false"] {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+        stop: 0 #ffffff,stop: 1.0 #ededed);
+    color: #333333;
+    border-color: #999999;
+}
+
+QPushButton:pressed[default="false"] {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+        stop: 0 #d9d9d9,stop: 1.0 #fefefe);
+    color: #333333;
+    border-color: #999999;
+}
+
+QPushButton[DisabledState="true"] {
     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
         stop: 0 #eaeaea, stop: 1.0 #cacaca);
-    border-radius: 5px;
-    border-style: solid;
-    padding: 6px;
-    padding-left: 20px;
-    padding-right: 20px;
     color: #595959;
     border-color: #939389;
-    border-width: 1px;
-    height: 14px;
-    font-size: 12px;
-}
-
-QPushButton:hover {
-    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-        stop: 0 #feae99,stop: 1.0 #df4e1c);
-    border-radius: 5px;
-    border-style: solid;
-    padding: 6px;
-    color: white;
-    border-color: #939389;
-    border-width: 1px;
-    height: 12px;
-}
-
-QPushButton:pressed {
-    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-        stop: 0 #ba3f14,stop: 1.0 #db4714);
-    border-radius: 5px;
-    border-style: solid;
-    padding: 6px;
-    color: white;
-    border-color: #939389;
-    border-width: 1px;
-    height: 12px;
-}
-
-QWidget{
-    font-family: "Ubuntu";
-    color: #333333;
-    font-size: 12px;
+}
+
+QPushButton[DisabledState="false"] {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+        stop: 0 #fe9e84,stop: 1.0 #dd4814);
+    color: white;
+    border-color: #999999;
+}
+
+QFrame#frm_box {
+    background: #ffffff;
+    border-radius: 5px;
+    border-style: solid;
+    border-color: #939389;
+    border-width: 1px;
+    color: white;
+    min-height: 100px;
+}
+
+QFrame#frm_box > QLabel{
+    font-size: 24px;
 }

=== modified file 'data/win_install_img_placeholder.png'
Binary files data/win_install_img_placeholder.png	2011-07-13 03:14:18 +0000 and data/win_install_img_placeholder.png	2011-07-28 18:40:32 +0000 differ
=== modified file 'ubuntuone_installer/gui/qt/are_you_sure.py'
--- ubuntuone_installer/gui/qt/are_you_sure.py	2011-07-08 15:21:50 +0000
+++ ubuntuone_installer/gui/qt/are_you_sure.py	2011-07-28 18:40:32 +0000
@@ -1,47 +1,47 @@
-# -*- coding: utf-8 -*-
-
-# Authors: Roberto Alsina <[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/>.
-
-"""The "Are you sure" dialog."""
-
-import gettext
-
-from PyQt4 import QtGui
-
-from ubuntuone.clientdefs import APP_NAME
-
-from ubuntuone_installer.gui.qt.ui import are_you_sure_ui
-from ubuntuone_installer.gui import (
-    ARE_YOU_SURE_1,
-    ARE_YOU_SURE_2,
-)
-
-_ = gettext.gettext
-
-
-class AreYouSure(QtGui.QDialog):
-
-    """A 'Are you sure?' dialog."""
-
-    def __init__(self, *args, **kwargs):
-        super(AreYouSure, self).__init__(*args, **kwargs)
-        self.ui = are_you_sure_ui.Ui_Dialog()
-        self.ui.setupUi(self)
-        self.setWindowTitle(APP_NAME)
-        link = u'<a href="https://one.ubuntu.com">https://one.ubuntu.com</a>'
-        msg = (u"%s<p>%s" % (ARE_YOU_SURE_1, ARE_YOU_SURE_2)) % {"url": link}
-        self.ui.message_label.setText(msg)
+# -*- coding: utf-8 -*-
+
+# Authors: Roberto Alsina <[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/>.
+
+"""The "Are you sure" dialog."""
+
+import gettext
+
+from PyQt4 import QtGui
+
+from ubuntuone.platform.credentials import APP_NAME
+
+from ubuntuone_installer.gui.qt.ui import are_you_sure_ui
+from ubuntuone_installer.gui import (
+    ARE_YOU_SURE_1,
+    ARE_YOU_SURE_2,
+)
+
+_ = gettext.gettext
+
+
+class AreYouSure(QtGui.QDialog):
+
+    """A 'Are you sure?' dialog."""
+
+    def __init__(self, *args, **kwargs):
+        super(AreYouSure, self).__init__(*args, **kwargs)
+        self.ui = are_you_sure_ui.Ui_Dialog()
+        self.ui.setupUi(self)
+        self.setWindowTitle(APP_NAME)
+        link = u'<a href="https://one.ubuntu.com">https://one.ubuntu.com</a>'
+        msg = (u"%s<p>%s" % (ARE_YOU_SURE_1, ARE_YOU_SURE_2)) % {"url": link}
+        self.ui.message_label.setText(msg)

=== modified file 'ubuntuone_installer/gui/qt/embedded_sso.py'
--- ubuntuone_installer/gui/qt/embedded_sso.py	2011-07-15 20:38:58 +0000
+++ ubuntuone_installer/gui/qt/embedded_sso.py	2011-07-28 18:40:32 +0000
@@ -1,61 +1,61 @@
-# -*- coding: utf-8 -*-
-
-# Authors: Roberto Alsina <[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/>.
-
-"""The user interface for the Ubuntu One Installer's SSO client."""
-
-import ubuntu_sso.qt.gui as sso_gui
-
-from ubuntuone_installer.gui.qt.gui import MainWindow
-
-
-class UbuntuSSOClientGUI(object):
-    """A custom Client GUI for SSO."""
-    def __init__(self, app_name, tc_url, help_text,
-                 window_id=0, login_only=False):
-        """Create a new instance."""
-
-        # create the controller and the ui, then set the cb and call the show
-        # method so that we can work
-        self.controller = sso_gui.UbuntuSSOWizardController(
-            app_name,
-            user_cancellation_callback=self._user_cancellation_callback
-        )
-        self.view = MainWindow()
-
-        self.login_success_callback = lambda x, y: None
-        self.registration_success_callback = lambda x, y: None
-        self.user_cancellation_callback = lambda x: None
-
-        self.view.loginSuccess.connect(self._login_success_callback)
-        self.view.registrationSuccess.connect(
-            self._registration_success_callback)
-        self.view.userCancellation.connect(self._user_cancellation_callback)
-
-        self.view.show()
-
-    def _login_success_callback(self, app_name, email):
-        """Call the real callback, set by the Credentials object"""
-        self.login_success_callback(str(app_name), str(email))
-
-    def _registration_success_callback(self, app_name, email):
-        """Call the real callback, set by the Credentials object"""
-        self.registration_success_callback(str(app_name), str(email))
-
-    def _user_cancellation_callback(self, app_name):
-        """Call the real callback, set by the Credentials object"""
-        self.user_cancellation_callback(str(app_name))
+# -*- coding: utf-8 -*-
+
+# Authors: Roberto Alsina <[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/>.
+
+"""The user interface for the Ubuntu One Installer's SSO client."""
+
+import ubuntu_sso.qt.gui as sso_gui
+
+from ubuntuone_installer.gui.qt.gui import MainWindow
+
+
+class UbuntuSSOClientGUI(object):
+    """A custom Client GUI for SSO."""
+
+    def __init__(self, app_name, tc_url, help_text,
+                 window_id=0, login_only=False):
+        """Create a new instance."""
+
+        # create the controller and the ui, then set the cb and call the show
+        # method so that we can work
+        self.controller = sso_gui.UbuntuSSOWizardController(
+            app_name,
+            user_cancellation_callback=self._user_cancellation_callback)
+        self.view = MainWindow()
+
+        self.login_success_callback = lambda x, y: None
+        self.registration_success_callback = lambda x, y: None
+        self.user_cancellation_callback = lambda x: None
+
+        self.view.loginSuccess.connect(self._login_success_callback)
+        self.view.registrationSuccess.connect(
+            self._registration_success_callback)
+        self.view.userCancellation.connect(self._user_cancellation_callback)
+
+        self.view.show()
+
+    def _login_success_callback(self, app_name, email):
+        """Call the real callback, set by the Credentials object"""
+        self.login_success_callback(str(app_name), str(email))
+
+    def _registration_success_callback(self, app_name, email):
+        """Call the real callback, set by the Credentials object"""
+        self.registration_success_callback(str(app_name), str(email))
+
+    def _user_cancellation_callback(self, app_name):
+        """Call the real callback, set by the Credentials object"""
+        self.user_cancellation_callback(str(app_name))

=== modified file 'ubuntuone_installer/gui/qt/gui.py'
--- ubuntuone_installer/gui/qt/gui.py	2011-07-22 19:08:25 +0000
+++ ubuntuone_installer/gui/qt/gui.py	2011-07-28 18:40:32 +0000
@@ -54,9 +54,8 @@
 
 from ubuntuone.controlpanel.gui.qt.loadingoverlay import LoadingOverlay
 
-from ubuntuone.credentials import (
+from ubuntuone.platform.credentials import (
     APP_NAME,
-    DESCRIPTION,
     TC_URL,
 )
 
@@ -124,12 +123,11 @@
 
         self.wizard().setButtonLayout([
             QtGui.QWizard.CancelButton,
+            QtGui.QWizard.BackButton,
             QtGui.QWizard.Stretch,
             QtGui.QWizard.CustomButton1,
-            QtGui.QWizard.BackButton,
             QtGui.QWizard.NextButton,
-            QtGui.QWizard.FinishButton,
-            ])
+            QtGui.QWizard.FinishButton])
 
     def print_document(self, button_id):
         """Print the document displayed in textBrowser."""
@@ -170,8 +168,14 @@
         # without cancel
         self.wizard().setButtonLayout([
             QtGui.QWizard.Stretch,
-            QtGui.QWizard.NextButton,
-            ])
+            QtGui.QWizard.NextButton])
+
+        # Set existing_account_button as default when the page is shown.
+        self.ui.existing_account_button.setDefault(True)
+        self.ui.existing_account_button.style().unpolish(
+            self.ui.existing_account_button)
+        self.ui.existing_account_button.style().polish(
+            self.ui.existing_account_button)
 
     def nextId(self):
         """Provide the next id."""
@@ -203,10 +207,15 @@
         # Layout without custom button 1,
         # without finish button
         self.wizard().setButtonLayout([
-            QtGui.QWizard.CancelButton,
-            QtGui.QWizard.Stretch,
             QtGui.QWizard.BackButton,
-            ])
+            QtGui.QWizard.Stretch])
+
+        # Set sign_in_button as default when the page is shown.
+        self.ui.sign_in_button.setDefault(True)
+        self.ui.sign_in_button.style().unpolish(
+            self.ui.sign_in_button)
+        self.ui.sign_in_button.style().polish(
+            self.ui.sign_in_button)
 
 
 class SuccessPage(QtGui.QWizardPage):
@@ -257,14 +266,20 @@
         # Layout without custom button 1,
         self.wizard().setButtonLayout([
             QtGui.QWizard.Stretch,
-            QtGui.QWizard.FinishButton,
-            ])
+            QtGui.QWizard.FinishButton])
         if self.field("sync_now").toBool() \
             or self.field("sync_custom").toBool():
             self.ui.progressContainer.setVisible(True)
         else:
             self.ui.progressContainer.setVisible(False)
 
+        # Set FinishButton as default when the page is shown.
+        self.wizard().button(QtGui.QWizard.FinishButton).setDefault(True)
+        self.wizard().button(QtGui.QWizard.FinishButton).style().unpolish(
+            self.wizard().button(QtGui.QWizard.FinishButton))
+        self.wizard().button(QtGui.QWizard.FinishButton).style().polish(
+            self.wizard().button(QtGui.QWizard.FinishButton))
+
 
 class MainWindow(QtGui.QWizard):
 
@@ -296,9 +311,10 @@
         self.help_text = ""
 
         super(MainWindow, self).__init__()
+
         self.setWindowTitle(APP_NAME)
         self.setMinimumHeight(630)
-        self.setMinimumWidth(800)
+        self.setMinimumWidth(820)
         self.setTitleFormat(QtCore.Qt.RichText)
         self.setWizardStyle(self.ModernStyle)
         self.close_callback = close_callback
@@ -394,6 +410,18 @@
         self.CONGRATULATIONS_PAGE = self.addPage(CongratulationsPage())
 
         self.currentIdChanged.connect(self.on_currentIdChanged)
+        # Set Wizard buttons style
+        self.button(QtGui.QWizard.NextButton).setDefault(True)
+
+        # Set Application Style Sheet
+        app = QtGui.QApplication.instance()
+        qss_file = QtCore.QFile(":/ubuntuone.qss")
+        qss_file.open(QtCore.QFile.ReadOnly)
+        stylesheet = QtCore.QLatin1String(qss_file.readAll())
+        app.setStyleSheet(stylesheet)
+        # Apply font to the entire application
+        QtGui.QFontDatabase.addApplicationFont(':/Ubuntu-R.ttf')
+        QtGui.QFontDatabase.addApplicationFont(':/Ubuntu-B.ttf')
 
     # Invalid name "closeEvent"
     # pylint: disable=C0103
@@ -404,6 +432,7 @@
         QtGui.QMessageBox.critical(*args, **kwargs)
 
     def next(self):
+        """Show the next page to display."""
         self.overlay.hide()
         super(MainWindow, self).next()
 
@@ -451,3 +480,11 @@
             self.sideWidget().set_stage(3)
         else:
             self.sideWidget().set_stage(4)
+
+    # Invalid name "resizeEvent"
+    # pylint: disable=C0103
+
+    def resizeEvent(self, event):
+        """Resize the overlay to fit all the widget."""
+        QtGui.QWizard.resizeEvent(self, event)
+        self.overlay.resize(event.size())

=== modified file 'ubuntuone_installer/gui/qt/main/tests/test_main.py'
--- ubuntuone_installer/gui/qt/main/tests/test_main.py	2011-07-18 18:32:27 +0000
+++ ubuntuone_installer/gui/qt/main/tests/test_main.py	2011-07-28 18:40:32 +0000
@@ -24,7 +24,7 @@
 
 # pylint: disable=W0212
 
-from ubuntuone.credentials import (
+from ubuntuone.platform.credentials import (
     APP_NAME,
     DESCRIPTION,
     TC_URL,

=== modified file 'ubuntuone_installer/gui/qt/main/windows.py'
--- ubuntuone_installer/gui/qt/main/windows.py	2011-07-22 16:32:35 +0000
+++ ubuntuone_installer/gui/qt/main/windows.py	2011-07-28 18:40:32 +0000
@@ -1,52 +1,52 @@
-# -*- coding: utf-8 -*-
-
-# Authors: 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/>.
-"""Reactor installation for windows."""
-
-# pylint: disable=E1101, F0401, W0404
-
-from twisted.internet.defer import inlineCallbacks
-from ubuntu_sso.main.windows import UbuntuSSOClient
-
-from ubuntuone.credentials import (
-    APP_NAME,
-    DESCRIPTION,
-    TC_URL,
-)
-
-
-@inlineCallbacks
-def main():
-    """Perform a client request to be logged in."""
-    client = UbuntuSSOClient()
-    client = yield client.connect()
-
-    @inlineCallbacks
-    def stop(*args):
-        """End the process."""
-        from twisted.internet import reactor
-        yield client.sso_cred.unregister_to_signals()
-        reactor.stop()
-
-    client.sso_cred.on_credentials_found_cb = stop
-    client.sso_cred.on_authorization_denied_cb = stop
-    client.sso_cred.on_credentials_error_cb = stop
-    yield client.sso_cred.register_to_signals()
-    yield client.sso_cred.login_or_register_to_get_credentials(APP_NAME,
-        TC_URL,
-        DESCRIPTION, 0,
-        ui_module="ubuntuone_installer.gui.qt.embedded_sso")
+# -*- coding: utf-8 -*-
+
+# Authors: 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/>.
+"""Reactor installation for windows."""
+
+# pylint: disable=E1101, F0401, W0404
+
+from twisted.internet.defer import inlineCallbacks
+from ubuntu_sso.main.windows import UbuntuSSOClient
+
+from ubuntuone.platform.credentials import (
+    APP_NAME,
+    DESCRIPTION,
+    TC_URL,
+)
+
+
+@inlineCallbacks
+def main():
+    """Perform a client request to be logged in."""
+    client = UbuntuSSOClient()
+    client = yield client.connect()
+
+    @inlineCallbacks
+    def stop(*args):
+        """End the process."""
+        from twisted.internet import reactor
+        yield client.sso_cred.unregister_to_signals()
+        reactor.stop()
+
+    client.sso_cred.on_credentials_found_cb = stop
+    client.sso_cred.on_authorization_denied_cb = stop
+    client.sso_cred.on_credentials_error_cb = stop
+    yield client.sso_cred.register_to_signals()
+    yield client.sso_cred.login_or_register_to_get_credentials(APP_NAME,
+        TC_URL,
+        DESCRIPTION, 0,
+        ui_module="ubuntuone_installer.gui.qt.embedded_sso")

=== modified file 'ubuntuone_installer/gui/qt/setup_account.py'
--- ubuntuone_installer/gui/qt/setup_account.py	2011-07-15 22:59:41 +0000
+++ ubuntuone_installer/gui/qt/setup_account.py	2011-07-28 18:40:32 +0000
@@ -22,6 +22,7 @@
 import re
 
 from PyQt4 import QtGui
+from PyQt4.QtCore import Qt
 
 from ubuntu_sso.qt import gui as sso_gui
 
@@ -45,6 +46,9 @@
 
     """Customized Setup Account page for SSO"""
 
+    # Invalid name "initializePage"
+    # pylint: disable=C0103
+
     def initializePage(self):
         """Setup UI details."""
         # We need to override some texts from SSO
@@ -67,10 +71,8 @@
 
         # Button setup
         self.wizard().setButtonLayout([
-            QtGui.QWizard.Stretch,
             QtGui.QWizard.BackButton,
-            QtGui.QWizard.CancelButton,
-            ])
+            QtGui.QWizard.Stretch])
 
         self.ui.name_edit.textEdited.connect(self.name_assistance)
         self.name_assistance()
@@ -84,6 +86,8 @@
         self.ui.confirm_password_edit.textEdited.connect(
             self.password_assistance)
         self.password_assistance()
+        self.ui.terms_checkbox.stateChanged.connect(
+            self.set_button_setup_account_property)
 
     def name_assistance(self):
         """Show help for the name field."""
@@ -142,6 +146,22 @@
 
         self.ui.password_assistance.setText("<br>".join(label_text))
 
+    def set_button_setup_account_property(self, state):
+        """Change the set_up_button disable property and reapply the style."""
+        self.ui.set_up_button.setProperty("DisabledState",
+            state == Qt.Unchecked)
+        self.ui.set_up_button.style().unpolish(self.ui.set_up_button)
+        self.ui.set_up_button.style().polish(self.ui.set_up_button)
+
+    def showEvent(self, event):
+        """Set set_up_button as default button when the page is shown."""
+        # This method should stays here because if we move it to initializePage
+        # set_up_button won't take the proper style for hover and press
+        self.ui.set_up_button.setDefault(True)
+        self.ui.set_up_button.setProperty("DisabledState", True)
+        self.ui.set_up_button.style().unpolish(self.ui.set_up_button)
+        self.ui.set_up_button.style().polish(self.ui.set_up_button)
+
 
 def is_min_required_password(password):
     """Return if the password meets the minimum requirements."""

=== modified file 'ubuntuone_installer/gui/qt/tests/test_are_you_sure.py'
--- ubuntuone_installer/gui/qt/tests/test_are_you_sure.py	2011-07-08 18:50:52 +0000
+++ ubuntuone_installer/gui/qt/tests/test_are_you_sure.py	2011-07-28 18:40:32 +0000
@@ -1,47 +1,47 @@
-# -*- coding: utf-8 -*-
-
-# Authors: Roberto Alsina <[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/>.
-
-"""Tests for the Are you Sure dialog."""
-
-from ubuntuone.clientdefs import APP_NAME
-
-from ubuntuone_installer.gui.qt.are_you_sure import AreYouSure
-from ubuntuone_installer.gui.qt.tests import BaseTestCase
-from ubuntuone_installer.gui import (
-    ARE_YOU_SURE_1,
-    ARE_YOU_SURE_2,
-)
-
-
-class AreYouSureTestCase(BaseTestCase):
-
-    """Test the are you sure dialog."""
-
-    class_ui = AreYouSure
-
-    def test_title(self):
-        """Check the window title."""
-        self.assertEqual(self.ui.windowTitle(), APP_NAME)
-        self.assertEqual(self.ui.windowTitle(), APP_NAME)
-
-    def test_msg_label(self):
-        """Check the message label text."""
-        link = '<a href="https://one.ubuntu.com">https://one.ubuntu.com</a>'
-        self.assertEqual(
-            (u"%s<p>%s" % (ARE_YOU_SURE_1, ARE_YOU_SURE_2)) % {"url": link},
-            unicode(self.ui.ui.message_label.text()))
+# -*- coding: utf-8 -*-
+
+# Authors: Roberto Alsina <[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/>.
+
+"""Tests for the Are you Sure dialog."""
+
+from ubuntuone.platform.credentials import APP_NAME
+
+from ubuntuone_installer.gui.qt.are_you_sure import AreYouSure
+from ubuntuone_installer.gui.qt.tests import BaseTestCase
+from ubuntuone_installer.gui import (
+    ARE_YOU_SURE_1,
+    ARE_YOU_SURE_2,
+)
+
+
+class AreYouSureTestCase(BaseTestCase):
+
+    """Test the are you sure dialog."""
+
+    class_ui = AreYouSure
+
+    def test_title(self):
+        """Check the window title."""
+        self.assertEqual(self.ui.windowTitle(), APP_NAME)
+        self.assertEqual(self.ui.windowTitle(), APP_NAME)
+
+    def test_msg_label(self):
+        """Check the message label text."""
+        link = '<a href="https://one.ubuntu.com">https://one.ubuntu.com</a>'
+        self.assertEqual(
+            (u"%s<p>%s" % (ARE_YOU_SURE_1, ARE_YOU_SURE_2)) % {"url": link},
+            unicode(self.ui.ui.message_label.text()))

=== modified file 'ubuntuone_installer/gui/qt/tests/test_gui.py'
--- ubuntuone_installer/gui/qt/tests/test_gui.py	2011-07-22 18:53:04 +0000
+++ ubuntuone_installer/gui/qt/tests/test_gui.py	2011-07-28 18:40:32 +0000
@@ -26,7 +26,7 @@
 
 from PyQt4 import QtCore
 
-from ubuntuone.credentials import (
+from ubuntuone.platform.credentials import (
     APP_NAME,
     TC_URL,
 )

=== modified file 'ubuntuone_installer/gui/qt/tos.py'
--- ubuntuone_installer/gui/qt/tos.py	2011-07-07 20:32:17 +0000
+++ ubuntuone_installer/gui/qt/tos.py	2011-07-28 18:40:32 +0000
@@ -1,66 +1,64 @@
-# -*- coding: utf-8 -*-
-
-# Authors: Roberto Alsina <[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/>.
-
-"""Widget to view the Terms Of Service."""
-
-import gettext
-
-from PyQt4 import QtGui
-
-import ubuntu_sso.qt.gui as sso_gui
-
-_ = gettext.gettext
-
-
-class TosPage(sso_gui.TosPage):
-
-    """Page to display the Terms of Service."""
-
-    # initializePage is inherited
-    # pylint: disable=C0103
-    def initializePage(self):
-        """Setup UI details."""
-        # Set the right texts and connections for buttons
-        self.setButtonText(QtGui.QWizard.NextButton, _("Agree && Install"))
-        self.setButtonText(QtGui.QWizard.CancelButton,
-            _("Disagree && Cancel"))
-        self.setButtonText(QtGui.QWizard.CustomButton1, _("&Print"))
-
-        # This is just to catch an exception thrown when nothing
-        # is connected to the signal. It's not an exceptional
-        # condition at all.
-        try:
-            self.wizard().customButtonClicked.disconnect()
-        except TypeError:
-            pass
-
-        self.wizard().customButtonClicked.connect(self.print_document)
-
-        self.wizard().setButtonLayout([
-            QtGui.QWizard.CustomButton1,
-            QtGui.QWizard.Stretch,
-            QtGui.QWizard.CancelButton,
-            QtGui.QWizard.BackButton,
-            ])
-
-    def print_document(self, button_id):
-        """Print the document displayed in textBrowser."""
-        if button_id == QtGui.QWizard.CustomButton1:
-            previewer = QtGui.QPrintPreviewDialog(
-                paintRequested=self.ui.terms_webkit.print_)
-            previewer.exec_()
+# -*- coding: utf-8 -*-
+
+# Authors: Roberto Alsina <[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/>.
+
+"""Widget to view the Terms Of Service."""
+
+import gettext
+
+from PyQt4 import QtGui
+
+import ubuntu_sso.qt.gui as sso_gui
+
+_ = gettext.gettext
+
+
+class TosPage(sso_gui.TosPage):
+
+    """Page to display the Terms of Service."""
+
+    # initializePage is inherited
+    # pylint: disable=C0103
+    def initializePage(self):
+        """Setup UI details."""
+        # Set the right texts and connections for buttons
+        self.setButtonText(QtGui.QWizard.NextButton, _("Agree && Install"))
+        self.setButtonText(QtGui.QWizard.CancelButton,
+            _("Disagree && Cancel"))
+        self.setButtonText(QtGui.QWizard.CustomButton1, _("&Print"))
+
+        # This is just to catch an exception thrown when nothing
+        # is connected to the signal. It's not an exceptional
+        # condition at all.
+        try:
+            self.wizard().customButtonClicked.disconnect()
+        except TypeError:
+            pass
+
+        self.wizard().customButtonClicked.connect(self.print_document)
+
+        self.wizard().setButtonLayout([
+            QtGui.QWizard.CustomButton1,
+            QtGui.QWizard.BackButton,
+            QtGui.QWizard.Stretch])
+
+    def print_document(self, button_id):
+        """Print the document displayed in textBrowser."""
+        if button_id == QtGui.QWizard.CustomButton1:
+            previewer = QtGui.QPrintPreviewDialog(
+                paintRequested=self.ui.terms_webkit.print_)
+            previewer.exec_()

=== modified file 'ubuntuone_installer/logger.py'
--- ubuntuone_installer/logger.py	2011-06-21 19:27:43 +0000
+++ ubuntuone_installer/logger.py	2011-07-28 18:40:32 +0000
@@ -26,7 +26,8 @@
 from logging.handlers import RotatingFileHandler
 
 # pylint: disable=F0401,E0611
-from ubuntuone.logger import LOGFOLDER, LOGBACKUP, basic_formatter
+from ubuntuone.logger import LOGBACKUP, basic_formatter
+from ubuntuone.platform.xdg_base_directory import ubuntuone_log_dir
 
 
 if os.environ.get('DEBUG'):
@@ -35,7 +36,8 @@
     # Only log this level and above
     LOG_LEVEL = logging.DEBUG  # before final release, switch to INFO
 
-MAIN_HANDLER = RotatingFileHandler(os.path.join(LOGFOLDER, 'installer.log'),
+FILE_NAME = os.path.join(ubuntuone_log_dir, 'installer.log')
+MAIN_HANDLER = RotatingFileHandler(FILE_NAME,
                                    maxBytes=1048576,
                                    backupCount=LOGBACKUP)
 MAIN_HANDLER.setFormatter(basic_formatter)