Merge lp:~nataliabidart/ubuntuone-control-panel/out-of-space-notif into lp:ubuntuone-control-panel

[Natalia Bidart]

  - Quota usage is now red when user is over quota (LP: #701729).
  - File sync status is now centered (LP: #715715).

Screenshot of how this looks IRL is: http://ubuntuone.com/p/fMq/

[Martin Albisetti (beuno)]

14:46 < nessita> beuno: http://ubuntuone.com/p/fMq/
14:47 < beuno> nessita, looks good to me
14:48 < beuno> do we only want to go red when they're >= 100?
14:48 < beuno> maybe 98/99 is enough?
14:48 < nessita> beuno: hum, good idea
14:48 < nessita> beuno: maybe >= 95
14:48 < nessita> beuno: that's a very good idea!

\o/

review: Approve

[lp:~nataliabidart/ubuntuone-control-panel/out-of-space-notif]

85. By Natalia Bidart on 2011-02-28

Setting red quota label when usage reaches or exceeds QUOTA_THRESHOLD.

[Natalia Bidart (nataliabidart)]

Quota usage 95% percent: http://ubuntuone.com/p/fNr/
Quota usage 94% percent: http://ubuntuone.com/p/fNs/

[lp:~nataliabidart/ubuntuone-control-panel/out-of-space-notif]

86. By Natalia Bidart on 2011-02-28

Merged trunk in.

[Alejandro J. Cura (alecu)]

Looking good!

review: Approve

=== modified file 'ubuntuone/controlpanel/gtk/gui.py'
--- ubuntuone/controlpanel/gtk/gui.py	2011-02-28 20:02:28 +0000
+++ ubuntuone/controlpanel/gtk/gui.py	2011-02-28 22:22:10 +0000
@@ -1161,7 +1161,7 @@
         ControlPanelMixin.__init__(self)
 
         self.label = LabelLoading(LOADING)
-        self.pack_start(self.label, expand=False)
+        self.pack_start(self.label, expand=True)
 
         self.button = gtk.LinkButton(uri='')
         self.button.connect('clicked', self._on_button_clicked)
@@ -1309,7 +1309,8 @@
                                  gobject.TYPE_NONE, ()),
     }
 
-    QUOTA_LABEL = _('Using %(used)s of %(total)s (%(percentage).1f%%)')
+    QUOTA_LABEL = _('Using %(used)s of %(total)s (%(percentage).0f%%)')
+    QUOTA_THRESHOLD = 0.95
     DASHBOARD_BUTTON_NAME = 'Account'
     SERVICES_BUTTON_NAME = 'Devices'  # Intentional until the theme is fixed
 
@@ -1339,7 +1340,7 @@
         self.quota_box.reorder_child(self.quota_label, 0)
 
         self.status_label = FileSyncStatus()
-        self.status_box.pack_end(self.status_label, expand=False)
+        self.status_box.pack_end(self.status_label, expand=True)
 
         self.dashboard = DashboardPanel(main_window=main_window)
         self.volumes = VolumesPanel(main_window=main_window)
@@ -1375,15 +1376,22 @@
 
     def _update_quota(self, msg, data=None):
         """Update the quota info."""
-        self.quota_label.set_markup(msg)
-        self.quota_label.stop()
-
         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
-        self.quota_progressbar.set_fraction(fraction)
+            else:
+                fraction = round(fraction, 2)
+
+        logger.debug('ManagementPanel: updating quota to %r.', fraction)
+        if fraction >= self.QUOTA_THRESHOLD:
+            self.quota_label.set_markup(WARNING_MARKUP % msg)
+        else:
+            self.quota_label.set_markup(msg)
+        self.quota_label.stop()
+
+        self.quota_progressbar.set_fraction(min(fraction, 1))
 
     def load(self):
         """Load the account info and file sync status list."""
 
=== modified file 'ubuntuone/controlpanel/gtk/tests/test_gui.py'
--- ubuntuone/controlpanel/gtk/tests/test_gui.py	2011-02-28 19:53:50 +0000
+++ ubuntuone/controlpanel/gtk/tests/test_gui.py	2011-02-28 22:22:10 +0000
@@ -2281,15 +2281,18 @@
         """Check that the displayed account info matches 'info'."""
         used = int(info['quota_used'])
         total = int(info['quota_total'])
-        percentage = (used / total) * 100
+        percentage = round((used / total) * 100, 2)
         expected = {'used': self.ui.humanize(used),
                     'total': self.ui.humanize(total),
                     'percentage': percentage}
-        self.assertEqual(self.ui.quota_label.get_text(),
-                         self.ui.QUOTA_LABEL % expected)
+        msg = self.ui.QUOTA_LABEL % expected
+        self.assertEqual(self.ui.quota_label.get_text(), msg)
+
+        if percentage >= self.ui.QUOTA_THRESHOLD * 100:
+            self.assert_warning_correct(self.ui.quota_label, msg)
 
         if progressbar_fraction is None:
-            progressbar_fraction = percentage / 100
+            progressbar_fraction = min(percentage / 100, 1)
         self.assertEqual(self.ui.quota_progressbar.get_fraction(),
                          progressbar_fraction)
 
@@ -2408,16 +2411,13 @@
         """The account info is processed when ready."""
         self.ui.on_account_info_ready(FAKE_ACCOUNT_INFO)
         self.assert_account_info_correct(FAKE_ACCOUNT_INFO)
-
-        for widget in (self.ui.quota_label,):
-            self.assertFalse(widget.active)
+        self.assertFalse(self.ui.quota_label.active)
 
     def test_on_account_info_error(self):
         """The account info couldn't be retrieved."""
         self.ui.on_account_info_error()
-        for widget in (self.ui.quota_label,):
-            self.assert_warning_correct(widget, gui.VALUE_ERROR)
-            self.assertFalse(widget.active)
+        self.assert_warning_correct(self.ui.quota_label, gui.VALUE_ERROR)
+        self.assertFalse(self.ui.quota_label.active)
 
     def test_on_account_info_ready_quota_unused(self):
         """The used quota is correct when unused."""
@@ -2434,6 +2434,26 @@
 
         self.assert_account_info_correct(info, progressbar_fraction=0.05)
 
+    def test_on_account_info_ready_quota_used_at_threshold(self):
+        """Show red notification when quota usage is same as threshold."""
+        info = FAKE_ACCOUNT_INFO.copy()
+
+        info['quota_total'] = '12345678'
+        info['quota_used'] = str(int(int(info['quota_total']) *
+                                     self.ui.QUOTA_THRESHOLD))
+        self.ui.on_account_info_ready(info)
+
+        self.assert_account_info_correct(info)
+
+    def test_on_account_info_ready_quota_over_threshold(self):
+        """Show red notification when quota usage is higher than threshold."""
+        info = FAKE_ACCOUNT_INFO.copy()
+        info['quota_total'] = '12345678'
+        info['quota_used'] = info['quota_total'] + '0'
+        self.ui.on_account_info_ready(info)
+
+        self.assert_account_info_correct(info)
+
     def test_file_sync_status(self):
         """The file sync status is shown correctly."""
         self.assertIsInstance(self.ui.status_label, gui.FileSyncStatus)