Merge lp:~nataliabidart/ubuntuone-control-panel/center-me into lp:ubuntuone-control-panel

[Natalia Bidart]

- Center the main window when openning it (LP: #934173).

[Roberto Alsina (ralsina)]

+1 code review + IRL test

review: Approve

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

=== modified file 'ubuntuone/controlpanel/gui/qt/gui.py'
--- ubuntuone/controlpanel/gui/qt/gui.py	2012-02-07 13:54:46 +0000
+++ ubuntuone/controlpanel/gui/qt/gui.py	2012-02-17 14:47:20 +0000
@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
-
-# Authors: Alejandro J. Cura <[e-mail]>
 #
-# Copyright 2011 Canonical Ltd.
+# 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
@@ -18,8 +16,7 @@
 
 """The user interface for the control panel for Ubuntu One."""
 
-
-from PyQt4 import QtGui
+from PyQt4 import QtGui, QtCore
 
 from ubuntuone.controlpanel.gui.qt.systray import TrayIcon
 from ubuntuone.controlpanel.gui.qt.ui import mainwindow_ui
@@ -60,6 +57,11 @@
             window = MainWindow()
         else:
             window = MainWindow(close_callback=close_callback)
+        app = QtGui.QApplication.instance()
+        style = QtGui.QStyle.alignedRect(
+                    QtCore.Qt.LeftToRight, QtCore.Qt.AlignCenter,
+                    window.size(), app.desktop().availableGeometry())
+        window.setGeometry(style)
         window.show()
     else:
         window = None
 
=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_start.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_start.py	2012-02-07 13:54:46 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_start.py	2012-02-17 14:47:20 +0000
@@ -28,9 +28,12 @@
 
     """A fake thing."""
 
+    shown = False
+    size = lambda *a: gui.QtCore.QSize(123456, 654321)
+    style = None
+
     def __init__(self):
         self.args = []
-        self.shown = False
 
     def __call__(self, *args, **kwargs):
         self.args.append((args, kwargs))
@@ -40,6 +43,13 @@
         """Show."""
         self.shown = True
 
+    # Invalid name "setGeometry"
+    # pylint: disable=C0103
+
+    def setGeometry(self, style):
+        """Save the new geometry."""
+        self.style = style
+
 
 class StartTestCase(TestCase):
     """Test the qt control panel."""
@@ -87,3 +97,12 @@
         kwargs = {'close_callback': self.close_cb, 'window': None}
         self.assertEqual(self.tray_icon.args, [((), kwargs)])
         self.assertEqual(self.main_window.args, [])
+
+    def test_center_window(self):
+        """The main window should be centered."""
+        gui.start(close_callback=self.close_cb)
+        app = gui.QtGui.QApplication.instance()
+        expected = gui.QtGui.QStyle.alignedRect(gui.QtCore.Qt.LeftToRight,
+                        gui.QtCore.Qt.AlignCenter, self.main_window.size(),
+                        app.desktop().availableGeometry())
+        self.assertEqual(self.main_window.style, expected)