Merge lp:~diegosarmentero/ubuntu-sso-client/window-title into lp:ubuntu-sso-client

[Diego Sarmentero]

- Setting the window title equal to the app_name (LP: #949744).

[lp:~diegosarmentero/ubuntu-sso-client/window-title]

904. By Diego Sarmentero on 2012-03-09

Changing window title to: Ubuntu Single Sign On

905. By Diego Sarmentero on 2012-03-09

changing docstring

[Natalia Bidart (nataliabidart)]

Looks good, though I would prefer a constant for the title instead of typing it twice.

review: Approve

[lp:~diegosarmentero/ubuntu-sso-client/window-title]

906. By Diego Sarmentero on 2012-03-09

Adding a constant for the title name

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'ubuntu_sso/qt/__init__.py'
--- ubuntu_sso/qt/__init__.py	2012-03-05 18:56:50 +0000
+++ ubuntu_sso/qt/__init__.py	2012-03-09 18:39:19 +0000
@@ -26,6 +26,7 @@
 ERROR_MESSAGE = 'message'
 PREFERED_UI_SIZE = {'width': 550, 'height': 525}
 TITLE_STYLE = u'<span style="font-size:24px">%s</span>'
+WINDOW_TITLE = 'Ubuntu Single Sign On'
 
 
 # Based on the gtk implementation

=== modified file 'ubuntu_sso/qt/tests/test_ubuntu_sso_wizard.py'
--- ubuntu_sso/qt/tests/test_ubuntu_sso_wizard.py	2012-03-05 19:19:41 +0000
+++ ubuntu_sso/qt/tests/test_ubuntu_sso_wizard.py	2012-03-09 18:39:19 +0000
@@ -91,6 +91,11 @@
         finish_button.clicked.emit(True)
         self.assertEqual(self._called, ((None,), {}))
 
+    def test_window_title(self):
+        """Check the window title for the application."""
+        title = unicode(self.ui.windowTitle())
+        self.assertEqual(title, ubuntu_sso_wizard.WINDOW_TITLE)
+
 
 class UbuntuSSOWizardTestCase(BaseTestCase):
 

=== modified file 'ubuntu_sso/qt/ubuntu_sso_wizard.py'
--- ubuntu_sso/qt/ubuntu_sso_wizard.py	2012-03-05 21:08:40 +0000
+++ ubuntu_sso/qt/ubuntu_sso_wizard.py	2012-03-09 18:39:19 +0000
@@ -30,7 +30,7 @@
     USER_SUCCESS,
 )
 from ubuntu_sso.logger import setup_gui_logging
-from ubuntu_sso.qt import PREFERED_UI_SIZE
+from ubuntu_sso.qt import PREFERED_UI_SIZE, WINDOW_TITLE
 from ubuntu_sso.qt.current_user_sign_in_page import CurrentUserSignInPage
 from ubuntu_sso.qt.email_verification_page import EmailVerificationPage
 from ubuntu_sso.qt.error_page import ErrorPage
@@ -260,6 +260,7 @@
         logger.debug('UbuntuSSOClientGUI: app_name %r, kwargs %r.',
                      app_name, kwargs)
         self.app_name = app_name
+        self.setWindowTitle(WINDOW_TITLE)
         # create the controller and the ui, then set the cb and call the show
         # method so that we can work
         self.wizard = UbuntuSSOWizard(app_name=app_name, **kwargs)