Merge lp:~nataliabidart/magicicada-gui/the-one-percent into lp:magicicada-gui

[Natalia Bidart]

- Added a legend to transfer progress bar indicating how much bytes has been sent
  (LP: #1043802).

[Facundo Batista (facundo)]

review: Approve

[Natalia Bidart (nataliabidart)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

=== modified file 'data/ui/operations.ui'
--- data/ui/operations.ui	2012-08-21 20:10:09 +0000
+++ data/ui/operations.ui	2012-09-06 19:38:19 +0000
@@ -28,6 +28,8 @@
       <column type="gint"/>
       <!-- column-name show_transfer -->
       <column type="gboolean"/>
+      <!-- column-name transfer_text -->
+      <column type="gchararray"/>
     </columns>
   </object>
   <object class="GtkVBox" id="itself">
@@ -79,11 +81,10 @@
                 <property name="alignment">1</property>
                 <signal name="clicked" handler="on_clear_button_clicked" swapped="no"/>
                 <child>
-                  <object class="GtkCellRendererProgress" id="cellrendererprogress1">
-                    <property name="width">100</property>
-                  </object>
+                  <object class="GtkCellRendererProgress" id="cellrendererprogress1"/>
                   <attributes>
                     <attribute name="visible">6</attribute>
+                    <attribute name="text">7</attribute>
                     <attribute name="value">5</attribute>
                   </attributes>
                 </child>

=== modified file 'magicicada/gui/gtk/operations.py'
--- magicicada/gui/gtk/operations.py	2012-09-05 16:09:39 +0000
+++ magicicada/gui/gtk/operations.py	2012-09-06 19:38:19 +0000
@@ -26,6 +26,7 @@
 # pylint: disable=E0611
 from gi.repository import Gtk
 # pylint: enable=E0611
+from ubuntuone.controlpanel.gui import humanize
 
 from magicicada import queue_content, syncdaemon
 from magicicada.gui.gtk.helpers import Buildable
@@ -43,6 +44,7 @@
 REMOTE_ICON_NAME = u'folder-remote'
 TIME_UNITS = {0: _(u'second'), 1: _(u'minute'), 2: _(u'hour'), 3: _(u'day')}
 TRANSFER_OPS = (u'Upload', u'Download')
+TRANSFER_TEXT = _('{transfered} of {total} ({percent:.1f}%)')
 
 
 logger = logging.getLogger('magicicada.gui.gtk.operations')
@@ -132,7 +134,7 @@
             all_done = all(op[2][queue_content.DONE] for op in transfer_ops)
             show_transfer = not all_done
 
-        row = row + (0, show_transfer)
+        row = row + (0, show_transfer, '')
         tree_iter = self.ops_store.append(parent_iter, row)
 
         if row_key is not None:
@@ -217,5 +219,9 @@
                 logger.exception('on_transfers: failed to retrive node from '
                                  'local index to process transfer progress:')
             else:
-                transfer = int((transfered / float(total)) * 100)
-                self.ops_store.set_value(row_iter, 5, transfer)
+                transfer = (transfered / float(total)) * 100
+                self.ops_store.set_value(row_iter, 5, int(transfer))
+                text = TRANSFER_TEXT.format(transfered=humanize(transfered),
+                                            total=humanize(total),
+                                            percent=transfer)
+                self.ops_store.set_value(row_iter, 7, text)