Merge lp:~dobey/ubuntu/oneiric/ubuntuone-control-panel/fix-823648 into lp:ubuntu/oneiric/ubuntuone-control-panel

[dobey]

[Ken VanDine (ken-vandine)]

Approved!

review: Approve

=== added file 'MANIFEST'
--- MANIFEST	1970-01-01 00:00:00 +0000
+++ MANIFEST	2011-08-12 19:16:23 +0000
@@ -0,0 +1,140 @@
+# file GENERATED by distutils, do NOT edit
+COPYING
+MANIFEST
+README
+com.ubuntuone.controlpanel.gui.service.in
+com.ubuntuone.controlpanel.service.in
+pylintrc
+run-tests
+run-tests.bat
+setup.py
+ubuntuone-control-panel-gtk.desktop.in
+ubuntuone-control-panel.in
+ubuntuone.controlpanel.pth
+bin/ubuntuone-control-panel-backend
+bin/ubuntuone-control-panel-gtk
+bin/ubuntuone-control-panel-qt
+data/Ubuntu-R.ttf
+data/computer.png
+data/contacts.png
+data/external_icon_orange.png
+data/external_icon_white.png
+data/facebook.png
+data/files.png
+data/folder.png
+data/music-store.png
+data/music-stream.png
+data/notes.png
+data/overview.png
+data/phone.png
+data/services-bookmarks.png
+data/services-contacts.png
+data/services-files-example.png
+data/services-files.png
+data/sync_status_alert.png
+data/sync_status_disconnected.png
+data/sync_status_sync_done.png
+data/sync_status_syncing.png
+data/twitter.png
+data/u1icon.png
+data/gtk/dashboard.ui
+data/gtk/device.ui
+data/gtk/devices.ui
+data/gtk/install.ui
+data/gtk/management.ui
+data/gtk/overview.ui
+data/gtk/services.ui
+data/gtk/volumes.ui
+data/qt/account.ui
+data/qt/controlpanel.ui
+data/qt/device.ui
+data/qt/devices.ui
+data/qt/filesyncstatus.ui
+data/qt/folders.ui
+data/qt/images.qrc
+data/qt/loadingoverlay.ui
+data/qt/mainwindow.ui
+data/qt/preferences.ui
+data/qt/ubuntuone.qss
+docs/ubuntuone-control-panel-gtk.1
+po/POTFILES.in
+po/ubuntuone-control-panel.pot
+ubuntuone/__init__.py
+ubuntuone/controlpanel/__init__.py
+ubuntuone/controlpanel/backend.py
+ubuntuone/controlpanel/constants.py.in
+ubuntuone/controlpanel/dbus_service.py
+ubuntuone/controlpanel/logger.py
+ubuntuone/controlpanel/login_client.py
+ubuntuone/controlpanel/replication_client.py
+ubuntuone/controlpanel/utils.py
+ubuntuone/controlpanel/dbustests/__init__.py
+ubuntuone/controlpanel/dbustests/test_dbus_service.py
+ubuntuone/controlpanel/dbustests/test_gui_service.py
+ubuntuone/controlpanel/dbustests/test_sd_client/__init__.py
+ubuntuone/controlpanel/dbustests/test_sd_client/test_linux.py
+ubuntuone/controlpanel/gui/__init__.py
+ubuntuone/controlpanel/gui/gtk/__init__.py
+ubuntuone/controlpanel/gui/gtk/gui.py
+ubuntuone/controlpanel/gui/gtk/package_manager.py
+ubuntuone/controlpanel/gui/gtk/widgets.py
+ubuntuone/controlpanel/gui/gtk/tests/__init__.py
+ubuntuone/controlpanel/gui/gtk/tests/test_gui.py
+ubuntuone/controlpanel/gui/gtk/tests/test_gui_basic.py
+ubuntuone/controlpanel/gui/gtk/tests/test_package_manager.py
+ubuntuone/controlpanel/gui/gtk/tests/test_widgets.py
+ubuntuone/controlpanel/gui/qt/__init__.py
+ubuntuone/controlpanel/gui/qt/account.py
+ubuntuone/controlpanel/gui/qt/addfolder.py
+ubuntuone/controlpanel/gui/qt/controlpanel.py
+ubuntuone/controlpanel/gui/qt/device.py
+ubuntuone/controlpanel/gui/qt/devices.py
+ubuntuone/controlpanel/gui/qt/filesyncstatus.py
+ubuntuone/controlpanel/gui/qt/folders.py
+ubuntuone/controlpanel/gui/qt/gotoweb.py
+ubuntuone/controlpanel/gui/qt/gui.py
+ubuntuone/controlpanel/gui/qt/loadingoverlay.py
+ubuntuone/controlpanel/gui/qt/preferences.py
+ubuntuone/controlpanel/gui/qt/ubuntuonebin.py
+ubuntuone/controlpanel/gui/qt/main/__init__.py
+ubuntuone/controlpanel/gui/qt/main/linux.py
+ubuntuone/controlpanel/gui/qt/main/windows.py
+ubuntuone/controlpanel/gui/qt/tests/__init__.py
+ubuntuone/controlpanel/gui/qt/tests/test_account.py
+ubuntuone/controlpanel/gui/qt/tests/test_addfolder.py
+ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py
+ubuntuone/controlpanel/gui/qt/tests/test_device.py
+ubuntuone/controlpanel/gui/qt/tests/test_devices.py
+ubuntuone/controlpanel/gui/qt/tests/test_filesyncstatus.py
+ubuntuone/controlpanel/gui/qt/tests/test_folders.py
+ubuntuone/controlpanel/gui/qt/tests/test_gotoweb.py
+ubuntuone/controlpanel/gui/qt/tests/test_gui.py
+ubuntuone/controlpanel/gui/qt/tests/test_loadingoverlay.py
+ubuntuone/controlpanel/gui/qt/tests/test_preferences.py
+ubuntuone/controlpanel/gui/qt/tests/test_ubuntuonebin.py
+ubuntuone/controlpanel/gui/qt/ui/__init__.py
+ubuntuone/controlpanel/gui/qt/ui/account_ui.py
+ubuntuone/controlpanel/gui/qt/ui/controlpanel_ui.py
+ubuntuone/controlpanel/gui/qt/ui/device_ui.py
+ubuntuone/controlpanel/gui/qt/ui/devices_ui.py
+ubuntuone/controlpanel/gui/qt/ui/filesyncstatus_ui.py
+ubuntuone/controlpanel/gui/qt/ui/folders_ui.py
+ubuntuone/controlpanel/gui/qt/ui/images_rc.py
+ubuntuone/controlpanel/gui/qt/ui/loadingoverlay_ui.py
+ubuntuone/controlpanel/gui/qt/ui/mainwindow_ui.py
+ubuntuone/controlpanel/gui/qt/ui/preferences_ui.py
+ubuntuone/controlpanel/gui/tests/__init__.py
+ubuntuone/controlpanel/gui/tests/test_humanize.py
+ubuntuone/controlpanel/gui/tests/test_url_sign.py
+ubuntuone/controlpanel/sd_client/__init__.py
+ubuntuone/controlpanel/sd_client/linux.py
+ubuntuone/controlpanel/tests/__init__.py
+ubuntuone/controlpanel/tests/test_backend.py
+ubuntuone/controlpanel/tests/test_login_client.py
+ubuntuone/controlpanel/tests/test_replication_client.py
+ubuntuone/controlpanel/tests/test_sd_client.py
+ubuntuone/controlpanel/tests/test_utils.py
+ubuntuone/controlpanel/tests/test_web_client.py
+ubuntuone/controlpanel/web_client/__init__.py
+ubuntuone/controlpanel/web_client/libsoup.py
+ubuntuone/controlpanel/web_client/txwebclient.py
 
=== modified file 'PKG-INFO'
--- PKG-INFO	2011-07-22 21:26:48 +0000
+++ PKG-INFO	2011-08-12 19:16:23 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: ubuntuone-control-panel
-Version: 1.1.1
+Version: 1.1.2
 Summary: Ubuntu One Control Panel
 Home-page: https://launchpad.net/ubuntuone-control-panel
 Author: Natalia Bidart
@@ -8,4 +8,23 @@
 License: GPL v3
 Description: Application to manage a Ubuntu One account. Provides aDBus service to query/modify all the Ubuntu One bits.
 Platform: UNKNOWN
+Requires: PyQt4
+Requires: apt
+Requires: aptdaemon
+Requires: dbus
+Requires: defer
+Requires: desktopcouch.application.replication_services
+Requires: gi.repository
+Requires: gobject
+Requires: gtk
+Requires: mocker
+Requires: oauth
+Requires: pango
+Requires: simplejson
+Requires: twisted.application
+Requires: twisted.internet
+Requires: twisted.python.failure
+Requires: twisted.trial.unittest
+Requires: twisted.web
+Requires: ubuntu_sso
 Provides: ubuntuone
 
=== modified file 'data/qt/account.ui'
--- data/qt/account.ui	2011-07-22 21:26:48 +0000
+++ data/qt/account.ui	2011-08-12 19:16:23 +0000
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>321</width>
-    <height>205</height>
+    <width>381</width>
+    <height>167</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -18,113 +18,107 @@
     <number>0</number>
    </property>
    <item>
-    <widget class="QGroupBox" name="horizontalGroupBox">
-     <property name="title">
-      <string>Personal details</string>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout">
-      <item>
-       <layout class="QVBoxLayout" name="verticalLayout_2">
-        <item>
-         <widget class="QLabel" name="name_label">
-          <property name="text">
-           <string/>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLabel" name="email_label">
-          <property name="text">
-           <string/>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <spacer name="horizontalSpacer_3">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="GoToWebButton" name="edit_profile_button">
-        <property name="text">
-         <string>Edit personal details online</string>
-        </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>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="horizontalGroupBox_2">
-     <property name="title">
-      <string>Your services</string>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_2">
-      <item>
-       <widget class="QLabel" name="services_description_label">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <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="GoToWebButton" name="edit_services_button">
-        <property name="text">
-         <string>Edit your services  online</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>
-    </widget>
+    <layout class="QGridLayout" name="gridLayout_2">
+     <property name="verticalSpacing">
+      <number>30</number>
+     </property>
+     <item row="2" column="2">
+      <widget class="GoToWebButton" name="edit_profile_button">
+       <property name="text">
+        <string>Edit personal details online</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QGroupBox" name="services">
+       <property name="title">
+        <string>Your services</string>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_3">
+        <property name="margin">
+         <number>0</number>
+        </property>
+        <item>
+         <widget class="QLabel" name="services_description_label">
+          <property name="text">
+           <string/>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item row="1" column="0" colspan="4">
+      <widget class="Line" name="account_separator">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0">
+      <widget class="QGroupBox" name="profile_info">
+       <property name="title">
+        <string>Personal details</string>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_4">
+        <property name="margin">
+         <number>0</number>
+        </property>
+        <item>
+         <layout class="QVBoxLayout" name="verticalLayout_2">
+          <item>
+           <widget class="QLabel" name="name_label">
+            <property name="text">
+             <string/>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLabel" name="email_label">
+            <property name="text">
+             <string/>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item row="0" column="2">
+      <widget class="GoToWebButton" name="edit_services_button">
+       <property name="text">
+        <string>Edit your services  online</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="3">
+      <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 row="0" column="1">
+      <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">
@@ -134,7 +128,7 @@
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
-       <height>40</height>
+       <height>10</height>
       </size>
      </property>
     </spacer>
 
=== modified file 'data/qt/controlpanel.ui'
--- data/qt/controlpanel.ui	2011-07-22 21:26:48 +0000
+++ data/qt/controlpanel.ui	2011-08-12 19:16:23 +0000
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>536</width>
-    <height>389</height>
+    <width>387</width>
+    <height>203</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -21,244 +21,179 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="spacing">
-    <number>4</number>
+    <number>3</number>
    </property>
    <property name="margin">
     <number>0</number>
    </property>
    <item>
-    <widget class="QFrame" name="frmHeader">
-     <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_4">
+    <widget class="QFrame" name="frame_header">
+     <layout class="QHBoxLayout" name="horizontalLayout_2">
       <property name="spacing">
+       <number>5</number>
+      </property>
+      <property name="margin">
        <number>0</number>
       </property>
-      <property name="leftMargin">
-       <number>15</number>
-      </property>
-      <property name="topMargin">
-       <number>10</number>
-      </property>
-      <property name="rightMargin">
-       <number>10</number>
-      </property>
-      <property name="bottomMargin">
-       <number>10</number>
-      </property>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout">
-        <property name="spacing">
-         <number>0</number>
-        </property>
-        <item>
-         <layout class="QVBoxLayout" name="vLayoutGreeting">
-          <property name="spacing">
-           <number>0</number>
-          </property>
-          <property name="sizeConstraint">
-           <enum>QLayout::SetDefaultConstraint</enum>
-          </property>
-          <item>
-           <widget class="QLabel" name="greeting_label">
-            <property name="font">
-             <font>
-              <pointsize>10</pointsize>
-             </font>
-            </property>
-            <property name="layoutDirection">
-             <enum>Qt::LeftToRight</enum>
-            </property>
-            <property name="autoFillBackground">
-             <bool>false</bool>
-            </property>
-            <property name="text">
-             <string notr="true"/>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+      <item>
+       <widget class="QFrame" name="frame_greeting">
+        <layout class="QVBoxLayout" name="verticalLayout_4">
+         <property name="margin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QLabel" name="greeting_label">
+           <property name="alignment">
+            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item>
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Fixed</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>15</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QFrame" name="frame_storage">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>165</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>165</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <layout class="QVBoxLayout" name="vLayoutStorage">
+         <property name="spacing">
+          <number>6</number>
+         </property>
+         <property name="sizeConstraint">
+          <enum>QLayout::SetDefaultConstraint</enum>
+         </property>
+         <property name="margin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QFrame" name="frame_quota">
+           <layout class="QVBoxLayout" name="verticalLayout_3">
+            <property name="spacing">
+             <number>2</number>
             </property>
             <property name="margin">
              <number>0</number>
             </property>
-            <property name="indent">
-             <number>-1</number>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-        <item>
-         <spacer name="horizontalSpacer">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Fixed</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>15</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QFrame" name="frameStorage">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>166</width>
-            <height>16777215</height>
-           </size>
-          </property>
-          <property name="frameShape">
-           <enum>QFrame::StyledPanel</enum>
-          </property>
-          <property name="frameShadow">
-           <enum>QFrame::Raised</enum>
-          </property>
-          <layout class="QHBoxLayout" name="horizontalLayout_7">
-           <property name="spacing">
-            <number>0</number>
-           </property>
-           <property name="leftMargin">
-            <number>10</number>
-           </property>
-           <property name="topMargin">
-            <number>0</number>
-           </property>
-           <property name="rightMargin">
-            <number>10</number>
-           </property>
-           <property name="bottomMargin">
-            <number>0</number>
-           </property>
-           <item>
-            <layout class="QVBoxLayout" name="vLayoutStorage">
-             <property name="sizeConstraint">
-              <enum>QLayout::SetDefaultConstraint</enum>
-             </property>
-             <item>
-              <widget class="QFrame" name="frmQuota">
-               <property name="frameShape">
-                <enum>QFrame::StyledPanel</enum>
-               </property>
-               <property name="frameShadow">
-                <enum>QFrame::Raised</enum>
-               </property>
-               <layout class="QVBoxLayout" name="verticalLayout_3">
-                <property name="spacing">
-                 <number>2</number>
-                </property>
-                <property name="leftMargin">
-                 <number>0</number>
-                </property>
-                <property name="topMargin">
-                 <number>0</number>
-                </property>
-                <property name="rightMargin">
-                 <number>0</number>
-                </property>
-                <property name="bottomMargin">
-                 <number>10</number>
-                </property>
-                <item>
-                 <widget class="QLabel" name="percentage_usage_label">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="text">
-                   <string notr="true"/>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QLabel" name="quota_usage_label">
-                  <property name="font">
-                   <font>
-                    <pointsize>8</pointsize>
-                   </font>
-                  </property>
-                  <property name="text">
-                   <string/>
-                  </property>
-                 </widget>
-                </item>
-               </layout>
-               <zorder>quota_usage_label</zorder>
-               <zorder>percentage_usage_label</zorder>
-              </widget>
-             </item>
-             <item>
-              <widget class="GoToWebButton" name="get_more_space_button">
-               <property name="text">
-                <string>Get more storage!</string>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </item>
-          </layout>
-          <zorder></zorder>
-         </widget>
-        </item>
-        <item>
-         <widget class="QFrame" name="frameStatus">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>166</width>
-            <height>16777215</height>
-           </size>
-          </property>
-          <property name="frameShape">
-           <enum>QFrame::StyledPanel</enum>
-          </property>
-          <property name="frameShadow">
-           <enum>QFrame::Raised</enum>
-          </property>
-          <layout class="QHBoxLayout" name="horizontalLayout_8">
-           <property name="spacing">
-            <number>0</number>
-           </property>
-           <property name="leftMargin">
-            <number>10</number>
-           </property>
-           <property name="topMargin">
-            <number>0</number>
-           </property>
-           <property name="rightMargin">
-            <number>0</number>
-           </property>
-           <property name="bottomMargin">
-            <number>0</number>
-           </property>
-           <item>
-            <widget class="FileSyncStatus" name="file_sync_status" native="true"/>
-           </item>
-          </layout>
-         </widget>
-        </item>
-       </layout>
+            <item>
+             <widget class="QLabel" name="percentage_usage_label">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string notr="true"/>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLabel" name="quota_usage_label">
+              <property name="font">
+               <font>
+                <pointsize>8</pointsize>
+               </font>
+              </property>
+              <property name="text">
+               <string/>
+              </property>
+             </widget>
+            </item>
+           </layout>
+           <zorder>quota_usage_label</zorder>
+           <zorder>percentage_usage_label</zorder>
+          </widget>
+         </item>
+         <item>
+          <widget class="GoToWebButton" name="get_more_space_button">
+           <property name="text">
+            <string>Get more storage</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item>
+       <widget class="QFrame" name="frame_status">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>165</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>165</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <layout class="QHBoxLayout" name="horizontalLayout_8">
+         <property name="margin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="FileSyncStatus" name="file_sync_status" native="true">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>0</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>165</width>
+             <height>16777215</height>
+            </size>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
       </item>
      </layout>
     </widget>
@@ -297,116 +232,100 @@
     </widget>
    </item>
    <item>
-    <widget class="QFrame" name="frmFooter">
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>30</height>
-      </size>
-     </property>
-     <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_2">
+    <widget class="QFrame" name="frame_footer">
+     <layout class="QHBoxLayout" name="horizontalLayout">
       <property name="spacing">
-       <number>0</number>
-      </property>
-      <property name="margin">
-       <number>0</number>
-      </property>
-      <item>
-       <layout class="QHBoxLayout" name="hLayoutFooter">
-        <property name="spacing">
-         <number>5</number>
-        </property>
-        <property name="leftMargin">
-         <number>3</number>
-        </property>
-        <property name="rightMargin">
-         <number>3</number>
-        </property>
-        <item>
-         <widget class="GoToWebButton" name="help_button">
-          <property name="text">
-           <string>Get help online</string>
-          </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>
-        <item>
-         <widget class="QLabel" name="follow_us_label">
-          <property name="font">
-           <font>
-            <pointsize>11</pointsize>
-           </font>
-          </property>
-          <property name="text">
-           <string>Talk to us</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QToolButton" name="twitter_button">
-          <property name="cursor">
-           <cursorShape>PointingHandCursor</cursorShape>
-          </property>
-          <property name="styleSheet">
-           <string notr="true">border: 0;</string>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="icon">
-           <iconset resource="images.qrc">
-            <normaloff>:/twitter.png</normaloff>:/twitter.png</iconset>
-          </property>
-          <property name="iconSize">
-           <size>
-            <width>22</width>
-            <height>22</height>
-           </size>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QToolButton" name="facebook_button">
-          <property name="cursor">
-           <cursorShape>PointingHandCursor</cursorShape>
-          </property>
-          <property name="styleSheet">
-           <string notr="true">border: 0;</string>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="icon">
-           <iconset resource="images.qrc">
-            <normaloff>:/facebook.png</normaloff>:/facebook.png</iconset>
-          </property>
-          <property name="iconSize">
-           <size>
-            <width>22</width>
-            <height>22</height>
-           </size>
-          </property>
-         </widget>
-        </item>
-       </layout>
+       <number>5</number>
+      </property>
+      <property name="leftMargin">
+       <number>3</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>3</number>
+      </property>
+      <property name="bottomMargin">
+       <number>3</number>
+      </property>
+      <item>
+       <widget class="GoToWebButton" name="help_button">
+        <property name="text">
+         <string>Get help online</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer name="horizontalSpacer_4">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>133</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QLabel" name="follow_us_label">
+        <property name="font">
+         <font>
+          <pointsize>11</pointsize>
+         </font>
+        </property>
+        <property name="text">
+         <string>Talk to us</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QToolButton" name="twitter_button">
+        <property name="cursor">
+         <cursorShape>PointingHandCursor</cursorShape>
+        </property>
+        <property name="styleSheet">
+         <string notr="true">border: 0;</string>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+        <property name="icon">
+         <iconset resource="images.qrc">
+          <normaloff>:/twitter.png</normaloff>:/twitter.png</iconset>
+        </property>
+        <property name="iconSize">
+         <size>
+          <width>22</width>
+          <height>22</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QToolButton" name="facebook_button">
+        <property name="cursor">
+         <cursorShape>PointingHandCursor</cursorShape>
+        </property>
+        <property name="styleSheet">
+         <string notr="true">border: 0;</string>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+        <property name="icon">
+         <iconset resource="images.qrc">
+          <normaloff>:/facebook.png</normaloff>:/facebook.png</iconset>
+        </property>
+        <property name="iconSize">
+         <size>
+          <width>22</width>
+          <height>22</height>
+         </size>
+        </property>
+       </widget>
       </item>
      </layout>
     </widget>
@@ -415,6 +334,11 @@
  </widget>
  <customwidgets>
   <customwidget>
+   <class>GoToWebButton</class>
+   <extends>QPushButton</extends>
+   <header>ubuntuone.controlpanel.gui.qt.gotoweb</header>
+  </customwidget>
+  <customwidget>
    <class>FoldersPanel</class>
    <extends>QWidget</extends>
    <header>ubuntuone.controlpanel.gui.qt.folders</header>
@@ -439,11 +363,6 @@
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>GoToWebButton</class>
-   <extends>QPushButton</extends>
-   <header>ubuntuone.controlpanel.gui.qt.gotoweb</header>
-  </customwidget>
-  <customwidget>
    <class>AccountPanel</class>
    <extends>QWidget</extends>
    <header>ubuntuone.controlpanel.gui.qt.account</header>
 
=== modified file 'data/qt/device.ui'
--- data/qt/device.ui	2011-07-22 21:26:48 +0000
+++ data/qt/device.ui	2011-08-12 19:16:23 +0000
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
-    <height>63</height>
+    <width>233</width>
+    <height>36</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -44,7 +44,7 @@
    <item>
     <widget class="QPushButton" name="remove_device_button">
      <property name="text">
-      <string>Delete device</string>
+      <string>Remove</string>
      </property>
     </widget>
    </item>
 
=== modified file 'data/qt/devices.ui'
--- data/qt/devices.ui	2011-07-22 21:26:48 +0000
+++ data/qt/devices.ui	2011-08-12 19:16:23 +0000
@@ -6,14 +6,14 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>409</width>
-    <height>310</height>
+    <width>393</width>
+    <height>281</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string notr="true">Form</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
+  <layout class="QVBoxLayout" name="verticalLayout_3">
    <property name="spacing">
     <number>0</number>
    </property>
@@ -21,47 +21,34 @@
     <number>0</number>
    </property>
    <item>
-    <widget class="QFrame" name="frame">
-     <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
+    <widget class="QGroupBox" name="local_device">
+     <property name="title">
+      <string>This device</string>
      </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <property name="margin">
+       <number>0</number>
+      </property>
+      <item>
+       <layout class="QVBoxLayout" name="local_device_box"/>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="oher_devices">
+     <property name="title">
+      <string>Other devices</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_2">
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_2">
-        <item>
-         <layout class="QVBoxLayout" name="local_device_box"/>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout">
-        <item>
-         <widget class="QLabel" name="other_devices_label">
-          <property name="text">
-           <string>Other devices</string>
-          </property>
-         </widget>
-        </item>
-        <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>
-       </layout>
-      </item>
+      <property name="margin">
+       <number>0</number>
+      </property>
       <item>
        <widget class="QListWidget" name="list_devices">
+        <property name="verticalScrollBarPolicy">
+         <enum>Qt::ScrollBarAlwaysOn</enum>
+        </property>
         <property name="alternatingRowColors">
          <bool>true</bool>
         </property>
@@ -79,46 +66,49 @@
         </property>
        </widget>
       </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_3">
-        <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="GoToWebButton" name="manage_devices_button">
-          <property name="text">
-           <string>Go to the web page to manage your other devices</string>
-          </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>
      </layout>
     </widget>
    </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <property name="margin">
+      <number>3</number>
+     </property>
+     <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="GoToWebButton" name="manage_devices_button">
+       <property name="text">
+        <string>Go to the web page to manage your other devices</string>
+       </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>
   </layout>
  </widget>
  <customwidgets>
 
=== modified file 'data/qt/filesyncstatus.ui'
--- data/qt/filesyncstatus.ui	2011-07-22 21:26:48 +0000
+++ data/qt/filesyncstatus.ui	2011-08-12 19:16:23 +0000
@@ -6,52 +6,42 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>310</width>
-    <height>211</height>
+    <width>94</width>
+    <height>49</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string notr="true">Form</string>
   </property>
-  <layout class="QHBoxLayout" name="horizontalLayout_2">
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="margin">
+    <number>0</number>
+   </property>
    <item>
-    <layout class="QVBoxLayout" name="verticalLayout">
+    <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
-      <layout class="QHBoxLayout" name="horizontalLayout">
-       <item>
-        <widget class="QLabel" name="sync_status_icon">
-         <property name="text">
-          <string/>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLabel" name="sync_status_label">
-         <property name="text">
-          <string notr="true"/>
-         </property>
-         <property name="wordWrap">
-          <bool>true</bool>
-         </property>
-         <property name="buddy">
-          <cstring>sync_status_button</cstring>
-         </property>
-        </widget>
-       </item>
-      </layout>
+      <widget class="QLabel" name="sync_status_icon">
+      </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="sync_status_button">
-       <property name="toolTip">
-        <string>test</string>
-       </property>
+      <widget class="QLabel" name="sync_status_label">
        <property name="text">
         <string notr="true"/>
        </property>
+       <property name="wordWrap">
+        <bool>true</bool>
+       </property>
+       <property name="buddy">
+        <cstring>sync_status_button</cstring>
+       </property>
       </widget>
      </item>
     </layout>
    </item>
+   <item>
+    <widget class="QPushButton" name="sync_status_button">
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>
 
=== modified file 'data/qt/folders.ui'
--- data/qt/folders.ui	2011-07-22 21:26:48 +0000
+++ data/qt/folders.ui	2011-08-12 19:16:23 +0000
@@ -6,33 +6,86 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>607</width>
-    <height>435</height>
+    <width>345</width>
+    <height>279</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string notr="true">Form</string>
   </property>
   <property name="styleSheet">
-   <string notr="true"/>
+   <string notr="true">padding: 0px;</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <property name="margin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QFrame" name="frame_top">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>35</height>
+      </size>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout_2">
+      <property name="margin">
+       <number>3</number>
+      </property>
+      <item>
+       <widget class="GoToWebButton" name="share_publish_button">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>Go to the web for public and private sharing options</string>
+        </property>
+       </widget>
+      </item>
+      <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>
+     </layout>
+    </widget>
+   </item>
    <item>
     <widget class="QTreeWidget" name="folders">
+     <property name="verticalScrollBarPolicy">
+      <enum>Qt::ScrollBarAlwaysOn</enum>
+     </property>
      <property name="alternatingRowColors">
       <bool>true</bool>
      </property>
-     <property name="uniformRowHeights">
+     <property name="indentation">
+      <number>15</number>
+     </property>
+     <property name="rootIsDecorated">
       <bool>false</bool>
      </property>
      <property name="itemsExpandable">
       <bool>true</bool>
      </property>
      <property name="headerHidden">
-      <bool>false</bool>
+      <bool>true</bool>
      </property>
      <attribute name="headerVisible">
-      <bool>true</bool>
+      <bool>false</bool>
      </attribute>
      <attribute name="headerCascadingSectionResizes">
       <bool>false</bool>
@@ -61,41 +114,64 @@
      </column>
      <column>
       <property name="text">
-       <string> </string>
+       <string>Explore</string>
       </property>
      </column>
     </widget>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_3">
-     <item>
-      <widget class="GoToWebButton" name="share_publish_button">
-       <property name="text">
-        <string>Go to the web to share folders and publish files</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_3">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="AddFolderButton" name="add_folder_button">
-       <property name="text">
-        <string>Sync another folder with your cloud</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
+    <widget class="QFrame" name="frame_bottom">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>40</height>
+      </size>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <property name="margin">
+       <number>3</number>
+      </property>
+      <item>
+       <spacer name="horizontalSpacer_3">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>53</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="AddFolderButton" name="add_folder_button">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>Add a folder from this computer</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>
+    </widget>
    </item>
   </layout>
  </widget>
 
=== modified file 'data/qt/loadingoverlay.ui'
--- data/qt/loadingoverlay.ui	2011-07-22 21:26:48 +0000
+++ data/qt/loadingoverlay.ui	2011-08-12 19:16:23 +0000
@@ -1,118 +1,103 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Form</class>
- <widget class="QFrame" name="Form">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>702</width>
-    <height>230</height>
-   </rect>
-  </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="topMargin">
-    <number>30</number>
-   </property>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <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="QFrame" name="frm_box">
-       <property name="minimumSize">
-        <size>
-         <width>0</width>
-         <height>102</height>
-        </size>
-       </property>
-       <property name="styleSheet">
-        <string notr="true"/>
-       </property>
-       <property name="frameShape">
-        <enum>QFrame::StyledPanel</enum>
-       </property>
-       <property name="frameShadow">
-        <enum>QFrame::Raised</enum>
-       </property>
-       <layout class="QHBoxLayout" name="horizontalLayout">
-        <property name="topMargin">
-         <number>0</number>
-        </property>
-        <property name="bottomMargin">
-         <number>30</number>
-        </property>
-        <item>
-         <widget class="QLabel" name="label">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="font">
-           <font>
-            <pointsize>14</pointsize>
-           </font>
-          </property>
-          <property name="text">
-           <string>Please wait while we retrieve the information...</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-     </item>
-     <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>
-    </layout>
-   </item>
-   <item>
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QFrame" name="Form">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>702</width>
+    <height>230</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Frame</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="topMargin">
+    <number>30</number>
+   </property>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <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="QFrame" name="frm_box">
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>102</height>
+        </size>
+       </property>
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <property name="topMargin">
+         <number>0</number>
+        </property>
+        <property name="bottomMargin">
+         <number>30</number>
+        </property>
+        <item>
+         <widget class="QLabel" name="label">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="font">
+           <font>
+            <pointsize>14</pointsize>
+           </font>
+          </property>
+          <property name="text">
+           <string>Getting information, please wait...</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <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>
+    </layout>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
 
=== modified file 'data/qt/preferences.ui'
--- data/qt/preferences.ui	2011-07-22 21:26:48 +0000
+++ data/qt/preferences.ui	2011-08-12 19:16:23 +0000
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>469</width>
-    <height>352</height>
+    <width>433</width>
+    <height>328</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -21,13 +21,13 @@
     <number>0</number>
    </property>
    <item>
-    <widget class="QGroupBox" name="verticalGroupBox">
+    <widget class="QGroupBox" name="bandwidth_settings">
      <property name="title">
       <string>Bandwidth settings</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
-      <property name="verticalSpacing">
-       <number>10</number>
+      <property name="margin">
+       <number>0</number>
       </property>
       <item row="0" column="0">
        <widget class="QCheckBox" name="limit_uploads_checkbox">
@@ -120,13 +120,13 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="groupBox_2">
+    <widget class="QGroupBox" name="file_sync_settings">
      <property name="title">
       <string>File Sync Settings</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_1">
-      <property name="spacing">
-       <number>10</number>
+      <property name="margin">
+       <number>0</number>
       </property>
       <item>
        <widget class="QCheckBox" name="autoconnect_checkbox">
@@ -160,7 +160,23 @@
     </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">
+     <property name="margin">
+      <number>3</number>
+     </property>
      <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">
@@ -190,19 +206,6 @@
      </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>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
  <resources/>
 
=== modified file 'data/qt/ubuntuone.qss'
--- data/qt/ubuntuone.qss	2011-07-22 21:26:48 +0000
+++ data/qt/ubuntuone.qss	2011-08-12 19:16:23 +0000
@@ -2,19 +2,49 @@
     background-color: #dd4814;
 }
 
-QFrame#frmHeader {
+QWidget {
+    font-family: "Ubuntu";
+}
+
+QFrame {
+    border: none;
+}
+
+QFrame#frame_header {
     background: #ffffff;
     border-radius: 5px;
     border-style: solid;
     border-color: #939389;
     border-width: 1px;
-    color: white;
-    min-height: 100px;
+    min-height: 90px;
+}
+
+QFrame#frame_greeting {
+    margin 0px;
+    padding-left: 15px;
+    padding-top: 10px;
+    padding-right: 10px;
+    padding-bottom: 10px;
+}
+
+QFrame#frame_status,
+QFrame#frame_storage {
+    border-style: dotted;
+    border-color: #939389;
+    border-left-width: 1px;
+    padding: 10px;
+    min-width: 40px;
+}
+
+QFrame#account_separator {
+    border-style: dotted;
+    border-color: #939389;
+    border-bottom-width: 1px;
 }
 
 QPushButton[enabled="true"] {
     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-        stop: 0 #fecfc2,stop: 1.0 #e44e19);
+        stop: 0 #fecfc2, stop: 1.0 #e44e19);
     border-radius: 5px;
     border-style: solid;
     padding: 6px;
@@ -60,6 +90,32 @@
     height: 12px;
 }
 
+QPushButton#help_button {
+    background: transparent;
+    border: none;
+    color: white;
+    height: 20px;
+    text-decoration: underline;
+    padding: 0px;
+}
+
+QPushButton#explore_folder_button {
+    border: none;
+    background: none;
+    color: #595959;
+}
+
+QPushButton#add_folder_button {
+    padding: 5px;
+}
+
+GoToWebButton#share_publish_button {
+    background: transparent;
+    border: none;
+    color: #dd4814;
+    text-decoration: underline;
+}
+
 QTabBar::tab {
     height: 15px;
     color: #333333;
@@ -101,6 +157,13 @@
     border-left-color: #e4e0dd;
 }
 
+QTabBar::tab:hover {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+        stop: 0 #fafafa, stop: 0.4 #f4f4f4,
+        stop: 0.5 #e7e7e7, stop: 1.0 #fafafa);
+    text-decoration: underline;
+}
+
 QTabBar::tab:last:!selected {
     border-left-color: #e4e0dd;
 }
@@ -121,37 +184,22 @@
     border-width: 1px;
     background: white;
     border-top: 2px solid white;
- }
-
-QTabBar::tab:hover {
-    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-        stop: 0 #fafafa, stop: 0.4 #f4f4f4,
-        stop: 0.5 #e7e7e7, stop: 1.0 #fafafa);
- }
-
-QPushButton#help_button {
-    background: transparent;
-    border: none;
-    color: white;
-    height: 20px;
-    text-decoration: underline;
-    padding: 0px;
-}
-
-QPushButton#explore_folder_button {
-    border: none;
-    background: none;
 }
 
 QGroupBox {
     padding-top: 30px;
-    border: 0px solid;
+    border: none;
     margin-top: 1ex;
+}
+
+QGroupBox::title {
+    color: #333333;
     font: bold 15px;
 }
 
-QGroupBox::title {
-    color: #333333;
+QGroupBox#profile,
+QGroupBox#services {
+    padding-left: 5px;
 }
 
 QListWidget {
@@ -159,12 +207,11 @@
     alternate-background-color: #efedec;
 }
 
-QListWidget#listDevices::item {
+QListWidget#list_devices::item {
     min-height: 48px;
 }
 
-QLabel#other_devices_label,
-QLabel#title_label {
+QLabel#other_devices_label {
     font: bold 16px;
 }
 
@@ -176,7 +223,7 @@
     color: white;
 }
 
-QFrame#frm_box {
+QFrame#frm_box { /* the loadingoverlay frame */
     background: #ffffff;
     border-radius: 5px;
     border-style: solid;
@@ -186,6 +233,10 @@
     min-height: 100px;
 }
 
-QWidget {
-    font-family: "Ubuntu";
+QAbstractItemView {
+    border-style: solid;
+    border-color: #333333;
+    border-width: 1px;
+    alternate-background-color: #efedec;
+    background: #f7f6f5;
 }
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-07-26 17:11:27 +0000
+++ debian/changelog	2011-08-12 19:16:23 +0000
@@ -1,3 +1,10 @@
+ubuntuone-control-panel (1.1.2-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release.
+    - ImportError: cannot import name LOGFOLDER (LP: #823648)
+
+ -- Rodney Dawes <[e-mail]>  Fri, 12 Aug 2011 15:12:09 -0400
+
 ubuntuone-control-panel (1.1.1-0ubuntu2) oneiric; urgency=low
 
   * Add pyqt4-dev-tools and python-qt4 to Build-Depends to fix FTBFS
 
=== modified file 'debian/control'
--- debian/control	2011-07-26 17:11:27 +0000
+++ debian/control	2011-08-12 19:16:23 +0000
@@ -17,7 +17,7 @@
  ${python:Depends},
  python,
  python-ubuntuone-control-panel (= ${binary:Version}),
- ubuntuone-client (>= 1.6.0),
+ ubuntuone-client (>= 1.7.1),
 Recommends: ubuntuone-control-panel-gui
 Description: Ubuntu One Control Panel
  Desktop application to manage a Ubuntu One account.
@@ -37,7 +37,7 @@
  python-simplejson,
  python-twisted-core,
  python-twisted-web,
- python-ubuntuone-client (>= 1.6.0),
+ python-ubuntuone-client (>= 1.7.1),
  ubuntu-sso-client (>= 1.2.0),
 Description: Ubuntu One Control Panel Python Libraries
  Ubuntu One Control Panel provides a Python library to manage an Ubuntu One
@@ -55,9 +55,9 @@
  python-defer | python-aptdaemon,
  python-gobject (>= 2.21.5),
  python-gtk2,
- python-ubuntuone-client (>= 1.6.0),
+ python-ubuntuone-client (>= 1.7.1),
  ubuntu-sso-client (>= 1.2.0),
- ubuntuone-client (>= 1.6.0),
+ ubuntuone-client (>= 1.7.1),
  ubuntuone-control-panel (= ${binary:Version}),
 Provides: ubuntuone-control-panel-gui
 Description: Ubuntu One Control Panel
 
=== added file 'po/ubuntuone-control-panel.pot'
--- po/ubuntuone-control-panel.pot	1970-01-01 00:00:00 +0000
+++ po/ubuntuone-control-panel.pot	2011-08-12 19:16:23 +0000
@@ -0,0 +1,486 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-08-12 15:07-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../ubuntuone-control-panel-gtk.desktop.in.h:1
+msgid "Configure and manage your Ubuntu One account"
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:72
+msgid "Always in sync"
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:73
+msgid "Firefox extension"
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:74
+msgid "Connect to Ubuntu One"
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:75
+msgid "Evolution plug-in"
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:76
+msgid "There was a problem while retrieving the credentials."
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:77
+msgid "View your personal details and service summary"
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:79
+msgid "Welcome to Ubuntu One!"
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:80
+msgid ""
+"The information could not be retrieved. Maybe your internet connection is "
+"down?"
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:83
+#: ../ubuntuone/controlpanel/gui/__init__.py:156
+msgid ""
+"The settings could not be changed,\n"
+"previous values were restored."
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:85
+msgid "Are you sure you want to remove this device from Ubuntu One?"
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:88
+msgid "The device could not be removed."
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:89
+msgid "Manage devices registered with your personal cloud"
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:91
+msgid "The devices connected with your personal cloud are listed below."
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:93
+msgid "Explore"
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:94
+#, python-format
+msgid "<i>%(package_name)s</i> could not be installed"
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:95
+msgid "Sync another folder with your cloud"
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:96
+#, python-format
+msgid ""
+"The chosen directory \"%(folder_path)s\" is not valid. \n"
+"\n"
+"Please choose a folder inside your \"%(home_folder)s\" directory, and not "
+"overlapping with any existing cloud folder."
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:101
+msgid "My personal folders"
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:102
+#, python-format
+msgid "Shared by %(other_user_display_name)s"
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:103
+#, python-format
+msgid ""
+"The contents of your cloud folder will be merged with your local folder "
+"\"%(folder_path)s\" when subscribing.\n"
+"Do you want to subscribe to this cloud folder?"
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:107
+msgid "Manage your cloud folders"
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:109
+msgid ""
+"Select which folders from your cloud you want to sync with this computer"
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:111
+msgid "Connect"
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:112
+msgid "Connect the file sync service with your personal cloud"
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:114
+msgid "File Sync is disabled."
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:115
+msgid "Disconnect"
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:116
+msgid "Disconnect the file sync service from your personal cloud"
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:118
+msgid "File Sync is disconnected."
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:119
+msgid "Enable"
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:120
+msgid "Enable the file sync service"
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:121
+msgid "File Sync error."
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:122
+msgid "File Sync is up-to-date."
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:123
+msgid "Restart"
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:124
+msgid "Restart the file sync service"
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:125
+msgid "File Sync"
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:126
+msgid "Start"
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:127
+msgid "Start the file sync service"
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:128
+msgid "File Sync starting..."
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:129
+msgid "Stop"
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:130
+msgid "Stop the file sync service"
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:131
+msgid "File Sync is stopped."
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:132
+msgid "File Sync in progress..."
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:133
+#, python-format
+msgid "%(free_space)s available storage"
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:134
+#, python-format
+msgid "Hi %(user_display_name)s"
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:135
+#, python-format
+msgid ""
+"You need to install the package <i>%(package_name)s</i> in order to enable "
+"more sync services."
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:137
+#, python-format
+msgid "Install the %(plugin_name)s for the sync service: %(service_name)s"
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:139
+#, python-format
+msgid "Installation of <i>%(package_name)s</i> in progress"
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:140
+msgid "Loading..."
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:141
+#, python-format
+msgid "%(app_name)s Control Panel"
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:142
+msgid "My folders"
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:143
+msgid "[unknown user name]"
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:144
+msgid "Purchased Music"
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:146
+#, python-format
+msgid "An internet connection is required to join or sign in to %(app_name)s."
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:148
+msgid "No devices to show."
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:149
+msgid "No folders to show."
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:150
+msgid "There is no Ubuntu One pairing record."
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:151
+#, python-format
+msgid "%(percentage)s used"
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:152
+#, python-format
+msgid "Using %(used)s of %(total)s (%(percentage).0f%%)"
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:153
+#, python-format
+msgid "%(used)s of %(total)s"
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:154
+msgid "Manage the sync services"
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:155
+msgid "Enable the sync services for this computer."
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:158
+msgid "Manage the shares offered to others"
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:159
+msgid "Manage permissions for shares made to other users."
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:160
+#, python-format
+msgid "<i>%(package_name)s</i> was successfully installed"
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:161 ../data/gtk/volumes.ui.h:1
+msgid "Sync locally?"
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:162
+msgid "Value could not be retrieved."
+msgstr ""
+
+#: ../ubuntuone/controlpanel/gui/__init__.py:163
+msgid "Unknown error"
+msgstr ""
+
+#: ../data/gtk/dashboard.ui.h:1
+msgid "<b>Personal details</b>"
+msgstr ""
+
+#: ../data/gtk/dashboard.ui.h:2
+msgid "<b>Your services</b>"
+msgstr ""
+
+#: ../data/gtk/dashboard.ui.h:3
+msgid "Buy storage and plans"
+msgstr ""
+
+#: ../data/gtk/dashboard.ui.h:4
+msgid "Edit account details"
+msgstr ""
+
+#: ../data/gtk/device.ui.h:1
+msgid "KiB/s"
+msgstr ""
+
+#: ../data/gtk/device.ui.h:2
+msgid "Limit file sync bandwidth usage"
+msgstr ""
+
+#: ../data/gtk/device.ui.h:3
+msgid "Max download speed:"
+msgstr ""
+
+#: ../data/gtk/device.ui.h:4
+msgid "Max upload speed:"
+msgstr ""
+
+#: ../data/gtk/device.ui.h:5
+msgid "Show activity notifications"
+msgstr ""
+
+#: ../data/gtk/install.ui.h:1
+msgid "_Install now"
+msgstr ""
+
+#: ../data/gtk/management.ui.h:1
+msgid "Account"
+msgstr ""
+
+#: ../data/gtk/management.ui.h:2
+msgid "Cloud Folders"
+msgstr ""
+
+#: ../data/gtk/management.ui.h:3
+msgid "Community Support"
+msgstr ""
+
+#: ../data/gtk/management.ui.h:4
+msgid "Devices"
+msgstr ""
+
+#: ../data/gtk/management.ui.h:5
+msgid "Official Support"
+msgstr ""
+
+#: ../data/gtk/management.ui.h:6
+msgid "Services"
+msgstr ""
+
+#: ../data/gtk/management.ui.h:7
+msgid "Shares"
+msgstr ""
+
+#: ../data/gtk/management.ui.h:8
+msgid "Talk to us on:"
+msgstr ""
+
+#: ../data/gtk/management.ui.h:9
+msgid "http://twitter.com/ubuntuone"
+msgstr ""
+
+#: ../data/gtk/management.ui.h:10
+msgid "http://www.facebook.com/ubuntuone"
+msgstr ""
+
+#: ../data/gtk/overview.ui.h:1
+msgid ""
+"<span font=\"24\" foreground=\"#4d4d4d\">The Power of Your Personal Cloud</"
+"span>"
+msgstr ""
+
+#: ../data/gtk/overview.ui.h:2
+msgid "<span font_size=\"xx-large\" foreground=\"#4d4d4d\">Join now</span>"
+msgstr ""
+
+#: ../data/gtk/overview.ui.h:3
+msgid "<span foreground=\"#909090\">2GB of free storage</span>"
+msgstr ""
+
+#: ../data/gtk/overview.ui.h:4
+msgid "<span foreground=\"#909090\">Learn More</span>"
+msgstr ""
+
+#: ../data/gtk/overview.ui.h:5
+msgid ""
+"Files Anywhere\n"
+"<span foreground=\"#909090\">Back up and access your files from Ubuntu, "
+"Windows, Web or Mobile</span>"
+msgstr ""
+
+#: ../data/gtk/overview.ui.h:7
+msgid "I already have an account!"
+msgstr ""
+
+#: ../data/gtk/overview.ui.h:8
+msgid ""
+"Keep Connected\n"
+"<span foreground=\"#909090\">Unify your contacts across Desktop, Mobile and "
+"Web</span>"
+msgstr ""
+
+#: ../data/gtk/overview.ui.h:10
+msgid ""
+"Rock Out\n"
+"<span foreground=\"#909090\">Your entire collection follows you around with "
+"music streaming to Android and iPhone</span>"
+msgstr ""
+
+#: ../data/gtk/overview.ui.h:12
+msgid ""
+"Stay Productive\n"
+"<span foreground=\"#909090\">Keep your Firefox bookmarks and Tomboy notes "
+"synced</span>"
+msgstr ""
+
+#: ../data/gtk/services.ui.h:1
+msgid "<span font_size=\"small\">Bookmarks sync works with Firefox</span>"
+msgstr ""
+
+#: ../data/gtk/services.ui.h:2
+msgid ""
+"<span font_size=\"small\">Enable and then choose which folders you want to "
+"access from the Web or any device you connected to Ubuntu One\n"
+"\n"
+"Simply drag and drop any file or folder to your Ubuntu One folder on this "
+"computer</span>"
+msgstr ""
+
+#: ../data/gtk/services.ui.h:5
+msgid ""
+"<span font_size=\"small\">Once enabled, visit the <a href=\"https://one."
+"ubuntu.com\">Ubuntu One website</a> to manage your contacts, including Gmail "
+"and Facebook import</span>"
+msgstr ""
+
+#: ../data/gtk/services.ui.h:6
+msgid "Enable Bookmarks Sync"
+msgstr ""
+
+#: ../data/gtk/services.ui.h:7
+msgid "Enable Contacts Sync"
+msgstr ""
+
+#: ../data/gtk/services.ui.h:8
+msgid "Enable File Sync"
+msgstr ""
+
+#: ../data/gtk/services.ui.h:9
+msgid "_Show me my Ubuntu One folder"
+msgstr ""
 
=== modified file 'setup.py'
--- setup.py	2011-07-22 21:26:48 +0000
+++ setup.py	2011-08-12 19:16:23 +0000
@@ -223,7 +223,7 @@
 
 DistUtilsExtra.auto.setup(
     name='ubuntuone-control-panel',
-    version='1.1.1',
+    version='1.1.2',
     license='GPL v3',
     author='Natalia Bidart',
     author_email='[e-mail]',
 
=== modified file 'ubuntuone/controlpanel/backend.py'
--- ubuntuone/controlpanel/backend.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/backend.py	2011-08-12 19:16:23 +0000
@@ -656,7 +656,9 @@
         folder_path = append_path_sep(folder_path)
 
         # handle folder_path not within '~' or links
-        if not folder_path.startswith(user_home) or is_link(folder_path):
+        # XXX is_link expects bytes, see bug #824252
+        if not folder_path.startswith(user_home) or is_link(
+            folder_path.encode('utf-8')):
             returnValue(False)
 
         # handle folder_path nested with a existing cloud folder
 
=== modified file 'ubuntuone/controlpanel/gui/__init__.py'
--- ubuntuone/controlpanel/gui/__init__.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/gui/__init__.py	2011-08-12 19:16:23 +0000
@@ -69,7 +69,7 @@
 MANAGE_FILES_LINK = UBUNTUONE_LINK + 'files/'
 TWITTER_LINK = 'http://twitter.com/ubuntuone/'
 
-ALWAYS_SUBSCRIBED = _('Always in sync!')
+ALWAYS_SUBSCRIBED = _('Always in sync')
 BOOKMARKS = _('Firefox extension')
 CONNECT_BUTTON_LABEL = _('Connect to Ubuntu One')
 CONTACTS = _('Evolution plug-in')
@@ -98,7 +98,7 @@
                         'Please choose a folder inside your "%(home_folder)s" '
                         'directory, and not overlapping with any existing '
                         'cloud folder.')
-FOLDER_OWNED_BY = _('Personal folders')
+FOLDER_OWNED_BY = _('My personal folders')
 FOLDER_SHARED_BY = _('Shared by %(other_user_display_name)s')
 FOLDERS_CONFIRM_MERGE = _('The contents of your cloud folder will be merged '
                           'with your local folder "%(folder_path)s" when '
@@ -158,6 +158,7 @@
 SHARES_BUTTON_TOOLTIP = _('Manage the shares offered to others')
 SHARES_TITLE = _('Manage permissions for shares made to other users.')
 SUCCESS_INSTALL = _('<i>%(package_name)s</i> was successfully installed')
+SYNC_LOCALLY = _('Sync locally?')
 VALUE_ERROR = _('Value could not be retrieved.')
 UNKNOWN_ERROR = _('Unknown error')
 
@@ -187,7 +188,7 @@
                                    credentials["consumer_secret"])
     token = oauth.OAuthToken(credentials["token"],
                              credentials["token_secret"])
-    uri = 'https://one.ubuntu.com/api/1.0/from_oauth'
+    uri = 'https://one.ubuntu.com/api/1.0/from_oauth/'
     request = oauth.OAuthRequest.from_consumer_and_token(
         http_url=uri, http_method='GET',
         oauth_consumer=consumer, token=token,
 
=== modified file 'ubuntuone/controlpanel/gui/qt/controlpanel.py'
--- ubuntuone/controlpanel/gui/qt/controlpanel.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/gui/qt/controlpanel.py	2011-08-12 19:16:23 +0000
@@ -42,7 +42,7 @@
 
 logger = setup_logging('qt.controlpanel')
 
-NAME_STYLE = '<br><span style=" font-size:26pt;">%s!</span>'
+NAME_STYLE = '<br><span style=" font-size:24pt;">%s!</span>'
 PERCENTAGE_STYLE = '<span style=" font-size:16pt;">%.0f%%</span>'
 
 
 
=== modified file 'ubuntuone/controlpanel/gui/qt/folders.py'
--- ubuntuone/controlpanel/gui/qt/folders.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/gui/qt/folders.py	2011-08-12 19:16:23 +0000
@@ -40,6 +40,7 @@
     MUSIC_REAL_PATH,
     NAME_NOT_SET,
     SHARE_ICON_NAME,
+    SYNC_LOCALLY,
 )
 from ubuntuone.controlpanel.gui.qt import uri_hook, icon_from_name
 from ubuntuone.controlpanel.gui.qt.ubuntuonebin import UbuntuOneBin
@@ -48,8 +49,6 @@
 
 logger = setup_logging('qt.folders')
 
-ROW_HEADER = u'<font size="5"><b>%s</b></font>'
-
 FOLDER_NAME_COL = 0
 SUBSCRIPTION_COL = 1
 EXPLORE_COL = 2
@@ -79,6 +78,8 @@
         headers.setStretchLastSection(False)
 
         self.ui.share_publish_button.uri = MANAGE_FILES_LINK
+        icon = icon_from_name('external_icon_orange')
+        self.ui.share_publish_button.setIcon(icon)
 
         logger.debug('%s: started.', self.__class__.__name__)
 
@@ -109,23 +110,22 @@
 
             if name:
                 name = FOLDER_SHARED_BY % {'other_user_display_name': name}
-                # we already added user folders, let's add an empty row
-                empty_row = QtGui.QTreeWidgetItem()
-                empty_row.is_empty = True
-                self.ui.folders.addTopLevelItem(empty_row)
             else:
                 name = FOLDER_OWNED_BY
 
             item = QtGui.QTreeWidgetItem()
+            item.setText(FOLDER_NAME_COL, name)
+            item.setText(SUBSCRIPTION_COL, SYNC_LOCALLY)
+            item.setSizeHint(FOLDER_NAME_COL, QtCore.QSize(-1, 20))
+            brush = QtGui.QBrush(QtGui.QColor('#d6d3cf'))
+            for col in (FOLDER_NAME_COL, SUBSCRIPTION_COL, EXPLORE_COL):
+                item.setBackground(col, brush)
             item.is_empty = False
             self.ui.folders.addTopLevelItem(item)
 
-            model_index = self.ui.folders.indexFromItem(item, FOLDER_NAME_COL)
-            title = QtGui.QLabel(ROW_HEADER % (name,))
-            self.ui.folders.setIndexWidget(model_index, title)
-
             for volume in volumes:
                 child = QtGui.QTreeWidgetItem()
+                child.setSizeHint(FOLDER_NAME_COL, QtCore.QSize(-1, 35))
                 child.volume_path = volume['path']
                 child.volume_id = volume['volume_id']
 
@@ -168,6 +168,7 @@
                 button.icon_obj = icon  # hack!
                 button.setIcon(icon_from_name(FOLDER_ICON_NAME))
                 button.setIconSize(QtCore.QSize(12, 12))
+                button.setText(EXPLORE)
                 button.setObjectName('explore_folder_button')
                 policy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed,
                                            QtGui.QSizePolicy.Fixed)
@@ -187,7 +188,7 @@
 
     def on_folders_itemActivated(self, item, column=None):
         """User activated a given row, open the path in a file browser."""
-        volume_path = item.volume_path
+        volume_path = getattr(item, 'volume_path', None)
         if volume_path is None:
             logger.warning('on_folders_itemActivated: volume_path for item %r '
                            'and column %r is None.', item, column)
 
=== modified file 'ubuntuone/controlpanel/gui/qt/loadingoverlay.py'
--- ubuntuone/controlpanel/gui/qt/loadingoverlay.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/gui/qt/loadingoverlay.py	2011-08-12 19:16:23 +0000
@@ -106,7 +106,8 @@
         palette.setColor(palette.Background, QtCore.Qt.transparent)
         self.setPalette(palette)
 
-        self.timer = self.startTimer(200)
+        if not self.timer:
+            self.timer = self.startTimer(200)
 
     # Invalid name "timerEvent"
     # pylint: disable=C0103
 
=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_folders.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_folders.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_folders.py	2011-08-12 19:16:23 +0000
@@ -85,6 +85,12 @@
         yield super(FoldersPanelVolumesInfoTestCase, self).setUp()
         yield self.ui.load()
 
+    def assert_folder_group_header_correct(self, item, name):
+        """Check that the folder group header is correct."""
+        self.assertEqual(item.text(gui.FOLDER_NAME_COL), name)
+        self.assertEqual(item.text(gui.SUBSCRIPTION_COL), gui.SYNC_LOCALLY)
+        self.assertEqual(item.text(gui.EXPLORE_COL), '')
+
     @defer.inlineCallbacks
     def test_is_processing_while_asking_info(self):
         """The ui is processing while the contents are loaded."""
@@ -113,7 +119,7 @@
         folders = self.ui.ui.folders
 
         root = folders.invisibleRootItem()
-        self.assertEqual(len(FAKE_VOLUMES_INFO) + 1, root.childCount())
+        self.assertEqual(len(FAKE_VOLUMES_INFO), root.childCount())
 
         treeiter = gui.QtGui.QTreeWidgetItemIterator(folders)
         for name, _, volumes in FAKE_VOLUMES_INFO:
@@ -123,9 +129,7 @@
             item = treeiter.value()
             self.assertFalse(item.is_empty)
 
-            model_index = folders.indexFromItem(item, gui.FOLDER_NAME_COL)
-            label = folders.indexWidget(model_index).text()
-            self.assertEqual(label, gui.ROW_HEADER % name)
+            self.assert_folder_group_header_correct(item, name)
 
             # check children
             self.assertEqual(len(volumes), item.childCount())
@@ -175,18 +179,13 @@
             treeiter += 1
             item = treeiter.value()
 
-            if item is not None:
-                self.assertTrue(item.is_empty)
-                # skip the empty row
-                treeiter += 1
-
     def test_process_info_clears_the_list(self):
         """The old volumes info is cleared before updated."""
         self.ui.process_info(FAKE_VOLUMES_INFO)
         self.ui.process_info(FAKE_VOLUMES_INFO)
 
         root = self.ui.ui.folders.invisibleRootItem()
-        self.assertEqual(len(FAKE_VOLUMES_INFO) + 1, root.childCount())
+        self.assertEqual(len(FAKE_VOLUMES_INFO), root.childCount())
 
     def test_process_info_with_no_volumes(self):
         """When there are no volumes, a notification is shown."""
@@ -198,7 +197,6 @@
     def test_process_info_highlights_little_free_space(self):
         """The free space is red if is zero (or close to 0)."""
         self.ui.process_info(FAKE_VOLUMES_NO_FREE_SPACE_INFO)
-        folders = self.ui.ui.folders
 
         child_index = 0
         root = self.ui.ui.folders.invisibleRootItem()
@@ -207,19 +205,11 @@
 
             item = root.child(child_index)
             self.assertFalse(item.is_empty)
-
-            model_index = folders.indexFromItem(item, gui.FOLDER_NAME_COL)
-            label = folders.indexWidget(model_index).text()
-            self.assertEqual(label, gui.ROW_HEADER % name)
+            self.assert_folder_group_header_correct(item, name)
 
             child_index += 1
             item = root.child(child_index)
 
-            if item is not None:
-                # skip the empty row
-                self.assertTrue(item.is_empty)
-                child_index += 1
-
     def test_process_info_handles_no_quota_info(self):
         """The lack of free space is handled."""
         info = [
@@ -231,7 +221,6 @@
                u'type': self.ui.backend.SHARE_TYPE}]),
         ]
         self.ui.process_info(info)
-        folders = self.ui.ui.folders
 
         child_index = 0
         root = self.ui.ui.folders.invisibleRootItem()
@@ -240,19 +229,11 @@
 
             item = root.child(child_index)
             self.assertFalse(item.is_empty)
-
-            model_index = folders.indexFromItem(item, gui.FOLDER_NAME_COL)
-            label = folders.indexWidget(model_index).text()
-            self.assertEqual(label, gui.ROW_HEADER % name)
+            self.assert_folder_group_header_correct(item, name)
 
             child_index += 1
             item = root.child(child_index)
 
-            if item is not None:
-                # skip the empty row
-                self.assertTrue(item.is_empty)
-                child_index += 1
-
     def test_clicking_on_row_opens_folder(self):
         """The folder activated is opened."""
         self.patch(gui.os.path, 'exists', lambda *a: True)
 
=== modified file 'ubuntuone/controlpanel/gui/qt/ui/account_ui.py'
--- ubuntuone/controlpanel/gui/qt/ui/account_ui.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/gui/qt/ui/account_ui.py	2011-08-12 19:16:23 +0000
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'data/qt/account.ui'
 #
-# Created: Fri Jul 22 17:06:43 2011
+# Created: Fri Aug 12 15:07:18 2011
 #      by: PyQt4 UI code generator 4.8.3
 #
 # WARNING! All changes made in this file will be lost!
@@ -18,60 +18,67 @@
 class Ui_Form(object):
     def setupUi(self, Form):
         Form.setObjectName(_fromUtf8("Form"))
-        Form.resize(321, 205)
+        Form.resize(381, 167)
         self.verticalLayout = QtGui.QVBoxLayout(Form)
         self.verticalLayout.setMargin(0)
         self.verticalLayout.setObjectName(_fromUtf8("verticalLayout"))
-        self.horizontalGroupBox = QtGui.QGroupBox(Form)
-        self.horizontalGroupBox.setObjectName(_fromUtf8("horizontalGroupBox"))
-        self.horizontalLayout = QtGui.QHBoxLayout(self.horizontalGroupBox)
-        self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout"))
+        self.gridLayout_2 = QtGui.QGridLayout()
+        self.gridLayout_2.setVerticalSpacing(30)
+        self.gridLayout_2.setObjectName(_fromUtf8("gridLayout_2"))
+        self.edit_profile_button = GoToWebButton(Form)
+        self.edit_profile_button.setObjectName(_fromUtf8("edit_profile_button"))
+        self.gridLayout_2.addWidget(self.edit_profile_button, 2, 2, 1, 1)
+        self.services = QtGui.QGroupBox(Form)
+        self.services.setObjectName(_fromUtf8("services"))
+        self.verticalLayout_3 = QtGui.QVBoxLayout(self.services)
+        self.verticalLayout_3.setMargin(0)
+        self.verticalLayout_3.setObjectName(_fromUtf8("verticalLayout_3"))
+        self.services_description_label = QtGui.QLabel(self.services)
+        self.services_description_label.setText(_fromUtf8(""))
+        self.services_description_label.setObjectName(_fromUtf8("services_description_label"))
+        self.verticalLayout_3.addWidget(self.services_description_label)
+        self.gridLayout_2.addWidget(self.services, 2, 0, 1, 1)
+        self.account_separator = QtGui.QFrame(Form)
+        self.account_separator.setFrameShape(QtGui.QFrame.HLine)
+        self.account_separator.setFrameShadow(QtGui.QFrame.Sunken)
+        self.account_separator.setObjectName(_fromUtf8("account_separator"))
+        self.gridLayout_2.addWidget(self.account_separator, 1, 0, 1, 4)
+        self.profile_info = QtGui.QGroupBox(Form)
+        self.profile_info.setObjectName(_fromUtf8("profile_info"))
+        self.verticalLayout_4 = QtGui.QVBoxLayout(self.profile_info)
+        self.verticalLayout_4.setMargin(0)
+        self.verticalLayout_4.setObjectName(_fromUtf8("verticalLayout_4"))
         self.verticalLayout_2 = QtGui.QVBoxLayout()
         self.verticalLayout_2.setObjectName(_fromUtf8("verticalLayout_2"))
-        self.name_label = QtGui.QLabel(self.horizontalGroupBox)
+        self.name_label = QtGui.QLabel(self.profile_info)
         self.name_label.setText(_fromUtf8(""))
         self.name_label.setObjectName(_fromUtf8("name_label"))
         self.verticalLayout_2.addWidget(self.name_label)
-        self.email_label = QtGui.QLabel(self.horizontalGroupBox)
+        self.email_label = QtGui.QLabel(self.profile_info)
         self.email_label.setText(_fromUtf8(""))
         self.email_label.setObjectName(_fromUtf8("email_label"))
         self.verticalLayout_2.addWidget(self.email_label)
-        self.horizontalLayout.addLayout(self.verticalLayout_2)
+        self.verticalLayout_4.addLayout(self.verticalLayout_2)
+        self.gridLayout_2.addWidget(self.profile_info, 0, 0, 1, 1)
+        self.edit_services_button = GoToWebButton(Form)
+        self.edit_services_button.setObjectName(_fromUtf8("edit_services_button"))
+        self.gridLayout_2.addWidget(self.edit_services_button, 0, 2, 1, 1)
         spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.horizontalLayout.addItem(spacerItem)
-        self.edit_profile_button = GoToWebButton(self.horizontalGroupBox)
-        self.edit_profile_button.setObjectName(_fromUtf8("edit_profile_button"))
-        self.horizontalLayout.addWidget(self.edit_profile_button)
+        self.gridLayout_2.addItem(spacerItem, 0, 3, 1, 1)
         spacerItem1 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.horizontalLayout.addItem(spacerItem1)
-        self.verticalLayout.addWidget(self.horizontalGroupBox)
-        self.horizontalGroupBox_2 = QtGui.QGroupBox(Form)
-        self.horizontalGroupBox_2.setObjectName(_fromUtf8("horizontalGroupBox_2"))
-        self.horizontalLayout_2 = QtGui.QHBoxLayout(self.horizontalGroupBox_2)
-        self.horizontalLayout_2.setObjectName(_fromUtf8("horizontalLayout_2"))
-        self.services_description_label = QtGui.QLabel(self.horizontalGroupBox_2)
-        self.services_description_label.setText(_fromUtf8(""))
-        self.services_description_label.setObjectName(_fromUtf8("services_description_label"))
-        self.horizontalLayout_2.addWidget(self.services_description_label)
-        spacerItem2 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.horizontalLayout_2.addItem(spacerItem2)
-        self.edit_services_button = GoToWebButton(self.horizontalGroupBox_2)
-        self.edit_services_button.setObjectName(_fromUtf8("edit_services_button"))
-        self.horizontalLayout_2.addWidget(self.edit_services_button)
-        spacerItem3 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.horizontalLayout_2.addItem(spacerItem3)
-        self.verticalLayout.addWidget(self.horizontalGroupBox_2)
-        spacerItem4 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
-        self.verticalLayout.addItem(spacerItem4)
+        self.gridLayout_2.addItem(spacerItem1, 0, 1, 1, 1)
+        self.verticalLayout.addLayout(self.gridLayout_2)
+        spacerItem2 = QtGui.QSpacerItem(20, 10, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+        self.verticalLayout.addItem(spacerItem2)
 
         self.retranslateUi(Form)
         QtCore.QMetaObject.connectSlotsByName(Form)
 
     def retranslateUi(self, Form):
         Form.setWindowTitle(_('Form'))
-        self.horizontalGroupBox.setTitle(_('Personal details'))
         self.edit_profile_button.setText(_('Edit personal details online'))
-        self.horizontalGroupBox_2.setTitle(_('Your services'))
+        self.services.setTitle(_('Your services'))
+        self.profile_info.setTitle(_('Personal details'))
         self.edit_services_button.setText(_('Edit your services  online'))
 
 from ubuntuone.controlpanel.gui.qt.gotoweb import GoToWebButton
 
=== modified file 'ubuntuone/controlpanel/gui/qt/ui/controlpanel_ui.py'
--- ubuntuone/controlpanel/gui/qt/ui/controlpanel_ui.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/gui/qt/ui/controlpanel_ui.py	2011-08-12 19:16:23 +0000
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'data/qt/controlpanel.ui'
 #
-# Created: Fri Jul 22 17:06:43 2011
+# Created: Fri Aug 12 15:07:18 2011
 #      by: PyQt4 UI code generator 4.8.3
 #
 # WARNING! All changes made in this file will be lost!
@@ -18,7 +18,7 @@
 class Ui_Form(object):
     def setupUi(self, Form):
         Form.setObjectName(_fromUtf8("Form"))
-        Form.resize(536, 389)
+        Form.resize(387, 203)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
@@ -26,65 +26,48 @@
         Form.setSizePolicy(sizePolicy)
         Form.setWindowTitle(_fromUtf8("Form"))
         self.verticalLayout = QtGui.QVBoxLayout(Form)
-        self.verticalLayout.setSpacing(4)
+        self.verticalLayout.setSpacing(3)
         self.verticalLayout.setMargin(0)
         self.verticalLayout.setObjectName(_fromUtf8("verticalLayout"))
-        self.frmHeader = QtGui.QFrame(Form)
-        self.frmHeader.setFrameShape(QtGui.QFrame.StyledPanel)
-        self.frmHeader.setFrameShadow(QtGui.QFrame.Raised)
-        self.frmHeader.setObjectName(_fromUtf8("frmHeader"))
-        self.horizontalLayout_4 = QtGui.QHBoxLayout(self.frmHeader)
-        self.horizontalLayout_4.setSpacing(0)
-        self.horizontalLayout_4.setContentsMargins(15, 10, 10, 10)
-        self.horizontalLayout_4.setObjectName(_fromUtf8("horizontalLayout_4"))
-        self.horizontalLayout = QtGui.QHBoxLayout()
-        self.horizontalLayout.setSpacing(0)
-        self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout"))
-        self.vLayoutGreeting = QtGui.QVBoxLayout()
-        self.vLayoutGreeting.setSpacing(0)
-        self.vLayoutGreeting.setSizeConstraint(QtGui.QLayout.SetDefaultConstraint)
-        self.vLayoutGreeting.setObjectName(_fromUtf8("vLayoutGreeting"))
-        self.greeting_label = QtGui.QLabel(self.frmHeader)
-        font = QtGui.QFont()
-        font.setPointSize(10)
-        self.greeting_label.setFont(font)
-        self.greeting_label.setLayoutDirection(QtCore.Qt.LeftToRight)
-        self.greeting_label.setAutoFillBackground(False)
-        self.greeting_label.setText(_fromUtf8(""))
+        self.frame_header = QtGui.QFrame(Form)
+        self.frame_header.setObjectName(_fromUtf8("frame_header"))
+        self.horizontalLayout_2 = QtGui.QHBoxLayout(self.frame_header)
+        self.horizontalLayout_2.setSpacing(5)
+        self.horizontalLayout_2.setMargin(0)
+        self.horizontalLayout_2.setObjectName(_fromUtf8("horizontalLayout_2"))
+        self.frame_greeting = QtGui.QFrame(self.frame_header)
+        self.frame_greeting.setObjectName(_fromUtf8("frame_greeting"))
+        self.verticalLayout_4 = QtGui.QVBoxLayout(self.frame_greeting)
+        self.verticalLayout_4.setMargin(0)
+        self.verticalLayout_4.setObjectName(_fromUtf8("verticalLayout_4"))
+        self.greeting_label = QtGui.QLabel(self.frame_greeting)
         self.greeting_label.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop)
-        self.greeting_label.setMargin(0)
-        self.greeting_label.setIndent(-1)
         self.greeting_label.setObjectName(_fromUtf8("greeting_label"))
-        self.vLayoutGreeting.addWidget(self.greeting_label)
-        self.horizontalLayout.addLayout(self.vLayoutGreeting)
+        self.verticalLayout_4.addWidget(self.greeting_label)
+        self.horizontalLayout_2.addWidget(self.frame_greeting)
         spacerItem = QtGui.QSpacerItem(15, 20, QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Minimum)
-        self.horizontalLayout.addItem(spacerItem)
-        self.frameStorage = QtGui.QFrame(self.frmHeader)
+        self.horizontalLayout_2.addItem(spacerItem)
+        self.frame_storage = QtGui.QFrame(self.frame_header)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.frameStorage.sizePolicy().hasHeightForWidth())
-        self.frameStorage.setSizePolicy(sizePolicy)
-        self.frameStorage.setMaximumSize(QtCore.QSize(166, 16777215))
-        self.frameStorage.setFrameShape(QtGui.QFrame.StyledPanel)
-        self.frameStorage.setFrameShadow(QtGui.QFrame.Raised)
-        self.frameStorage.setObjectName(_fromUtf8("frameStorage"))
-        self.horizontalLayout_7 = QtGui.QHBoxLayout(self.frameStorage)
-        self.horizontalLayout_7.setSpacing(0)
-        self.horizontalLayout_7.setContentsMargins(10, 0, 10, 0)
-        self.horizontalLayout_7.setObjectName(_fromUtf8("horizontalLayout_7"))
-        self.vLayoutStorage = QtGui.QVBoxLayout()
+        sizePolicy.setHeightForWidth(self.frame_storage.sizePolicy().hasHeightForWidth())
+        self.frame_storage.setSizePolicy(sizePolicy)
+        self.frame_storage.setMinimumSize(QtCore.QSize(165, 0))
+        self.frame_storage.setMaximumSize(QtCore.QSize(165, 16777215))
+        self.frame_storage.setObjectName(_fromUtf8("frame_storage"))
+        self.vLayoutStorage = QtGui.QVBoxLayout(self.frame_storage)
+        self.vLayoutStorage.setSpacing(6)
         self.vLayoutStorage.setSizeConstraint(QtGui.QLayout.SetDefaultConstraint)
+        self.vLayoutStorage.setMargin(0)
         self.vLayoutStorage.setObjectName(_fromUtf8("vLayoutStorage"))
-        self.frmQuota = QtGui.QFrame(self.frameStorage)
-        self.frmQuota.setFrameShape(QtGui.QFrame.StyledPanel)
-        self.frmQuota.setFrameShadow(QtGui.QFrame.Raised)
-        self.frmQuota.setObjectName(_fromUtf8("frmQuota"))
-        self.verticalLayout_3 = QtGui.QVBoxLayout(self.frmQuota)
+        self.frame_quota = QtGui.QFrame(self.frame_storage)
+        self.frame_quota.setObjectName(_fromUtf8("frame_quota"))
+        self.verticalLayout_3 = QtGui.QVBoxLayout(self.frame_quota)
         self.verticalLayout_3.setSpacing(2)
-        self.verticalLayout_3.setContentsMargins(0, 0, 0, 10)
+        self.verticalLayout_3.setMargin(0)
         self.verticalLayout_3.setObjectName(_fromUtf8("verticalLayout_3"))
-        self.percentage_usage_label = QtGui.QLabel(self.frmQuota)
+        self.percentage_usage_label = QtGui.QLabel(self.frame_quota)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
@@ -93,39 +76,42 @@
         self.percentage_usage_label.setText(_fromUtf8(""))
         self.percentage_usage_label.setObjectName(_fromUtf8("percentage_usage_label"))
         self.verticalLayout_3.addWidget(self.percentage_usage_label)
-        self.quota_usage_label = QtGui.QLabel(self.frmQuota)
+        self.quota_usage_label = QtGui.QLabel(self.frame_quota)
         font = QtGui.QFont()
         font.setPointSize(8)
         self.quota_usage_label.setFont(font)
         self.quota_usage_label.setText(_fromUtf8(""))
         self.quota_usage_label.setObjectName(_fromUtf8("quota_usage_label"))
         self.verticalLayout_3.addWidget(self.quota_usage_label)
-        self.vLayoutStorage.addWidget(self.frmQuota)
-        self.get_more_space_button = GoToWebButton(self.frameStorage)
+        self.vLayoutStorage.addWidget(self.frame_quota)
+        self.get_more_space_button = GoToWebButton(self.frame_storage)
         self.get_more_space_button.setObjectName(_fromUtf8("get_more_space_button"))
         self.vLayoutStorage.addWidget(self.get_more_space_button)
-        self.horizontalLayout_7.addLayout(self.vLayoutStorage)
-        self.horizontalLayout.addWidget(self.frameStorage)
-        self.frameStatus = QtGui.QFrame(self.frmHeader)
+        self.horizontalLayout_2.addWidget(self.frame_storage)
+        self.frame_status = QtGui.QFrame(self.frame_header)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.frameStatus.sizePolicy().hasHeightForWidth())
-        self.frameStatus.setSizePolicy(sizePolicy)
-        self.frameStatus.setMaximumSize(QtCore.QSize(166, 16777215))
-        self.frameStatus.setFrameShape(QtGui.QFrame.StyledPanel)
-        self.frameStatus.setFrameShadow(QtGui.QFrame.Raised)
-        self.frameStatus.setObjectName(_fromUtf8("frameStatus"))
-        self.horizontalLayout_8 = QtGui.QHBoxLayout(self.frameStatus)
-        self.horizontalLayout_8.setSpacing(0)
-        self.horizontalLayout_8.setContentsMargins(10, 0, 0, 0)
+        sizePolicy.setHeightForWidth(self.frame_status.sizePolicy().hasHeightForWidth())
+        self.frame_status.setSizePolicy(sizePolicy)
+        self.frame_status.setMinimumSize(QtCore.QSize(165, 0))
+        self.frame_status.setMaximumSize(QtCore.QSize(165, 16777215))
+        self.frame_status.setObjectName(_fromUtf8("frame_status"))
+        self.horizontalLayout_8 = QtGui.QHBoxLayout(self.frame_status)
+        self.horizontalLayout_8.setMargin(0)
         self.horizontalLayout_8.setObjectName(_fromUtf8("horizontalLayout_8"))
-        self.file_sync_status = FileSyncStatus(self.frameStatus)
+        self.file_sync_status = FileSyncStatus(self.frame_status)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.file_sync_status.sizePolicy().hasHeightForWidth())
+        self.file_sync_status.setSizePolicy(sizePolicy)
+        self.file_sync_status.setMinimumSize(QtCore.QSize(0, 0))
+        self.file_sync_status.setMaximumSize(QtCore.QSize(165, 16777215))
         self.file_sync_status.setObjectName(_fromUtf8("file_sync_status"))
         self.horizontalLayout_8.addWidget(self.file_sync_status)
-        self.horizontalLayout.addWidget(self.frameStatus)
-        self.horizontalLayout_4.addLayout(self.horizontalLayout)
-        self.verticalLayout.addWidget(self.frmHeader)
+        self.horizontalLayout_2.addWidget(self.frame_status)
+        self.verticalLayout.addWidget(self.frame_header)
         self.tab_widget = QtGui.QTabWidget(Form)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.MinimumExpanding)
         sizePolicy.setHorizontalStretch(0)
@@ -146,31 +132,24 @@
         self.account_tab.setObjectName(_fromUtf8("account_tab"))
         self.tab_widget.addTab(self.account_tab, _fromUtf8(""))
         self.verticalLayout.addWidget(self.tab_widget)
-        self.frmFooter = QtGui.QFrame(Form)
-        self.frmFooter.setMaximumSize(QtCore.QSize(16777215, 30))
-        self.frmFooter.setFrameShape(QtGui.QFrame.StyledPanel)
-        self.frmFooter.setFrameShadow(QtGui.QFrame.Raised)
-        self.frmFooter.setObjectName(_fromUtf8("frmFooter"))
-        self.verticalLayout_2 = QtGui.QVBoxLayout(self.frmFooter)
-        self.verticalLayout_2.setSpacing(0)
-        self.verticalLayout_2.setMargin(0)
-        self.verticalLayout_2.setObjectName(_fromUtf8("verticalLayout_2"))
-        self.hLayoutFooter = QtGui.QHBoxLayout()
-        self.hLayoutFooter.setSpacing(5)
-        self.hLayoutFooter.setContentsMargins(3, -1, 3, -1)
-        self.hLayoutFooter.setObjectName(_fromUtf8("hLayoutFooter"))
-        self.help_button = GoToWebButton(self.frmFooter)
+        self.frame_footer = QtGui.QFrame(Form)
+        self.frame_footer.setObjectName(_fromUtf8("frame_footer"))
+        self.horizontalLayout = QtGui.QHBoxLayout(self.frame_footer)
+        self.horizontalLayout.setSpacing(5)
+        self.horizontalLayout.setContentsMargins(3, 0, 3, 3)
+        self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout"))
+        self.help_button = GoToWebButton(self.frame_footer)
         self.help_button.setObjectName(_fromUtf8("help_button"))
-        self.hLayoutFooter.addWidget(self.help_button)
-        spacerItem1 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.hLayoutFooter.addItem(spacerItem1)
-        self.follow_us_label = QtGui.QLabel(self.frmFooter)
+        self.horizontalLayout.addWidget(self.help_button)
+        spacerItem1 = QtGui.QSpacerItem(133, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.horizontalLayout.addItem(spacerItem1)
+        self.follow_us_label = QtGui.QLabel(self.frame_footer)
         font = QtGui.QFont()
         font.setPointSize(11)
         self.follow_us_label.setFont(font)
         self.follow_us_label.setObjectName(_fromUtf8("follow_us_label"))
-        self.hLayoutFooter.addWidget(self.follow_us_label)
-        self.twitter_button = QtGui.QToolButton(self.frmFooter)
+        self.horizontalLayout.addWidget(self.follow_us_label)
+        self.twitter_button = QtGui.QToolButton(self.frame_footer)
         self.twitter_button.setCursor(QtCore.Qt.PointingHandCursor)
         self.twitter_button.setStyleSheet(_fromUtf8("border: 0;"))
         self.twitter_button.setText(_fromUtf8(""))
@@ -179,8 +158,8 @@
         self.twitter_button.setIcon(icon)
         self.twitter_button.setIconSize(QtCore.QSize(22, 22))
         self.twitter_button.setObjectName(_fromUtf8("twitter_button"))
-        self.hLayoutFooter.addWidget(self.twitter_button)
-        self.facebook_button = QtGui.QToolButton(self.frmFooter)
+        self.horizontalLayout.addWidget(self.twitter_button)
+        self.facebook_button = QtGui.QToolButton(self.frame_footer)
         self.facebook_button.setCursor(QtCore.Qt.PointingHandCursor)
         self.facebook_button.setStyleSheet(_fromUtf8("border: 0;"))
         self.facebook_button.setText(_fromUtf8(""))
@@ -189,9 +168,8 @@
         self.facebook_button.setIcon(icon1)
         self.facebook_button.setIconSize(QtCore.QSize(22, 22))
         self.facebook_button.setObjectName(_fromUtf8("facebook_button"))
-        self.hLayoutFooter.addWidget(self.facebook_button)
-        self.verticalLayout_2.addLayout(self.hLayoutFooter)
-        self.verticalLayout.addWidget(self.frmFooter)
+        self.horizontalLayout.addWidget(self.facebook_button)
+        self.verticalLayout.addWidget(self.frame_footer)
 
         self.retranslateUi(Form)
         self.tab_widget.setCurrentIndex(0)
@@ -201,7 +179,7 @@
         Form.setTabOrder(self.twitter_button, self.facebook_button)
 
     def retranslateUi(self, Form):
-        self.get_more_space_button.setText(_('Get more storage!'))
+        self.get_more_space_button.setText(_('Get more storage'))
         self.tab_widget.setTabText(self.tab_widget.indexOf(self.folders_tab), _('Folders'))
         self.tab_widget.setTabText(self.tab_widget.indexOf(self.devices_tab), _('Devices'))
         self.tab_widget.setTabText(self.tab_widget.indexOf(self.preferences_tab), _('Preferences'))
 
=== modified file 'ubuntuone/controlpanel/gui/qt/ui/device_ui.py'
--- ubuntuone/controlpanel/gui/qt/ui/device_ui.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/gui/qt/ui/device_ui.py	2011-08-12 19:16:23 +0000
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'data/qt/device.ui'
 #
-# Created: Fri Jul 22 17:06:43 2011
+# Created: Fri Aug 12 15:07:18 2011
 #      by: PyQt4 UI code generator 4.8.3
 #
 # WARNING! All changes made in this file will be lost!
@@ -18,7 +18,7 @@
 class Ui_Form(object):
     def setupUi(self, Form):
         Form.setObjectName(_fromUtf8("Form"))
-        Form.resize(400, 63)
+        Form.resize(233, 36)
         Form.setWindowTitle(_fromUtf8("Form"))
         self.horizontalLayout = QtGui.QHBoxLayout(Form)
         self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout"))
@@ -40,6 +40,6 @@
 
     def retranslateUi(self, Form):
         self.device_name_label.setText(_('Local device'))
-        self.remove_device_button.setText(_('Delete device'))
+        self.remove_device_button.setText(_('Remove'))
 
 import images_rc
 
=== modified file 'ubuntuone/controlpanel/gui/qt/ui/devices_ui.py'
--- ubuntuone/controlpanel/gui/qt/ui/devices_ui.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/gui/qt/ui/devices_ui.py	2011-08-12 19:16:23 +0000
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'data/qt/devices.ui'
 #
-# Created: Fri Jul 22 17:06:43 2011
+# Created: Fri Aug 12 15:07:18 2011
 #      by: PyQt4 UI code generator 4.8.3
 #
 # WARNING! All changes made in this file will be lost!
@@ -18,56 +18,53 @@
 class Ui_Form(object):
     def setupUi(self, Form):
         Form.setObjectName(_fromUtf8("Form"))
-        Form.resize(409, 310)
+        Form.resize(393, 281)
         Form.setWindowTitle(_fromUtf8("Form"))
-        self.verticalLayout = QtGui.QVBoxLayout(Form)
-        self.verticalLayout.setSpacing(0)
+        self.verticalLayout_3 = QtGui.QVBoxLayout(Form)
+        self.verticalLayout_3.setSpacing(0)
+        self.verticalLayout_3.setMargin(0)
+        self.verticalLayout_3.setObjectName(_fromUtf8("verticalLayout_3"))
+        self.local_device = QtGui.QGroupBox(Form)
+        self.local_device.setObjectName(_fromUtf8("local_device"))
+        self.verticalLayout = QtGui.QVBoxLayout(self.local_device)
         self.verticalLayout.setMargin(0)
         self.verticalLayout.setObjectName(_fromUtf8("verticalLayout"))
-        self.frame = QtGui.QFrame(Form)
-        self.frame.setFrameShape(QtGui.QFrame.StyledPanel)
-        self.frame.setFrameShadow(QtGui.QFrame.Raised)
-        self.frame.setObjectName(_fromUtf8("frame"))
-        self.verticalLayout_2 = QtGui.QVBoxLayout(self.frame)
-        self.verticalLayout_2.setObjectName(_fromUtf8("verticalLayout_2"))
-        self.horizontalLayout_2 = QtGui.QHBoxLayout()
-        self.horizontalLayout_2.setObjectName(_fromUtf8("horizontalLayout_2"))
         self.local_device_box = QtGui.QVBoxLayout()
         self.local_device_box.setObjectName(_fromUtf8("local_device_box"))
-        self.horizontalLayout_2.addLayout(self.local_device_box)
-        self.verticalLayout_2.addLayout(self.horizontalLayout_2)
-        self.horizontalLayout = QtGui.QHBoxLayout()
-        self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout"))
-        self.other_devices_label = QtGui.QLabel(self.frame)
-        self.other_devices_label.setObjectName(_fromUtf8("other_devices_label"))
-        self.horizontalLayout.addWidget(self.other_devices_label)
-        spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.horizontalLayout.addItem(spacerItem)
-        self.verticalLayout_2.addLayout(self.horizontalLayout)
-        self.list_devices = QtGui.QListWidget(self.frame)
+        self.verticalLayout.addLayout(self.local_device_box)
+        self.verticalLayout_3.addWidget(self.local_device)
+        self.oher_devices = QtGui.QGroupBox(Form)
+        self.oher_devices.setObjectName(_fromUtf8("oher_devices"))
+        self.verticalLayout_2 = QtGui.QVBoxLayout(self.oher_devices)
+        self.verticalLayout_2.setMargin(0)
+        self.verticalLayout_2.setObjectName(_fromUtf8("verticalLayout_2"))
+        self.list_devices = QtGui.QListWidget(self.oher_devices)
+        self.list_devices.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOn)
         self.list_devices.setAlternatingRowColors(True)
         self.list_devices.setIconSize(QtCore.QSize(32, 32))
         self.list_devices.setSpacing(0)
         self.list_devices.setSelectionRectVisible(False)
         self.list_devices.setObjectName(_fromUtf8("list_devices"))
         self.verticalLayout_2.addWidget(self.list_devices)
+        self.verticalLayout_3.addWidget(self.oher_devices)
         self.horizontalLayout_3 = QtGui.QHBoxLayout()
+        self.horizontalLayout_3.setMargin(3)
         self.horizontalLayout_3.setObjectName(_fromUtf8("horizontalLayout_3"))
+        spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.horizontalLayout_3.addItem(spacerItem)
+        self.manage_devices_button = GoToWebButton(Form)
+        self.manage_devices_button.setObjectName(_fromUtf8("manage_devices_button"))
+        self.horizontalLayout_3.addWidget(self.manage_devices_button)
         spacerItem1 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
         self.horizontalLayout_3.addItem(spacerItem1)
-        self.manage_devices_button = GoToWebButton(self.frame)
-        self.manage_devices_button.setObjectName(_fromUtf8("manage_devices_button"))
-        self.horizontalLayout_3.addWidget(self.manage_devices_button)
-        spacerItem2 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.horizontalLayout_3.addItem(spacerItem2)
-        self.verticalLayout_2.addLayout(self.horizontalLayout_3)
-        self.verticalLayout.addWidget(self.frame)
+        self.verticalLayout_3.addLayout(self.horizontalLayout_3)
 
         self.retranslateUi(Form)
         QtCore.QMetaObject.connectSlotsByName(Form)
 
     def retranslateUi(self, Form):
-        self.other_devices_label.setText(_('Other devices'))
+        self.local_device.setTitle(_('This device'))
+        self.oher_devices.setTitle(_('Other devices'))
         self.manage_devices_button.setText(_('Go to the web page to manage your other devices'))
 
 from ubuntuone.controlpanel.gui.qt.gotoweb import GoToWebButton
 
=== modified file 'ubuntuone/controlpanel/gui/qt/ui/filesyncstatus_ui.py'
--- ubuntuone/controlpanel/gui/qt/ui/filesyncstatus_ui.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/gui/qt/ui/filesyncstatus_ui.py	2011-08-12 19:16:23 +0000
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'data/qt/filesyncstatus.ui'
 #
-# Created: Fri Jul 22 17:06:43 2011
+# Created: Fri Aug 12 15:07:18 2011
 #      by: PyQt4 UI code generator 4.8.3
 #
 # WARNING! All changes made in this file will be lost!
@@ -18,16 +18,14 @@
 class Ui_Form(object):
     def setupUi(self, Form):
         Form.setObjectName(_fromUtf8("Form"))
-        Form.resize(310, 211)
+        Form.resize(94, 49)
         Form.setWindowTitle(_fromUtf8("Form"))
-        self.horizontalLayout_2 = QtGui.QHBoxLayout(Form)
-        self.horizontalLayout_2.setObjectName(_fromUtf8("horizontalLayout_2"))
-        self.verticalLayout = QtGui.QVBoxLayout()
+        self.verticalLayout = QtGui.QVBoxLayout(Form)
+        self.verticalLayout.setMargin(0)
         self.verticalLayout.setObjectName(_fromUtf8("verticalLayout"))
         self.horizontalLayout = QtGui.QHBoxLayout()
         self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout"))
         self.sync_status_icon = QtGui.QLabel(Form)
-        self.sync_status_icon.setText(_fromUtf8(""))
         self.sync_status_icon.setObjectName(_fromUtf8("sync_status_icon"))
         self.horizontalLayout.addWidget(self.sync_status_icon)
         self.sync_status_label = QtGui.QLabel(Form)
@@ -37,15 +35,13 @@
         self.horizontalLayout.addWidget(self.sync_status_label)
         self.verticalLayout.addLayout(self.horizontalLayout)
         self.sync_status_button = QtGui.QPushButton(Form)
-        self.sync_status_button.setText(_fromUtf8(""))
         self.sync_status_button.setObjectName(_fromUtf8("sync_status_button"))
         self.verticalLayout.addWidget(self.sync_status_button)
-        self.horizontalLayout_2.addLayout(self.verticalLayout)
         self.sync_status_label.setBuddy(self.sync_status_button)
 
         self.retranslateUi(Form)
         QtCore.QMetaObject.connectSlotsByName(Form)
 
     def retranslateUi(self, Form):
-        self.sync_status_button.setToolTip(_('test'))
+        pass
 
 
=== modified file 'ubuntuone/controlpanel/gui/qt/ui/folders_ui.py'
--- ubuntuone/controlpanel/gui/qt/ui/folders_ui.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/gui/qt/ui/folders_ui.py	2011-08-12 19:16:23 +0000
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'data/qt/folders.ui'
 #
-# Created: Fri Jul 22 17:06:43 2011
+# Created: Fri Aug 12 15:07:18 2011
 #      by: PyQt4 UI code generator 4.8.3
 #
 # WARNING! All changes made in this file will be lost!
@@ -18,45 +18,74 @@
 class Ui_Form(object):
     def setupUi(self, Form):
         Form.setObjectName(_fromUtf8("Form"))
-        Form.resize(607, 435)
+        Form.resize(345, 279)
         Form.setWindowTitle(_fromUtf8("Form"))
-        Form.setStyleSheet(_fromUtf8(""))
+        Form.setStyleSheet(_fromUtf8("padding: 0px;"))
         self.verticalLayout = QtGui.QVBoxLayout(Form)
+        self.verticalLayout.setSpacing(0)
+        self.verticalLayout.setMargin(0)
         self.verticalLayout.setObjectName(_fromUtf8("verticalLayout"))
+        self.frame_top = QtGui.QFrame(Form)
+        self.frame_top.setMinimumSize(QtCore.QSize(0, 35))
+        self.frame_top.setObjectName(_fromUtf8("frame_top"))
+        self.horizontalLayout_2 = QtGui.QHBoxLayout(self.frame_top)
+        self.horizontalLayout_2.setMargin(3)
+        self.horizontalLayout_2.setObjectName(_fromUtf8("horizontalLayout_2"))
+        self.share_publish_button = GoToWebButton(self.frame_top)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.share_publish_button.sizePolicy().hasHeightForWidth())
+        self.share_publish_button.setSizePolicy(sizePolicy)
+        self.share_publish_button.setObjectName(_fromUtf8("share_publish_button"))
+        self.horizontalLayout_2.addWidget(self.share_publish_button)
+        spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.horizontalLayout_2.addItem(spacerItem)
+        self.verticalLayout.addWidget(self.frame_top)
         self.folders = QtGui.QTreeWidget(Form)
+        self.folders.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOn)
         self.folders.setAlternatingRowColors(True)
-        self.folders.setUniformRowHeights(False)
+        self.folders.setIndentation(15)
+        self.folders.setRootIsDecorated(False)
         self.folders.setItemsExpandable(True)
-        self.folders.setHeaderHidden(False)
+        self.folders.setHeaderHidden(True)
         self.folders.setObjectName(_fromUtf8("folders"))
-        self.folders.header().setVisible(True)
+        self.folders.header().setVisible(False)
         self.folders.header().setCascadingSectionResizes(False)
         self.folders.header().setDefaultSectionSize(300)
         self.folders.header().setHighlightSections(False)
         self.folders.header().setSortIndicatorShown(False)
         self.folders.header().setStretchLastSection(True)
         self.verticalLayout.addWidget(self.folders)
-        self.horizontalLayout_3 = QtGui.QHBoxLayout()
-        self.horizontalLayout_3.setObjectName(_fromUtf8("horizontalLayout_3"))
-        self.share_publish_button = GoToWebButton(Form)
-        self.share_publish_button.setObjectName(_fromUtf8("share_publish_button"))
-        self.horizontalLayout_3.addWidget(self.share_publish_button)
-        spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.horizontalLayout_3.addItem(spacerItem)
-        self.add_folder_button = AddFolderButton(Form)
+        self.frame_bottom = QtGui.QFrame(Form)
+        self.frame_bottom.setMinimumSize(QtCore.QSize(0, 40))
+        self.frame_bottom.setObjectName(_fromUtf8("frame_bottom"))
+        self.horizontalLayout = QtGui.QHBoxLayout(self.frame_bottom)
+        self.horizontalLayout.setMargin(3)
+        self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout"))
+        spacerItem1 = QtGui.QSpacerItem(53, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.horizontalLayout.addItem(spacerItem1)
+        self.add_folder_button = AddFolderButton(self.frame_bottom)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.add_folder_button.sizePolicy().hasHeightForWidth())
+        self.add_folder_button.setSizePolicy(sizePolicy)
         self.add_folder_button.setObjectName(_fromUtf8("add_folder_button"))
-        self.horizontalLayout_3.addWidget(self.add_folder_button)
-        self.verticalLayout.addLayout(self.horizontalLayout_3)
+        self.horizontalLayout.addWidget(self.add_folder_button)
+        spacerItem2 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.horizontalLayout.addItem(spacerItem2)
+        self.verticalLayout.addWidget(self.frame_bottom)
 
         self.retranslateUi(Form)
         QtCore.QMetaObject.connectSlotsByName(Form)
 
     def retranslateUi(self, Form):
+        self.share_publish_button.setText(_('Go to the web for public and private sharing options'))
         self.folders.headerItem().setText(0, _('Name'))
         self.folders.headerItem().setText(1, _('Sync Locally?'))
-        self.folders.headerItem().setText(2, _(' '))
-        self.share_publish_button.setText(_('Go to the web to share folders and publish files'))
-        self.add_folder_button.setText(_('Sync another folder with your cloud'))
+        self.folders.headerItem().setText(2, _('Explore'))
+        self.add_folder_button.setText(_('Add a folder from this computer'))
 
 from ubuntuone.controlpanel.gui.qt.gotoweb import GoToWebButton
 from ubuntuone.controlpanel.gui.qt.addfolder import AddFolderButton
 
=== modified file 'ubuntuone/controlpanel/gui/qt/ui/images_rc.py'
--- ubuntuone/controlpanel/gui/qt/ui/images_rc.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/gui/qt/ui/images_rc.py	2011-08-12 19:16:23 +0000
@@ -2,7 +2,7 @@
 
 # Resource object code
 #
-# Created: Fri Jul 22 17:06:43 2011
+# Created: Fri Aug 12 15:07:18 2011
 #      by: The Resource Compiler for PyQt (Qt v4.7.2)
 #
 # WARNING! All changes made in this file will be lost!
@@ -412,102 +412,180 @@
 \x04\xc3\x06\xd0\xb4\xf6\x1c\xaa\xf8\x39\x94\x8f\x12\xe1\x00\x01\
 \x06\x00\x00\x4e\x7e\x7b\x48\x93\x95\x27\x00\x00\x00\x00\x49\x45\
 \x4e\x44\xae\x42\x60\x82\
-\x00\x00\x0f\x1d\
+\x00\x00\x12\xb1\
 \x51\
 \x4d\x61\x69\x6e\x57\x69\x6e\x64\x6f\x77\x20\x7b\x0a\x20\x20\x20\
 \x20\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x2d\x63\x6f\x6c\x6f\
 \x72\x3a\x20\x23\x64\x64\x34\x38\x31\x34\x3b\x0a\x7d\x0a\x0a\x51\
-\x46\x72\x61\x6d\x65\x23\x66\x72\x6d\x48\x65\x61\x64\x65\x72\x20\
-\x7b\x0a\x20\x20\x20\x20\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\
-\x3a\x20\x23\x66\x66\x66\x66\x66\x66\x3b\x0a\x20\x20\x20\x20\x62\
-\x6f\x72\x64\x65\x72\x2d\x72\x61\x64\x69\x75\x73\x3a\x20\x35\x70\
-\x78\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\x73\x74\
-\x79\x6c\x65\x3a\x20\x73\x6f\x6c\x69\x64\x3b\x0a\x20\x20\x20\x20\
-\x62\x6f\x72\x64\x65\x72\x2d\x63\x6f\x6c\x6f\x72\x3a\x20\x23\x39\
-\x33\x39\x33\x38\x39\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\
-\x72\x2d\x77\x69\x64\x74\x68\x3a\x20\x31\x70\x78\x3b\x0a\x20\x20\
-\x20\x20\x63\x6f\x6c\x6f\x72\x3a\x20\x77\x68\x69\x74\x65\x3b\x0a\
-\x20\x20\x20\x20\x6d\x69\x6e\x2d\x68\x65\x69\x67\x68\x74\x3a\x20\
-\x31\x30\x30\x70\x78\x3b\x0a\x7d\x0a\x0a\x51\x50\x75\x73\x68\x42\
-\x75\x74\x74\x6f\x6e\x5b\x65\x6e\x61\x62\x6c\x65\x64\x3d\x22\x74\
-\x72\x75\x65\x22\x5d\x20\x7b\x0a\x20\x20\x20\x20\x62\x61\x63\x6b\
-\x67\x72\x6f\x75\x6e\x64\x3a\x20\x71\x6c\x69\x6e\x65\x61\x72\x67\
-\x72\x61\x64\x69\x65\x6e\x74\x28\x78\x31\x3a\x20\x30\x2c\x20\x79\
-\x31\x3a\x20\x30\x2c\x20\x78\x32\x3a\x20\x30\x2c\x20\x79\x32\x3a\
-\x20\x31\x2c\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x73\x74\x6f\x70\
-\x3a\x20\x30\x20\x23\x66\x65\x63\x66\x63\x32\x2c\x73\x74\x6f\x70\
-\x3a\x20\x31\x2e\x30\x20\x23\x65\x34\x34\x65\x31\x39\x29\x3b\x0a\
-\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\x72\x61\x64\x69\x75\
-\x73\x3a\x20\x35\x70\x78\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\
-\x65\x72\x2d\x73\x74\x79\x6c\x65\x3a\x20\x73\x6f\x6c\x69\x64\x3b\
-\x0a\x20\x20\x20\x20\x70\x61\x64\x64\x69\x6e\x67\x3a\x20\x36\x70\
-\x78\x3b\x0a\x20\x20\x20\x20\x63\x6f\x6c\x6f\x72\x3a\x20\x77\x68\
-\x69\x74\x65\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\
+\x57\x69\x64\x67\x65\x74\x20\x7b\x0a\x20\x20\x20\x20\x66\x6f\x6e\
+\x74\x2d\x66\x61\x6d\x69\x6c\x79\x3a\x20\x22\x55\x62\x75\x6e\x74\
+\x75\x22\x3b\x0a\x7d\x0a\x0a\x51\x46\x72\x61\x6d\x65\x20\x7b\x0a\
+\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x3a\x20\x6e\x6f\x6e\x65\
+\x3b\x0a\x7d\x0a\x0a\x51\x46\x72\x61\x6d\x65\x23\x66\x72\x61\x6d\
+\x65\x5f\x68\x65\x61\x64\x65\x72\x20\x7b\x0a\x20\x20\x20\x20\x62\
+\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3a\x20\x23\x66\x66\x66\x66\
+\x66\x66\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\x72\
+\x61\x64\x69\x75\x73\x3a\x20\x35\x70\x78\x3b\x0a\x20\x20\x20\x20\
+\x62\x6f\x72\x64\x65\x72\x2d\x73\x74\x79\x6c\x65\x3a\x20\x73\x6f\
+\x6c\x69\x64\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\
 \x63\x6f\x6c\x6f\x72\x3a\x20\x23\x39\x33\x39\x33\x38\x39\x3b\x0a\
 \x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\x77\x69\x64\x74\x68\
-\x3a\x20\x31\x70\x78\x3b\x0a\x20\x20\x20\x20\x68\x65\x69\x67\x68\
-\x74\x3a\x20\x31\x34\x70\x78\x3b\x0a\x7d\x0a\x0a\x51\x50\x75\x73\
-\x68\x42\x75\x74\x74\x6f\x6e\x3a\x68\x6f\x76\x65\x72\x5b\x65\x6e\
-\x61\x62\x6c\x65\x64\x3d\x22\x74\x72\x75\x65\x22\x5d\x20\x7b\x0a\
-\x20\x20\x20\x20\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3a\x20\
-\x71\x6c\x69\x6e\x65\x61\x72\x67\x72\x61\x64\x69\x65\x6e\x74\x28\
-\x78\x31\x3a\x20\x30\x2c\x20\x79\x31\x3a\x20\x30\x2c\x20\x78\x32\
-\x3a\x20\x30\x2c\x20\x79\x32\x3a\x20\x31\x2c\x0a\x20\x20\x20\x20\
-\x20\x20\x20\x20\x73\x74\x6f\x70\x3a\x20\x30\x20\x23\x66\x65\x64\
-\x61\x64\x31\x2c\x73\x74\x6f\x70\x3a\x20\x31\x2e\x30\x20\x23\x65\
-\x34\x37\x61\x35\x35\x29\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\
-\x65\x72\x2d\x72\x61\x64\x69\x75\x73\x3a\x20\x35\x70\x78\x3b\x0a\
+\x3a\x20\x31\x70\x78\x3b\x0a\x20\x20\x20\x20\x6d\x69\x6e\x2d\x68\
+\x65\x69\x67\x68\x74\x3a\x20\x39\x30\x70\x78\x3b\x0a\x7d\x0a\x0a\
+\x51\x46\x72\x61\x6d\x65\x23\x66\x72\x61\x6d\x65\x5f\x67\x72\x65\
+\x65\x74\x69\x6e\x67\x20\x7b\x0a\x20\x20\x20\x20\x6d\x61\x72\x67\
+\x69\x6e\x20\x30\x70\x78\x3b\x0a\x20\x20\x20\x20\x70\x61\x64\x64\
+\x69\x6e\x67\x2d\x6c\x65\x66\x74\x3a\x20\x31\x35\x70\x78\x3b\x0a\
+\x20\x20\x20\x20\x70\x61\x64\x64\x69\x6e\x67\x2d\x74\x6f\x70\x3a\
+\x20\x31\x30\x70\x78\x3b\x0a\x20\x20\x20\x20\x70\x61\x64\x64\x69\
+\x6e\x67\x2d\x72\x69\x67\x68\x74\x3a\x20\x31\x30\x70\x78\x3b\x0a\
+\x20\x20\x20\x20\x70\x61\x64\x64\x69\x6e\x67\x2d\x62\x6f\x74\x74\
+\x6f\x6d\x3a\x20\x31\x30\x70\x78\x3b\x0a\x7d\x0a\x0a\x51\x46\x72\
+\x61\x6d\x65\x23\x66\x72\x61\x6d\x65\x5f\x73\x74\x61\x74\x75\x73\
+\x2c\x0a\x51\x46\x72\x61\x6d\x65\x23\x66\x72\x61\x6d\x65\x5f\x73\
+\x74\x6f\x72\x61\x67\x65\x20\x7b\x0a\x20\x20\x20\x20\x62\x6f\x72\
+\x64\x65\x72\x2d\x73\x74\x79\x6c\x65\x3a\x20\x64\x6f\x74\x74\x65\
+\x64\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\x63\x6f\
+\x6c\x6f\x72\x3a\x20\x23\x39\x33\x39\x33\x38\x39\x3b\x0a\x20\x20\
+\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\x6c\x65\x66\x74\x2d\x77\x69\
+\x64\x74\x68\x3a\x20\x31\x70\x78\x3b\x0a\x20\x20\x20\x20\x70\x61\
+\x64\x64\x69\x6e\x67\x3a\x20\x31\x30\x70\x78\x3b\x0a\x20\x20\x20\
+\x20\x6d\x69\x6e\x2d\x77\x69\x64\x74\x68\x3a\x20\x34\x30\x70\x78\
+\x3b\x0a\x7d\x0a\x0a\x51\x46\x72\x61\x6d\x65\x23\x61\x63\x63\x6f\
+\x75\x6e\x74\x5f\x73\x65\x70\x61\x72\x61\x74\x6f\x72\x20\x7b\x0a\
 \x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\x73\x74\x79\x6c\x65\
-\x3a\x20\x73\x6f\x6c\x69\x64\x3b\x0a\x20\x20\x20\x20\x70\x61\x64\
-\x64\x69\x6e\x67\x3a\x20\x36\x70\x78\x3b\x0a\x20\x20\x20\x20\x63\
-\x6f\x6c\x6f\x72\x3a\x20\x77\x68\x69\x74\x65\x3b\x0a\x20\x20\x20\
-\x20\x62\x6f\x72\x64\x65\x72\x2d\x63\x6f\x6c\x6f\x72\x3a\x20\x23\
-\x39\x33\x39\x33\x38\x39\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\
-\x65\x72\x2d\x77\x69\x64\x74\x68\x3a\x20\x31\x70\x78\x3b\x0a\x20\
-\x20\x20\x20\x68\x65\x69\x67\x68\x74\x3a\x20\x31\x32\x70\x78\x3b\
-\x0a\x7d\x0a\x0a\x51\x50\x75\x73\x68\x42\x75\x74\x74\x6f\x6e\x3a\
-\x70\x72\x65\x73\x73\x65\x64\x5b\x65\x6e\x61\x62\x6c\x65\x64\x3d\
-\x22\x74\x72\x75\x65\x22\x5d\x20\x7b\x0a\x20\x20\x20\x20\x62\x61\
-\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3a\x20\x71\x6c\x69\x6e\x65\x61\
-\x72\x67\x72\x61\x64\x69\x65\x6e\x74\x28\x78\x31\x3a\x20\x30\x2c\
-\x20\x79\x31\x3a\x20\x30\x2c\x20\x78\x32\x3a\x20\x30\x2c\x20\x79\
-\x32\x3a\x20\x31\x2c\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x73\x74\
-\x6f\x70\x3a\x20\x30\x20\x23\x65\x34\x34\x65\x31\x39\x2c\x73\x74\
-\x6f\x70\x3a\x20\x31\x2e\x30\x20\x23\x66\x65\x63\x66\x63\x32\x29\
-\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\x72\x61\x64\
-\x69\x75\x73\x3a\x20\x35\x70\x78\x3b\x0a\x20\x20\x20\x20\x62\x6f\
-\x72\x64\x65\x72\x2d\x73\x74\x79\x6c\x65\x3a\x20\x73\x6f\x6c\x69\
-\x64\x3b\x0a\x20\x20\x20\x20\x70\x61\x64\x64\x69\x6e\x67\x3a\x20\
-\x36\x70\x78\x3b\x0a\x20\x20\x20\x20\x63\x6f\x6c\x6f\x72\x3a\x20\
-\x77\x68\x69\x74\x65\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\
-\x72\x2d\x63\x6f\x6c\x6f\x72\x3a\x20\x23\x39\x33\x39\x33\x38\x39\
-\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\x77\x69\x64\
-\x74\x68\x3a\x20\x31\x70\x78\x3b\x0a\x20\x20\x20\x20\x68\x65\x69\
-\x67\x68\x74\x3a\x20\x31\x32\x70\x78\x3b\x0a\x7d\x0a\x0a\x51\x50\
-\x75\x73\x68\x42\x75\x74\x74\x6f\x6e\x5b\x65\x6e\x61\x62\x6c\x65\
-\x64\x3d\x22\x66\x61\x6c\x73\x65\x22\x5d\x20\x7b\x0a\x20\x20\x20\
+\x3a\x20\x64\x6f\x74\x74\x65\x64\x3b\x0a\x20\x20\x20\x20\x62\x6f\
+\x72\x64\x65\x72\x2d\x63\x6f\x6c\x6f\x72\x3a\x20\x23\x39\x33\x39\
+\x33\x38\x39\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\
+\x62\x6f\x74\x74\x6f\x6d\x2d\x77\x69\x64\x74\x68\x3a\x20\x31\x70\
+\x78\x3b\x0a\x7d\x0a\x0a\x51\x50\x75\x73\x68\x42\x75\x74\x74\x6f\
+\x6e\x5b\x65\x6e\x61\x62\x6c\x65\x64\x3d\x22\x74\x72\x75\x65\x22\
+\x5d\x20\x7b\x0a\x20\x20\x20\x20\x62\x61\x63\x6b\x67\x72\x6f\x75\
+\x6e\x64\x3a\x20\x71\x6c\x69\x6e\x65\x61\x72\x67\x72\x61\x64\x69\
+\x65\x6e\x74\x28\x78\x31\x3a\x20\x30\x2c\x20\x79\x31\x3a\x20\x30\
+\x2c\x20\x78\x32\x3a\x20\x30\x2c\x20\x79\x32\x3a\x20\x31\x2c\x0a\
+\x20\x20\x20\x20\x20\x20\x20\x20\x73\x74\x6f\x70\x3a\x20\x30\x20\
+\x23\x66\x65\x63\x66\x63\x32\x2c\x20\x73\x74\x6f\x70\x3a\x20\x31\
+\x2e\x30\x20\x23\x65\x34\x34\x65\x31\x39\x29\x3b\x0a\x20\x20\x20\
+\x20\x62\x6f\x72\x64\x65\x72\x2d\x72\x61\x64\x69\x75\x73\x3a\x20\
+\x35\x70\x78\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\
+\x73\x74\x79\x6c\x65\x3a\x20\x73\x6f\x6c\x69\x64\x3b\x0a\x20\x20\
+\x20\x20\x70\x61\x64\x64\x69\x6e\x67\x3a\x20\x36\x70\x78\x3b\x0a\
+\x20\x20\x20\x20\x63\x6f\x6c\x6f\x72\x3a\x20\x77\x68\x69\x74\x65\
+\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\x63\x6f\x6c\
+\x6f\x72\x3a\x20\x23\x39\x33\x39\x33\x38\x39\x3b\x0a\x20\x20\x20\
+\x20\x62\x6f\x72\x64\x65\x72\x2d\x77\x69\x64\x74\x68\x3a\x20\x31\
+\x70\x78\x3b\x0a\x20\x20\x20\x20\x68\x65\x69\x67\x68\x74\x3a\x20\
+\x31\x34\x70\x78\x3b\x0a\x7d\x0a\x0a\x51\x50\x75\x73\x68\x42\x75\
+\x74\x74\x6f\x6e\x3a\x68\x6f\x76\x65\x72\x5b\x65\x6e\x61\x62\x6c\
+\x65\x64\x3d\x22\x74\x72\x75\x65\x22\x5d\x20\x7b\x0a\x20\x20\x20\
 \x20\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3a\x20\x71\x6c\x69\
 \x6e\x65\x61\x72\x67\x72\x61\x64\x69\x65\x6e\x74\x28\x78\x31\x3a\
 \x20\x30\x2c\x20\x79\x31\x3a\x20\x30\x2c\x20\x78\x32\x3a\x20\x30\
 \x2c\x20\x79\x32\x3a\x20\x31\x2c\x0a\x20\x20\x20\x20\x20\x20\x20\
-\x20\x73\x74\x6f\x70\x3a\x20\x30\x20\x23\x65\x61\x65\x61\x65\x61\
-\x2c\x20\x73\x74\x6f\x70\x3a\x20\x31\x2e\x30\x20\x23\x63\x61\x63\
-\x61\x63\x61\x29\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\
-\x2d\x72\x61\x64\x69\x75\x73\x3a\x20\x35\x70\x78\x3b\x0a\x20\x20\
-\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\x73\x74\x79\x6c\x65\x3a\x20\
-\x73\x6f\x6c\x69\x64\x3b\x0a\x20\x20\x20\x20\x70\x61\x64\x64\x69\
-\x6e\x67\x3a\x20\x36\x70\x78\x3b\x0a\x20\x20\x20\x20\x63\x6f\x6c\
-\x6f\x72\x3a\x20\x23\x35\x39\x35\x39\x35\x39\x3b\x0a\x20\x20\x20\
-\x20\x62\x6f\x72\x64\x65\x72\x2d\x63\x6f\x6c\x6f\x72\x3a\x20\x23\
+\x20\x73\x74\x6f\x70\x3a\x20\x30\x20\x23\x66\x65\x64\x61\x64\x31\
+\x2c\x73\x74\x6f\x70\x3a\x20\x31\x2e\x30\x20\x23\x65\x34\x37\x61\
+\x35\x35\x29\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\
+\x72\x61\x64\x69\x75\x73\x3a\x20\x35\x70\x78\x3b\x0a\x20\x20\x20\
+\x20\x62\x6f\x72\x64\x65\x72\x2d\x73\x74\x79\x6c\x65\x3a\x20\x73\
+\x6f\x6c\x69\x64\x3b\x0a\x20\x20\x20\x20\x70\x61\x64\x64\x69\x6e\
+\x67\x3a\x20\x36\x70\x78\x3b\x0a\x20\x20\x20\x20\x63\x6f\x6c\x6f\
+\x72\x3a\x20\x77\x68\x69\x74\x65\x3b\x0a\x20\x20\x20\x20\x62\x6f\
+\x72\x64\x65\x72\x2d\x63\x6f\x6c\x6f\x72\x3a\x20\x23\x39\x33\x39\
+\x33\x38\x39\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\
+\x77\x69\x64\x74\x68\x3a\x20\x31\x70\x78\x3b\x0a\x20\x20\x20\x20\
+\x68\x65\x69\x67\x68\x74\x3a\x20\x31\x32\x70\x78\x3b\x0a\x7d\x0a\
+\x0a\x51\x50\x75\x73\x68\x42\x75\x74\x74\x6f\x6e\x3a\x70\x72\x65\
+\x73\x73\x65\x64\x5b\x65\x6e\x61\x62\x6c\x65\x64\x3d\x22\x74\x72\
+\x75\x65\x22\x5d\x20\x7b\x0a\x20\x20\x20\x20\x62\x61\x63\x6b\x67\
+\x72\x6f\x75\x6e\x64\x3a\x20\x71\x6c\x69\x6e\x65\x61\x72\x67\x72\
+\x61\x64\x69\x65\x6e\x74\x28\x78\x31\x3a\x20\x30\x2c\x20\x79\x31\
+\x3a\x20\x30\x2c\x20\x78\x32\x3a\x20\x30\x2c\x20\x79\x32\x3a\x20\
+\x31\x2c\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x73\x74\x6f\x70\x3a\
+\x20\x30\x20\x23\x65\x34\x34\x65\x31\x39\x2c\x73\x74\x6f\x70\x3a\
+\x20\x31\x2e\x30\x20\x23\x66\x65\x63\x66\x63\x32\x29\x3b\x0a\x20\
+\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\x72\x61\x64\x69\x75\x73\
+\x3a\x20\x35\x70\x78\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\
+\x72\x2d\x73\x74\x79\x6c\x65\x3a\x20\x73\x6f\x6c\x69\x64\x3b\x0a\
+\x20\x20\x20\x20\x70\x61\x64\x64\x69\x6e\x67\x3a\x20\x36\x70\x78\
+\x3b\x0a\x20\x20\x20\x20\x63\x6f\x6c\x6f\x72\x3a\x20\x77\x68\x69\
+\x74\x65\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\x63\
+\x6f\x6c\x6f\x72\x3a\x20\x23\x39\x33\x39\x33\x38\x39\x3b\x0a\x20\
+\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\x77\x69\x64\x74\x68\x3a\
+\x20\x31\x70\x78\x3b\x0a\x20\x20\x20\x20\x68\x65\x69\x67\x68\x74\
+\x3a\x20\x31\x32\x70\x78\x3b\x0a\x7d\x0a\x0a\x51\x50\x75\x73\x68\
+\x42\x75\x74\x74\x6f\x6e\x5b\x65\x6e\x61\x62\x6c\x65\x64\x3d\x22\
+\x66\x61\x6c\x73\x65\x22\x5d\x20\x7b\x0a\x20\x20\x20\x20\x62\x61\
+\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3a\x20\x71\x6c\x69\x6e\x65\x61\
+\x72\x67\x72\x61\x64\x69\x65\x6e\x74\x28\x78\x31\x3a\x20\x30\x2c\
+\x20\x79\x31\x3a\x20\x30\x2c\x20\x78\x32\x3a\x20\x30\x2c\x20\x79\
+\x32\x3a\x20\x31\x2c\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x73\x74\
+\x6f\x70\x3a\x20\x30\x20\x23\x65\x61\x65\x61\x65\x61\x2c\x20\x73\
+\x74\x6f\x70\x3a\x20\x31\x2e\x30\x20\x23\x63\x61\x63\x61\x63\x61\
+\x29\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\x72\x61\
+\x64\x69\x75\x73\x3a\x20\x35\x70\x78\x3b\x0a\x20\x20\x20\x20\x62\
+\x6f\x72\x64\x65\x72\x2d\x73\x74\x79\x6c\x65\x3a\x20\x73\x6f\x6c\
+\x69\x64\x3b\x0a\x20\x20\x20\x20\x70\x61\x64\x64\x69\x6e\x67\x3a\
+\x20\x36\x70\x78\x3b\x0a\x20\x20\x20\x20\x63\x6f\x6c\x6f\x72\x3a\
+\x20\x23\x35\x39\x35\x39\x35\x39\x3b\x0a\x20\x20\x20\x20\x62\x6f\
+\x72\x64\x65\x72\x2d\x63\x6f\x6c\x6f\x72\x3a\x20\x23\x39\x33\x39\
+\x33\x38\x39\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\
+\x77\x69\x64\x74\x68\x3a\x20\x31\x70\x78\x3b\x0a\x20\x20\x20\x20\
+\x68\x65\x69\x67\x68\x74\x3a\x20\x31\x32\x70\x78\x3b\x0a\x7d\x0a\
+\x0a\x51\x50\x75\x73\x68\x42\x75\x74\x74\x6f\x6e\x23\x68\x65\x6c\
+\x70\x5f\x62\x75\x74\x74\x6f\x6e\x20\x7b\x0a\x20\x20\x20\x20\x62\
+\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3a\x20\x74\x72\x61\x6e\x73\
+\x70\x61\x72\x65\x6e\x74\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\
+\x65\x72\x3a\x20\x6e\x6f\x6e\x65\x3b\x0a\x20\x20\x20\x20\x63\x6f\
+\x6c\x6f\x72\x3a\x20\x77\x68\x69\x74\x65\x3b\x0a\x20\x20\x20\x20\
+\x68\x65\x69\x67\x68\x74\x3a\x20\x32\x30\x70\x78\x3b\x0a\x20\x20\
+\x20\x20\x74\x65\x78\x74\x2d\x64\x65\x63\x6f\x72\x61\x74\x69\x6f\
+\x6e\x3a\x20\x75\x6e\x64\x65\x72\x6c\x69\x6e\x65\x3b\x0a\x20\x20\
+\x20\x20\x70\x61\x64\x64\x69\x6e\x67\x3a\x20\x30\x70\x78\x3b\x0a\
+\x7d\x0a\x0a\x51\x50\x75\x73\x68\x42\x75\x74\x74\x6f\x6e\x23\x65\
+\x78\x70\x6c\x6f\x72\x65\x5f\x66\x6f\x6c\x64\x65\x72\x5f\x62\x75\
+\x74\x74\x6f\x6e\x20\x7b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\
+\x72\x3a\x20\x6e\x6f\x6e\x65\x3b\x0a\x20\x20\x20\x20\x62\x61\x63\
+\x6b\x67\x72\x6f\x75\x6e\x64\x3a\x20\x6e\x6f\x6e\x65\x3b\x0a\x20\
+\x20\x20\x20\x63\x6f\x6c\x6f\x72\x3a\x20\x23\x35\x39\x35\x39\x35\
+\x39\x3b\x0a\x7d\x0a\x0a\x51\x50\x75\x73\x68\x42\x75\x74\x74\x6f\
+\x6e\x23\x61\x64\x64\x5f\x66\x6f\x6c\x64\x65\x72\x5f\x62\x75\x74\
+\x74\x6f\x6e\x20\x7b\x0a\x20\x20\x20\x20\x70\x61\x64\x64\x69\x6e\
+\x67\x3a\x20\x35\x70\x78\x3b\x0a\x7d\x0a\x0a\x47\x6f\x54\x6f\x57\
+\x65\x62\x42\x75\x74\x74\x6f\x6e\x23\x73\x68\x61\x72\x65\x5f\x70\
+\x75\x62\x6c\x69\x73\x68\x5f\x62\x75\x74\x74\x6f\x6e\x20\x7b\x0a\
+\x20\x20\x20\x20\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3a\x20\
+\x74\x72\x61\x6e\x73\x70\x61\x72\x65\x6e\x74\x3b\x0a\x20\x20\x20\
+\x20\x62\x6f\x72\x64\x65\x72\x3a\x20\x6e\x6f\x6e\x65\x3b\x0a\x20\
+\x20\x20\x20\x63\x6f\x6c\x6f\x72\x3a\x20\x23\x64\x64\x34\x38\x31\
+\x34\x3b\x0a\x20\x20\x20\x20\x74\x65\x78\x74\x2d\x64\x65\x63\x6f\
+\x72\x61\x74\x69\x6f\x6e\x3a\x20\x75\x6e\x64\x65\x72\x6c\x69\x6e\
+\x65\x3b\x0a\x7d\x0a\x0a\x51\x54\x61\x62\x42\x61\x72\x3a\x3a\x74\
+\x61\x62\x20\x7b\x0a\x20\x20\x20\x20\x68\x65\x69\x67\x68\x74\x3a\
+\x20\x31\x35\x70\x78\x3b\x0a\x20\x20\x20\x20\x63\x6f\x6c\x6f\x72\
+\x3a\x20\x23\x33\x33\x33\x33\x33\x33\x3b\x0a\x20\x20\x20\x20\x62\
+\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x2d\x63\x6f\x6c\x6f\x72\x3a\
+\x20\x23\x65\x34\x65\x30\x64\x64\x3b\x0a\x20\x20\x20\x20\x62\x6f\
+\x72\x64\x65\x72\x2d\x74\x6f\x70\x2d\x6c\x65\x66\x74\x2d\x72\x61\
+\x64\x69\x75\x73\x3a\x20\x35\x70\x78\x3b\x0a\x20\x20\x20\x20\x62\
+\x6f\x72\x64\x65\x72\x2d\x74\x6f\x70\x2d\x72\x69\x67\x68\x74\x2d\
+\x72\x61\x64\x69\x75\x73\x3a\x20\x35\x70\x78\x3b\x0a\x20\x20\x20\
+\x20\x62\x6f\x72\x64\x65\x72\x2d\x73\x74\x79\x6c\x65\x3a\x20\x73\
+\x6f\x6c\x69\x64\x3b\x0a\x20\x20\x20\x20\x70\x61\x64\x64\x69\x6e\
+\x67\x3a\x20\x31\x32\x70\x78\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\
+\x64\x65\x72\x2d\x74\x6f\x70\x2d\x63\x6f\x6c\x6f\x72\x3a\x20\x23\
 \x39\x33\x39\x33\x38\x39\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\
-\x65\x72\x2d\x77\x69\x64\x74\x68\x3a\x20\x31\x70\x78\x3b\x0a\x20\
-\x20\x20\x20\x68\x65\x69\x67\x68\x74\x3a\x20\x31\x32\x70\x78\x3b\
-\x0a\x7d\x0a\x0a\x51\x54\x61\x62\x42\x61\x72\x3a\x3a\x74\x61\x62\
-\x20\x7b\x0a\x20\x20\x20\x20\x68\x65\x69\x67\x68\x74\x3a\x20\x31\
-\x35\x70\x78\x3b\x0a\x20\x20\x20\x20\x63\x6f\x6c\x6f\x72\x3a\x20\
-\x23\x33\x33\x33\x33\x33\x33\x3b\x0a\x20\x20\x20\x20\x62\x61\x63\
-\x6b\x67\x72\x6f\x75\x6e\x64\x2d\x63\x6f\x6c\x6f\x72\x3a\x20\x23\
-\x65\x34\x65\x30\x64\x64\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\
+\x65\x72\x2d\x72\x69\x67\x68\x74\x2d\x63\x6f\x6c\x6f\x72\x3a\x20\
+\x23\x39\x33\x39\x33\x38\x39\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\
+\x64\x65\x72\x2d\x6c\x65\x66\x74\x2d\x63\x6f\x6c\x6f\x72\x3a\x20\
+\x77\x68\x69\x74\x65\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\
+\x72\x2d\x62\x6f\x74\x74\x6f\x6d\x2d\x63\x6f\x6c\x6f\x72\x3a\x20\
+\x23\x39\x33\x39\x33\x38\x39\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\
+\x64\x65\x72\x2d\x77\x69\x64\x74\x68\x3a\x20\x31\x70\x78\x3b\x0a\
+\x7d\x0a\x0a\x51\x54\x61\x62\x42\x61\x72\x3a\x3a\x74\x61\x62\x3a\
+\x73\x65\x6c\x65\x63\x74\x65\x64\x20\x7b\x0a\x20\x20\x20\x20\x62\
+\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x2d\x63\x6f\x6c\x6f\x72\x3a\
+\x20\x77\x68\x69\x74\x65\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\
 \x65\x72\x2d\x74\x6f\x70\x2d\x6c\x65\x66\x74\x2d\x72\x61\x64\x69\
 \x75\x73\x3a\x20\x35\x70\x78\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\
 \x64\x65\x72\x2d\x74\x6f\x70\x2d\x72\x69\x67\x68\x74\x2d\x72\x61\
@@ -521,141 +599,121 @@
 \x33\x39\x33\x38\x39\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\
 \x72\x2d\x6c\x65\x66\x74\x2d\x63\x6f\x6c\x6f\x72\x3a\x20\x77\x68\
 \x69\x74\x65\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\
-\x62\x6f\x74\x74\x6f\x6d\x2d\x63\x6f\x6c\x6f\x72\x3a\x20\x23\x39\
-\x33\x39\x33\x38\x39\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\
-\x72\x2d\x77\x69\x64\x74\x68\x3a\x20\x31\x70\x78\x3b\x0a\x7d\x0a\
-\x0a\x51\x54\x61\x62\x42\x61\x72\x3a\x3a\x74\x61\x62\x3a\x73\x65\
-\x6c\x65\x63\x74\x65\x64\x20\x7b\x0a\x20\x20\x20\x20\x62\x61\x63\
-\x6b\x67\x72\x6f\x75\x6e\x64\x2d\x63\x6f\x6c\x6f\x72\x3a\x20\x77\
-\x68\x69\x74\x65\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\
-\x2d\x74\x6f\x70\x2d\x6c\x65\x66\x74\x2d\x72\x61\x64\x69\x75\x73\
-\x3a\x20\x35\x70\x78\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\
-\x72\x2d\x74\x6f\x70\x2d\x72\x69\x67\x68\x74\x2d\x72\x61\x64\x69\
-\x75\x73\x3a\x20\x35\x70\x78\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\
-\x64\x65\x72\x2d\x73\x74\x79\x6c\x65\x3a\x20\x73\x6f\x6c\x69\x64\
-\x3b\x0a\x20\x20\x20\x20\x70\x61\x64\x64\x69\x6e\x67\x3a\x20\x31\
-\x32\x70\x78\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\
-\x74\x6f\x70\x2d\x63\x6f\x6c\x6f\x72\x3a\x20\x23\x39\x33\x39\x33\
-\x38\x39\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\x72\
-\x69\x67\x68\x74\x2d\x63\x6f\x6c\x6f\x72\x3a\x20\x23\x39\x33\x39\
-\x33\x38\x39\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\
-\x6c\x65\x66\x74\x2d\x63\x6f\x6c\x6f\x72\x3a\x20\x77\x68\x69\x74\
-\x65\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\x62\x6f\
-\x74\x74\x6f\x6d\x2d\x63\x6f\x6c\x6f\x72\x3a\x20\x77\x68\x69\x74\
-\x65\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\x77\x69\
-\x64\x74\x68\x3a\x20\x31\x70\x78\x3b\x0a\x7d\x0a\x0a\x51\x54\x61\
-\x62\x42\x61\x72\x3a\x3a\x74\x61\x62\x3a\x66\x69\x72\x73\x74\x3a\
-\x21\x73\x65\x6c\x65\x63\x74\x65\x64\x20\x7b\x0a\x20\x20\x20\x20\
-\x62\x6f\x72\x64\x65\x72\x2d\x6c\x65\x66\x74\x2d\x63\x6f\x6c\x6f\
-\x72\x3a\x20\x23\x39\x33\x39\x33\x38\x39\x3b\x0a\x20\x20\x20\x20\
-\x62\x6f\x72\x64\x65\x72\x2d\x6c\x65\x66\x74\x2d\x63\x6f\x6c\x6f\
-\x72\x3a\x20\x23\x39\x33\x39\x33\x38\x39\x3b\x0a\x7d\x0a\x0a\x51\
+\x62\x6f\x74\x74\x6f\x6d\x2d\x63\x6f\x6c\x6f\x72\x3a\x20\x77\x68\
+\x69\x74\x65\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\
+\x77\x69\x64\x74\x68\x3a\x20\x31\x70\x78\x3b\x0a\x7d\x0a\x0a\x51\
 \x54\x61\x62\x42\x61\x72\x3a\x3a\x74\x61\x62\x3a\x66\x69\x72\x73\
-\x74\x3a\x73\x65\x6c\x65\x63\x74\x65\x64\x20\x7b\x0a\x20\x20\x20\
-\x20\x62\x6f\x72\x64\x65\x72\x2d\x6c\x65\x66\x74\x2d\x63\x6f\x6c\
-\x6f\x72\x3a\x20\x23\x39\x33\x39\x33\x38\x39\x3b\x0a\x7d\x0a\x0a\
-\x51\x54\x61\x62\x42\x61\x72\x3a\x3a\x74\x61\x62\x3a\x6d\x69\x64\
-\x64\x6c\x65\x3a\x21\x73\x65\x6c\x65\x63\x74\x65\x64\x20\x7b\x0a\
-\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\x6c\x65\x66\x74\x2d\
-\x63\x6f\x6c\x6f\x72\x3a\x20\x23\x65\x34\x65\x30\x64\x64\x3b\x0a\
-\x7d\x0a\x0a\x51\x54\x61\x62\x42\x61\x72\x3a\x3a\x74\x61\x62\x3a\
-\x6c\x61\x73\x74\x3a\x21\x73\x65\x6c\x65\x63\x74\x65\x64\x20\x7b\
-\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\x6c\x65\x66\x74\
-\x2d\x63\x6f\x6c\x6f\x72\x3a\x20\x23\x65\x34\x65\x30\x64\x64\x3b\
-\x0a\x7d\x0a\x0a\x51\x54\x61\x62\x57\x69\x64\x67\x65\x74\x20\x7b\
+\x74\x3a\x21\x73\x65\x6c\x65\x63\x74\x65\x64\x20\x7b\x0a\x20\x20\
+\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\x6c\x65\x66\x74\x2d\x63\x6f\
+\x6c\x6f\x72\x3a\x20\x23\x39\x33\x39\x33\x38\x39\x3b\x0a\x20\x20\
+\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\x6c\x65\x66\x74\x2d\x63\x6f\
+\x6c\x6f\x72\x3a\x20\x23\x39\x33\x39\x33\x38\x39\x3b\x0a\x7d\x0a\
+\x0a\x51\x54\x61\x62\x42\x61\x72\x3a\x3a\x74\x61\x62\x3a\x66\x69\
+\x72\x73\x74\x3a\x73\x65\x6c\x65\x63\x74\x65\x64\x20\x7b\x0a\x20\
+\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\x6c\x65\x66\x74\x2d\x63\
+\x6f\x6c\x6f\x72\x3a\x20\x23\x39\x33\x39\x33\x38\x39\x3b\x0a\x7d\
+\x0a\x0a\x51\x54\x61\x62\x42\x61\x72\x3a\x3a\x74\x61\x62\x3a\x6d\
+\x69\x64\x64\x6c\x65\x3a\x21\x73\x65\x6c\x65\x63\x74\x65\x64\x20\
+\x7b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\x6c\x65\x66\
+\x74\x2d\x63\x6f\x6c\x6f\x72\x3a\x20\x23\x65\x34\x65\x30\x64\x64\
+\x3b\x0a\x7d\x0a\x0a\x51\x54\x61\x62\x42\x61\x72\x3a\x3a\x74\x61\
+\x62\x3a\x68\x6f\x76\x65\x72\x20\x7b\x0a\x20\x20\x20\x20\x62\x61\
+\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3a\x20\x71\x6c\x69\x6e\x65\x61\
+\x72\x67\x72\x61\x64\x69\x65\x6e\x74\x28\x78\x31\x3a\x20\x30\x2c\
+\x20\x79\x31\x3a\x20\x30\x2c\x20\x78\x32\x3a\x20\x30\x2c\x20\x79\
+\x32\x3a\x20\x31\x2c\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x73\x74\
+\x6f\x70\x3a\x20\x30\x20\x23\x66\x61\x66\x61\x66\x61\x2c\x20\x73\
+\x74\x6f\x70\x3a\x20\x30\x2e\x34\x20\x23\x66\x34\x66\x34\x66\x34\
+\x2c\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x73\x74\x6f\x70\x3a\x20\
+\x30\x2e\x35\x20\x23\x65\x37\x65\x37\x65\x37\x2c\x20\x73\x74\x6f\
+\x70\x3a\x20\x31\x2e\x30\x20\x23\x66\x61\x66\x61\x66\x61\x29\x3b\
+\x0a\x20\x20\x20\x20\x74\x65\x78\x74\x2d\x64\x65\x63\x6f\x72\x61\
+\x74\x69\x6f\x6e\x3a\x20\x75\x6e\x64\x65\x72\x6c\x69\x6e\x65\x3b\
+\x0a\x7d\x0a\x0a\x51\x54\x61\x62\x42\x61\x72\x3a\x3a\x74\x61\x62\
+\x3a\x6c\x61\x73\x74\x3a\x21\x73\x65\x6c\x65\x63\x74\x65\x64\x20\
+\x7b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\x6c\x65\x66\
+\x74\x2d\x63\x6f\x6c\x6f\x72\x3a\x20\x23\x65\x34\x65\x30\x64\x64\
+\x3b\x0a\x7d\x0a\x0a\x51\x54\x61\x62\x57\x69\x64\x67\x65\x74\x20\
+\x7b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\x62\x6f\x74\
+\x74\x6f\x6d\x2d\x6c\x65\x66\x74\x2d\x72\x61\x64\x69\x75\x73\x3a\
+\x20\x35\x70\x78\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\
+\x2d\x62\x6f\x74\x74\x6f\x6d\x2d\x72\x69\x67\x68\x74\x2d\x72\x61\
+\x64\x69\x75\x73\x3a\x20\x35\x70\x78\x3b\x0a\x20\x20\x20\x20\x62\
+\x6f\x72\x64\x65\x72\x2d\x73\x74\x79\x6c\x65\x3a\x20\x73\x6f\x6c\
+\x69\x64\x3b\x0a\x20\x20\x20\x20\x70\x61\x64\x64\x69\x6e\x67\x3a\
+\x20\x31\x30\x70\x78\x3b\x0a\x7d\x0a\x0a\x51\x54\x61\x62\x57\x69\
+\x64\x67\x65\x74\x3a\x3a\x70\x61\x6e\x65\x20\x7b\x0a\x20\x20\x20\
+\x20\x62\x6f\x72\x64\x65\x72\x2d\x62\x6f\x74\x74\x6f\x6d\x2d\x6c\
+\x65\x66\x74\x2d\x72\x61\x64\x69\x75\x73\x3a\x20\x35\x70\x78\x3b\
 \x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\x62\x6f\x74\x74\
-\x6f\x6d\x2d\x6c\x65\x66\x74\x2d\x72\x61\x64\x69\x75\x73\x3a\x20\
-\x35\x70\x78\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\
-\x62\x6f\x74\x74\x6f\x6d\x2d\x72\x69\x67\x68\x74\x2d\x72\x61\x64\
-\x69\x75\x73\x3a\x20\x35\x70\x78\x3b\x0a\x20\x20\x20\x20\x62\x6f\
-\x72\x64\x65\x72\x2d\x73\x74\x79\x6c\x65\x3a\x20\x73\x6f\x6c\x69\
-\x64\x3b\x0a\x20\x20\x20\x20\x70\x61\x64\x64\x69\x6e\x67\x3a\x20\
-\x31\x30\x70\x78\x3b\x0a\x7d\x0a\x0a\x51\x54\x61\x62\x57\x69\x64\
-\x67\x65\x74\x3a\x3a\x70\x61\x6e\x65\x20\x7b\x0a\x20\x20\x20\x20\
-\x62\x6f\x72\x64\x65\x72\x2d\x62\x6f\x74\x74\x6f\x6d\x2d\x6c\x65\
-\x66\x74\x2d\x72\x61\x64\x69\x75\x73\x3a\x20\x35\x70\x78\x3b\x0a\
-\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\x62\x6f\x74\x74\x6f\
-\x6d\x2d\x72\x69\x67\x68\x74\x2d\x72\x61\x64\x69\x75\x73\x3a\x20\
-\x35\x70\x78\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\
-\x74\x6f\x70\x2d\x72\x69\x67\x68\x74\x2d\x72\x61\x64\x69\x75\x73\
-\x3a\x20\x35\x70\x78\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\
-\x72\x2d\x73\x74\x79\x6c\x65\x3a\x20\x73\x6f\x6c\x69\x64\x3b\x0a\
-\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\x63\x6f\x6c\x6f\x72\
-\x3a\x20\x23\x39\x33\x39\x33\x38\x39\x3b\x0a\x20\x20\x20\x20\x62\
-\x6f\x72\x64\x65\x72\x2d\x77\x69\x64\x74\x68\x3a\x20\x31\x70\x78\
-\x3b\x0a\x20\x20\x20\x20\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\
-\x3a\x20\x77\x68\x69\x74\x65\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\
-\x64\x65\x72\x2d\x74\x6f\x70\x3a\x20\x32\x70\x78\x20\x73\x6f\x6c\
-\x69\x64\x20\x77\x68\x69\x74\x65\x3b\x0a\x20\x7d\x0a\x0a\x51\x54\
-\x61\x62\x42\x61\x72\x3a\x3a\x74\x61\x62\x3a\x68\x6f\x76\x65\x72\
-\x20\x7b\x0a\x20\x20\x20\x20\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\
-\x64\x3a\x20\x71\x6c\x69\x6e\x65\x61\x72\x67\x72\x61\x64\x69\x65\
-\x6e\x74\x28\x78\x31\x3a\x20\x30\x2c\x20\x79\x31\x3a\x20\x30\x2c\
-\x20\x78\x32\x3a\x20\x30\x2c\x20\x79\x32\x3a\x20\x31\x2c\x0a\x20\
-\x20\x20\x20\x20\x20\x20\x20\x73\x74\x6f\x70\x3a\x20\x30\x20\x23\
-\x66\x61\x66\x61\x66\x61\x2c\x20\x73\x74\x6f\x70\x3a\x20\x30\x2e\
-\x34\x20\x23\x66\x34\x66\x34\x66\x34\x2c\x0a\x20\x20\x20\x20\x20\
-\x20\x20\x20\x73\x74\x6f\x70\x3a\x20\x30\x2e\x35\x20\x23\x65\x37\
-\x65\x37\x65\x37\x2c\x20\x73\x74\x6f\x70\x3a\x20\x31\x2e\x30\x20\
-\x23\x66\x61\x66\x61\x66\x61\x29\x3b\x0a\x20\x7d\x0a\x0a\x51\x50\
-\x75\x73\x68\x42\x75\x74\x74\x6f\x6e\x23\x68\x65\x6c\x70\x5f\x62\
-\x75\x74\x74\x6f\x6e\x20\x7b\x0a\x20\x20\x20\x20\x62\x61\x63\x6b\
-\x67\x72\x6f\x75\x6e\x64\x3a\x20\x74\x72\x61\x6e\x73\x70\x61\x72\
-\x65\x6e\x74\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x3a\
-\x20\x6e\x6f\x6e\x65\x3b\x0a\x20\x20\x20\x20\x63\x6f\x6c\x6f\x72\
-\x3a\x20\x77\x68\x69\x74\x65\x3b\x0a\x20\x20\x20\x20\x68\x65\x69\
-\x67\x68\x74\x3a\x20\x32\x30\x70\x78\x3b\x0a\x20\x20\x20\x20\x74\
-\x65\x78\x74\x2d\x64\x65\x63\x6f\x72\x61\x74\x69\x6f\x6e\x3a\x20\
-\x75\x6e\x64\x65\x72\x6c\x69\x6e\x65\x3b\x0a\x20\x20\x20\x20\x70\
-\x61\x64\x64\x69\x6e\x67\x3a\x20\x30\x70\x78\x3b\x0a\x7d\x0a\x0a\
-\x51\x50\x75\x73\x68\x42\x75\x74\x74\x6f\x6e\x23\x65\x78\x70\x6c\
-\x6f\x72\x65\x5f\x66\x6f\x6c\x64\x65\x72\x5f\x62\x75\x74\x74\x6f\
-\x6e\x20\x7b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x3a\x20\
-\x6e\x6f\x6e\x65\x3b\x0a\x20\x20\x20\x20\x62\x61\x63\x6b\x67\x72\
-\x6f\x75\x6e\x64\x3a\x20\x6e\x6f\x6e\x65\x3b\x0a\x7d\x0a\x0a\x51\
-\x47\x72\x6f\x75\x70\x42\x6f\x78\x20\x7b\x0a\x20\x20\x20\x20\x70\
-\x61\x64\x64\x69\x6e\x67\x2d\x74\x6f\x70\x3a\x20\x33\x30\x70\x78\
-\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x3a\x20\x30\x70\
-\x78\x20\x73\x6f\x6c\x69\x64\x3b\x0a\x20\x20\x20\x20\x6d\x61\x72\
-\x67\x69\x6e\x2d\x74\x6f\x70\x3a\x20\x31\x65\x78\x3b\x0a\x20\x20\
-\x20\x20\x66\x6f\x6e\x74\x3a\x20\x62\x6f\x6c\x64\x20\x31\x35\x70\
-\x78\x3b\x0a\x7d\x0a\x0a\x51\x47\x72\x6f\x75\x70\x42\x6f\x78\x3a\
-\x3a\x74\x69\x74\x6c\x65\x20\x7b\x0a\x20\x20\x20\x20\x63\x6f\x6c\
-\x6f\x72\x3a\x20\x23\x33\x33\x33\x33\x33\x33\x3b\x0a\x7d\x0a\x0a\
-\x51\x4c\x69\x73\x74\x57\x69\x64\x67\x65\x74\x20\x7b\x0a\x20\x20\
-\x20\x20\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3a\x20\x23\x66\
-\x37\x66\x36\x66\x35\x3b\x0a\x20\x20\x20\x20\x61\x6c\x74\x65\x72\
-\x6e\x61\x74\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x2d\
-\x63\x6f\x6c\x6f\x72\x3a\x20\x23\x65\x66\x65\x64\x65\x63\x3b\x0a\
-\x7d\x0a\x0a\x51\x4c\x69\x73\x74\x57\x69\x64\x67\x65\x74\x23\x6c\
-\x69\x73\x74\x44\x65\x76\x69\x63\x65\x73\x3a\x3a\x69\x74\x65\x6d\
-\x20\x7b\x0a\x20\x20\x20\x20\x6d\x69\x6e\x2d\x68\x65\x69\x67\x68\
-\x74\x3a\x20\x34\x38\x70\x78\x3b\x0a\x7d\x0a\x0a\x51\x4c\x61\x62\
-\x65\x6c\x23\x6f\x74\x68\x65\x72\x5f\x64\x65\x76\x69\x63\x65\x73\
-\x5f\x6c\x61\x62\x65\x6c\x2c\x0a\x51\x4c\x61\x62\x65\x6c\x23\x74\
-\x69\x74\x6c\x65\x5f\x6c\x61\x62\x65\x6c\x20\x7b\x0a\x20\x20\x20\
-\x20\x66\x6f\x6e\x74\x3a\x20\x62\x6f\x6c\x64\x20\x31\x36\x70\x78\
-\x3b\x0a\x7d\x0a\x0a\x51\x4c\x61\x62\x65\x6c\x23\x70\x65\x72\x63\
-\x65\x6e\x74\x61\x67\x65\x5f\x75\x73\x61\x67\x65\x5f\x6c\x61\x62\
-\x65\x6c\x20\x7b\x0a\x20\x20\x20\x20\x6d\x61\x72\x67\x69\x6e\x2d\
-\x74\x6f\x70\x3a\x20\x2d\x34\x70\x78\x3b\x0a\x7d\x0a\x0a\x51\x4c\
-\x61\x62\x65\x6c\x23\x66\x6f\x6c\x6c\x6f\x77\x5f\x75\x73\x5f\x6c\
-\x61\x62\x65\x6c\x20\x7b\x0a\x20\x20\x20\x20\x63\x6f\x6c\x6f\x72\
-\x3a\x20\x77\x68\x69\x74\x65\x3b\x0a\x7d\x0a\x0a\x51\x46\x72\x61\
-\x6d\x65\x23\x66\x72\x6d\x5f\x62\x6f\x78\x20\x7b\x0a\x20\x20\x20\
-\x20\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3a\x20\x23\x66\x66\
-\x66\x66\x66\x66\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\
-\x2d\x72\x61\x64\x69\x75\x73\x3a\x20\x35\x70\x78\x3b\x0a\x20\x20\
-\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\x73\x74\x79\x6c\x65\x3a\x20\
-\x73\x6f\x6c\x69\x64\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\
-\x72\x2d\x63\x6f\x6c\x6f\x72\x3a\x20\x23\x39\x33\x39\x33\x38\x39\
-\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\x77\x69\x64\
-\x74\x68\x3a\x20\x31\x70\x78\x3b\x0a\x20\x20\x20\x20\x63\x6f\x6c\
-\x6f\x72\x3a\x20\x77\x68\x69\x74\x65\x3b\x0a\x20\x20\x20\x20\x6d\
-\x69\x6e\x2d\x68\x65\x69\x67\x68\x74\x3a\x20\x31\x30\x30\x70\x78\
-\x3b\x0a\x7d\x0a\x0a\x51\x57\x69\x64\x67\x65\x74\x20\x7b\x0a\x20\
-\x20\x20\x20\x66\x6f\x6e\x74\x2d\x66\x61\x6d\x69\x6c\x79\x3a\x20\
-\x22\x55\x62\x75\x6e\x74\x75\x22\x3b\x0a\x7d\x0a\
+\x6f\x6d\x2d\x72\x69\x67\x68\x74\x2d\x72\x61\x64\x69\x75\x73\x3a\
+\x20\x35\x70\x78\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\
+\x2d\x74\x6f\x70\x2d\x72\x69\x67\x68\x74\x2d\x72\x61\x64\x69\x75\
+\x73\x3a\x20\x35\x70\x78\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\
+\x65\x72\x2d\x73\x74\x79\x6c\x65\x3a\x20\x73\x6f\x6c\x69\x64\x3b\
+\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\x63\x6f\x6c\x6f\
+\x72\x3a\x20\x23\x39\x33\x39\x33\x38\x39\x3b\x0a\x20\x20\x20\x20\
+\x62\x6f\x72\x64\x65\x72\x2d\x77\x69\x64\x74\x68\x3a\x20\x31\x70\
+\x78\x3b\x0a\x20\x20\x20\x20\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\
+\x64\x3a\x20\x77\x68\x69\x74\x65\x3b\x0a\x20\x20\x20\x20\x62\x6f\
+\x72\x64\x65\x72\x2d\x74\x6f\x70\x3a\x20\x32\x70\x78\x20\x73\x6f\
+\x6c\x69\x64\x20\x77\x68\x69\x74\x65\x3b\x0a\x7d\x0a\x0a\x51\x47\
+\x72\x6f\x75\x70\x42\x6f\x78\x20\x7b\x0a\x20\x20\x20\x20\x70\x61\
+\x64\x64\x69\x6e\x67\x2d\x74\x6f\x70\x3a\x20\x33\x30\x70\x78\x3b\
+\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x3a\x20\x6e\x6f\x6e\
+\x65\x3b\x0a\x20\x20\x20\x20\x6d\x61\x72\x67\x69\x6e\x2d\x74\x6f\
+\x70\x3a\x20\x31\x65\x78\x3b\x0a\x7d\x0a\x0a\x51\x47\x72\x6f\x75\
+\x70\x42\x6f\x78\x3a\x3a\x74\x69\x74\x6c\x65\x20\x7b\x0a\x20\x20\
+\x20\x20\x63\x6f\x6c\x6f\x72\x3a\x20\x23\x33\x33\x33\x33\x33\x33\
+\x3b\x0a\x20\x20\x20\x20\x66\x6f\x6e\x74\x3a\x20\x62\x6f\x6c\x64\
+\x20\x31\x35\x70\x78\x3b\x0a\x7d\x0a\x0a\x51\x47\x72\x6f\x75\x70\
+\x42\x6f\x78\x23\x70\x72\x6f\x66\x69\x6c\x65\x2c\x0a\x51\x47\x72\
+\x6f\x75\x70\x42\x6f\x78\x23\x73\x65\x72\x76\x69\x63\x65\x73\x20\
+\x7b\x0a\x20\x20\x20\x20\x70\x61\x64\x64\x69\x6e\x67\x2d\x6c\x65\
+\x66\x74\x3a\x20\x35\x70\x78\x3b\x0a\x7d\x0a\x0a\x51\x4c\x69\x73\
+\x74\x57\x69\x64\x67\x65\x74\x20\x7b\x0a\x20\x20\x20\x20\x62\x61\
+\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3a\x20\x23\x66\x37\x66\x36\x66\
+\x35\x3b\x0a\x20\x20\x20\x20\x61\x6c\x74\x65\x72\x6e\x61\x74\x65\
+\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x2d\x63\x6f\x6c\x6f\
+\x72\x3a\x20\x23\x65\x66\x65\x64\x65\x63\x3b\x0a\x7d\x0a\x0a\x51\
+\x4c\x69\x73\x74\x57\x69\x64\x67\x65\x74\x23\x6c\x69\x73\x74\x5f\
+\x64\x65\x76\x69\x63\x65\x73\x3a\x3a\x69\x74\x65\x6d\x20\x7b\x0a\
+\x20\x20\x20\x20\x6d\x69\x6e\x2d\x68\x65\x69\x67\x68\x74\x3a\x20\
+\x34\x38\x70\x78\x3b\x0a\x7d\x0a\x0a\x51\x4c\x61\x62\x65\x6c\x23\
+\x6f\x74\x68\x65\x72\x5f\x64\x65\x76\x69\x63\x65\x73\x5f\x6c\x61\
+\x62\x65\x6c\x20\x7b\x0a\x20\x20\x20\x20\x66\x6f\x6e\x74\x3a\x20\
+\x62\x6f\x6c\x64\x20\x31\x36\x70\x78\x3b\x0a\x7d\x0a\x0a\x51\x4c\
+\x61\x62\x65\x6c\x23\x70\x65\x72\x63\x65\x6e\x74\x61\x67\x65\x5f\
+\x75\x73\x61\x67\x65\x5f\x6c\x61\x62\x65\x6c\x20\x7b\x0a\x20\x20\
+\x20\x20\x6d\x61\x72\x67\x69\x6e\x2d\x74\x6f\x70\x3a\x20\x2d\x34\
+\x70\x78\x3b\x0a\x7d\x0a\x0a\x51\x4c\x61\x62\x65\x6c\x23\x66\x6f\
+\x6c\x6c\x6f\x77\x5f\x75\x73\x5f\x6c\x61\x62\x65\x6c\x20\x7b\x0a\
+\x20\x20\x20\x20\x63\x6f\x6c\x6f\x72\x3a\x20\x77\x68\x69\x74\x65\
+\x3b\x0a\x7d\x0a\x0a\x51\x46\x72\x61\x6d\x65\x23\x66\x72\x6d\x5f\
+\x62\x6f\x78\x20\x7b\x20\x2f\x2a\x20\x74\x68\x65\x20\x6c\x6f\x61\
+\x64\x69\x6e\x67\x6f\x76\x65\x72\x6c\x61\x79\x20\x66\x72\x61\x6d\
+\x65\x20\x2a\x2f\x0a\x20\x20\x20\x20\x62\x61\x63\x6b\x67\x72\x6f\
+\x75\x6e\x64\x3a\x20\x23\x66\x66\x66\x66\x66\x66\x3b\x0a\x20\x20\
+\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\x72\x61\x64\x69\x75\x73\x3a\
+\x20\x35\x70\x78\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\
+\x2d\x73\x74\x79\x6c\x65\x3a\x20\x73\x6f\x6c\x69\x64\x3b\x0a\x20\
+\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\x63\x6f\x6c\x6f\x72\x3a\
+\x20\x23\x39\x33\x39\x33\x38\x39\x3b\x0a\x20\x20\x20\x20\x62\x6f\
+\x72\x64\x65\x72\x2d\x77\x69\x64\x74\x68\x3a\x20\x31\x70\x78\x3b\
+\x0a\x20\x20\x20\x20\x63\x6f\x6c\x6f\x72\x3a\x20\x77\x68\x69\x74\
+\x65\x3b\x0a\x20\x20\x20\x20\x6d\x69\x6e\x2d\x68\x65\x69\x67\x68\
+\x74\x3a\x20\x31\x30\x30\x70\x78\x3b\x0a\x7d\x0a\x0a\x51\x41\x62\
+\x73\x74\x72\x61\x63\x74\x49\x74\x65\x6d\x56\x69\x65\x77\x20\x7b\
+\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\x73\x74\x79\x6c\
+\x65\x3a\x20\x73\x6f\x6c\x69\x64\x3b\x0a\x20\x20\x20\x20\x62\x6f\
+\x72\x64\x65\x72\x2d\x63\x6f\x6c\x6f\x72\x3a\x20\x23\x33\x33\x33\
+\x33\x33\x33\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\
+\x77\x69\x64\x74\x68\x3a\x20\x31\x70\x78\x3b\x0a\x20\x20\x20\x20\
+\x61\x6c\x74\x65\x72\x6e\x61\x74\x65\x2d\x62\x61\x63\x6b\x67\x72\
+\x6f\x75\x6e\x64\x2d\x63\x6f\x6c\x6f\x72\x3a\x20\x23\x65\x66\x65\
+\x64\x65\x63\x3b\x0a\x20\x20\x20\x20\x62\x61\x63\x6b\x67\x72\x6f\
+\x75\x6e\x64\x3a\x20\x23\x66\x37\x66\x36\x66\x35\x3b\x0a\x7d\x0a\
+\
 \x00\x00\x02\x6f\
 \x89\
 \x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
@@ -23411,20 +23469,20 @@
 
 qt_resource_struct = "\
 \x00\x00\x00\x00\x00\x02\x00\x00\x00\x0e\x00\x00\x00\x01\
-\x00\x00\x01\xf0\x00\x00\x00\x00\x00\x01\x00\x05\xae\xdf\
+\x00\x00\x01\xf0\x00\x00\x00\x00\x00\x01\x00\x05\xb2\x73\
 \x00\x00\x00\x96\x00\x00\x00\x00\x00\x01\x00\x00\x0c\xe5\
 \x00\x00\x01\x3e\x00\x00\x00\x00\x00\x01\x00\x00\x17\xfe\
 \x00\x00\x00\x7e\x00\x00\x00\x00\x00\x01\x00\x00\x09\xc8\
-\x00\x00\x01\xb4\x00\x00\x00\x00\x00\x01\x00\x05\xa6\x8a\
+\x00\x00\x01\xb4\x00\x00\x00\x00\x00\x01\x00\x05\xaa\x1e\
 \x00\x00\x00\x4a\x00\x00\x00\x00\x00\x01\x00\x00\x04\x92\
 \x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
 \x00\x00\x00\xee\x00\x00\x00\x00\x00\x01\x00\x00\x11\xb2\
 \x00\x00\x00\x30\x00\x00\x00\x00\x00\x01\x00\x00\x01\xd5\
 \x00\x00\x00\xd4\x00\x00\x00\x00\x00\x01\x00\x00\x0f\x83\
 \x00\x00\x01\x0a\x00\x00\x00\x00\x00\x01\x00\x00\x16\xd3\
-\x00\x00\x01\xd2\x00\x00\x00\x00\x00\x01\x00\x05\xaa\x16\
-\x00\x00\x01\x5e\x00\x00\x00\x00\x00\x01\x00\x00\x27\x1f\
-\x00\x00\x01\x96\x00\x00\x00\x00\x00\x01\x00\x00\x29\x92\
+\x00\x00\x01\xd2\x00\x00\x00\x00\x00\x01\x00\x05\xad\xaa\
+\x00\x00\x01\x5e\x00\x00\x00\x00\x00\x01\x00\x00\x2a\xb3\
+\x00\x00\x01\x96\x00\x00\x00\x00\x00\x01\x00\x00\x2d\x26\
 "
 
 def qInitResources():
 
=== modified file 'ubuntuone/controlpanel/gui/qt/ui/loadingoverlay_ui.py'
--- ubuntuone/controlpanel/gui/qt/ui/loadingoverlay_ui.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/gui/qt/ui/loadingoverlay_ui.py	2011-08-12 19:16:23 +0000
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'data/qt/loadingoverlay.ui'
 #
-# Created: Fri Jul 22 17:06:43 2011
+# Created: Fri Aug 12 15:07:18 2011
 #      by: PyQt4 UI code generator 4.8.3
 #
 # WARNING! All changes made in this file will be lost!
@@ -19,8 +19,6 @@
     def setupUi(self, Form):
         Form.setObjectName(_fromUtf8("Form"))
         Form.resize(702, 230)
-        Form.setFrameShape(QtGui.QFrame.StyledPanel)
-        Form.setFrameShadow(QtGui.QFrame.Raised)
         self.verticalLayout = QtGui.QVBoxLayout(Form)
         self.verticalLayout.setContentsMargins(-1, 30, -1, -1)
         self.verticalLayout.setObjectName(_fromUtf8("verticalLayout"))
@@ -30,9 +28,6 @@
         self.horizontalLayout_2.addItem(spacerItem)
         self.frm_box = QtGui.QFrame(Form)
         self.frm_box.setMinimumSize(QtCore.QSize(0, 102))
-        self.frm_box.setStyleSheet(_fromUtf8(""))
-        self.frm_box.setFrameShape(QtGui.QFrame.StyledPanel)
-        self.frm_box.setFrameShadow(QtGui.QFrame.Raised)
         self.frm_box.setObjectName(_fromUtf8("frm_box"))
         self.horizontalLayout = QtGui.QHBoxLayout(self.frm_box)
         self.horizontalLayout.setContentsMargins(-1, 0, -1, 30)
@@ -60,5 +55,5 @@
 
     def retranslateUi(self, Form):
         Form.setWindowTitle(_('Frame'))
-        self.label.setText(_('Please wait while we retrieve the information...'))
+        self.label.setText(_('Getting information, please wait...'))
 
 
=== modified file 'ubuntuone/controlpanel/gui/qt/ui/mainwindow_ui.py'
--- ubuntuone/controlpanel/gui/qt/ui/mainwindow_ui.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/gui/qt/ui/mainwindow_ui.py	2011-08-12 19:16:23 +0000
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'data/qt/mainwindow.ui'
 #
-# Created: Fri Jul 22 17:06:43 2011
+# Created: Fri Aug 12 15:07:18 2011
 #      by: PyQt4 UI code generator 4.8.3
 #
 # WARNING! All changes made in this file will be lost!
 
=== modified file 'ubuntuone/controlpanel/gui/qt/ui/preferences_ui.py'
--- ubuntuone/controlpanel/gui/qt/ui/preferences_ui.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/gui/qt/ui/preferences_ui.py	2011-08-12 19:16:23 +0000
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'data/qt/preferences.ui'
 #
-# Created: Fri Jul 22 17:06:43 2011
+# Created: Fri Aug 12 15:07:18 2011
 #      by: PyQt4 UI code generator 4.8.3
 #
 # WARNING! All changes made in this file will be lost!
@@ -18,71 +18,74 @@
 class Ui_Form(object):
     def setupUi(self, Form):
         Form.setObjectName(_fromUtf8("Form"))
-        Form.resize(469, 352)
+        Form.resize(433, 328)
         Form.setWindowTitle(_fromUtf8("Form"))
         Form.setStyleSheet(_fromUtf8(""))
         self.verticalLayout = QtGui.QVBoxLayout(Form)
         self.verticalLayout.setMargin(0)
         self.verticalLayout.setObjectName(_fromUtf8("verticalLayout"))
-        self.verticalGroupBox = QtGui.QGroupBox(Form)
-        self.verticalGroupBox.setObjectName(_fromUtf8("verticalGroupBox"))
-        self.gridLayout = QtGui.QGridLayout(self.verticalGroupBox)
-        self.gridLayout.setVerticalSpacing(10)
+        self.bandwidth_settings = QtGui.QGroupBox(Form)
+        self.bandwidth_settings.setObjectName(_fromUtf8("bandwidth_settings"))
+        self.gridLayout = QtGui.QGridLayout(self.bandwidth_settings)
+        self.gridLayout.setMargin(0)
         self.gridLayout.setObjectName(_fromUtf8("gridLayout"))
-        self.limit_uploads_checkbox = QtGui.QCheckBox(self.verticalGroupBox)
+        self.limit_uploads_checkbox = QtGui.QCheckBox(self.bandwidth_settings)
         self.limit_uploads_checkbox.setObjectName(_fromUtf8("limit_uploads_checkbox"))
         self.gridLayout.addWidget(self.limit_uploads_checkbox, 0, 0, 1, 1)
-        self.upload_speed_spinbox = QtGui.QSpinBox(self.verticalGroupBox)
+        self.upload_speed_spinbox = QtGui.QSpinBox(self.bandwidth_settings)
         self.upload_speed_spinbox.setMinimum(-1)
         self.upload_speed_spinbox.setMaximum(999999999)
         self.upload_speed_spinbox.setObjectName(_fromUtf8("upload_speed_spinbox"))
         self.gridLayout.addWidget(self.upload_speed_spinbox, 0, 1, 1, 1)
-        self.kbps_label_1 = QtGui.QLabel(self.verticalGroupBox)
+        self.kbps_label_1 = QtGui.QLabel(self.bandwidth_settings)
         self.kbps_label_1.setObjectName(_fromUtf8("kbps_label_1"))
         self.gridLayout.addWidget(self.kbps_label_1, 0, 2, 1, 1)
-        self.limit_downloads_checkbox = QtGui.QCheckBox(self.verticalGroupBox)
+        self.limit_downloads_checkbox = QtGui.QCheckBox(self.bandwidth_settings)
         self.limit_downloads_checkbox.setObjectName(_fromUtf8("limit_downloads_checkbox"))
         self.gridLayout.addWidget(self.limit_downloads_checkbox, 2, 0, 1, 1)
-        self.download_speed_spinbox = QtGui.QSpinBox(self.verticalGroupBox)
+        self.download_speed_spinbox = QtGui.QSpinBox(self.bandwidth_settings)
         self.download_speed_spinbox.setMinimum(-1)
         self.download_speed_spinbox.setMaximum(999999999)
         self.download_speed_spinbox.setObjectName(_fromUtf8("download_speed_spinbox"))
         self.gridLayout.addWidget(self.download_speed_spinbox, 2, 1, 1, 1)
-        self.kbps_label_2 = QtGui.QLabel(self.verticalGroupBox)
+        self.kbps_label_2 = QtGui.QLabel(self.bandwidth_settings)
         self.kbps_label_2.setObjectName(_fromUtf8("kbps_label_2"))
         self.gridLayout.addWidget(self.kbps_label_2, 2, 2, 1, 1)
         spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
         self.gridLayout.addItem(spacerItem, 0, 3, 1, 1)
-        self.label_2 = QtGui.QLabel(self.verticalGroupBox)
+        self.label_2 = QtGui.QLabel(self.bandwidth_settings)
         self.label_2.setScaledContents(False)
         self.label_2.setWordWrap(False)
         self.label_2.setObjectName(_fromUtf8("label_2"))
         self.gridLayout.addWidget(self.label_2, 4, 0, 1, 3)
         spacerItem1 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
         self.gridLayout.addItem(spacerItem1, 3, 0, 1, 1)
-        self.verticalLayout.addWidget(self.verticalGroupBox)
-        self.groupBox_2 = QtGui.QGroupBox(Form)
-        self.groupBox_2.setObjectName(_fromUtf8("groupBox_2"))
-        self.verticalLayout_1 = QtGui.QVBoxLayout(self.groupBox_2)
-        self.verticalLayout_1.setSpacing(10)
+        self.verticalLayout.addWidget(self.bandwidth_settings)
+        self.file_sync_settings = QtGui.QGroupBox(Form)
+        self.file_sync_settings.setObjectName(_fromUtf8("file_sync_settings"))
+        self.verticalLayout_1 = QtGui.QVBoxLayout(self.file_sync_settings)
+        self.verticalLayout_1.setMargin(0)
         self.verticalLayout_1.setObjectName(_fromUtf8("verticalLayout_1"))
-        self.autoconnect_checkbox = QtGui.QCheckBox(self.groupBox_2)
+        self.autoconnect_checkbox = QtGui.QCheckBox(self.file_sync_settings)
         self.autoconnect_checkbox.setObjectName(_fromUtf8("autoconnect_checkbox"))
         self.verticalLayout_1.addWidget(self.autoconnect_checkbox)
-        self.udf_autosubscribe_checkbox = QtGui.QCheckBox(self.groupBox_2)
+        self.udf_autosubscribe_checkbox = QtGui.QCheckBox(self.file_sync_settings)
         self.udf_autosubscribe_checkbox.setObjectName(_fromUtf8("udf_autosubscribe_checkbox"))
         self.verticalLayout_1.addWidget(self.udf_autosubscribe_checkbox)
-        self.share_autosubscribe_checkbox = QtGui.QCheckBox(self.groupBox_2)
+        self.share_autosubscribe_checkbox = QtGui.QCheckBox(self.file_sync_settings)
         self.share_autosubscribe_checkbox.setObjectName(_fromUtf8("share_autosubscribe_checkbox"))
         self.verticalLayout_1.addWidget(self.share_autosubscribe_checkbox)
-        self.show_all_notifications_checkbox = QtGui.QCheckBox(self.groupBox_2)
+        self.show_all_notifications_checkbox = QtGui.QCheckBox(self.file_sync_settings)
         self.show_all_notifications_checkbox.setObjectName(_fromUtf8("show_all_notifications_checkbox"))
         self.verticalLayout_1.addWidget(self.show_all_notifications_checkbox)
-        self.verticalLayout.addWidget(self.groupBox_2)
+        self.verticalLayout.addWidget(self.file_sync_settings)
+        spacerItem2 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+        self.verticalLayout.addItem(spacerItem2)
         self.horizontalLayout = QtGui.QHBoxLayout()
+        self.horizontalLayout.setMargin(3)
         self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout"))
-        spacerItem2 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.horizontalLayout.addItem(spacerItem2)
+        spacerItem3 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        self.horizontalLayout.addItem(spacerItem3)
         self.apply_changes_button = QtGui.QPushButton(Form)
         self.apply_changes_button.setObjectName(_fromUtf8("apply_changes_button"))
         self.horizontalLayout.addWidget(self.apply_changes_button)
@@ -90,20 +93,18 @@
         self.restore_defaults_button.setObjectName(_fromUtf8("restore_defaults_button"))
         self.horizontalLayout.addWidget(self.restore_defaults_button)
         self.verticalLayout.addLayout(self.horizontalLayout)
-        spacerItem3 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
-        self.verticalLayout.addItem(spacerItem3)
 
         self.retranslateUi(Form)
         QtCore.QMetaObject.connectSlotsByName(Form)
 
     def retranslateUi(self, Form):
-        self.verticalGroupBox.setTitle(_('Bandwidth settings'))
+        self.bandwidth_settings.setTitle(_('Bandwidth settings'))
         self.limit_uploads_checkbox.setText(_('Limit upload speed to'))
         self.kbps_label_1.setText(_('Kilobits per second'))
         self.limit_downloads_checkbox.setText(_('Limit download speed to'))
         self.kbps_label_2.setText(_('Kilobits per second'))
         self.label_2.setText(_('Please note that your files will not sync if you set bandwidth to 0'))
-        self.groupBox_2.setTitle(_('File Sync Settings'))
+        self.file_sync_settings.setTitle(_('File Sync Settings'))
         self.autoconnect_checkbox.setText(_('Connect automatically when computer starts'))
         self.udf_autosubscribe_checkbox.setText(_('Automatically sync all selected folders on this computer to the cloud'))
         self.share_autosubscribe_checkbox.setText(_('Automatically sync all folders shared with me by other to this computer'))
 
=== modified file 'ubuntuone/controlpanel/gui/tests/test_url_sign.py'
--- ubuntuone/controlpanel/gui/tests/test_url_sign.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/gui/tests/test_url_sign.py	2011-08-12 19:16:23 +0000
@@ -29,7 +29,7 @@
          u'token': u'GkInOfSMGwTXAUoVQwLUoPxElEEUdhsLVNTPhxHJDUIeHCPNEo',
          u'token_secret': u'qFYImEtlczPbsCnYyuwLoPDlPEnvNcIktZphPQklAWrvyfFMV'}
 
-SAMPLE_SIGNED = 'https://one.ubuntu.com/api/1.0/from_oauth?oauth_nonce=' \
+SAMPLE_SIGNED = 'https://one.ubuntu.com/api/1.0/from_oauth/?oauth_nonce=' \
     '36886134&oauth_timestamp=1310671062&oauth_consumer_key=consumer_key&' \
     'oauth_signature_method=HMAC-SHA1&next=%2Fblah&oauth_version=1.0&' \
     'oauth_token=GkInOfSMGwTXAUoVQwLUoPxElEEUdhsLVNTPhxHJDUIeHCPNEo&' \
@@ -47,9 +47,15 @@
         signed = sign_url("/blah", TOKEN)
         parsed_signed = urlparse(signed)
         parsed_sample = urlparse(SAMPLE_SIGNED)
-
         self.assertEqual(parsed_signed.netloc, parsed_sample.netloc)
 
+    def test_is_correct_path(self):
+        """Test that we are using the right path in the URL."""
+        signed = sign_url("/blah", TOKEN)
+        parsed_signed = urlparse(signed)
+        parsed_sample = urlparse(SAMPLE_SIGNED)
+        self.assertEqual(parsed_signed.path, parsed_sample.path)
+
     def test_is_correct_scheme(self):
         """Test that we are using the right scheme."""
         signed = sign_url("/blah", TOKEN)
 
=== modified file 'ubuntuone/controlpanel/logger.py'
--- ubuntuone/controlpanel/logger.py	2011-01-25 19:08:59 +0000
+++ ubuntuone/controlpanel/logger.py	2011-08-12 19:16:23 +0000
@@ -26,7 +26,8 @@
 from logging.handlers import RotatingFileHandler
 
 # pylint: disable=F0401,E0611
-from ubuntuone.logger import LOGFOLDER, LOGBACKUP, basic_formatter
+from ubuntuone.logger import LOGBACKUP, basic_formatter
+from ubuntuone.platform.xdg_base_directory import ubuntuone_log_dir
 
 
 if os.environ.get('DEBUG'):
@@ -35,7 +36,8 @@
     # Only log this level and above
     LOG_LEVEL = logging.DEBUG  # before final release, switch to INFO
 
-MAIN_HANDLER = RotatingFileHandler(os.path.join(LOGFOLDER, 'controlpanel.log'),
+FILE_NAME = os.path.join(ubuntuone_log_dir, 'controlpanel.log')
+MAIN_HANDLER = RotatingFileHandler(FILE_NAME,
                                    maxBytes=1048576,
                                    backupCount=LOGBACKUP)
 MAIN_HANDLER.setFormatter(basic_formatter)