Merge lp:~nataliabidart/ubuntuone-control-panel/unify-account-and-service into lp:ubuntuone-control-panel

[Natalia Bidart]

- Unified Services and Profile tab into an Account tab (LP: #813099).

[Roberto Alsina (ralsina)]

Looks great!

review: Approve

=== added file 'data/qt/account.ui'
--- data/qt/account.ui	1970-01-01 00:00:00 +0000
+++ data/qt/account.ui	2011-07-21 20:09:30 +0000
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QWidget" name="Form">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>321</width>
+    <height>205</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="margin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QGroupBox" name="horizontalGroupBox">
+     <property name="title">
+      <string>Personal details</string>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <item>
+       <layout class="QVBoxLayout" name="verticalLayout_2">
+        <item>
+         <widget class="QLabel" name="name_label">
+          <property name="text">
+           <string/>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="email_label">
+          <property name="text">
+           <string/>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <spacer name="horizontalSpacer_3">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="GoToWebButton" name="edit_profile_button">
+        <property name="text">
+         <string>Edit personal details online</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer name="horizontalSpacer_4">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="horizontalGroupBox_2">
+     <property name="title">
+      <string>Your services</string>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout_2">
+      <item>
+       <widget class="QLabel" name="services_description_label">
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="GoToWebButton" name="edit_services_button">
+        <property name="text">
+         <string>Edit your services  online</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer name="horizontalSpacer_2">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>GoToWebButton</class>
+   <extends>QPushButton</extends>
+   <header>ubuntuone.controlpanel.gui.qt.gotoweb</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

=== modified file 'data/qt/controlpanel.ui'
--- data/qt/controlpanel.ui	2011-07-20 16:31:52 +0000
+++ data/qt/controlpanel.ui	2011-07-21 20:09:30 +0000
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>536</width>
-    <height>284</height>
+    <height>389</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -279,11 +279,6 @@
        <string>Folders</string>
       </attribute>
      </widget>
-     <widget class="ServicesPanel" name="services_tab">
-      <attribute name="title">
-       <string>Services</string>
-      </attribute>
-     </widget>
      <widget class="DevicesPanel" name="devices_tab">
       <attribute name="title">
        <string>Devices</string>
@@ -294,7 +289,7 @@
        <string>Preferences</string>
       </attribute>
      </widget>
-     <widget class="ProfilePanel" name="profile_tab">
+     <widget class="AccountPanel" name="account_tab">
       <attribute name="title">
        <string>Account information</string>
       </attribute>
@@ -328,10 +323,10 @@
          <number>5</number>
         </property>
         <property name="leftMargin">
-         <number>0</number>
+         <number>3</number>
         </property>
         <property name="rightMargin">
-         <number>0</number>
+         <number>3</number>
         </property>
         <item>
          <widget class="GoToWebButton" name="help_button">
@@ -426,12 +421,6 @@
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>ServicesPanel</class>
-   <extends>QWidget</extends>
-   <header>ubuntuone.controlpanel.gui.qt.services</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
    <class>DevicesPanel</class>
    <extends>QWidget</extends>
    <header>ubuntuone.controlpanel.gui.qt.devices</header>
@@ -444,12 +433,6 @@
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>ProfilePanel</class>
-   <extends>QWidget</extends>
-   <header>ubuntuone.controlpanel.gui.qt.profile</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
    <class>FileSyncStatus</class>
    <extends>QWidget</extends>
    <header>ubuntuone.controlpanel.gui.qt.filesyncstatus</header>
@@ -460,6 +443,12 @@
    <extends>QPushButton</extends>
    <header>ubuntuone.controlpanel.gui.qt.gotoweb</header>
   </customwidget>
+  <customwidget>
+   <class>AccountPanel</class>
+   <extends>QWidget</extends>
+   <header>ubuntuone.controlpanel.gui.qt.account</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>tab_widget</tabstop>

=== removed file 'data/qt/profile.ui'
--- data/qt/profile.ui	2011-07-11 11:19:09 +0000
+++ data/qt/profile.ui	1970-01-01 00:00:00 +0000
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Form</class>
- <widget class="QWidget" name="Form">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>456</width>
-    <height>189</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string notr="true">Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QGroupBox" name="groupBox">
-     <property name="title">
-      <string>Profile</string>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout">
-      <item>
-       <layout class="QFormLayout" name="formLayout">
-        <property name="fieldGrowthPolicy">
-         <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
-        </property>
-        <item row="0" column="1">
-         <widget class="QLineEdit" name="fullname_lineedit">
-          <property name="text">
-           <string/>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="0">
-         <widget class="QLabel" name="email_label">
-          <property name="text">
-           <string>Email</string>
-          </property>
-          <property name="buddy">
-           <cstring>email_lineedit</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="1">
-         <widget class="QLineEdit" name="email_lineedit">
-          <property name="text">
-           <string/>
-          </property>
-          <property name="placeholderText">
-           <string/>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="0">
-         <widget class="QLabel" name="password_label">
-          <property name="text">
-           <string>Password</string>
-          </property>
-          <property name="buddy">
-           <cstring>password_lineedit</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="1">
-         <widget class="QLineEdit" name="password_lineedit">
-          <property name="text">
-           <string/>
-          </property>
-          <property name="echoMode">
-           <enum>QLineEdit::PasswordEchoOnEdit</enum>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="0">
-         <widget class="QLabel" name="fullname_label">
-          <property name="text">
-           <string>Full name</string>
-          </property>
-          <property name="buddy">
-           <cstring>fullname_lineedit</cstring>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <spacer name="horizontalSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::Expanding</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="QPushButton" name="edit_profile_button">
-        <property name="text">
-         <string>Go to web to edit your profile</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-  </layout>
- </widget>
- <tabstops>
-  <tabstop>fullname_lineedit</tabstop>
-  <tabstop>email_lineedit</tabstop>
-  <tabstop>password_lineedit</tabstop>
-  <tabstop>edit_profile_button</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>

=== removed file 'data/qt/services.ui'
--- data/qt/services.ui	2011-07-11 11:19:09 +0000
+++ data/qt/services.ui	1970-01-01 00:00:00 +0000
@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Form</class>
- <widget class="QWidget" name="Form">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>341</width>
-    <height>248</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string notr="true">Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <layout class="QVBoxLayout" name="mobile_plan_verticallayout">
-     <item>
-      <layout class="QHBoxLayout" name="horizontalLayout">
-       <item>
-        <widget class="QLabel" name="mobile_plan_title_label">
-         <property name="text">
-          <string notr="true"/>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="horizontalSpacer">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="QLabel" name="mobile_plan_trial_label">
-         <property name="text">
-          <string notr="true"/>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <widget class="Line" name="mobile_plan_horizontal_line">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="mobile_plan_billing_label">
-       <property name="text">
-        <string notr="true"/>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_2">
-       <item>
-        <spacer name="horizontalSpacer_2">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="QPushButton" name="mobile_plan_modify_button">
-         <property name="text">
-          <string>Go to the web to modify your plan</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="horizontalSpacer_3">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QVBoxLayout" name="storage_plan_verticallayout">
-     <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_3">
-       <item>
-        <widget class="QLabel" name="storage_plan_total_label">
-         <property name="text">
-          <string notr="true"/>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="horizontalSpacer_4">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="QLabel" name="storage_plan_usage_label">
-         <property name="text">
-          <string notr="true"/>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <widget class="Line" name="storage_plan_horizontalline">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="storage_plan_label">
-       <property name="text">
-        <string notr="true"/>
-       </property>
-       <property name="textFormat">
-        <enum>Qt::PlainText</enum>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_4">
-       <item>
-        <spacer name="horizontalSpacer_5">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="QPushButton" name="storage_plan_modify_button">
-         <property name="text">
-          <string>Go to the web to update your storage</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="horizontalSpacer_6">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <spacer name="verticalSpacer_2">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>

=== removed file 'data/qt/ubuntuonebin.ui'
--- data/qt/ubuntuonebin.ui	2011-07-11 11:19:09 +0000
+++ data/qt/ubuntuonebin.ui	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Form</class>
- <widget class="QWidget" name="Form">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>248</width>
-    <height>59</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string notr="true">Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QLabel" name="title_label">
-       <property name="text">
-        <string notr="true">The Panel Title</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QWidget" name="container" native="true"/>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>

=== renamed file 'ubuntuone/controlpanel/gui/qt/profile.py' => 'ubuntuone/controlpanel/gui/qt/account.py'
--- ubuntuone/controlpanel/gui/qt/profile.py	2011-06-21 22:46:08 +0000
+++ ubuntuone/controlpanel/gui/qt/account.py	2011-07-21 20:09:30 +0000
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 # Authors: Alejandro J. Cura <[e-mail]>
+#          Natalia B. Bidart <[e-mail]>
 #
 # Copyright 2011 Canonical Ltd.
 #
@@ -18,26 +19,29 @@
 
 """The user interface for the control panel for Ubuntu One."""
 
-# Unused import QtGui
-# pylint: disable=W0611
-from PyQt4 import QtGui, QtCore
-# pylint: enable=W0611
 from twisted.internet import defer
 
 from ubuntuone.controlpanel.logger import setup_logging, log_call
-from ubuntuone.controlpanel.gui import EDIT_PROFILE_LINK
-from ubuntuone.controlpanel.gui.qt import uri_hook
+from ubuntuone.controlpanel.gui import (
+    EDIT_ACCOUNT_LINK,
+    EDIT_PROFILE_LINK,
+)
 from ubuntuone.controlpanel.gui.qt.ubuntuonebin import UbuntuOneBin
-from ubuntuone.controlpanel.gui.qt.ui import profile_ui
-
-
-logger = setup_logging('qt.profile')
-
-
-class ProfilePanel(UbuntuOneBin):
-    """The Profile Tab Panel widget"""
-
-    ui_class = profile_ui
+from ubuntuone.controlpanel.gui.qt.ui import account_ui
+
+
+logger = setup_logging('qt.account')
+
+
+class AccountPanel(UbuntuOneBin):
+    """The Account Tab Panel widget"""
+
+    ui_class = account_ui
+
+    def _setup(self):
+        """Do some extra setupping for the UI."""
+        self.ui.edit_profile_button.uri = EDIT_PROFILE_LINK
+        self.ui.edit_services_button.uri = EDIT_ACCOUNT_LINK
 
     @defer.inlineCallbacks
     def load(self):
@@ -49,13 +53,8 @@
     @log_call(logger.debug)
     def process_info(self, info):
         """Process and display the account info."""
-        self.ui.fullname_lineedit.setText(info["name"])
-        self.ui.email_lineedit.setText(info["email"])
-        self.ui.password_lineedit.setText("swordfish")
+        self.ui.name_label.setText(info["name"])
+        self.ui.email_label.setText(info["email"])
+        self.ui.services_description_label.setText(info["type"])
 
         self.is_processing = False
-
-    @QtCore.pyqtSlot()
-    def on_edit_profile_button_clicked(self):
-        """The edit profile button was clicked."""
-        uri_hook(EDIT_PROFILE_LINK)

=== removed file 'ubuntuone/controlpanel/gui/qt/services.py'
--- ubuntuone/controlpanel/gui/qt/services.py	2011-06-21 22:46:08 +0000
+++ ubuntuone/controlpanel/gui/qt/services.py	1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Authors: Alejandro J. Cura <[e-mail]>
-#
-# Copyright 2011 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-"""The user interface for the control panel for Ubuntu One."""
-
-from gettext import gettext as _
-from twisted.internet import defer
-
-# Unused import QtGui
-# pylint: disable=W0611
-from PyQt4 import QtGui, QtCore
-# pylint: enable=W0611
-
-from ubuntuone.controlpanel.logger import setup_logging, log_call
-from ubuntuone.controlpanel.gui import EDIT_ACCOUNT_LINK
-from ubuntuone.controlpanel.gui.qt import uri_hook
-from ubuntuone.controlpanel.gui.qt.ubuntuonebin import UbuntuOneBin
-from ubuntuone.controlpanel.gui.qt.ui import services_ui
-
-
-logger = setup_logging('qt.services')
-
-
-class ServicesPanel(UbuntuOneBin):
-    """The ServicesFolders Tab Panel widget"""
-
-    title = _('Selected plans and storage')
-    ui_class = services_ui
-
-    @defer.inlineCallbacks
-    def load(self):
-        """Load info."""
-        self.is_processing = True
-        info = yield self.backend.account_info()
-        self.process_info(info)
-
-    @log_call(logger.debug)
-    def process_info(self, info):
-        """Process and display the account info."""
-        self.ui.storage_plan_label.setText(info["type"])
-        self.is_processing = False
-
-    @QtCore.pyqtSlot()
-    def on_mobile_plan_modify_button_clicked(self):
-        """The mobile plan modify button was clicked."""
-        uri_hook(EDIT_ACCOUNT_LINK)
-
-    @QtCore.pyqtSlot()
-    def on_storage_plan_modify_button_clicked(self):
-        """The storage plan modify button was clicked."""
-        uri_hook(EDIT_ACCOUNT_LINK)

=== renamed file 'ubuntuone/controlpanel/gui/qt/tests/test_profile.py' => 'ubuntuone/controlpanel/gui/qt/tests/test_account.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_profile.py	2011-07-11 11:19:09 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_account.py	2011-07-21 20:09:30 +0000
@@ -16,29 +16,30 @@
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Tests for the profile tab."""
+"""Tests for the account tab."""
 
 from twisted.internet import defer
 
-from ubuntuone.controlpanel.gui.qt import profile as gui
+from ubuntuone.controlpanel.gui import qt
+from ubuntuone.controlpanel.gui.qt import account as gui
 from ubuntuone.controlpanel.gui.qt.tests import (
-    SAMPLE_ACCOUNT_INFO, SAMPLE_EMAIL, SAMPLE_NAME,
+    SAMPLE_ACCOUNT_INFO, SAMPLE_EMAIL, SAMPLE_NAME, SAMPLE_PLAN,
 )
 from ubuntuone.controlpanel.gui.qt.tests.test_ubuntuonebin import (
     UbuntuOneBinTestCase,
 )
 
 
-class ProfilePanelTestCase(UbuntuOneBinTestCase):
+class AccountPanelTestCase(UbuntuOneBinTestCase):
     """Test the qt control panel."""
 
-    innerclass_ui = gui.profile_ui
+    innerclass_ui = gui.account_ui
     innerclass_name = "Ui_Form"
-    class_ui = gui.ProfilePanel
+    class_ui = gui.AccountPanel
 
     @defer.inlineCallbacks
     def setUp(self):
-        yield super(ProfilePanelTestCase, self).setUp()
+        yield super(AccountPanelTestCase, self).setUp()
         self.ui.backend.next_result = SAMPLE_ACCOUNT_INFO
 
     def test_is_processing_while_asking_info(self):
@@ -67,13 +68,21 @@
     def test_process_info(self):
         """The info is processed when ready."""
         self.ui.process_info(SAMPLE_ACCOUNT_INFO)
-        self.assertEqual(self.ui.ui.fullname_lineedit.text(), SAMPLE_NAME)
-        self.assertEqual(self.ui.ui.email_lineedit.text(), SAMPLE_EMAIL)
-        self.assertEqual(self.ui.ui.password_lineedit.text(), "swordfish")
+        self.assertEqual(self.ui.ui.name_label.text(), SAMPLE_NAME)
+        self.assertEqual(self.ui.ui.email_label.text(), SAMPLE_EMAIL)
+        self.assertEqual(self.ui.ui.services_description_label.text(),
+                         SAMPLE_PLAN)
 
-    def test_edit_profile_button(self):
-        """When clicking the edit profile button, the proper url is opened."""
-        self.patch(gui, 'uri_hook', self._set_called)
+    def test_edit_account_button(self):
+        """When clicking the edit account button, the proper url is opened."""
+        self.patch(qt, 'uri_hook', self._set_called)
         self.ui.ui.edit_profile_button.click()
 
         self.assertEqual(self._called, ((gui.EDIT_PROFILE_LINK,), {}))
+
+    def test_edit_services_button(self):
+        """When clicking the mobile plan button, the proper url is opened."""
+        self.patch(qt, 'uri_hook', self._set_called)
+        self.ui.ui.edit_services_button.click()
+
+        self.assertEqual(self._called, ((gui.EDIT_ACCOUNT_LINK,), {}))

=== removed file 'ubuntuone/controlpanel/gui/qt/tests/test_services.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_services.py	2011-07-11 11:19:09 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_services.py	1970-01-01 00:00:00 +0000
@@ -1,84 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Author: Alejandro J. Cura <[e-mail]>
-#
-# Copyright 2011 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-"""Tests for the services tab."""
-
-from twisted.internet import defer
-
-from ubuntuone.controlpanel.gui.qt import services as gui
-from ubuntuone.controlpanel.gui.qt.tests import (
-    SAMPLE_ACCOUNT_INFO, SAMPLE_PLAN,
-)
-from ubuntuone.controlpanel.gui.qt.tests.test_ubuntuonebin import (
-    UbuntuOneBinTestCase,
-)
-
-
-class ServicesPanelTestCase(UbuntuOneBinTestCase):
-    """Test the qt control panel."""
-
-    innerclass_ui = gui.services_ui
-    innerclass_name = "Ui_Form"
-    class_ui = gui.ServicesPanel
-
-    @defer.inlineCallbacks
-    def setUp(self):
-        yield super(ServicesPanelTestCase, self).setUp()
-        self.ui.backend.next_result = SAMPLE_ACCOUNT_INFO
-
-    def test_is_processing_while_asking_info(self):
-        """The ui is processing while the contents are loaded."""
-        def check():
-            """The ui must be is_processing."""
-            self.assertTrue(self.ui.is_processing, 'ui must be processing')
-            return SAMPLE_ACCOUNT_INFO
-
-        self.patch(self.ui.backend, 'account_info', check)
-
-        return self.ui.load()  # trigger the info request
-
-    def test_is_not_processing_after_info_ready(self):
-        """The ui is not processing when contents are load."""
-        self.ui.process_info(SAMPLE_ACCOUNT_INFO)
-
-        self.assertFalse(self.ui.is_processing)
-
-    @defer.inlineCallbacks
-    def test_info_is_requested_on_load(self):
-        """The info is requested to the backend."""
-        yield self.ui.load()
-        self.assert_backend_called('account_info')
-
-    def test_process_info(self):
-        """The info is processed when ready."""
-        self.ui.process_info(SAMPLE_ACCOUNT_INFO)
-        self.assertEqual(self.ui.ui.storage_plan_label.text(), SAMPLE_PLAN)
-
-    def test_mobile_plan_modify_button(self):
-        """When clicking the mobile plan button, the proper url is opened."""
-        self.patch(gui, 'uri_hook', self._set_called)
-        self.ui.ui.mobile_plan_modify_button.click()
-
-        self.assertEqual(self._called, ((gui.EDIT_ACCOUNT_LINK,), {}))
-
-    def test_storage_plan_modify_button(self):
-        """When clicking the storage plan button, the proper url is opened."""
-        self.patch(gui, 'uri_hook', self._set_called)
-        self.ui.ui.storage_plan_modify_button.click()
-
-        self.assertEqual(self._called, ((gui.EDIT_ACCOUNT_LINK,), {}))

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_ubuntuonebin.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_ubuntuonebin.py	2011-07-20 16:31:52 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_ubuntuonebin.py	2011-07-21 20:09:30 +0000
@@ -37,13 +37,6 @@
         self.assertIsInstance(self.ui.backend,
                               gui.backend.ControlBackend)
 
-    # pylint: disable=W0221
-    def test_init_loads_ui(self):
-        """The __init__ method loads the ui."""
-        expected_setup_ui = lambda ui: ui.bin_ui.container
-        super(UbuntuOneBinTestCase, self).test_init_loads_ui(expected_setup_ui)
-    # pylint: enable=W0221
-
     def test_is_not_processing_after_creation(self):
         """After creation, is not processing."""
         self.assertFalse(self.ui.is_processing)
@@ -72,23 +65,3 @@
 
         self.assertFalse(self.ui.isEnabled())
         self.assertTrue(self.ui.overlay.isVisible())
-
-    def test_title_when_none(self):
-        """The title is the empty string when class title is None."""
-
-        class MyBin(gui.UbuntuOneBin):
-            """Inherit to set a class title."""
-            title = None
-
-        ui = MyBin()
-        self.assertEqual(ui.bin_ui.title_label.text(), '')
-
-    def test_title_when_not_none(self):
-        """The title is the empty string when class title is None."""
-
-        class MyBin(gui.UbuntuOneBin):
-            """Inherit to set a class title."""
-            title = 'Hello World!'
-
-        ui = MyBin()
-        self.assertEqual(ui.bin_ui.title_label.text(), MyBin.title)

=== modified file 'ubuntuone/controlpanel/gui/qt/ubuntuonebin.py'
--- ubuntuone/controlpanel/gui/qt/ubuntuonebin.py	2011-07-20 16:31:52 +0000
+++ ubuntuone/controlpanel/gui/qt/ubuntuonebin.py	2011-07-21 20:09:30 +0000
@@ -18,39 +18,26 @@
 
 """The base widget for the Control Panel tabs."""
 
-from PyQt4 import QtGui, QtCore
+from PyQt4 import QtGui
 
 from ubuntuone.controlpanel import backend
-from ubuntuone.controlpanel.gui.qt.ui import ubuntuonebin_ui
 from ubuntuone.controlpanel.gui.qt.loadingoverlay import LoadingOverlay
 
 
 class UbuntuOneBin(QtGui.QWidget):
     """The base widget for the Control Panel's tabs."""
 
-    title = None
     ui_class = None
 
     def __init__(self, parent=None):
         """Initialize the UI of the widget."""
         QtGui.QWidget.__init__(self, parent)
-
-        self.bin_ui = ubuntuonebin_ui.Ui_Form()
-        self.bin_ui.setupUi(self)
-
-        if self.title is None:
-            self.bin_ui.title_label.setText('')
-        else:
-            self.bin_ui.title_label.setText(self.title)
-
         self.ui = None
         if self.ui_class is not None:
             # self.ui_class is not callable
+            self.ui = self.ui_class.Ui_Form()
             # pylint: disable=E1102
-            self.ui = self.ui_class.Ui_Form()
-            self.ui.setupUi(self.bin_ui.container)
-            # connect all signals to this instance
-            QtCore.QMetaObject.connectSlotsByName(self)
+            self.ui.setupUi(self)
 
         self.overlay = LoadingOverlay(self)
         self.overlay.hide()