Merge lp:~nataliabidart/ubuntuone-windows-installer/stable-3-0-update-2.99.92 into lp:ubuntuone-windows-installer/stable-3-0

[Natalia Bidart]

- Updating from trunk up to revno 110:

[ Natalia B. Bidart <email address hidden> ]
  - Adding missing setup.py.
  - Removing all the deprecated and unused code, since it was either replaced
    or moved to another project.

[ Brian Curtin <email address hidden> ]
  - Added --with-icon to all installer commands and shortcuts to ensure
    Ubuntu One resides in the system tray on Windows.
  - Cleanup windows build, get rid of windows-installer,
    build all required binaries.

[dobey (dobey)]

+ version='3.1',

Wrong version.

review: Needs Fixing

[Natalia Bidart (nataliabidart)]

> + version='3.1',
>
> Wrong version.

Fixed!

[lp:~nataliabidart/ubuntuone-windows-installer/stable-3-0-update-2.99.92]

105. By Natalia Bidart on 2012-04-06

Restoring stable-3-0 version.

[dobey (dobey)]

review: Approve

=== removed file '.bzrignore'
--- .bzrignore	2011-06-21 16:17:47 +0000
+++ .bzrignore	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-_trial_temp
-*.service
-MANIFEST
-build/
-dist/
-po/ubuntuone-installer.pot
-ubuntuone_installer/gui/qt/ui/*_ui.py
-ubuntuone_installer/gui/qt/ui/*_rc.py
-qtreactor/

=== removed directory 'bin'
=== removed file 'bin/ubuntuone-installer-qt'
--- bin/ubuntuone-installer-qt	2011-09-14 14:12:02 +0000
+++ bin/ubuntuone-installer-qt	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-
-# Authors: Natalia B Bidart <[e-mail]>
-#          Eric Casteleijn <[e-mail]>
-#          Roberto Alsina <[e-mail]>
-#
-# Copyright 2010 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/>.
-"""Execute the graphical interface for the Ubuntu One installer."""
-
-# Invalid name "ubuntuone-installer-qt", pylint: disable=C0103
-
-import gettext
-import sys
-
-from optparse import OptionParser
-
-from ubuntuone_installer import TRANSLATION_DOMAIN
-
-gettext.textdomain(TRANSLATION_DOMAIN)
-# import the GUI after the translation domain has been set
-from ubuntuone_installer.gui.qt import main
-
-
-def parser_options():
-    """Parse command line parameters."""
-    usage = "Usage: %prog [option]"
-    result = OptionParser(usage=usage)
-    result.add_option("-i", "--installer", dest="installer",
-        action="store_true",
-        default=False, help="To be used by the installer: "
-        "Show license page, offer uninstall on cancel.")
-    return result
-
-
-if __name__ == "__main__":
-    parser = parser_options()
-    (options, args) = parser.parse_args(sys.argv)
-    main.main(installing=options.installer)

=== removed directory 'data'
=== removed file 'data/Ubuntu-B.ttf'
Binary files data/Ubuntu-B.ttf	2011-07-27 14:53:56 +0000 and data/Ubuntu-B.ttf	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/Ubuntu-R.ttf'
Binary files data/Ubuntu-R.ttf	2011-07-12 03:24:48 +0000 and data/Ubuntu-R.ttf	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/balloon_shape.png'
Binary files data/balloon_shape.png	2011-07-13 03:14:18 +0000 and data/balloon_shape.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/folder.png'
Binary files data/folder.png	2011-08-08 21:48:11 +0000 and data/folder.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/password_hint_ok.png'
Binary files data/password_hint_ok.png	2011-07-13 03:14:18 +0000 and data/password_hint_ok.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/password_hint_warning.png'
Binary files data/password_hint_warning.png	2011-07-13 03:14:18 +0000 and data/password_hint_warning.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/progress_arrow_grey.png'
Binary files data/progress_arrow_grey.png	2011-07-12 03:24:48 +0000 and data/progress_arrow_grey.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/progress_arrow_orange.png'
Binary files data/progress_arrow_orange.png	2011-07-12 03:24:48 +0000 and data/progress_arrow_orange.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/progress_finish_grey.png'
Binary files data/progress_finish_grey.png	2011-07-12 03:24:48 +0000 and data/progress_finish_grey.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/progress_finish_orange.png'
Binary files data/progress_finish_orange.png	2011-07-12 03:24:48 +0000 and data/progress_finish_orange.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/progress_tick.png'
Binary files data/progress_tick.png	2011-07-12 03:24:48 +0000 and data/progress_tick.png	1970-01-01 00:00:00 +0000 differ
=== removed directory 'data/qt'
=== removed file 'data/qt/are_you_sure.ui'
--- data/qt/are_you_sure.ui	2011-09-05 17:53:44 +0000
+++ data/qt/are_you_sure.ui	1970-01-01 00:00:00 +0000
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Dialog</class>
- <widget class="QDialog" name="Dialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>386</width>
-    <height>196</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Dialog</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>Are you sure you want to cancel setting up Ubuntu One?</string>
-     </property>
-     <property name="textFormat">
-      <enum>Qt::PlainText</enum>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="message_label">
-     <property name="text">
-      <string>PLACEHOLDER TEXT</string>
-     </property>
-     <property name="textFormat">
-      <enum>Qt::AutoText</enum>
-     </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
-     <property name="openExternalLinks">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <spacer name="verticalSpacer">
-     <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">
-     <item>
-      <spacer name="horizontalSpacer">
-       <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="pushButton">
-       <property name="text">
-        <string>Yes, I want to cancel</string>
-       </property>
-       <property name="autoDefault">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_2">
-       <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="pushButton_2">
-       <property name="text">
-        <string>No, continue setting up</string>
-       </property>
-       <property name="default">
-        <bool>true</bool>
-       </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>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections>
-  <connection>
-   <sender>pushButton_2</sender>
-   <signal>clicked()</signal>
-   <receiver>Dialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>272</x>
-     <y>174</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>330</x>
-     <y>129</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>pushButton</sender>
-   <signal>clicked()</signal>
-   <receiver>Dialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>118</x>
-     <y>167</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>163</x>
-     <y>122</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>

=== removed file 'data/qt/choose_sign_in.ui'
--- data/qt/choose_sign_in.ui	2011-09-02 12:58:29 +0000
+++ data/qt/choose_sign_in.ui	1970-01-01 00:00:00 +0000
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ChooseSignInPage</class>
- <widget class="QWizardPage" name="ChooseSignInPage">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>432</width>
-    <height>387</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>WizardPage</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <item>
-      <widget class="QLabel" name="image_label">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>400</width>
-         <height>150</height>
-        </size>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="textFormat">
-        <enum>Qt::PlainText</enum>
-       </property>
-       <property name="pixmap">
-        <pixmap resource="images.qrc">:/win_installer_graphic.png</pixmap>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignCenter</set>
-       </property>
-       <property name="wordWrap">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </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>Congratulations, Ubuntu One is installed!</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <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>30</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <spacer name="horizontalSpacer_2">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>20</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <layout class="QVBoxLayout" name="verticalLayout">
-       <item>
-        <widget class="QPushButton" name="existing_account_button">
-         <property name="text">
-          <string/>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="setup_account_button">
-         <property name="text">
-          <string/>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="cancel_button">
-         <property name="text">
-          <string/>
-         </property>
-        </widget>
-       </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>20</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </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>50</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-  </layout>
- </widget>
- <resources>
-  <include location="images.qrc"/>
- </resources>
- <connections/>
-</ui>

=== removed file 'data/qt/congratulations.ui'
--- data/qt/congratulations.ui	2011-11-17 20:05:33 +0000
+++ data/qt/congratulations.ui	1970-01-01 00:00:00 +0000
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Form</class>
- <widget class="QWidget" name="Form">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>622</width>
-    <height>362</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
-   <property name="spacing">
-    <number>24</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <item>
-      <spacer name="horizontalSpacer">
-       <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="QLabel" name="image_label">
-       <property name="text">
-        <string/>
-       </property>
-       <property name="pixmap">
-        <pixmap resource="images.qrc">:/win_installer_graphic.png</pixmap>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_2">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QLabel" name="label_3">
-     <property name="text">
-      <string>Ubuntu One is installed, set up and is ready to go!</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QWidget" name="progressContainer" native="true">
-     <property name="layoutDirection">
-      <enum>Qt::RightToLeft</enum>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout">
-      <property name="spacing">
-       <number>0</number>
-      </property>
-      <property name="margin">
-       <number>0</number>
-      </property>
-      <item>
-       <widget class="QLabel" name="label_4">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <layout class="QVBoxLayout" name="verticalLayout">
-        <item>
-         <widget class="QLabel" name="label_5">
-          <property name="font">
-           <font>
-            <weight>75</weight>
-            <bold>true</bold>
-           </font>
-          </property>
-          <property name="text">
-           <string>Sync in progress...</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLabel" name="label_6">
-          <property name="text">
-           <string>Your selected folders have started to sync in the background, launch the dashboard to get more information about the sync in progress.</string>
-          </property>
-          <property name="wordWrap">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <spacer name="verticalSpacer">
-     <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>
- </widget>
- <resources>
-  <include location="images.qrc"/>
- </resources>
- <connections/>
-</ui>

=== removed file 'data/qt/folders.ui'
--- data/qt/folders.ui	2011-09-08 02:33:23 +0000
+++ data/qt/folders.ui	1970-01-01 00:00:00 +0000
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Form</class>
- <widget class="QWidget" name="Form">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>480</width>
-    <height>374</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <spacer name="horizontalSpacer">
-       <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="check_settings_button">
-       <property name="text">
-        <string>Check settings</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_2">
-       <property name="orientation">
-        <enum>Qt::Horizontal</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>

=== removed file 'data/qt/images.qrc'
--- data/qt/images.qrc	2011-08-08 21:48:11 +0000
+++ data/qt/images.qrc	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-<RCC>
-  <qresource prefix="/">
-    <file>../balloon_shape.png</file>
-    <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>
-    <file>../progress_arrow_orange.png</file>
-    <file>../progress_finish_grey.png</file>
-    <file>../progress_finish_orange.png</file>
-    <file>../progress_tick.png</file>
-    <file>../u1icon.png</file>
-    <file>../ubuntu_one_favicon.png</file>
-    <file>../win_installer_graphic.png</file>
-    <file>../folder.png</file>
-  </qresource>
-</RCC>

=== removed file 'data/qt/license.ui'
--- data/qt/license.ui	2011-09-07 11:30:30 +0000
+++ data/qt/license.ui	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Form</class>
- <widget class="QWidget" name="Form">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>300</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QTextBrowser" name="textBrowser">
-     <property name="openExternalLinks">
-      <bool>true</bool>
-     </property>
-     <property name="openLinks">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>

=== removed file 'data/qt/local_folders.ui'
--- data/qt/local_folders.ui	2011-09-08 02:33:23 +0000
+++ data/qt/local_folders.ui	1970-01-01 00:00:00 +0000
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Form</class>
- <widget class="QWidget" name="Form">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>519</width>
-    <height>536</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>Ok! Now it's time to choose which folder sync to the cloud from this computer.
-We started by suggesting a few.</string>
-     </property>
-     <property name="textFormat">
-      <enum>Qt::PlainText</enum>
-     </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QTreeWidget" name="folder_list">
-     <property name="indentation">
-      <number>0</number>
-     </property>
-     <property name="rootIsDecorated">
-      <bool>false</bool>
-     </property>
-     <property name="uniformRowHeights">
-      <bool>true</bool>
-     </property>
-     <property name="allColumnsShowFocus">
-      <bool>true</bool>
-     </property>
-     <attribute name="headerStretchLastSection">
-      <bool>false</bool>
-     </attribute>
-     <column>
-      <property name="text">
-       <string>Sync these folders on my computer</string>
-      </property>
-     </column>
-     <column>
-      <property name="text">
-       <string>Space (Total)</string>
-      </property>
-     </column>
-    </widget>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_3">
-     <item>
-      <spacer name="horizontalSpacer_4">
-       <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="add_folder_button">
-       <property name="text">
-        <string>Add a folder from this computer</string>
-       </property>
-       <property name="DisabledState" stdset="0">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_5">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QFrame" name="offer_frame">
-     <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout">
-      <property name="leftMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>0</number>
-      </property>
-      <item>
-       <widget class="QLabel" name="offer_label">
-        <property name="text">
-         <string>The folders you have selected to sync take over your 5GB storage space by 6.5GB. You can remove some folders or add some extra storage now.</string>
-        </property>
-        <property name="wordWrap">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout">
-        <item>
-         <spacer name="horizontalSpacer">
-          <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="add_storage_button">
-          <property name="text">
-           <string>Add more storage</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="horizontalSpacer_2">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>

=== removed file 'data/qt/network_detection.ui'
--- data/qt/network_detection.ui	2011-09-26 20:28:46 +0000
+++ data/qt/network_detection.ui	1970-01-01 00:00:00 +0000
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Form</class>
- <widget class="QWizardPage" name="Form">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>541</width>
-    <height>365</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>WizardPage</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <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="QLabel" name="image_label">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>400</width>
-         <height>150</height>
-        </size>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="textFormat">
-        <enum>Qt::PlainText</enum>
-       </property>
-       <property name="pixmap">
-        <pixmap resource="images.qrc">:/win_installer_graphic.png</pixmap>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignCenter</set>
-       </property>
-       <property name="wordWrap">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_4">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QLabel" name="message_label">
-     <property name="text">
-      <string>Ubuntu One has installed!</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <spacer name="horizontalSpacer">
-       <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="QLabel" name="label">
-       <property name="text">
-        <string>Are you online? We can't detect an internet connection - you will need to be connected to set up Ubuntu One</string>
-       </property>
-       <property name="textFormat">
-        <enum>Qt::PlainText</enum>
-       </property>
-       <property name="wordWrap">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_2">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>76</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-  </layout>
- </widget>
- <resources>
-  <include location="images.qrc"/>
- </resources>
- <connections/>
-</ui>

=== removed file 'data/qt/preferences.ui'
--- data/qt/preferences.ui	2011-09-02 12:58:29 +0000
+++ data/qt/preferences.ui	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Form</class>
- <widget class="QWidget" name="Form">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>480</width>
-    <height>374</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>

=== removed file 'data/qt/setup_account.ui'
--- data/qt/setup_account.ui	2011-09-02 12:58:29 +0000
+++ data/qt/setup_account.ui	1970-01-01 00:00:00 +0000
@@ -1,670 +0,0 @@
-<?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>543</width>
-    <height>523</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>16777215</width>
-    <height>16777215</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>WizardPage</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>3</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <layout class="QGridLayout" name="gridLayout" columnminimumwidth="310,220">
-     <item row="0" column="0">
-      <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>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="wordWrap">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0">
-      <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="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>300</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>300</width>
-           <height>16777215</height>
-          </size>
-         </property>
-         <property name="font">
-          <font>
-           <pointsize>11</pointsize>
-          </font>
-         </property>
-         <property name="formError" stdset="0">
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item row="3" column="0">
-      <layout class="QVBoxLayout" name="verticalLayout">
-       <property name="spacing">
-        <number>3</number>
-       </property>
-       <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="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>300</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>300</width>
-           <height>16777215</height>
-          </size>
-         </property>
-         <property name="font">
-          <font>
-           <pointsize>11</pointsize>
-          </font>
-         </property>
-         <property name="placeholderText">
-          <string/>
-         </property>
-         <property name="formError" stdset="0">
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item row="4" column="0">
-      <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="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>300</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>300</width>
-           <height>16777215</height>
-          </size>
-         </property>
-         <property name="font">
-          <font>
-           <pointsize>11</pointsize>
-          </font>
-         </property>
-         <property name="placeholderText">
-          <string/>
-         </property>
-         <property name="formError" stdset="0">
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item row="6" column="0">
-      <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="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>300</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>300</width>
-           <height>16777215</height>
-          </size>
-         </property>
-         <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>
-         <property name="formError" stdset="0">
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item row="7" column="0">
-      <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="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>300</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>300</width>
-           <height>16777215</height>
-          </size>
-         </property>
-         <property name="font">
-          <font>
-           <pointsize>11</pointsize>
-          </font>
-         </property>
-         <property name="echoMode">
-          <enum>QLineEdit::Password</enum>
-         </property>
-         <property name="placeholderText">
-          <string/>
-         </property>
-         <property name="formError" stdset="0">
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item row="9" column="0">
-      <layout class="QVBoxLayout" name="verticalLayout">
-       <property name="spacing">
-        <number>3</number>
-       </property>
-       <item>
-        <widget class="QLabel" name="captcha_view">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>300</width>
-           <height>57</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>300</width>
-           <height>16777215</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="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>300</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>300</width>
-           <height>16777215</height>
-          </size>
-         </property>
-         <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>
-         <property name="formError" stdset="0">
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item row="9" column="1">
-      <widget class="QLabel" name="refresh_label">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>220</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>220</width>
-         <height>16777215</height>
-        </size>
-       </property>
-       <property name="locale">
-        <locale language="English" country="UnitedStates"/>
-       </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>
-       <property name="wordWrap">
-        <bool>true</bool>
-       </property>
-       <property name="indent">
-        <number>0</number>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1">
-      <layout class="QVBoxLayout" name="verticalLayout_7">
-       <property name="spacing">
-        <number>0</number>
-       </property>
-       <property name="leftMargin">
-        <number>0</number>
-       </property>
-       <item>
-        <widget class="QLabel" name="name_assistance">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>220</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>220</width>
-           <height>16777215</height>
-          </size>
-         </property>
-         <property name="text">
-          <string>name_assistance</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
-         </property>
-         <property name="wordWrap">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item row="3" column="1">
-      <layout class="QVBoxLayout" name="verticalLayout_8">
-       <property name="spacing">
-        <number>0</number>
-       </property>
-       <property name="leftMargin">
-        <number>0</number>
-       </property>
-       <item>
-        <widget class="QLabel" name="email_assistance">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>220</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>220</width>
-           <height>16777215</height>
-          </size>
-         </property>
-         <property name="text">
-          <string>email_assistance</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
-         </property>
-         <property name="wordWrap">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item row="4" column="1">
-      <layout class="QVBoxLayout" name="verticalLayout_9">
-       <property name="spacing">
-        <number>0</number>
-       </property>
-       <property name="leftMargin">
-        <number>0</number>
-       </property>
-       <item>
-        <widget class="QLabel" name="confirm_email_assistance">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>220</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>220</width>
-           <height>16777215</height>
-          </size>
-         </property>
-         <property name="text">
-          <string>confirm_email_assistance</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
-         </property>
-         <property name="wordWrap">
-          <bool>true</bool>
-         </property>
-         <property name="indent">
-          <number>0</number>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item row="6" column="1" rowspan="2">
-      <widget class="QLabel" name="password_assistance">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>220</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>220</width>
-         <height>16777215</height>
-        </size>
-       </property>
-       <property name="text">
-        <string>password_assistance</string>
-       </property>
-       <property name="wordWrap">
-        <bool>true</bool>
-       </property>
-       <property name="indent">
-        <number>17</number>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="1">
-      <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>15</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item row="5" column="1">
-      <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>15</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item row="8" column="1">
-      <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>15</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="hlayout_check">
-     <property name="spacing">
-      <number>0</number>
-     </property>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources>
-  <include location="images.qrc"/>
- </resources>
- <connections/>
-</ui>

=== removed file 'data/qt/side_widget.ui'
--- data/qt/side_widget.ui	2011-09-02 12:58:29 +0000
+++ data/qt/side_widget.ui	1970-01-01 00:00:00 +0000
@@ -1,235 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>SideWidget</class>
- <widget class="QFrame" name="SideWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>170</width>
-    <height>466</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>170</width>
-    <height>466</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>Frame</string>
-  </property>
-  <property name="frameShape">
-   <enum>QFrame::StyledPanel</enum>
-  </property>
-  <property name="frameShadow">
-   <enum>QFrame::Raised</enum>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="spacing">
-    <number>40</number>
-   </property>
-   <property name="margin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QLabel" name="ubuntu_one_logo_label">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-     <property name="pixmap">
-      <pixmap resource="images.qrc">:/u1_logo.png</pixmap>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QFrame" name="states_frame">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-       <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="QVBoxLayout" name="verticalLayout_2">
-      <property name="spacing">
-       <number>20</number>
-      </property>
-      <property name="margin">
-       <number>0</number>
-      </property>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout">
-        <property name="spacing">
-         <number>7</number>
-        </property>
-        <item>
-         <widget class="QLabel" name="install_icon_label">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="pixmap">
-           <pixmap resource="images.qrc">:/progress_arrow_grey.png</pixmap>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLabel" name="install_label">
-          <property name="enabled">
-           <bool>true</bool>
-          </property>
-          <property name="text">
-           <string>Install</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_2">
-        <property name="spacing">
-         <number>7</number>
-        </property>
-        <property name="sizeConstraint">
-         <enum>QLayout::SetDefaultConstraint</enum>
-        </property>
-        <item>
-         <widget class="QLabel" name="sign_icon_label">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="pixmap">
-           <pixmap resource="images.qrc">:/progress_arrow_grey.png</pixmap>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLabel" name="sign_in_label">
-          <property name="enabled">
-           <bool>true</bool>
-          </property>
-          <property name="text">
-           <string>Sign In</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_4">
-        <property name="spacing">
-         <number>7</number>
-        </property>
-        <item>
-         <widget class="QLabel" name="folders_icon_label">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="pixmap">
-           <pixmap resource="images.qrc">:/progress_arrow_grey.png</pixmap>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLabel" name="select_folders_label">
-          <property name="enabled">
-           <bool>true</bool>
-          </property>
-          <property name="text">
-           <string>Select sync folders</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_5">
-        <property name="spacing">
-         <number>7</number>
-        </property>
-        <item>
-         <widget class="QLabel" name="sync_icon_label">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="pixmap">
-           <pixmap resource="images.qrc">:/progress_finish_grey.png</pixmap>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLabel" name="sync_label">
-          <property name="enabled">
-           <bool>true</bool>
-          </property>
-          <property name="text">
-           <string>Sync, stream, share!</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <spacer name="verticalSpacer">
-     <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>
- </widget>
- <resources>
-  <include location="images.qrc"/>
- </resources>
- <connections/>
-</ui>

=== removed file 'data/qt/sign_in.ui'
--- data/qt/sign_in.ui	2011-09-02 12:58:29 +0000
+++ data/qt/sign_in.ui	1970-01-01 00:00:00 +0000
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Form</class>
- <widget class="QWidget" name="Form">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>300</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QLabel" name="label">
-     <property name="font">
-      <font>
-       <pointsize>14</pointsize>
-       <weight>75</weight>
-       <bold>true</bold>
-      </font>
-     </property>
-     <property name="text">
-      <string>Sync, stream, share</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>163</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <widget class="QPushButton" name="sign_in">
-     <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>
-    <widget class="QPushButton" name="sign_up">
-     <property name="text">
-      <string>I don't have an account, sign me up</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QPushButton" name="sign_off">
-     <property name="text">
-      <string>Close window and setup later</string>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>

=== removed file 'data/qt/ubuntuone.qss'
--- data/qt/ubuntuone.qss	2011-09-02 12:58:29 +0000
+++ data/qt/ubuntuone.qss	1970-01-01 00:00:00 +0000
@@ -1,179 +0,0 @@
-QWidget {
-    font-family: "Ubuntu";
-    color: #333333;
-}
-
-QFrame#SideWidget {
-    background-color: white;
-    border-style: dotted;
-    border-color: #939389;
-    border-right-width: 1px;
-    color: white;
-    min-height: 100px;
-}
-
-QWizard,
-QDialog {
-    background-color: white;
-}
-
-QLabel#password_assistance {
-    border-image: url(":/balloon_shape.png");
-}
-
-QLineEdit {
-    border: 1px solid #aea79f;
-}
-
-QLabel#install_label,
-QLabel#sign_in_label,
-QLabel#choose_services_label,
-QLabel#select_folders_label,
-QLabel#sync_label {
-    font-size: 14px;
-}
-
-QTextEdit {
-    background-color: #ffffff;
-    border: none;
-}
-
-QPushButton {
-    border-radius: 5px;
-    border-style: solid;
-    padding: 6px;
-    padding-left: 20px;
-    padding-right: 20px;
-    border-width: 1px;
-    height: 14px;
-}
-
-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);
-    color: #595959;
-    border-color: #939389;
-}
-
-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;
-}
-
-QPushButton:hover[DisabledState="false"] {
-    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-        stop: 0 #ffb19c,stop: 1.0 #dd4814);
-    color: white;
-    border-color: #999999;
-}
-
-QPushButton:pressed[DisabledState="false"] {
-    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-        stop: 0 #b93f14,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;
-}
-
-QLabel#image_label {
-    border-style: dotted;
-    border-color: #939389;
-    border-bottom-width: 1px;
-    border-top-width: 1px;
-}
-
-QLabel#title_label {
-    font-size: 20px;
-}
-
-QGroupBox {
-    padding-top: 30px;
-    border: none;
-    margin-top: 1ex;
-    font: bold 15px;
-}
-
-QGroupBox::title {
-    color: #333333;
-}
-
-QGroupBox#bandwidth_settings {
-    border-style: dotted;
-    border-color: #939389;
-    border-bottom-width: 1px;
-}
-
-QTreeView {
-    background: #f7f6f5;
-    alternate-background-color: #efedec;
-}
-
-QLabel#form_errors {
-    font: bold 14px;
-    color: #df2d1f;
-}
-
-QLineEdit[formError="true"] {
-    background-color: #ffe5e5;
-}
-
-QLineEdit[formError="false"] {
-    background-color: white;
-}

=== removed file 'data/u1_logo.png'
Binary files data/u1_logo.png	2011-07-12 03:24:48 +0000 and data/u1_logo.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/u1icon.png'
Binary files data/u1icon.png	2011-07-12 03:24:48 +0000 and data/u1icon.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/ubuntu_one_favicon.png'
Binary files data/ubuntu_one_favicon.png	2011-08-05 17:18:34 +0000 and data/ubuntu_one_favicon.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/win_installer_graphic.png'
Binary files data/win_installer_graphic.png	2011-08-05 17:18:34 +0000 and data/win_installer_graphic.png	1970-01-01 00:00:00 +0000 differ
=== removed directory 'po'
=== removed file 'pylintrc'
--- pylintrc	2011-06-22 21:40:10 +0000
+++ pylintrc	1970-01-01 00:00:00 +0000
@@ -1,305 +0,0 @@
-# lint Python modules using external checkers.
-#
-# This is the main checker controlling the other ones and the reports
-# generation. It is itself both a raw checker and an astng checker in order
-# to:
-# * handle message activation / deactivation at the module level
-# * handle some basic but necessary stats'data (number of classes, methods...)
-#
-[MASTER]
-
-# Specify a configuration file.
-#rcfile=
-
-# Python code to execute, usually for sys.path manipulation such as
-# pygtk.require().
-#init-hook=
-
-# Profiled execution.
-profile=no
-
-# Add <file or directory> to the black list. It should be a base name, not a
-# path. You may set this option multiple times.
-ignore=ui,qtreactor
-
-# Pickle collected data for later comparisons.
-persistent=no
-
-# List of plugins (as comma separated values of python modules names) to load,
-# usually to register additional checkers.
-load-plugins=
-
-
-[MESSAGES CONTROL]
-
-# Enable only checker(s) with the given id(s). This option conflicts with the
-# disable-checker option
-#enable-checker=
-
-# Enable all checker(s) except those with the given id(s). This option
-# conflicts with the enable-checker option
-#disable-checker=
-
-# Enable all messages in the listed categories.
-#enable-cat=
-
-# Disable all messages in the listed categories.
-#disable-cat=
-
-# Disable the message(s) with the given id(s) or categories
-# W0142: Used * or ** magic
-# W0613: Unused argument 'yyy'
-disable=R,I,W0142,W0613,W0511
-
-
-[REPORTS]
-
-# Set the output format. Available formats are text, parseable, colorized, msvs
-# (visual studio) and html
-output-format=text
-
-# Include message's id in output
-include-ids=yes
-
-# Put messages in a separate file for each module / package specified on the
-# command line instead of printing them on stdout. Reports (if any) will be
-# written in a file name "pylint_global.[txt|html]".
-files-output=no
-
-# Tells whether to display a full report or only the messages
-reports=no
-
-# Python expression which should return a note less than 10 (10 is the highest
-# note). You have access to the variables errors warning, statement which
-# respectively contain the number of errors / warnings messages and the total
-# number of statements analyzed. This is used by the global evaluation report
-# (R0004).
-evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
-
-# Add a comment according to your evaluation note. This is used by the global
-# evaluation report (R0004).
-comment=no
-
-# Enable the report(s) with the given id(s).
-#enable-report=
-
-# Disable the report(s) with the given id(s).
-#disable-report=
-
-
-# try to find bugs in the code using type inference
-#
-[TYPECHECK]
-
-# Tells whether missing members accessed in mixin class should be ignored. A
-# mixin class is detected if its name ends with "mixin" (case insensitive).
-ignore-mixin-members=yes
-
-# List of classes names for which member attributes should not be checked
-# (useful for classes with attributes dynamically set).
-ignored-classes=
-
-# When zope mode is activated, add a predefined set of Zope acquired attributes
-# to generated-members.
-zope=no
-
-# List of members which are set dynamically and missed by pylint inference
-# system, and so shouldn't trigger E0201 when accessed.
-generated-members=REQUEST,acl_users,aq_parent
-
-
-# checks for
-# * unused variables / imports
-# * undefined variables
-# * redefinition of variable from builtins or from an outer scope
-# * use of variable before assignment
-#
-[VARIABLES]
-
-# Tells whether we should check for unused import in __init__ files.
-init-import=yes
-
-# A regular expression matching names used for dummy variables (i.e. not used).
-dummy-variables-rgx=_|dummy
-
-# List of additional names supposed to be defined in builtins. Remember that
-# you should avoid to define new builtins when possible.
-additional-builtins=
-
-
-# checks for :
-# * doc strings
-# * modules / classes / functions / methods / arguments / variables name
-# * number of arguments, local variables, branches, returns and statements in
-# functions, methods
-# * required module attributes
-# * dangerous default values as arguments
-# * redefinition of function / method / class
-# * uses of the global statement
-#
-[BASIC]
-
-# Required attributes for module, separated by a comma
-required-attributes=
-
-# Regular expression which should only match functions or classes name which do
-# not require a docstring
-no-docstring-rgx=(__.*__|setUp|tearDown)
-
-# Regular expression which should only match correct module names
-module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
-
-# Regular expression which should only match correct module level names
-const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__))$
-
-# Regular expression which should only match correct class names
-class-rgx=[A-Z_][a-zA-Z0-9]+$
-
-# Regular expression which should only match correct function names
-function-rgx=[a-z_][a-z0-9_]{2,79}$
-
-# Regular expression which should only match correct method names
-method-rgx=([a-z_][a-z0-9_]{2,79}$|setUp|tearDown)
-
-# Regular expression which should only match correct instance attribute names
-attr-rgx=[a-z_][a-z0-9_]{1,30}$
-
-# Regular expression which should only match correct argument names
-argument-rgx=[a-z_][a-z0-9_]{1,30}$
-
-# Regular expression which should only match correct variable names
-variable-rgx=[a-z_][a-z0-9_]{1,30}$
-
-# Regular expression which should only match correct list comprehension /
-# generator expression variable names
-inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$
-
-# Good variable names which should always be accepted, separated by a comma
-good-names=d,e,f,g,i,j,k,ex,logger,Run,_
-
-# Bad variable names which should always be refused, separated by a comma
-bad-names=foo,bar,baz,toto,tutu,tata
-
-# List of builtins function names that should not be used, separated by a comma
-bad-functions=apply,input,reduce
-
-
-# checks for sign of poor/misdesign:
-# * number of methods, attributes, local variables...
-# * size, complexity of functions, methods
-#
-[DESIGN]
-
-# Maximum number of arguments for function / method
-max-args=5
-
-# Maximum number of locals for function / method body
-max-locals=15
-
-# Maximum number of return / yield for function / method body
-max-returns=6
-
-# Maximum number of branch for function / method body
-max-branchs=12
-
-# Maximum number of statements in function / method body
-max-statements=50
-
-# Maximum number of parents for a class (see R0901).
-max-parents=7
-
-# Maximum number of attributes for a class (see R0902).
-max-attributes=7
-
-# Minimum number of public methods for a class (see R0903).
-min-public-methods=2
-
-# Maximum number of public methods for a class (see R0904).
-max-public-methods=20
-
-
-# checks for :
-# * methods without self as first argument
-# * overridden methods signature
-# * access only to existent members via self
-# * attributes not defined in the __init__ method
-# * supported interfaces implementation
-# * unreachable code
-#
-[CLASSES]
-
-# List of interface methods to ignore, separated by a comma. This is used for
-# instance to not check methods defines in Zopes Interface base class.
-#ignore-iface-methods=isImplementedBy,deferred,extends,names,namesAndDescriptions,queryDescriptionFor,getBases,getDescriptionFor,getDoc,getName,getTaggedValue,getTaggedValueTags,isEqualOrExtendedBy,setTaggedValue,isImplementedByInstancesOf,adaptWith,is_implemented_by,providedBy
-
-# List of method names used to declare (i.e. assign) instance attributes.
-defining-attr-methods=__init__,__new__,setUp
-
-
-# checks for
-# * external modules dependencies
-# * relative / wildcard imports
-# * cyclic imports
-# * uses of deprecated modules
-#
-[IMPORTS]
-
-# Deprecated modules which should not be used, separated by a comma
-deprecated-modules=regsub,string,TERMIOS,Bastion,rexec
-
-# Create a graph of every (i.e. internal and external) dependencies in the
-# given file (report RP0402 must not be disabled)
-import-graph=
-
-# Create a graph of external dependencies in the given file (report RP0402 must
-# not be disabled)
-ext-import-graph=
-
-# Create a graph of internal dependencies in the given file (report RP0402 must
-# not be disabled)
-int-import-graph=
-
-
-# checks for :
-# * unauthorized constructions
-# * strict indentation
-# * line length
-# * use of <> instead of !=
-#
-[FORMAT]
-
-# Maximum number of characters on a single line.
-max-line-length=79
-
-# Maximum number of lines in a module
-max-module-lines=2500
-
-# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1
-# tab).
-indent-string='    '
-
-
-# checks for similarities and duplicated code. This computation may be
-# memory / CPU intensive, so you should disable it if you experiments some
-# problems.
-#
-[SIMILARITIES]
-
-# Minimum lines number of a similarity.
-min-similarity-lines=4
-
-# Ignore comments when computing similarities.
-ignore-comments=yes
-
-# Ignore docstrings when computing similarities.
-ignore-docstrings=yes
-
-
-# checks for:
-# * warning notes in the code like FIXME, XXX
-# * PEP 263: source code with non ascii character but no encoding declaration
-#
-[MISCELLANEOUS]
-
-# List of note tags to take in consideration, separated by a comma.
-notes=FIXME,XXX,TODO,fixme,xxx,todo

=== removed file 'run-tests'
--- run-tests	2011-09-15 17:49:32 +0000
+++ run-tests	1970-01-01 00:00:00 +0000
@@ -1,44 +0,0 @@
-#! /bin/bash
-#
-# Author: Natalia Bidart <[e-mail]>
-#
-# Copyright 2010 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/>.
-
-set -e
-
-if [ $# -ne 0 ]; then
-    # run specific module given by the caller
-    MODULE="$@"
-else
-    # run all tests, useful for tarmac and reviews
-    MODULE="ubuntuone_installer"
-fi
-
-style_check() {
-    ./setup.py clean
-    u1lint
-    if [ -x `which pep8` ]; then
-        pep8 --exclude '.svn,CVS,.bzr,.hg,.git,*_ui.py,*_rc.py' --repeat .
-    else
-        echo "Please install the 'pep8' package."
-    fi
-}
-
-./setup.py build
-echo "Running test suite for ""$MODULE"
-`which xvfb-run` u1trial -i "test_windows.py" --reactor=qt4 --gui "$MODULE"
-style_check
-rm -rf _trial_temp
-rm -rf build

=== removed file 'run-tests.bat'
--- run-tests.bat	2012-01-31 16:33:13 +0000
+++ run-tests.bat	1970-01-01 00:00:00 +0000
@@ -1,125 +0,0 @@
-:: Author: Manuel de la Pena <[e-mail]>
-::
-:: Copyright 2010 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/>.
-@ECHO off
-
-:: We could have Python 2.6 or 2.7 on Windows. In order to check availability,
-:: we should first check for 2.7, and run the tests, otherwise fall back to 2.6.
-SET REGQUERY27="REG QUERY HKLM\Software\Python\PythonCore\2.7\InstallPath /ve"
-SET REGQUERY2732="REG QUERY HKLM\Software\Wow6432Node\Python\PythonCore\2.7\InstallPath /ve"
-SET REGQUERY26="REG QUERY HKLM\Software\Python\PythonCore\2.6\InstallPath /ve"
-SET REGQUERY2632="REG QUERY HKLM\Software\Wow6432Node\Python\PythonCore\2.6\InstallPath /ve"
-SET PYTHONEXEPATH=""
-
-:: This is very annoying; FOR /F will work differently depending on the output
-:: of reg which is not consistent between OS versions (XP, 7). We must choose
-:: the tokens according to OS version.
-SET PYTHONPATHTOKENS=3
-VER | FIND "XP" > nul
-IF %ERRORLEVEL% == 0 (
-    SET PYTHONPATHTOKENS=4)
-
-ECHO Checking if python 2.7 is in the system
-
-:: Look for python 2.7
-FOR /F "tokens=%PYTHONPATHTOKENS%" %%A IN ('%REGQUERY27%') DO @SET PYTHONEXEPATH=%%A
-IF NOT %PYTHONEXEPATH% == "" (
-    GOTO :PYTHONPRESENT)
-
-ECHO Checking if python 2.6 is in the system
-:: we do not have python 2.7 in the system, try to find 2.6
-FOR /F "tokens=%PYTHONPATHTOKENS%" %%A IN ('%REGQUERY26%') DO @SET PYTHONEXEPATH=%%A
-
-IF NOT %PYTHONEXEPATH% == "" (
-    GOTO :PYTHONPRESENT)
-
-:: we do not have python (2.6 or 2.7) this could hapen in the case  that the
-:: user installed the 32version in a 64 machine, let check if the software was installed in the wow key
-
-:: Look for python 2.7 in WoW64
-ECHO Checking if python 2.7 32 is in the system
-FOR /F "tokens=%PYTHONPATHTOKENS%" %%A IN ('%REGQUERY2732%') DO @SET PYTHONEXEPATH=%%A
-
-IF NOT %PYTHONEXEPATH% == "" (
-    GOTO :PYTHONPRESENT)
-
-ECHO Checking if python 2.6 32 is in the system
-:: we do not have python 2.7 in the system, try to find 2.6
-FOR /F "tokens=%PYTHONPATHTOKENS%" %%A IN ('%REGQUERY2632%') DO @SET PYTHONEXEPATH=%%A
-IF NOT %PYTHONEXEPATH% == "" (
-    GOTO :PYTHONPRESENT)
-
-ECHO Please ensure you have python installed
-GOTO :END
-
-:PYTHONPRESENT
-
-:: throw the first parameter away if is /skip-lint,
-:: the way we do this is to ensure that /skip-lint
-:: is the first parameter and copy all the rest in a loop
-:: the main reason for that is that %* is not affected
-:: by SHIFT, that is, it allways have all passed parameters
-
-SET PARAMS=%*
-SET SKIPLINT=0
-IF "%1" == "/skip-lint" (
-    SET SKIPLINT=1
-    GOTO :CLEANPARAMS
-)ELSE (
-    GOTO :CONTINUEBATCH) 
-:CLEANPARAMS
-
-SHIFT
-SET PARAMS=%1
-:GETREST
-SHIFT
-if [%1]==[] (
-    GOTO CONTINUEBATCH)
-SET PARAMS=%PARAMS% %1
-GOTO GETREST
-:CONTINUEBATCH
-
-ECHO Python found, building auto-generated modules...
-:: call setup.py build so that the qt uic is called
-::START "Build code" /D%CD% /WAIT "%PYTHONEXEPATH%\python.exe" setup.py build
-"%PYTHONEXEPATH%\python.exe" setup.py build
-
-ECHO Running tests
-
-:: execute the tests with a number of ignored linux only modules
-"%PYTHONEXEPATH%\python.exe" "%PYTHONEXEPATH%\Scripts\u1trial" -i "test_linux.py" --gui --reactor=qt4 -c %PARAMS% ubuntuone_installer
-
-:: Clean the build from the setup.py
-ECHO Cleaning the generated code before running the style checks...
-
-"%PYTHONEXEPATH%\python.exe" setup.py clean
-
-IF %SKIPLINT% == 1 (
-    ECHO Skipping style checks
-    GOTO :CLEAN)
-
-ECHO Performing style checks...
-set USE_PYFLAKES=1
-"%PYTHONEXEPATH%\python.exe" "%PYTHONEXEPATH%\Scripts\u1lint" ubuntuone_installer
-:: test for style if we can, if pep8 is not present, move to the end
-IF EXIST "%PYTHONEXEPATH%\Scripts\pep8.exe" (
-    "%PYTHONEXEPATH%\Scripts\pep8.exe" --repeat --exclude="*_ui.py,*_rc.py" .
-
-:CLEAN
-:: Delete the temp folders
-RMDIR /s /q _trial_temp
-RMDIR /s /q .coverage
-:END
-

=== modified file 'scripts/README'
--- scripts/README	2012-01-04 12:43:39 +0000
+++ scripts/README	2012-04-06 02:37:24 +0000
@@ -35,8 +35,9 @@
 -------------------------
 
 Update the release numbers in setup.py ubuntuone_autoupdate.xml and 
-ubuntuone.xml. Remember that you have both a build (ex: 203) 
-and a release (ex: 2.0.3)
+ubuntuone.xml. Remember that you have both a build (ex: 1000) 
+and a release (ex: 2.0.3). The build number in ubuntuone_autoupdate.xml should
+be increased on all releases and is not related to the version number.
 
 Get the VS2008 runtime "vcredist_x86.exe" and put it in the
 scripts folder.

=== modified file 'scripts/conf.py'
--- scripts/conf.py	2012-03-16 14:19:31 +0000
+++ scripts/conf.py	2012-04-06 02:37:24 +0000
@@ -13,28 +13,31 @@
 #
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 """Configure what branches make the release."""
 
+# This is appended to the branches. So, if you set it to
+# "/stable-3-0" you will get lp:ubuntuone-client/stable-3-0
+BRANCH_POSTFIX = ""
+
 # You can add branches that are to be merged into the release by
 # adding them to the adequate list.
 
+
 U1_CLIENT_BRANCHES = (
-    "lp:ubuntuone-client",
+    "lp:ubuntuone-client" + BRANCH_POSTFIX,
 )
 U1_CONTROL_PANEL_BRANCHES = (
-    "lp:ubuntuone-control-panel",
+    "lp:ubuntuone-control-panel" + BRANCH_POSTFIX,
 )
 UBUNTU_SSO_BRANCHES = (
-    "lp:ubuntu-sso-client",
-)
-U1_WINDOWS_INSTALLER_BRANCHES = (
-    "lp:ubuntuone-windows-installer",
+    "lp:ubuntu-sso-client" + BRANCH_POSTFIX,
 )
 U1_STORAGE_PROTOCOL_BRANCHES = (
-    "lp:ubuntuone-storage-protocol",
+    "lp:ubuntuone-storage-protocol" + BRANCH_POSTFIX,
 )
 
 # If show_cmd is set to True, then the binaries will have cmd windows where
 # you can see stderr.
 
-SHOW_CMD = False
+SHOW_CMD = True

=== modified file 'scripts/setup.py'
--- scripts/setup.py	2012-03-16 14:39:17 +0000
+++ scripts/setup.py	2012-04-06 02:37:24 +0000
@@ -160,7 +160,6 @@
         branch_and_merge(conf.U1_CLIENT_BRANCHES)
         branch_and_merge(conf.U1_CONTROL_PANEL_BRANCHES)
         branch_and_merge(conf.UBUNTU_SSO_BRANCHES)
-        branch_and_merge(conf.U1_WINDOWS_INSTALLER_BRANCHES)
         branch_and_merge(conf.U1_STORAGE_PROTOCOL_BRANCHES)
 # pylint: enable=R0904
 
@@ -188,16 +187,25 @@
         shutil.copyfile(os.path.join(
             "sources", "ubuntuone-client", "bin", "u1sdtool"),
             os.path.join("bin", "u1sdtool"))
+        shutil.copyfile(os.path.join(
+            "sources", "ubuntuone-client", "bin", "ubuntuone-proxy-tunnel"),
+            os.path.join("bin", "ubuntuone-proxy-tunnel"))
         shutil.copyfile(os.path.join("sources", "ubuntu-sso-client",
             "bin", "ubuntu-sso-login"),
             os.path.join("bin", "ubuntu-sso-login"))
+        shutil.copyfile(os.path.join("sources", "ubuntu-sso-client",
+            "bin", "ubuntu-sso-login-qt"),
+            os.path.join("bin", "ubuntu-sso-login-qt"))
+        shutil.copyfile(os.path.join("sources", "ubuntu-sso-client",
+            "bin", "ubuntu-sso-proxy-creds-qt"),
+            os.path.join("bin", "ubuntu-sso-proxy-creds-qt"))
+        shutil.copyfile(os.path.join("sources", "ubuntu-sso-client",
+            "bin", "ubuntu-sso-ssl-certificate-qt"),
+            os.path.join("bin", "ubuntu-sso-ssl-certificate-qt"))
         shutil.copyfile(os.path.join("sources",
             "ubuntuone-control-panel", "bin",
             "ubuntuone-control-panel-qt"),
             os.path.join("bin", "ubuntuone-control-panel-qt"))
-        shutil.copyfile(os.path.join("sources", "ubuntuone-windows-installer",
-            "bin", "ubuntuone-installer-qt"),
-            os.path.join("bin", "ubuntuone-installer-qt"))
 
         # Remove "installed" copy
         try:
@@ -241,23 +249,12 @@
             stdout=subprocess.PIPE).communicate()[0]
         os.chdir(start_dir)
 
-        os.chdir(os.path.join("sources", "ubuntuone-windows-installer"))
-        os.system("python setup.py build")
-        # Copying by hand because the install is borked
-        dest_installer = os.path.join(dest_dir, "ubuntuone_installer")
-        shutil.copytree("ubuntuone_installer", dest_installer)
-        u1inst_revno = subprocess.Popen(
-            ["bzr", "revno", "."],
-            stdout=subprocess.PIPE).communicate()[0]
-        os.chdir(start_dir)
-
         # Create revno file
         with open(os.path.join("data", "revnos.txt"), "w+") as revnos:
             revnos.write("ubuntu-sso-client: %s"
                     "ubuntuone-client: %s"
-                    "ubuntuone-control-panel: %s"
-                    "ubuntuonw-windows-installer: %s" %
-                    (sso_revno, u1client_revno, u1cp_revno, u1inst_revno))
+                    "ubuntuone-control-panel: %s" %
+                    (sso_revno, u1client_revno, u1cp_revno))
 
         # Copy storage-protocol's pem files
         shutil.copyfile(os.path.join("sources",
@@ -304,6 +301,10 @@
             'icon_resources': [(0, 'ubuntu_one.ico')]
         },
         {
+            'script': 'bin/ubuntuone-proxy-tunnel',
+            'icon_resources': [(0, 'ubuntu_one.ico')]
+        },
+        {
             'script': 'bin/ubuntuone-control-panel-qt',
             'icon_resources': [(0, 'ubuntu_one.ico')]
         },
@@ -312,7 +313,15 @@
             'icon_resources': [(0, 'ubuntu_one.ico')]
         },
         {
-            'script': 'bin/ubuntuone-installer-qt',
+            'script': 'bin/ubuntu-sso-login-qt',
+            'icon_resources': [(0, 'ubuntu_one.ico')]
+        },
+        {
+            'script': 'bin/ubuntu-sso-proxy-creds-qt',
+            'icon_resources': [(0, 'ubuntu_one.ico')]
+        },
+        {
+            'script': 'bin/ubuntu-sso-ssl-certificate-qt',
             'icon_resources': [(0, 'ubuntu_one.ico')]
         },
     ]
@@ -324,7 +333,7 @@
     # Build bundles
     setup(
         name='ubuntuone',
-        version='2.0.3',
+        version='2.99.91',
         license='GPL v3',
         author='',
         author_email='',
@@ -342,11 +351,11 @@
                 'includes': ['google.protobuf.descriptor',
                     'sip',
                     'twisted.web.resource',
+                    'twisted.web.client',
                     'ubuntu_sso.qt',
-                    'ubuntu_sso.qt.gui',
+                    'ubuntu_sso.qt.ui',
                     'PyQt4.QtNetwork',
                     'oauth',
-                    'ubuntuone_installer',
                     'configglue',
                     'configglue.app',
                     'configglue.inischema',

=== modified file 'scripts/ubuntuone.xml'
--- scripts/ubuntuone.xml	2011-12-28 19:15:16 +0000
+++ scripts/ubuntuone.xml	2012-04-06 02:37:24 +0000
@@ -1,7 +1,7 @@
 <project>
     <shortName>ubuntuone</shortName>
     <fullName>Ubuntu One</fullName>
-    <version>2.0.3</version>
+    <version>2.99.91</version>
     <componentList>
         <component>
             <name>autoupdater</name>
@@ -46,8 +46,8 @@
                     <platforms>windows</platforms>
                     <runAsAdmin>0</runAsAdmin>
                     <runInTerminal>0</runInTerminal>
-                    <windowsExec>${installdir}\dist\ubuntuone-installer-qt.exe</windowsExec>
-                    <windowsExecArgs></windowsExecArgs>
+                    <windowsExec>${installdir}\dist\ubuntuone-control-panel-qt.exe</windowsExec>
+                    <windowsExecArgs>--with-icon</windowsExecArgs>
                     <windowsIcon>${installdir}/ubuntu_one.ico</windowsIcon>
                     <windowsPath>${windows_folder_desktopdirectory}</windowsPath>
                 </shortcut>
@@ -136,8 +136,8 @@
                     <name>Ubuntu One</name>
                     <runAsAdmin>0</runAsAdmin>
                     <runInTerminal>0</runInTerminal>
-                    <windowsExec>${installdir}\dist\ubuntuone-installer-qt.exe</windowsExec>
-                    <windowsExecArgs></windowsExecArgs>
+                    <windowsExec>${installdir}\dist\ubuntuone-control-panel-qt.exe</windowsExec>
+                    <windowsExecArgs>--with-icon</windowsExecArgs>
                     <windowsIcon>${installdir}/ubuntu_one.ico</windowsIcon>
                     <windowsPath>${windows_folder_desktopdirectory}</windowsPath>
                 </startMenuShortcut>
@@ -228,7 +228,7 @@
         </registrySet>
         <runProgram>
             <program>${windows_folder_system}\RunDll32.exe</program>
-            <programArguments>"${installdir}\dist\VistaLib32.dll" RunNonElevated "${installdir}\dist\ubuntuone-installer-qt.exe" --installer &amp;</programArguments>
+            <programArguments>"${installdir}\dist\VistaLib32.dll" RunNonElevated "${installdir}\dist\ubuntuone-control-panel-qt.exe" --installer --with-icon &amp;</programArguments>
             <useMSDOSPath>0</useMSDOSPath>
             <ruleList>
                 <compareText>
@@ -243,7 +243,7 @@
         </runProgram>
         <runProgram>
             <program>${windows_folder_system}\RunDll32.exe</program>
-            <programArguments>"${installdir}\dist\VistaLib64.dll" RunNonElevated "${installdir}\dist\ubuntuone-installer-qt.exe" --installer &amp;</programArguments>
+            <programArguments>"${installdir}\dist\VistaLib64.dll" RunNonElevated "${installdir}\dist\ubuntuone-control-panel-qt.exe" --installer --with-icon &amp;</programArguments>
             <useMSDOSPath>0</useMSDOSPath>
             <ruleList>
                 <compareText>
@@ -256,6 +256,7 @@
                 </platformTest>
             </ruleList>
         </runProgram>
+        <!-- TODO: remove this showInfo? -->
         <showInfo>
             <text>Please reboot to finish upgrade.</text>
             <ruleList>

=== modified file 'scripts/ubuntuone_autoupdate.xml'
--- scripts/ubuntuone_autoupdate.xml	2011-12-14 20:42:38 +0000
+++ scripts/ubuntuone_autoupdate.xml	2012-04-06 02:37:24 +0000
@@ -2,7 +2,7 @@
     <fullName>Ubuntu One</fullName>
     <shortName>ubuntuone</shortName>
     <vendor>Canonical</vendor>
-    <version>203</version>
+    <version>1000</version>
     <singleInstanceCheck>1</singleInstanceCheck>
     <requireInstallationByRootUser>0</requireInstallationByRootUser>
     <requestedExecutionLevel>asInvoker</requestedExecutionLevel>

=== added file 'setup.py'
--- setup.py	1970-01-01 00:00:00 +0000
+++ setup.py	2012-04-06 02:37:24 +0000
@@ -0,0 +1,37 @@
+#!/usr/bin/env python
+#
+# Copyright 2010-2012 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/>.
+
+"""Setup.py: build, distribute, clean."""
+
+try:
+    import DistUtilsExtra.auto
+except ImportError:
+    print >> sys.stderr, 'To build this program you need '\
+                         'https://launchpad.net/python-distutils-extra'
+    sys.exit(1)
+assert DistUtilsExtra.auto.__version__ >= '2.18', \
+       'needs DistUtilsExtra.auto >= 2.18'
+
+DistUtilsExtra.auto.setup(
+    name='ubuntuone-windows-installer',
+    version='2.99.91',
+    license='GPL v3',
+    author='Roberto Alsina',
+    author_email='[e-mail]',
+    description='Ubuntu One Windows Installer',
+    long_description='Scripts to build the Ubuntu One windows installer.',
+    url='https://launchpad.net/ubuntuone-windows-installer',
+)

=== removed file 'setup.py'
--- setup.py	2012-03-21 14:10:27 +0000
+++ setup.py	1970-01-01 00:00:00 +0000
@@ -1,249 +0,0 @@
-#!/usr/bin/env python
-# setup.py - Build system for Ubuntu One Installer package
-#
-# Authors: Natalia B. Bidart <[e-mail]>
-#          Manuel de la Pena <[e-mail]>
-#          Alejandro J. Cura <[e-mail]>
-#
-# Copyright 2010-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/>.
-"""Setup.py: build, distribute, clean."""
-
-# pylint: disable=W0404
-
-import os
-import sys
-
-try:
-    import DistUtilsExtra.auto
-    from DistUtilsExtra.command import build_extra
-except ImportError:
-    print >> sys.stderr, 'To build this program you need '\
-                         'https://launchpad.net/python-distutils-extra'
-    sys.exit(1)
-assert DistUtilsExtra.auto.__version__ >= '2.18', \
-       'needs DistUtilsExtra.auto >= 2.18'
-
-from distutils import log
-
-POT_FILE = 'po/ubuntuone-installer.pot'
-MESSAGE_ENTRY = 'ubuntuone-installer'
-CONSTANTS = 'ubuntuone_installer/constants.py'
-
-CLEANFILES = [
-    MESSAGE_ENTRY, CONSTANTS, POT_FILE,
-    'MANIFEST']
-QT_UI_DIR = os.path.join('ubuntuone_installer', 'gui', 'qt', 'ui')
-
-
-def replace_prefix(prefix):
-    """Replace every '@prefix@' with prefix within 'filename' content."""
-    # replace .service file, DATA_DIR constant
-    for filename in (MESSAGE_ENTRY, CONSTANTS):
-        with open(filename + '.in') as in_file:
-            content = in_file.read()
-            with open(filename, 'w') as out_file:
-                out_file.write(content.replace('@prefix@', prefix))
-
-
-class InstallerInstall(DistUtilsExtra.auto.install_auto):
-    """Class to install proper files."""
-
-    def run(self):
-        """Do the install.
-
-        Read from *.service.in and generate .service files by replacing
-        @prefix@ by self.prefix.
-
-        """
-        replace_prefix(self.prefix)
-        DistUtilsExtra.auto.install_auto.run(self)
-
-
-class InstallerBuild(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(QT_UI_DIR, py_file)
-        # we indeed want to catch Exception, is ugly but we 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(QT_UI_DIR, py_file)
-        path = os.getenv('PATH')
-        os.putenv('PATH', path + os.path.pathsep + os.path.join(
-                  os.path.dirname(PyQt4.__file__), 'bin'))
-        if os.system('pyrcc4 -no-compress "%s" -o "%s"' %
-            (qrc_file, py_file)) > 0:
-            self.warn('Unable to generate python module {py_file}'
-                      ' for resource file {qrc_file}'.format(
-                      py_file=py_file, qrc_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')
-            import cgi
-            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 cases, 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))
-
-        build_extra.build_extra.run(self)
-
-    # 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 gettext import gettext as _')
-                return super(_UICompiler, self).createToplevelWidget(classname,
-                    widgetname)
-        compiler.UICompiler = _UICompiler
-
-        class _i18n_string(qtproxies.i18n_string):
-            """Provide a translated 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 InstallerClean(DistUtilsExtra.auto.clean_build_tree):
-    """Class to clean up after the build."""
-
-    def run(self):
-        """Clean up the built files."""
-        for built_file in CLEANFILES:
-            if os.path.exists(built_file):
-                os.unlink(built_file)
-
-        for dirpath, _, filenames in os.walk(os.path.join(QT_UI_DIR)):
-            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))
-
-        DistUtilsExtra.auto.clean_build_tree.run(self)
-
-
-DistUtilsExtra.auto.setup(
-    name='ubuntuone-windows-installer',
-    version='2.99.91',
-    license='GPL v3',
-    author='Roberto Alsina',
-    author_email='[e-mail]',
-    description='Ubuntu One Install Wizard',
-    long_description='Application to perform initial setup of a '
-        'Ubuntu One account.',
-    url='https://launchpad.net/ubuntuone-windows-installer',
-    packages=[
-        'ubuntuone_installer', 'ubuntuone_installer.gui',
-        'ubuntuone_installer.gui.qt',
-    ],
-    extra_path='ubuntuone_installer',
-    cmdclass={
-        'install': InstallerInstall,
-        'build': InstallerBuild,
-        'clean': InstallerClean,
-    },
-)

=== removed directory 'ubuntuone_installer'
=== removed file 'ubuntuone_installer/__init__.py'
--- ubuntuone_installer/__init__.py	2011-06-22 10:47:08 +0000
+++ ubuntuone_installer/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Authors: Natalia B Bidart <[e-mail]>
-# Authors: Alejandro J. Cura <[e-mail]>
-#
-# Copyright 2010 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 windows installer for Ubuntu One.
-
-The installer is a wizard that sets up the basic account and configuration for
-a Ubuntu One user on windows.
-"""
-
-# constants
-TRANSLATION_DOMAIN = 'ubuntuone-installer'

=== removed directory 'ubuntuone_installer/gui'
=== removed file 'ubuntuone_installer/gui/__init__.py'
--- ubuntuone_installer/gui/__init__.py	2011-09-05 21:12:02 +0000
+++ ubuntuone_installer/gui/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Authors: Natalia B Bidart <[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 Installer UI for Ubuntu One."""
-
-import gettext
-
-_ = gettext.gettext
-
-ARE_YOU_SURE_1 = _("You can restart the setup process at any time "
-    "by clicking on Ubuntu One in your Start menu.")
-ARE_YOU_SURE_2 = _("If you need to know more about Ubuntu One, then please "
-    "go to %(url)s")
-LOCAL_FOLDERS_TITLE = _("Syncing your computer with the cloud")
-LOCAL_FOLDERS_SPACE_HEADER = _("Space (%s)")
-LOCAL_FOLDERS_OFFER_LABEL = _("The folders you have selected to sync "
-    "take over your %(quota)s space. You can remove some folders or add "
-    "some extra space")
-LOCAL_FOLDERS_CALCULATING = _("Calculating")
-NEXT = _("Next")

=== removed directory 'ubuntuone_installer/gui/qt'
=== removed file 'ubuntuone_installer/gui/qt/__init__.py'
--- ubuntuone_installer/gui/qt/__init__.py	2011-09-02 13:36:36 +0000
+++ ubuntuone_installer/gui/qt/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Authors: Natalia B Bidart <[e-mail]>
-#
-# Copyright 2010 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 Qt graphical interface for the Ubuntu One Installer."""
-
-
-LICENSE_CONTENT = """<html>
-    <body style="font-family:Ubuntu">
-        <h2>License Agreement</h2>
-        <p>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.</p>
-        <p>Ubuntu One Basic is free, while additional service add-ons may be
-        paid for services.</p>
-        <p>As free software, this programme is distributed without warranty.
-        See the GNU General Public License for more details at
-        <a href='http://www.gnu.org/licenses'
-        style="color:#dd4814;">http://www.gnu.org/licenses</a>
-        </p>
-    </body>
-<html>"""

=== removed file 'ubuntuone_installer/gui/qt/are_you_sure.py'
--- ubuntuone_installer/gui/qt/are_you_sure.py	2011-07-27 15:09:28 +0000
+++ ubuntuone_installer/gui/qt/are_you_sure.py	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-# -*- 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)

=== removed file 'ubuntuone_installer/gui/qt/currentuser.py'
--- ubuntuone_installer/gui/qt/currentuser.py	2011-08-02 20:16:28 +0000
+++ ubuntuone_installer/gui/qt/currentuser.py	1970-01-01 00:00:00 +0000
@@ -1,55 +0,0 @@
-# -*- 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/>.
-
-"""Custom controller for current user page."""
-
-from twisted.internet.defer import inlineCallbacks
-
-from ubuntu_sso.qt import controllers
-
-from ubuntuone.platform.credentials import (
-     CredentialsManagementTool,
-     CredentialsError,
-)
-
-from ubuntuone_installer.logger import setup_logging
-
-# Invalid name logger
-# pylint: disable=C0103
-logger = setup_logging('qt.currentuser')
-# pylint: enable=C0103
-
-
-class CurrentUserController(controllers.CurrentUserController):
-    """Custom controller for current user page."""
-
-    @inlineCallbacks
-    def login(self, *args):
-        """Perform the login using the self.backend."""
-        email = unicode(self.view.ui.email_edit.text())
-        password = unicode(self.view.ui.password_edit.text())
-        credtool = CredentialsManagementTool()
-        try:
-            d = yield credtool.login_email_password(
-                email=email,
-                password=password,
-            )
-            self.on_logged_in(self.view.wizard().app_name, d)
-        except CredentialsError, e:
-            logger.exception("Error getting credentials:")
-            self.on_login_error(e.args[0])

=== removed file 'ubuntuone_installer/gui/qt/enhanced_check_box.py'
--- ubuntuone_installer/gui/qt/enhanced_check_box.py	2011-08-29 13:48:32 +0000
+++ ubuntuone_installer/gui/qt/enhanced_check_box.py	1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Authors: Diego Sarmentero <[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/>.
-
-"""Customized Check Box to support links."""
-
-from PyQt4 import QtGui
-
-
-class EnhancedCheckBox(QtGui.QCheckBox):
-    """Enhanced QCheckBox to support links in the message displayed."""
-
-    def __init__(self, text=""):
-        QtGui.QCheckBox.__init__(self)
-        hbox = QtGui.QHBoxLayout()
-        self.text_label = QtGui.QLabel(text)
-        self.text_label.setOpenExternalLinks(True)
-        padding = self.iconSize().width()
-        self.text_label.setStyleSheet("padding-left: {0}px;".format(padding))
-        hbox.addWidget(self.text_label)
-        self.setLayout(hbox)
-
-        self.stateChanged.connect(self.text_label.setFocus)
-
-    def text(self):
-        """Return the text of this widget."""
-        return self.text_label.text()
-
-    # Invalid name "setText"
-    # pylint: disable=C0103
-
-    def setText(self, text):
-        """Set a new text to this widget."""
-        self.text_label.setText(text)
-
-    # pylint: enable=C0103

=== removed file 'ubuntuone_installer/gui/qt/folders.py'
--- ubuntuone_installer/gui/qt/folders.py	2011-09-09 14:39:55 +0000
+++ ubuntuone_installer/gui/qt/folders.py	1970-01-01 00:00:00 +0000
@@ -1,71 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Authors: Roberto Alsina <[e-mail]>
-#          Diego Sarmentero <[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/>.
-
-"""Page to list folders in a Ubuntu One account."""
-
-import gettext
-
-from PyQt4 import QtGui, QtCore
-from ubuntu_sso.qt.gui import SSOWizardPage
-from ubuntuone.controlpanel.gui.qt import folders
-
-from ubuntuone_installer.gui import NEXT
-from ubuntuone_installer.gui.qt.ui import folders_ui
-
-_ = gettext.gettext
-
-
-class FoldersPage(SSOWizardPage):
-    """Wizard page to list and manage an account's folders."""
-
-    def __init__(self, parent=None):
-        super(FoldersPage, self).__init__(folders_ui.Ui_Form(), None, parent)
-        self.setTitle(_("Syncing the cloud to your computer"))
-        self.setSubTitle(_("These are your folders in your cloud. "
-            "Select the ones you want to sync with this computer."))
-        self.folders_widget = folders.FoldersPanel()
-        self.layout().insertWidget(
-            self.layout().count() - 1, self.folders_widget)
-        self.folders_widget.ui.share_publish_button.hide()
-        self.folders_widget.ui.add_folder_button.hide()
-        self.folders_widget.ui.folders.setHeaderHidden(True)
-        self.folders_widget.ui.folders.setColumnHidden(2, True)
-
-    # Invalid name "initializePage"
-    # pylint: disable=C0103
-
-    def initializePage(self):
-        """Set Folders Page navigation buttons."""
-        self.wizard().setOption(QtGui.QWizard.HaveCustomButton1, False)
-        self.wizard().setOption(QtGui.QWizard.HaveCustomButton2, False)
-        self.wizard().setButtonLayout([
-            QtGui.QWizard.Stretch,
-            QtGui.QWizard.NextButton])
-        self.wizard().setButtonText(QtGui.QWizard.NextButton,
-            NEXT)
-        self.wizard()._next_id = self.wizard().local_folders_page_id
-
-    # pylint: enable=C0103
-
-    @QtCore.pyqtSlot()
-    def on_check_settings_button_clicked(self):
-        """Show the Preferences Page when the user click on Settings button."""
-        self.wizard()._next_id = \
-            self.wizard().preferences_page_id
-        self.wizard().next()

=== removed file 'ubuntuone_installer/gui/qt/forgotten.py'
--- ubuntuone_installer/gui/qt/forgotten.py	2011-09-21 18:24:39 +0000
+++ ubuntuone_installer/gui/qt/forgotten.py	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-# -*- 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/>.
-
-"""Custom forgotten password controller."""
-
-from ubuntu_sso.qt import controllers
-
-
-class ForgottenPasswordController(controllers.ForgottenPasswordController):
-    """A custom forgotten password controller.
-
-    This controller hides the overlay as needed.
-    """
-
-    def on_password_reset_error(self, app_name, error):
-        """Hide the overlay, then do as the default controller does."""
-        super(ForgottenPasswordController,
-            self).on_password_reset_error(app_name, error)

=== removed file 'ubuntuone_installer/gui/qt/gui.py'
--- ubuntuone_installer/gui/qt/gui.py	2012-01-26 14:41:56 +0000
+++ ubuntuone_installer/gui/qt/gui.py	1970-01-01 00:00:00 +0000
@@ -1,604 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# 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."""
-
-import gettext
-
-from twisted.internet import defer
-from PyQt4 import QtGui, QtCore
-
-from ubuntu_sso import networkstate
-from ubuntu_sso.qt.gui import (
-    SSOWizardPage,
-    EmailVerificationPage,
-    ErrorPage,
-    ForgottenPasswordPage,
-    ResetPasswordPage,
-)
-from ubuntu_sso.utils.ui import (
-    SUCCESS,
-)
-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.error_message_ui import Ui_ErrorPage
-from ubuntu_sso.qt.success_message_ui import Ui_SuccessPage
-from ubuntu_sso.qt.forgotten_password_ui import \
-    Ui_ForgottenPasswordPage
-from ubuntu_sso.qt.reset_password_ui import Ui_ResetPasswordPage
-from ubuntu_sso.qt.controllers import (
-    ChooseSignInController,
-    EmailVerificationController,
-    ErrorController,
-    ResetPasswordController,
-    SetUpAccountController,
-    SuccessController,
-)
-
-from ubuntuone.controlpanel import backend
-from ubuntuone.controlpanel.gui.qt.loadingoverlay import LoadingOverlay
-
-from ubuntuone.platform.credentials import (
-    APP_NAME,
-    TC_URL,
-)
-
-# Module used to include the resources into this file
-# pylint: disable=W0611
-from ubuntuone_installer.gui.qt.ui import images_rc
-# pylint: enable=W0611
-from ubuntuone_installer.logger import setup_logging
-from ubuntuone_installer.gui.qt.ui import (
-    choose_sign_in_ui,
-    congratulations_ui,
-    license_ui,
-    setup_account_ui,
-)
-
-from ubuntuone_installer.gui import qt
-from ubuntuone_installer.gui.qt.are_you_sure import AreYouSure
-from ubuntuone_installer.gui.qt.currentuser import CurrentUserController
-from ubuntuone_installer.gui.qt.folders import FoldersPage
-from ubuntuone_installer.gui.qt.forgotten import ForgottenPasswordController
-from ubuntuone_installer.gui.qt.local_folders import LocalFoldersPage
-from ubuntuone_installer.gui.qt.network_detection import NetworkDetectionPage
-from ubuntuone_installer.gui.qt.preferences import PreferencesPage
-from ubuntuone_installer.gui.qt.sync_now_or_later import SyncNowOrLaterPage
-from ubuntuone_installer.gui.qt.setup_account import SetupAccountPage
-from ubuntuone_installer.gui.qt.side_widget import SideWidget
-
-_ = gettext.gettext
-CONGRATULATIONS = _("Congratulations")
-CREDENTIALS_ERROR_TITLE = _("Error getting credentials")
-CREDENTIALS_ERROR = _('Application will close.\n\n%r')
-SIGN_IN = _("Sign in to Ubuntu One")
-SIGN_IN_SUBTITLE = _("Sign in with your existing Ubuntu One"
-    " username and password.")
-SKIP_TOUR = _("Skip tour, go to Dashboard")
-START_SETUP = _("Start setup")
-SUCCESSFUL_LOGIN = _("Login successful")
-TITLE_STYLE = "<span style=\"font-size:24px\">%s</span>"
-UPDATE_TITLE = _("Updates are available")
-UPDATE_SOFTWARE = _("There is a new version of Ubuntu One available. "
-                    "Do you want to perform an upgrade?")
-REMOVE_OLD_BETA_TITLE = _("Remove old Beta")
-REMOVE_OLD_BETA = _("The old Ubuntu One Beta is installed in your system. Do "
-                    "you want to uninstall it?")
-REMOVE_OLD_BETA_ERROR = _("There was an error uninstall the old beta. Please "
-                          "do this step manually")
-MIGRATE_OLD_BETA_DATA_TITLE = _("Migrate old data")
-MIGRATE_OLD_BETA = _("Do you want to migrate the files from the old Ubuntu "
-                     "One Beta location to the new one?")
-MIGRATE_OLD_BETA_DATA_ERROR = _("There was an error migrating your data. "
-                                "Please do this step manually.")
-
-# Invalid name logger
-# pylint: disable=C0103
-logger = setup_logging('qt.gui')
-# pylint: enable=C0103
-
-
-def _ask_user_question(title, question):
-    """Ask the user a Yes/No question."""
-    result = QtGui.QMessageBox.question(None, title, question,
-            QtGui.QMessageBox.Yes, QtGui.QMessageBox.No)
-    return result == QtGui.QMessageBox.Yes
-
-
-def user_wants_to_update():
-    """Ask the user if he really wants to update the software."""
-    return _ask_user_question(UPDATE_TITLE, UPDATE_SOFTWARE)
-
-
-def user_wants_to_remove_old_beta():
-    """Ask the user if he really wants to remove the old beta."""
-    return _ask_user_question(REMOVE_OLD_BETA_TITLE, REMOVE_OLD_BETA)
-
-
-def user_wants_to_migrate_data():
-    """Ask the user if he really wants to migrate the data."""
-    return _ask_user_question(MIGRATE_OLD_BETA_DATA_TITLE, MIGRATE_OLD_BETA)
-
-
-def _warn_user(title, message):
-    """Warn the user."""
-    QtGui.QMessageBox.warning(None, title, message, QtGui.QMessageBox.Ok)
-
-
-def warn_user_beta_not_removed():
-    """Let the user know that the data was not migrated."""
-    _warn_user(REMOVE_OLD_BETA_TITLE, REMOVE_OLD_BETA_ERROR)
-
-
-def warn_user_data_not_migrated():
-    """Let the user know that the data was not migrated."""
-    _warn_user(MIGRATE_OLD_BETA_DATA_TITLE, MIGRATE_OLD_BETA_DATA_ERROR)
-
-
-class LicensePage(SSOWizardPage):
-    """Wizard Page that displays the license info and links to the GPL."""
-
-    def __init__(self, parent=None):
-        super(LicensePage, self).__init__(license_ui.Ui_Form(), None, parent)
-        self.header.setVisible(False)
-        self.ui.textBrowser.setHtml(qt.LICENSE_CONTENT)
-        self.agree_button = None
-
-    # Invalid names of Qt-inherited methods
-    # pylint: disable=C0103
-
-    def initializePage(self):
-        """Setup UI details."""
-        # Set the right texts and connections for buttons
-        self.setButtonText(QtGui.QWizard.CustomButton1, _("Agree && continue"))
-        self.setButtonText(QtGui.QWizard.CancelButton,
-            _("Disagree && uninstall"))
-
-        # 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().setButtonLayout([
-            QtGui.QWizard.CancelButton,
-            QtGui.QWizard.BackButton,
-            QtGui.QWizard.Stretch,
-            QtGui.QWizard.CustomButton1])
-
-        self.agree_button = self.wizard().button(QtGui.QWizard.CustomButton1)
-        self.agree_button.setDefault(True)
-        self.agree_button.style().unpolish(self.agree_button)
-        self.agree_button.style().polish(self.agree_button)
-        self.wizard().customButtonClicked.connect(self.check_connection)
-
-    # pylint: disable=W0212
-    @defer.inlineCallbacks
-    def check_connection(self, button_id):
-        """Decide next ID based on network detection."""
-        if button_id == QtGui.QWizard.CustomButton1:
-            connected = yield self.wizard().check_connection()
-            if connected:
-                self.next = self.wizard().SIGN_IN_PAGE_ID
-            else:
-                self.next = self.wizard()._next_id
-            self.wizard().next()
-    # pylint: enable=W0212
-
-    def nextId(self):
-        """Return the next page ID."""
-        return self.next
-
-
-class SignInPage(SSOWizardPage):
-    """Wizard Page that lets the user Sign into Ubuntu One."""
-
-    # Invalid names of Qt-inherited methods
-    # pylint: disable=C0103
-
-    def initializePage(self):
-        """Setup UI details."""
-        self.ui.cancel_button.setText(_("Close window and setup later"))
-        self.ui.cancel_button.clicked.connect(self.wizard().reject)
-        # Layout without custom button 1,
-        # without finish button
-        # without cancel
-        self.wizard().setButtonLayout([
-            QtGui.QWizard.Stretch,
-            QtGui.QWizard.NextButton])
-
-    def showEvent(self, event):
-        """Set existing_account_button as default when the page is shown."""
-        super(SignInPage, self).showEvent(event)
-        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."""
-        return self.next
-
-
-class CurrentUserSignInPage(SSOWizardPage):
-    """Wizard Page that lets a current user Sign into Ubuntu One."""
-
-    # Invalid names of Qt-inherited methods
-    # pylint: disable=C0103
-
-    def nextId(self):
-        """Provide the next id."""
-        return self.next
-
-    def initializePage(self):
-        """Setup UI details."""
-        self.setButtonText(QtGui.QWizard.CancelButton,
-            _("Cancel"))
-        # Layout without custom button 1,
-        # without finish button
-        self.wizard().setButtonLayout([
-            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.setEnabled(False)
-        self.ui.sign_in_button.setProperty("DisabledState",
-            not self.ui.sign_in_button.isEnabled())
-        self.ui.sign_in_button.style().unpolish(
-            self.ui.sign_in_button)
-        self.ui.sign_in_button.style().polish(
-            self.ui.sign_in_button)
-
-    def cleanupPage(self):
-        """Reset the state of the wizard if Verification code was visited."""
-        self.wizard()._next_id = None
-
-
-class SuccessPage(SSOWizardPage):
-    """Shown after SSO login, before setup."""
-
-    # Invalid names of Qt-inherited methods
-    # pylint: disable=C0103
-
-    def __init__(self, parent=None):
-        super(SuccessPage, self).__init__(
-            Ui_SuccessPage(),
-            SuccessController(title=SUCCESSFUL_LOGIN), parent)
-        self.backend = backend.ControlBackend()
-        self.finish_button = None
-        self.next_button = None
-        self.ui.image_label.setPixmap(
-            QtGui.QPixmap(':/win_installer_graphic.png'))
-
-    def initializePage(self):
-        """Setup UI details."""
-        self.wizard().setButtonLayout([
-            QtGui.QWizard.Stretch,
-            QtGui.QWizard.FinishButton,
-            QtGui.QWizard.NextButton,
-            ])
-        self.setFinalPage(True)
-        self.wizard().setButtonText(QtGui.QWizard.FinishButton,
-            SKIP_TOUR)
-        self.wizard().setButtonText(QtGui.QWizard.NextButton,
-            START_SETUP)
-        self.finish_button = self.wizard().button(QtGui.QWizard.FinishButton)
-        self.next_button = self.wizard().button(QtGui.QWizard.NextButton)
-        self.finish_button.style().unpolish(self.finish_button)
-        self.finish_button.style().polish(self.finish_button)
-        self.next_button.setDefault(True)
-        self.next_button.style().unpolish(self.next_button)
-        self.next_button.style().polish(self.next_button)
-        self.backend.connect_files()
-
-        self.ui.success_message_body.setText(
-            SUCCESS % {'app_name': self.wizard().app_name})
-
-    def nextId(self):
-        """Provide the next id."""
-        return self.next
-
-
-class CongratulationsPage(SSOWizardPage):
-    """Final page of the wizard."""
-
-    def __init__(self, parent=None):
-        super(CongratulationsPage, self).__init__(
-            congratulations_ui.Ui_Form(), None, parent)
-        self.setFinalPage(True)
-        self.setTitle(CONGRATULATIONS)
-
-    # Invalid names of Qt-inherited methods
-    # pylint: disable=C0103
-
-    def initializePage(self):
-        """Setup UI details."""
-        # We need custom buttons
-        self.wizard().setButtonText(QtGui.QWizard.FinishButton,
-            _("Go to my Ubuntu One dashboard"))
-        # Layout without custom button 1,
-        self.wizard().setButtonLayout([
-            QtGui.QWizard.Stretch,
-            QtGui.QWizard.FinishButton])
-        # 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))
-
-        # Add syncdaemon to autostart
-        qt.utils.add_syncdaemon_to_autostart()
-
-
-class MainWindow(QtGui.QWizard):
-
-    """The Main Window of the Installer wizard."""
-
-    # Invalid constant names and Qt-inherited methods
-    # pylint: disable=C0103
-
-    LICENSE_PAGE = 0
-    SIGNIN_PAGE = 1
-    SYNC_NOW_OR_LATER_PAGE = 2
-    CONGRATULATIONS_PAGE = 3
-
-    # definition of the signals raised by the widget (for SSO)
-    recoverableError = QtCore.pyqtSignal('QString', 'QString')
-    loginSuccess = QtCore.pyqtSignal('QString', 'QString')
-    registrationIncomplete = QtCore.pyqtSignal('QString', 'QString')
-    registrationSuccess = QtCore.pyqtSignal('QString', 'QString')
-    userCancellation = QtCore.pyqtSignal('QString')
-
-    def __init__(self, close_callback=None, installing=False):
-        """Initialize this instance."""
-        # Used to decide the next page dynamically
-        self._next_id = None
-
-        # Data for SSO
-        self.app_name = APP_NAME
-        self.tc_url = TC_URL
-        # help_text is not displayed in the UI from design
-        self.help_text = ""
-
-        super(MainWindow, self).__init__()
-        # Set windows flags
-        flags = self.windowFlags() & ~QtCore.Qt.WindowContextHelpButtonHint
-        self.setWindowFlags(flags)
-
-        self.setWindowTitle(APP_NAME)
-        self.setMinimumHeight(538)
-        self.setMinimumWidth(740)
-        self.setWizardStyle(self.ModernStyle)
-        self.close_callback = close_callback
-
-        # Label for Form Errors
-        self.form_errors_label = QtGui.QLabel()
-        self.form_errors_label.setObjectName("form_errors")
-        self.form_errors_label.hide()
-
-        self.setSideWidget(SideWidget())
-        self.overlay = LoadingOverlay(self)
-        self.overlay.hide()
-
-        self.setOption(self.NoBackButtonOnStartPage, True)
-
-        # PyQt doesn't support the (int, page) version of addPage, so
-        # Add the pages in the right order
-        # pylint: disable=C0103
-        self.license_page = LicensePage()
-        self.LICENSE_PAGE = self.addPage(self.license_page)
-        self.network_page = NetworkDetectionPage()
-
-        #SSO Pages
-        title_page = TITLE_STYLE % SIGN_IN
-        self.sign_in_controller = ChooseSignInController(
-            title=title_page)
-        self.sign_in_page = SignInPage(
-            ui=choose_sign_in_ui.Ui_ChooseSignInPage(),
-            controller=self.sign_in_controller,
-            parent=self)
-        if not installing:
-            self.sign_in_page.ui.message_label.setText("")
-
-        self.setup_controller = SetUpAccountController(message_box=self)
-        self.setup_account = SetupAccountPage(
-            setup_account_ui.Ui_SetUpAccountPage(),
-            self.setup_controller,
-            parent=self)
-
-        email_controller = EmailVerificationController(message_box=self)
-        email_verification_page = Ui_EmailVerificationPage()
-        self.email_verification = EmailVerificationPage(
-                                                       email_verification_page,
-                                                       email_controller)
-        self.email_verification.next_button.clicked.connect(
-            self.overlay.show)
-
-        title_page = TITLE_STYLE % SIGN_IN
-        self.current_user_controller = CurrentUserController(
-            title=title_page, subtitle=SIGN_IN_SUBTITLE,
-            message_box=self)
-        self.current_user = CurrentUserSignInPage(Ui_CurrentUserSignInPage(),
-                                                  self.current_user_controller,
-                                                  parent=self)
-        self.current_user.ui.sign_in_button.clicked.connect(
-            self.overlay.show)
-
-        self.success = SuccessPage(self)
-        self.error_controller = ErrorController()
-        self.error = ErrorPage(Ui_ErrorPage(), self.error_controller)
-
-        self.forgotten_pwd_controller = ForgottenPasswordController(
-            message_box=self)
-        self.forgotten = ForgottenPasswordPage(Ui_ForgottenPasswordPage(),
-                                               self.forgotten_pwd_controller,
-                                               parent=self)
-        self.forgotten.ui.send_button.clicked.connect(
-            self.overlay.show)
-
-        self.reset_password_controller = ResetPasswordController(
-            message_box=self)
-        self.reset_password = ResetPasswordPage(Ui_ResetPasswordPage(),
-                                                self.reset_password_controller,
-                                                parent=self)
-        self.reset_password.ui.reset_password_button.clicked.connect(
-            self.overlay.show)
-
-        self.SIGN_IN_PAGE_ID = self.addPage(self.sign_in_page)
-        self.NETWORK_DETECTION_PAGE_ID = self.addPage(self.network_page)
-        self.setup_account_page_id = self.addPage(self.setup_account)
-        self.email_verification_page_id = self.addPage(self.email_verification)
-        self.current_user_page_id = self.addPage(self.current_user)
-        self.SUCCESS_PAGE = self.addPage(self.success)
-        self.ERROR_PAGE = self.addPage(self.error)
-        self.forgotten_password_page_id = self.addPage(self.forgotten)
-        self.reset_password_page_id = self.addPage(self.reset_password)
-
-        self.loginSuccess.connect(self.login_success_slot)
-        self.registrationIncomplete.connect(self.registration_incomplete)
-        self.registrationSuccess.connect(self.registration_success_slot)
-
-        # End of SSO pages
-
-        self.SYNC_NOW_OR_LATER_PAGE = self.addPage(SyncNowOrLaterPage())
-        self.folders_page = FoldersPage()
-        self.folders_page_id = self.addPage(self.folders_page)
-        self.local_folders_page = LocalFoldersPage()
-        self.local_folders_page_id = self.addPage(self.local_folders_page)
-        self.preferences_page = PreferencesPage()
-        self.preferences_page_id = self.addPage(self.preferences_page)
-        self.CONGRATULATIONS_PAGE = self.addPage(CongratulationsPage())
-
-        self.currentIdChanged.connect(self.on_currentIdChanged)
-        # Set Wizard buttons style
-        self.button(QtGui.QWizard.NextButton).setDefault(True)
-
-        self.set_start_page(installing)
-
-    # Invalid name "closeEvent"
-    # pylint: disable=C0103
-
-    @defer.inlineCallbacks
-    def set_start_page(self, installing):
-        """Set the Wizard start page based in some conditions."""
-        connected = yield self.check_connection()
-        if installing:
-            self.setStartId(self.LICENSE_PAGE)
-        elif connected:
-            self.setStartId(self.SIGNIN_PAGE)
-        else:
-            self.setStartId(self._next_id)
-        self.restart()
-
-    def critical(self, message, page=None):
-        """Show a message at the bottom of the page on form errors."""
-        self.overlay.hide()
-        self.form_errors_label.setText(message)
-        self.form_errors_label.show()
-        if page is None and self.currentPage():
-            self.currentPage().layout().addWidget(self.form_errors_label)
-        elif page is not None:
-            page.layout().addWidget(self.form_errors_label)
-
-    def next(self):
-        """Show the next page to display and remove the form errors label."""
-        self.overlay.hide()
-        self.form_errors_label.hide()
-        if self.currentPage().layout():
-            self.currentPage().layout().removeWidget(self.form_errors_label)
-        self.form_errors_label.setParent(None)
-        super(MainWindow, self).next()
-
-    def nextId(self):
-        """Selects which page to display next."""
-        if self._next_id is not None:
-            return self._next_id
-        else:
-            return QtGui.QWizard.nextId(self)
-
-    @defer.inlineCallbacks
-    def check_connection(self):
-        """Return is machine is connected, False set Network Page as next."""
-        # pylint: disable=W0703
-        connected = yield networkstate.is_machine_connected()
-        if not connected:
-            self._next_id = self.NETWORK_DETECTION_PAGE_ID
-        defer.returnValue(connected)
-        # pylint: enable=W0703
-
-    def login_success_slot(self):
-        """Called on successful login."""
-        self._next_id = self.SUCCESS_PAGE
-        self.next()
-        self._next_id = self.SYNC_NOW_OR_LATER_PAGE
-
-    def registration_incomplete(self):
-        """Called when registration wasn't completed."""
-        self._next_id = self.email_verification_page_id
-        self.next()
-        self._next_id = self.SUCCESS_PAGE
-
-    def registration_success_slot(self):
-        """Called on successful registration."""
-        self._next_id = self.SUCCESS_PAGE
-        self.next()
-        self._next_id = self.SYNC_NOW_OR_LATER_PAGE
-
-    def done(self, result):
-        """The main window is being closed, call any custom callback."""
-        # Finished, not cancelled
-        if result == 1:  # Cancelled
-            qt.utils.start_control_panel()
-        elif self.currentId() == self.LICENSE_PAGE:
-            if AreYouSure(self).exec_() == QtGui.QDialog.Accepted:
-                qt.utils.uninstall_application()
-            else:
-                return
-        elif self.currentId() != self.CONGRATULATIONS_PAGE:
-            if AreYouSure(self).exec_() == QtGui.QDialog.Rejected:
-                return
-        if self.close_callback is not None:
-            self.close_callback()
-        QtGui.QWizard.done(self, result)
-        self.userCancellation.emit(self.app_name)
-
-    def on_currentIdChanged(self, page_id):
-        """The current page changed."""
-        if page_id < self.SIGNIN_PAGE:
-            self.sideWidget().ui.states_frame.hide()
-            self.sideWidget().set_stage(0)
-        elif page_id < self.SYNC_NOW_OR_LATER_PAGE:
-            self.sideWidget().ui.states_frame.show()
-            self.sideWidget().set_stage(1)
-        elif page_id < self.CONGRATULATIONS_PAGE:
-            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())

=== removed file 'ubuntuone_installer/gui/qt/local_folders.py'
--- ubuntuone_installer/gui/qt/local_folders.py	2011-12-26 17:22:23 +0000
+++ ubuntuone_installer/gui/qt/local_folders.py	1970-01-01 00:00:00 +0000
@@ -1,310 +0,0 @@
-# -*- 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 create UDFs in the Windows Install Wizard."""
-
-import os
-import threading
-import Queue
-
-from twisted.internet.defer import inlineCallbacks, returnValue
-from PyQt4 import QtGui, QtCore
-from ubuntuone.controlpanel import backend
-from ubuntuone.controlpanel.gui import (
-    humanize,
-    sign_url,
-    FOLDER_INVALID_PATH,
-)
-from ubuntuone.controlpanel.web_client.txwebclient import timestamp_checker
-from ubuntuone.platform.credentials import CredentialsManagementTool
-from ubuntu_sso.qt.gui import SSOWizardPage
-
-from ubuntuone_installer.gui.qt.ui import local_folders_ui
-from ubuntuone_installer.gui.qt.utils import default_folders
-from ubuntuone_installer.gui import (
-    LOCAL_FOLDERS_TITLE,
-    LOCAL_FOLDERS_SPACE_HEADER,
-    LOCAL_FOLDERS_OFFER_LABEL,
-    LOCAL_FOLDERS_CALCULATING,
-    NEXT,
-)
-
-from ubuntuone_installer.logger import setup_logging
-
-
-# Invalid name logger
-# pylint: disable=C0103
-logger = setup_logging('qt.local_folders')
-# pylint: enable=C0103
-
-
-class FolderItem(QtGui.QTreeWidgetItem):
-    """Class representing a folder in the folder list UI."""
-    def __init__(self, strings, path=None, queue=None,
-        calculate=True, volume_id=None):
-        super(FolderItem, self).__init__(strings)
-        self.thread = CalculateSize(path, queue)
-        # Don't calculate sizes of UDFs
-        if calculate and not volume_id:
-            self.thread.start()
-            self.size = None
-        else:
-            self.size = 0
-        self.path = path
-        self.setCheckState(0, QtCore.Qt.Unchecked)
-        self.volume_id = volume_id
-
-
-class CalculateSize(threading.Thread):
-    """Class to calculate the size of a folder in the background."""
-    def __init__(self, path_name, queue):
-        self.path_name = path_name
-        self.queue = queue
-        self._stop = False
-        super(CalculateSize, self).__init__()
-        self.daemon = True
-
-    def run(self):
-        total_size = 0
-        for dirpath, _, filenames in os.walk(self.path_name):
-            for f in filenames:
-                fp = os.path.join(dirpath, f)
-                total_size += os.path.getsize(fp)
-        self.queue.put([self.path_name, total_size])
-
-
-class LocalFoldersPage(SSOWizardPage):
-    """Wizard page to create UDFs in the Windows Installer."""
-
-    def __init__(self, parent=None):
-        super(LocalFoldersPage, self).__init__(
-            local_folders_ui.Ui_Form(), None, parent)
-        self.setTitle(LOCAL_FOLDERS_TITLE)
-        self.setSubTitle()
-        header_view = self.ui.folder_list.header()
-        header_view.setResizeMode(0, header_view.Stretch)
-        self.queue = Queue.Queue()
-        self.timer = QtCore.QTimer()
-        self.items = {}
-        self.folders_info = None
-        self.account_info = None
-        self.has_back_button = True
-        self.cp_backend = backend.ControlBackend()
-
-    # initializePage is inherited
-    # pylint: disable=C0103
-    def initializePage(self):
-        """UI details."""
-        if self.has_back_button:
-            self.wizard().setButtonLayout([
-                QtGui.QWizard.BackButton,
-                QtGui.QWizard.Stretch,
-                QtGui.QWizard.NextButton])
-        else:
-            self.wizard().setButtonLayout([
-                QtGui.QWizard.Stretch,
-                QtGui.QWizard.NextButton])
-        self.wizard().setButtonText(QtGui.QWizard.NextButton,
-            NEXT)
-        self.wizard()._next_id = self.wizard().CONGRATULATIONS_PAGE
-        # Start with this invisible
-        self.ui.offer_frame.setVisible(False)
-        # Show overlay until we have server data
-        self.wizard().overlay.show()
-        self.get_info()
-
-    def cleanupPage(self):
-        """Initialize previous page when going back."""
-        self.wizard().folders_page.initializePage()
-
-    @inlineCallbacks
-    def get_info(self):
-        """Get information from CP backend and fill folder list."""
-        # pylint: disable=W0702
-        try:
-            volumes_info = yield self.cp_backend.volumes_info()
-            self.account_info = yield self.cp_backend.account_info()
-            self.folders_info = []
-            for _, _, volumes in volumes_info:
-                for volume in volumes:
-                    if volume[u'type'] == u"UDF":
-                        self.folders_info.append(volume)
-            self.ui.folder_list.clear()
-            self.items = {}
-            for folder in self.folders_info:
-                if folder['subscribed']:
-                    item = yield self.add_folder(
-                        os.path.expanduser(folder['path']),
-                        validate=False,
-                        volume_id=folder['volume_id'],
-                        calculate=False,
-                        )
-                    if item:
-                        item.setCheckState(0, QtCore.Qt.Checked)
-                        item.size = 0
-            for folder_name in default_folders():
-                item = yield self.add_folder(folder_name, validate=True)
-            self.timer.start(2000)
-            self.timer.timeout.connect(self.update_sizes)
-            self.wizard().currentIdChanged.connect(self.changed_page)
-        except:
-            logger.exception("Error getting backend info:")
-        finally:
-            self.wizard().overlay.hide()
-
-    @QtCore.pyqtSlot("int")
-    @inlineCallbacks
-    def changed_page(self, page_id):
-        """When moving to next page, create/[un]subscribe UDFs."""
-        self.timer.stop()
-        try:
-            self.wizard().currentIdChanged.disconnect(self.changed_page)
-        except KeyError:
-            pass
-        if page_id == self.wizard().CONGRATULATIONS_PAGE:
-            # The page following this one
-            self.wizard().overlay.show()
-            for path, item in self.items.items():
-                if item.checkState(0) == QtCore.Qt.Checked:
-                    if item.volume_id:
-                        yield self.cp_backend.change_volume_settings(
-                            item.volume_id,
-                            dict(subscribed=True))
-                    else:
-                        yield self.cp_backend.create_folder(path)
-                else:
-                    if item.volume_id:
-                        yield self.cp_backend.change_volume_settings(
-                            item.volume_id,
-                            dict(subscribed=False))
-            self.wizard().overlay.hide()
-
-    @inlineCallbacks
-    def add_folder(self, path, validate=True, calculate=True, volume_id=None):
-        """Add a folder to the list."""
-        if path in self.items:
-            returnValue(None)
-        if validate:
-            is_valid = yield self.cp_backend.validate_path_for_folder(path)
-        else:
-            is_valid = True
-        if is_valid:
-            item = FolderItem([path, ""],
-                path=path,
-                queue=self.queue,
-                volume_id=volume_id,
-                calculate=calculate)
-            self.ui.folder_list.addTopLevelItem(item)
-            self.items[path] = item
-            returnValue(item)
-        returnValue(None)
-
-    def update_sizes(self):
-        """Poll the queue were the threads put the size info."""
-        while True:
-            try:
-                path, size = self.queue.get(False)
-            except Queue.Empty:
-                break
-            else:
-                item = self.items.get(path)
-                if item:
-                    item.size = size
-                    try:
-                        item.setText(1, humanize(size))
-                    except RuntimeError:
-                        del self.items[path]
-        total = long(self.account_info['quota_used'])
-        for path, item in self.items.items():
-            if item.size is None:
-                total = LOCAL_FOLDERS_CALCULATING
-                break
-            if not item.volume_id and item.checkState(0) == QtCore.Qt.Checked:
-                # Existing UDFs are already accounted for, count if marked.
-                total += item.size
-        if isinstance(total, long):
-            self.show_hide_offer(total)
-            total = humanize(total)
-        else:
-            self.show_hide_offer(0)
-        self.ui.folder_list.headerItem().setText(
-            1, LOCAL_FOLDERS_SPACE_HEADER % total)
-
-    def show_hide_offer(self, cur_size):
-        """Show or hide the offer to buy space according to the total size."""
-        quota = self.account_info['quota_total']
-        if cur_size > quota:
-            self.ui.offer_frame.setVisible(True)
-        else:
-            self.ui.offer_frame.setVisible(False)
-        self.ui.offer_label.setText(LOCAL_FOLDERS_OFFER_LABEL %
-            {"quota": humanize(quota)})
-
-    def stop_threads(self):
-        """Stop all pending threads."""
-        for _, item in self.items:
-            item.thread._stop = True
-
-    # itemClicked is a Qt signal name.
-    # pylint: disable=C0103
-    def on_folder_list_itemChanged(self, item, column):
-        """Delete folder from the list."""
-        if column == 0:
-            self.update_sizes()
-
-    @inlineCallbacks
-    @QtCore.pyqtSlot()
-    def on_add_storage_button_clicked(self):
-        """user clicked on the "Add more storage" button."""
-        # Really want to catch everything
-        # pylint: disable=W0702
-        url = "https://one.ubuntu.com/services/#storage_panel"
-        try:
-            credtool = CredentialsManagementTool()
-            creds = yield credtool.find_credentials()
-        except:
-            logger.exception('Error while trying to get credentials:')
-            creds = {}
-        if creds:
-            timestamp = yield timestamp_checker.get_faithful_time()
-            signed_url = yield sign_url(url, creds, timestamp)
-        else:
-            signed_url = url
-        QtGui.QDesktopServices.openUrl(QtCore.QUrl(signed_url))
-
-    @inlineCallbacks
-    @QtCore.pyqtSlot()
-    def on_add_folder_button_clicked(self):
-        """user clicked on the "Add Folder" button."""
-        folder = QtGui.QFileDialog.getExistingDirectory(
-            parent=self,
-            options=QtGui.QFileDialog.DontUseNativeDialog)
-        folder = unicode(QtCore.QDir.toNativeSeparators(folder))
-        if folder == '':
-            return
-
-        is_valid = yield self.cp_backend.validate_path_for_folder(folder)
-        if not is_valid:
-            user_home = os.path.expanduser('~')
-            text = FOLDER_INVALID_PATH % {'folder_path': folder,
-                                          'home_folder': user_home}
-            QtGui.QMessageBox.warning(self, '', text, QtGui.QMessageBox.Close)
-            return
-        item = yield self.add_folder(folder, validate=False, volume_id=False)
-        if item is not None:
-            item.setCheckState(0, QtCore.Qt.Checked)

=== removed directory 'ubuntuone_installer/gui/qt/main'
=== removed file 'ubuntuone_installer/gui/qt/main/__init__.py'
--- ubuntuone_installer/gui/qt/main/__init__.py	2011-11-11 19:27:39 +0000
+++ ubuntuone_installer/gui/qt/main/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# 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/>.
-
-"""Provide the correct reactor and ui integration."""
-
-import sys
-
-from PyQt4 import QtGui
-
-# Module used to include the resources into this file
-# Unused import images_rc, pylint: disable=W0611
-from ubuntuone_installer.gui.qt.ui import images_rc
-# pylint: enable=W0611
-
-
-# Invalid name "source", pylint: disable=C0103
-if sys.platform == 'win32':
-    from ubuntuone_installer.gui.qt.main import windows
-    source = windows
-else:
-    from ubuntuone_installer.gui.qt.main import linux
-    source = linux
-# pylint: enable=C0103
-
-
-def main(installing=False):
-    """Start the Qt reactor and open the main window."""
-    # The following cannot be imported outside this function
-    # because u1trial already provides a reactor.
-
-    # The main loop MUST be initialized before importing the reactor
-    app = QtGui.QApplication(sys.argv)
-    source.main(app)
-
-    # Reimport 'qt4reactor', 'reactor', pylint: disable=W0404
-    import qt4reactor
-    qt4reactor.install()
-
-    from twisted.internet import reactor
-    from ubuntuone_installer.gui.qt.utils import check_credentials
-    # pylint: enable=W0404
-
-    # Module 'reactor' has no 'run'/'stop' member, pylint: disable=E1101
-    reactor.callWhenRunning(check_credentials,
-                            installing=installing, stop_cb=reactor.stop)
-    reactor.run()
-    # pylint: enable=E1101

=== removed file 'ubuntuone_installer/gui/qt/main/linux.py'
--- ubuntuone_installer/gui/qt/main/linux.py	2011-11-11 19:27:39 +0000
+++ ubuntuone_installer/gui/qt/main/linux.py	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# 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/>.
-
-"""Main method to be used on linux."""
-
-from dbus.mainloop.qt import DBusQtMainLoop
-from PyQt4 import QtCore
-
-
-def main(app):
-    """Apply style sheet."""
-    # The DBus main loop MUST be initialized before importing the reactor
-    DBusQtMainLoop(set_as_default=True)
-
-    # Apply Style Sheet -- The linux version may be different
-    qss = QtCore.QResource(":/ubuntuone.qss")
-    app.setStyleSheet(qss.data())

=== removed file 'ubuntuone_installer/gui/qt/main/windows.py'
--- ubuntuone_installer/gui/qt/main/windows.py	2012-01-18 12:37:40 +0000
+++ ubuntuone_installer/gui/qt/main/windows.py	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# 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/>.
-
-"""Main method to be used on windows."""
-
-from PyQt4 import QtGui, QtCore
-
-
-def main(app):
-    """Apply style sheet and fonts."""
-    # Apply font to the entire application
-    QtGui.QFontDatabase.addApplicationFont(':/Ubuntu-R.ttf')
-    QtGui.QFontDatabase.addApplicationFont(':/Ubuntu-B.ttf')
-
-    # Set Application Icon
-    app.setWindowIcon(QtGui.QIcon(":/ubuntu_one_favicon.png"))
-
-    # Apply Style Sheet -- The windows version may be different
-    qss = QtCore.QResource(":/ubuntuone.qss")
-    app.setStyleSheet(qss.data())

=== removed file 'ubuntuone_installer/gui/qt/network_detection.py'
--- ubuntuone_installer/gui/qt/network_detection.py	2012-01-25 12:37:01 +0000
+++ ubuntuone_installer/gui/qt/network_detection.py	1970-01-01 00:00:00 +0000
@@ -1,76 +0,0 @@
-# -*- coding: utf-8 *-*
-#
-# 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 show if we don't detect a network connection."""
-
-import gettext
-
-from twisted.internet import defer
-from PyQt4 import QtGui
-
-from ubuntu_sso import networkstate
-
-from ubuntuone_installer.gui.qt.ui import network_detection_ui
-
-_ = gettext.gettext
-
-
-class NetworkDetectionPage(QtGui.QWizardPage):
-
-    """Widget to show if we don't detect a network connection."""
-
-    def __init__(self, parent=None):
-        super(NetworkDetectionPage, self).__init__(parent)
-        self.setTitle(_("Installing Ubuntu One"))
-        self.ui = network_detection_ui.Ui_Form()
-        self.ui.setupUi(self)
-        self.btn_try_again = None
-
-    # pylint: disable=C0103
-    def initializePage(self):
-        """Set UI details."""
-        self.wizard()._next_id = None
-
-        self.setButtonText(QtGui.QWizard.CustomButton1, _("Try again"))
-        self.setButtonText(QtGui.QWizard.CancelButton,
-            _("Close window and set up later"))
-        self.wizard().setButtonLayout([
-            QtGui.QWizard.Stretch,
-            QtGui.QWizard.CustomButton1,
-            QtGui.QWizard.CancelButton,
-            ])
-
-        try:
-            self.wizard().customButtonClicked.disconnect()
-        except TypeError:
-            pass
-
-        self.btn_try_again = self.wizard().button(QtGui.QWizard.CustomButton1)
-        self.btn_try_again.setDefault(True)
-        self.btn_try_again.style().unpolish(self.btn_try_again)
-        self.btn_try_again.style().polish(self.btn_try_again)
-        self.wizard().customButtonClicked.connect(self.try_again)
-    # pylint: enable=C0103
-
-    @defer.inlineCallbacks
-    def try_again(self, button_id=QtGui.QWizard.CustomButton1):
-        """Test the connection again."""
-        if button_id == QtGui.QWizard.CustomButton1:
-            d = yield networkstate.is_machine_connected()
-            if d:
-                self.wizard()._next_id = self.wizard().SIGN_IN_PAGE_ID
-                self.wizard().next()
-                self.wizard()._next_id = None

=== removed file 'ubuntuone_installer/gui/qt/preferences.py'
--- ubuntuone_installer/gui/qt/preferences.py	2011-10-18 10:59:36 +0000
+++ ubuntuone_installer/gui/qt/preferences.py	1970-01-01 00:00:00 +0000
@@ -1,98 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Authors: Roberto Alsina <[e-mail]>
-#          Diego Sarmentero <[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/>.
-
-"""Page to list folders in a Ubuntu One account."""
-
-import gettext
-
-from PyQt4 import QtGui
-from ubuntuone.controlpanel.gui.qt import preferences
-from ubuntu_sso.qt.gui import SSOWizardPage
-
-from ubuntuone_installer.gui.qt.ui import preferences_ui
-
-_ = gettext.gettext
-
-
-class PreferencesPage(SSOWizardPage):
-    """Wizard page to list and manage an account's folders."""
-
-    def __init__(self, parent=None):
-        super(PreferencesPage, self).__init__(
-            preferences_ui.Ui_Form(), None, parent)
-        self.preferences_widget = preferences.PreferencesPanel()
-        self.layout().addWidget(self.preferences_widget)
-        self.preferences_widget.ui.apply_changes_button.hide()
-        self.preferences_widget.ui.restore_defaults_button.hide()
-
-    # Invalid name "initializePage"
-    # pylint: disable=C0103
-
-    def initializePage(self):
-        """Initialize the page before the Wizard show it."""
-        self.wizard().setOption(QtGui.QWizard.HaveCustomButton1, True)
-        self.wizard().setOption(QtGui.QWizard.HaveCustomButton2, True)
-        # 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()._next_id = None
-        self.setButtonText(QtGui.QWizard.CustomButton1,
-            _("Apply these settings >"))
-        self.setButtonText(QtGui.QWizard.CustomButton2, _("Default settings"))
-
-        self.wizard().setButtonLayout([
-            QtGui.QWizard.BackButton,
-            QtGui.QWizard.Stretch,
-            QtGui.QWizard.CustomButton2,
-            QtGui.QWizard.CustomButton1])
-        self.wizard().button(QtGui.QWizard.CustomButton1).setDefault(True)
-        self.wizard().button(QtGui.QWizard.CustomButton1).style().unpolish(
-            self.wizard().button(QtGui.QWizard.CustomButton1))
-        self.wizard().button(QtGui.QWizard.CustomButton1).style().polish(
-            self.wizard().button(QtGui.QWizard.CustomButton1))
-
-        self.wizard().customButtonClicked.connect(self._button_clicked)
-
-    # pylint: enable=C0103
-
-    def _button_clicked(self, btn):
-        """Receive custom wizard buttons clicks."""
-        if btn == QtGui.QWizard.CustomButton1:
-            self.preferences_widget.on_apply_changes_button_clicked()
-            self.cleanupPage()
-            self.wizard().back()
-        elif btn == QtGui.QWizard.CustomButton2:
-            self.preferences_widget.on_restore_defaults_button_clicked()
-
-    # Invalid name "cleanupPage"
-    # pylint: disable=C0103
-    def cleanupPage(self):
-        """Execute this cleanup function when the back button is pressed."""
-        self.wizard().setOption(QtGui.QWizard.HaveCustomButton1, False)
-        self.wizard().setOption(QtGui.QWizard.HaveCustomButton2, False)
-        self.wizard().setButtonLayout([
-            QtGui.QWizard.BackButton,
-            QtGui.QWizard.Stretch,
-            QtGui.QWizard.NextButton])
-        self.wizard().folders_page.initializePage()
-    # pylint: enable=C0103

=== removed file 'ubuntuone_installer/gui/qt/setup_account.py'
--- ubuntuone_installer/gui/qt/setup_account.py	2011-09-28 17:31:15 +0000
+++ ubuntuone_installer/gui/qt/setup_account.py	1970-01-01 00:00:00 +0000
@@ -1,226 +0,0 @@
-# -*- 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/>.
-
-"""Customized Setup Account page for SSO."""
-
-import gettext
-import re
-
-from PyQt4 import QtGui, QtCore
-
-from ubuntu_sso.qt import common
-from ubuntu_sso.qt import gui as sso_gui
-from ubuntu_sso.utils.ui import SET_UP_ACCOUNT_BUTTON
-
-from ubuntuone_installer.gui.qt import enhanced_check_box
-
-_ = gettext.gettext
-
-# pylint: disable=C0103
-ERROR = u'<font color="#df2d1f"><b> %s </b></font>'
-TITLE_STYLE = "<span style=\"font-size:24px\">%s</span>"
-
-EMAIL = _("Email")
-EMPTY_NAME = _("Please enter your name")
-INVALID_EMAIL = _("Please enter a valid email address")
-EMAIL_MATCH = _("The email addresses do not match")
-NAME = _("Name")
-PASSWORD = _("Create a password")
-RETYPE_EMAIL = _("Retype email")
-RETYPE_PASSWORD = _("Retype password")
-SUBTITLE = _("You only need to set up your account "
-             "once to get access to Ubuntu One across your devices.")
-TERMS = _("By signing up to Ubuntu One you agree to our "
-          "{terms_and_conditions} and {privacy_policy}")
-TERMS_LINK = _("<a href='https://one.ubuntu.com/terms/'>"
-               "<span style='color:#df2d1f;'>Terms of Service</span></a>")
-PRIVACY_POLICY_LINK = _("<a href='https://one.ubuntu.com/privacy/'>"
-                        "<span style='color:#df2d1f;'>Privacy Policy"
-                        "</span></a></font>")
-TITLE = _("Sign Up to Ubuntu One")
-
-
-class SetupAccountPage(sso_gui.SetupAccountPage):
-    """Customized Setup Account page for SSO."""
-
-    def __init__(self, *args, **kwargs):