Merge lp:~nataliabidart/ubuntuone-control-panel/stable-3-0-update-2.99.2 into lp:ubuntuone-control-panel/stable-3-0

[Natalia Bidart]

[ Diego Sarmentero <email address hidden> ]
  - Fixed: two remove buttons (LP: #904551).
[ Robert Alsina <email address hidden> ]
  - Make control panel a unique instance app on windows (LP: #862997).

[Roberto Alsina (ralsina)]

+1

review: Approve

[dobey (dobey)]

review: Approve

=== modified file 'ubuntuone/controlpanel/gui/qt/devices.py'
--- ubuntuone/controlpanel/gui/qt/devices.py	2011-11-28 15:06:18 +0000
+++ ubuntuone/controlpanel/gui/qt/devices.py	2012-01-17 16:56:26 +0000
@@ -81,6 +81,7 @@
         for i in reversed(range(children)):
             widget = box.itemAt(i).widget()
             box.removeWidget(widget)
+            widget.deleteLater()
 
     def update_device_info(self, device_info):
         """Update one device."""

=== modified file 'ubuntuone/controlpanel/gui/qt/main/__init__.py'
--- ubuntuone/controlpanel/gui/qt/main/__init__.py	2011-11-14 11:46:39 +0000
+++ ubuntuone/controlpanel/gui/qt/main/__init__.py	2012-01-17 16:56:26 +0000
@@ -18,13 +18,11 @@
 
 import sys
 
-from PyQt4 import QtGui
-
 # Module used to include the resources into this file
 # Unused import images_rc, pylint: disable=W0611
 from ubuntuone.controlpanel.gui.qt.ui import images_rc
 # pylint: enable=W0611
-
+from ubuntuone.controlpanel.gui.qt.uniqueapp import UniqueApplication
 
 # Invalid name "source", pylint: disable=C0103
 if sys.platform == 'win32':
@@ -42,7 +40,7 @@
     # because u1trial already provides a reactor.
 
     # The main loop MUST be initialized before importing the reactor
-    app = QtGui.QApplication(sys.argv)
+    app = UniqueApplication(sys.argv, "ubuntuone-control-panel")
     source.main(app)
 
     # Reimport 'qt4reactor', 'reactor', 'start', pylint: disable=W0404, F0401
@@ -59,6 +57,8 @@
     icon, window = start(reactor.stop,
                          minimized=minimized, with_icon=with_icon)
     # pylint: enable=W0612
+    if icon:
+        app.new_instance.connect(icon.restore_window)
 
     reactor.run()
     # pylint: enable=E1101

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_devices.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_devices.py	2011-11-28 15:06:18 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_devices.py	2012-01-17 16:56:26 +0000
@@ -35,6 +35,7 @@
     innerclass_ui = gui.devices_ui
     innerclass_name = "Ui_Form"
     class_ui = gui.DevicesPanel
+    executed = False
 
     @defer.inlineCallbacks
     def setUp(self):
@@ -88,6 +89,27 @@
             device = self.ui.ui.list_devices.itemWidget(item)
             self.assertEqual(device.text(), remote_device['name'])
 
+    def test_remove_device_and_check_layout_state(self):
+        """Test if the widget is properly removed."""
+        self.ui.process_info(SAMPLE_DEVICES_INFO)
+        self.ui.show()
+
+        self.assertEqual(self.ui.ui.local_device_box.count(), 1)
+        local_device = self.ui.ui.local_device_box.itemAt(0).widget()
+        self.executed = False
+
+        def delete_later(reference=None):
+            """Fake delete later."""
+            self.executed = True
+        self.patch(local_device, "deleteLater", delete_later)
+        self.ui.clear_device_info(self.ui.ui.local_device_box)
+        self.ui.process_info(SAMPLE_DEVICES_INFO)
+        self.assertEqual(self.ui.ui.local_device_box.count(), 1)
+        local_device2 = self.ui.ui.local_device_box.itemAt(0).widget()
+        self.assertNotEqual(local_device, local_device2)
+        self.assertTrue(self.executed)
+        self.assertFalse(local_device.isVisible())
+
     def test_process_info_twice(self):
         """The widget is updated with the info."""
         self.test_process_info()

=== added directory 'ubuntuone/controlpanel/gui/qt/uniqueapp'
=== added file 'ubuntuone/controlpanel/gui/qt/uniqueapp/__init__.py'
--- ubuntuone/controlpanel/gui/qt/uniqueapp/__init__.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/controlpanel/gui/qt/uniqueapp/__init__.py	2012-01-17 16:56:26 +0000
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright 2011 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
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""A QApplication that starts a single instance."""
+
+#pylint: disable=W0404
+import sys
+
+if sys.platform == "win32":
+    import windows as platform
+else:
+    import linux as platform
+
+#pylint: disable=C0103
+UniqueApplication = platform.UniqueApplication

=== added file 'ubuntuone/controlpanel/gui/qt/uniqueapp/linux.py'
--- ubuntuone/controlpanel/gui/qt/uniqueapp/linux.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/controlpanel/gui/qt/uniqueapp/linux.py	2012-01-17 16:56:26 +0000
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright 2011 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
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""A QApplication that starts a single instance."""
+
+from PyQt4 import QtGui, QtCore
+
+
+class UniqueApplication(QtGui.QApplication):
+
+    """A dummy UniqueApplication class."""
+
+    new_instance = QtCore.pyqtSignal()
+
+    def __init__(self, argv, key):
+        super(UniqueApplication, self).__init__(argv)

=== added directory 'ubuntuone/controlpanel/gui/qt/uniqueapp/tests'
=== added file 'ubuntuone/controlpanel/gui/qt/uniqueapp/tests/__init__.py'
--- ubuntuone/controlpanel/gui/qt/uniqueapp/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/controlpanel/gui/qt/uniqueapp/tests/__init__.py	2012-01-17 16:56:26 +0000
@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright 2011-2012 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
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Tests for the UniqueApplication class."""

=== added file 'ubuntuone/controlpanel/gui/qt/uniqueapp/tests/test_windows.py'
--- ubuntuone/controlpanel/gui/qt/uniqueapp/tests/test_windows.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/controlpanel/gui/qt/uniqueapp/tests/test_windows.py	2012-01-17 16:56:26 +0000
@@ -0,0 +1,135 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright 2011-2012 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
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Tests for the UniqueApplication class."""
+
+from PyQt4 import QtCore
+from twisted.internet.defer import inlineCallbacks
+
+from ubuntuone.controlpanel.gui.qt.uniqueapp import windows as uniqueapp
+from ubuntuone.controlpanel.tests import TestCase
+
+
+#pylint: disable=C0103
+class FakeLocalSocket(object):
+    """A fake QLocalSocket."""
+
+    def __init__(self):
+        self.connect_calls = []
+        self.connect_timeouts = []
+        self.connect_succeeds = True
+
+    def connectToServer(self, *args, **kwargs):
+        """Fake connectToServer."""
+        self.connect_calls.append((args, kwargs))
+
+    def waitForConnected(self, timeout):
+        """Fake waitForConnected."""
+        self.connect_timeouts.append(timeout)
+        return self.connect_succeeds
+
+
+class FakeSignal(object):
+
+    """A fake PyQt signal."""
+
+    def __init__(self, *args, **kwargs):
+        """Initialize."""
+        self.target = None
+
+    def connect(self, target):
+        """Fake connect."""
+        self.target = target
+
+    def disconnect(self, *args):
+        """Fake disconnect."""
+        self.target = None
+
+    def emit(self, *args):
+        """Fake emit."""
+        if self.target:
+            self.target(*args)
+
+
+class FakeLocalServer(object):
+
+    """A fake QLocalServer."""
+
+    def __init__(self):
+        self.newConnection = FakeSignal()
+        self.listen_args = []
+
+    def listen(self, *args, **kwargs):
+        """Fake listen."""
+        self.listen_args.append((args, kwargs))
+
+
+class FakeApplication(object):
+    """A fake QApplication."""
+
+
+class UniqueAppTestCase(TestCase):
+    """Test the UniqueAppplication class."""
+
+    @inlineCallbacks
+    def setUp(self):
+        yield super(UniqueAppTestCase, self).setUp()
+        self.local_socket = FakeLocalSocket()
+        self.patch(uniqueapp.QtNetwork, "QLocalSocket",
+            lambda: self.local_socket)
+        self.local_server = FakeLocalServer()
+        self.patch(uniqueapp.QtNetwork, "QLocalServer",
+            lambda parent: self.local_server)
+        self.patch(uniqueapp.sys, "exit", self._set_called)
+        self.fake_quit = FakeSignal()
+        self.patch(uniqueapp.UniqueApplication, "aboutToQuit", self.fake_quit)
+        self.patch(uniqueapp.QtGui, "QApplication", FakeApplication)
+
+    def test_client_socket(self):
+        """Check that the client socket is used correctly."""
+        self.local_socket.connect_succeeds = True
+        uniqueapp.UniqueApplication([], "key")
+        self.assertEqual(self.local_socket.connect_calls,
+        [(("key", QtCore.QIODevice.WriteOnly), {})])
+        self.assertEqual(self.local_socket.connect_timeouts,
+        [500])
+        # The connection succeeds, so it should stop
+        self.assertEqual(self._called, ((), {}))
+
+    def test_server_socket(self):
+        """Check that the server socket is used correctly."""
+        self.local_socket.connect_succeeds = False
+        uniqueapp.UniqueApplication([], "key")
+        self.assertEqual(self.local_socket.connect_calls,
+        [(("key", QtCore.QIODevice.WriteOnly), {})])
+        self.assertEqual(self.local_socket.connect_timeouts,
+        [500])
+
+        # Should not exit
+        self.assertEqual(self._called, False)
+
+    def test_signal_connection(self):
+        """Check that new_instance is correctly connected."""
+        app = uniqueapp.UniqueApplication([], "key")
+        # Yes, this is ugly. I can't find any other meaningful
+        # way to compare them though.
+        self.assertEqual(str(app.server.newConnection.target.__self__),
+            str(app.new_instance))
+
+    def test_cleanup(self):
+        """Check that cleanup is called with the right key."""
+        app = uniqueapp.UniqueApplication([], "key")
+        self.assertEqual(self.fake_quit.target, app.cleanup)

=== added file 'ubuntuone/controlpanel/gui/qt/uniqueapp/windows.py'
--- ubuntuone/controlpanel/gui/qt/uniqueapp/windows.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/controlpanel/gui/qt/uniqueapp/windows.py	2012-01-17 16:56:26 +0000
@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright 2011 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
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""A QApplication that starts a single instance."""
+
+import sys
+
+from PyQt4 import QtNetwork, QtGui, QtCore
+
+
+class UniqueApplication(QtGui.QApplication):
+
+    """A QApplication that can only be started once.
+
+    Also, the new instance notifies the old one to show
+    its window.
+    """
+
+    new_instance = QtCore.pyqtSignal()
+
+    def __init__(self, argv, key):
+        super(UniqueApplication, self).__init__(argv)
+        self.key = key
+        self.server = QtNetwork.QLocalServer(self)
+        self.server.newConnection.connect(self.new_instance.emit)
+        self.aboutToQuit.connect(self.cleanup)
+        # Try to connect to existing app
+        socket = QtNetwork.QLocalSocket()
+        socket.connectToServer(key, QtCore.QIODevice.WriteOnly)
+        if socket.waitForConnected(500):
+            # Connected, exit
+            sys.exit()
+
+        # Not connected, start server
+        self.ready = self.server.listen(key)
+
+    def cleanup(self):
+        """Remove the socket when we die."""
+        self.server.removeServer(self.key)