Merge lp:~diegosarmentero/ubuntuone-control-panel/x-button into lp:ubuntuone-control-panel

[Diego Sarmentero]

- Remove the text on x button pressed (LP: #1070917).

This wasn't working because the focusOutEvent was being fired before the button can detect the click, so the click over the button was actually never being executed.

[dobey (dobey)]

review: Approve

[Michał Karnicki (karni)]

review: Approve

=== modified file 'ubuntuone/controlpanel/gui/qt/share_links.py'
--- ubuntuone/controlpanel/gui/qt/share_links.py	2012-11-01 17:57:13 +0000
+++ ubuntuone/controlpanel/gui/qt/share_links.py	2012-11-02 17:19:19 +0000
@@ -84,8 +84,6 @@
         self._enhanced_line = EnhancedLineEdit(self.ui.line_search,
             self._line_close_btn, icon=":/delete_search.png",
             style='enhanced_borderless')
-        self.ui.line_search.popup.popupHidden.connect(
-            self._hide_line_btn_close_hide)
         self.ui.line_search.popup.popupShown.connect(
             self._hide_line_btn_close_show)
         EnhancedLineEdit(self.ui.line_copy_link, self._copy_link_from_line,
@@ -95,6 +93,8 @@
         self.ui.back_to_file_list.setCursor(QtCore.Qt.PointingHandCursor)
         self.ui.back_to_file_list_2.setCursor(QtCore.Qt.PointingHandCursor)
         self.ui.open_in_browser.setCursor(QtCore.Qt.PointingHandCursor)
+        self._enhanced_line.btn_operation.setCursor(
+            QtCore.Qt.ArrowCursor)
 
         self.ui.line_search.itemSelected.connect(self.share_file)
         self.ui.line_search.filesFound.connect(self._load_search_results)
@@ -248,9 +248,6 @@
         self.ui.line_search.setText('')
         self.ui.line_search.popup.hide()
         self.ui.line_search.setFocus()
-
-    def _hide_line_btn_close_hide(self):
-        """Hide the button inside the search line edit-"""
         self._enhanced_line.btn_operation.hide()
 
     def _hide_line_btn_close_show(self):
 
=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_share_links.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_share_links.py	2012-10-29 13:34:33 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_share_links.py	2012-11-02 17:19:19 +0000
@@ -171,11 +171,6 @@
         self.addCleanup(self.ui.ui.line_search.popup.hide)
         self.ui._line_close_btn()
         self.assertFalse(self.ui.ui.line_search.popup.isVisible())
-
-    def test_hide_line_btn_close_hide(self):
-        """Check the state of the inline button."""
-        self.ui._enhanced_line.btn_operation.show()
-        self.ui.ui.line_search.popup.popupHidden.emit()
         self.assertFalse(self.ui._enhanced_line.btn_operation.isVisible())
 
     def test_hide_line_btn_close_show(self):