[gnome-initial-setup/shell/4765: 118/362] Add maximum window size

[Jasper St. Pierre <jstpierre src gnome org>]

commit 140ee22599ab6a7853f98fd2f1190999155f7c37
Author: Philip Chimento <philip endlessm com>
Date:   Thu Jul 31 20:27:59 2014 -0700

    Add maximum window size
    
    Add a maximum size to the geometry hints; also, for this size to be
    honored the window needs to be set to resizable.
    
    Changed a label on the account page to span two cells instead of one so
    that it wraps less -- this was causing the new size to be too large for
    800x600.
    
    [endlessm/eos-shell#3251]

 gnome-initial-setup/gis-driver.c                   |   10 ++++++----
 .../pages/account/gis-account-page.ui              |    4 +++-
 2 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/gnome-initial-setup/gis-driver.c b/gnome-initial-setup/gis-driver.c
index 6af03f7..154106b 100644
--- a/gnome-initial-setup/gis-driver.c
+++ b/gnome-initial-setup/gis-driver.c
@@ -109,14 +109,16 @@ prepare_main_window (GisDriver *driver)
   GisDriverPrivate *priv = gis_driver_get_instance_private (driver);
   GdkGeometry size_hints;
 
-  size_hints.min_width = 680;
-  size_hints.min_height = 440;
+  size_hints.min_width = 747;
+  size_hints.min_height = 539;
+  size_hints.max_width = 747;
+  size_hints.max_height = 539;
   size_hints.win_gravity = GDK_GRAVITY_CENTER;
 
   gtk_window_set_geometry_hints (priv->main_window,
                                  GTK_WIDGET (priv->main_window),
                                  &size_hints,
-                                 GDK_HINT_MIN_SIZE | GDK_HINT_WIN_GRAVITY);
+                                 GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE | GDK_HINT_WIN_GRAVITY);
 
   gtk_window_set_titlebar (priv->main_window,
                            gis_assistant_get_titlebar (priv->assistant));
@@ -328,7 +330,7 @@ gis_driver_startup (GApplication *app)
                                     "type", GTK_WINDOW_TOPLEVEL,
                                     "border-width", 12,
                                     "icon-name", "preferences-system",
-                                    "resizable", FALSE,
+                                    "resizable", TRUE,
                                     "window-position", GTK_WIN_POS_CENTER_ALWAYS,
                                     "deletable", FALSE,
                                     NULL);
diff --git a/gnome-initial-setup/pages/account/gis-account-page.ui 
b/gnome-initial-setup/pages/account/gis-account-page.ui
index 7c59b9e..b1398ff 100644
--- a/gnome-initial-setup/pages/account/gis-account-page.ui
+++ b/gnome-initial-setup/pages/account/gis-account-page.ui
@@ -247,6 +247,8 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
+                <property name="xalign">0</property>
+                <property name="yalign">0</property>
                 <property name="label" translatable="yes">To make your password more secure, you can use 
letters and numbers together. This is optional.</property>
                 <property name="wrap">True</property>
                 <attributes>
@@ -256,7 +258,7 @@
               <packing>
                 <property name="left_attach">1</property>
                 <property name="top_attach">8</property>
-                <property name="width">1</property>
+                <property name="width">2</property>
                 <property name="height">1</property>
               </packing>
             </child>