Merge lp:~diegosarmentero/ubuntuone-control-panel/over-quota into lp:ubuntuone-control-panel

[Diego Sarmentero]

- Show special legends to the user when s/he has run out of quota (LP: #828983).

Show special legends to the user when s/he has run out of quota.

[Natalia Bidart (nataliabidart)]

== Python Lint Notices ==

ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py:
    124: [C0111, ControlPanelTestCase.test_update_over_quota] Missing docstring
    126: [W0212, ControlPanelTestCase.test_update_over_quota] Access to a protected member _update_quota of a client class
    133: [C0111, ControlPanelTestCase.test_update_quota_in_range] Missing docstring
    135: [W0212, ControlPanelTestCase.test_update_quota_in_range] Access to a protected member _update_quota of a client class

review: Needs Fixing

[lp:~diegosarmentero/ubuntuone-control-panel/over-quota]

219. By Diego Sarmentero on 2011-09-09

Changed over quota color.
merge.

220. By Diego Sarmentero on 2011-09-09

Fixed lint issues.
Improved code in update_quota

221. By Diego Sarmentero on 2011-09-09

Grouped together some styles.

222. By Diego Sarmentero on 2011-09-09

Grouped together the PROPER style now.

223. By Diego Sarmentero on 2011-09-09

Removed font size.

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

[Roberto Alsina (ralsina)]

+1

review: Approve

=== modified file 'data/qt/controlpanel.ui'
--- data/qt/controlpanel.ui	2011-09-06 15:56:06 +0000
+++ data/qt/controlpanel.ui	2011-09-09 18:53:28 +0000
@@ -132,6 +132,9 @@
                     <property name="text">
                      <string notr="true"/>
                     </property>
+                    <property name="OverQuota" stdset="0">
+                     <bool>false</bool>
+                    </property>
                    </widget>
                   </item>
                   <item>
@@ -144,6 +147,9 @@
                     <property name="text">
                      <string/>
                     </property>
+                    <property name="OverQuota" stdset="0">
+                     <bool>false</bool>
+                    </property>
                    </widget>
                   </item>
                  </layout>

=== modified file 'data/qt/ubuntuone.qss'
--- data/qt/ubuntuone.qss	2011-09-07 11:26:48 +0000
+++ data/qt/ubuntuone.qss	2011-09-09 18:53:28 +0000
@@ -241,6 +241,10 @@
     min-height: 48px;
 }
 
+QLabel[OverQuota="false"] {
+    color: #333333;
+}
+
 QLabel#other_devices_label {
     font: bold 16px;
 }
@@ -262,8 +266,8 @@
     font-size: 10px;
 }
 
+QLabel[OverQuota="true"],
 QLabel#warning_label {
-    font: bold 14px;
     color: #df2d1f;
 }
 

=== modified file 'ubuntuone/controlpanel/gui/qt/controlpanel.py'
--- ubuntuone/controlpanel/gui/qt/controlpanel.py	2011-09-09 00:11:12 +0000
+++ ubuntuone/controlpanel/gui/qt/controlpanel.py	2011-09-09 18:53:28 +0000
@@ -32,6 +32,7 @@
     GET_SUPPORT_LINK,
     GREETING,
     PERCENTAGE_LABEL,
+    QUOTA_THRESHOLD,
     TWITTER_LINK,
     USAGE_LABEL,
 )
@@ -93,10 +94,36 @@
 
         used = int(info['quota_used'])
         total = int(info['quota_total'])
-        percentage = {'percentage': PERCENTAGE_STYLE % ((used / total) * 100)}
+        percentage_value = ((used / total) * 100)
+        percentage = {'percentage': PERCENTAGE_STYLE % percentage_value}
         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})
+
+    @log_call(logger.debug)
+    def _update_quota(self, data=None):
+        """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)
+        self.ui.percentage_usage_label.style().unpolish(
+            self.ui.percentage_usage_label)
+        self.ui.percentage_usage_label.style().polish(
+            self.ui.percentage_usage_label)
+        self.ui.quota_usage_label.style().unpolish(
+            self.ui.quota_usage_label)
+        self.ui.quota_usage_label.style().polish(self.ui.quota_usage_label)
 
     @QtCore.pyqtSlot()
     def on_twitter_button_clicked(self):

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py	2011-09-08 19:37:50 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py	2011-09-09 18:53:28 +0000
@@ -121,6 +121,30 @@
         msg = gui.PERCENTAGE_LABEL % percentage_usage
         self.assertEqual(self.ui.ui.percentage_usage_label.text(), msg)
 
+    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})
+        # pylint: enable=W0212
+
+        self.assertTrue(
+            self.ui.ui.percentage_usage_label.property("OverQuota").toBool())
+        self.assertTrue(
+            self.ui.ui.quota_usage_label.property("OverQuota").toBool())
+
+    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})
+        # pylint: enable=W0212
+
+        self.assertFalse(
+            self.ui.ui.percentage_usage_label.property("OverQuota").toBool())
+        self.assertFalse(
+            self.ui.ui.quota_usage_label.property("OverQuota").toBool())
+
     def test_on_local_device_removed(self):
         """On DeviesPanel's localDeviceRemoved, emit credentialsNotFound."""
         self.ui.ui.devices_tab.localDeviceRemoved.emit()