Merge lp:~dobey/ubuntuone-control-panel/update-4-0 into lp:ubuntuone-control-panel/stable-4-0

[dobey]

[Roberto Alsina]

    - Made handling of the space key more robust in the search field. (LP:1042806)

[Eric Casteleijn (thisfred)]

review: Approve

[lp:~dobey/ubuntuone-control-panel/update-4-0]

341. By Roberto Alsina on 2012-09-18

[Roberto Alsina]

    - Made handling of the space key more robust in the search field. (LP:1042806)

=== modified file 'ubuntuone/controlpanel/gui/qt/share_links_search.py'
--- ubuntuone/controlpanel/gui/qt/share_links_search.py	2012-08-28 19:47:27 +0000
+++ ubuntuone/controlpanel/gui/qt/share_links_search.py	2012-09-18 18:12:21 +0000
@@ -141,6 +141,8 @@
     def _key_space_pressed(self):
         """The user pressed the space key."""
         item = self.popup.list_widget.currentItem()
+        if item is None:
+            return False
         widget = self.popup.list_widget.itemWidget(item)
         self.setText(widget.name)
         self.popup.hide()

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_share_links_search.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_share_links_search.py	2012-08-28 19:38:24 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_share_links_search.py	2012-09-18 18:12:21 +0000
@@ -73,7 +73,7 @@
         self.assertTrue(self.ui.isEnabled())
 
     def test_key_down_pressed(self):
-        """Check the proper action are executed on key down pressed."""
+        """Check the proper actions are executed on key down pressed."""
         data1 = [{'path': 'folder1'}]
         data2 = [{'realpath': 'folder2'}]
         self.ui._process_volumes_info([(0, 0, data1), (0, 0, data2)])
@@ -83,7 +83,7 @@
         self.assertEqual(self.ui.popup.list_widget.currentRow(), 2)
 
     def test_key_down_pressed_load_more_items(self):
-        """Check the proper action are executed on key down pressed."""
+        """Check the proper actions are executed on key down pressed."""
         data = []
 
         def fake_fetch_more(filenames):
@@ -105,7 +105,7 @@
         self.assertEqual(data, [True])
 
     def test_key_up_pressed(self):
-        """Check the proper action are executed on key up pressed."""
+        """Check the proper actions are executed on key up pressed."""
         data1 = [{'path': 'folder1'}]
         data2 = [{'realpath': 'folder2'}]
         self.ui._process_volumes_info([(0, 0, data1), (0, 0, data2)])
@@ -115,7 +115,7 @@
         self.assertEqual(self.ui.popup.list_widget.currentRow(), 0)
 
     def test_key_up_pressed_stay_in_0(self):
-        """Check the proper action are executed on key up pressed."""
+        """Check the proper actions are executed on key up pressed."""
         data1 = [{'path': 'folder1'}]
         data2 = [{'realpath': 'folder2'}]
         self.ui._process_volumes_info([(0, 0, data1), (0, 0, data2)])
@@ -126,7 +126,7 @@
         self.assertEqual(self.ui.popup.list_widget.currentRow(), 0)
 
     def test_key_return_pressed(self):
-        """Check the proper action are executed on key return pressed."""
+        """Check the proper actions are executed on key return pressed."""
         data1 = [{'path': 'folder1'}]
         data2 = [{'realpath': 'folder2'}]
         self.ui._process_volumes_info([(0, 0, data1), (0, 0, data2)])
@@ -135,7 +135,7 @@
         self.ui._key_return_pressed(current)
 
     def test_key_space_pressed(self):
-        """Check the proper action are executed on key space pressed."""
+        """Check the proper actions are executed on key space pressed."""
         data = []
 
         def fake_set_text(text):
@@ -152,6 +152,11 @@
         expected = ['iop']
         self.assertEqual(expected, data)
 
+    def test_key_space_pressed_without_selection(self):
+        """Check the proper actions are executed on key space pressed."""
+        self.ui.popup.list_widget.setCurrentItem(None)
+        self.assertFalse(self.ui._key_space_pressed())
+
     def test_process_volumes_info(self):
         """Check that _process_volumes_info obtain the proper info."""
         data1 = [{'path': 'folder1'}]