Merge lp:~nataliabidart/ubuntu-sso-client/resize-so-password-can-be-changed into lp:ubuntu-sso-client

[Natalia Bidart]

* Added a gtk.Notebook to ensure proper window resize at startup (LP: #682669).
* Also, enabled window resizing to be more user friendly.

To test, first let's reproduce the problem on trunk. In an updated trunk, run:

* killall ubuntu-sso-login; DEBUG=True PYTHONPATH=. ./bin/ubuntu-sso-login
* open d-feet and execute the 'login' method of the com.ubuntu.sso service, /com/ubuntu/sso/credentials interface. Pass parameters like this:

'Test', {}

Then, in the newly shown GTK ui, click on "I've forgotten my password" button and enter the email address:

<email address hidden>

and hit Next. You'll see the resulting screen and you'll be scared (3 text entries that doesn't fit the main window).

Now, using this proposed branch repeat the procedure (be sure to close and re open d-feet) and check that the main window now has proper size for all the screens.
If you feel brave enough you could change the font dpi from System -> Preferences -> Appearence -> Fonts -> Details (I've tried with 200 dpi).

[lp:~nataliabidart/ubuntu-sso-client/resize-so-password-can-be-changed]

659. By Natalia Bidart on 2010-11-29

Reverting changes to setup.py

[dobey (dobey)]

review: Approve

[Chad Miller (cmiller)]

Instead of catching size-allocations and performing some arithmetic magic, I think you should let them pass through.

In ubuntu_sso/gtk/gui.py

- obj.connect('size-allocate', self.on_size_allocate)

Now, you can remove .on_size_allocate altogether.

review: Needs Fixing

[Natalia Bidart (nataliabidart)]

We need to connect to size-allocate to make labels resize properly on window resizing.

[Chad Miller (cmiller)]

I see the problem with resized wrapping Labels now.

I still think this signal shouldn't be touched, but I don't have a better idea at present.

I say the new behavior is a "Low" bug and it should be in Launchpad. A bad fix for a High-impact bug is okay for now.

review: Approve

=== modified file 'data/ui.glade'
--- data/ui.glade	2010-11-22 18:14:26 +0000
+++ data/ui.glade	2010-11-29 17:47:47 +0000
@@ -4,7 +4,6 @@
   <!-- interface-naming-policy project-wide -->
   <object class="GtkWindow" id="window">
     <property name="border_width">10</property>
-    <property name="resizable">False</property>
     <property name="window_position">center</property>
     <signal name="delete_event" handler="on_close_clicked"/>
     <child>
@@ -49,7 +48,15 @@
           </packing>
         </child>
         <child>
-          <placeholder/>
+          <object class="GtkNotebook" id="content">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="show_tabs">False</property>
+            <property name="show_border">False</property>
+          </object>
+          <packing>
+            <property name="position">3</property>
+          </packing>
         </child>
       </object>
     </child>

=== modified file 'ubuntu_sso/gtk/gui.py'
--- ubuntu_sso/gtk/gui.py	2010-11-22 18:14:26 +0000
+++ ubuntu_sso/gtk/gui.py	2010-11-29 17:47:47 +0000
@@ -269,6 +269,7 @@
         self.app_label = '<b>%s</b>' % self.app_name
         self.tc_url = tc_url
         self.help_text = help_text
+        self.login_only = login_only
         self.close_callback = close_callback
         self.user_email = None
         self.user_password = None
@@ -333,25 +334,7 @@
                       self.request_password_token_vbox,
                       self.set_new_password_vbox)
 
-        self._append_page(self._build_processing_page())
-        self._append_page(self._build_finish_page())
-        self._append_page(self._build_login_page())
-        self._append_page(self._build_request_password_token_page())
-        self._append_page(self._build_set_new_password_page())
-        self._append_page(self._build_verify_email_page())
-
-        if not login_only:
-            self._append_page(self._build_enter_details_page())
-            self._append_page(self._build_tc_page())
-            self.login_button.grab_focus()
-            self._set_current_page(self.enter_details_vbox)
-        else:
-            self.login_back_button.hide()
-            self.login_ok_button.grab_focus()
-            self.login_vbox.help_text = help_text
-            self._set_current_page(self.login_vbox)
-
-        self.window.connect('size-allocate', self.on_size_allocate)
+        self._append_pages()
 
         self._signals = {
             'CaptchaGenerated':
@@ -502,9 +485,29 @@
 
     # build pages
 
+    def _append_pages(self):
+        """Append all the requires pages to main widget."""
+        self._append_page(self._build_processing_page())
+        self._append_page(self._build_finish_page())
+        self._append_page(self._build_login_page())
+        self._append_page(self._build_request_password_token_page())
+        self._append_page(self._build_set_new_password_page())
+        self._append_page(self._build_verify_email_page())
+
+        if not self.login_only:
+            self._append_page(self._build_enter_details_page())
+            self._append_page(self._build_tc_page())
+            self.login_button.grab_focus()
+            self._set_current_page(self.enter_details_vbox)
+        else:
+            self.login_back_button.hide()
+            self.login_ok_button.grab_focus()
+            self.login_vbox.help_text = self.help_text
+            self._set_current_page(self.login_vbox)
+
     def _append_page(self, page):
         """Append 'page' to the 'window'."""
-        self.window.get_children()[0].pack_start(page)
+        self.content.append_page(page)
 
     def _set_header(self, header):
         """Set 'header' as the window title and header."""
@@ -525,11 +528,7 @@
         else:
             self.warning_label.set_text('')
 
-        for page in self.pages:
-            if page is current_page:
-                page.show()
-            else:
-                page.hide()
+        self.content.set_current_page(self.content.page_num(current_page))
 
         if current_page.default_widget is not None:
             current_page.default_widget.grab_default()
@@ -748,7 +747,7 @@
 
     def on_size_allocate(self, widget, allocation):
         """The widget can re rezised, embrase it!."""
-        widget.set_size_request(allocation.width, allocation.height)
+        widget.set_size_request(allocation.width - 2, -1)
 
     def on_close_clicked(self, *args, **kwargs):
         """Call self.close_callback if defined."""

=== modified file 'ubuntu_sso/gtk/tests/test_gui.py'
--- ubuntu_sso/gtk/tests/test_gui.py	2010-11-22 15:28:59 +0000
+++ ubuntu_sso/gtk/tests/test_gui.py	2010-11-29 17:47:47 +0000
@@ -438,16 +438,12 @@
         self.assertEqual(entry.warning, message)
 
     def assert_pages_visibility(self, **kwargs):
-        """The pages has the correct visibility."""
-        for i in self.pages:
-            kwargs.setdefault(i, False)
-
-        msg = 'page %r must %sbe visible.'
-        for name, expected in kwargs.iteritems():
-            page = getattr(self.ui, '%s_vbox' % name)
-            actual = page.get_property('visible')
-            self.assertEqual(expected, actual,
-                             msg % (name, '' if expected else 'not '))
+        """The page 'name' is the current page for the content notebook."""
+        msg = 'page %r must be self.ui.content\'s current page.'
+        (name, _), = kwargs.items()
+        page = getattr(self.ui, '%s_vbox' % name)
+        self.assertEqual(self.ui.content.get_current_page(),
+                         self.ui.content.page_num(page), msg % name)
 
     def click_join_with_valid_data(self):
         """Move to the next page after entering details."""
@@ -510,9 +506,9 @@
         """The main window is shown at startup."""
         self.assertTrue(self.ui.window.get_property('visible'))
 
-    def test_main_window_is_not_resizable(self):
-        """The main window can not be resized."""
-        self.assertFalse(self.ui.window.get_property('resizable'))
+    def test_main_window_is_resizable(self):
+        """The main window can be resized."""
+        self.assertTrue(self.ui.window.get_property('resizable'))
 
     def test_closing_main_window_calls_close_callback(self):
         """The close_callback is called when closing the main window."""
@@ -571,9 +567,9 @@
         ui.on_close_clicked()
         # no crash when close_callback is None
 
-    def test_pages_are_packed_into_window(self):
-        """All the pages are packed in the main window."""
-        children = self.ui.window.get_children()[0].get_children()
+    def test_pages_are_packed_into_container(self):
+        """All the pages are packed in the main container."""
+        children = self.ui.content.get_children()
         for page_name in self.pages:
             page = getattr(self.ui, '%s_vbox' % page_name)
             self.assertIn(page, children)
@@ -602,7 +598,8 @@
         for label in labels:
             widget = getattr(self.ui, label)
             widget.emit('size-allocate', gtk.gdk.Rectangle(1, 2, 3, 4))
-            self.assertEqual(widget.get_size_request(), (3, 4), msg % (label,))
+            self.assertEqual(widget.get_size_request(), (3 - 2, -1),
+                             msg % (label,))
 
     def test_password_fields_are_password(self):
         """Password fields have the is_password flag set."""