Merge lp:~diegosarmentero/ubuntuone-control-panel/mouse-events into lp:ubuntuone-control-panel

[Diego Sarmentero]

- Popup list accept mouse events (LP: #1056192).

[lp:~diegosarmentero/ubuntuone-control-panel/mouse-events]

361. By Diego Sarmentero on 2012-09-28

merge

[Roberto Alsina (ralsina)]

looks good!

review: Approve

[dobey (dobey)]

I am getting a lot of WARNING output to console, and some other debug info, along with a couple of AssertionErrors, when running this from your branch. Running the installed version of control-panel I have, doesn't do this.

review: Needs Fixing

[lp:~diegosarmentero/ubuntuone-control-panel/mouse-events]

362. By Diego Sarmentero on 2012-09-28

merge

[dobey (dobey)]

review: Approve

=== modified file 'ubuntuone/controlpanel/gui/qt/share_file.py'
--- ubuntuone/controlpanel/gui/qt/share_file.py	2012-08-27 15:00:01 +0000
+++ ubuntuone/controlpanel/gui/qt/share_file.py	2012-09-28 20:31:21 +0000
@@ -20,6 +20,8 @@
 
 from PyQt4 import QtGui, QtCore
 
+from ubuntuone.platform import expand_user
+
 from ubuntuone.controlpanel import cache
 from ubuntuone.controlpanel.gui.qt.share_links_search import (
     get_system_icon_for_filename,
@@ -40,11 +42,12 @@
         super(ShareFileWidget, self).__init__(*args, **kwargs)
         self.ui = share_file_ui.Ui_Form()
         self.ui.setupUi(self)
-        self.file_path = file_path
+        full_path = expand_user(file_path.encode('utf-8'))
+        self.file_path = full_path.decode('utf-8')
 
         self.ui.lbl_filename.setText(os.path.basename(file_path))
         self.ui.lbl_path.setText(file_path)
-        icon = get_system_icon_for_filename(os.path.expanduser(file_path))
+        icon = get_system_icon_for_filename(full_path)
         pixmap = icon.pixmap(24)
         self.ui.lbl_icon.setPixmap(pixmap)
 
@@ -53,11 +56,10 @@
 
     def open_file(self):
         """Open the specified file."""
-        path = u'file://%s' % self.file_path
+        path = 'file://%s' % self.file_path
         QtGui.QDesktopServices.openUrl(QtCore.QUrl(path))
 
     def disable_link(self, val):
         """Change the access of the file to Not Public."""
-        self.backend.change_public_access(
-            os.path.expanduser(self.file_path), False)
+        self.backend.change_public_access(self.file_path, False)
         self.linkDisabled.emit()

=== modified file 'ubuntuone/controlpanel/gui/qt/share_links.py'
--- ubuntuone/controlpanel/gui/qt/share_links.py	2012-08-27 15:00:01 +0000
+++ ubuntuone/controlpanel/gui/qt/share_links.py	2012-09-28 20:31:21 +0000
@@ -21,6 +21,8 @@
 from PyQt4 import QtGui, QtCore
 from twisted.internet.defer import inlineCallbacks
 
+from ubuntuone.platform import expand_user
+
 from ubuntuone.controlpanel.logger import setup_logging
 from ubuntuone.controlpanel.gui import (
     COPY_LINK,
@@ -57,6 +59,7 @@
     logger = logger
     _enhanced_line = None
     home_dir = ''
+    _shared_files = {}
 
     def _setup(self):
         """Do some extra setupping for the UI."""
@@ -91,17 +94,26 @@
     @inlineCallbacks
     def share_file(self, file_path):
         """Clean the previous file share details and publish file_path."""
+        file_path = unicode(file_path)
         if self.ui.hbox_share_file.count() > 0:
             widget = self.ui.hbox_share_file.takeAt(0).widget()
             widget.close()
-        self.is_processing = True
-        file_path = unicode(file_path)
-        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(''))
-        yield self.backend.change_public_access(
-            os.path.expanduser(file_path), True)
+        full_path = expand_user(file_path.encode('utf-8')).decode('utf-8')
+        if full_path not in self._shared_files:
+            self.is_processing = True
+            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(''))
+            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)
 
     def _file_shared(self, info):
         """Receive the notification that the file has been published."""
@@ -135,17 +147,19 @@
     def _load_public_files(self, publicfiles):
         """Load the list of public files."""
         self.ui.tree_shared_files.clear()
+        self._shared_files = {}
         for pfile in publicfiles:
             item = QtGui.QTreeWidgetItem()
             path = pfile['path']
             public_url = pfile['public_url']
+            self._shared_files[path] = public_url
             name = os.path.basename(path)
             item.setText(FILE_NAME_COL, name)
             tooltip = path
             if tooltip.startswith(self.home_dir):
                 tooltip = tooltip.replace(self.home_dir, '~', 1)
             item.setToolTip(FILE_NAME_COL, tooltip)
-            icon = get_system_icon_for_filename(path)
+            icon = get_system_icon_for_filename(path.encode('utf-8'))
             item.setIcon(FILE_NAME_COL, icon)
 
             self.ui.tree_shared_files.setColumnWidth(PUBLIC_LINK_COL, 300)

=== modified file 'ubuntuone/controlpanel/gui/qt/share_links_search.py'
--- ubuntuone/controlpanel/gui/qt/share_links_search.py	2012-09-14 20:23:13 +0000
+++ ubuntuone/controlpanel/gui/qt/share_links_search.py	2012-09-28 20:31:21 +0000
@@ -21,6 +21,8 @@
 from PyQt4 import QtGui, QtCore
 from twisted.internet.defer import inlineCallbacks
 
+from ubuntuone.platform import expand_user
+
 from ubuntuone.controlpanel import cache
 from ubuntuone.controlpanel.logger import setup_logging
 
@@ -29,7 +31,7 @@
 
 def get_system_icon_for_filename(file_path):
     """Return the icon used for the system to represent this file."""
-    fileinfo = QtCore.QFileInfo(os.path.expanduser(file_path))
+    fileinfo = QtCore.QFileInfo(expand_user(file_path))
     icon_provider = QtGui.QFileIconProvider()
     icon = icon_provider.icon(fileinfo)
     return icon
@@ -65,10 +67,19 @@
             QtCore.Qt.Key_Enter: self._key_return_pressed,
         }
 
+        self.popup.list_widget.itemPressed.connect(self._set_selected_item)
+        self.popup.list_widget.verticalScrollBar().valueChanged.connect(
+            self._scroll_fetch_more)
         self.textChanged.connect(self.filter)
 
         self._get_volumes_info()
 
+    def _scroll_fetch_more(self, value):
+        """Fetch more items into the list on scroll."""
+        if self.popup.list_widget.verticalScrollBar().maximum() == value:
+            filenames = self._get_filtered_list(self.temp_u1_files)
+            self.popup.fetch_more(filenames)
+
     @inlineCallbacks
     def _get_volumes_info(self):
         """Get the volumes info."""
@@ -260,7 +271,7 @@
             file_widget = FileItem(file_)
             self.list_widget.addItem(item)
             self.list_widget.setItemWidget(item, file_widget)
-            icon = get_system_icon_for_filename(file_)
+            icon = get_system_icon_for_filename(file_.encode('utf-8'))
             item.setIcon(icon)
         if file_items:
             self.list_widget.setCurrentRow(0)
@@ -272,7 +283,7 @@
             file_widget = FileItem(file_)
             self.list_widget.addItem(item)
             self.list_widget.setItemWidget(item, file_widget)
-            icon = get_system_icon_for_filename(file_)
+            icon = get_system_icon_for_filename(file_.encode('utf-8'))
             item.setIcon(icon)
 
     def showEvent(self, event):

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_share_file.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_share_file.py	2012-08-28 00:32:41 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_share_file.py	2012-09-28 20:31:21 +0000
@@ -20,6 +20,8 @@
 
 from PyQt4 import QtGui, QtCore
 
+from ubuntuone.platform import expand_user
+
 from ubuntuone.controlpanel.gui.qt import share_file as gui
 from ubuntuone.controlpanel.gui.qt.tests import (
     BaseTestCase,
@@ -54,7 +56,7 @@
         self.patch(QtGui, "QDesktopServices", fake_desktop_service)
         self.ui.ui.btn_open.click()
 
-        expected = QtCore.QUrl(u'file://%s' % self.file_path)
+        expected = QtCore.QUrl('file://%s' % self.file_path)
         self.assertEqual(expected, fake_desktop_service.opened_url)
 
     def test_disable_link(self):
@@ -71,6 +73,7 @@
             fake_change_access)
         self.ui.ui.btn_disable.click()
 
-        expected = [os.path.expanduser(self.file_path), False]
+        expected = [expand_user(
+            self.file_path.encode('utf-8')).decode('utf-8'), False]
         self.assertEqual(data, expected)
         self.assertEqual(self._called, ((), {}))

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_share_links.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_share_links.py	2012-08-28 00:32:41 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_share_links.py	2012-09-28 20:31:21 +0000
@@ -78,6 +78,24 @@
         self.assertEqual(self.ui.ui.stacked_widget.currentIndex(), 1)
         self.assertFalse(self.ui.is_processing)
 
+    def test_file_already_shared(self):
+        """Check the behavior of the widgets when there is a shared file."""
+        data = []
+
+        def fake_method(self, *args):
+            """Fake callback."""
+            data.append((args))
+
+        self.patch(self.ui.backend, "change_public_access", fake_method)
+        path = '/home/user/Ubuntu One/file1.txt'
+        shared = {
+            '/home/user/Ubuntu One/file1.txt': 'http://ubuntuone.com/asd123'}
+        self.ui._shared_files = shared
+        self.ui.share_file(path)
+        self.assertEqual(self.ui.ui.line_copy_link.text(), shared[path])
+        self.assertEqual(self.ui.ui.stacked_widget.currentIndex(), 1)
+        self.assertEqual(data, [])
+
     def test_open_in_browser(self):
         """Test the execution of open_in_browser."""
         fake_desktop_service = FakeDesktopService()

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_share_links_search.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_share_links_search.py	2012-09-24 17:56:23 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_share_links_search.py	2012-09-28 20:31:21 +0000
@@ -18,6 +18,7 @@
 
 import os
 
+from dirspec import utils
 from twisted.internet import defer
 
 from ubuntuone.controlpanel.gui.tests import USER_HOME
@@ -27,6 +28,7 @@
 
 # pylint: disable=W0212
 
+
 class SearchBoxTestCase(BaseTestCase):
     """Test the qt control panel."""
 
@@ -36,6 +38,7 @@
     def setUp(self):
         yield super(SearchBoxTestCase, self).setUp()
 
+        self.patch(utils, "user_home", USER_HOME)
         self.patch(self.ui._thread_explore, "get_folder_info",
             self.fake_get_folder_info)
         self.patch(self.ui._thread_explore, "start",
@@ -52,6 +55,11 @@
                 os.path.join(USER_HOME, 'blabla', 'iop'),
             ]
         }
+        self._slot_item = None
+
+    def fake_slot(self, item):
+        """Fake function to be called when itemSelected is emitted."""
+        self._slot_item = item
 
     def fake_get_folder_info(self, folder):
         """Fake get_folder_info."""
@@ -132,7 +140,33 @@
         self.ui._process_volumes_info([(0, 0, data1), (0, 0, data2)])
         self.ui.popup.list_widget.setCurrentRow(1)
         current = self.ui.popup.list_widget.currentRow()
+        self.ui.itemSelected.connect(self.fake_slot)
         self.ui._key_return_pressed(current)
+        expected = unicode(self._slot_item).replace('~', USER_HOME)
+        self.assertEqual(expected, self.folder_info['folder2'][2])
+
+    def test_mouse_click_pressed(self):
+        """Check the proper actions are executed when click is pressed."""
+        data1 = [{'path': 'folder1'}]
+        data2 = [{'realpath': 'folder2'}]
+        self.ui._process_volumes_info([(0, 0, data1), (0, 0, data2)])
+        self.ui.popup.list_widget.setCurrentRow(1)
+        current = self.ui.popup.list_widget.currentItem()
+        self.ui.itemSelected.connect(self.fake_slot)
+        self.ui.popup.list_widget.itemPressed.emit(current)
+        expected = unicode(self._slot_item).replace('~', USER_HOME)
+        self.assertEqual(expected, self.folder_info['folder2'][2])
+
+    def test_mouse_scroll(self):
+        """Check that fetch_more is called when we reach the end of scroll."""
+        data1 = [{'path': 'folder1'}]
+        data2 = [{'realpath': 'folder2'}]
+        self.ui._process_volumes_info([(0, 0, data1), (0, 0, data2)])
+        self.patch(self.ui.popup, "fetch_more", self._set_called)
+        self.ui._scroll_fetch_more(
+            self.ui.popup.list_widget.verticalScrollBar().maximum())
+        expected = (([],), {})
+        self.assertEqual(expected, self._called)
 
     def test_key_space_pressed(self):
         """Check the proper actions are executed on key space pressed."""