Merge lp:~dobey/ubuntu/oneiric/ubuntuone-control-panel/release-113 into lp:ubuntu/oneiric/ubuntuone-control-panel

[dobey]

=== modified file 'PKG-INFO'
--- PKG-INFO	2011-08-12 19:12:08 +0000
+++ PKG-INFO	2011-08-25 19:40:18 +0000
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: ubuntuone-control-panel
-Version: 1.1.2
+Version: 1.1.3
 Summary: Ubuntu One Control Panel
 Home-page: https://launchpad.net/ubuntuone-control-panel
 Author: Natalia Bidart
 Author-email: [e-mail]
 License: GPL v3
-Description: Application to manage a Ubuntu One account. Provides aDBus service to query/modify all the Ubuntu One bits.
+Description: Application to manage a Ubuntu One account. Provides a DBus service to query/modify all the Ubuntu One bits.
 Platform: UNKNOWN
 Requires: PyQt4
 Requires: apt

=== modified file 'bin/ubuntuone-control-panel-gtk'
--- bin/ubuntuone-control-panel-gtk	2011-07-22 21:26:48 +0000
+++ bin/ubuntuone-control-panel-gtk	2011-08-25 19:40:18 +0000
@@ -39,12 +39,12 @@
     result = OptionParser(usage=usage)
     result.add_option("", "--switch-to", dest="switch_to", type="string",
                       metavar="PANEL_NAME", default="",
-                      help="Start the Ubuntu One Control Panel (GTK) in the "
+                      help="Start Ubuntu One in the "
                            "PANEL_NAME tab. Possible values are: "
                            "dashboard, volumes, devices, applications")
     result.add_option("-a", "--alert", dest="alert", action="store_true",
-                      default=False, help="Start the Ubuntu One Control Panel "
-                      "(GTK) alerting the user to its presence.")
+                      default=False, help="Start Ubuntu One "
+                      "alerting the user to its presence.")
     return result
 
 

=== modified file 'bin/ubuntuone-control-panel-qt'
--- bin/ubuntuone-control-panel-qt	2011-07-22 21:26:48 +0000
+++ bin/ubuntuone-control-panel-qt	2011-08-25 19:40:18 +0000
@@ -39,12 +39,12 @@
     result = OptionParser(usage=usage)
     result.add_option("", "--switch-to", dest="switch_to", type="string",
                       metavar="PANEL_NAME", default="",
-                      help="Start the Ubuntu One Control Panel (QT) in the "
+                      help="Start Ubuntu One in the "
                            "PANEL_NAME tab. Possible values are: "
                            "dashboard, volumes, devices, applications")
     result.add_option("-a", "--alert", dest="alert", action="store_true",
-                      default=False, help="Start the Ubuntu One Control Panel "
-                      "(QT) alerting the user to its presence.")
+                      default=False, help="Start Ubuntu One "
+                      "alerting the user to its presence.")
     return result
 
 

=== modified file 'data/facebook.png'
Binary files data/facebook.png	2011-01-25 19:08:59 +0000 and data/facebook.png	2011-08-25 19:40:18 +0000 differ
=== modified file 'data/qt/account.ui'
--- data/qt/account.ui	2011-08-12 19:12:08 +0000
+++ data/qt/account.ui	2011-08-25 19:40:18 +0000
@@ -22,7 +22,7 @@
      <property name="verticalSpacing">
       <number>30</number>
      </property>
-     <item row="2" column="2">
+     <item row="0" column="2">
       <widget class="GoToWebButton" name="edit_profile_button">
        <property name="text">
         <string>Edit personal details online</string>
@@ -85,7 +85,7 @@
        </layout>
       </widget>
      </item>
-     <item row="0" column="2">
+     <item row="2" column="2">
       <widget class="GoToWebButton" name="edit_services_button">
        <property name="text">
         <string>Edit your services  online</string>

=== modified file 'data/qt/controlpanel.ui'
--- data/qt/controlpanel.ui	2011-08-12 19:12:08 +0000
+++ data/qt/controlpanel.ui	2011-08-25 19:40:18 +0000
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>387</width>
-    <height>203</height>
+    <width>367</width>
+    <height>142</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -221,7 +221,7 @@
      </widget>
      <widget class="PreferencesPanel" name="preferences_tab">
       <attribute name="title">
-       <string>Preferences</string>
+       <string>Settings</string>
       </attribute>
      </widget>
      <widget class="AccountPanel" name="account_tab">
@@ -233,22 +233,25 @@
    </item>
    <item>
     <widget class="QFrame" name="frame_footer">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>30</height>
+      </size>
+     </property>
      <layout class="QHBoxLayout" name="horizontalLayout">
       <property name="spacing">
        <number>5</number>
       </property>
-      <property name="leftMargin">
-       <number>3</number>
-      </property>
-      <property name="topMargin">
+      <property name="margin">
        <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">
@@ -282,49 +285,49 @@
        </widget>
       </item>
       <item>
-       <widget class="QToolButton" name="twitter_button">
+       <widget class="QPushButton" name="twitter_button">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>16</width>
+          <height>16</height>
+         </size>
+        </property>
         <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">
+       <widget class="QPushButton" name="facebook_button">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>16</width>
+          <height>16</height>
+         </size>
+        </property>
         <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>

=== modified file 'data/qt/device.ui'
--- data/qt/device.ui	2011-08-12 19:12:08 +0000
+++ data/qt/device.ui	2011-08-25 19:40:18 +0000
@@ -46,6 +46,9 @@
      <property name="text">
       <string>Remove</string>
      </property>
+     <property name="secondary" stdset="0">
+      <bool>true</bool>
+     </property>
     </widget>
    </item>
   </layout>

=== modified file 'data/qt/filesyncstatus.ui'
--- data/qt/filesyncstatus.ui	2011-08-12 19:12:08 +0000
+++ data/qt/filesyncstatus.ui	2011-08-25 19:40:18 +0000
@@ -20,8 +20,7 @@
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
-      <widget class="QLabel" name="sync_status_icon">
-      </widget>
+      <widget class="QLabel" name="sync_status_icon"/>
      </item>
      <item>
       <widget class="QLabel" name="sync_status_label">
@@ -40,6 +39,9 @@
    </item>
    <item>
     <widget class="QPushButton" name="sync_status_button">
+     <property name="secondary" stdset="0">
+      <bool>true</bool>
+     </property>
     </widget>
    </item>
   </layout>

=== modified file 'data/qt/folders.ui'
--- data/qt/folders.ui	2011-08-12 19:12:08 +0000
+++ data/qt/folders.ui	2011-08-25 19:40:18 +0000
@@ -13,9 +13,6 @@
   <property name="windowTitle">
    <string notr="true">Form</string>
   </property>
-  <property name="styleSheet">
-   <string notr="true">padding: 0px;</string>
-  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="spacing">
     <number>0</number>
@@ -38,7 +35,7 @@
       <item>
        <widget class="GoToWebButton" name="share_publish_button">
         <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
@@ -136,6 +133,9 @@
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Expanding</enum>
+        </property>
         <property name="sizeHint" stdset="0">
          <size>
           <width>53</width>
@@ -147,7 +147,7 @@
       <item>
        <widget class="AddFolderButton" name="add_folder_button">
         <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
@@ -162,6 +162,9 @@
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Expanding</enum>
+        </property>
         <property name="sizeHint" stdset="0">
          <size>
           <width>40</width>

=== modified file 'data/qt/images.qrc'
--- data/qt/images.qrc	2011-07-22 21:26:48 +0000
+++ data/qt/images.qrc	2011-08-25 19:40:18 +0000
@@ -10,6 +10,8 @@
     <file>../computer.png</file>
     <file>../phone.png</file>
     <file>../twitter.png</file>
+    <file>../twitter.png</file>
+    <file>../facebook.png</file>
     <file>../facebook.png</file>
     <file>../external_icon_white.png</file>
     <file>../Ubuntu-R.ttf</file>

=== modified file 'data/qt/mainwindow.ui'
--- data/qt/mainwindow.ui	2011-07-22 21:26:48 +0000
+++ data/qt/mainwindow.ui	2011-08-25 19:40:18 +0000
@@ -23,7 +23,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>Ubuntu One Control Panel</string>
+   <string>Ubuntu One</string>
   </property>
   <property name="windowIcon">
    <iconset resource="images.qrc">

=== modified file 'data/qt/preferences.ui'
--- data/qt/preferences.ui	2011-08-12 19:12:08 +0000
+++ data/qt/preferences.ui	2011-08-25 19:40:18 +0000
@@ -23,7 +23,7 @@
    <item>
     <widget class="QGroupBox" name="bandwidth_settings">
      <property name="title">
-      <string>Bandwidth settings</string>
+      <string>Bandwidth Settings</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
       <property name="margin">
@@ -202,6 +202,9 @@
        <property name="text">
         <string>Default settings</string>
        </property>
+       <property name="secondary" stdset="0">
+        <bool>true</bool>
+       </property>
       </widget>
      </item>
     </layout>

=== modified file 'data/qt/ubuntuone.qss'
--- data/qt/ubuntuone.qss	2011-08-12 19:12:08 +0000
+++ data/qt/ubuntuone.qss	2011-08-25 19:40:18 +0000
@@ -4,6 +4,8 @@
 
 QWidget {
     font-family: "Ubuntu";
+    font-size: 13px;
+    color: #333333;
 }
 
 QFrame {
@@ -42,59 +44,82 @@
     border-bottom-width: 1px;
 }
 
+QFrame#frm_box { /*The Loading Overlay frame.*/
+    background: #ffffff;
+    border-radius: 5px;
+    border-style: solid;
+    border-color: #939389;
+    border-width: 1px;
+    color: white;
+    min-height: 100px;
+}
+
+QFrame#frm_box > QLabel {
+    font-size: 24px;
+}
+
+QPushButton {
+    border-radius: 5px;
+    border-style: solid;
+    padding: 6px;
+    padding-left: 20px;
+    padding-right: 20px;
+    border-width: 1px;
+}
+
 QPushButton[enabled="true"] {
     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-        stop: 0 #fecfc2, stop: 1.0 #e44e19);
-    border-radius: 5px;
-    border-style: solid;
-    padding: 6px;
+        stop: 0 #fe9e84,stop: 1.0 #dd4814);
     color: white;
-    border-color: #939389;
-    border-width: 1px;
-    height: 14px;
+    border-color: #999999;
 }
 
 QPushButton:hover[enabled="true"] {
     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-        stop: 0 #fedad1,stop: 1.0 #e47a55);
-    border-radius: 5px;
-    border-style: solid;
-    padding: 6px;
+        stop: 0 #ffb19c,stop: 1.0 #dd4814);
     color: white;
-    border-color: #939389;
-    border-width: 1px;
-    height: 12px;
+    border-color: #999999;
 }
 
 QPushButton:pressed[enabled="true"] {
     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-        stop: 0 #e44e19,stop: 1.0 #fecfc2);
-    border-radius: 5px;
-    border-style: solid;
-    padding: 6px;
+        stop: 0 #b93f14,stop: 1.0 #dd4814);
     color: white;
-    border-color: #939389;
-    border-width: 1px;
-    height: 12px;
+    border-color: #999999;
+}
+
+QPushButton[secondary="true"] {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+        stop: 0 #ffffff,stop: 1.0 #e6e6e6);
+    color: #333333;
+    border-color: #999999;
+}
+
+QPushButton:hover[secondary="true"] {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+        stop: 0 #ffffff,stop: 1.0 #ededed);
+    color: #333333;
+    border-color: #999999;
+}
+
+QPushButton:pressed[secondary="true"] {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+        stop: 0 #d9d9d9,stop: 1.0 #fefefe);
+    color: #333333;
+    border-color: #999999;
 }
 
 QPushButton[enabled="false"] {
     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
         stop: 0 #eaeaea, stop: 1.0 #cacaca);
-    border-radius: 5px;
-    border-style: solid;
-    padding: 6px;
     color: #595959;
     border-color: #939389;
-    border-width: 1px;
-    height: 12px;
 }
 
 QPushButton#help_button {
     background: transparent;
     border: none;
     color: white;
-    height: 20px;
     text-decoration: underline;
     padding: 0px;
 }
@@ -103,10 +128,13 @@
     border: none;
     background: none;
     color: #595959;
+    padding-left: 10px;
+    padding-right: 10px;
 }
 
-QPushButton#add_folder_button {
-    padding: 5px;
+QPushButton#twitter_button,
+QPushButton#facebook_button {
+    border: none;
 }
 
 GoToWebButton#share_publish_button {
@@ -158,9 +186,7 @@
 }
 
 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);
+    background: #f6f6f6;
     text-decoration: underline;
 }
 
@@ -223,20 +249,11 @@
     color: white;
 }
 
-QFrame#frm_box { /* the loadingoverlay frame */
-    background: #ffffff;
-    border-radius: 5px;
-    border-style: solid;
-    border-color: #939389;
-    border-width: 1px;
-    color: white;
-    min-height: 100px;
-}
-
 QAbstractItemView {
     border-style: solid;
-    border-color: #333333;
-    border-width: 1px;
-    alternate-background-color: #efedec;
-    background: #f7f6f5;
+    border-color: #898989;
+    border-top-width: 1px;
+    border-bottom-width: 1px;
+    alternate-background-color: #f7f6f5;
+    background: #efedec;
 }

=== modified file 'data/twitter.png'
Binary files data/twitter.png	2011-01-25 19:08:59 +0000 and data/twitter.png	2011-08-25 19:40:18 +0000 differ
=== modified file 'debian/changelog'
--- debian/changelog	2011-08-12 19:13:51 +0000
+++ debian/changelog	2011-08-25 19:40:18 +0000
@@ -1,3 +1,10 @@
+ubuntuone-control-panel (1.1.3-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release.
+    - Work correctly with static and GI bindings of gobject (LP: #829186)
+
+ -- Rodney Dawes <[e-mail]>  Thu, 25 Aug 2011 15:37:15 -0400
+
 ubuntuone-control-panel (1.1.2-0ubuntu1) oneiric; urgency=low
 
   * New upstream release.

=== modified file 'po/ubuntuone-control-panel.pot'
--- po/ubuntuone-control-panel.pot	2011-08-12 19:12:08 +0000
+++ po/ubuntuone-control-panel.pot	2011-08-25 19:40:18 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-12 15:07-0400\n"
+"POT-Creation-Date: 2011-08-25 15:26-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"

=== modified file 'run-tests'
--- run-tests	2011-07-22 21:26:48 +0000
+++ run-tests	2011-08-25 19:40:18 +0000
@@ -37,14 +37,16 @@
 fi
 
 style_check() {
-    u1lint --ignore ubuntuone/controlpanel/gui/qt/ui ubuntuone/
+    u1lint --ignore ubuntuone/controlpanel/gui/qt/ui
     if [ -x `which pep8` ]; then
-        pep8 --exclude '.svn,CVS,.bzr,.hg,.git,*_ui.py,*_rc.py' --repeat bin/ $MODULE
+        pep8 --exclude '.svn,CVS,.bzr,.hg,.git,*_ui.py,*_rc.py' --repeat .
     else
         echo "Please install the 'pep8' package."
     fi
 }
 
+unset GTK_MODULES
+
 ./setup.py build
 echo "Running test suite for ""$MODULE"
 if [ "$USE_QT" -eq 0 ]; then

=== modified file 'run-tests.bat'
--- run-tests.bat	2011-07-22 21:26:48 +0000
+++ run-tests.bat	2011-08-25 19:40:18 +0000
@@ -30,7 +30,7 @@
 ECHO Cleaning the generated code before running the style checks...
 "%PYTHONEXEPATH%\python.exe" setup.py clean
 ECHO Performing style checks...
-"%PYTHONEXEPATH%\Scripts\u1lint.exe" --ignore ubuntuone\controlpanel\gui\qt\ui "%MODULE%"
+"%PYTHONEXEPATH%\python.exe" "%PYTHONEXEPATH%\Scripts\u1lint" --ignore ubuntuone\controlpanel\gui\qt\ui "%MODULE%"
 "%PYTHONEXEPATH%\Scripts\pep8.exe" --exclude ".svn,CVS,.bzr,.hg,.git,*_ui.py,*_rc.py" --repeat .
 :: Delete the temp folders
 RMDIR /s /q _trial_temp

=== modified file 'setup.py'
--- setup.py	2011-08-12 19:12:08 +0000
+++ setup.py	2011-08-25 19:40:18 +0000
@@ -46,6 +46,7 @@
 CLEANFILES = [
     SERVICE_FILE, GUI_SERVICE_FILE, MESSAGE_ENTRY, CONSTANTS, POT_FILE,
     'MANIFEST']
+QT_UI_DIR = os.path.join('ubuntuone', 'controlpanel', 'gui', 'qt', 'ui')
 
 
 def replace_prefix(prefix):
@@ -64,7 +65,7 @@
     def run(self):
         """Do the install.
 
-        Read from *.service.in and generate .service files with reeplacing
+        Read from *.service.in and generate .service files by replacing
         @prefix@ by self.prefix.
 
         """
@@ -75,7 +76,6 @@
 class ControlPanelBuild(build_extra.build_extra):
     """Build PyQt (.ui) files and resources."""
 
-    QT_UI_DIR = os.path.join('ubuntuone', 'controlpanel', 'gui', 'qt', 'ui')
     description = "build PyQt GUIs (.ui) and resources (.qrc)"
 
     def compile_ui(self, ui_file, py_file=None):
@@ -86,7 +86,7 @@
             # python file in the qt moodule
             py_file = os.path.split(ui_file)[1]
             py_file = os.path.splitext(py_file)[0] + '_ui.py'
-            py_file = os.path.join(self.QT_UI_DIR, py_file)
+            py_file = os.path.join(QT_UI_DIR, py_file)
         # we indeed want to catch Exception, is ugly but we need it
         # pylint: disable=W0703
         try:
@@ -112,7 +112,7 @@
         if py_file is None:
             py_file = os.path.split(qrc_file)[1]
             py_file = os.path.splitext(py_file)[0] + '_rc.py'
-            py_file = os.path.join(self.QT_UI_DIR, py_file)
+            py_file = os.path.join(QT_UI_DIR, py_file)
         path = os.getenv('PATH')
         os.putenv('PATH', path + os.path.pathsep + os.path.join(
                   os.path.dirname(PyQt4.__file__), 'bin'))
@@ -218,18 +218,24 @@
             if os.path.exists(built_file):
                 os.unlink(built_file)
 
+        for dirpath, _, filenames in os.walk(os.path.join(QT_UI_DIR)):
+            for current_file in filenames:
+                if current_file.endswith('_ui.py') or\
+                                current_file.endswith('_rc.py'):
+                    os.unlink(os.path.join(dirpath, current_file))
+
         DistUtilsExtra.auto.clean_build_tree.run(self)
 
 
 DistUtilsExtra.auto.setup(
     name='ubuntuone-control-panel',
-    version='1.1.2',
+    version='1.1.3',
     license='GPL v3',
     author='Natalia Bidart',
     author_email='[e-mail]',
     description='Ubuntu One Control Panel',
-    long_description='Application to manage a Ubuntu One account. Provides a'\
-                     'DBus service to query/modify all the Ubuntu One bits.',
+    long_description='Application to manage a Ubuntu One account. Provides' \
+        ' a DBus service to query/modify all the Ubuntu One bits.',
     url='https://launchpad.net/ubuntuone-control-panel',
     packages=[
         'ubuntuone', 'ubuntuone.controlpanel', 'ubuntuone.controlpanel.gui',

=== modified file 'ubuntuone/controlpanel/backend.py'
--- ubuntuone/controlpanel/backend.py	2011-08-12 19:12:08 +0000
+++ ubuntuone/controlpanel/backend.py	2011-08-25 19:40:18 +0000
@@ -27,11 +27,12 @@
 
 from twisted.internet.defer import inlineCallbacks, returnValue
 # No name 'is_link' in module 'ubuntuone.platform'
-# pylint: disable=E0611
+# pylint: disable=E0611, F0401
 from ubuntuone.platform import is_link
-# pylint: enable=E0611
+from ubuntuone.platform.credentials import CredentialsManagementTool
+# pylint: enable=E0611, F0401
 
-from ubuntuone.controlpanel import login_client, sd_client, replication_client
+from ubuntuone.controlpanel import sd_client, replication_client
 from ubuntuone.controlpanel.logger import setup_logging, log_call
 # pylint: disable=W0611
 from ubuntuone.controlpanel.web_client import (UnauthorizedError,
@@ -92,13 +93,13 @@
 
     @inlineCallbacks
     @wraps(f)
-    def inner(*args, **kwargs):
+    def inner(instance, *args, **kwargs):
         """Handle UnauthorizedError and clear credentials."""
         try:
-            result = yield f(*args, **kwargs)
+            result = yield f(instance, *args, **kwargs)
         except UnauthorizedError, e:
             logger.exception('process_unauthorized (clearing credentials):')
-            yield login_client.clear_credentials()
+            yield instance.login_client.clear_credentials()
             raise e
 
         returnValue(result)
@@ -126,13 +127,17 @@
 
     def __init__(self, shutdown_func=None):
         """Initialize the web_client."""
-        self.shutdown_func = shutdown_func
-        self.wc = web_client_factory(login_client.get_credentials)
         self._status_changed_handler = None
-
+        self._credentials = None
         self._volumes = {}  # cache last known volume info
+
+        self.shutdown_func = shutdown_func
         self.file_sync_disabled = False
 
+        self.login_client = CredentialsManagementTool()
+        self.sd_client = sd_client.SyncDaemonClient()
+        self.wc = web_client_factory(self.get_credentials)
+
     def _process_file_sync_status(self, status):
         """Process raw file sync status into custom format.
 
@@ -194,11 +199,7 @@
             handler(result)
 
         self._status_changed_handler = handler
-
-        # XXX: since windows version of sd_client still don't have a way of
-        # setting a status changed handler, we'll be robust by doing this check
-        if getattr(sd_client, 'set_status_changed_handler', None) is not None:
-            sd_client.set_status_changed_handler(process_and_callback)
+        self.sd_client.set_status_changed_handler(process_and_callback)
 
     def _get_status_changed_handler(self):
         """Return the handler to be called when file sync status changes."""
@@ -263,7 +264,7 @@
         If all the file sync settings are None, do not attach that info.
 
         """
-        credentials = yield login_client.get_credentials()
+        credentials = yield self.get_credentials()
 
         local_device = {}
         local_device["type"] = DEVICE_TYPE_COMPUTER
@@ -294,9 +295,16 @@
         return result
 
     @inlineCallbacks
+    def get_credentials(self):
+        """Find credentials."""
+        if self._credentials is None:
+            self._credentials = yield self.login_client.find_credentials()
+        returnValue(self._credentials)
+
+    @inlineCallbacks
     def get_token(self):
         """Return the token from the credentials."""
-        credentials = yield login_client.get_credentials()
+        credentials = yield self.get_credentials()
         returnValue(credentials["token"])
 
     @inlineCallbacks
@@ -344,25 +352,25 @@
         autoconnect = show_notifs = None
         share_autosubscribe = udf_autosubscribe = None
 
-        enabled = yield sd_client.files_sync_enabled()
+        enabled = yield self.sd_client.files_sync_enabled()
         enabled = bool(enabled)
         if enabled:
-            sd_res = yield sd_client.autoconnect_enabled()
+            sd_res = yield self.sd_client.autoconnect_enabled()
             autoconnect = bool(sd_res)
 
-            sd_res = yield sd_client.show_all_notifications_enabled()
+            sd_res = yield self.sd_client.show_all_notifications_enabled()
             show_notifs = bool(sd_res)
 
-            sd_res = yield sd_client.share_autosubscribe_enabled()
+            sd_res = yield self.sd_client.share_autosubscribe_enabled()
             share_autosubscribe = bool(sd_res)
 
-            sd_res = yield sd_client.udf_autosubscribe_enabled()
+            sd_res = yield self.sd_client.udf_autosubscribe_enabled()
             udf_autosubscribe = bool(sd_res)
 
-            sd_res = yield sd_client.bandwidth_throttling_enabled()
+            sd_res = yield self.sd_client.bandwidth_throttling_enabled()
             limit_bw = bool(sd_res)
 
-            limits = yield sd_client.get_throttling_limits()
+            limits = yield self.sd_client.get_throttling_limits()
 
         logger.debug('devices_info: file sync enabled? %s limit_bw %s, limits '
                      '%s, autoconnect %s, show_notifs %s, '
@@ -432,19 +440,19 @@
 
         if is_local and SHOW_ALL_NOTIFICATIONS_KEY in settings:
             if not settings[SHOW_ALL_NOTIFICATIONS_KEY]:
-                yield sd_client.disable_show_all_notifications()
+                yield self.sd_client.disable_show_all_notifications()
             else:
-                yield sd_client.enable_show_all_notifications()
+                yield self.sd_client.enable_show_all_notifications()
 
         if is_local and LIMIT_BW_KEY in settings:
             if not settings[LIMIT_BW_KEY]:
-                yield sd_client.disable_bandwidth_throttling()
+                yield self.sd_client.disable_bandwidth_throttling()
             else:
-                yield sd_client.enable_bandwidth_throttling()
+                yield self.sd_client.enable_bandwidth_throttling()
 
         if is_local and (UPLOAD_KEY in settings or
                          DOWNLOAD_KEY in settings):
-            current_limits = yield sd_client.get_throttling_limits()
+            current_limits = yield self.sd_client.get_throttling_limits()
             limits = {
                 "download": current_limits["download"],
                 "upload": current_limits["upload"],
@@ -453,7 +461,7 @@
                 limits["upload"] = settings[UPLOAD_KEY]
             if DOWNLOAD_KEY in settings:
                 limits["download"] = settings[DOWNLOAD_KEY]
-            sd_client.set_throttling_limits(limits)
+            self.sd_client.set_throttling_limits(limits)
 
         # still pending: more work on the settings dict (LP: #673674)
         returnValue(device_id)
@@ -472,7 +480,7 @@
         if is_local:
             logger.warning('remove_device: device is local! removing and '
                            'clearing credentials.')
-            yield login_client.clear_credentials()
+            yield self.login_client.clear_credentials()
 
         returnValue(device_id)
 
@@ -480,9 +488,9 @@
     @inlineCallbacks
     def file_sync_status(self):
         """Return the status of the file sync service."""
-        enabled = yield sd_client.files_sync_enabled()
+        enabled = yield self.sd_client.files_sync_enabled()
         if enabled:
-            status = yield sd_client.get_current_status()
+            status = yield self.sd_client.get_current_status()
         else:
             status = {}
         returnValue(self._process_file_sync_status(status))
@@ -491,46 +499,46 @@
     @inlineCallbacks
     def enable_files(self):
         """Enable the files service."""
-        yield sd_client.set_files_sync_enabled(True)
+        yield self.sd_client.set_files_sync_enabled(True)
         self.file_sync_disabled = False
 
     @log_call(logger.debug)
     @inlineCallbacks
     def disable_files(self):
         """Enable the files service."""
-        yield sd_client.set_files_sync_enabled(False)
+        yield self.sd_client.set_files_sync_enabled(False)
         self.file_sync_disabled = True
 
     @log_call(logger.debug)
     @inlineCallbacks
     def connect_files(self):
         """Connect the files service."""
-        yield sd_client.connect_file_sync()
+        yield self.sd_client.connect_file_sync()
 
     @log_call(logger.debug)
     @inlineCallbacks
     def disconnect_files(self):
         """Disconnect the files service."""
-        yield sd_client.disconnect_file_sync()
+        yield self.sd_client.disconnect_file_sync()
 
     @log_call(logger.debug)
     @inlineCallbacks
     def restart_files(self):
         """restart the files service."""
-        yield sd_client.stop_file_sync()
-        yield sd_client.start_file_sync()
+        yield self.sd_client.stop_file_sync()
+        yield self.sd_client.start_file_sync()
 
     @log_call(logger.debug)
     @inlineCallbacks
     def start_files(self):
         """start the files service."""
-        yield sd_client.start_file_sync()
+        yield self.sd_client.start_file_sync()
 
     @log_call(logger.debug)
     @inlineCallbacks
     def stop_files(self):
         """stop the files service."""
-        yield sd_client.stop_file_sync()
+        yield self.sd_client.stop_file_sync()
 
     @log_call(logger.debug)
     @inlineCallbacks
@@ -547,11 +555,11 @@
             else:
                 free_bytes = account['quota_total'] - account['quota_used']
 
-        root_dir = yield sd_client.get_root_dir()
-        shares_dir = yield sd_client.get_shares_dir()
-        shares_dir_link = yield sd_client.get_shares_dir_link()
-        folders = yield sd_client.get_folders()
-        shares = yield sd_client.get_shares()
+        root_dir = yield self.sd_client.get_root_dir()
+        shares_dir = yield self.sd_client.get_shares_dir()
+        shares_dir_link = yield self.sd_client.get_shares_dir_link()
+        folders = yield self.sd_client.get_folders()
+        shares = yield self.sd_client.get_shares()
 
         root_volume = {u'volume_id': u'', u'path': root_dir,
                        u'subscribed': True, u'type': self.ROOT_TYPE,
@@ -630,23 +638,23 @@
     def subscribe_volume(self, volume_id):
         """Subscribe to 'volume_id'."""
         if self._volumes[volume_id][u'type'] == self.FOLDER_TYPE:
-            yield sd_client.subscribe_folder(volume_id)
+            yield self.sd_client.subscribe_folder(volume_id)
         elif self._volumes[volume_id][u'type'] == self.SHARE_TYPE:
-            yield sd_client.subscribe_share(volume_id)
+            yield self.sd_client.subscribe_share(volume_id)
 
     @inlineCallbacks
     def unsubscribe_volume(self, volume_id):
         """Unsubscribe from 'volume_id'."""
         if self._volumes[volume_id][u'type'] == self.FOLDER_TYPE:
-            yield sd_client.unsubscribe_folder(volume_id)
+            yield self.sd_client.unsubscribe_folder(volume_id)
         elif self._volumes[volume_id][u'type'] == self.SHARE_TYPE:
-            yield sd_client.unsubscribe_share(volume_id)
+            yield self.sd_client.unsubscribe_share(volume_id)
 
     @log_call(logger.debug)
     @inlineCallbacks
     def create_folder(self, folder_path):
         """Create a new User Defined Folder pointing to 'folder_path'."""
-        yield sd_client.create_folder(path=folder_path)
+        yield self.sd_client.create_folder(path=folder_path)
 
     @log_call(logger.debug)
     @inlineCallbacks
@@ -728,11 +736,11 @@
 
         for name in (AUTOCONNECT_KEY, SHOW_ALL_NOTIFICATIONS_KEY,
                      SHARE_AUTOSUBSCRIBE_KEY, UDF_AUTOSUBSCRIBE_KEY):
-            sd_method = getattr(sd_client, '%s_enabled' % name)
+            sd_method = getattr(self.sd_client, '%s_enabled' % name)
             value = yield sd_method()
             result[name] = bool(value)
 
-        limits = yield sd_client.get_throttling_limits()
+        limits = yield self.sd_client.get_throttling_limits()
         result[DOWNLOAD_KEY] = limits['download']
         result[UPLOAD_KEY] = limits['upload']
 
@@ -744,7 +752,7 @@
         if setting_name in settings:
             new_value = settings[setting_name]
             sd_method_name = 'enable_%s' if new_value else 'disable_%s'
-            sd_method = getattr(sd_client, sd_method_name % setting_name)
+            sd_method = getattr(self.sd_client, sd_method_name % setting_name)
             yield sd_method()
 
     @log_call(logger.info)
@@ -756,7 +764,7 @@
             yield self._change_boolean_file_sync_setting(name, settings)
 
         if DOWNLOAD_KEY in settings or UPLOAD_KEY in settings:
-            current_limits = yield sd_client.get_throttling_limits()
+            current_limits = yield self.sd_client.get_throttling_limits()
             limits = {
                 "download": current_limits["download"],
                 "upload": current_limits["upload"],
@@ -765,13 +773,13 @@
                 limits["upload"] = settings[UPLOAD_KEY]
             if DOWNLOAD_KEY in settings:
                 limits["download"] = settings[DOWNLOAD_KEY]
-            yield sd_client.set_throttling_limits(limits)
+            yield self.sd_client.set_throttling_limits(limits)
 
             throttling_disabled = sum(limits.itervalues()) == -2
             if throttling_disabled:
-                yield sd_client.disable_bandwidth_throttling()
+                yield self.sd_client.disable_bandwidth_throttling()
             else:
-                yield sd_client.enable_bandwidth_throttling()
+                yield self.sd_client.enable_bandwidth_throttling()
 
     @log_call(logger.info)
     @inlineCallbacks

=== modified file 'ubuntuone/controlpanel/dbus_service.py'
--- ubuntuone/controlpanel/dbus_service.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/dbus_service.py	2011-08-25 19:40:18 +0000
@@ -20,9 +20,17 @@
 """Export the control backend thru DBus."""
 
 from functools import wraps
+import sys
 
 import dbus.service
-import gobject
+# pylint: disable=E0611
+# pylint: disable=W0404
+if 'gobject' in sys.modules:
+    import gobject as GObject
+else:
+    from gi.repository import GObject
+# pylint: enable=W0404
+# pylint: enable=E0611
 
 from dbus.mainloop.glib import DBusGMainLoop
 from dbus.service import method, signal
@@ -608,9 +616,9 @@
 
 
 def run_mainloop(loop=None):
-    """Run the gobject main loop."""
+    """Run the GObject main loop."""
     if loop is None:
-        loop = gobject.MainLoop()
+        loop = GObject.MainLoop()
     loop.run()
 
 
@@ -643,7 +651,7 @@
     """Hook the DBus listeners and start the main loop."""
     init_mainloop()
     if register_service():
-        loop = gobject.MainLoop()
+        loop = GObject.MainLoop()
         publish_backend(shutdown_func=loop.quit)
         run_mainloop(loop=loop)
     else:

=== modified file 'ubuntuone/controlpanel/dbustests/test_dbus_service.py'
--- ubuntuone/controlpanel/dbustests/test_dbus_service.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/dbustests/test_dbus_service.py	2011-08-25 19:40:18 +0000
@@ -107,7 +107,7 @@
         rs()
         self.mocker.result(True)
 
-        mainloop = "ubuntuone.controlpanel.dbus_service.gobject.MainLoop"
+        mainloop = "ubuntuone.controlpanel.dbus_service.GObject.MainLoop"
         mainloop = self.mocker.replace(mainloop)
         mainloop()
         loop = self.mocker.mock()

=== modified file 'ubuntuone/controlpanel/dbustests/test_sd_client/test_linux.py'
--- ubuntuone/controlpanel/dbustests/test_sd_client/test_linux.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/dbustests/test_sd_client/test_linux.py	2011-08-25 19:40:18 +0000
@@ -82,7 +82,8 @@
 
     def test_set_status_changed_handler(self):
         """A proper callback can be connected to StatusChanged signal."""
-        _, sig = sd_client.set_status_changed_handler(self._set_called)
+        client = sd_client.SyncDaemonClient()
+        _, sig = client.set_status_changed_handler(self._set_called)
 
         self.assertEqual(sig._handler, self._set_called)
         self.assertEqual(sig._member, 'StatusChanged')

=== modified file 'ubuntuone/controlpanel/gui/gtk/gui.py'
--- ubuntuone/controlpanel/gui/gtk/gui.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/gui/gtk/gui.py	2011-08-25 19:40:18 +0000
@@ -28,17 +28,14 @@
 import dbus
 import gtk
 import gobject
-import ubuntu_sso
 
 from dbus.mainloop.glib import DBusGMainLoop
 from ubuntu_sso import networkstate
-from ubuntu_sso.credentials import (TC_URL_KEY, HELP_TEXT_KEY, WINDOW_ID_KEY,
-    PING_URL_KEY)
-# No name 'clientdefs' in module 'ubuntuone'
 # pylint: disable=E0611,F0401
-from gi.repository import GLib
-from ubuntuone.clientdefs import (APP_NAME as U1_APP_NAME, TC_URL as U1_TC_URL,
-    PING_URL as U1_PING_URL, DESCRIPTION as U1_DESCRIPTION)
+from ubuntuone.platform.credentials import (
+    APP_NAME as U1_APP_NAME,
+    CredentialsManagementTool,
+)
 # pylint: enable=E0611,F0401
 
 # Wildcard import ubuntuone.controlpanel.gui
@@ -123,21 +120,6 @@
     gtk.main()
 
 
-def filter_by_app_name(f):
-    """Excecute 'f' filtering by app_name."""
-
-    @wraps(f)
-    def filter_by_app_name_inner(instance, app_name, *args, **kwargs):
-        """Execute 'f' only if 'app_name' matches 'U1_APP_NAME'."""
-        if app_name == U1_APP_NAME:
-            return f(instance, app_name, *args, **kwargs)
-        else:
-            logger.info('%s: ignoring call since received app_name '\
-                        '"%s" (expected "%s")',
-                        f.__name__, app_name, U1_APP_NAME)
-    return filter_by_app_name_inner
-
-
 def on_size_allocate(widget, allocation, label):
     """Resize labels according to who 'widget' is being resized."""
     label.set_size_request(allocation.width - 2, -1)
@@ -188,10 +170,6 @@
 
         logger.debug('%s: started.', self.__class__.__name__)
 
-    def humanize(self, int_bytes):
-        """Return a human readble string of 'int_bytes'."""
-        return GLib.format_size_for_display(int_bytes)
-
     def _set_warning(self, message, label):
         """Set 'message' as warning in 'label'."""
         label.set_markup(WARNING_MARKUP % message)
@@ -272,23 +250,9 @@
 
     def __init__(self, main_window):
         GreyableBin.__init__(self)
-
-        sso_backend = None
-        bus = dbus.SessionBus()
-        try:
-            obj = bus.get_object(ubuntu_sso.DBUS_BUS_NAME,
-                                 ubuntu_sso.DBUS_CREDENTIALS_PATH,
-                                 follow_name_owner_changes=True)
-            iface = ubuntu_sso.DBUS_CREDENTIALS_IFACE
-            sso_backend = dbus.Interface(obj, dbus_interface=iface)
-        except dbus.exceptions.DBusException:
-            logger.exception('Can not connect to DBus at %r',
-                             (ubuntu_sso.DBUS_BUS_NAME,
-                              ubuntu_sso.DBUS_CREDENTIALS_PATH))
-            raise
-
+        creds_backend = CredentialsManagementTool()
         ControlPanelMixin.__init__(self, filename='overview.ui',
-                                   backend_instance=sso_backend)
+                                   backend_instance=creds_backend)
         self.add(self.itself)
         self.banner.set_from_file(get_data_file(OVERVIEW_BANNER))
         self.files_icon.set_from_file(get_data_file(FILES_ICON))
@@ -305,15 +269,6 @@
         self._credentials_are_new = False
         self.show()
 
-        self.backend.connect_to_signal('CredentialsFound',
-                                       self.on_credentials_found)
-        self.backend.connect_to_signal('CredentialsNotFound',
-                                       self.on_credentials_not_found)
-        self.backend.connect_to_signal('CredentialsError',
-                                       self.on_credentials_error)
-        self.backend.connect_to_signal('AuthorizationDenied',
-                                       self.on_authorization_denied)
-
         kw = dict(result_cb=self.on_network_state_changed)
         self.network_manager_state = networkstate.NetworkManagerState(**kw)
         self.network_manager_state.find_online_state()
@@ -323,6 +278,14 @@
         ControlPanelMixin._set_warning(self, message,
                                        label=self.warning_label)
 
+    def _window_xid(self):
+        """Return settings for credentials backend."""
+        if self.main_window.window is not None:
+            settings = {'window_id': str(self.main_window.window.xid)}
+        else:
+            settings = {}
+        return settings
+
     def set_property(self, prop_name, new_value):
         """Override 'set_property' to disable buttons if prop is 'greyed'."""
         if prop_name == 'greyed':
@@ -342,21 +305,17 @@
 
     def on_join_now_button_clicked(self, *a, **kw):
         """User wants to join now."""
-        settings = {TC_URL_KEY: U1_TC_URL, HELP_TEXT_KEY: U1_DESCRIPTION,
-                    WINDOW_ID_KEY: str(self.main_window.window.xid),
-                    PING_URL_KEY: U1_PING_URL}
-        self.backend.register(U1_APP_NAME, settings,
-            reply_handler=NO_OP, error_handler=error_handler)
+        d = self.backend.register(**self._window_xid())
+        d.addCallback(self.on_credentials_result)
+        d.addErrback(self.on_credentials_error)
         self.set_property('greyed', True)
         self.warning_label.set_text('')
 
     def on_connect_button_clicked(self, *a, **kw):
         """User wants to connect now."""
-        settings = {TC_URL_KEY: U1_TC_URL, HELP_TEXT_KEY: U1_DESCRIPTION,
-                    WINDOW_ID_KEY: str(self.main_window.window.xid),
-                    PING_URL_KEY: U1_PING_URL}
-        self.backend.login(U1_APP_NAME, settings,
-            reply_handler=NO_OP, error_handler=error_handler)
+        d = self.backend.login(**self._window_xid())
+        d.addCallback(self.on_credentials_result)
+        d.addErrback(self.on_credentials_error)
         self.set_property('greyed', True)
         self.warning_label.set_text('')
 
@@ -364,31 +323,42 @@
         """User wants to learn more."""
         uri_hook(self.learn_more_button, LEARN_MORE_LINK)
 
-    @filter_by_app_name
+    def on_credentials_result(self, result):
+        """Process the credentials response.
+
+        If 'result' is a non empty dict, they were found.
+        If 'result' is an empty dict, they were not found.
+        If 'result' is None, the user cancelled the process.
+
+        """
+        if result is None:
+            self.on_authorization_denied()
+        elif result == {}:
+            self.on_credentials_not_found()
+        else:
+            self.on_credentials_found(result)
+
     @log_call(logger.info, with_args=False)
-    def on_credentials_found(self, app_name, credentials):
-        """SSO backend notifies of credentials found."""
+    def on_credentials_found(self, credentials):
+        """Credentials backend notifies of credentials found."""
         self.set_property('greyed', False)
         self.emit('credentials-found', self._credentials_are_new, credentials)
 
-    @filter_by_app_name
     @log_call(logger.info)
-    def on_credentials_not_found(self, app_name):
-        """SSO backend notifies of credentials not found."""
+    def on_credentials_not_found(self):
+        """Creds backend notifies of credentials not found."""
         self._credentials_are_new = True
         self.set_property('greyed', False)
 
-    @filter_by_app_name
     @log_call(logger.error)
-    def on_credentials_error(self, app_name, error_dict):
-        """SSO backend notifies of an error when fetching credentials."""
+    def on_credentials_error(self, error_dict):
+        """Creds backend notifies of an error when fetching credentials."""
         self.set_property('greyed', False)
         self._set_warning(CREDENTIALS_ERROR)
 
-    @filter_by_app_name
     @log_call(logger.info)
-    def on_authorization_denied(self, app_name):
-        """SSO backend notifies that user refused auth for 'app_name'."""
+    def on_authorization_denied(self):
+        """Creds backend notifies that user refused auth for 'app_name'."""
         self.set_property('greyed', False)
 
     @log_call(logger.info)
@@ -402,8 +372,9 @@
         else:
             self.set_sensitive(True)
             self.warning_label.set_text(msg)
-            self.backend.find_credentials(U1_APP_NAME, {},
-                reply_handler=NO_OP, error_handler=error_handler)
+            d = self.backend.find_credentials()
+            d.addCallback(self.on_credentials_result)
+            d.addErrback(self.on_credentials_error)
 
 
 class DashboardPanel(UbuntuOneBin, ControlPanelMixin):
@@ -520,7 +491,7 @@
                     scroll_to_cell = True
                 else:
                     free_bytes_str = self.FREE_SPACE
-                free_bytes_args = {'free_space': self.humanize(free_bytes)}
+                free_bytes_args = {'free_space': humanize(free_bytes)}
                 free_bytes = free_bytes_str % free_bytes_args
 
             row = (self.ROW_HEADER % (name, free_bytes),
@@ -1542,7 +1513,7 @@
         """Backend notifies of account info."""
         used = int(info['quota_used'])
         total = int(info['quota_total'])
-        data = {'used': self.humanize(used), 'total': self.humanize(total),
+        data = {'used': humanize(used), 'total': humanize(total),
                 'percentage': (used / total) * 100}
         self._update_quota(QUOTA_LABEL % data, data)
 

=== modified file 'ubuntuone/controlpanel/gui/gtk/tests/__init__.py'
--- ubuntuone/controlpanel/gui/gtk/tests/__init__.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/gui/gtk/tests/__init__.py	2011-08-25 19:40:18 +0000
@@ -22,6 +22,7 @@
 
 from collections import defaultdict
 
+from twisted.internet import defer
 from ubuntuone.devtools.handlers import MementoHandler
 
 from ubuntuone.controlpanel.gui.gtk import gui
@@ -83,14 +84,12 @@
         self._signals[signal].append(handler)
 
 
-class FakedSSOBackend(FakedDBusBackend):
-    """Fake a SSO Backend, act as a dbus.Interface."""
+class FakedCredentialsBackend(FakedObject):
+    """Fake a credentials backend."""
 
-    bus_name = gui.ubuntu_sso.DBUS_BUS_NAME
-    object_path = gui.ubuntu_sso.DBUS_CREDENTIALS_PATH
-    iface = gui.ubuntu_sso.DBUS_CREDENTIALS_IFACE
     exposed_methods = ['find_credentials', 'clear_credentials',
                        'login', 'register']
+    next_result = defer.succeed(None)
 
 
 class FakedControlPanelBackend(FakedDBusBackend):
@@ -135,8 +134,6 @@
         if dbus_interface == gui.DBUS_PREFERENCES_IFACE:
             return FakedControlPanelBackend(obj, dbus_interface,
                                             *args, **kwargs)
-        if dbus_interface == gui.ubuntu_sso.DBUS_CREDENTIALS_IFACE:
-            return FakedSSOBackend(obj, dbus_interface, *args, **kwargs)
         if dbus_interface == gui.DBUS_IFACE_GUI:
             return FakeControlPanelBackend(
                 obj, dbus_interface, *args, **kwargs)
@@ -188,9 +185,11 @@
     # pylint: disable=E1102
     klass = None
     kwargs = {}
+    backend_is_dbus = True
 
     def setUp(self):
         super(BaseTestCase, self).setUp()
+        self.patch(gui, 'CredentialsManagementTool', FakedCredentialsBackend)
         self.patch(gui.os.path, 'expanduser',
                    lambda path: path.replace('~', USER_HOME))
         self.patch(gui.gtk, 'main', lambda: None)
@@ -221,14 +220,13 @@
         pb = gui.gtk.gdk.pixbuf_new_from_file(gui.get_data_file(filename))
         self.assertEqual(image.get_pixbuf().get_pixels(), pb.get_pixels())
 
-    def assert_backend_called(self, method_name, args, backend=None):
+    def assert_backend_called(self, method_name, *args, **kwargs):
         """Check that the control panel backend 'method_name' was called."""
-        if backend is None:
-            backend = self.ui.backend
-        self.assertIn(method_name, backend._called)
-        kwargs = {'reply_handler': gui.NO_OP,
-                  'error_handler': gui.error_handler}
-        self.assertEqual(backend._called[method_name], (args, kwargs))
+        if self.backend_is_dbus:
+            kwargs = {'reply_handler': gui.NO_OP,
+                      'error_handler': gui.error_handler}
+        self.assertIn(method_name, self.ui.backend._called)
+        self.assertEqual(self.ui.backend._called[method_name], (args, kwargs))
 
     def assert_warning_correct(self, warning, text):
         """Check that 'warning' is visible, showing 'text'."""

=== modified file 'ubuntuone/controlpanel/gui/gtk/tests/test_gui.py'
--- ubuntuone/controlpanel/gui/gtk/tests/test_gui.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/gui/gtk/tests/test_gui.py	2011-08-25 19:40:18 +0000
@@ -42,6 +42,7 @@
 )
 from ubuntuone.controlpanel.gui.gtk.tests.test_package_manager import (
     SUCCESS, FAILURE)
+from ubuntuone.controlpanel.gui import humanize
 
 
 # Attribute 'yyy' defined outside __init__, access to a protected member
@@ -159,7 +160,7 @@
         self.ui.backend._called.pop('volumes_info', None)
         self.ui.load()
 
-        self.assert_backend_called('volumes_info', ())
+        self.assert_backend_called('volumes_info')
 
     def test_is_processing_after_load(self):
         """The ui is processing when contents are load."""
@@ -196,7 +197,7 @@
         treeiter = self.ui.volumes_store.get_iter_root()
         for name, free_bytes, volumes in FAKE_VOLUMES_INFO:
             name = "%s's" % name if name else gui.MY_FOLDERS
-            free_bytes = self.ui.humanize(int(free_bytes))
+            free_bytes = humanize(int(free_bytes))
             header = (name, self.ui.FREE_SPACE % {'free_space': free_bytes})
 
             # check parent row
@@ -277,7 +278,7 @@
         treeiter = self.ui.volumes_store.get_iter_root()
         for name, free_bytes, volumes in FAKE_VOLUMES_NO_FREE_SPACE_INFO:
             name = "%s's" % name if name else gui.MY_FOLDERS
-            free_bytes = self.ui.humanize(int(free_bytes))
+            free_bytes = humanize(int(free_bytes))
             free_bytes = self.ui.NO_FREE_SPACE % {'free_space': free_bytes}
 
             # check parent row
@@ -440,7 +441,7 @@
                 subscribed = gui.bool_str(not bool(volume['subscribed']))
                 # backend was called
                 self.assert_backend_called('change_volume_settings',
-                                           (fid, {'subscribed': subscribed}))
+                                           fid, {'subscribed': subscribed})
                 # store was updated
                 it = self.ui.volumes_store.get_iter(path)
                 value = self.ui.volumes_store.get_value(it, 1)
@@ -572,7 +573,7 @@
         """Changing throttling settings updates the backend properly."""
         expected = self.ui.__dict__
         self.assert_backend_called('change_device_settings',
-                                   (self.ui.id, expected))
+                                   self.ui.id, expected)
         self.assertEqual(self.ui.warning_label.get_text(), '')
 
         limit_enabled = self.ui.throttling_limits.get_sensitive()
@@ -806,7 +807,7 @@
         self.ui.is_local = False
         self.ui.remove.clicked()
 
-        self.assert_backend_called('remove_device', (self.ui.id,))
+        self.assert_backend_called('remove_device', self.ui.id)
         self.assertFalse(self.ui.get_sensitive(),
                          'Must be disabled while removing.')
 
@@ -936,7 +937,7 @@
         self.ui.backend._called.pop('devices_info', None)
         self.ui.load()
 
-        self.assert_backend_called('devices_info', ())
+        self.assert_backend_called('devices_info')
 
     def test_is_processing_after_load(self):
         """The ui is processing when contents are load."""
@@ -1246,7 +1247,7 @@
 
     def test_file_sync_status_is_requested(self):
         """The file sync status is requested to the backend."""
-        self.assert_backend_called('file_sync_status', ())
+        self.assert_backend_called('file_sync_status')
 
     def test_is_disabled(self):
         """Until file sync status is given, the widget is disabled."""
@@ -1273,10 +1274,10 @@
         assert self.ui.button.get_active()
 
         self.ui.button.set_active(not self.ui.button.get_active())
-        self.assert_backend_called('disable_files', ())
+        self.assert_backend_called('disable_files')
 
         self.ui.button.set_active(not self.ui.button.get_active())
-        self.assert_backend_called('enable_files', ())
+        self.assert_backend_called('enable_files')
 
     def test_on_file_sync_enabled(self):
         """When file sync is enabled, the button is active."""
@@ -1330,7 +1331,7 @@
 
         args = (self.service_id,
                 {'enabled': gui.bool_str(self.ui.button.get_active())})
-        self.assert_backend_called('change_replication_settings', args)
+        self.assert_backend_called('change_replication_settings', *args)
 
     def test_dependency(self):
         """The dependency box is None."""
@@ -1543,7 +1544,7 @@
         self.ui.load_replications()
 
         self.assertTrue(self.ui.message.active)
-        self.assert_backend_called('replications_info', ())
+        self.assert_backend_called('replications_info')
 
 
 class ServicesWithDesktopcouchTestCase(ServicesTestCase):
@@ -1750,7 +1751,7 @@
     def test_file_sync_status_is_requested_on_load(self):
         """The file sync status is requested to the backend."""
         self.ui.load()
-        self.assert_backend_called('file_sync_status', ())
+        self.assert_backend_called('file_sync_status')
 
     def test_on_file_sync_status_disabled(self):
         """The file sync is disabled.
@@ -1862,43 +1863,43 @@
         self.ui.backend._called.clear()
         self.ui.on_files_start_error({'error_msg': 'error msg'})
 
-        self.assert_backend_called('file_sync_status', ())
+        self.assert_backend_called('file_sync_status')
 
     def test_on_connect_clicked(self):
         """User requested connection."""
         self.ui.on_connect_clicked(self.ui.button)
 
-        self.assert_backend_called('connect_files', ())
+        self.assert_backend_called('connect_files')
 
     def test_on_disconnect_clicked(self):
         """User requested disconnection."""
         self.ui.on_disconnect_clicked(self.ui.button)
 
-        self.assert_backend_called('disconnect_files', ())
+        self.assert_backend_called('disconnect_files')
 
     def test_on_enable_clicked(self):
         """User requested enable the service."""
         self.ui.on_enable_clicked(self.ui.button)
 
-        self.assert_backend_called('enable_files', ())
+        self.assert_backend_called('enable_files')
 
     def test_on_restart_clicked(self):
         """User requested restart the service."""
         self.ui.on_restart_clicked(self.ui.button)
 
-        self.assert_backend_called('restart_files', ())
+        self.assert_backend_called('restart_files')
 
     def test_on_start_clicked(self):
         """User requested start the service."""
         self.ui.on_start_clicked(self.ui.button)
 
-        self.assert_backend_called('start_files', ())
+        self.assert_backend_called('start_files')
 
     def test_on_stop_clicked(self):
         """User requested stop the service."""
         self.ui.on_stop_clicked(self.ui.button)
 
-        self.assert_backend_called('stop_files', ())
+        self.assert_backend_called('stop_files')
 
 
 class ManagementPanelTestCase(ControlPanelMixinTestCase):
@@ -1912,8 +1913,8 @@
         used = int(info['quota_used'])
         total = int(info['quota_total'])
         percentage = round((used / total) * 100, 2)
-        expected = {'used': self.ui.humanize(used),
-                    'total': self.ui.humanize(total),
+        expected = {'used': humanize(used),
+                    'total': humanize(total),
                     'percentage': percentage}
         msg = gui.QUOTA_LABEL % expected
         self.assertEqual(self.ui.quota_label.get_text(), msg)
@@ -1992,7 +1993,7 @@
     def test_account_info_is_requested_on_load(self):
         """The account info is requested to the backend."""
         self.ui.load()
-        self.assert_backend_called('account_info', ())
+        self.assert_backend_called('account_info')
 
     def test_file_sync_status_info_is_requested_on_load(self):
         """The file sync status info is requested to the backend."""

=== modified file 'ubuntuone/controlpanel/gui/gtk/tests/test_gui_basic.py'
--- ubuntuone/controlpanel/gui/gtk/tests/test_gui_basic.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/gui/gtk/tests/test_gui_basic.py	2011-08-25 19:40:18 +0000
@@ -20,9 +20,14 @@
 
 from __future__ import division
 
+from twisted.internet import defer
+from twisted.python.failure import Failure
 
 from ubuntuone.controlpanel.gui.gtk import gui
-from ubuntuone.controlpanel.gui.gtk.tests import BaseTestCase, FakedSSOBackend
+from ubuntuone.controlpanel.gui.gtk.tests import (
+    BaseTestCase,
+    FakedCredentialsBackend,
+)
 from ubuntuone.controlpanel.tests import TOKEN
 
 from ubuntuone.devtools.testcase import skipIf
@@ -287,7 +292,7 @@
         """On 'credentials-found' signal, ask syncdaemon to connect."""
         # credentials are new
         self.ui.overview.emit('credentials-found', True, object())
-        self.assert_backend_called('connect_files', ())
+        self.assert_backend_called('connect_files')
 
     def test_local_device_removed_shows_overview_panel(self):
         """On 'local-device-removed' signal, the overview panel is shown."""
@@ -306,7 +311,7 @@
     def test_backend_is_shutdown_on_close(self):
         """When the control panel is closed, the backend is shutdown."""
         self.ui.emit('destroy')
-        self.assert_backend_called('shutdown', ())
+        self.assert_backend_called('shutdown')
 
 
 class UbuntuOneBinTestCase(BaseTestCase):
@@ -437,6 +442,11 @@
     klass = gui.OverviewPanel
     kwargs = {'main_window': gui.gtk.Window()}
     ui_filename = 'overview.ui'
+    backend_is_dbus = False
+
+    def setUp(self):
+        super(OverwiewPanelTestCase, self).setUp()
+        gui.gtk.link_button_set_uri_hook(lambda *a: None)
 
     def test_is_a_greyable_bin(self):
         """Inherits from GreyableBin."""
@@ -450,20 +460,102 @@
         """The 'join_now' button is the default widget."""
         self.assertTrue(self.ui.join_now_button.get_property('can-default'))
 
-    def test_sso_backend(self):
-        """Has a correct SSO backend."""
-        self.assertIsInstance(self.ui.backend, FakedSSOBackend)
-
-    def test_sso_backend_signals(self):
-        """The proper signals are connected to the backend."""
-        self.assertEqual(self.ui.backend._signals['CredentialsFound'],
-                         [self.ui.on_credentials_found])
-        self.assertEqual(self.ui.backend._signals['CredentialsNotFound'],
-                         [self.ui.on_credentials_not_found])
-        self.assertEqual(self.ui.backend._signals['CredentialsError'],
-                         [self.ui.on_credentials_error])
-        self.assertEqual(self.ui.backend._signals['AuthorizationDenied'],
-                         [self.ui.on_authorization_denied])
+    def test_backend(self):
+        """Has a correct backend."""
+        self.assertIsInstance(self.ui.backend, FakedCredentialsBackend)
+
+
+class OverwiewPanelBackendCallbacksTestCase(OverwiewPanelTestCase):
+    """Proper callbacks are chained to the credentials backend methods."""
+
+    failure = Exception()
+
+    def test_find_credentials_fired_with_credentials(self):
+        """Test that on_credentials_found is called."""
+        self.ui.backend.next_result = defer.succeed(TOKEN)
+        self.patch(self.ui, 'on_credentials_found', self._set_called)
+
+        self.ui.on_network_state_changed(gui.networkstate.ONLINE)
+
+        self.assertEqual(self._called, ((TOKEN,), {}))
+
+    def test_find_credentials_fired_without_credentials(self):
+        """Test that on_credentials_not_found is called."""
+        self.ui.backend.next_result = defer.succeed({})
+        self.patch(self.ui, 'on_credentials_not_found', self._set_called)
+
+        self.ui.on_network_state_changed(gui.networkstate.ONLINE)
+
+        self.assertEqual(self._called, ((), {}))
+
+    def test_find_credentials_errback(self):
+        """Test that on_credentials_error is called."""
+        self.ui.backend.next_result = defer.fail(self.failure)
+        self.patch(self.ui, 'on_credentials_error', self._set_called)
+
+        self.ui.on_network_state_changed(gui.networkstate.ONLINE)
+
+        failure = self._called[0][0]
+        self.assertIsInstance(failure, Failure)
+        self.assertEqual(failure.value, self.failure)
+
+    def test_register_fired_with_credentials(self):
+        """Test that on_credentials_found is called."""
+        self.ui.backend.next_result = defer.succeed(TOKEN)
+        self.patch(self.ui, 'on_credentials_found', self._set_called)
+
+        self.ui.join_now_button.clicked()
+
+        self.assertEqual(self._called, ((TOKEN,), {}))
+
+    def test_register_fired_with_credentials_none(self):
+        """Test that on_authorization_denied is called."""
+        self.ui.backend.next_result = defer.succeed(None)
+        self.patch(self.ui, 'on_authorization_denied', self._set_called)
+
+        self.ui.join_now_button.clicked()
+
+        self.assertEqual(self._called, ((), {}))
+
+    def test_register_errback(self):
+        """Test that on_credentials_error is called."""
+        self.ui.backend.next_result = defer.fail(self.failure)
+        self.patch(self.ui, 'on_credentials_error', self._set_called)
+
+        self.ui.join_now_button.clicked()
+
+        failure = self._called[0][0]
+        self.assertIsInstance(failure, Failure)
+        self.assertEqual(failure.value, self.failure)
+
+    def test_login_fired_with_credentials(self):
+        """Test that on_credentials_found is called."""
+        self.ui.backend.next_result = defer.succeed(TOKEN)
+        self.patch(self.ui, 'on_credentials_found', self._set_called)
+
+        self.ui.connect_button.clicked()
+
+        self.assertEqual(self._called, ((TOKEN,), {}))
+
+    def test_login_fired_with_credentials_none(self):
+        """Test that on_authorization_denied is called."""
+        self.ui.backend.next_result = defer.succeed(None)
+        self.patch(self.ui, 'on_authorization_denied', self._set_called)
+
+        self.ui.connect_button.clicked()
+
+        self.assertEqual(self._called, ((), {}))
+
+    def test_login_errback(self):
+        """Test that on_credentials_error is called."""
+        self.ui.backend.next_result = defer.fail(self.failure)
+        self.patch(self.ui, 'on_credentials_error', self._set_called)
+
+        self.ui.connect_button.clicked()
+
+        failure = self._called[0][0]
+        self.assertIsInstance(failure, Failure)
+        self.assertEqual(failure.value, self.failure)
 
 
 class OverwiewNetworkStatePanelTestCase(OverwiewPanelTestCase):
@@ -514,13 +606,13 @@
     def test_find_credentials_is_called(self):
         """Credentials are asked to SSO backend."""
         self.assertFalse(self.ui._credentials_are_new)
-        self.assert_backend_called('find_credentials', (gui.U1_APP_NAME, {}))
+        self.assert_backend_called('find_credentials')
 
     def test_on_credentials_found(self):
         """Callback 'on_credentials_found' is correct."""
         self.ui.connect('credentials-found', self._set_called)
 
-        self.ui.on_credentials_found(gui.U1_APP_NAME, TOKEN)
+        self.ui.on_credentials_found(TOKEN)
 
         self.assertFalse(self.ui.get_property('greyed'), 'Must not be greyed.')
         # assume credentials were in local keyring
@@ -531,9 +623,9 @@
         self.ui.connect('credentials-found', self._set_called)
 
         # credentials weren't in the system
-        self.ui.on_credentials_not_found(gui.U1_APP_NAME)
+        self.ui.on_credentials_not_found()
         # now they are!
-        self.ui.on_credentials_found(gui.U1_APP_NAME, TOKEN)
+        self.ui.on_credentials_found(TOKEN)
 
         self.assertFalse(self.ui.get_property('greyed'), 'Must not be greyed.')
         # assume credentials were not in local keyring
@@ -541,70 +633,31 @@
 
     def test_on_credentials_not_found(self):
         """Callback 'on_credentials_not_found' is correct."""
-        self.ui.on_credentials_not_found(gui.U1_APP_NAME)
+        self.ui.on_credentials_not_found()
         self.assertTrue(self.ui.get_visible())
         self.assertTrue(self.ui._credentials_are_new)
 
     def test_on_credentials_error(self):
         """Callback 'on_credentials_error' is correct."""
-        self.ui.on_credentials_error(gui.U1_APP_NAME, {})
+        self.ui.on_credentials_error({})
         self.assertTrue(self.ui.get_visible())
         self.assert_warning_correct(self.ui.warning_label,
                                     gui.CREDENTIALS_ERROR)
 
     def test_on_authorization_denied(self):
         """Callback 'on_authorization_denied' is correct."""
-        self.ui.on_authorization_denied(gui.U1_APP_NAME)
+        self.ui.on_authorization_denied()
         self.assertTrue(self.ui.get_visible())
         self.assertFalse(self.ui.get_property('greyed'), 'Must not be greyed.')
         self.assertEqual(self.ui.warning_label.get_text(), '')
 
 
-class OverwiewPanelAppNameMismatchTestCase(OverwiewPanelTestCase):
-    """The test suite for the overview panel when the app_name won't match."""
-
-    NOT_U1_APP = 'Not ' + gui.U1_APP_NAME
-
-    def test_filter_by_app_name(self):
-        """The filter_by_app_name decorator is correct."""
-        f = gui.filter_by_app_name(self._set_called)
-        f(self.ui, self.NOT_U1_APP)
-        self.assertFalse(self._called)
-        self.assertTrue(self.memento.check_info('ignoring', self.NOT_U1_APP))
-
-        args = ('test', object())
-        kwargs = {'really': 'AWESOME'}
-        f(self.ui, gui.U1_APP_NAME, *args, **kwargs)
-        self.assertEqual(self._called,
-                         ((self.ui, gui.U1_APP_NAME,) + args, kwargs))
-
-    def test_on_credentials_found(self):
-        """Callback 'on_credentials_found' is not executed."""
-        self.assert_function_decorated(gui.filter_by_app_name,
-                                       self.ui.on_credentials_found)
-
-    def test_on_credentials_not_found(self):
-        """Callback 'on_credentials_not_found' is not executed."""
-        self.assert_function_decorated(gui.filter_by_app_name,
-                                       self.ui.on_credentials_not_found)
-
-    def test_on_credentials_error(self):
-        """Callback 'on_credentials_error' is not executed."""
-        self.assert_function_decorated(gui.filter_by_app_name,
-                                       self.ui.on_credentials_error)
-
-    def test_on_authorization_denied(self):
-        """Callback 'on_authorization_denied' is not executed."""
-        self.assert_function_decorated(gui.filter_by_app_name,
-                                       self.ui.on_authorization_denied)
-
-
 class OverwiewPanelNoCredsTestCase(OverwiewPanelTestCase):
     """The test suite for the overview panel when no credentials are found."""
 
     def setUp(self):
         super(OverwiewPanelNoCredsTestCase, self).setUp()
-        self.ui.on_credentials_not_found(gui.U1_APP_NAME)
+        self.ui.on_credentials_not_found()
 
     def test_startup_visibility(self):
         """The widget is visible at startup."""
@@ -631,12 +684,8 @@
         self.ui.join_now_button.clicked()
 
         window_id = self.kwargs['main_window'].window.xid
-        args = (gui.U1_APP_NAME,
-                {gui.TC_URL_KEY: gui.U1_TC_URL,
-                 gui.HELP_TEXT_KEY: gui.U1_DESCRIPTION,
-                 gui.WINDOW_ID_KEY: str(window_id),
-                 gui.PING_URL_KEY: gui.U1_PING_URL})
-        self.assert_backend_called('register', args)
+        kwargs = {'window_id': str(window_id)}
+        self.assert_backend_called('register', **kwargs)
 
     def test_connect_button_clicked(self):
         """Test the 'join now' button callback."""
@@ -646,12 +695,8 @@
         self.ui.connect_button.clicked()
 
         window_id = self.kwargs['main_window'].window.xid
-        args = (gui.U1_APP_NAME,
-                {gui.TC_URL_KEY: gui.U1_TC_URL,
-                 gui.HELP_TEXT_KEY: gui.U1_DESCRIPTION,
-                 gui.WINDOW_ID_KEY: str(window_id),
-                 gui.PING_URL_KEY: gui.U1_PING_URL})
-        self.assert_backend_called('login', args)
+        kwargs = {'window_id': str(window_id)}
+        self.assert_backend_called('login', **kwargs)
 
     def test_join_now_button_clicked_set_greyed(self):
         """Clicking on 'join_now' self is greyed."""
@@ -660,7 +705,7 @@
 
     def test_join_now_button_clicked_removes_warning(self):
         """Clicking on 'join_now' the warnings are removed."""
-        self.ui.on_authorization_denied(gui.U1_APP_NAME)  # show warning
+        self.ui.on_authorization_denied()  # show warning
         self.ui.join_now_button.clicked()
 
         self.assertEqual(self.ui.warning_label.get_text(), '')
@@ -672,7 +717,7 @@
 
     def test_connect_button_clicked_removes_warning(self):
         """Clicking on 'connect' the warnings are removed."""
-        self.ui.on_authorization_denied(gui.U1_APP_NAME)  # show warning
+        self.ui.on_authorization_denied()  # show warning
         self.ui.connect_button.clicked()
 
         self.assertEqual(self.ui.warning_label.get_text(), '')
@@ -688,21 +733,21 @@
     def test_on_credentials_not_found_unset_greyed(self):
         """Callback 'on_credentials_not_found' unsets the 'greyed' prop."""
         self.ui.connect_button.clicked()
-        self.ui.on_credentials_not_found(gui.U1_APP_NAME)
+        self.ui.on_credentials_not_found()
 
         self.assertFalse(self.ui.get_property('greyed'), 'Must not be greyed.')
 
     def test_on_credentials_error_unset_greyed(self):
         """Callback 'on_credentials_error' unsets the 'greyed' prop."""
         self.ui.connect_button.clicked()
-        self.ui.on_credentials_error(gui.U1_APP_NAME, {})
+        self.ui.on_credentials_error({})
 
         self.assertFalse(self.ui.get_property('greyed'), 'Must not be greyed.')
 
     def test_on_authorization_denied_unset_greyed(self):
         """Callback 'on_authorization_denied' unsets the 'greyed' prop."""
         self.ui.connect_button.clicked()
-        self.ui.on_authorization_denied(gui.U1_APP_NAME)
+        self.ui.on_authorization_denied()
 
         self.assertFalse(self.ui.get_property('greyed'), 'Must not be greyed.')
 

=== modified file 'ubuntuone/controlpanel/gui/qt/filesyncstatus.py'
--- ubuntuone/controlpanel/gui/qt/filesyncstatus.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/gui/qt/filesyncstatus.py	2011-08-25 19:40:18 +0000
@@ -165,6 +165,14 @@
             self.ui.sync_status_button.setText(action)
             self.ui.sync_status_button.setEnabled(True)
             self.ui.sync_status_button.show()
+            if status_key == backend.FILE_SYNC_DISCONNECTED:
+                self.ui.sync_status_button.setProperty("secondary", False)
+            else:
+                self.ui.sync_status_button.setProperty("secondary", True)
+            self.ui.sync_status_button.style().unpolish(
+                self.ui.sync_status_button)
+            self.ui.sync_status_button.style().polish(
+                self.ui.sync_status_button)
         else:
             self.ui.sync_status_button.hide()
 

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_filesyncstatus.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_filesyncstatus.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_filesyncstatus.py	2011-08-25 19:40:18 +0000
@@ -65,10 +65,22 @@
 
         self.assertTrue(self.ui.ui.sync_status_button.isEnabled())
         self.assertEqual(self.ui.ui.sync_status_button.text(), action)
+        if action == gui.FILE_SYNC_DISCONNECTED:
+            self.assertFalse(
+                self.ui.ui.sync_status_button.property("secondary"))
+        else:
+            self.assertTrue(
+                self.ui.ui.sync_status_button.property("secondary"))
 
         self.ui.ui.sync_status_button.click()
         self.assertFalse(self.ui.ui.sync_status_button.isEnabled())
         self.assert_backend_called(callback)
+        if action == gui.FILE_SYNC_DISCONNECTED:
+            self.assertFalse(
+                self.ui.ui.sync_status_button.property("secondary"))
+        else:
+            self.assertTrue(
+                self.ui.ui.sync_status_button.property("secondary"))
 
         if tooltip is not None:
             self.assertEqual(self.ui.ui.sync_status_button.toolTip(), tooltip)

=== modified file 'ubuntuone/controlpanel/gui/qt/ui/account_ui.py'
--- ubuntuone/controlpanel/gui/qt/ui/account_ui.py	2011-08-12 19:12:08 +0000
+++ ubuntuone/controlpanel/gui/qt/ui/account_ui.py	2011-08-25 19:40:18 +0000
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'data/qt/account.ui'
 #
-# Created: Fri Aug 12 15:07:18 2011
+# Created: Thu Aug 25 15:26:50 2011
 #      by: PyQt4 UI code generator 4.8.3
 #
 # WARNING! All changes made in this file will be lost!
@@ -27,7 +27,7 @@
         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.gridLayout_2.addWidget(self.edit_profile_button, 0, 2, 1, 1)
         self.services = QtGui.QGroupBox(Form)
         self.services.setObjectName(_fromUtf8("services"))
         self.verticalLayout_3 = QtGui.QVBoxLayout(self.services)
@@ -62,7 +62,7 @@
         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)
+        self.gridLayout_2.addWidget(self.edit_services_button, 2, 2, 1, 1)
         spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
         self.gridLayout_2.addItem(spacerItem, 0, 3, 1, 1)
         spacerItem1 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)

=== modified file 'ubuntuone/controlpanel/gui/qt/ui/controlpanel_ui.py'
--- ubuntuone/controlpanel/gui/qt/ui/controlpanel_ui.py	2011-08-12 19:12:08 +0000
+++ ubuntuone/controlpanel/gui/qt/ui/controlpanel_ui.py	2011-08-25 19:40:18 +0000
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'data/qt/controlpanel.ui'
 #
-# Created: Fri Aug 12 15:07:18 2011
+# Created: Thu Aug 25 15:26:50 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(387, 203)
+        Form.resize(367, 142)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
@@ -133,10 +133,16 @@
         self.tab_widget.addTab(self.account_tab, _fromUtf8(""))
         self.verticalLayout.addWidget(self.tab_widget)
         self.frame_footer = QtGui.QFrame(Form)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.frame_footer.sizePolicy().hasHeightForWidth())
+        self.frame_footer.setSizePolicy(sizePolicy)
+        self.frame_footer.setMaximumSize(QtCore.QSize(16777215, 30))
         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.setMargin(0)
         self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout"))
         self.help_button = GoToWebButton(self.frame_footer)
         self.help_button.setObjectName(_fromUtf8("help_button"))
@@ -149,24 +155,30 @@
         self.follow_us_label.setFont(font)
         self.follow_us_label.setObjectName(_fromUtf8("follow_us_label"))
         self.horizontalLayout.addWidget(self.follow_us_label)
-        self.twitter_button = QtGui.QToolButton(self.frame_footer)
+        self.twitter_button = QtGui.QPushButton(self.frame_footer)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.twitter_button.sizePolicy().hasHeightForWidth())
+        self.twitter_button.setSizePolicy(sizePolicy)
+        self.twitter_button.setMaximumSize(QtCore.QSize(16, 16))
         self.twitter_button.setCursor(QtCore.Qt.PointingHandCursor)
-        self.twitter_button.setStyleSheet(_fromUtf8("border: 0;"))
-        self.twitter_button.setText(_fromUtf8(""))
         icon = QtGui.QIcon()
         icon.addPixmap(QtGui.QPixmap(_fromUtf8(":/twitter.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.twitter_button.setIcon(icon)
-        self.twitter_button.setIconSize(QtCore.QSize(22, 22))
         self.twitter_button.setObjectName(_fromUtf8("twitter_button"))
         self.horizontalLayout.addWidget(self.twitter_button)
-        self.facebook_button = QtGui.QToolButton(self.frame_footer)
+        self.facebook_button = QtGui.QPushButton(self.frame_footer)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.facebook_button.sizePolicy().hasHeightForWidth())
+        self.facebook_button.setSizePolicy(sizePolicy)
+        self.facebook_button.setMaximumSize(QtCore.QSize(16, 16))
         self.facebook_button.setCursor(QtCore.Qt.PointingHandCursor)
-        self.facebook_button.setStyleSheet(_fromUtf8("border: 0;"))
-        self.facebook_button.setText(_fromUtf8(""))
         icon1 = QtGui.QIcon()
         icon1.addPixmap(QtGui.QPixmap(_fromUtf8(":/facebook.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.facebook_button.setIcon(icon1)
-        self.facebook_button.setIconSize(QtCore.QSize(22, 22))
         self.facebook_button.setObjectName(_fromUtf8("facebook_button"))
         self.horizontalLayout.addWidget(self.facebook_button)
         self.verticalLayout.addWidget(self.frame_footer)
@@ -182,7 +194,7 @@
         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'))
+        self.tab_widget.setTabText(self.tab_widget.indexOf(self.preferences_tab), _('Settings'))
         self.tab_widget.setTabText(self.tab_widget.indexOf(self.account_tab), _('Account information'))
         self.help_button.setText(_('Get help online'))
         self.follow_us_label.setText(_('Talk to us'))

=== modified file 'ubuntuone/controlpanel/gui/qt/ui/device_ui.py'
--- ubuntuone/controlpanel/gui/qt/ui/device_ui.py	2011-08-12 19:12:08 +0000
+++ ubuntuone/controlpanel/gui/qt/ui/device_ui.py	2011-08-25 19:40:18 +0000
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'data/qt/device.ui'
 #
-# Created: Fri Aug 12 15:07:18 2011
+# Created: Thu Aug 25 15:26:50 2011
 #      by: PyQt4 UI code generator 4.8.3
 #
 # WARNING! All changes made in this file will be lost!
@@ -32,6 +32,7 @@
         spacerItem = QtGui.QSpacerItem(217, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
         self.horizontalLayout.addItem(spacerItem)
         self.remove_device_button = QtGui.QPushButton(Form)
+        self.remove_device_button.setProperty(_fromUtf8("secondary"), True)
         self.remove_device_button.setObjectName(_fromUtf8("remove_device_button"))
         self.horizontalLayout.addWidget(self.remove_device_button)
 

=== modified file 'ubuntuone/controlpanel/gui/qt/ui/devices_ui.py'
--- ubuntuone/controlpanel/gui/qt/ui/devices_ui.py	2011-08-12 19:12:08 +0000
+++ ubuntuone/controlpanel/gui/qt/ui/devices_ui.py	2011-08-25 19:40:18 +0000
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'data/qt/devices.ui'
 #
-# Created: Fri Aug 12 15:07:18 2011
+# Created: Thu Aug 25 15:26:50 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/filesyncstatus_ui.py'
--- ubuntuone/controlpanel/gui/qt/ui/filesyncstatus_ui.py	2011-08-12 19:12:08 +0000
+++ ubuntuone/controlpanel/gui/qt/ui/filesyncstatus_ui.py	2011-08-25 19:40:18 +0000
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'data/qt/filesyncstatus.ui'
 #
-# Created: Fri Aug 12 15:07:18 2011
+# Created: Thu Aug 25 15:26:50 2011
 #      by: PyQt4 UI code generator 4.8.3
 #
 # WARNING! All changes made in this file will be lost!
@@ -35,6 +35,7 @@
         self.horizontalLayout.addWidget(self.sync_status_label)
         self.verticalLayout.addLayout(self.horizontalLayout)
         self.sync_status_button = QtGui.QPushButton(Form)
+        self.sync_status_button.setProperty(_fromUtf8("secondary"), True)
         self.sync_status_button.setObjectName(_fromUtf8("sync_status_button"))
         self.verticalLayout.addWidget(self.sync_status_button)
         self.sync_status_label.setBuddy(self.sync_status_button)

=== modified file 'ubuntuone/controlpanel/gui/qt/ui/folders_ui.py'
--- ubuntuone/controlpanel/gui/qt/ui/folders_ui.py	2011-08-12 19:12:08 +0000
+++ ubuntuone/controlpanel/gui/qt/ui/folders_ui.py	2011-08-25 19:40:18 +0000
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'data/qt/folders.ui'
 #
-# Created: Fri Aug 12 15:07:18 2011
+# Created: Thu Aug 25 15:26:50 2011
 #      by: PyQt4 UI code generator 4.8.3
 #
 # WARNING! All changes made in this file will be lost!
@@ -20,7 +20,6 @@
         Form.setObjectName(_fromUtf8("Form"))
         Form.resize(345, 279)
         Form.setWindowTitle(_fromUtf8("Form"))
-        Form.setStyleSheet(_fromUtf8("padding: 0px;"))
         self.verticalLayout = QtGui.QVBoxLayout(Form)
         self.verticalLayout.setSpacing(0)
         self.verticalLayout.setMargin(0)
@@ -32,7 +31,7 @@
         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 = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.share_publish_button.sizePolicy().hasHeightForWidth())
@@ -66,7 +65,7 @@
         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 = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.add_folder_button.sizePolicy().hasHeightForWidth())

=== modified file 'ubuntuone/controlpanel/gui/qt/ui/images_rc.py'
--- ubuntuone/controlpanel/gui/qt/ui/images_rc.py	2011-08-12 19:12:08 +0000
+++ ubuntuone/controlpanel/gui/qt/ui/images_rc.py	2011-08-25 19:40:18 +0000
@@ -2,7 +2,7 @@
 
 # Resource object code
 #
-# Created: Fri Aug 12 15:07:18 2011
+# Created: Thu Aug 25 15:26:50 2011
 #      by: The Resource Compiler for PyQt (Qt v4.7.2)
 #
 # WARNING! All changes made in this file will be lost!
@@ -307,90 +307,84 @@
 \xf8\xb9\x66\x02\x5d\x38\x49\x38\xe7\x8e\x81\x63\xe0\x88\x7f\x33\
 \x0f\xac\x24\xad\x7e\x03\xdb\x11\x28\xad\xbd\x6a\x0e\xf8\x00\x00\
 \x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x05\x1d\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x04\xe4\x49\x44\x41\x54\x78\xda\xbd\x97\xd9\x4f\xdc\x55\
-\x14\xc7\xfd\x37\x7c\xb1\x16\xda\x29\x05\x5a\xa8\xec\x20\x52\x95\
-\xae\x94\x62\x23\x89\x21\x46\x4d\x7c\x33\xbe\xa8\x2f\x8d\x7d\xe9\
-\x43\xe3\xd2\x5a\x6b\x95\x61\x93\xd2\x05\x81\xd6\x16\x0a\x96\x75\
-\x98\x8d\x6d\xa6\x82\x0c\xdb\x0c\xfb\xb0\x15\x04\xa4\x44\x91\x52\
-\xa9\x9d\xb1\xc7\x73\x6e\x38\xbf\xfb\x63\x7e\x3f\x48\xe0\xa1\x93\
-\x7c\x72\x96\x7b\xee\xf9\x7e\x73\x5b\xc8\xf0\x82\xf8\xa4\x9e\x8e\
-\x44\x0a\x11\xfb\x73\xa2\x90\x34\xd5\xe2\xf6\xac\x32\xe7\xfc\xd9\
-\xae\x59\xff\x97\x9e\x05\x38\xd7\x37\xaf\x0b\x9e\xe9\xc6\x2f\xdc\
-\x7f\xa8\x67\x36\xbd\x77\xb6\x7b\xd6\x4f\x5a\xa4\x29\xb4\xc9\x4d\
-\x66\x89\x63\xee\xb4\x6b\x06\xde\x77\x3c\x80\x93\x36\x2f\xa4\x5b\
-\xd7\xf3\x56\xd3\x04\xa3\xf4\x32\xec\xe3\x9c\xeb\xcd\xeb\xf6\x4e\
-\x21\xef\xb6\x4c\xc0\x99\xae\x39\xc8\x2c\x69\x9b\x13\x2f\x41\x4e\
-\x3e\x75\x4e\xf8\xb3\x9a\xc6\x21\xc3\x36\x0e\x27\xcc\xa3\x1c\x35\
-\x04\x9c\x73\x4e\x6c\x32\xe3\xd5\x9c\x67\xb5\x4c\x02\x69\x92\xb6\
-\x30\xf0\xc9\xaf\x53\x70\xd2\xe2\x85\xb4\xc6\x51\x38\x6e\x1a\x16\
-\xa4\x63\x4d\xf1\x94\x65\x04\xd2\xee\x76\x43\x98\xd1\x02\xa1\xd9\
-\x66\x38\x5e\xee\x82\x4c\xdb\x18\x9f\xe3\x9d\x11\xca\x05\x69\xa6\
-\x11\xea\x31\xdc\xa3\xa8\x46\x68\x7d\xd6\x31\x0d\x8a\x81\x8f\x9d\
-\x53\x70\xb4\x7e\x48\x18\x60\xb8\x7e\xbb\xb2\x07\x2a\xfa\x67\x60\
-\xf9\x89\x4f\x50\x8e\x79\x66\x55\x2f\x9d\x33\x3c\xaf\xad\x79\xa7\
-\x69\x14\x8e\x35\x0c\x53\x8d\xc6\x46\x44\xfc\xc8\x31\x29\x0d\x7c\
-\xd8\xe4\x15\x03\x87\x6b\x07\x38\x32\x42\x3c\xf0\x53\xee\x99\x81\
-\x23\xb5\x83\x3c\xab\x81\xf7\x30\xb2\x96\xa0\xa6\x34\xf0\x9e\x7d\
-\x0c\x8e\xd4\x0d\x09\x52\xab\xfb\x45\x64\x36\xf8\xd0\x9c\x06\xd5\
-\x3d\xae\x39\x47\x13\xeb\xcf\x50\x53\x1a\xc8\x6c\x18\x84\xc3\x35\
-\x03\xf0\xe6\x2f\x6e\x38\x84\x87\x9c\x13\xbe\x67\xa0\x07\x9f\xd3\
-\x2c\x83\xb5\x47\x90\x7a\xcf\x13\xd0\x77\x6b\x72\xd4\x94\x06\x32\
-\xea\x07\xe9\x12\xd2\x0f\xaf\x57\xf6\x11\x94\x0b\x56\xff\x03\x5d\
-\x76\x7e\x53\x0b\x3b\x2e\x08\x30\xaf\x13\xb5\xba\x97\x52\xec\x84\
-\x34\x7c\x7a\xda\xc1\xbb\xd5\x1a\x27\x6a\xfa\xa5\x81\x43\x55\x7d\
-\x90\x52\xd1\x0b\x6f\x54\xb9\xd7\xf0\x28\xf5\x23\x3f\x6c\x8b\x7b\
-\xc3\xf3\x90\x76\xb3\x83\x77\x11\x28\xec\x56\x72\xd4\x94\x06\x0e\
-\xde\xed\x83\xe4\x3b\xdd\x0c\x0e\xf4\x00\xf7\x96\x7c\xb0\x6d\x2a\
-\x87\xe6\x69\x0f\xc3\x3b\x39\x97\x06\x52\xca\x7b\x81\x79\xf5\xe7\
-\x2e\x46\xd4\x8b\x4f\x61\xdb\xfc\xed\x03\xde\xab\xb7\x5f\x1a\x48\
-\xbc\xd9\x09\x4c\xf2\xed\x6e\x85\xa4\x5b\x2e\x98\xff\x17\xb6\xc5\
-\x9f\x28\xde\x3c\xbd\x44\x7b\xe4\x5e\x99\xa3\x01\x97\x34\x10\x5f\
-\xda\x01\x04\x1d\x92\x68\x12\xc7\x5b\x9d\x30\xf3\x04\x74\x79\xfa\
-\x6c\x73\xec\xd3\x7f\x41\xea\x1d\x17\xed\x5d\xdb\xa5\xe4\x8c\x34\
-\x90\x50\xd6\x09\xb1\x3f\xb5\x03\x45\xce\xb9\x9e\x5c\x05\x3d\x34\
-\x73\xaa\x1c\x85\x7e\xe3\x5d\x7a\x73\x8c\x34\x10\x57\xd2\x01\xd1\
-\x37\xee\x0b\x28\x67\xa8\xf6\xfe\x03\xba\xf0\xbc\x44\xde\xe5\x3c\
-\xa6\x58\xb3\x4f\x9d\x4b\x03\xb1\xc5\xed\x40\x44\x5d\x73\x8a\xa8\
-\x66\x0c\xc5\x86\x1e\x6b\x39\x76\xdb\xa5\xb9\xc3\xb9\x6e\x2d\x7b\
-\xdc\x97\x06\x0e\x14\xb5\x01\x11\x75\xd5\x01\x9c\x47\x5f\xbf\x2f\
-\xa2\x79\x6a\x09\x3c\x2b\xa0\x21\xbd\xd8\x01\x47\xcb\xda\x21\x09\
-\x9f\x52\x7d\x47\xe2\xe4\x1d\x0c\x6b\xf0\x8c\x34\xf0\xca\x55\x27\
-\xa8\x89\x28\x6c\x55\xf2\xd2\xfe\x39\xe8\x7d\x04\x1a\x9c\x8b\x3e\
-\xf8\xa0\xc2\x05\xbb\xce\x57\xc3\x8b\xe7\xaa\xd6\xa8\x54\xf2\x98\
-\x5c\x2b\xc4\x5d\x73\xa8\x77\x71\xce\x51\x1a\x88\xbc\xd2\x06\x91\
-\x57\x5a\x61\x5f\x41\xb3\x80\x6a\x82\xf2\x77\xf0\xbb\xc0\x30\x3e\
-\xb9\x6b\x79\x6b\xe4\xf4\xcc\x42\x7c\x9e\x95\x77\x29\xec\xc7\x9d\
-\x08\xed\x96\x06\xf6\xff\xd8\x02\x44\x58\x9e\x5d\xc4\xf0\x7c\x3b\
-\xd7\x82\x86\xb1\x45\x70\xe3\xb3\x77\x2e\x6f\x8d\xeb\x03\x0f\x71\
-\x4f\x33\x84\xe3\x0e\xde\xad\xd6\x92\x2f\x80\x8d\xd0\x1c\x1b\xec\
-\xcb\x6f\x86\x30\x8c\xa1\x01\x24\xe2\xbf\x5b\xcf\xc2\x0a\xbe\xc4\
-\xd6\x0c\x0c\xac\x00\xed\xe3\xdd\x02\xce\x51\x53\x1a\x88\xc2\xe7\
-\xd8\x6b\xb4\xc0\xde\x6c\x0b\x84\xe7\xda\x09\x1c\xb4\x52\x14\xbd\
-\x30\x8c\x09\x45\xad\x50\x3f\xf6\x50\xfc\x8e\x1f\x5f\xc5\xe5\x9b\
-\x9b\x11\x66\xdb\x66\x96\xf8\x3e\x45\xde\x27\x88\xcc\xb5\x49\x03\
-\xd1\x68\x20\x04\x9b\x7b\xbe\x37\x13\x22\x0f\x35\xda\xd4\x3d\xaa\
-\x45\x4c\xbd\xe1\x84\xa2\xae\x07\xd0\x8a\xbf\xe9\x1e\xfb\x61\x43\
-\xea\xbc\x0b\x10\x9d\x8f\x82\x46\xab\xb8\xcb\xf7\x99\x03\x6a\x03\
-\x31\x05\x4d\xb0\xfb\x3b\x93\x42\xc8\x0f\x16\x42\xd3\xe3\x68\xc0\
-\x05\x5c\x6f\x00\x8a\x34\xf2\xbc\xee\xbe\xa8\x5c\xab\xca\x00\x16\
-\xbb\xbe\xad\x87\x3d\x97\x1b\x15\x0c\x97\x4d\xdc\xa3\xc8\x35\x81\
-\x0b\x1a\x44\x5f\xd6\xf2\x4c\x75\x47\xce\x5c\x92\xbb\x79\x26\x46\
-\x6d\x20\x0e\x8b\x60\xfc\x56\x13\x14\xc0\xee\x4b\x26\x08\xba\x28\
-\xeb\x60\x12\xc3\x1e\x42\xf5\x66\x91\x73\xcd\x5d\xca\x0d\x18\x13\
-\x0a\x54\x3f\x05\xb1\xc6\x46\x9f\x01\x85\x5e\x3e\x5f\x03\xc1\x17\
-\xeb\x75\xa1\x33\x26\x48\x53\x8b\xbb\x0c\x7d\x35\x53\xdf\xd1\xdc\
-\x0f\x41\x33\xf1\x46\x8b\x8f\x0d\x14\x1a\x3e\x2f\xfd\x3d\x31\x0f\
-\xff\xa3\xe0\x53\xee\xbc\x50\x27\x78\xe9\xab\x6a\x06\x2f\xd5\x8a\
-\xc8\x67\x3b\xbe\xae\xe1\x9a\xa2\x44\xce\x68\x72\x51\xe3\x1e\xd2\
-\x20\x2d\xd2\xe4\x3f\xcd\x22\xc8\x89\xe1\x0c\x9a\xc8\x36\xf9\x0f\
-\xe2\xd3\xbc\x96\x67\x01\x8a\x0c\xf7\x38\xea\x91\x92\x6f\xe5\x99\
-\x80\x68\x5b\xd7\x4b\xce\x31\xfb\x49\x8b\x34\x85\x36\x00\xb0\x89\
-\xe7\xfd\xe7\x79\x04\x69\xff\x0f\xc3\x78\xed\x1a\xcc\x42\xc6\x50\
-\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x02\x50\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x10\x00\x00\x00\x10\x08\x06\x00\x00\x00\x1f\xf3\xff\x61\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0b\x13\x00\x00\x0b\x13\
+\x01\x00\x9a\x9c\x18\x00\x00\x00\x19\x74\x45\x58\x74\x53\x6f\x66\
+\x74\x77\x61\x72\x65\x00\x41\x64\x6f\x62\x65\x20\x49\x6d\x61\x67\
+\x65\x52\x65\x61\x64\x79\x71\xc9\x65\x3c\x00\x00\x01\xdd\x49\x44\
+\x41\x54\x78\xda\x94\x53\xbb\x6e\x13\x41\x14\x3d\x33\x3b\x5e\x7b\
+\x63\x3b\x0f\x04\x29\x42\x91\x2d\x03\x55\x0a\xa4\xd4\x28\xe9\x23\
+\x37\x94\xf9\x01\xc4\x27\x50\x52\xd2\x13\x41\xc3\x17\xa4\xa3\xa3\
+\xa0\x41\xe9\x40\x02\x04\x54\xd9\x14\x11\x49\x94\x28\xb1\x1d\xef\
+\x63\x66\x76\x86\x3b\xb3\x8e\xbd\x11\x44\x8a\xef\xea\xee\xce\xeb\
+\x9c\x3d\xf7\xcc\x8c\x78\xf9\xf1\xcb\xfa\x72\xb7\xbb\x77\xbf\xd3\
+\x8e\xe7\x5b\x11\xee\x12\x83\x3c\xc3\xd9\xd5\x28\x39\x1d\x0e\x7b\
+\x78\xfd\xf9\xd7\xc1\xd1\x95\xb2\xca\xd8\x99\xd2\x61\x1c\x56\x74\
+\x9a\x61\xcc\x60\xf1\x67\x24\x31\x4b\x08\xc6\xb0\x18\xb5\x62\x11\
+\x70\x86\x81\xd4\x44\x51\x0f\x36\xfe\xda\x5b\x09\x98\x9f\xb5\x10\
+\xb9\x92\xc8\x4b\x33\x99\x48\x8b\x12\xcf\xde\x7e\xf5\xed\x0f\x2f\
+\x9e\x80\xd4\xde\x4a\xe2\xb0\x22\x97\x0a\xb2\x46\x50\x12\x40\xdb\
+\x4a\x81\xf5\xe0\x29\x01\xd5\x8e\x3a\x9f\xc3\x8a\x42\x2b\xa8\xb2\
+\x9c\x0c\x46\x21\x47\x2b\x6c\xf8\xf6\xf6\xee\xb7\xc9\x78\xbb\xc9\
+\xf1\x7e\x67\xed\xc6\xcf\x1c\xd6\x13\x48\x33\x25\x68\x18\x06\xd1\
+\x14\xff\x9a\x16\x06\x30\xa4\xa0\xbe\xb6\x22\x50\x9a\xea\x04\xb4\
+\xa9\x98\xa3\xc0\xc2\x34\x2b\x05\xaf\x36\x57\xb0\xba\x34\x25\xbb\
+\x24\xc9\x76\x5c\x83\xe0\x1c\x0e\xcb\x25\xb1\x38\xa3\x24\x11\xb8\
+\x54\xd6\x60\x79\x29\xf2\x24\xef\xbe\xf7\xd1\x2f\x2c\x39\x5e\x3d\
+\x6a\xbc\xc6\xa5\xc7\x78\x05\xa5\xae\x3a\xe3\xda\xce\x33\x89\xde\
+\xda\x02\x76\x7f\x0c\x70\x90\x59\x3c\xff\x74\xee\xc7\x3b\x0d\x8e\
+\x37\x4f\xef\xd1\x79\xc9\x7d\x3f\x74\x0a\x08\xcb\x0b\xad\xfd\x7e\
+\x4a\x32\xd2\x65\x46\xfd\xf5\x07\x0c\x3b\x8f\x17\x30\xdf\x0e\xc1\
+\x49\x89\xcf\x50\x78\xf9\xd7\xeb\x1c\xc6\x61\x85\x7b\xb9\x90\x66\
+\xea\xee\x71\x9a\xe3\xd1\x62\x80\xad\x87\x9d\x1b\x46\x26\xc3\x11\
+\x79\x65\x6b\x26\x12\x81\xab\x63\x90\x66\x08\x18\x47\xaa\x6b\x0e\
+\x53\x49\xfd\x42\xfd\xf7\x00\xcd\x89\xc0\x63\x2a\x0f\xb4\x4e\xf6\
+\x93\x24\xde\x88\x57\x11\x77\xe7\xee\x74\x0f\x2e\xd2\x14\xfb\xc9\
+\xa1\x53\x90\x08\x5b\x96\xbd\xdf\xc7\x27\x7b\x3f\x4f\x4e\xe3\x59\
+\x2e\x13\xb7\x36\xa1\x1d\xef\xfd\x15\x60\x00\xe8\x15\x51\x25\x42\
+\x1c\xe5\x09\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x02\x50\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x10\x00\x00\x00\x10\x08\x06\x00\x00\x00\x1f\xf3\xff\x61\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0b\x13\x00\x00\x0b\x13\
+\x01\x00\x9a\x9c\x18\x00\x00\x00\x19\x74\x45\x58\x74\x53\x6f\x66\
+\x74\x77\x61\x72\x65\x00\x41\x64\x6f\x62\x65\x20\x49\x6d\x61\x67\
+\x65\x52\x65\x61\x64\x79\x71\xc9\x65\x3c\x00\x00\x01\xdd\x49\x44\
+\x41\x54\x78\xda\x94\x53\xbb\x6e\x13\x41\x14\x3d\x33\x3b\x5e\x7b\
+\x63\x3b\x0f\x04\x29\x42\x91\x2d\x03\x55\x0a\xa4\xd4\x28\xe9\x23\
+\x37\x94\xf9\x01\xc4\x27\x50\x52\xd2\x13\x41\xc3\x17\xa4\xa3\xa3\
+\xa0\x41\xe9\x40\x02\x04\x54\xd9\x14\x11\x49\x94\x28\xb1\x1d\xef\
+\x63\x66\x76\x86\x3b\xb3\x8e\xbd\x11\x44\x8a\xef\xea\xee\xce\xeb\
+\x9c\x3d\xf7\xcc\x8c\x78\xf9\xf1\xcb\xfa\x72\xb7\xbb\x77\xbf\xd3\
+\x8e\xe7\x5b\x11\xee\x12\x83\x3c\xc3\xd9\xd5\x28\x39\x1d\x0e\x7b\
+\x78\xfd\xf9\xd7\xc1\xd1\x95\xb2\xca\xd8\x99\xd2\x61\x1c\x56\x74\
+\x9a\x61\xcc\x60\xf1\x67\x24\x31\x4b\x08\xc6\xb0\x18\xb5\x62\x11\
+\x70\x86\x81\xd4\x44\x51\x0f\x36\xfe\xda\x5b\x09\x98\x9f\xb5\x10\
+\xb9\x92\xc8\x4b\x33\x99\x48\x8b\x12\xcf\xde\x7e\xf5\xed\x0f\x2f\
+\x9e\x80\xd4\xde\x4a\xe2\xb0\x22\x97\x0a\xb2\x46\x50\x12\x40\xdb\
+\x4a\x81\xf5\xe0\x29\x01\xd5\x8e\x3a\x9f\xc3\x8a\x42\x2b\xa8\xb2\
+\x9c\x0c\x46\x21\x47\x2b\x6c\xf8\xf6\xf6\xee\xb7\xc9\x78\xbb\xc9\
+\xf1\x7e\x67\xed\xc6\xcf\x1c\xd6\x13\x48\x33\x25\x68\x18\x06\xd1\
+\x14\xff\x9a\x16\x06\x30\xa4\xa0\xbe\xb6\x22\x50\x9a\xea\x04\xb4\
+\xa9\x98\xa3\xc0\xc2\x34\x2b\x05\xaf\x36\x57\xb0\xba\x34\x25\xbb\
+\x24\xc9\x76\x5c\x83\xe0\x1c\x0e\xcb\x25\xb1\x38\xa3\x24\x11\xb8\
+\x54\xd6\x60\x79\x29\xf2\x24\xef\xbe\xf7\xd1\x2f\x2c\x39\x5e\x3d\
+\x6a\xbc\xc6\xa5\xc7\x78\x05\xa5\xae\x3a\xe3\xda\xce\x33\x89\xde\
+\xda\x02\x76\x7f\x0c\x70\x90\x59\x3c\xff\x74\xee\xc7\x3b\x0d\x8e\
+\x37\x4f\xef\xd1\x79\xc9\x7d\x3f\x74\x0a\x08\xcb\x0b\xad\xfd\x7e\
+\x4a\x32\xd2\x65\x46\xfd\xf5\x07\x0c\x3b\x8f\x17\x30\xdf\x0e\xc1\
+\x49\x89\xcf\x50\x78\xf9\xd7\xeb\x1c\xc6\x61\x85\x7b\xb9\x90\x66\
+\xea\xee\x71\x9a\xe3\xd1\x62\x80\xad\x87\x9d\x1b\x46\x26\xc3\x11\
+\x79\x65\x6b\x26\x12\x81\xab\x63\x90\x66\x08\x18\x47\xaa\x6b\x0e\
+\x53\x49\xfd\x42\xfd\xf7\x00\xcd\x89\xc0\x63\x2a\x0f\xb4\x4e\xf6\
+\x93\x24\xde\x88\x57\x11\x77\xe7\xee\x74\x0f\x2e\xd2\x14\xfb\xc9\
+\xa1\x53\x90\x08\x5b\x96\xbd\xdf\xc7\x27\x7b\x3f\x4f\x4e\xe3\x59\
+\x2e\x13\xb7\x36\xa1\x1d\xef\xfd\x15\x60\x00\xe8\x15\x51\x25\x42\
+\x1c\xe5\x09\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
 \x00\x00\x01\x27\
 \x89\
 \x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
@@ -412,308 +406,329 @@
 \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\x12\xb1\
+\x00\x00\x14\x10\
 \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\
 \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\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\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\
+\x75\x22\x3b\x0a\x20\x20\x20\x20\x66\x6f\x6e\x74\x2d\x73\x69\x7a\
+\x65\x3a\x20\x31\x33\x70\x78\x3b\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\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\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\
+\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\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\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\
+\x46\x72\x61\x6d\x65\x23\x66\x72\x6d\x5f\x62\x6f\x78\x20\x7b\x20\
+\x2f\x2a\x54\x68\x65\x20\x4c\x6f\x61\x64\x69\x6e\x67\x20\x4f\x76\
+\x65\x72\x6c\x61\x79\x20\x66\x72\x61\x6d\x65\x2e\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\x46\x72\x61\x6d\x65\x23\x66\x72\
+\x6d\x5f\x62\x6f\x78\x20\x3e\x20\x51\x4c\x61\x62\x65\x6c\x20\x7b\
+\x0a\x20\x20\x20\x20\x66\x6f\x6e\x74\x2d\x73\x69\x7a\x65\x3a\x20\
+\x32\x34\x70\x78\x3b\x0a\x7d\x0a\x0a\x51\x50\x75\x73\x68\x42\x75\
+\x74\x74\x6f\x6e\x20\x7b\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\x70\x61\
+\x64\x64\x69\x6e\x67\x2d\x6c\x65\x66\x74\x3a\x20\x32\x30\x70\x78\
+\x3b\x0a\x20\x20\x20\x20\x70\x61\x64\x64\x69\x6e\x67\x2d\x72\x69\
+\x67\x68\x74\x3a\x20\x32\x30\x70\x78\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\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\x39\x65\x38\x34\x2c\x73\x74\x6f\x70\x3a\x20\x31\x2e\x30\
+\x20\x23\x64\x64\x34\x38\x31\x34\x29\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\x39\x39\x39\x39\x39\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\x66\x62\x31\
+\x39\x63\x2c\x73\x74\x6f\x70\x3a\x20\x31\x2e\x30\x20\x23\x64\x64\
+\x34\x38\x31\x34\x29\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\x39\x39\x39\
+\x39\x39\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\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\
+\x20\x73\x74\x6f\x70\x3a\x20\x30\x20\x23\x62\x39\x33\x66\x31\x34\
+\x2c\x73\x74\x6f\x70\x3a\x20\x31\x2e\x30\x20\x23\x64\x64\x34\x38\
+\x31\x34\x29\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\x39\x39\x39\x39\x39\
+\x3b\x0a\x7d\x0a\x0a\x51\x50\x75\x73\x68\x42\x75\x74\x74\x6f\x6e\
+\x5b\x73\x65\x63\x6f\x6e\x64\x61\x72\x79\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\x66\x66\x66\x66\x66\x2c\x73\x74\x6f\x70\x3a\x20\x31\
+\x2e\x30\x20\x23\x65\x36\x65\x36\x65\x36\x29\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\x6f\x72\x64\x65\x72\x2d\x63\x6f\x6c\x6f\
+\x72\x3a\x20\x23\x39\x39\x39\x39\x39\x39\x3b\x0a\x7d\x0a\x0a\x51\
+\x50\x75\x73\x68\x42\x75\x74\x74\x6f\x6e\x3a\x68\x6f\x76\x65\x72\
+\x5b\x73\x65\x63\x6f\x6e\x64\x61\x72\x79\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\x66\x66\x66\x66\x66\x2c\x73\x74\x6f\x70\x3a\x20\x31\
+\x2e\x30\x20\x23\x65\x64\x65\x64\x65\x64\x29\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\x6f\x72\x64\x65\x72\x2d\x63\x6f\x6c\x6f\
+\x72\x3a\x20\x23\x39\x39\x39\x39\x39\x39\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\x73\x65\x63\x6f\x6e\x64\x61\x72\x79\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\x30\x20\x23\x64\x39\x64\x39\x64\x39\x2c\x73\x74\x6f\x70\x3a\
+\x20\x31\x2e\x30\x20\x23\x66\x65\x66\x65\x66\x65\x29\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\x6f\x72\x64\x65\x72\x2d\x63\x6f\
+\x6c\x6f\x72\x3a\x20\x23\x39\x39\x39\x39\x39\x39\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\
-\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\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\
-\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\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\
+\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\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\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\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\x20\x20\x20\x20\x70\
+\x61\x64\x64\x69\x6e\x67\x2d\x6c\x65\x66\x74\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\x7d\x0a\x0a\x51\
+\x50\x75\x73\x68\x42\x75\x74\x74\x6f\x6e\x23\x74\x77\x69\x74\x74\
+\x65\x72\x5f\x62\x75\x74\x74\x6f\x6e\x2c\x0a\x51\x50\x75\x73\x68\
+\x42\x75\x74\x74\x6f\x6e\x23\x66\x61\x63\x65\x62\x6f\x6f\x6b\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\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\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\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\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\x65\x34\x65\x30\x64\x64\
+\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\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\
+\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\x23\x66\x36\
+\x66\x36\x66\x36\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\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\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\
-\
+\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\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\x38\x39\x38\x39\x38\x39\
+\x3b\x0a\x20\x20\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\x74\x6f\x70\
+\x2d\x77\x69\x64\x74\x68\x3a\x20\x31\x70\x78\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\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\x66\x37\x66\x36\
+\x66\x35\x3b\x0a\x20\x20\x20\x20\x62\x61\x63\x6b\x67\x72\x6f\x75\
+\x6e\x64\x3a\x20\x23\x65\x66\x65\x64\x65\x63\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\
@@ -23296,85 +23311,80 @@
 \xee\xee\xee\x93\x74\xd0\xf8\xf8\x78\xff\xac\x9e\xfb\xdf\x96\xbf\
 \x02\x0c\x00\x57\x70\xa3\x5d\x63\x1a\xb1\xc1\x00\x00\x00\x00\x49\
 \x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x04\xc5\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x04\x8c\x49\x44\x41\x54\x78\xda\xbd\x97\xfb\x53\xd4\x65\
-\x14\xc6\xf9\x17\xfa\x4b\x6c\xa6\xdf\xba\x89\x9a\x19\x65\x99\x95\
-\x20\x97\xbd\x21\xec\x02\x8a\x28\x77\x58\x60\xc1\x26\xe9\x66\x4a\
-\xa5\x21\x2c\xe2\x28\xb0\x0b\xbb\x2c\x2c\x94\x94\x46\x54\xde\xa6\
-\x71\x72\xaa\xd1\x9a\x32\xa6\xa6\x7b\x43\x22\x0a\x22\x5e\xb6\xd3\
-\x7b\x5e\xe6\xd9\xf7\xec\xee\x77\x1b\x7e\x92\x99\xcf\x9c\x73\x9e\
-\xf7\x5c\x1e\x96\x1f\x80\x0c\xfe\x7a\xe0\xa1\xba\x07\x15\xdd\x8a\
-\xa9\xfb\x44\x37\xdf\x94\xc7\xa7\x8a\x9a\x22\x33\x7b\xbb\xce\xc4\
-\xf6\xf5\x9e\xa7\xd7\x7b\xce\x5a\x82\xb7\xe4\xf8\xe6\x11\xcc\x40\
-\x4b\x3f\xd7\xde\x7d\x36\xc6\xb7\xf8\xa6\x36\xc1\x6e\x0a\x1b\x87\
-\x67\xf6\x1c\xfc\x8c\x2a\x5f\x3d\x49\x1e\xdf\xfb\xe4\x6e\x19\x37\
-\xf8\xc6\xa9\xb4\xed\x04\xe0\x5a\x53\xd2\xfa\x01\x7a\x64\x2f\x47\
-\xdd\x27\x75\x68\x65\x8a\x8a\xf6\x09\x7a\xb9\xf3\x73\xe2\x9b\x7c\
-\x3b\x83\x9d\x78\xdf\xfe\x24\x56\xbe\x77\x82\x3c\x6a\x69\x51\xcb\
-\x18\x62\x0a\x9e\xb6\x84\x77\xe4\x8c\xec\x91\xd1\x32\xdf\xd9\xfe\
-\x21\x79\x0f\x4c\xc6\xf8\xf6\xb2\x81\x8e\x49\x72\xb7\x8e\xd3\xb6\
-\xe6\x28\x15\x36\x8d\x6a\x8a\x7d\xe3\x32\x4f\x5b\xf3\x0c\x6a\x47\
-\x7d\x98\x36\x97\xf9\x29\xcb\xd5\x41\x1b\x1c\xfb\xe9\x29\xa7\x89\
-\xfc\x0e\xf8\x56\xf3\x3b\x53\x14\x37\x50\xbf\x7f\x92\x9c\x8d\x23\
-\x6a\xd9\x18\x88\xd7\x2e\xef\xe8\x72\x6c\x1c\xd5\x9a\xd6\x9b\xf4\
-\xbb\x06\x7d\xb6\xda\x10\xd9\xab\x7b\xe9\xe4\xe9\xcb\x34\x7f\x73\
-\x89\x92\xbe\x30\xaf\x4c\x47\x75\xac\xdb\x77\xca\x18\xd8\xad\x7e\
-\x2e\x85\xde\xa8\xfa\x0e\x22\x88\x20\x9d\x9e\xa2\xb9\xbd\x41\x9a\
-\x9b\xbf\x45\xf7\x62\xff\x5a\xc2\xbd\x12\x75\xd3\x18\x28\x7f\xe5\
-\x04\x39\x1a\x46\x34\x05\xb5\x61\xe4\x29\x1a\x72\xbb\x3a\xc8\x51\
-\x12\x9a\xb8\x48\xb7\xef\xc6\xd2\xc2\x33\x72\x87\xba\x69\x0c\x78\
-\x7c\x51\xdd\x90\x5f\x13\x52\x1f\xe5\x30\xf2\x15\xc1\xbd\xcc\xe5\
-\x2b\x7f\xd2\xe2\xd2\xbd\xb4\xa0\x0f\x33\xee\x96\xa8\x31\x50\xd4\
-\x14\x55\xae\x86\x35\xb9\x55\x43\x0c\x6a\x35\x10\x96\x1a\x62\x4a\
-\xef\xc2\xe2\xdd\x04\x3e\x3a\xf3\x23\x15\xb7\x8c\xe9\x37\x20\xe7\
-\x5c\x8d\x11\x63\x20\xaf\x7a\x90\xb2\x77\x07\x28\xb7\x7a\x08\xa4\
-\xab\x11\x53\xb8\xbe\x70\x27\x01\x47\x43\x58\xce\x6a\xb6\x56\x0d\
-\xc6\x73\x75\xd3\x18\xc8\xa9\x1c\xa4\x97\x2a\x06\xe2\x64\xef\x0a\
-\x92\xd4\x38\x67\x64\xbe\xa5\x22\x80\x5a\xc7\xd9\x1b\x77\x24\xe8\
-\x03\x16\x3b\x84\x81\x2d\xbb\x02\x04\x5e\x28\xef\x03\xa8\xd5\xb1\
-\x81\x84\x77\xe4\x99\xb9\x6f\x68\x56\xe7\xbc\x46\x33\xd7\x6e\x4b\
-\x58\xe3\x37\x60\xb5\xdf\x18\x78\x7e\xfb\x71\x02\x2f\xee\x1c\x88\
-\xb3\x79\x47\x1f\x34\xe4\xa8\x75\xfc\xeb\xea\xd2\x4a\xc1\x4e\xcc\
-\x2b\x03\xfd\xc6\xc0\x73\xa5\xc7\x48\xa1\x1e\xfb\xd4\xa1\x7e\xc4\
-\x04\x36\x95\x1d\xe7\x1e\xd4\x3a\xff\x7d\xe6\xd6\x8a\xf8\xf8\xfc\
-\x34\x66\xc4\x4e\x61\x60\x93\x72\xb5\xb1\xe4\x28\x71\x44\xce\xc4\
-\xf5\xb2\x63\x96\x6f\xbf\xfe\xbd\xb8\x22\x4e\x9d\x9b\x96\xfb\x80\
-\x31\xf0\xac\x72\xf6\xb4\xbb\x57\xc3\x39\x40\x8d\xb7\xe4\xfa\xe7\
-\x3f\x6e\xae\x88\x43\x81\x0b\x72\x1f\x72\x63\x60\xa3\xe7\x28\x31\
-\x59\x45\x3d\x1c\x01\x34\x19\xd3\xe6\xd3\xbf\x2d\x48\xfe\x6f\x1f\
-\x74\x63\xe0\xc9\x42\x3f\x31\x1b\xb6\xf5\x10\xf2\xac\xe2\x5e\xe4\
-\x96\x35\x34\xe8\x3f\xfc\x32\x2f\x51\x47\x8e\x24\xcf\xe0\x06\xe6\
-\x8c\x01\x16\x25\x4f\x38\xbb\x64\x8e\x88\x05\x96\xef\xdf\xfd\x74\
-\x43\xc2\x3a\x90\xbd\x32\x1a\x03\xeb\x5d\x7e\x5a\xef\xf4\xd3\x5a\
-\xfb\x61\x0d\xd7\x0c\x72\x51\x5b\x46\xe6\xd2\xf4\x75\x89\xd5\x3c\
-\x34\x60\x0c\xac\x73\x74\x11\x93\x59\xf0\x9e\x8e\x6b\x0a\x3a\x51\
-\xa7\x65\x9d\xdd\xf4\x33\x5f\x5f\x99\x93\xe0\x0d\x7d\xa8\x01\xd7\
-\xd2\xc0\x61\x7a\x3c\xef\x20\xad\xb1\x75\x72\x94\x40\xd7\xc8\x9e\
-\xcc\xfc\x43\x1a\xd4\x17\xbf\x9f\x93\xa0\x37\xed\x0e\x75\xd3\x18\
-\x58\x6b\x7b\x97\x1e\xc9\x7e\x8b\x1e\x56\x3c\x96\xdb\xa1\x79\x34\
-\xe7\x80\x8e\xd0\x00\x34\x44\xe4\x17\xbe\xbd\x26\x91\xbd\x96\x33\
-\xab\xf3\x3a\x8c\x81\x12\xdf\x08\x39\xeb\x87\xc8\x51\x37\xc8\xe8\
-\xbc\xb0\x31\x2c\x35\x5d\x23\xba\x94\x8e\x1a\x7c\x71\x69\x56\xa2\
-\x7a\x42\x5a\x77\x35\x84\xb8\x37\xa5\xbf\xb8\x29\x9c\x68\xc0\x5e\
-\x1b\x04\x3c\xc4\xa4\x68\x88\x6c\x0c\x35\x38\xf7\xcd\x55\x09\xf7\
-\xa0\xdf\x72\x9f\x5b\x1a\x70\x37\x87\xa9\xa0\x26\x40\x0e\x35\x04\
-\xd8\x25\x34\x8e\xf6\xe5\x5a\x63\x53\x0b\xa0\xe3\xed\xf4\x57\xff\
-\x48\xe4\x2c\xf2\x84\x9a\x6f\x9a\x3f\xc9\xd8\x40\xf5\x00\xe5\x57\
-\x25\xa0\x9c\x0e\x26\xd4\xb6\xea\xa0\xd6\xa0\xcb\xf8\xe9\x97\x33\
-\x92\xe4\x59\xb5\x3f\x00\x4d\x7f\x73\xa5\xbe\x88\xf8\x04\xbc\xe1\
-\x18\x7f\x2c\x79\x7c\x44\x35\x59\xc1\x6f\xc0\x56\x93\x5c\x07\x13\
-\xea\x7c\x75\x4c\xcc\x20\x07\xca\x40\x90\x3c\xcd\xc3\x31\x18\xe8\
-\x7e\xc6\xed\x9f\x2d\x6d\x1b\x25\x67\xc3\x10\xe5\xab\x65\xcc\xd6\
-\xca\x7e\xa0\x86\x02\x3a\xe2\x2d\x57\x2d\x41\x2d\xfa\x64\x8f\xcc\
-\xc5\x5b\x40\xdf\xe0\x5b\x7c\x13\xff\x9a\xad\xd2\xbf\x11\x3d\xfe\
-\xd9\xe2\xe6\x50\x6c\xc7\x9e\x28\x95\xb6\x46\x88\x23\x80\x86\x68\
-\x45\x59\xdb\x88\xe9\x11\x71\xbb\x3a\x26\xb5\x12\x5f\x24\xc6\xb7\
-\xf8\x26\xdf\xce\x20\x22\x98\xb8\xdf\xff\x9e\xaf\xe2\xdb\xff\x01\
-\x95\x7c\xeb\x7f\xbd\xd5\xeb\x77\x00\x00\x00\x00\x49\x45\x4e\x44\
-\xae\x42\x60\x82\
+\x00\x00\x02\x2a\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x10\x00\x00\x00\x10\x08\x06\x00\x00\x00\x1f\xf3\xff\x61\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0b\x13\x00\x00\x0b\x13\
+\x01\x00\x9a\x9c\x18\x00\x00\x00\x19\x74\x45\x58\x74\x53\x6f\x66\
+\x74\x77\x61\x72\x65\x00\x41\x64\x6f\x62\x65\x20\x49\x6d\x61\x67\
+\x65\x52\x65\x61\x64\x79\x71\xc9\x65\x3c\x00\x00\x01\xb7\x49\x44\
+\x41\x54\x78\xda\x94\x93\x4d\x2f\x03\x41\x18\xc7\x9f\x5d\xd3\xdd\
+\xb6\x0e\x5e\x83\x34\xc1\x88\x38\x38\x78\x8d\x44\x38\x38\x78\xb9\
+\x8a\xc6\x55\x22\x1c\x5c\xc4\x37\x70\xf3\x2d\x48\x70\x90\x38\x96\
+\xc4\x89\xe8\xcd\x57\xd0\x92\x58\x2b\x95\x4a\x43\xd5\x5b\xed\xdb\
+\xec\xac\x99\xd9\x54\xad\x96\xf0\x5c\x9e\xcc\xf3\x3c\xff\xdf\xfc\
+\x67\x76\x47\x1a\x9b\x5b\x1f\x0c\x87\xa3\x09\x35\x1c\xc1\x8a\xa2\
+\xc2\x5f\xc2\xb6\x2d\xb0\x4c\x43\x37\xcd\xf7\x38\x52\xd5\x48\x62\
+\x76\x7a\x1c\x77\xb7\xb7\x82\x24\x49\x7f\x02\x78\x9e\x07\x57\x99\
+\x1c\x3e\x3c\x39\x4b\x20\x14\x52\x70\xbe\x60\x41\x4a\x4f\xc3\x7f\
+\xa2\xa5\x2e\x0a\x21\x25\x8c\x11\x80\x0c\xe9\x4c\x1e\x5c\xea\xfd\
+\x0b\xf0\xf8\x62\x30\x27\x00\x88\x50\x0a\x96\xe3\xfe\x38\x38\x39\
+\xda\x05\xcb\xf3\xc3\x50\x1b\x51\xc4\x3a\xbe\xb6\x2f\x32\x61\x12\
+\xae\x45\xae\xeb\xb2\x05\xfd\x11\xf0\x55\xec\x0b\xcb\xb3\x5c\xcb\
+\x00\xf4\x57\x40\x49\xbc\xba\x71\x04\xda\x6d\x21\xd0\xe3\x5a\xe1\
+\x80\x1f\x86\xdb\xf9\x2d\x2e\x6f\x1e\x02\x6b\x24\xcb\x65\x07\x8a\
+\x2c\x81\xe9\x04\x01\xc9\xed\xa5\xcf\x4f\xc6\xe3\x78\x6b\xd1\xbf\
+\x93\xe5\x1d\x91\xa3\xa8\xa6\xe4\x80\x82\x2a\x68\x41\x80\xe3\x38\
+\x55\x9d\x94\xe6\x4a\x1a\x44\x98\x0d\x85\xd1\xec\x6f\x80\x89\xa5\
+\x5d\x91\x4f\x37\x17\x44\x9e\x5a\xd9\x0b\xf4\xb9\x86\x6b\x91\x69\
+\x19\x0c\x6b\x40\xb1\xf8\x52\x75\x47\x87\xf8\x4e\x2a\xfa\xf5\x21\
+\xe0\x5a\xd4\xd8\xde\x09\xb8\x7f\x08\x0a\xcd\x4f\xd5\x01\x0e\x11\
+\xb9\x63\x60\x24\x50\xc7\xb1\x7a\xb8\x36\x18\x80\x58\x36\xb8\x66\
+\x11\xa2\x1e\x85\x7c\xd1\xaa\x00\x10\xe2\x03\x8c\x37\xe3\xb3\xd6\
+\x54\xab\x0a\x0d\xe5\x77\x50\x03\x54\xbf\xbb\xcf\xe1\xbe\x58\x8c\
+\xfd\xdb\x0d\x15\x00\x55\xf5\x5f\xe8\x4c\x6f\x5b\xd9\x15\x7b\x8d\
+\x5a\x36\x0b\x12\xb1\x75\x44\x8d\xe7\xf8\x85\xa6\x25\x52\x9a\x8e\
+\xab\x1d\xa1\xa7\x35\x27\xf2\x41\xf2\x3c\x50\x97\xd9\xc6\x9e\xf9\
+\x1a\xff\x10\x60\x00\x7c\x3b\xda\x5b\x6c\x8a\x7e\xa0\x00\x00\x00\
+\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x02\x2a\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x10\x00\x00\x00\x10\x08\x06\x00\x00\x00\x1f\xf3\xff\x61\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0b\x13\x00\x00\x0b\x13\
+\x01\x00\x9a\x9c\x18\x00\x00\x00\x19\x74\x45\x58\x74\x53\x6f\x66\
+\x74\x77\x61\x72\x65\x00\x41\x64\x6f\x62\x65\x20\x49\x6d\x61\x67\
+\x65\x52\x65\x61\x64\x79\x71\xc9\x65\x3c\x00\x00\x01\xb7\x49\x44\
+\x41\x54\x78\xda\x94\x93\x4d\x2f\x03\x41\x18\xc7\x9f\x5d\xd3\xdd\
+\xb6\x0e\x5e\x83\x34\xc1\x88\x38\x38\x78\x8d\x44\x38\x38\x78\xb9\
+\x8a\xc6\x55\x22\x1c\x5c\xc4\x37\x70\xf3\x2d\x48\x70\x90\x38\x96\
+\xc4\x89\xe8\xcd\x57\xd0\x92\x58\x2b\x95\x4a\x43\xd5\x5b\xed\xdb\
+\xec\xac\x99\xd9\x54\xad\x96\xf0\x5c\x9e\xcc\xf3\x3c\xff\xdf\xfc\
+\x67\x76\x47\x1a\x9b\x5b\x1f\x0c\x87\xa3\x09\x35\x1c\xc1\x8a\xa2\
+\xc2\x5f\xc2\xb6\x2d\xb0\x4c\x43\x37\xcd\xf7\x38\x52\xd5\x48\x62\
+\x76\x7a\x1c\x77\xb7\xb7\x82\x24\x49\x7f\x02\x78\x9e\x07\x57\x99\
+\x1c\x3e\x3c\x39\x4b\x20\x14\x52\x70\xbe\x60\x41\x4a\x4f\xc3\x7f\
+\xa2\xa5\x2e\x0a\x21\x25\x8c\x11\x80\x0c\xe9\x4c\x1e\x5c\xea\xfd\
+\x0b\xf0\xf8\x62\x30\x27\x00\x88\x50\x0a\x96\xe3\xfe\x38\x38\x39\
+\xda\x05\xcb\xf3\xc3\x50\x1b\x51\xc4\x3a\xbe\xb6\x2f\x32\x61\x12\
+\xae\x45\xae\xeb\xb2\x05\xfd\x11\xf0\x55\xec\x0b\xcb\xb3\x5c\xcb\
+\x00\xf4\x57\x40\x49\xbc\xba\x71\x04\xda\x6d\x21\xd0\xe3\x5a\xe1\
+\x80\x1f\x86\xdb\xf9\x2d\x2e\x6f\x1e\x02\x6b\x24\xcb\x65\x07\x8a\
+\x2c\x81\xe9\x04\x01\xc9\xed\xa5\xcf\x4f\xc6\xe3\x78\x6b\xd1\xbf\
+\x93\xe5\x1d\x91\xa3\xa8\xa6\xe4\x80\x82\x2a\x68\x41\x80\xe3\x38\
+\x55\x9d\x94\xe6\x4a\x1a\x44\x98\x0d\x85\xd1\xec\x6f\x80\x89\xa5\
+\x5d\x91\x4f\x37\x17\x44\x9e\x5a\xd9\x0b\xf4\xb9\x86\x6b\x91\x69\
+\x19\x0c\x6b\x40\xb1\xf8\x52\x75\x47\x87\xf8\x4e\x2a\xfa\xf5\x21\
+\xe0\x5a\xd4\xd8\xde\x09\xb8\x7f\x08\x0a\xcd\x4f\xd5\x01\x0e\x11\
+\xb9\x63\x60\x24\x50\xc7\xb1\x7a\xb8\x36\x18\x80\x58\x36\xb8\x66\
+\x11\xa2\x1e\x85\x7c\xd1\xaa\x00\x10\xe2\x03\x8c\x37\xe3\xb3\xd6\
+\x54\xab\x0a\x0d\xe5\x77\x50\x03\x54\xbf\xbb\xcf\xe1\xbe\x58\x8c\
+\xfd\xdb\x0d\x15\x00\x55\xf5\x5f\xe8\x4c\x6f\x5b\xd9\x15\x7b\x8d\
+\x5a\x36\x0b\x12\xb1\x75\x44\x8d\xe7\xf8\x85\xa6\x25\x52\x9a\x8e\
+\xab\x1d\xa1\xa7\x35\x27\xf2\x41\xf2\x3c\x50\x97\xd9\xc6\x9e\xf9\
+\x1a\xff\x10\x60\x00\x7c\x3b\xda\x5b\x6c\x8a\x7e\xa0\x00\x00\x00\
+\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
 \x00\x00\x01\x68\
 \x89\
 \x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
@@ -23468,21 +23478,23 @@
 "
 
 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\xb2\x73\
+\x00\x00\x00\x00\x00\x02\x00\x00\x00\x10\x00\x00\x00\x01\
+\x00\x00\x01\xf0\x00\x00\x00\x00\x00\x01\x00\x05\xb2\xec\
 \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\x01\x3e\x00\x00\x00\x00\x00\x01\x00\x00\x17\x85\
 \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\xaa\x1e\
+\x00\x00\x01\xb4\x00\x00\x00\x00\x00\x01\x00\x05\xab\x04\
 \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\xee\x00\x00\x00\x00\x00\x01\x00\x00\x14\x06\
 \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\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\
+\x00\x00\x01\x0a\x00\x00\x00\x00\x00\x01\x00\x00\x16\x5a\
+\x00\x00\x01\xd2\x00\x00\x00\x00\x00\x01\x00\x05\xb0\xbe\
+\x00\x00\x01\xd2\x00\x00\x00\x00\x00\x01\x00\x05\xae\x90\
+\x00\x00\x01\x5e\x00\x00\x00\x00\x00\x01\x00\x00\x2b\x99\
+\x00\x00\x01\x96\x00\x00\x00\x00\x00\x01\x00\x00\x2e\x0c\
 "
 
 def qInitResources():

=== modified file 'ubuntuone/controlpanel/gui/qt/ui/loadingoverlay_ui.py'
--- ubuntuone/controlpanel/gui/qt/ui/loadingoverlay_ui.py	2011-08-12 19:12:08 +0000
+++ ubuntuone/controlpanel/gui/qt/ui/loadingoverlay_ui.py	2011-08-25 19:40:18 +0000
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'data/qt/loadingoverlay.ui'
 #
-# Created: Fri Aug 12 15:07:18 2011
+# Created: Thu Aug 25 15:26:50 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/mainwindow_ui.py'
--- ubuntuone/controlpanel/gui/qt/ui/mainwindow_ui.py	2011-08-12 19:12:08 +0000
+++ ubuntuone/controlpanel/gui/qt/ui/mainwindow_ui.py	2011-08-25 19:40:18 +0000
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'data/qt/mainwindow.ui'
 #
-# Created: Fri Aug 12 15:07:18 2011
+# Created: Thu Aug 25 15:26:50 2011
 #      by: PyQt4 UI code generator 4.8.3
 #
 # WARNING! All changes made in this file will be lost!
@@ -48,7 +48,7 @@
         QtCore.QMetaObject.connectSlotsByName(MainWindow)
 
     def retranslateUi(self, MainWindow):
-        MainWindow.setWindowTitle(_('Ubuntu One Control Panel'))
+        MainWindow.setWindowTitle(_('Ubuntu One'))
 
 from ubuntuone.controlpanel.gui.qt.controlpanel import ControlPanel
 import images_rc

=== modified file 'ubuntuone/controlpanel/gui/qt/ui/preferences_ui.py'
--- ubuntuone/controlpanel/gui/qt/ui/preferences_ui.py	2011-08-12 19:12:08 +0000
+++ ubuntuone/controlpanel/gui/qt/ui/preferences_ui.py	2011-08-25 19:40:18 +0000
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'data/qt/preferences.ui'
 #
-# Created: Fri Aug 12 15:07:18 2011
+# Created: Thu Aug 25 15:26:50 2011
 #      by: PyQt4 UI code generator 4.8.3
 #
 # WARNING! All changes made in this file will be lost!
@@ -90,6 +90,7 @@
         self.apply_changes_button.setObjectName(_fromUtf8("apply_changes_button"))
         self.horizontalLayout.addWidget(self.apply_changes_button)
         self.restore_defaults_button = QtGui.QPushButton(Form)
+        self.restore_defaults_button.setProperty(_fromUtf8("secondary"), True)
         self.restore_defaults_button.setObjectName(_fromUtf8("restore_defaults_button"))
         self.horizontalLayout.addWidget(self.restore_defaults_button)
         self.verticalLayout.addLayout(self.horizontalLayout)
@@ -98,7 +99,7 @@
         QtCore.QMetaObject.connectSlotsByName(Form)
 
     def retranslateUi(self, Form):
-        self.bandwidth_settings.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'))

=== modified file 'ubuntuone/controlpanel/login_client.py'
--- ubuntuone/controlpanel/login_client.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/login_client.py	2011-08-25 19:40:18 +0000
@@ -18,14 +18,15 @@
 
 """Client to access Ubuntu One credentials."""
 
+# pylint: disable=E0611, F0401
+from ubuntuone.platform.credentials import CredentialsManagementTool
+# pylint: enable=E0611, F0401
+
 
 def get_sso_proxy():
     """Return a login client."""
-    # No name 'credentials' in module 'ubuntuone.platform'
-    # Reimport 'credentials' (imported line 22)
-    # pylint: disable=E0611,W0404
-    from ubuntuone.platform import credentials
-    return credentials.CredentialsManagementTool()
+    result = CredentialsManagementTool()
+    return result
 
 
 def get_credentials():
@@ -38,3 +39,15 @@
     """Clear the credentials for Ubuntu One."""
     proxy = get_sso_proxy()
     return proxy.clear_credentials()
+
+
+def login(*args, **kwargs):
+    """Get the credentials for Ubuntu One offering the user to login."""
+    proxy = get_sso_proxy()
+    return proxy.login(*args, **kwargs)
+
+
+def register(*args, **kwargs):
+    """Get the credentials for Ubuntu One offering the user to register."""
+    proxy = get_sso_proxy()
+    return proxy.register(*args, **kwargs)

=== modified file 'ubuntuone/controlpanel/sd_client/__init__.py'
--- ubuntuone/controlpanel/sd_client/__init__.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/sd_client/__init__.py	2011-08-25 19:40:18 +0000
@@ -21,221 +21,186 @@
 import sys
 import warnings
 
+# pylint: disable=E0611
+from ubuntuone.platform import tools
+# pylint: enable=E0611
 from ubuntuone.controlpanel.logger import setup_logging
 
-# pylint: disable=W0611
-
 
 logger = setup_logging('sd_client')
 
 
-def get_syncdaemon_tool():
-    """Get a proxy for the SyncDaemonTool."""
-    # Reimport 'SyncDaemonTool'
-    # No name 'tools' in module 'ubuntuone.platform'
-    # pylint: disable=W0404, E0611
-    from ubuntuone.platform import tools
-    proxy = tools.SyncDaemonTool()
-    return proxy
-
-
-def get_throttling_limits():
-    """Get the speed limits from the syncdaemon."""
-    return get_syncdaemon_tool().get_throttling_limits()
-
-
-def set_throttling_limits(limits):
-    """Set the speed limits on the syncdaemon."""
-    dload = int(limits["download"])
-    uload = int(limits["upload"])
-    return get_syncdaemon_tool().set_throttling_limits(dload, uload)
-
-
-def bandwidth_throttling_enabled():
-    """Get the state of throttling in the syncdaemon."""
-    return get_syncdaemon_tool().is_throttling_enabled()
-
-
-def enable_bandwidth_throttling():
-    """Enable the speed limits in the syncdaemon."""
-    return get_syncdaemon_tool().enable_throttling(True)
-
-
-def disable_bandwidth_throttling():
-    """Disable the speed limits in the syncdaemon."""
-    return get_syncdaemon_tool().enable_throttling(False)
-
-
-def autoconnect_enabled():
-    """Get the state of autoconnect in the syncdaemon."""
-    return get_syncdaemon_tool().is_autoconnect_enabled()
-
-
-def enable_autoconnect():
-    """Enable autoconnect in the syncdaemon."""
-    return get_syncdaemon_tool().enable_autoconnect(True)
-
-
-def disable_autoconnect():
-    """Disable autoconnect in the syncdaemon."""
-    return get_syncdaemon_tool().enable_autoconnect(False)
-
-
-def show_all_notifications_enabled():
-    """Get the state of show_all_notifications in the syncdaemon."""
-    return get_syncdaemon_tool().is_show_all_notifications_enabled()
-
-
-def enable_show_all_notifications():
-    """Enable show_all_notifications in the syncdaemon."""
-    return get_syncdaemon_tool().enable_show_all_notifications(True)
-
-
-def disable_show_all_notifications():
-    """Disable show_all_notifications in the syncdaemon."""
-    return get_syncdaemon_tool().enable_show_all_notifications(False)
-
-
-def share_autosubscribe_enabled():
-    """Get the state of share_autosubscribe in the syncdaemon."""
-    return get_syncdaemon_tool().is_share_autosubscribe_enabled()
-
-
-def enable_share_autosubscribe():
-    """Enable share_autosubscribe in the syncdaemon."""
-    return get_syncdaemon_tool().enable_share_autosubscribe(True)
-
-
-def disable_share_autosubscribe():
-    """Disable share_autosubscribe in the syncdaemon."""
-    return get_syncdaemon_tool().enable_share_autosubscribe(False)
-
-
-def udf_autosubscribe_enabled():
-    """Get the state of udf_autosubscribe in the syncdaemon."""
-    return get_syncdaemon_tool().is_udf_autosubscribe_enabled()
-
-
-def enable_udf_autosubscribe():
-    """Enable udf_autosubscribe in the syncdaemon."""
-    return get_syncdaemon_tool().enable_udf_autosubscribe(True)
-
-
-def disable_udf_autosubscribe():
-    """Disable udf_autosubscribe in the syncdaemon."""
-    return get_syncdaemon_tool().enable_udf_autosubscribe(False)
-
-
-def get_root_dir():
-    """Retrieve the root information from syncdaemon."""
-    return get_syncdaemon_tool().get_root_dir()
-
-
-def get_shares_dir():
-    """Retrieve the shares information from syncdaemon."""
-    return get_syncdaemon_tool().get_shares_dir()
-
-
-def get_shares_dir_link():
-    """Retrieve the shares information from syncdaemon."""
-    return get_syncdaemon_tool().get_shares_dir_link()
-
-
-def get_folders():
-    """Retrieve the folders information from syncdaemon."""
-    return get_syncdaemon_tool().get_folders()
-
-
-def create_folder(path):
-    """Create a new folder through syncdaemon."""
-    return get_syncdaemon_tool().create_folder(path)
-
-
-def subscribe_folder(folder_id):
-    """Subscribe to 'folder_id'."""
-    return get_syncdaemon_tool().subscribe_folder(folder_id)
-
-
-def unsubscribe_folder(folder_id):
-    """Unsubscribe 'folder_id'."""
-    return get_syncdaemon_tool().unsubscribe_folder(folder_id)
-
-
-def get_shares():
-    """Retrieve the shares information from syncdaemon."""
-    return get_syncdaemon_tool().get_shares()
-
-
-def subscribe_share(share_id):
-    """Subscribe to 'share_id'."""
-    return get_syncdaemon_tool().subscribe_share(share_id)
-
-
-def unsubscribe_share(share_id):
-    """Unsubscribe 'share_id'."""
-    return get_syncdaemon_tool().unsubscribe_share(share_id)
-
-
-def get_current_status():
-    """Retrieve the current status from syncdaemon."""
-    return get_syncdaemon_tool().get_status()
-
-
-def file_sync_enabled():
-    """Get if file sync service is enabled."""
-    return get_syncdaemon_tool().is_files_sync_enabled()
-
-
-def enable_file_sync():
-    """Enable the file sync service."""
-    return get_syncdaemon_tool().enable_files_sync(True)
-
-
-def disable_file_sync():
-    """Enable the file sync service."""
-    return get_syncdaemon_tool().enable_files_sync(False)
-
-
-def files_sync_enabled():
-    """Get if file sync service is enabled."""
-    warnings.warn('use file_sync_enabled instead', DeprecationWarning)
-    return file_sync_enabled()
-
-
-def set_files_sync_enabled(enabled):
-    """Set the file sync service to be 'enabled'."""
-    warnings.warn('use {enable/disable}_file_sync instead', DeprecationWarning)
-    if enabled:
-        return enable_file_sync()
-    else:
-        return disable_file_sync()
-
-
-def connect_file_sync():
-    """Connect the file sync service."""
-    return get_syncdaemon_tool().connect()
-
-
-def disconnect_file_sync():
-    """Disconnect the file sync service."""
-    return get_syncdaemon_tool().disconnect()
-
-
-def start_file_sync():
-    """Start the file sync service."""
-    return get_syncdaemon_tool().start()
-
-
-def stop_file_sync():
-    """Stop the file sync service."""
-    return get_syncdaemon_tool().quit()
-
-
-if sys.platform.startswith("linux"):
-    from ubuntuone.controlpanel.sd_client.linux \
-    import set_status_changed_handler
-else:
-
-    def set_status_changed_handler(handler):
+class SyncDaemonClient(object):
+    """An abstraction to SyncDaemonTool."""
+
+    def __init__(self):
+        """Get a proxy for the SyncDaemonTool."""
+        self.status_changed_handler = None
+        self.proxy = tools.SyncDaemonTool()
+
+    def get_throttling_limits(self):
+        """Get the speed limits from the syncdaemon."""
+        return self.proxy.get_throttling_limits()
+
+    def set_throttling_limits(self, limits):
+        """Set the speed limits on the syncdaemon."""
+        dload = int(limits["download"])
+        uload = int(limits["upload"])
+        return self.proxy.set_throttling_limits(dload, uload)
+
+    def bandwidth_throttling_enabled(self):
+        """Get the state of throttling in the syncdaemon."""
+        return self.proxy.is_throttling_enabled()
+
+    def enable_bandwidth_throttling(self):
+        """Enable the speed limits in the syncdaemon."""
+        return self.proxy.enable_throttling(True)
+
+    def disable_bandwidth_throttling(self):
+        """Disable the speed limits in the syncdaemon."""
+        return self.proxy.enable_throttling(False)
+
+    def autoconnect_enabled(self):
+        """Get the state of autoconnect in the syncdaemon."""
+        return self.proxy.is_autoconnect_enabled()
+
+    def enable_autoconnect(self):
+        """Enable autoconnect in the syncdaemon."""
+        return self.proxy.enable_autoconnect(True)
+
+    def disable_autoconnect(self):
+        """Disable autoconnect in the syncdaemon."""
+        return self.proxy.enable_autoconnect(False)
+
+    def show_all_notifications_enabled(self):
+        """Get the state of show_all_notifications in the syncdaemon."""
+        return self.proxy.is_show_all_notifications_enabled()
+
+    def enable_show_all_notifications(self):
+        """Enable show_all_notifications in the syncdaemon."""
+        return self.proxy.enable_show_all_notifications(True)
+
+    def disable_show_all_notifications(self):
+        """Disable show_all_notifications in the syncdaemon."""
+        return self.proxy.enable_show_all_notifications(False)
+
+    def share_autosubscribe_enabled(self):
+        """Get the state of share_autosubscribe in the syncdaemon."""
+        return self.proxy.is_share_autosubscribe_enabled()
+
+    def enable_share_autosubscribe(self):
+        """Enable share_autosubscribe in the syncdaemon."""
+        return self.proxy.enable_share_autosubscribe(True)
+
+    def disable_share_autosubscribe(self):
+        """Disable share_autosubscribe in the syncdaemon."""
+        return self.proxy.enable_share_autosubscribe(False)
+
+    def udf_autosubscribe_enabled(self):
+        """Get the state of udf_autosubscribe in the syncdaemon."""
+        return self.proxy.is_udf_autosubscribe_enabled()
+
+    def enable_udf_autosubscribe(self):
+        """Enable udf_autosubscribe in the syncdaemon."""
+        return self.proxy.enable_udf_autosubscribe(True)
+
+    def disable_udf_autosubscribe(self):
+        """Disable udf_autosubscribe in the syncdaemon."""
+        return self.proxy.enable_udf_autosubscribe(False)
+
+    def get_root_dir(self):
+        """Retrieve the root information from syncdaemon."""
+        return self.proxy.get_root_dir()
+
+    def get_shares_dir(self):
+        """Retrieve the shares information from syncdaemon."""
+        return self.proxy.get_shares_dir()
+
+    def get_shares_dir_link(self):
+        """Retrieve the shares information from syncdaemon."""
+        return self.proxy.get_shares_dir_link()
+
+    def get_folders(self):
+        """Retrieve the folders information from syncdaemon."""
+        return self.proxy.get_folders()
+
+    def create_folder(self, path):
+        """Create a new folder through syncdaemon."""
+        return self.proxy.create_folder(path)
+
+    def subscribe_folder(self, folder_id):
+        """Subscribe to 'folder_id'."""
+        return self.proxy.subscribe_folder(folder_id)
+
+    def unsubscribe_folder(self, folder_id):
+        """Unsubscribe 'folder_id'."""
+        return self.proxy.unsubscribe_folder(folder_id)
+
+    def get_shares(self):
+        """Retrieve the shares information from syncdaemon."""
+        return self.proxy.get_shares()
+
+    def subscribe_share(self, share_id):
+        """Subscribe to 'share_id'."""
+        return self.proxy.subscribe_share(share_id)
+
+    def unsubscribe_share(self, share_id):
+        """Unsubscribe 'share_id'."""
+        return self.proxy.unsubscribe_share(share_id)
+
+    def get_current_status(self):
+        """Retrieve the current status from syncdaemon."""
+        return self.proxy.get_status()
+
+    def file_sync_enabled(self):
+        """Get if file sync service is enabled."""
+        return self.proxy.is_files_sync_enabled()
+
+    def enable_file_sync(self):
+        """Enable the file sync service."""
+        return self.proxy.enable_files_sync(True)
+
+    def disable_file_sync(self):
+        """Enable the file sync service."""
+        return self.proxy.enable_files_sync(False)
+
+    def files_sync_enabled(self):
+        """Get if file sync service is enabled."""
+        warnings.warn('use file_sync_enabled instead', DeprecationWarning)
+        return self.file_sync_enabled()
+
+    def set_files_sync_enabled(self, enabled):
+        """Set the file sync service to be 'enabled'."""
+        warnings.warn('use {enable/disable}_file_sync instead',
+                      DeprecationWarning)
+        if enabled:
+            return self.enable_file_sync()
+        else:
+            return self.disable_file_sync()
+
+    def connect_file_sync(self):
+        """Connect the file sync service."""
+        return self.proxy.connect()
+
+    def disconnect_file_sync(self):
+        """Disconnect the file sync service."""
+        return self.proxy.disconnect()
+
+    def start_file_sync(self):
+        """Start the file sync service."""
+        return self.proxy.start()
+
+    def stop_file_sync(self):
+        """Stop the file sync service."""
+        return self.proxy.quit()
+
+    def set_status_changed_handler(self, handler):
         """Set the status handler function."""
-        return get_syncdaemon_tool().set_status_changed_handler(handler)
+        self.status_changed_handler = handler
+        if sys.platform.startswith("linux"):
+            # pylint: disable=W0404
+            from ubuntuone.controlpanel.sd_client import linux
+            result = linux.set_status_changed_handler(handler)
+        else:
+            result = self.proxy.set_status_changed_handler(handler)
+        return result

=== modified file 'ubuntuone/controlpanel/tests/test_backend.py'
--- ubuntuone/controlpanel/tests/test_backend.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/tests/test_backend.py	2011-08-25 19:40:18 +0000
@@ -66,18 +66,33 @@
 )
 
 
-# pylint: disable=E1101
-
-
-class MockWebClient(object):
+# pylint: disable=E1101, W0201, W0212
+
+
+class CallRecorder(object):
+    """A class that records every call clients made to it."""
+
+    def __init__(self):
+        self._called = defaultdict(int)
+
+    def __getattribute__(self, attr_name):
+        """Override to we can record calls to members."""
+        result = super(CallRecorder, self).__getattribute__(attr_name)
+        if attr_name != '_called':
+            called = super(CallRecorder, self).__getattribute__('_called')
+            called[attr_name] += 1
+        return result
+
+
+class MockWebClient(CallRecorder):
     """A mock webclient."""
 
-    failure = False
-    results = {}
-
     def __init__(self, get_credentials):
         """Initialize this mock instance."""
+        super(MockWebClient, self).__init__()
         self.get_credentials = get_credentials
+        self.failure = False
+        self.results = {}
 
     def call_api(self, method):
         """Get a given url from the webservice."""
@@ -90,42 +105,48 @@
             return defer.succeed(result)
 
 
-class MockLoginClient(object):
+class MockLoginClient(CallRecorder):
     """A mock login_client module."""
 
-    creds = TOKEN
+    def __init__(self):
+        """Initialize this mock instance."""
+        super(MockLoginClient, self).__init__()
+        self.creds = TOKEN
 
-    def get_credentials(self):
+    def find_credentials(self):
         """Return the mock credentials."""
         return defer.succeed(self.creds)
 
     def clear_credentials(self):
         """Clear the mock credentials."""
-        MockLoginClient.creds = None
+        self.creds = None
         return defer.succeed(None)
 
 
-class MockSDClient(object):
+class MockSDClient(CallRecorder):
     """A mock sd_client module."""
 
-    throttling = False
-    show_all_notifications = True
-    autoconnect = True
-    udf_autosubscribe = False
-    share_autosubscribe = False
-    limits = {"download": -1, "upload": -1}
-    file_sync = True
-    status = {
-        'name': 'TEST', 'queues': 'GORGEOUS', 'connection': '',
-        'description': 'Some test state, nothing else.',
-        'is_error': '', 'is_connected': 'True', 'is_online': '',
-    }
-    status_changed_handler = None
-    subscribed_folders = []
-    subscribed_shares = []
-    actions = []
-    shares = []
-    folders = []
+    def __init__(self):
+        """Initialize this mock instance."""
+        super(MockSDClient, self).__init__()
+        self.throttling = False
+        self.show_all_notifications = True
+        self.autoconnect = True
+        self.udf_autosubscribe = False
+        self.share_autosubscribe = False
+        self.limits = {"download": -1, "upload": -1}
+        self.file_sync = True
+        self.status = {
+            'name': 'TEST', 'queues': 'GORGEOUS', 'connection': '',
+            'description': 'Some test state, nothing else.',
+            'is_error': '', 'is_connected': 'True', 'is_online': '',
+        }
+        self.status_changed_handler = None
+        self.subscribed_folders = []
+        self.subscribed_shares = []
+        self.actions = []
+        self.shares = []
+        self.folders = []
 
     def get_throttling_limits(self):
         """Return the sample speed limits."""
@@ -198,27 +219,27 @@
 
     def files_sync_enabled(self):
         """Get if file sync service is enabled."""
-        return MockSDClient.file_sync
+        return self.file_sync
 
     def set_files_sync_enabled(self, enabled):
         """Set the file sync service to be 'enabled'."""
-        MockSDClient.file_sync = enabled
+        self.file_sync = enabled
 
     def connect_file_sync(self):
         """Connect files service."""
-        MockSDClient.actions.append('connect')
+        self.actions.append('connect')
 
     def disconnect_file_sync(self):
         """Disconnect file_sync service."""
-        MockSDClient.actions.append('disconnect')
+        self.actions.append('disconnect')
 
     def start_file_sync(self):
         """Start the file_sync service."""
-        MockSDClient.actions.append('start')
+        self.actions.append('start')
 
     def stop_file_sync(self):
         """Stop the file_sync service."""
-        MockSDClient.actions.append('stop')
+        self.actions.append('stop')
 
     def get_root_dir(self):
         """Grab the root dir."""
@@ -234,31 +255,31 @@
 
     def get_folders(self):
         """Grab list of folders."""
-        return MockSDClient.folders
+        return self.folders
 
     def subscribe_folder(self, volume_id):
         """Subcribe to 'volume_id'."""
-        MockSDClient.subscribed_folders.append(volume_id)
+        self.subscribed_folders.append(volume_id)
 
     def unsubscribe_folder(self, volume_id):
         """Unsubcribe from 'volume_id'."""
-        MockSDClient.subscribed_folders.remove(volume_id)
+        self.subscribed_folders.remove(volume_id)
 
     def create_folder(self, path):
         """Grab list of folders."""
-        MockSDClient.folders.append(path)
+        self.folders.append(path)
 
     def get_shares(self):
         """Grab list of shares."""
-        return MockSDClient.shares
+        return self.shares
 
     def subscribe_share(self, volume_id):
         """Subcribe to 'volume_id'."""
-        MockSDClient.subscribed_shares.append(volume_id)
+        self.subscribed_shares.append(volume_id)
 
     def unsubscribe_share(self, volume_id):
         """Unsubcribe from 'volume_id'."""
-        MockSDClient.subscribed_shares.remove(volume_id)
+        self.subscribed_shares.remove(volume_id)
 
     def get_current_status(self):
         """Grab syncdaemon status."""
@@ -273,7 +294,7 @@
         return SAMPLE_SHARED
 
 
-class MockReplicationClient(object):
+class MockReplicationClient(CallRecorder):
     """A mock replication_client module."""
 
     BOOKMARKS = 'awesome'
@@ -311,21 +332,22 @@
     def setUp(self):
         super(BackendBasicTestCase, self).setUp()
         self.patch(backend, "web_client_factory", MockWebClient)
-        self.patch(backend, "login_client", MockLoginClient())
-        self.patch(backend, "sd_client", MockSDClient())
+        self.patch(backend, "CredentialsManagementTool", MockLoginClient)
+        self.patch(backend.sd_client, "SyncDaemonClient", MockSDClient)
         self.patch(backend, "replication_client", MockReplicationClient())
+
         self.local_token = DEVICE_TYPE_COMPUTER + TOKEN["token"]
         self.be = backend.ControlBackend()
+        self.be.wc.failure = False
 
         self.memento = MementoHandler()
         backend.logger.addHandler(self.memento)
 
-        MockLoginClient.creds = TOKEN
-        MockWebClient.failure = None
-
     def test_backend_creation(self):
         """The backend instance is successfully created."""
-        self.assertEqual(self.be.wc.__class__, MockWebClient)
+        self.assertIsInstance(self.be.wc, MockWebClient)
+        self.assertIsInstance(self.be.login_client, MockLoginClient)
+        self.assertIsInstance(self.be.sd_client, MockSDClient)
 
     @inlineCallbacks
     def test_get_token(self):
@@ -361,6 +383,22 @@
         self.be.shutdown()
         # nothing explodes
 
+    @inlineCallbacks
+    def test_credentials_are_cached(self):
+        """The credentials are cached."""
+        creds1 = yield self.be.get_credentials()
+        creds2 = yield self.be.get_credentials()
+        self.assertEqual(creds1, creds2)
+        self.assertEqual(self.be.login_client._called['find_credentials'], 1)
+
+    def test_login_client_is_cached(self):
+        """The login_client instance is cached."""
+        self.assertIs(self.be.login_client, self.be.login_client)
+
+    def test_sd_client_is_cached(self):
+        """The sd_client instance is cached."""
+        self.assertIs(self.be.sd_client, self.be.sd_client)
+
 
 class BackendAccountTestCase(BackendBasicTestCase):
     """Account tests for the backend."""
@@ -384,16 +422,16 @@
     @inlineCallbacks
     def test_account_info_fails(self):
         """The account_info method exercises its errback."""
-        MockWebClient.failure = 404
+        self.be.wc.failure = 404
         yield self.assertFailure(self.be.account_info(),
                                  backend.WebClientError)
 
     @inlineCallbacks
     def test_account_info_fails_with_unauthorized(self):
         """The account_info clears the credentials on unauthorized."""
-        MockWebClient.failure = 401
+        self.be.wc.failure = 401
         d = defer.Deferred()
-        self.patch(backend.login_client, 'clear_credentials',
+        self.patch(self.be.login_client, 'clear_credentials',
                    lambda: d.callback('called'))
         yield self.assertFailure(self.be.account_info(),
                                  backend.UnauthorizedError)
@@ -423,7 +461,7 @@
     @inlineCallbacks
     def test_devices_info_with_webclient_error(self):
         """The devices_info returns local info if webclient error."""
-        MockWebClient.failure = 404
+        self.be.wc.failure = 404
         result = yield self.be.devices_info()
 
         self.assertEqual(result, [LOCAL_DEVICE])
@@ -433,9 +471,9 @@
     @inlineCallbacks
     def test_devices_info_fails_with_unauthorized(self):
         """The devices_info clears the credentials on unauthorized."""
-        MockWebClient.failure = 401
+        self.be.wc.failure = 401
         d = defer.Deferred()
-        self.patch(backend.login_client, 'clear_credentials',
+        self.patch(self.be.login_client, 'clear_credentials',
                    lambda: d.callback('called'))
         yield self.assertFailure(self.be.devices_info(),
                                  backend.UnauthorizedError)
@@ -446,13 +484,14 @@
         """The devices_info returns device only info if files is disabled."""
         yield self.be.disable_files()
         status = yield self.be.file_sync_status()
-        assert status['status'] == backend.FILE_SYNC_DISABLED, status
+        assert status['status'] == backend.FILE_SYNC_DISABLED
 
         self.be.wc.results[DEVICES_API] = SAMPLE_DEVICES_JSON
         result = yield self.be.devices_info()
 
-        expected = EXPECTED_DEVICES_INFO[:]
-        for device in expected:
+        expected = []
+        for device in EXPECTED_DEVICES_INFO:
+            device = device.copy()
             device.pop('limit_bandwidth', None)
             device.pop(backend.DOWNLOAD_KEY, None)
             device.pop(backend.UPLOAD_KEY, None)
@@ -461,6 +500,7 @@
             device.pop(backend.SHARE_AUTOSUBSCRIBE_KEY, None)
             device.pop(backend.UDF_AUTOSUBSCRIBE_KEY, None)
             device['configurable'] = False
+            expected.append(device)
         self.assertEqual(result, expected)
 
     @inlineCallbacks
@@ -506,7 +546,7 @@
     @inlineCallbacks
     def test_device_names_info_with_webclient_error(self):
         """The device_names_info returns local info if webclient error."""
-        MockWebClient.failure = 404
+        self.be.wc.failure = 404
         result = yield self.be.device_names_info()
 
         device = LOCAL_DEVICE.copy()
@@ -525,9 +565,9 @@
     @inlineCallbacks
     def test_device_names_info_fails_with_unauthorized(self):
         """The device_names_info clears the credentials on unauthorized."""
-        MockWebClient.failure = 401
+        self.be.wc.failure = 401
         d = defer.Deferred()
-        self.patch(backend.login_client, 'clear_credentials',
+        self.patch(self.be.login_client, 'clear_credentials',
                    lambda: d.callback('called'))
         yield self.assertFailure(self.be.device_names_info(),
                                  backend.UnauthorizedError)
@@ -565,7 +605,7 @@
         result = yield self.be.remove_device(device_id)
         self.assertEqual(result, device_id)
         # credentials were not cleared
-        self.assertEqual(MockLoginClient.creds, TOKEN)
+        self.assertEqual(self.be.login_client.creds, TOKEN)
 
     @inlineCallbacks
     def test_remove_device_clear_credentials_if_local_device(self):
@@ -574,21 +614,21 @@
         self.be.wc.results[apiurl] = SAMPLE_DEVICES_JSON
         yield self.be.remove_device(self.local_token)
         # credentials were cleared
-        self.assertEqual(MockLoginClient.creds, None)
+        self.assertEqual(self.be.login_client.creds, None)
 
     @inlineCallbacks
     def test_remove_device_fails(self):
         """The remove_device method fails as expected."""
-        MockWebClient.failure = 404
+        self.be.wc.failure = 404
         yield self.assertFailure(self.be.remove_device(self.local_token),
                                  backend.WebClientError)
 
     @inlineCallbacks
     def test_remove_device_fails_with_unauthorized(self):
         """The remove_device clears the credentials on unauthorized."""
-        MockWebClient.failure = 401
+        self.be.wc.failure = 401
         d = defer.Deferred()
-        self.patch(backend.login_client, 'clear_credentials',
+        self.patch(self.be.login_client, 'clear_credentials',
                    lambda: d.callback('called'))
         yield self.assertFailure(self.be.remove_device(self.local_token),
                                  backend.UnauthorizedError)
@@ -598,6 +638,8 @@
     def test_remove_device_does_not_log_device_id(self):
         """The remove_device does not log the device_id."""
         device_id = DEVICE_TYPE_COMPUTER + TOKEN['token']
+        apiurl = DEVICE_REMOVE_API % ('computer', TOKEN['token'])
+        self.be.wc.results[apiurl] = SAMPLE_DEVICES_JSON
         yield self.be.remove_device(device_id)
 
         device_id_logged = all(device_id not in r.getMessage()
@@ -607,57 +649,57 @@
     @inlineCallbacks
     def test_change_show_all_notifications(self):
         """The device settings are updated."""
-        backend.sd_client.show_all_notifications = False
+        self.be.sd_client.show_all_notifications = False
         yield self.be.change_device_settings(self.local_token,
                                     {backend.SHOW_ALL_NOTIFICATIONS_KEY: True})
-        self.assertEqual(backend.sd_client.show_all_notifications, True)
+        self.assertEqual(self.be.sd_client.show_all_notifications, True)
         yield self.be.change_device_settings(self.local_token,
                                    {backend.SHOW_ALL_NOTIFICATIONS_KEY: False})
-        self.assertEqual(backend.sd_client.show_all_notifications, False)
+        self.assertEqual(self.be.sd_client.show_all_notifications, False)
 
     @inlineCallbacks
     def test_change_limit_bandwidth(self):
         """The device settings are updated."""
-        backend.sd_client.throttling = False
+        self.be.sd_client.throttling = False
         yield self.be.change_device_settings(self.local_token,
                                         {backend.LIMIT_BW_KEY: True})
-        self.assertEqual(backend.sd_client.throttling, True)
+        self.assertEqual(self.be.sd_client.throttling, True)
         yield self.be.change_device_settings(self.local_token,
                                         {backend.LIMIT_BW_KEY: False})
-        self.assertEqual(backend.sd_client.throttling, False)
+        self.assertEqual(self.be.sd_client.throttling, False)
 
     @inlineCallbacks
     def test_change_upload_speed_limit(self):
         """The device settings are updated."""
-        backend.sd_client.limits = {"download": -1, "upload": -1}
+        self.be.sd_client.limits = {"download": -1, "upload": -1}
         yield self.be.change_device_settings(self.local_token,
                                         {backend.UPLOAD_KEY: 1111})
-        self.assertEqual(backend.sd_client.limits["upload"], 1111)
-        self.assertEqual(backend.sd_client.limits["download"], -1)
+        self.assertEqual(self.be.sd_client.limits["upload"], 1111)
+        self.assertEqual(self.be.sd_client.limits["download"], -1)
 
     @inlineCallbacks
     def test_change_download_speed_limit(self):
         """The device settings are updated."""
-        backend.sd_client.limits = {"download": -1, "upload": -1}
+        self.be.sd_client.limits = {"download": -1, "upload": -1}
         yield self.be.change_device_settings(self.local_token,
                                         {backend.DOWNLOAD_KEY: 99})
-        self.assertEqual(backend.sd_client.limits["upload"], -1)
-        self.assertEqual(backend.sd_client.limits["download"], 99)
+        self.assertEqual(self.be.sd_client.limits["upload"], -1)
+        self.assertEqual(self.be.sd_client.limits["download"], 99)
 
     @inlineCallbacks
     def test_changing_settings_for_wrong_id_has_no_effect(self):
         """If the id is wrong, no settings are changed."""
-        backend.sd_client.throttling = False
-        backend.sd_client.limits = {"download": -1, "upload": -1}
+        self.be.sd_client.throttling = False
+        self.be.sd_client.limits = {"download": -1, "upload": -1}
         new_settings = {
             backend.DOWNLOAD_KEY: 99,
             backend.UPLOAD_KEY: 99,
             backend.LIMIT_BW_KEY: True,
         }
         yield self.be.change_device_settings("wrong token!", new_settings)
-        self.assertEqual(backend.sd_client.throttling, False)
-        self.assertEqual(backend.sd_client.limits["upload"], -1)
-        self.assertEqual(backend.sd_client.limits["download"], -1)
+        self.assertEqual(self.be.sd_client.throttling, False)
+        self.assertEqual(self.be.sd_client.limits["upload"], -1)
+        self.assertEqual(self.be.sd_client.limits["download"], -1)
 
     @inlineCallbacks
     def test_changing_settings_does_not_log_device_id(self):
@@ -674,7 +716,6 @@
     """Volumes tests for the backend."""
 
     # Access to a protected member of a client class
-    # pylint: disable=W0212
 
     def setUp(self):
         super(BackendVolumesTestCase, self).setUp()
@@ -753,8 +794,8 @@
     @inlineCallbacks
     def test_volumes_info(self):
         """The volumes_info method exercises its callback."""
-        self.patch(MockSDClient, 'shares', SAMPLE_SHARES)
-        self.patch(MockSDClient, 'folders', SAMPLE_FOLDERS)
+        self.patch(self.be.sd_client, 'shares', SAMPLE_SHARES)
+        self.patch(self.be.sd_client, 'folders', SAMPLE_FOLDERS)
 
         expected = yield self.expected_volumes(SAMPLE_SHARES, SAMPLE_FOLDERS)
         result = yield self.be.volumes_info()
@@ -763,16 +804,14 @@
     @inlineCallbacks
     def test_volumes_info_without_storage_info(self):
         """The volumes_info method exercises its callback."""
-        self.patch(MockSDClient, 'shares', SAMPLE_SHARES)
-        self.patch(MockSDClient, 'folders', SAMPLE_FOLDERS)
+        self.patch(self.be.sd_client, 'shares', SAMPLE_SHARES)
+        self.patch(self.be.sd_client, 'folders', SAMPLE_FOLDERS)
 
         expected = yield self.expected_volumes(SAMPLE_SHARES, SAMPLE_FOLDERS,
                                                with_storage_info=False)
         result = yield self.be.volumes_info(with_storage_info=False)
         self.assertEqual(result, expected)
 
-    # pylint: disable=W0212
-
     def test_cached_volumes_are_initially_empty(self):
         """The cached volume list is empty."""
         self.assertEqual(self.be._volumes, {})
@@ -780,8 +819,8 @@
     @inlineCallbacks
     def test_volumes_are_cached(self):
         """The volume list is cached."""
-        self.patch(MockSDClient, 'shares', SAMPLE_SHARES)
-        self.patch(MockSDClient, 'folders', SAMPLE_FOLDERS)
+        self.patch(self.be.sd_client, 'shares', SAMPLE_SHARES)
+        self.patch(self.be.sd_client, 'folders', SAMPLE_FOLDERS)
 
         expected = {}
         info = yield self.expected_volumes(SAMPLE_SHARES, SAMPLE_FOLDERS)
@@ -832,8 +871,8 @@
              u'volume_id': u'7d130dfe-98b2-4bd5-8708-9eeba9838ac0'},
         ]
 
-        self.patch(MockSDClient, 'shares', read_only_shares)
-        self.patch(MockSDClient, 'folders', SAMPLE_FOLDERS)
+        self.patch(self.be.sd_client, 'shares', read_only_shares)
+        self.patch(self.be.sd_client, 'folders', SAMPLE_FOLDERS)
 
         expected = yield self.expected_volumes(read_only_shares,
                                                SAMPLE_FOLDERS)
@@ -843,9 +882,9 @@
     @inlineCallbacks
     def test_volumes_info_no_quota_for_root(self):
         """The volumes_info returns info even if quota call fails."""
-        MockWebClient.failure = 500
-        self.patch(MockSDClient, 'shares', SAMPLE_SHARES)
-        self.patch(MockSDClient, 'folders', SAMPLE_FOLDERS)
+        self.be.wc.failure = 500
+        self.patch(self.be.sd_client, 'shares', SAMPLE_SHARES)
+        self.patch(self.be.sd_client, 'folders', SAMPLE_FOLDERS)
 
         expected = yield self.expected_volumes(SAMPLE_SHARES, SAMPLE_FOLDERS)
         result = yield self.be.volumes_info()
@@ -860,9 +899,9 @@
         self.be._volumes[fid] = {u'type': self.be.FOLDER_TYPE}
 
         yield self.be.subscribe_volume(volume_id=fid)
-        self.addCleanup(lambda: MockSDClient.subscribed_folders.remove(fid))
+        self.addCleanup(self.be.sd_client.subscribed_folders.remove, fid)
 
-        self.assertEqual(MockSDClient.subscribed_folders, [fid])
+        self.assertEqual(self.be.sd_client.subscribed_folders, [fid])
 
     @inlineCallbacks
     def test_unsubscribe_volume_folder(self):
@@ -871,11 +910,11 @@
         self.be._volumes[fid] = {u'type': self.be.FOLDER_TYPE}
 
         yield self.be.subscribe_volume(volume_id=fid)
-        self.assertEqual(MockSDClient.subscribed_folders, [fid])
+        self.assertEqual(self.be.sd_client.subscribed_folders, [fid])
 
         yield self.be.unsubscribe_volume(volume_id=fid)
 
-        self.assertEqual(MockSDClient.subscribed_folders, [])
+        self.assertEqual(self.be.sd_client.subscribed_folders, [])
 
     @inlineCallbacks
     def test_subscribe_volume_share(self):
@@ -884,9 +923,9 @@
         self.be._volumes[sid] = {u'type': self.be.SHARE_TYPE}
 
         yield self.be.subscribe_volume(volume_id=sid)
-        self.addCleanup(lambda: MockSDClient.subscribed_shares.remove(sid))
+        self.addCleanup(self.be.sd_client.subscribed_shares.remove, sid)
 
-        self.assertEqual(MockSDClient.subscribed_shares, [sid])
+        self.assertEqual(self.be.sd_client.subscribed_shares, [sid])
 
     @inlineCallbacks
     def test_unsubscribe_volume_share(self):
@@ -895,11 +934,11 @@
         self.be._volumes[sid] = {u'type': self.be.SHARE_TYPE}
 
         yield self.be.subscribe_volume(volume_id=sid)
-        self.assertEqual(MockSDClient.subscribed_shares, [sid])
+        self.assertEqual(self.be.sd_client.subscribed_shares, [sid])
 
         yield self.be.unsubscribe_volume(volume_id=sid)
 
-        self.assertEqual(MockSDClient.subscribed_shares, [])
+        self.assertEqual(self.be.sd_client.subscribed_shares, [])
 
     @inlineCallbacks
     def test_change_volume_settings_folder(self):
@@ -908,10 +947,10 @@
         self.be._volumes[fid] = {u'type': self.be.FOLDER_TYPE}
 
         yield self.be.change_volume_settings(fid, {'subscribed': True})
-        self.assertEqual(MockSDClient.subscribed_folders, [fid])
+        self.assertEqual(self.be.sd_client.subscribed_folders, [fid])
 
         yield self.be.change_volume_settings(fid, {'subscribed': False})
-        self.assertEqual(MockSDClient.subscribed_folders, [])
+        self.assertEqual(self.be.sd_client.subscribed_folders, [])
 
     @inlineCallbacks
     def test_change_volume_settings_share(self):
@@ -920,17 +959,17 @@
         self.be._volumes[sid] = {u'type': self.be.SHARE_TYPE}
 
         yield self.be.change_volume_settings(sid, {'subscribed': True})
-        self.assertEqual(MockSDClient.subscribed_shares, [sid])
+        self.assertEqual(self.be.sd_client.subscribed_shares, [sid])
 
         yield self.be.change_volume_settings(sid, {'subscribed': False})
-        self.assertEqual(MockSDClient.subscribed_shares, [])
+        self.assertEqual(self.be.sd_client.subscribed_shares, [])
 
     @inlineCallbacks
     def test_change_volume_settings_no_setting(self):
         """The change volume settings does not fail on empty settings."""
         yield self.be.change_volume_settings('test', {})
-        self.assertEqual(MockSDClient.subscribed_folders, [])
-        self.assertEqual(MockSDClient.subscribed_shares, [])
+        self.assertEqual(self.be.sd_client.subscribed_folders, [])
+        self.assertEqual(self.be.sd_client.subscribed_shares, [])
 
     @inlineCallbacks
     def test_create_folder(self):
@@ -938,7 +977,7 @@
         folder_path = os.path.join(USER_HOME, 'Test Me')
         yield self.be.create_folder(folder_path=folder_path)
 
-        self.assertEqual(MockSDClient.folders, [folder_path])
+        self.assertEqual(self.be.sd_client.folders, [folder_path])
 
 
 class BackendValidatePathForFolderTestCase(BackendBasicTestCase):
@@ -950,9 +989,9 @@
         super(BackendValidatePathForFolderTestCase, self).setUp()
         old_home = os.environ['HOME']
         os.environ['HOME'] = USER_HOME
-        self.addCleanup(lambda: os.environ.__setitem__('HOME', old_home))
-        self.patch(MockSDClient, 'shares', SAMPLE_SHARES)
-        self.patch(MockSDClient, 'folders', SAMPLE_FOLDERS)
+        self.addCleanup(os.environ.__setitem__, 'HOME', old_home)
+        self.patch(self.be.sd_client, 'shares', SAMPLE_SHARES)
+        self.patch(self.be.sd_client, 'folders', SAMPLE_FOLDERS)
         self.patch(backend, 'is_link', lambda p: False)
 
     @defer.inlineCallbacks
@@ -1040,8 +1079,8 @@
 
     def _build_msg(self):
         """Build expected message regarding file sync status."""
-        return '%s (%s)' % (MockSDClient.status['description'],
-                            MockSDClient.status['name'])
+        return '%s (%s)' % (self.be.sd_client.status['description'],
+                            self.be.sd_client.status['name'])
 
     @inlineCallbacks
     def assert_correct_status(self, status, msg=None):
@@ -1054,14 +1093,14 @@
     @inlineCallbacks
     def test_disabled(self):
         """The syncdaemon status is processed and emitted."""
-        self.patch(MockSDClient, 'file_sync', False)
+        self.patch(self.be.sd_client, 'file_sync', False)
         yield self.assert_correct_status(FILE_SYNC_DISABLED, msg='')
         self.assertTrue(self.be.file_sync_disabled)
 
     @inlineCallbacks
     def test_error(self):
         """The syncdaemon status is processed and emitted."""
-        MockSDClient.status = {
+        self.be.sd_client.status = {
             'is_error': 'True',  # nothing else matters
             'is_online': '', 'is_connected': '',
             'name': 'AUTH_FAILED', 'connection': '', 'queues': '',
@@ -1074,7 +1113,7 @@
     @inlineCallbacks
     def test_starting_when_init_not_user(self):
         """The syncdaemon status is processed and emitted."""
-        MockSDClient.status = {
+        self.be.sd_client.status = {
             'is_error': '', 'is_online': '', 'is_connected': '',
             'connection': 'Not User With Network', 'queues': '',
             'name': 'INIT', 'description': 'something new',
@@ -1085,7 +1124,7 @@
     @inlineCallbacks
     def test_starting_when_init_with_user(self):
         """The syncdaemon status is processed and emitted."""
-        MockSDClient.status = {
+        self.be.sd_client.status = {
             'is_error': '', 'is_online': '', 'is_connected': '',
             'connection': 'With User With Network', 'queues': '',
             'name': 'INIT', 'description': 'something new',
@@ -1096,7 +1135,7 @@
     @inlineCallbacks
     def test_starting_when_local_rescan_not_user(self):
         """The syncdaemon status is processed and emitted."""
-        MockSDClient.status = {
+        self.be.sd_client.status = {
             'is_error': '', 'is_online': '', 'is_connected': '',
             'connection': 'Not User With Network', 'queues': '',
             'name': 'LOCAL_RESCAN', 'description': 'something new',
@@ -1107,7 +1146,7 @@
     @inlineCallbacks
     def test_starting_when_local_rescan_with_user(self):
         """The syncdaemon status is processed and emitted."""
-        MockSDClient.status = {
+        self.be.sd_client.status = {
             'is_error': '', 'is_online': '', 'is_connected': '',
             'connection': 'With User With Network', 'queues': '',
             'name': 'LOCAL_RESCAN', 'description': 'something new',
@@ -1118,7 +1157,7 @@
     @inlineCallbacks
     def test_starting_when_ready_with_user(self):
         """The syncdaemon status is processed and emitted."""
-        MockSDClient.status = {
+        self.be.sd_client.status = {
             'is_error': '', 'is_online': '', 'is_connected': '',
             'connection': 'With User With Network', 'queues': '',
             'name': 'READY', 'description': 'something nicer',
@@ -1129,7 +1168,7 @@
     @inlineCallbacks
     def test_disconnected(self):
         """The syncdaemon status is processed and emitted."""
-        MockSDClient.status = {
+        self.be.sd_client.status = {
             'is_error': '', 'is_online': '', 'is_connected': '',
             'queues': '', 'description': 'something new',
             'connection': 'Not User With Network',  # user didn't connect
@@ -1143,7 +1182,7 @@
     @inlineCallbacks
     def test_disconnected_when_waiting(self):
         """The syncdaemon status is processed and emitted."""
-        MockSDClient.status = {
+        self.be.sd_client.status = {
             'is_error': '', 'is_online': '', 'is_connected': '',
             'connection': 'With User With Network', 'queues': '',
             'name': 'WAITING', 'description': 'what a long wait!',
@@ -1156,7 +1195,7 @@
     @inlineCallbacks
     def test_syncing_if_online(self):
         """The syncdaemon status is processed and emitted."""
-        MockSDClient.status = {
+        self.be.sd_client.status = {
             'is_error': '', 'is_online': 'True', 'is_connected': 'True',
             'name': 'QUEUE_MANAGER', 'connection': '',
             'queues': 'WORKING_ON_CONTENT',  # anything but IDLE
@@ -1170,7 +1209,7 @@
     @inlineCallbacks
     def test_syncing_even_if_not_online(self):
         """The syncdaemon status is processed and emitted."""
-        MockSDClient.status = {
+        self.be.sd_client.status = {
             'is_error': '', 'is_online': '', 'is_connected': 'True',
             'name': 'CHECK_VERSION', 'connection': '',
             'queues': 'WORKING_ON_CONTENT',
@@ -1184,7 +1223,7 @@
     @inlineCallbacks
     def test_idle(self):
         """The syncdaemon status is processed and emitted."""
-        MockSDClient.status = {
+        self.be.sd_client.status = {
             'is_error': '', 'is_online': 'True', 'is_connected': 'True',
             'name': 'QUEUE_MANAGER', 'connection': '',
             'queues': 'IDLE',
@@ -1198,7 +1237,7 @@
     @inlineCallbacks
     def test_stopped(self):
         """The syncdaemon status is processed and emitted."""
-        MockSDClient.status = {
+        self.be.sd_client.status = {
             'is_error': '', 'is_online': '', 'is_connected': '',
             'name': 'SHUTDOWN', 'connection': '',
             'queues': 'IDLE',
@@ -1212,7 +1251,7 @@
     @inlineCallbacks
     def test_unknown(self):
         """The syncdaemon status is processed and emitted."""
-        MockSDClient.status = {
+        self.be.sd_client.status = status = {
             'is_error': '', 'is_online': '', 'is_connected': '',
             'name': '', 'connection': '', 'queues': '',
             'description': '',
@@ -1220,7 +1259,7 @@
         yield self.assert_correct_status(FILE_SYNC_UNKNOWN)
 
         has_warning = self.memento.check_warning('file_sync_status: unknown',
-                                                 repr(MockSDClient.status))
+                                                 repr(status))
         self.assertTrue(has_warning)
 
         # self.be.file_sync_disabled does not change
@@ -1231,10 +1270,8 @@
         self.be.status_changed_handler = self._set_called
         status = {'name': 'foo', 'description': 'bar', 'is_error': '',
                   'is_connected': '', 'is_online': '', 'queues': ''}
-        backend.sd_client.status_changed_handler(status)
+        self.be.sd_client.status_changed_handler(status)
 
-        # pylint: disable=W0212
-        # Access to a protected member _process_file_sync_status
         expected_status = self.be._process_file_sync_status(status)
         self.assertEqual(self._called, ((expected_status,), {}))
 
@@ -1259,7 +1296,7 @@
 
     def setUp(self):
         super(BackendFileSyncOpsTestCase, self).setUp()
-        MockSDClient.actions = []
+        self.be.sd_client.actions = []
 
     @inlineCallbacks
     def test_enable_files(self):
@@ -1267,7 +1304,7 @@
         yield self.be.disable_files()
 
         yield self.be.enable_files()
-        self.assertTrue(MockSDClient.file_sync)
+        self.assertTrue(self.be.sd_client.file_sync)
         self.assertFalse(self.be.file_sync_disabled)
 
     @inlineCallbacks
@@ -1276,7 +1313,7 @@
         yield self.be.enable_files()
 
         yield self.be.disable_files()
-        self.assertFalse(MockSDClient.file_sync)
+        self.assertFalse(self.be.sd_client.file_sync)
         self.assertTrue(self.be.file_sync_disabled)
 
     @inlineCallbacks
@@ -1284,7 +1321,7 @@
         """Connect files service."""
         yield self.be.connect_files()
 
-        self.assertEqual(MockSDClient.actions, ['connect'])
+        self.assertEqual(self.be.sd_client.actions, ['connect'])
         self.assertFalse(self.be.file_sync_disabled)
 
     @inlineCallbacks
@@ -1292,7 +1329,7 @@
         """Disconnect files service."""
         yield self.be.disconnect_files()
 
-        self.assertEqual(MockSDClient.actions, ['disconnect'])
+        self.assertEqual(self.be.sd_client.actions, ['disconnect'])
         self.assertFalse(self.be.file_sync_disabled)
 
     @inlineCallbacks
@@ -1300,7 +1337,7 @@
         """Restart the files service."""
         yield self.be.restart_files()
 
-        self.assertEqual(MockSDClient.actions, ['stop', 'start'])
+        self.assertEqual(self.be.sd_client.actions, ['stop', 'start'])
         self.assertFalse(self.be.file_sync_disabled)
 
     @inlineCallbacks
@@ -1308,7 +1345,7 @@
         """Start the files service."""
         yield self.be.start_files()
 
-        self.assertEqual(MockSDClient.actions, ['start'])
+        self.assertEqual(self.be.sd_client.actions, ['start'])
         self.assertFalse(self.be.file_sync_disabled)
 
     @inlineCallbacks
@@ -1316,7 +1353,7 @@
         """Stop the files service."""
         yield self.be.stop_files()
 
-        self.assertEqual(MockSDClient.actions, ['stop'])
+        self.assertEqual(self.be.sd_client.actions, ['stop'])
         self.assertFalse(self.be.file_sync_disabled)
 
 
@@ -1348,7 +1385,7 @@
         """The replication settings can be changed."""
         rid = '0123-4567'
         MockReplicationClient.replications.add(rid)
-        self.addCleanup(lambda: MockReplicationClient.replications.remove(rid))
+        self.addCleanup(MockReplicationClient.replications.remove, rid)
 
         yield self.be.change_replication_settings(rid, {'enabled': False})
         self.assertIn(rid, MockReplicationClient.exclusions)
@@ -1373,7 +1410,7 @@
         """The change replication settings does not fail on empty settings."""
         rid = '0123-4567'
         MockReplicationClient.replications.add(rid)
-        self.addCleanup(lambda: MockReplicationClient.replications.remove(rid))
+        self.addCleanup(MockReplicationClient.replications.remove, rid)
 
         prior = MockReplicationClient.exclusions.copy()
         yield self.be.change_replication_settings(rid, {})
@@ -1398,7 +1435,7 @@
         new_value = not self.default_settings[setting_name]
         yield self.be.change_file_sync_settings({setting_name: new_value})
 
-        self.assertEqual(getattr(backend.sd_client, setting_name), new_value)
+        self.assertEqual(getattr(self.be.sd_client, setting_name), new_value)
 
         actual = yield self.be.file_sync_settings_info()
         expected = self.default_settings.copy()
@@ -1408,17 +1445,17 @@
     @inlineCallbacks
     def test_file_sync_settings_info(self):
         """The settings_info method exercises its callback."""
-        backend.sd_client.limits = {"download": 1000, "upload": 100}
+        self.be.sd_client.limits = {"download": 1000, "upload": 100}
         expected = {
-            backend.AUTOCONNECT_KEY: backend.sd_client.autoconnect,
+            backend.AUTOCONNECT_KEY: self.be.sd_client.autoconnect,
             backend.SHOW_ALL_NOTIFICATIONS_KEY:
-                backend.sd_client.show_all_notifications,
+                self.be.sd_client.show_all_notifications,
             backend.SHARE_AUTOSUBSCRIBE_KEY:
-                backend.sd_client.share_autosubscribe,
+                self.be.sd_client.share_autosubscribe,
             backend.UDF_AUTOSUBSCRIBE_KEY:
-                backend.sd_client.udf_autosubscribe,
-            backend.DOWNLOAD_KEY: backend.sd_client.limits['download'],
-            backend.UPLOAD_KEY: backend.sd_client.limits['upload'],
+                self.be.sd_client.udf_autosubscribe,
+            backend.DOWNLOAD_KEY: self.be.sd_client.limits['download'],
+            backend.UPLOAD_KEY: self.be.sd_client.limits['upload'],
         }
         result = yield self.be.file_sync_settings_info()
         self.assertEqual(expected, result)
@@ -1453,8 +1490,8 @@
         setting_name = backend.DOWNLOAD_KEY
         yield self.be.change_file_sync_settings({setting_name: new_value})
 
-        self.assertEqual(backend.sd_client.throttling, True)
-        self.assertEqual(backend.sd_client.limits,
+        self.assertEqual(self.be.sd_client.throttling, True)
+        self.assertEqual(self.be.sd_client.limits,
                          {'download': new_value, 'upload': -1})
 
     @inlineCallbacks
@@ -1464,8 +1501,8 @@
         setting_name = backend.UPLOAD_KEY
         yield self.be.change_file_sync_settings({setting_name: new_value})
 
-        self.assertEqual(backend.sd_client.throttling, True)
-        self.assertEqual(backend.sd_client.limits,
+        self.assertEqual(self.be.sd_client.throttling, True)
+        self.assertEqual(self.be.sd_client.limits,
                          {'download': -1, 'upload': new_value})
 
     @inlineCallbacks
@@ -1486,8 +1523,8 @@
         setting_name = backend.UPLOAD_KEY
         yield self.be.change_file_sync_settings({setting_name: -1})
 
-        self.assertEqual(backend.sd_client.throttling, False)
-        self.assertEqual(backend.sd_client.limits,
+        self.assertEqual(self.be.sd_client.throttling, False)
+        self.assertEqual(self.be.sd_client.limits,
                          {'download': -1, 'upload': -1})
 
     @inlineCallbacks
@@ -1508,8 +1545,8 @@
         setting_name = backend.DOWNLOAD_KEY
         yield self.be.change_file_sync_settings({setting_name: -1})
 
-        self.assertEqual(backend.sd_client.throttling, False)
-        self.assertEqual(backend.sd_client.limits,
+        self.assertEqual(self.be.sd_client.throttling, False)
+        self.assertEqual(self.be.sd_client.limits,
                          {'download': -1, 'upload': -1})
 
     @inlineCallbacks
@@ -1528,12 +1565,12 @@
         # the call we want to test
         yield self.be.restore_file_sync_settings()
 
-        self.assertEqual(backend.sd_client.autoconnect, True)
-        self.assertEqual(backend.sd_client.show_all_notifications, True)
-        self.assertEqual(backend.sd_client.share_autosubscribe, False)
-        self.assertEqual(backend.sd_client.udf_autosubscribe, False)
-        self.assertEqual(backend.sd_client.throttling, False)
-        self.assertEqual(backend.sd_client.limits,
+        self.assertEqual(self.be.sd_client.autoconnect, True)
+        self.assertEqual(self.be.sd_client.show_all_notifications, True)
+        self.assertEqual(self.be.sd_client.share_autosubscribe, False)
+        self.assertEqual(self.be.sd_client.udf_autosubscribe, False)
+        self.assertEqual(self.be.sd_client.throttling, False)
+        self.assertEqual(self.be.sd_client.limits,
                          {'download': -1, 'upload': -1})
 
         result = yield self.be.file_sync_settings_info()

=== modified file 'ubuntuone/controlpanel/tests/test_login_client.py'
--- ubuntuone/controlpanel/tests/test_login_client.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/tests/test_login_client.py	2011-08-25 19:40:18 +0000
@@ -19,10 +19,6 @@
 """Tests for the service when accessing the login client."""
 
 from twisted.internet import defer
-# No name 'credentials' in module 'ubuntuone.platform'
-# pylint: disable=E0611
-from ubuntuone.platform import credentials
-# pylint: enable=E0611
 
 from ubuntuone.controlpanel import login_client
 from ubuntuone.controlpanel.tests import TestCase, TOKEN
@@ -49,13 +45,23 @@
         FakedCredentialsManagementTool.credentials = None
         yield
 
+    @defer.inlineCallbacks
+    def login(self):
+        """Create credentials for Ubuntu One by logging in."""
+        yield defer.succeed(FakedCredentialsManagementTool.credentials)
+
+    @defer.inlineCallbacks
+    def register(self):
+        """Create credentials for Ubuntu One by registering."""
+        yield defer.succeed(FakedCredentialsManagementTool.credentials)
+
 
 class BaseTestCase(TestCase):
     """Base TestCase for the login client methods."""
 
     def setUp(self):
         super(BaseTestCase, self).setUp()
-        self.patch(credentials, 'CredentialsManagementTool',
+        self.patch(login_client, 'CredentialsManagementTool',
                    FakedCredentialsManagementTool)
         FakedCredentialsManagementTool.credentials = TOKEN
 
@@ -87,7 +93,7 @@
 
     @defer.inlineCallbacks
     def test_clear_credentials(self):
-        """The credentials are properly retrieved."""
+        """The credentials are properly cleared."""
         yield login_client.clear_credentials()
         self.assertEqual(None, FakedCredentialsManagementTool.credentials)
 
@@ -98,3 +104,39 @@
                    self.fake_fail)
         yield self.assertFailure(login_client.clear_credentials(),
                                  CustomError)
+
+
+class LoginTestCase(BaseTestCase):
+    """Test for the login method."""
+
+    @defer.inlineCallbacks
+    def test_login(self):
+        """The credentials are properly retrieved."""
+        yield login_client.login()
+        self.assertEqual(TOKEN, FakedCredentialsManagementTool.credentials)
+
+    @defer.inlineCallbacks
+    def test_login_throws_an_error(self):
+        """If login fails, the error is propagated."""
+        self.patch(FakedCredentialsManagementTool, 'login',
+                   self.fake_fail)
+        yield self.assertFailure(login_client.login(),
+                                 CustomError)
+
+
+class RegisterTestCase(BaseTestCase):
+    """Test for the register method."""
+
+    @defer.inlineCallbacks
+    def test_register(self):
+        """The credentials are properly retrieved."""
+        yield login_client.register()
+        self.assertEqual(TOKEN, FakedCredentialsManagementTool.credentials)
+
+    @defer.inlineCallbacks
+    def test_register_throws_an_error(self):
+        """If register fails, the error is propagated."""
+        self.patch(FakedCredentialsManagementTool, 'register',
+                   self.fake_fail)
+        yield self.assertFailure(login_client.register(),
+                                 CustomError)

=== modified file 'ubuntuone/controlpanel/tests/test_sd_client.py'
--- ubuntuone/controlpanel/tests/test_sd_client.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/tests/test_sd_client.py	2011-08-25 19:40:18 +0000
@@ -149,7 +149,7 @@
     @inlineCallbacks
     def get_shares(self):
         """Get the list of shares (accepted or not)."""
-        result = yield FakedSyncDaemonTool.shares.values()
+        result = yield self.shares.values()
         returnValue(sorted(result))
 
     def refresh_shares(self):
@@ -169,38 +169,38 @@
         if path == '':  # simulate an error
             raise CustomError(path)
 
-        folder = FakedSyncDaemonTool.create_udf(path)
+        folder = self.create_udf(path)
         return folder
 
     def delete_folder(self, folder_id):
         """Delete a user defined folder given its id."""
-        if folder_id not in FakedSyncDaemonTool.folders:
+        if folder_id not in self.folders:
             raise CustomError(folder_id)
 
-        folder = FakedSyncDaemonTool.folders.pop(folder_id)
+        folder = self.folders.pop(folder_id)
         return folder
 
     @inlineCallbacks
     def subscribe_folder(self, folder_id):
         """Subscribe to a user defined folder given its id."""
-        yield FakedSyncDaemonTool._set_folder_attr(folder_id,
+        yield self._set_folder_attr(folder_id,
                                                    u'subscribed', True)
 
     @inlineCallbacks
     def unsubscribe_folder(self, folder_id):
         """Unsubscribe from a user defined folder given its id."""
-        yield FakedSyncDaemonTool._set_folder_attr(folder_id,
+        yield self._set_folder_attr(folder_id,
                                                    u'subscribed', False)
 
     @inlineCallbacks
     def get_folders(self):
         """Return the list of folders (a list of dicts)."""
-        result = yield FakedSyncDaemonTool.folders.values()
+        result = yield self.folders.values()
         returnValue(sorted(result))
 
     def get_folder_info(self, path):
         """Call the get_info method for a UDF path."""
-        for _, content in FakedSyncDaemonTool.folders.iteritems():
+        for _, content in self.folders.iteritems():
             if content['path'] == path:
                 return content
         else:
@@ -322,9 +322,10 @@
     def setUp(self):
         super(BaseTestCase, self).setUp()
         self.patch(tools, 'SyncDaemonTool', FakedSyncDaemonTool)
-        FakedSyncDaemonTool.shares.clear()
-        FakedSyncDaemonTool.folders.clear()
-        FakedSyncDaemonTool.called.clear()
+        self.sd = sd_client.SyncDaemonClient()
+        self.sd.proxy.shares.clear()
+        self.sd.proxy.folders.clear()
+        self.sd.proxy.called.clear()
 
     def fake_fail(self, *a):
         """Fake a failure."""
@@ -337,79 +338,79 @@
     @inlineCallbacks
     def test_throttle_limits_returned(self):
         """When SD returns the limits, they are handled."""
-        limits = yield sd_client.get_throttling_limits()
-        self.assertEqual(limits, FakedSyncDaemonTool.settings['limits'])
+        limits = yield self.sd.get_throttling_limits()
+        self.assertEqual(limits, self.sd.proxy.settings['limits'])
 
     @inlineCallbacks
     def test_getting_throttle_limits_throws_an_error(self):
         """Handle error when getting the limits."""
-        self.patch(FakedSyncDaemonTool, 'get_throttling_limits',
+        self.patch(self.sd.proxy, 'get_throttling_limits',
                    self.fake_fail)
-        yield self.assertFailure(sd_client.get_throttling_limits(),
+        yield self.assertFailure(self.sd.get_throttling_limits(),
                                  CustomError)
 
     @inlineCallbacks
     def test_throttle_limits_set(self):
         """Setting the limits."""
-        yield sd_client.set_throttling_limits(SAMPLE_LIMITS)
-        actual = sd_client.get_throttling_limits()
+        yield self.sd.set_throttling_limits(SAMPLE_LIMITS)
+        actual = self.sd.get_throttling_limits()
         self.assertEqual(actual, SAMPLE_LIMITS)
 
     @inlineCallbacks
     def test_setting_throttle_limits_throws_an_error(self):
         """Handle error when setting the limits."""
-        self.patch(FakedSyncDaemonTool, 'set_throttling_limits',
+        self.patch(self.sd.proxy, 'set_throttling_limits',
                    self.fake_fail)
-        d = sd_client.set_throttling_limits(SAMPLE_LIMITS)
+        d = self.sd.set_throttling_limits(SAMPLE_LIMITS)
         yield self.assertFailure(d, CustomError)
 
     @inlineCallbacks
     def test_throttle_get(self):
         """Getting the throttling state."""
-        FakedSyncDaemonTool.settings['throttling_enabled'] = False
-        throttling = yield sd_client.bandwidth_throttling_enabled()
+        self.sd.proxy.settings['throttling_enabled'] = False
+        throttling = yield self.sd.bandwidth_throttling_enabled()
         self.assertEqual(throttling, False)
 
-        FakedSyncDaemonTool.settings['throttling_enabled'] = True
-        throttling = yield sd_client.bandwidth_throttling_enabled()
+        self.sd.proxy.settings['throttling_enabled'] = True
+        throttling = yield self.sd.bandwidth_throttling_enabled()
         self.assertEqual(throttling, True)
 
     @inlineCallbacks
     def test_throttle_get_throws_an_error(self):
         """Handle error when getting the throttling state."""
-        self.patch(FakedSyncDaemonTool, 'is_throttling_enabled',
+        self.patch(self.sd.proxy, 'is_throttling_enabled',
                    self.fake_fail)
-        yield self.assertFailure(sd_client.bandwidth_throttling_enabled(),
+        yield self.assertFailure(self.sd.bandwidth_throttling_enabled(),
                                  CustomError)
 
     @inlineCallbacks
     def test_throttle_enable(self):
         """Enabling bw throttling."""
-        FakedSyncDaemonTool.settings['throttling_enabled'] = False
-        yield sd_client.enable_bandwidth_throttling()
-        self.assertTrue(FakedSyncDaemonTool.settings['throttling_enabled'])
+        self.sd.proxy.settings['throttling_enabled'] = False
+        yield self.sd.enable_bandwidth_throttling()
+        self.assertTrue(self.sd.proxy.settings['throttling_enabled'])
 
     @inlineCallbacks
     def test_throttle_enable_throws_an_error(self):
         """Handle error when enabling throttling."""
-        self.patch(FakedSyncDaemonTool, 'enable_throttling',
+        self.patch(self.sd.proxy, 'enable_throttling',
                    self.fake_fail)
-        yield self.assertFailure(sd_client.enable_bandwidth_throttling(),
+        yield self.assertFailure(self.sd.enable_bandwidth_throttling(),
                                  CustomError)
 
     @inlineCallbacks
     def test_throttle_disable(self):
         """Disabling bw throttling."""
-        FakedSyncDaemonTool.settings['throttling_enabled'] = True
-        yield sd_client.disable_bandwidth_throttling()
-        self.assertFalse(FakedSyncDaemonTool.settings['throttling_enabled'])
+        self.sd.proxy.settings['throttling_enabled'] = True
+        yield self.sd.disable_bandwidth_throttling()
+        self.assertFalse(self.sd.proxy.settings['throttling_enabled'])
 
     @inlineCallbacks
     def test_throttle_disable_throws_an_error(self):
         """Handle error when disabling throttling."""
-        self.patch(FakedSyncDaemonTool, 'enable_throttling',
+        self.patch(self.sd.proxy, 'enable_throttling',
                    self.fake_fail)
-        yield self.assertFailure(sd_client.disable_bandwidth_throttling(),
+        yield self.assertFailure(self.sd.disable_bandwidth_throttling(),
                                  CustomError)
 
 
@@ -420,53 +421,56 @@
     # pylint: disable=E1120
 
     name = 'show_all_notifications'
-    getter = lambda _: sd_client.show_all_notifications_enabled()
-    enabler = lambda _: sd_client.enable_show_all_notifications()
-    disabler = lambda _: sd_client.disable_show_all_notifications()
+
+    def setUp(self):
+        super(NotificationsTestCase, self).setUp()
+        self.getter = getattr(self.sd, '%s_enabled' % self.name)
+        self.enabler = getattr(self.sd, 'enable_%s' % self.name)
+        self.disabler = getattr(self.sd, 'disable_%s' % self.name)
 
     @inlineCallbacks
     def test_get_value(self):
         """Getting the show_all_notifications state."""
-        FakedSyncDaemonTool.settings[self.name] = False
+        self.sd.proxy.settings[self.name] = False
         state = yield self.getter()
         self.assertEqual(state, False)
-        FakedSyncDaemonTool.settings[self.name] = True
+        self.sd.proxy.settings[self.name] = True
         state = yield self.getter()
         self.assertEqual(state, True)
 
     @inlineCallbacks
     def test_get_value_throws_an_error(self):
         """Handle error when getting the show_all_notifications state."""
-        self.patch(FakedSyncDaemonTool, 'is_%s_enabled' % self.name,
+        self.patch(self.sd.proxy, 'is_%s_enabled' % self.name,
                    self.fake_fail)
         yield self.assertFailure(self.getter(), CustomError)
 
     @inlineCallbacks
     def test_enable(self):
         """Enabling show_all_notifications."""
-        FakedSyncDaemonTool.settings[self.name] = False
+        self.sd.proxy.settings[self.name] = False
         yield self.enabler()
-        self.assertTrue(FakedSyncDaemonTool.settings[self.name])
+        self.assertTrue(self.sd.proxy.settings[self.name])
 
     @inlineCallbacks
     def test_enable_throws_an_error(self):
         """Handle error when enabling show_all_notifications."""
-        self.patch(FakedSyncDaemonTool, 'enable_%s' % self.name,
+        self.patch(self.sd.proxy, 'enable_%s' % self.name,
                    self.fake_fail)
         yield self.assertFailure(self.enabler(), CustomError)
 
     @inlineCallbacks
     def test_disable(self):
         """Disabling show_all_notifications."""
-        FakedSyncDaemonTool.settings[self.name] = True
+        self.sd.proxy.settings[self.name] = True
         yield self.disabler()
-        value = FakedSyncDaemonTool.settings[self.name]
+        value = self.sd.proxy.settings[self.name]
         self.assertFalse(value)
 
     @inlineCallbacks
     def test_disable_throws_an_error(self):
         """Handle error when disabling show_all_notifications."""
-        self.patch(FakedSyncDaemonTool, 'enable_%s' % self.name,
+        self.patch(self.sd.proxy, 'enable_%s' % self.name,
                    self.fake_fail)
         yield self.assertFailure(self.disabler(), CustomError)
 
@@ -475,27 +479,18 @@
     """Test for the autoconnect syncdaemon client methods."""
 
     name = 'autoconnect'
-    getter = lambda _: sd_client.autoconnect_enabled()
-    enabler = lambda _: sd_client.enable_autoconnect()
-    disabler = lambda _: sd_client.disable_autoconnect()
 
 
 class ShareAutosubscribeTestCase(NotificationsTestCase):
     """Test for the share_autosubscribe syncdaemon client methods."""
 
     name = 'share_autosubscribe'
-    getter = lambda _: sd_client.share_autosubscribe_enabled()
-    enabler = lambda _: sd_client.enable_share_autosubscribe()