Merge lp:~diegosarmentero/ubuntuone-control-panel/reconnect-button into lp:ubuntuone-control-panel

[Diego Sarmentero]

- The QT UI will make a button inactive while a (re-) connection is in progress (LP: #878867).

[Roberto Alsina (ralsina)]

+1

review: Approve

[lp:~diegosarmentero/ubuntuone-control-panel/reconnect-button]

256. By Manuel de la Peña on 2012-02-01

Forward extra params to u1trial.

[Natalia Bidart (nataliabidart)]

Can we please not depend on SSO qt-related stuff for the test suite?
Though is a valid dependency, we would need to hack tarmac regarding PYTHONPATH since we don't have -qt packages yet.

In particular, I'm having this:

  File "/home/nessita/canonical/controlpanel/review_reconnect-button/ubuntuone/controlpanel/gui/qt/tests/test_filesyncstatus.py", line 23, in <module>
    from ubuntu_sso.qt.tests import FakePageUiStyle

[Diego Sarmentero (diegosarmentero)]

> Can we please not depend on SSO qt-related stuff for the test suite?
> Though is a valid dependency, we would need to hack tarmac regarding
> PYTHONPATH since we don't have -qt packages yet.
>
> In particular, I'm having this:
>
> File "/home/nessita/canonical/controlpanel/review_reconnect-
> button/ubuntuone/controlpanel/gui/qt/tests/test_filesyncstatus.py", line 23,
> in <module>
> from ubuntu_sso.qt.tests import FakePageUiStyle

updated

[lp:~diegosarmentero/ubuntuone-control-panel/reconnect-button]

257. By Natalia Bidart on 2012-02-07

- Avoid TypeError when fetching credentials in the Gtk OverviewPanel
   (LP: #927743).
- Run the whole test suite with a single command (LP: #927770).
- Do proper cleanup when dealing with UIs (LP: #925617).

258. By Natalia Bidart on 2012-02-08

 - Replaced custom webclient with the one from ubuntu-sso-client
   (LP: #926311).
- Removed the dependency on qt4reactor for Linux implementation.

259. By Natalia Bidart on 2012-02-10

- Install the uniqueapp module (LP: #930269).

260. By Diego Sarmentero on 2012-02-17

merge

[Natalia Bidart (nataliabidart)]

Looks great! and works as expected

review: Approve

=== modified file 'data/qt/filesyncstatus.ui'
--- data/qt/filesyncstatus.ui	2011-08-23 16:03:31 +0000
+++ data/qt/filesyncstatus.ui	2012-02-17 12:07:20 +0000
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>94</width>
-    <height>49</height>
+    <height>52</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -20,7 +20,14 @@
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
-      <widget class="QLabel" name="sync_status_icon"/>
+      <widget class="QLabel" name="sync_status_icon">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+      </widget>
      </item>
      <item>
       <widget class="QLabel" name="sync_status_label">

=== modified file 'data/qt/images.qrc'
--- data/qt/images.qrc	2011-09-06 13:43:25 +0000
+++ data/qt/images.qrc	2012-02-17 12:07:20 +0000
@@ -6,6 +6,7 @@
     <file>../sync_status_alert.png</file>
     <file>../sync_status_sync_done.png</file>
     <file>../sync_status_syncing.png</file>
+    <file>../sync_status_loading.png</file>
     <file>../folder.png</file>
     <file>../computer.png</file>
     <file>../phone.png</file>

=== added file 'data/sync_status_loading.png'
Binary files data/sync_status_loading.png	1970-01-01 00:00:00 +0000 and data/sync_status_loading.png	2012-02-17 12:07:20 +0000 differ
=== modified file 'ubuntuone/controlpanel/gui/__init__.py'
--- ubuntuone/controlpanel/gui/__init__.py	2012-02-06 15:23:27 +0000
+++ ubuntuone/controlpanel/gui/__init__.py	2012-02-17 12:07:20 +0000
@@ -153,6 +153,7 @@
 NO_FOLDERS = _('No folders to show.')
 NO_PAIRING_RECORD = _('There is no Ubuntu One pairing record.')
 PERCENTAGE_LABEL = _('%(percentage)s used')
+PLEASE_WAIT = _('Please wait')
 QUOTA_LABEL = _('Using %(used)s of %(total)s (%(percentage).0f%%)')
 USAGE_LABEL = _('%(used)s of %(total)s')
 SERVICES_BUTTON_TOOLTIP = _('Manage the sync services')

=== modified file 'ubuntuone/controlpanel/gui/qt/filesyncstatus.py'
--- ubuntuone/controlpanel/gui/qt/filesyncstatus.py	2011-09-02 17:59:39 +0000
+++ ubuntuone/controlpanel/gui/qt/filesyncstatus.py	2012-02-17 12:07:20 +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
@@ -44,6 +42,8 @@
     FILE_SYNC_STOP_TOOLTIP,
     FILE_SYNC_STOPPED,
     FILE_SYNC_SYNCING,
+    LOADING,
+    PLEASE_WAIT,
 )
 from ubuntuone.controlpanel.gui.qt import pixmap_from_name
 from ubuntuone.controlpanel.gui.qt.ui import filesyncstatus_ui
@@ -186,6 +186,15 @@
         """Button was clicked, act accordingly to the label."""
         self.ui.sync_status_button.setEnabled(False)
         if self._backend_method is not None:
+            self.ui.sync_status_label.setText(LOADING)
+            self.ui.sync_status_button.setText(PLEASE_WAIT)
+            pixmap = pixmap_from_name('sync_status_loading')
+            self.ui.sync_status_icon.setPixmap(pixmap)
+            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)
             self._backend_method()
         else:
             logger.error('on_sync_status_button_clicked: backend method is '

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/__init__.py'
--- ubuntuone/controlpanel/gui/qt/tests/__init__.py	2012-02-06 15:23:27 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/__init__.py	2012-02-17 12:07:20 +0000
@@ -233,6 +233,73 @@
     # pylint: enable=C0103
 
 
+class FakePageUiStyle(object):
+    """Fake the page."""
+
+    def __init__(self):
+        self.ui = self
+        self.properties = {}
+        super(FakePageUiStyle, self).__init__()
+
+    def wizard(self):
+        """Use itself as a fake wizard, too."""
+        return self
+
+    def text(self):
+        """Return text."""
+        return self.properties.get('text', '')
+
+    # setText, setEnabled are inherited
+    # pylint: disable=C0103
+    def setText(self, text):
+        """Save text."""
+        self.properties['text'] = text
+
+    def setEnabled(self, value):
+        """Fake setEnabled."""
+        self.properties['enabled'] = value
+
+    def enabled(self):
+        """Fake enabled."""
+        return self.properties.get('enabled', False)
+
+    def isEnabled(self):
+        """Fake isEnabled."""
+        return self.properties.get('enabled', False)
+
+    def setProperty(self, key, val):
+        """Fake setProperty to restyle some widget."""
+        self.properties[key] = val
+
+    def property(self, key):
+        """Fake property from widget style."""
+        return self.properties.get(key, False)
+
+    def setDefault(self, val):
+        """Fake button setDefault."""
+        self.properties['default'] = val
+
+    def style(self):
+        """Fake style."""
+        return self
+
+    def unpolish(self, *args):
+        """Fake unpolish."""
+        self.properties['unpolish'] = len(args) > 0
+
+    def polish(self, *args):
+        """Fake polish."""
+        self.properties['polish'] = len(args) > 0
+
+    def setVisible(self, val):
+        """Fake setVisible from Qt."""
+        self.properties['visible'] = val
+
+    def isVisible(self):
+        """Fake isVisible from Qt."""
+        return self.properties['visible']
+
+
 class BaseTestCase(TestCase):
     """Base Test Case."""
 

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_filesyncstatus.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_filesyncstatus.py	2011-10-28 08:19:20 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_filesyncstatus.py	2012-02-17 12:07:20 +0000
@@ -21,7 +21,14 @@
 from twisted.internet import defer
 
 from ubuntuone.controlpanel.gui.qt import filesyncstatus as gui
-from ubuntuone.controlpanel.gui.qt.tests import BaseTestCase
+from ubuntuone.controlpanel.gui.qt.tests import (
+    BaseTestCase,
+    FakePageUiStyle,
+)
+from ubuntuone.controlpanel.gui import (
+    LOADING,
+    PLEASE_WAIT,
+)
 
 backend = gui.backend  # pylint: disable=C0103
 
@@ -171,3 +178,24 @@
                                    action=gui.FILE_SYNC_RESTART,
                                    callback='restart_files',
                                    tooltip=gui.FILE_SYNC_RESTART_TOOLTIP)
+
+    def test_on_sync_status_button_clicked(self):
+        """Check the labels and icon when the button is pressed."""
+        # Ensure the _backend_method is not None to execute the first
+        # part of the If.
+        self.ui._backend_method = lambda: 'Not None'
+        self.patch(self.ui.ui, "sync_status_button", FakePageUiStyle())
+        # Simulate the click event
+        self.ui.on_sync_status_button_clicked()
+        self.assertFalse(self.ui.ui.sync_status_button.isEnabled())
+        self.assertTrue(self.ui.ui.sync_status_button.property("secondary"))
+        actual_text = self.ui.ui.sync_status_label.text()
+        self.assertEqual(actual_text, LOADING)
+        self.assertEqual(self.ui.ui.sync_status_button.text(), PLEASE_WAIT)
+        actual_icon = self.ui.ui.sync_status_icon.pixmap()
+        expected_icon = gui.pixmap_from_name('sync_status_loading')
+        self.assertEqualPixmaps(expected_icon, actual_icon)
+        self.assertTrue(
+            self.ui.ui.sync_status_button.properties.get('unpolish', True))
+        self.assertTrue(
+            self.ui.ui.sync_status_button.properties.get('polish', True))