Merge lp:~diegosarmentero/ubuntuone-client/menu-separator into lp:ubuntuone-client

[Diego Sarmentero]

- Adding separator between current and recent transfers (LP: #1054259).

[dobey (dobey)]

review: Approve

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'tests/platform/sync_menu/test_linux.py'
--- tests/platform/sync_menu/test_linux.py	2012-09-21 14:09:05 +0000
+++ tests/platform/sync_menu/test_linux.py	2012-09-24 13:12:20 +0000
@@ -163,6 +163,9 @@
         self.assertTrue(self._paused)
         self.sync_menu.app.data['connect'][1]()
         self.assertFalse(self._paused)
+        self.sync_menu.transfers.update_progress()
+        self.assertIsInstance(self.sync_menu.transfers.separator,
+            linux.Dbusmenu.Menuitem)
 
     def test_open_u1(self):
         """Check that the proper action is executed."""
@@ -206,7 +209,7 @@
         self.status_frontend.recent_transfers_data = data
         self.sync_menu.transfers.update_progress()
         children = self.sync_menu.transfers.get_children()
-        self.assertEqual(len(children), 3)
+        self.assertEqual(len(children), 4)
         data.reverse()
         for itemM, itemD in zip(children, data):
             self.assertEqual(itemM.property_get(
@@ -224,10 +227,12 @@
         self.status_frontend.uploading_data = data
         self.sync_menu.transfers.update_progress()
         children = self.sync_menu.transfers.get_children()
-        self.assertEqual(len(children), 3)
+        self.assertEqual(len(children), 4)
         data.reverse()
         for item in children:
             text = item.property_get(linux.Dbusmenu.MENUITEM_PROP_LABEL)
+            if text is None:
+                continue
             self.assertIn(text, uploading_data)
             size, written = uploading_data[text]
             percentage = written * 100 / size
@@ -243,7 +248,7 @@
             data_recent
         self.sync_menu.transfers.update_progress()
         children = self.sync_menu.transfers.get_children()
-        self.assertEqual(len(children), 5)
+        self.assertEqual(len(children), 6)
         data_recent.reverse()
         for itemM, itemD in zip(children, data_recent):
             self.assertEqual(itemM.property_get(
@@ -263,9 +268,9 @@
         self.sync_menu.transfers.update_progress()
         children = self.sync_menu.transfers.get_children()
         # The menu should only show 5 current transfers.
-        self.assertEqual(len(children), 10)
+        self.assertEqual(len(children), 11)
         data_current.reverse()
-        for item in children[5:]:
+        for item in children[6:]:
             text = item.property_get(linux.Dbusmenu.MENUITEM_PROP_LABEL)
             self.assertIn(text, uploading_data)
             size, written = uploading_data[text]
@@ -288,10 +293,12 @@
         self.sync_menu.transfers.update_progress()
         children = self.sync_menu.transfers.get_children()
         # The menu should only show 5 current transfers.
-        self.assertEqual(len(children), 4)
+        self.assertEqual(len(children), 5)
         data_current.reverse()
         for item in children:
             text = item.property_get(linux.Dbusmenu.MENUITEM_PROP_LABEL)
+            if text is None:
+                continue
             self.assertIn(text, uploading_data)
             size, written = uploading_data[text]
             percentage = written * 100 / size
@@ -303,7 +310,7 @@
         self.status_frontend.recent_transfers_data = data_recent
         self.sync_menu.transfers.update_progress()
         children = self.sync_menu.transfers.get_children()
-        self.assertEqual(len(children), 5)
+        self.assertEqual(len(children), 6)
         data_recent.reverse()
         for itemM, itemD in zip(children, data_recent):
             self.assertEqual(itemM.property_get(
@@ -320,9 +327,10 @@
         self.sync_menu.transfers.update_progress()
         children = self.sync_menu.transfers.get_children()
         # The menu should only show 5 current transfers.
-        self.assertEqual(len(children), 4)
+        self.assertEqual(len(children), 5)
         data_current.reverse()
-        for item in children[5:]:
+        for item in children[6:]:
+            print repr(item)
             text = item.property_get(linux.Dbusmenu.MENUITEM_PROP_LABEL)
             self.assertIn(text, uploading_data)
             size, written = uploading_data[text]

=== modified file 'ubuntuone/platform/sync_menu/linux.py'
--- ubuntuone/platform/sync_menu/linux.py	2012-09-21 12:39:52 +0000
+++ ubuntuone/platform/sync_menu/linux.py	2012-09-24 13:12:20 +0000
@@ -161,6 +161,7 @@
         self.previous_transfers = []
         self._transfers_items = {}
         self._uploading_items = {}
+        self.separator = None
 
     def start_timer(self):
         """Trigger an update in one second."""
@@ -187,6 +188,12 @@
                 temp_transfers[item] = recent_file
             self._transfers_items = temp_transfers
 
+        if self.separator is None:
+            self.separator = Dbusmenu.Menuitem()
+            self.separator.property_set(Dbusmenu.MENUITEM_PROP_TYPE,
+                Dbusmenu.CLIENT_TYPES_SEPARATOR)
+            self.child_append(self.separator)
+
         items_added = 0
         remove = []
         for item in self._uploading_items: