Merge lp:~nataliabidart/ubuntuone-control-panel/focus into lp:ubuntuone-control-panel

[Natalia Bidart]

- Apply new specification for tabbing navigation and tabbing style
  (LP: #942020).
- Make the "Explore" buttons for folders be disabled (style-wise) when the folder
  is not synched (LP: #949035).

[lp:~nataliabidart/ubuntuone-control-panel/focus]

283. By Natalia Bidart on 2012-03-08

Less changes against trunk.

284. By Natalia Bidart on 2012-03-08

Restoring hack for tabs.

285. By Natalia Bidart on 2012-03-08

No need for controlpanel help buttons to be enabled/disabled for the style.

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'data/qt/controlpanel.ui'
--- data/qt/controlpanel.ui	2012-03-02 13:53:24 +0000
+++ data/qt/controlpanel.ui	2012-03-08 21:13:18 +0000
@@ -329,8 +329,8 @@
         </property>
         <property name="maximumSize">
          <size>
-          <width>16</width>
-          <height>16</height>
+          <width>20</width>
+          <height>20</height>
          </size>
         </property>
         <property name="cursor">
@@ -352,8 +352,8 @@
         </property>
         <property name="maximumSize">
          <size>
-          <width>16</width>
-          <height>16</height>
+          <width>20</width>
+          <height>20</height>
          </size>
         </property>
         <property name="cursor">

=== modified file 'data/qt/device.ui'
--- data/qt/device.ui	2012-02-22 15:35:13 +0000
+++ data/qt/device.ui	2012-03-08 21:13:18 +0000
@@ -6,14 +6,17 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>233</width>
-    <height>36</height>
+    <width>430</width>
+    <height>27</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string notr="true">Form</string>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout">
+   <property name="margin">
+    <number>0</number>
+   </property>
    <item>
     <widget class="QLabel" name="device_icon_label">
      <property name="pixmap">

=== removed file 'data/qt/device_remote.ui'
--- data/qt/device_remote.ui	2012-02-22 14:58:25 +0000
+++ data/qt/device_remote.ui	1970-01-01 00:00:00 +0000
@@ -1,50 +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>264</width>
-    <height>45</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string notr="true">Form</string>
-  </property>
-  <layout class="QHBoxLayout" name="horizontalLayout">
-   <item>
-    <widget class="QLabel" name="device_icon_label">
-     <property name="pixmap">
-      <pixmap resource="images.qrc">:/computer.png</pixmap>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="device_name_label">
-     <property name="text">
-      <string notr="true">Non local device</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <spacer name="horizontalSpacer">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>217</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-  </layout>
- </widget>
- <resources>
-  <include location="images.qrc"/>
- </resources>
- <connections/>
-</ui>

=== modified file 'data/qt/devices.ui'
--- data/qt/devices.ui	2012-03-02 13:53:24 +0000
+++ data/qt/devices.ui	2012-03-08 21:13:18 +0000
@@ -21,16 +21,16 @@
     <number>0</number>
    </property>
    <item>
-    <widget class="QGroupBox" name="local_device">
+    <widget class="QGroupBox" name="local_device_box">
      <property name="title">
       <string notr="true">This device</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout">
+     <layout class="QVBoxLayout" name="local_device_layout">
       <property name="margin">
        <number>0</number>
       </property>
       <item>
-       <layout class="QVBoxLayout" name="local_device_box"/>
+       <widget class="DeviceWidget" name="local_device" native="true"/>
       </item>
      </layout>
     </widget>
@@ -120,6 +120,12 @@
    <extends>QPushButton</extends>
    <header>ubuntuone.controlpanel.gui.qt.gotoweb</header>
   </customwidget>
+  <customwidget>
+   <class>DeviceWidget</class>
+   <extends>QWidget</extends>
+   <header>ubuntuone.controlpanel.gui.qt.device</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <resources>
   <include location="images.qrc"/>

=== modified file 'data/qt/preferences.ui'
--- data/qt/preferences.ui	2012-03-02 19:42:17 +0000
+++ data/qt/preferences.ui	2012-03-08 21:13:18 +0000
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>512</width>
-    <height>328</height>
+    <width>520</width>
+    <height>342</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -53,14 +53,27 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="0">
+      <item row="0" column="3">
+       <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 row="1" column="0">
        <widget class="QCheckBox" name="limit_downloads_checkbox">
         <property name="text">
          <string notr="true">Limit download speed to</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="1">
+      <item row="1" column="1">
        <widget class="QSpinBox" name="download_speed_spinbox">
         <property name="minimum">
          <number>-1</number>
@@ -70,17 +83,17 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="2">
+      <item row="1" column="2">
        <widget class="QLabel" name="kbps_label_2">
         <property name="text">
          <string notr="true">Kilobits per second</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="3">
-       <spacer name="horizontalSpacer_2">
+      <item row="2" column="0">
+       <spacer name="verticalSpacer_2">
         <property name="orientation">
-         <enum>Qt::Horizontal</enum>
+         <enum>Qt::Vertical</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
@@ -90,7 +103,7 @@
         </property>
        </spacer>
       </item>
-      <item row="4" column="0" colspan="3">
+      <item row="3" column="0" colspan="3">
        <widget class="QLabel" name="label_2">
         <property name="text">
          <string notr="true">Please note that your files will not sync if you set bandwidth to 0</string>
@@ -103,19 +116,6 @@
         </property>
        </widget>
       </item>
-      <item row="3" column="0">
-       <spacer name="verticalSpacer_2">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
      </layout>
     </widget>
    </item>
@@ -124,32 +124,45 @@
      <property name="title">
       <string notr="true">File Sync Settings</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_1">
+     <layout class="QGridLayout" name="gridLayout_2">
       <property name="margin">
        <number>0</number>
       </property>
-      <item>
+      <item row="0" column="0">
        <widget class="QCheckBox" name="autoconnect_checkbox">
         <property name="text">
          <string notr="true">Connect automatically when computer starts</string>
         </property>
        </widget>
       </item>
-      <item>
+      <item row="0" column="1">
+       <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 row="1" column="0">
        <widget class="QCheckBox" name="udf_autosubscribe_checkbox">
         <property name="text">
          <string notr="true">Automatically sync all new cloud folders to this computer</string>
         </property>
        </widget>
       </item>
-      <item>
+      <item row="2" column="0">
        <widget class="QCheckBox" name="share_autosubscribe_checkbox">
         <property name="text">
          <string notr="true">Automatically sync all folders shared with me to this computer</string>
         </property>
        </widget>
       </item>
-      <item>
+      <item row="3" column="0">
        <widget class="QCheckBox" name="show_all_notifications_checkbox">
         <property name="text">
          <string notr="true">Allow all notifications to this device</string>

=== modified file 'data/qt/ubuntuone.qss'
--- data/qt/ubuntuone.qss	2012-03-02 17:33:38 +0000
+++ data/qt/ubuntuone.qss	2012-03-08 21:13:18 +0000
@@ -1,3 +1,11 @@
+/* Common colours:
+
+orange: #dd4814
+dark grey: #333333
+light grey: #aea79f
+
+*/
+
 QMainWindow {
     background-color: #aea79f;
 }
@@ -77,6 +85,18 @@
     border-width: 1px;
 }
 
+QPushButton:focus {
+    border-width: 2px;
+    /* reduce the padding since we have a 2px border now */
+    padding: 5px;
+    padding-left: 19px;
+    padding-right: 19px;
+    /* hack to make the mild-orange focused box dissapear */
+    padding-top: 20px;
+    padding-bottom: 20px;
+    /* end of hack */
+}
+
 QPushButton:disabled {
     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
         stop: 0 #eaeaea, stop: 1.0 #cacaca);
@@ -91,19 +111,18 @@
     border-color: #999999;
 }
 
-QPushButton:enabled:focus,
+QPushButton:enabled:focus {
+    border-color: #dd4814;
+}
+
 QPushButton:enabled:hover {
     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
         stop: 0 #ffffff,stop: 1.0 #ededed);
-    color: #333333;
-    border-color: #999999;
 }
 
 QPushButton:enabled:pressed {
     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
         stop: 0 #d9d9d9,stop: 1.0 #fefefe);
-    color: #333333;
-    border-color: #999999;
 }
 
 QPushButton:default:enabled {
@@ -113,55 +132,69 @@
     border-color: #999999;
 }
 
-QPushButton:default:enabled:focus,
+QPushButton:default:enabled:focus {
+    border-color: #333333;
+}
+
 QPushButton:default:enabled:hover {
     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
         stop: 0 #ffb19c,stop: 1.0 #dd4814);
-    color: white;
-    border-color: #999999;
 }
 
 QPushButton:default:enabled:pressed {
     background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
         stop: 0 #b93f14,stop: 1.0 #dd4814);
-    color: white;
-    border-color: #999999;
-}
-
-QPushButton#help_button {
-    background: transparent;
-    border: none;
-    color: white;
-    text-decoration: underline;
-    padding: 0px;
-}
-
-QPushButton#explore_folder_button {
-    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-        stop: 0 #fbfbfb, stop: 1.0 #e6e6e6);
-    height: 15px;
-    border-radius: 7px;
-    border-color: #908e8d;
-    color: #595959;
-    padding-left: 10px;
-    padding-right: 10px;
+}
+
+ExploreFolderButton {
     margin-top: 5px;
     margin-bottom: 5px;
     margin-right: 20px;
     margin-left: 20px;
 }
 
+ExploreFolderButton:enabled {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+        stop: 0 #fbfbfb, stop: 1.0 #e6e6e6);
+    border-color: #908e8d;
+    color: #595959;
+}
+
 QPushButton#twitter_button,
 QPushButton#facebook_button {
+    background: transparent;
+}
+
+QPushButton#twitter_button:focus,
+QPushButton#facebook_button:focus {
+    border: 2px solid #dd4814;
+}
+
+GoToWebButton#help_button {
+    padding: 2px;
+}
+
+GoToWebButton#share_publish_button,
+GoToWebButton#help_button {
+    background: transparent;
     border: none;
+    text-decoration: underline;
 }
 
-GoToWebButton#forgot_password_button,
 GoToWebButton#share_publish_button {
-    background: transparent;
-    border: none;
     color: #dd4814;
-    text-decoration: underline;
+}
+
+GoToWebButton#help_button {
+    color: white;
+}
+
+GoToWebButton#share_publish_button:focus {
+    border: 2px solid #aea79f;
+}
+
+GoToWebButton#help_button:focus {
+    border: 2px solid #dd4814;
 }
 
 QTabBar::tab {
@@ -192,12 +225,7 @@
     border-width: 1px;
 }
 
-QTabBar::tab:first:!selected {
-    border-left-color: #939389;
-    border-left-color: #939389;
-}
-
-QTabBar::tab:first:selected {
+QTabBar::tab:first {
     border-left-color: #939389;
 }
 
@@ -205,13 +233,21 @@
     border-left-color: #e4e0dd;
 }
 
+QTabBar::tab:last:!selected {
+    border-left-color: #e4e0dd;
+}
+
 QTabBar::tab:hover {
     background: #f6f6f6;
     text-decoration: underline;
 }
 
-QTabBar::tab:last:!selected {
-    border-left-color: #e4e0dd;
+QTabBar::tab:focus {
+    text-decoration: underline;
+    /* hack to make the mild-orange focused box dissapear */
+    padding-left: 1000px;
+    padding-right: 1000px;
+    /* end of hack */
 }
 
 QTabWidget {
@@ -259,6 +295,12 @@
     min-height: 48px;
 }
 
+QGroupBox#local_device_box,
+QListWidget#list_devices::item {
+    padding-left: 9px;
+    padding-right: 9px;
+}
+
 QLabel[OverQuota="false"] {
     color: #333333;
 }
@@ -301,3 +343,8 @@
     alternate-background-color: #f7f6f5;
     background: #efedec;
 }
+
+QCheckBox:focus {
+    border-radius: 5px;
+    border: 2px solid #dd4814;
+}

=== modified file 'ubuntuone/controlpanel/gui/qt/device.py'
--- ubuntuone/controlpanel/gui/qt/device.py	2012-02-22 17:04:28 +0000
+++ ubuntuone/controlpanel/gui/qt/device.py	2012-03-08 21:13:18 +0000
@@ -34,7 +34,7 @@
     handle_errors,
     pixmap_from_name,
 )
-from ubuntuone.controlpanel.gui.qt.ui import device_ui, device_remote_ui
+from ubuntuone.controlpanel.gui.qt.ui import device_ui
 from ubuntuone.controlpanel.logger import setup_logging
 
 COMPUTER_ICON = "computer"
@@ -61,27 +61,35 @@
 
 
 class DeviceWidget(cache.Cache, QtGui.QWidget):
-    """The widget for each device in the control panel."""
+    """The widget for a local device in the control panel."""
 
     removed = QtCore.pyqtSignal()
     removeCanceled = QtCore.pyqtSignal()
 
-    def __init__(self, device_id, *args, **kwargs):
+    def __init__(self, device_id=None, *args, **kwargs):
         """Initialize the UI of the widget."""
         super(DeviceWidget, self).__init__(*args, **kwargs)
         self.ui = device_ui.Ui_Form()
         self.ui.setupUi(self)
 
-        # The following is a hack to avoid having the faked self.ui failing
-        # with AttributeError in the tests. We need to improve the fake so we
-        # don't leak this to the production code.
-        if getattr(self.ui, 'remove_device_button', None) is not None:
-            self.ui.remove_device_button.setText(REMOVE_BUTTON)
-
+        self.ui.remove_device_button.setText(REMOVE_BUTTON)
+        self._id = None
         self.id = device_id
 
+    def _get_id(self):
+        """Return this device's id."""
+        return self._id
+
+    def _set_id(self, new_id):
+        """Set this device's id."""
+        self._id = new_id
+        self.ui.remove_device_button.setEnabled(self._id is not None)
+
+    id = property(fget=_get_id, fset=_set_id)
+
     def update_device_info(self, device_info):
         """Update the device info."""
+        self.id = device_info["device_id"]
         self.ui.device_name_label.setText(device_info["name"])
         icon_name = icon_name_from_type(device_info["type"])
         pixmap = pixmap_from_name(icon_name)
@@ -102,28 +110,20 @@
         else:
             self.removeCanceled.emit()
 
-
-class DeviceRemoteWidget(QtGui.QWidget):
-
-    """Remote Device widget for Devices List."""
-
-    def __init__(self, device_info):
-        super(DeviceRemoteWidget, self).__init__()
-        self.ui = device_remote_ui.Ui_Form()
-        self.ui.setupUi(self)
-
-        text = device_info["name"]
-        icon_name = icon_name_from_type(device_info["type"])
-        pixmap = pixmap_from_name(icon_name)
-        self.ui.device_icon_label.setPixmap(pixmap)
-        self.ui.device_name_label.setText(text)
-
     def text(self):
         """Return the text displayed in the Widget."""
         return self.ui.device_name_label.text()
 
-
-def get_device_for_list_widget(device_info):
-    """Return a DeviceRemoteWidget with device proper info."""
-    item = DeviceRemoteWidget(device_info)
-    return item
+    def clear(self):
+        """Clear this widget's info."""
+        self.id = None
+        self.ui.device_name_label.setText('')
+
+
+class RemoteDeviceWidget(DeviceWidget):
+
+    """Remote device widget."""
+
+    def __init__(self, *args, **kwargs):
+        super(RemoteDeviceWidget, self).__init__(*args, **kwargs)
+        self.ui.remove_device_button.hide()

=== modified file 'ubuntuone/controlpanel/gui/qt/devices.py'
--- ubuntuone/controlpanel/gui/qt/devices.py	2012-02-22 15:35:13 +0000
+++ ubuntuone/controlpanel/gui/qt/devices.py	2012-03-08 21:13:18 +0000
@@ -50,7 +50,7 @@
     def _setup(self):
         """Do some extra setupping for the UI."""
         super(DevicesPanel, self)._setup()
-        self.ui.local_device.setTitle(DEVICES_LOCAL_LABEL)
+        self.ui.local_device_box.setTitle(DEVICES_LOCAL_LABEL)
         self.ui.other_devices.setTitle(DEVICES_REMOTE_LABEL)
         self.ui.manage_devices_button.setText(DEVICES_MANAGE_LABEL)
         self.ui.manage_devices_button.uri = EDIT_DEVICES_LINK
@@ -66,7 +66,6 @@
     @log_call(logger.debug)
     def process_info(self, info):
         """Process and display the devices info."""
-        self.clear_device_info(self.ui.local_device_box)
         self.ui.list_devices.clear()
 
         for device_info in info:
@@ -76,21 +75,9 @@
 
     def on_local_device_removed(self):
         """When the local device is removed, clear the box and emit signal."""
-        self.clear_device_info(self.ui.local_device_box)
+        self.ui.local_device.clear()
         self.localDeviceRemoved.emit()
 
-    def clear_device_info(self, box):
-        """Clear all the device info."""
-        children = box.count()
-        # we need to reverse the index list to remove children because:
-        # "Items are numbered consecutively from 0. If an item is deleted,
-        # other items will be renumbered."
-        # http://doc.qt.nokia.com/latest/qlayout.html#itemAt
-        for i in reversed(range(children)):
-            widget = box.itemAt(i).widget()
-            box.removeWidget(widget)
-            widget.deleteLater()
-
     def update_device_info(self, device_info):
         """Update one device."""
         if device_info["is_local"]:
@@ -100,15 +87,13 @@
 
     def update_local_device(self, device_info):
         """Update the info for the local device."""
-        device_widget = device.DeviceWidget(device_id=device_info['device_id'])
-        device_widget.update_device_info(device_info)
-        device_widget.removed.connect(self.on_local_device_removed)
-
-        self.ui.local_device_box.addWidget(device_widget)
+        self.ui.local_device.update_device_info(device_info)
+        self.ui.local_device.removed.connect(self.on_local_device_removed)
 
     def create_remote_device(self, device_info):
         """Add a remote device to the list."""
-        widget = device.get_device_for_list_widget(device_info)
+        widget = device.RemoteDeviceWidget()
+        widget.update_device_info(device_info)
         item = QtGui.QListWidgetItem()
 
         self.ui.list_devices.addItem(item)

=== modified file 'ubuntuone/controlpanel/gui/qt/folders.py'
--- ubuntuone/controlpanel/gui/qt/folders.py	2012-02-28 17:48:23 +0000
+++ ubuntuone/controlpanel/gui/qt/folders.py	2012-03-08 21:13:18 +0000
@@ -61,6 +61,21 @@
 YES = QtGui.QMessageBox.Yes
 
 
+class ExploreFolderButton(QtGui.QPushButton):
+    """A specialized button for the folder listing."""
+
+    def __init__(self, folder_path, parent=None):
+        super(ExploreFolderButton, self).__init__(parent=parent)
+        self.folder_path = folder_path
+        self.setText(FOLDERS_COLUMN_EXPLORE)
+        self.clicked.connect(self.on_clicked)
+
+    def on_clicked(self):
+        """Open the folder_path in the default file manager."""
+        uri = unicode(QtCore.QUrl.fromLocalFile(self.folder_path).toString())
+        uri_hook(uri)
+
+
 class FoldersPanel(UbuntuOneBin):
     """The Folders Tab Panel widget"""
 
@@ -180,21 +195,9 @@
 
                 # attach a third item with a button to explore the folder
                 model_index = self.ui.folders.indexFromItem(child, EXPLORE_COL)
-                button = QtGui.QPushButton(parent=self.ui.folders)
-                button.setFlat(True)
-                button.setText(FOLDERS_COLUMN_EXPLORE)
-                button.setObjectName('explore_folder_button')
-                policy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed,
-                                           QtGui.QSizePolicy.Fixed)
-                button.setSizePolicy(policy)
+                button = ExploreFolderButton(folder_path=child.volume_path,
+                            parent=self.ui.folders)
                 button.setEnabled(bool(volume[u'subscribed']))
-
-                # Operator not preceded by a space
-                # pylint: disable=C0322
-                cb = lambda checked, item=child: \
-                    self.on_folders_itemActivated(item)
-                # pylint: enable=C0322
-                button.clicked.connect(cb)
                 self.ui.folders.setIndexWidget(model_index, button)
 
         self.ui.folders.expandAll()

=== modified file 'ubuntuone/controlpanel/gui/qt/loadingoverlay.py'
--- ubuntuone/controlpanel/gui/qt/loadingoverlay.py	2012-02-22 17:04:28 +0000
+++ ubuntuone/controlpanel/gui/qt/loadingoverlay.py	2012-03-08 21:13:18 +0000
@@ -45,11 +45,7 @@
         self.counter = 0
         self.orientation = False
 
-        # The following is a hack to avoid having the faked self.ui failing
-        # with AttributeError in the tests. We need to improve the fake so we
-        # don't leak this to the production code.
-        if getattr(self.ui, 'label', None) is not None:
-            self.ui.label.setText(LOADING_OVERLAY)
+        self.ui.label.setText(LOADING_OVERLAY)
 
     # Invalid name "paintEvent"
     # pylint: disable=C0103

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/__init__.py'
--- ubuntuone/controlpanel/gui/qt/tests/__init__.py	2012-03-02 13:53:24 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/__init__.py	2012-03-08 21:13:18 +0000
@@ -96,6 +96,7 @@
     """A fake Ui object."""
 
     exposed_methods = ['setupUi']
+    raise_attr_error = False
 
 
 class FakedControlPanelBackend(FakedObject):

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_device.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_device.py	2012-03-01 22:05:51 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_device.py	2012-03-08 21:13:18 +0000
@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
-
-# Author: Alejandro J. Cura <[e-mail]>
 #
-# Copyright 2011 Canonical Ltd.
+# Copyright 2011-2012 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -36,7 +34,7 @@
 
 
 class DeviceWidgetTestCase(BaseTestCase):
-    """Test the qt control panel."""
+    """Test the DeviceWidget class."""
 
     innerclass_ui = gui.device_ui
     innerclass_name = "Ui_Form"
@@ -46,9 +44,28 @@
     logger = gui.logger
 
     def test_has_id(self):
-        """The device as an id, None by default."""
+        """The device as an id accepted as creation param."""
         self.assertEqual(self.ui.id, self.device_id)
 
+    def test_id_can_be_none(self):
+        """The device id is None by default."""
+        ui = self.class_ui()
+        self.assertEqual(ui.id, None)
+
+    def test_setting_id_to_none_disables_remove_button(self):
+        """If the id is set to None, the remove button is disabled."""
+        self.ui.id = None
+        self.assertFalse(self.ui.ui.remove_device_button.isEnabled())
+
+    def test_setting_id_to_not_none_enables_remove_button(self):
+        """If the id is set to not None, the remove button is enabled."""
+        self.ui.id = 'not None'
+        self.assertTrue(self.ui.ui.remove_device_button.isEnabled())
+
+    def test_remove_button(self):
+        """The remove button is visible."""
+        self.assertTrue(self.ui.ui.remove_device_button.isVisible())
+
     def test_update_device_info(self):
         """The widget is updated with the info."""
         info = SAMPLE_COMPUTER_INFO
@@ -68,7 +85,7 @@
         self.assertIconMatchesType(gui.DEVICE_TYPE_PHONE, gui.PHONE_ICON)
         self.assertIconMatchesType("other random type", gui.COMPUTER_ICON)
 
-    def _test_update_device_info_sets_right_icon(self, info):
+    def assert_update_device_info_sets_right_icon(self, info):
         """The widget is updated with the right icon."""
         self.ui.update_device_info(info)
         pixmap_name = gui.icon_name_from_type(info["type"])
@@ -78,21 +95,11 @@
 
     def test_update_device_info_sets_computer_icon(self):
         """The computer icon is set."""
-        self._test_update_device_info_sets_right_icon(SAMPLE_COMPUTER_INFO)
+        self.assert_update_device_info_sets_right_icon(SAMPLE_COMPUTER_INFO)
 
     def test_update_device_info_sets_phone_icon(self):
         """The phone icon is set."""
-        self._test_update_device_info_sets_right_icon(SAMPLE_PHONE_INFO)
-
-    def test_get_device_for_list_widget(self):
-        """The the item list values returned."""
-        info = SAMPLE_COMPUTER_INFO
-        item = gui.get_device_for_list_widget(info)
-        self.assertEqual(item.text(), info["name"])
-
-        info = SAMPLE_PHONE_INFO
-        item = gui.get_device_for_list_widget(info)
-        self.assertEqual(item.text(), info["name"])
+        self.assert_update_device_info_sets_right_icon(SAMPLE_PHONE_INFO)
 
 
 class RemoveDeviceTestCase(DeviceWidgetTestCase):
@@ -161,3 +168,13 @@
         yield self.ui.ui.remove_device_button.click()
 
         self.assertTrue(self.memento.check_exception(CrashyBackendException))
+
+
+class RemoteDeviceWidgetTestCase(DeviceWidgetTestCase):
+    """Test the RemoteDeviceWidget class."""
+
+    class_ui = gui.RemoteDeviceWidget
+
+    def test_remove_button(self):
+        """The remove button is hidden."""
+        self.assertFalse(self.ui.ui.remove_device_button.isVisible())

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_devices.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_devices.py	2012-03-01 22:05:51 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_devices.py	2012-03-08 21:13:18 +0000
@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
-
-# Author: Alejandro J. Cura <[e-mail]>
 #
-# Copyright 2011 Canonical Ltd.
+# Copyright 2011-2012 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -63,7 +61,6 @@
     def test_no_devices_at_startup(self):
         """The UI is reset at startup."""
         self.assertEqual(self.ui.ui.list_devices.count(), 0)
-        self.assertEqual(self.ui.ui.local_device_box.count(), 0)
 
     def test_process_info(self):
         """The widget is updated with the info."""
@@ -71,10 +68,8 @@
 
         local, remote = SAMPLE_DEVICES_INFO[0], SAMPLE_DEVICES_INFO[1:]
 
-        self.assertEqual(self.ui.ui.local_device_box.count(), 1)
-        local_device = self.ui.ui.local_device_box.itemAt(0).widget()
-        self.assertEqual(local_device.ui.device_name_label.text(),
-                         local['name'])
+        local_device = self.ui.ui.local_device
+        self.assertEqual(local_device.text(), local['name'])
         self.assertEqual(local_device.id, local['device_id'])
 
         self.assertEqual(self.ui.ui.list_devices.count(),
@@ -84,26 +79,12 @@
             device = self.ui.ui.list_devices.itemWidget(item)
             self.assertEqual(device.text(), remote_device['name'])
 
-    def test_remove_device_and_check_layout_state(self):
-        """Test if the widget is properly removed."""
-        self.ui.process_info(SAMPLE_DEVICES_INFO)
-        self.ui.show()
-
-        self.assertEqual(self.ui.ui.local_device_box.count(), 1)
-        local_device = self.ui.ui.local_device_box.itemAt(0).widget()
-        self.executed = False
-
-        def delete_later(reference=None):
-            """Fake delete later."""
-            self.executed = True
-        self.patch(local_device, "deleteLater", delete_later)
-        self.ui.clear_device_info(self.ui.ui.local_device_box)
-        self.ui.process_info(SAMPLE_DEVICES_INFO)
-        self.assertEqual(self.ui.ui.local_device_box.count(), 1)
-        local_device2 = self.ui.ui.local_device_box.itemAt(0).widget()
-        self.assertNotEqual(local_device, local_device2)
-        self.assertTrue(self.executed)
-        self.assertFalse(local_device.isVisible())
+    def test_local_device(self):
+        """Test if the local_device widget is properly packed."""
+        self.ui.process_info(SAMPLE_DEVICES_INFO)
+
+        local_device = self.ui.ui.local_device_layout.itemAt(0).widget()
+        self.assertIs(local_device, self.ui.ui.local_device)
 
     def test_process_info_twice(self):
         """The widget is updated with the info."""
@@ -115,21 +96,20 @@
         self.assert_uri_hook_called(self.ui.ui.manage_devices_button,
                                     gui.EDIT_DEVICES_LINK)
 
-    def test_remove_device_widget_after_removal(self):
-        """When a device widget was deleted, remove it from the UI."""
+    def test_local_device_removed_clears_the_widget(self):
+        """When the local device was deleted, clear it."""
         self.ui.process_info(SAMPLE_DEVICES_INFO)
 
-        local_device = self.ui.ui.local_device_box.itemAt(0).widget()
-        local_device.removed.emit()
+        self.ui.ui.local_device.removed.emit()
 
-        self.assertTrue(self.ui.ui.local_device_box.itemAt(0) is None)
+        self.assertEqual(self.ui.ui.local_device.text(), '')
+        self.assertEqual(self.ui.ui.local_device.id, None)
 
     def test_local_device_removed_signal(self):
         """When the local device is removed, emit localDeviceRemoved signal."""
         self.ui.localDeviceRemoved.connect(self._set_called)
         self.ui.process_info(SAMPLE_DEVICES_INFO)
 
-        local_device = self.ui.ui.local_device_box.itemAt(0).widget()
-        local_device.removed.emit()
+        self.ui.ui.local_device.removed.emit()
 
         self.assertEqual(self._called, ((), {}))

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_folders.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_folders.py	2012-03-02 16:56:10 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_folders.py	2012-03-08 21:13:18 +0000
@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
-
-# Authors: Natalia B Bidart <[e-mail]>
 #
-# Copyright 2011 Canonical Ltd.
+# Copyright 2011-2012 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -33,6 +31,7 @@
 )
 from ubuntuone.controlpanel.gui.qt import folders as gui
 from ubuntuone.controlpanel.gui.qt.tests import (
+    BaseTestCase,
     FakedDialog,
 )
 from ubuntuone.controlpanel.gui.qt.tests.test_ubuntuonebin import (
@@ -54,6 +53,26 @@
     return name
 
 
+class ExploreFolderButtonTestCase(BaseTestCase):
+    """Test the ExploreFolderButton widget."""
+
+    class_ui = gui.ExploreFolderButton
+    kwargs = dict(folder_path=u'foo')
+
+    def test_text(self):
+        """The button text is correct."""
+        self.assertEqual(self.ui.text(), gui.FOLDERS_COLUMN_EXPLORE)
+
+    def test_clicked(self):
+        """Clicking the button opens the folder in the default file manager."""
+        self.patch(gui, 'uri_hook', self._set_called)
+        self.ui.click()
+
+        url = gui.QtCore.QUrl.fromLocalFile(self.kwargs['folder_path'])
+        expected = unicode(url.toString())
+        self.assertEqual(self._called, ((expected,), {}))
+
+
 class FoldersPanelTestCase(UbuntuOneBinTestCase):
     """Test the qt cloud folders tab."""
 
@@ -173,7 +192,6 @@
                 # explore button is in place
                 model_index = folders.indexFromItem(item, gui.EXPLORE_COL)
                 button = folders.indexWidget(model_index)
-                self.assertEqual(button.isFlat(), True)
                 self.assertEqual(button.isEnabled(),
                                  bool(volume['subscribed']))
 

=== modified file 'ubuntuone/controlpanel/gui/tests/__init__.py'
--- ubuntuone/controlpanel/gui/tests/__init__.py	2012-03-02 21:21:03 +0000
+++ ubuntuone/controlpanel/gui/tests/__init__.py	2012-03-08 21:13:18 +0000
@@ -134,6 +134,7 @@
     next_result = None
     exposed_methods = []
     exposed_results = {}
+    raise_attr_error = True
 
     def __init__(self, *args, **kwargs):
         self._args = args
@@ -142,6 +143,23 @@
         for i in self.exposed_methods:
             setattr(self, i, self._record_call(i))
 
+    def __call__(self, *args, **kwargs):
+        """Skip."""
+
+    def __getattribute__(self, attr_name):
+        super_getattr = super(FakedObject, self).__getattribute__
+
+        try:
+            result = super_getattr(attr_name)
+        except AttributeError:
+            if super_getattr('raise_attr_error'):
+                raise
+            else:
+                result = FakedObject()
+                result.raise_attr_error = super_getattr('raise_attr_error')
+
+        return result
+
     def _record_call(self, func_name):
         """Store values when calling 'func_name'."""