Merge lp:~mikemc/ubuntuone-control-panel/fix-1018614-darwin-raise into lp:ubuntuone-control-panel

[Mike McCracken]

- Call raise_() after show() to ensure the window is brought to the front on darwin. (LP: #1018614)

- Call raise_() after show() to ensure the window is brought to the front on darwin. (LP: #1018614)

[Manuel de la Peña (mandel)]

Can we add a test in which we assert that raise is not called in anything but darwin. You can patch the sys.platform used in gui.py to return darwin or order according to the test.

review: Needs Fixing

[Roberto Alsina (ralsina)]

I think calling raise_ doesn't hurt in any platorm, so we may just get rid of the if.

Of course, someone needs to test that :)

[Mike McCracken (mikemc)]

Changed to call raise_ on every platform as Roberto suggested.
Verified on ubuntu and windows that it still works as expected.
On those platforms it should be unnecessary but doesn't hurt.

[Roberto Alsina (ralsina)]

review: Approve

[Brian Curtin (brian.curtin)]

Looks alright to me.

review: Approve

[Manuel de la Peña (mandel)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~mikemc/ubuntuone-control-panel/fix-1018614-darwin-raise into lp:ubuntuone-control-panel 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]
 ...

[lp:~mikemc/ubuntuone-control-panel/fix-1018614-darwin-raise]

338. By Mike McCracken on 2012-07-05

fix pep8 complaints

=== 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-05 16:45:22 +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/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-05 16:45:22 +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 = []