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

[dobey]

[Mike McCracken]

    - Call raise_() after show() to ensure the window is brought to the front on darwin. (LP: #1018614)
    - On Darwin, install qt4reactor after QApplication is created. (LP: #1015825)

[Diego Sarmentero]

    - Replacing side widget logo (LP: #1020187).

[Alejandro J. Cura (alecu)]

+1

review: Approve (trivial)

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~dobey/ubuntuone-control-panel/update-4-0 into lp:ubuntuone-control-panel/stable-4-0 failed. Below is the output from the failed tests.

*** Running DBus test suite ***
ubuntuone.controlpanel.dbustests.test_dbus_service
  BaseTestCase
    runTest ... [OK]
  DBusServiceMainTestCase
    test_dbus_service_cant_register ... Control panel backend already running.
                                   [OK]
    test_dbus_service_main ... [OK]
  DBusServiceTestCase
    test_cant_register_twice ... [SKIPPED]
    test_dbus_busname_created ... [OK]
    test_error_handler_default ... [OK]
    test_error_handler_with_exception ... [OK]
    test_error_handler_with_failure ... [OK]
    test_error_handler_with_non_string_dict ... [OK]
    test_error_handler_with_string_dict ... [OK]
    test_register_service ... [OK]
  FileSyncTestCase
    test_file_sync_status_changed ... [OK]
    test_file_sync_status_disabled ... [OK]
    test_file_sync_status_disconnected ... [OK]
    test_file_sync_status_error ... [OK]
    test_file_sync_status_idle ... [OK]
    test_file_sync_status_starting ... [OK]
    test_file_sync_status_stopped ... [OK]
    test_file_sync_status_syncing ... [OK]
    test_file_sync_status_unknown ... [OK]
    test_status_changed_handler ... [OK]
    test_status_changed_handler_after_status_requested ... [OK]
    test_status_changed_handler_after_status_requested_twice ... [OK]
  OperationsAuthErrorTestCase
    test_account_info_returned ... [OK]
    test_change_device_settings ... [OK]
    test_change_replication_settings ... [OK]
    test_change_volume_settings ... [OK]
    test_connect_files ... [OK]
    test_devices_info_returned ... [OK]
    test_disable_files ... [OK]
    test_disconnect_files ... [OK]
    test_enable_files ... [OK]
    test_remove_device ... [OK]
    test_replications_info ... [OK]
    test_restart_files ... [OK]
    t...

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

332. By Diego Sarmentero on 2012-07-19

[Mike McCracken]

    - Call raise_() after show() to ensure the window is brought to the front on darwin. (LP: #1018614)
    - On Darwin, install qt4reactor after QApplication is created. (LP: #1015825)

[Diego Sarmentero]

    - Replacing side widget logo (LP: #1020187).

=== modified file 'bin/ubuntuone-control-panel-qt'
--- bin/ubuntuone-control-panel-qt	2012-06-15 21:28:44 +0000
+++ bin/ubuntuone-control-panel-qt	2012-07-18 19:11:24 +0000
@@ -22,7 +22,7 @@
 import signal
 import sys
 
-if sys.platform in ('win32', 'darwin'):
+if sys.platform == 'win32':
     import qt4reactor
     qt4reactor.install()
 
@@ -31,4 +31,4 @@
 
 if __name__ == "__main__":
     signal.signal(signal.SIGINT, signal.SIG_DFL)
-    main.main(sys.argv)
+    main.main(sys.argv, install_reactor_darwin=True)

=== modified file 'data/logo.png'
Binary files data/logo.png	2012-02-29 21:33:02 +0000 and data/logo.png	2012-07-18 19:11:24 +0000 differ
=== modified file 'ubuntuone/controlpanel/gui/qt/gui.py'
--- ubuntuone/controlpanel/gui/qt/gui.py	2012-06-15 22:09:46 +0000
+++ ubuntuone/controlpanel/gui/qt/gui.py	2012-07-18 19:11:24 +0000
@@ -119,14 +119,15 @@
             window = MainWindow(installer=installer)
         else:
             window = MainWindow(close_callback=close_callback,
-                installer=installer)
+                                installer=installer)
         app = QtGui.QApplication.instance()
         style = QtGui.QStyle.alignedRect(
-                    QtCore.Qt.LeftToRight, QtCore.Qt.AlignCenter,
-                    window.size(), app.desktop().availableGeometry())
+            QtCore.Qt.LeftToRight, QtCore.Qt.AlignCenter,
+            window.size(), app.desktop().availableGeometry())
         window.setGeometry(style)
         window.check_updates()
         window.show()
+        window.raise_()
     else:
         window = None
     if with_icon or minimized:

=== modified file 'ubuntuone/controlpanel/gui/qt/main/__init__.py'
--- ubuntuone/controlpanel/gui/qt/main/__init__.py	2012-06-15 22:02:39 +0000
+++ ubuntuone/controlpanel/gui/qt/main/__init__.py	2012-07-18 19:11:24 +0000
@@ -61,7 +61,13 @@
     return result
 
 
-def main(args):
+def install_qt4reactor():
+    """Import and install the qt4reactor."""
+    import qt4reactor
+    qt4reactor.install()
+
+
+def main(args, install_reactor_darwin=False):
     """Start the Qt mainloop and open the main window."""
     # The following cannot be imported outside this function
     # because u1trial already provides a reactor.
@@ -69,6 +75,12 @@
     args = ['ubuntuone-installer'] + args
     app = UniqueApplication(args, "ubuntuone-control-panel")
 
+    # on darwin, must install qt4reactor after UniqueApplication init.
+    # otherwise qt4reactor will create a QCoreApplication for us,
+    # instead of the QApplication we need
+    if install_reactor_darwin and sys.platform == 'darwin':
+        install_qt4reactor()
+
     # Install translator for standard dialogs.
     locale = unicode(QtCore.QLocale.system().name())
     translator = QtCore.QTranslator()

=== modified file 'ubuntuone/controlpanel/gui/qt/main/tests/test_main.py'
--- ubuntuone/controlpanel/gui/qt/main/tests/test_main.py	2012-05-14 22:30:47 +0000
+++ ubuntuone/controlpanel/gui/qt/main/tests/test_main.py	2012-07-18 19:11:24 +0000
@@ -130,6 +130,15 @@
         self.patch(main.source, "main_start", lambda app: None)
         self.patch(QtCore, "QTranslator", lambda: self.translator)
 
+        self.qt4reactor_installed = False
+
+        def fake_install_qt4reactor():
+            """Record the install without importing."""
+            self.qt4reactor_installed = True
+
+        self.patch(main, "install_qt4reactor",
+                   fake_install_qt4reactor)
+
     def test_wm_class(self):
         """Test that we set the 1st argument, used for WM_CLASS, correctly."""
         main.main([sys.argv[0]])
@@ -200,3 +209,27 @@
         main.main([sys.argv[0]])
         self.assertEqual(self.app.new_instance.target,
             self.start.window.raise_)
+
+    def test_darwin_installs_qt4reactor(self):
+        """Ensure the qt4 reactor is installed when requested."""
+        self.patch(sys, 'platform', 'darwin')
+        main.main([sys.argv[0]], install_reactor_darwin=True)
+        self.assertEqual(self.qt4reactor_installed, True)
+
+    def test_darwin_doesnt_install_qt4reactor(self):
+        """Ensure the qt4 reactor isn't installed by default."""
+        self.patch(sys, 'platform', 'darwin')
+        main.main([sys.argv[0]])
+        self.assertEqual(self.qt4reactor_installed, False)
+
+    def test_nondarwin_ignores_true_install_flag(self):
+        """Ensure the qt4 reactor isn't installed on non-darwin."""
+        self.patch(sys, 'platform', 'not-darwin')
+        main.main([sys.argv[0]], install_reactor_darwin=True)
+        self.assertEqual(self.qt4reactor_installed, False)
+
+    def test_nondarwin_ignores_false_install_flag(self):
+        """Ensure the qt4 reactor isn't installed on non-darwin."""
+        self.patch(sys, 'platform', 'not-darwin')
+        main.main([sys.argv[0]], install_reactor_darwin=False)
+        self.assertEqual(self.qt4reactor_installed, False)

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_start.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_start.py	2012-06-15 22:23:19 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_start.py	2012-07-18 19:11:24 +0000
@@ -31,6 +31,7 @@
     shown = False
     size = lambda *a: gui.QtCore.QSize(123456, 654321)
     style = None
+    raise_ = lambda self: None
 
     def __init__(self):
         self.args = []