[gnome-system-tools/users-ui-redesign: 10/12] Move Add, Remove and Manage Groups buttons below users list

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

commit ccbdc47427eb09101322170a381fb11703a720bd
Author: Milan Bouchet-Valat <nalimilan club fr>
Date:   Thu Sep 24 22:08:18 2009 +0200

    Move Add, Remove and Manage Groups buttons below users list
    
    Need to decide where will go the Manage Groups one, but for now it's the best place we can find. Also use stock buttons (for Add an Remove) and standard layout (for Manage Groups) to make the design simpler and follow GTK+ configuration.

 interfaces/users.ui |  135 +++++++++++++++++++-------------------------------
 1 files changed, 51 insertions(+), 84 deletions(-)
---
diff --git a/interfaces/users.ui b/interfaces/users.ui
index c66617a..a77fe73 100644
--- a/interfaces/users.ui
+++ b/interfaces/users.ui
@@ -66,123 +66,94 @@
         <property name="visible">True</property>
         <property name="spacing">6</property>
         <child>
-          <object class="GtkScrolledWindow" id="users_table_sw">
+          <object class="GtkVBox" id="vbox2">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hscrollbar_policy">never</property>
-            <property name="vscrollbar_policy">never</property>
-            <property name="shadow_type">etched-in</property>
+            <property name="orientation">vertical</property>
             <child>
-              <object class="GtkTreeView" id="users_table">
+              <object class="GtkScrolledWindow" id="users_table_sw">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="headers_visible">False</property>
-                <property name="rules_hint">True</property>
+                <property name="hscrollbar_policy">never</property>
+                <property name="vscrollbar_policy">never</property>
+                <property name="shadow_type">etched-in</property>
+                <child>
+                  <object class="GtkTreeView" id="users_table">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="headers_visible">False</property>
+                    <property name="rules_hint">True</property>
+                  </object>
+                </child>
               </object>
+              <packing>
+                <property name="position">0</property>
+              </packing>
             </child>
-          </object>
-          <packing>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkVBox" id="vbox1">
-            <property name="visible">True</property>
-            <property name="orientation">vertical</property>
             <child>
-              <object class="GtkHBox" id="hbox1">
+              <object class="GtkHBox" id="hbox6">
                 <property name="visible">True</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkButton" id="user_new">
-                    <property name="label" translatable="yes">_Add user</property>
+                    <property name="label">gtk-add</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="can_default">True</property>
                     <property name="receives_default">True</property>
-                    <property name="image">image1</property>
                     <property name="use_underline">True</property>
+                    <property name="use_stock">True</property>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkButton" id="user_delete">
-                    <property name="label" translatable="yes">_Delete user</property>
+                    <property name="label">gtk-delete</property>
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="can_focus">True</property>
                     <property name="can_default">True</property>
                     <property name="receives_default">True</property>
-                    <property name="image">image2</property>
                     <property name="use_underline">True</property>
+                    <property name="use_stock">True</property>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkButton" id="manage_groups">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <child>
-                      <object class="GtkAlignment" id="alignment67">
-                        <property name="visible">True</property>
-                        <property name="xscale">0</property>
-                        <property name="yscale">0</property>
-                        <child>
-                          <object class="GtkHBox" id="hbox78">
-                            <property name="visible">True</property>
-                            <property name="spacing">2</property>
-                            <child>
-                              <object class="GtkImage" id="image14">
-                                <property name="visible">True</property>
-                                <property name="icon_name">stock_people</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="label316">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">_Manage Groups</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="padding">6</property>
-                <property name="position">0</property>
+                <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>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkVBox" id="vbox1">
+            <property name="visible">True</property>
+            <property name="orientation">vertical</property>
+            <child>
               <object class="GtkTable" id="table1">
                 <property name="visible">True</property>
                 <property name="n_rows">2</property>
@@ -248,7 +219,7 @@
               </object>
               <packing>
                 <property name="padding">6</property>
-                <property name="position">1</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
@@ -1126,7 +1097,7 @@
                 </child>
               </object>
               <packing>
-                <property name="position">2</property>
+                <property name="position">1</property>
               </packing>
             </child>
           </object>
@@ -2429,12 +2400,8 @@
       <action-widget response="-7">closebutton3</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkImage" id="image1">
-    <property name="visible">True</property>
-    <property name="stock">gtk-add</property>
-  </object>
-  <object class="GtkImage" id="image2">
+  <object class="GtkImage" id="image19">
     <property name="visible">True</property>
-    <property name="stock">gtk-delete</property>
+    <property name="icon_name">stock_people</property>
   </object>
 </interface>