Merge lp:~diegosarmentero/ubuntuone-control-panel/clickshare into lp:ubuntuone-control-panel

[Diego Sarmentero]

- Allow double click in the list items to see the detailed information (LP: #1065190).

[Roberto Alsina (ralsina)]

code review only

review: Approve

[Manuel de la Peña (mandel)]

Tests pass on Q and code looks good. The only problem I see are the lint errors I get in Q, I'll approve because tarmac should block it if lint fails.

review: Approve

=== modified file 'ubuntuone/controlpanel/gui/qt/share_links.py'
--- ubuntuone/controlpanel/gui/qt/share_links.py	2012-09-28 20:26:35 +0000
+++ ubuntuone/controlpanel/gui/qt/share_links.py	2012-10-11 13:42:43 +0000
@@ -83,6 +83,8 @@
         self.ui.line_search.itemSelected.connect(self.share_file)
         self.ui.back_to_file_list.clicked.connect(self._move_to_main_list)
         self.ui.open_in_browser.clicked.connect(self._open_in_browser)
+        self.ui.tree_shared_files.itemDoubleClicked.connect(
+            self._open_properties_selected_file)
 
         # Connect backend signals
         self.backend.set_public_files_list_handler(self._load_public_files)
@@ -108,12 +110,22 @@
             yield self.backend.change_public_access(
                 full_path, True)
         else:
-            share_file_widget = ShareFileWidget(file_path)
-            self.ui.hbox_share_file.addWidget(share_file_widget)
-            share_file_widget.linkDisabled.connect(
-                lambda: self.ui.line_copy_link.setText(''))
-            self.ui.line_copy_link.setText(self._shared_files[full_path])
-            self.ui.stacked_widget.setCurrentIndex(1)
+            self.open_file_properties(file_path, full_path)
+
+    def _open_properties_selected_file(self, item):
+        """Open the file properties on double click."""
+        file_path = unicode(item.toolTip(FILE_NAME_COL))
+        full_path = expand_user(file_path.encode('utf-8')).decode('utf-8')
+        self.open_file_properties(file_path, full_path)
+
+    def open_file_properties(self, file_path, full_path):
+        """Move the stacked widget to the properties section."""
+        share_file_widget = ShareFileWidget(file_path)
+        self.ui.hbox_share_file.addWidget(share_file_widget)
+        share_file_widget.linkDisabled.connect(
+            lambda: self.ui.line_copy_link.setText(''))
+        self.ui.line_copy_link.setText(self._shared_files[full_path])
+        self.ui.stacked_widget.setCurrentIndex(1)
 
     def _file_shared(self, info):
         """Receive the notification that the file has been published."""

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_share_links.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_share_links.py	2012-09-26 20:47:46 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_share_links.py	2012-10-11 13:42:43 +0000
@@ -173,6 +173,24 @@
         actions = self.ui.ui.tree_shared_files.itemWidget(item, 2)
         self.assertIsInstance(actions, gui.ActionsButtons)
 
+    def test_tree_item_clicked(self):
+        """Check if the proper info is displayed when the item is clicked."""
+        publicfiles = [
+            {'path': '/home/file1', 'public_url': 'http:ubuntuone.com/asd123'},
+            {'path': '/home/file2', 'public_url': 'http:ubuntuone.com/qwe456'},
+        ]
+        self.ui._load_public_files(publicfiles)
+        item = self.ui.ui.tree_shared_files.topLevelItem(1)
+        self.ui.ui.tree_shared_files.itemDoubleClicked.emit(item, 0)
+        widget = self.ui.ui.hbox_share_file.itemAt(0).widget()
+
+        file_path = unicode(item.toolTip(gui.FILE_NAME_COL))
+        full_path = gui.expand_user(file_path.encode('utf-8')).decode('utf-8')
+        self.assertEqual(widget.file_path, full_path)
+        self.assertEqual(widget.ui.lbl_filename.text(),
+            os.path.basename(file_path))
+        self.assertEqual(widget.ui.lbl_path.text(), file_path)
+
 
 class ActionsButtonsTestCase(BaseTestCase):
     """Test the Actions Buttons."""