Merge lp:~mikemc/ubuntuone-control-panel/fix-close-popup into lp:ubuntuone-control-panel

[Mike McCracken]

- Work around Qt issue where search files popup frame was not hidden after switching to another tab. (LP: #1152388)

- Work around Qt issue where search files popup frame was not hidden after switching to another tab. (LP: #1152388)

[dobey (dobey)]

Testable?

review: Needs Information

[lp:~mikemc/ubuntuone-control-panel/fix-close-popup]

401. By Mike McCracken on 2013-03-12

- Add new test for Qt connections set up inside ControlPanel's init. Requires patching before testcase setUp, so duplicates some code from UbuntuOneBinTestCase.

402. By Mike McCracken on 2013-03-12

update copyrights

403. By Mike McCracken on 2013-03-12

add test for hiding popup in handle_current_tab_changed

[dobey (dobey)]

review: Approve

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'ubuntuone/controlpanel/gui/qt/controlpanel.py'
--- ubuntuone/controlpanel/gui/qt/controlpanel.py	2012-10-18 21:45:05 +0000
+++ ubuntuone/controlpanel/gui/qt/controlpanel.py	2013-03-12 20:03:19 +0000
@@ -79,6 +79,11 @@
         self.ui.tab_widget.setTabText(
             self.ui.tab_widget.indexOf(self.ui.share_links_tab),
                 MAIN_SHARE_LINKS_TAB)
+
+        # Workaround for bug LP: 1152388
+        handler = self.ui.share_links_tab.handle_current_tab_changed
+        self.ui.tab_widget.currentChanged.connect(handler)
+
         self.ui.tab_widget.setTabText(
             self.ui.tab_widget.indexOf(self.ui.devices_tab), MAIN_DEVICES_TAB)
         self.ui.tab_widget.setTabText(
 
=== modified file 'ubuntuone/controlpanel/gui/qt/share_links.py'
--- ubuntuone/controlpanel/gui/qt/share_links.py	2012-11-02 17:15:15 +0000
+++ ubuntuone/controlpanel/gui/qt/share_links.py	2013-03-12 20:03:19 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 *-*
 
-# Copyright 2012 Canonical Ltd.
+# Copyright 2012-2013 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -107,6 +107,11 @@
         self.get_public_files()
         self._enhanced_line.btn_operation.hide()
 
+    def handle_current_tab_changed(self, index):
+        """Workaround for bug LP: 1152388"""
+        self.ui.line_search.clearFocus()
+        self.ui.line_search.popup.hide()
+
     @inlineCallbacks
     def share_file(self, file_path):
         """Clean the previous file share details and publish file_path."""
 
=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py	2012-10-17 07:21:28 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py	2013-03-12 20:03:19 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright 2011-2012 Canonical Ltd.
+# Copyright 2011-2013 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -19,10 +19,17 @@
 from __future__ import division
 
 from twisted.internet import defer
+from PyQt4 import QtCore
+
+from ubuntuone.controlpanel import backend, cache
+from ubuntuone.controlpanel.tests import TestCase
+from mock import call, Mock
+
+from ubuntuone.controlpanel.gui.qt import share_links
 
 from ubuntuone.controlpanel.gui.qt import controlpanel as gui
 from ubuntuone.controlpanel.gui.qt.tests import (
-    SAMPLE_ACCOUNT_INFO, SAMPLE_NAME,
+    FakedControlPanelBackend, SAMPLE_ACCOUNT_INFO, SAMPLE_NAME,
 )
 from ubuntuone.controlpanel.gui.qt.tests.test_ubuntuonebin import (
     UbuntuOneBinTestCase,
@@ -204,6 +211,39 @@
             self.ui.ui.wizard.pages[self.ui.ui.wizard.license_page])
 
 
+class ControlPanelConnectionTestCase(TestCase):
+    """Test qt signal connections from controlpanel."""
+
+    @defer.inlineCallbacks
+    def setUp(self):
+        cache.Cache._shared_objects = {}
+        yield super(ControlPanelConnectionTestCase, self).setUp()
+        self.patch(backend, 'ControlBackend', FakedControlPanelBackend)
+
+        self.mock_handler = Mock(name='handle_current_tab_changed')
+        self.patch(share_links.ShareLinksPanel, 'handle_current_tab_changed',
+                   self.mock_handler)
+
+        self.ui = gui.ControlPanel()
+        self.ui.show()
+        self.addCleanup(self.ui.hide)
+        #self.addCleanup(self.ui.deleteLater)
+        self.addCleanup(QtCore.QCoreApplication.instance().processEvents)
+
+        if getattr(self.ui, 'backend', None) is not None:
+            self.addCleanup(self.ui.backend._called.clear)
+
+    def test_popup_hides_when_switching_tab(self):
+        """Test that the share_links_tab gets the signal for changed tabs"""
+        folders_index = self.ui.ui.tab_widget.indexOf(self.ui.ui.folders_tab)
+        share_index = self.ui.ui.tab_widget.indexOf(self.ui.ui.share_links_tab)
+        self.ui.ui.tab_widget.setCurrentIndex(share_index)
+        self.ui.ui.tab_widget.setCurrentIndex(folders_index)
+
+        self.assertEqual(self.mock_handler.mock_calls,
+                         [call(share_index), call(folders_index)])
+
+
 class ExternalLinkButtonsTestCase(ControlPanelTestCase):
     """The link in the go-to-web buttons are correct."""
 
 
=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_share_links.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_share_links.py	2012-11-02 17:15:15 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_share_links.py	2013-03-12 20:03:19 +0000
@@ -254,6 +254,14 @@
             os.path.basename(file_path))
         self.assertEqual(widget.ui.lbl_path.text(), file_path)
 
+    def test_hide_popup_on_tab_changed(self):
+        """Test that the popup is hidden by the tab changed signal."""
+
+        self.ui.ui.line_search.popup.show()
+        self.ui.handle_current_tab_changed(0)
+        self.assertFalse(self.ui.ui.line_search.popup.isVisible())
+        self.assertFalse(self.ui.ui.line_search.hasFocus())
+
 
 class ActionsButtonsTestCase(BaseTestCase):
     """Test the Actions Buttons."""