Merge lp:~nataliabidart/ubuntuone-control-panel/stable-3-0-update-2.99.5 into lp:ubuntuone-control-panel/stable-3-0

[Natalia Bidart]

- Updating from trunk up to revno 262:

[ Diego Sarmentero <email address hidden> ]
  - Control Panel shows quota in red with more accuracy depending on the
    free space (LP: #901314).
  - The QT UI will make a button inactive while a (re-) connection is
    in progress (LP: #878867).

[ Natalia B. Bidart <email address hidden> ]
  - Center the main window when openning it (LP: #934173).

[lp:~nataliabidart/ubuntuone-control-panel/stable-3-0-update-2.99.5]

251. By Natalia Bidart on 2012-02-21

Attaching bug numbers.

[Roberto Alsina (ralsina)]

+1

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-21 23:16:17 +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-21 23:16:17 +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-21 23:16:17 +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-21 23:16:17 +0000
@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Authors: Natalia B Bidart <[e-mail]>
-# Authors: 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
@@ -29,10 +26,14 @@
 
 ERROR_COLOR = u'red'
 KILOBYTES = 1024
+FREE_ACCOUNT_SIZE = (KILOBYTES ** 3) * 5  # 5 gigs
 NO_OP = lambda *a, **kw: None
 # http://design.canonical.com/the-toolkit/ubuntu-logo-and-circle-of-friends/
 ORANGE = u'#DD4814'
 QUOTA_THRESHOLD = 0.95
+QUOTA_THRESHOLD_ACCOUNTS = {
+    'free': FREE_ACCOUNT_SIZE * 0.1,  # 10% of the free account size
+    'pay': (KILOBYTES ** 3) * 3}  # 3 gigs
 SHARES_MIN_SIZE_FULL = 1048576
 SUCCESS_COLOR = u'green'
 
@@ -153,6 +154,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')
@@ -184,3 +186,14 @@
     str_bytes = str_bytes.rstrip('0')
     str_bytes = str_bytes.rstrip('.')
     return '%s %s' % (str_bytes, units[unit])
+
+
+def show_quota_warning(int_bytes_used, int_bytes_total):
+    """Return True if the user should be warn about the remaining quota."""
+    available = (int_bytes_total - int_bytes_used)
+    free_threshold = (int_bytes_total == FREE_ACCOUNT_SIZE and
+                      available <= QUOTA_THRESHOLD_ACCOUNTS['free'])
+    payed_threshold = (int_bytes_total > FREE_ACCOUNT_SIZE and
+                       available <= QUOTA_THRESHOLD_ACCOUNTS['pay'])
+
+    return free_threshold or payed_threshold

=== modified file 'ubuntuone/controlpanel/gui/qt/controlpanel.py'
--- ubuntuone/controlpanel/gui/qt/controlpanel.py	2011-09-23 15:05:27 +0000
+++ ubuntuone/controlpanel/gui/qt/controlpanel.py	2012-02-21 23:16:17 +0000
@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Authors: Alejandro J. Cura <[e-mail]>
-# Authors: Natalia B Bidart <[e-mail]>
-#
-# Copyright 2011 Canonical Ltd.
+# Copyright 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
@@ -28,12 +25,12 @@
 from ubuntuone.controlpanel.logger import setup_logging, log_call
 from ubuntuone.controlpanel.gui import (
     humanize,
+    show_quota_warning,
     EDIT_SERVICES_LINK,
     FACEBOOK_LINK,
     GET_SUPPORT_LINK,
     GREETING,
     PERCENTAGE_LABEL,
-    QUOTA_THRESHOLD,
     TWITTER_LINK,
     USAGE_LABEL,
 )
@@ -105,27 +102,19 @@
         total = int(info['quota_total'])
         percentage_value = ((used / total) * 100)
         percentage = {'percentage': PERCENTAGE_STYLE % percentage_value}
+        show_warning = show_quota_warning(used, total)
         data = {'used': humanize(used), 'total': humanize(total)}
         self.ui.percentage_usage_label.setText(PERCENTAGE_LABEL % percentage)
         self.ui.quota_usage_label.setText(USAGE_LABEL % data)
-        self._update_quota({'percentage': percentage_value})
+        self._update_quota(show_warning)
 
     @log_call(logger.debug)
-    def _update_quota(self, data=None):
+    def _update_quota(self, show_warning=False):
         """Update the quota info."""
-        fraction = 0.0
-        if data is not None:
-            fraction = data.get('percentage', 0.0) / 100
-            if fraction > 0 and fraction < 0.05:
-                fraction = 0.05
-            else:
-                fraction = round(fraction, 2)
-
-        logger.debug('ManagementPanel: updating quota to %r.', fraction)
-        self.ui.percentage_usage_label.setProperty("OverQuota",
-            fraction >= QUOTA_THRESHOLD)
-        self.ui.quota_usage_label.setProperty("OverQuota",
-            fraction >= QUOTA_THRESHOLD)
+        logger.debug('ManagementPanel: show warning in quota %r.',
+            show_warning)
+        self.ui.percentage_usage_label.setProperty("OverQuota", show_warning)
+        self.ui.quota_usage_label.setProperty("OverQuota", show_warning)
         self.ui.percentage_usage_label.style().unpolish(
             self.ui.percentage_usage_label)
         self.ui.percentage_usage_label.style().polish(

=== 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-21 23:16:17 +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/gui.py'
--- ubuntuone/controlpanel/gui/qt/gui.py	2012-02-07 13:54:46 +0000
+++ ubuntuone/controlpanel/gui/qt/gui.py	2012-02-21 23:16:17 +0000
@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
-
-# Authors: 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
@@ -18,8 +16,7 @@
 
 """The user interface for the control panel for Ubuntu One."""
 
-
-from PyQt4 import QtGui
+from PyQt4 import QtGui, QtCore
 
 from ubuntuone.controlpanel.gui.qt.systray import TrayIcon
 from ubuntuone.controlpanel.gui.qt.ui import mainwindow_ui
@@ -60,6 +57,11 @@
             window = MainWindow()
         else:
             window = MainWindow(close_callback=close_callback)
+        app = QtGui.QApplication.instance()
+        style = QtGui.QStyle.alignedRect(
+                    QtCore.Qt.LeftToRight, QtCore.Qt.AlignCenter,
+                    window.size(), app.desktop().availableGeometry())
+        window.setGeometry(style)
         window.show()
     else:
         window = None

=== 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-21 23:16:17 +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_controlpanel.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py	2011-09-12 20:17:37 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py	2012-02-21 23:16:17 +0000
@@ -126,9 +126,8 @@
 
     def test_update_over_quota(self):
         """Check the labels state when the user exceed the quota."""
-        percentage_value = 100
         # pylint: disable=W0212
-        self.ui._update_quota({'percentage': percentage_value})
+        self.ui._update_quota(True)
         # pylint: enable=W0212
 
         self.assertTrue(
@@ -138,9 +137,8 @@
 
     def test_update_quota_in_range(self):
         """Check the labels state when the quota is under the threshold."""
-        percentage_value = 50
         # pylint: disable=W0212
-        self.ui._update_quota({'percentage': percentage_value})
+        self.ui._update_quota(False)
         # pylint: enable=W0212
 
         self.assertFalse(

=== 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-21 23:16:17 +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))

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_start.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_start.py	2012-02-07 13:54:46 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_start.py	2012-02-21 23:16:17 +0000
@@ -28,9 +28,12 @@
 
     """A fake thing."""
 
+    shown = False
+    size = lambda *a: gui.QtCore.QSize(123456, 654321)
+    style = None
+
     def __init__(self):
         self.args = []
-        self.shown = False
 
     def __call__(self, *args, **kwargs):
         self.args.append((args, kwargs))
@@ -40,6 +43,13 @@
         """Show."""
         self.shown = True
 
+    # Invalid name "setGeometry"
+    # pylint: disable=C0103
+
+    def setGeometry(self, style):
+        """Save the new geometry."""
+        self.style = style
+
 
 class StartTestCase(TestCase):
     """Test the qt control panel."""
@@ -87,3 +97,12 @@
         kwargs = {'close_callback': self.close_cb, 'window': None}
         self.assertEqual(self.tray_icon.args, [((), kwargs)])
         self.assertEqual(self.main_window.args, [])
+
+    def test_center_window(self):
+        """The main window should be centered."""
+        gui.start(close_callback=self.close_cb)
+        app = gui.QtGui.QApplication.instance()
+        expected = gui.QtGui.QStyle.alignedRect(gui.QtCore.Qt.LeftToRight,
+                        gui.QtCore.Qt.AlignCenter, self.main_window.size(),
+                        app.desktop().availableGeometry())
+        self.assertEqual(self.main_window.style, expected)

=== added file 'ubuntuone/controlpanel/gui/tests/test_show_quota_warning.py'
--- ubuntuone/controlpanel/gui/tests/test_show_quota_warning.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/controlpanel/gui/tests/test_show_quota_warning.py	2012-02-21 23:16:17 +0000
@@ -0,0 +1,75 @@
+# -*- coding: utf-8 -*-
+
+# Copyright 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
+# 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 show_quota_warning function."""
+
+from ubuntuone.controlpanel.tests import TestCase
+from ubuntuone.controlpanel.gui import show_quota_warning
+
+
+GB5 = 5368709120  # 5 Gb
+GB25 = 26843545600  # 25 Gb
+
+
+class QuotaWarningTestCase(TestCase):
+
+    """Test cases for the humanize function."""
+
+    def test_quota_warning_with_used_0_free_account(self):
+        """Check the return value for show_quota_warning with 0 bytes used."""
+        self.assertFalse(show_quota_warning(0, GB5))
+
+    def test_quota_warning_with_free_account_used_medium(self):
+        """Check the return value for show_quota_warning with 2.5 gb used."""
+        used = 2.5 * (1024 ** 3)  # 2.5 Gb
+        self.assertFalse(show_quota_warning(used, GB5))
+
+    def test_quota_warning_with_free_account_used_almost_full(self):
+        """Check the return value for show_quota_warning with 4.5 gb used."""
+        # For free accounts the warning should be activate when the user
+        # has equal or less than 500 mb remaining
+        used = 4.5 * (1024 ** 3)  # 4.5 Gb
+        self.assertTrue(show_quota_warning(used, GB5))
+
+    def test_quota_warning_with_free_account_used_full(self):
+        """Check the return value for show_quota_warning with 5 gb used."""
+        # For free accounts the warning should be activate when the user
+        # has equal or less than 500 mb remaining
+        used = 5.0 * (1024 ** 3)  # 5.0 Gb
+        self.assertTrue(show_quota_warning(used, GB5))
+
+    def test_quota_warning_with_used_0_pay_account(self):
+        """Check the return value for show_quota_warning with 0 bytes used."""
+        self.assertFalse(show_quota_warning(0, GB25))
+
+    def test_quota_warning_with_pay_account_used_medium(self):
+        """Check the return value for show_quota_warning with 12.5 gb used."""
+        used = 12.5 * (1024 ** 3)  # 12.5 Gb
+        self.assertFalse(show_quota_warning(used, GB25))
+
+    def test_quota_warning_with_pay_account_used_almost_full(self):
+        """Check the return value for show_quota_warning with 22 gb used."""
+        # For pay accounts the warning should be activate when the user
+        # has equal or less than 3 Gb remaining
+        used = 22 * (1024 ** 3)  # 22 Gb
+        self.assertTrue(show_quota_warning(used, GB25))
+
+    def test_quota_warning_with_pay_account_used_full(self):
+        """Check the return value for show_quota_warning with 25 gb used."""
+        # For free accounts the warning should be activate when the user
+        # has equal or less than 3 gb remaining
+        used = 25 * (1024 ** 3)  # 25 Gb
+        self.assertTrue(show_quota_warning(used, GB25))