Merge lp:~nataliabidart/ubuntuone-control-panel/always-in-... into lp:ubuntuone-control-panel

[Natalia Bidart]

- Ensured that Folders' tree view has proper texts in the columns to have proper
  column widths (LP: #965175).

[lp:~nataliabidart/ubuntuone-control-panel/always-in-...]

303. By Natalia Bidart on 2012-03-29

Remove skip.

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[lp:~nataliabidart/ubuntuone-control-panel/always-in-...]

304. By Natalia Bidart on 2012-03-29

Merged trunk in.

305. By Natalia Bidart on 2012-03-29

Revert some changes.

306. By Natalia Bidart on 2012-03-29

- Add tests.

307. By Natalia Bidart on 2012-03-29

Better (and passing) test.

[Roberto Alsina (ralsina)]

+1

review: Approve

=== modified file 'ubuntuone/controlpanel/gui/qt/folders.py'
--- ubuntuone/controlpanel/gui/qt/folders.py	2012-03-20 13:05:20 +0000
+++ ubuntuone/controlpanel/gui/qt/folders.py	2012-03-29 15:29:19 +0000
@@ -123,7 +123,7 @@
         self.ui.folders.headerItem().setText(FOLDER_NAME_COL,
                                              FOLDERS_COLUMN_NAME)
         self.ui.folders.headerItem().setText(SUBSCRIPTION_COL,
-                                             FOLDERS_COLUMN_SYNC_LOCALLY)
+                                             ALWAYS_SUBSCRIBED)
         self.ui.folders.headerItem().setText(EXPLORE_COL,
                                              FOLDERS_COLUMN_EXPLORE)
         headers = self.ui.folders.header()

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_folders.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_folders.py	2012-03-23 14:04:57 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_folders.py	2012-03-29 15:29:19 +0000
@@ -409,6 +409,17 @@
                 item)
             it += 1
 
+    def test_tree_view_header(self):
+        """The tree view header is hidden but the text is correct."""
+        self.assertFalse(self.ui.ui.folders.header().isVisible())
+
+        name = self.ui.ui.folders.headerItem().text(gui.FOLDER_NAME_COL)
+        self.assertEqual(name, gui.FOLDERS_COLUMN_NAME)
+        name = self.ui.ui.folders.headerItem().text(gui.SUBSCRIPTION_COL)
+        self.assertEqual(name, gui.ALWAYS_SUBSCRIBED)
+        name = self.ui.ui.folders.headerItem().text(gui.EXPLORE_COL)
+        self.assertEqual(name, gui.FOLDERS_COLUMN_EXPLORE)
+
     def test_share_publish_button(self):
         """When clicking the share/publish button, the proper url is opened."""
         self.assertTrue(self.ui.ui.share_publish_button.isVisible())