[gnome-system-tools/users-ui-redesign] Aesthetical fixes to users-admin main dialog

[Milan Bouchet-Valat <milanbv src gnome org>]

commit dc9fff788ccaea0c859bf0dcb888cc5fbc14d612
Author: Milan Bouchet-Valat <nalimilan club fr>
Date:   Mon Nov 30 20:08:36 2009 +0100

    Aesthetical fixes to users-admin main dialog
    
    Use 6px padding between Add/Remove buttons and user list. Use 24px padding between the list and the main settings table. Right-align account type and password labels, to be aligned with the Real name. Unset the width of account type label to let the dialog reduce its horizontal size (waiting for another commit to set this size dynamically). Move the Manage groups button to the main table. Make "Manual" password type translatable, since we don't handle any other value for now. Reduce default size of the main window accordingly, using golden ratio since that suits our needs!

 interfaces/users.ui |   50 ++++++++++++++++++++++++++------------------------
 src/users/main.c    |    2 +-
 2 files changed, 27 insertions(+), 25 deletions(-)
---
diff --git a/interfaces/users.ui b/interfaces/users.ui
index dbe717d..063baa8 100644
--- a/interfaces/users.ui
+++ b/interfaces/users.ui
@@ -77,11 +77,12 @@
     <child>
       <object class="GtkHBox" id="users_admin">
         <property name="visible">True</property>
-        <property name="spacing">6</property>
+        <property name="spacing">24</property>
         <child>
           <object class="GtkVBox" id="vbox2">
             <property name="visible">True</property>
             <property name="orientation">vertical</property>
+            <property name="spacing">6</property>
             <child>
               <object class="GtkScrolledWindow" id="users_table_sw">
                 <property name="visible">True</property>
@@ -143,21 +144,6 @@
                 <property name="position">1</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkButton" id="manage_groups">
-                <property name="label" translatable="yes">_Manage Groups</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="image">image19</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
           </object>
           <packing>
             <property name="position">0</property>
@@ -172,7 +158,7 @@
                 <property name="visible">True</property>
                 <property name="n_rows">5</property>
                 <property name="n_columns">3</property>
-                <property name="column_spacing">12</property>
+                <property name="column_spacing">24</property>
                 <property name="row_spacing">12</property>
                 <child>
                   <object class="GtkImage" id="user_settings_face">
@@ -254,7 +240,8 @@
                 <child>
                   <object class="GtkLabel" id="user_settings_passwd">
                     <property name="visible">True</property>
-                    <property name="label">Manual</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Manual</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -289,8 +276,8 @@
                 <child>
                   <object class="GtkLabel" id="user_settings_profile">
                     <property name="visible">True</property>
+                    <property name="xalign">0</property>
                     <property name="label">Desktop user</property>
-                    <property name="width_chars">30</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -354,7 +341,22 @@
                   <placeholder/>
                 </child>
                 <child>
-                  <placeholder/>
+                  <object class="GtkButton" id="manage_groups">
+                    <property name="label" translatable="yes">_Manage Groups</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="image">image19</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">4</property>
+                    <property name="bottom_attach">5</property>
+                    <property name="x_options">GTK_EXPAND</property>
+                    <property name="y_options"></property>
+                  </packing>
                 </child>
               </object>
               <packing>
@@ -1597,10 +1599,6 @@
       <action-widget response="-7">closebutton3</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkImage" id="image19">
-    <property name="visible">True</property>
-    <property name="icon_name">stock_people</property>
-  </object>
   <object class="GtkDialog" id="user_name_dialog">
     <property name="border_width">12</property>
     <property name="title" translatable="yes">Change User Name and Login</property>
@@ -3166,6 +3164,10 @@
       <action-widget response="-5">user_advanced_validate_button</action-widget>
     </action-widgets>
   </object>
+  <object class="GtkImage" id="image19">
+    <property name="visible">True</property>
+    <property name="icon_name">stock_people</property>
+  </object>
   <object class="GtkSizeGroup" id="user_new_notice_sizegroup">
     <property name="mode">both</property>
     <widgets>
diff --git a/src/users/main.c b/src/users/main.c
index f877ae2..ee4596c 100644
--- a/src/users/main.c
+++ b/src/users/main.c
@@ -64,7 +64,7 @@ main_window_prepare (GstUsersTool *tool)
 	create_tables (tool);
 
 	gtk_window_set_default_size (GTK_WINDOW (GST_TOOL (tool)->main_dialog),
-	                             400, 500);
+	                             650, 400);
 
 	/* For random password generation. */
 	srand (time (NULL));