[gnome-control-center] printers: fix alignment in secondary notebook pages

[William Jon McCann <mccann src gnome org>]

commit e2cb3282e276820cd27b7df06c7b3afe1718a811
Author: William Jon McCann <jmccann redhat com>
Date:   Sat Mar 19 23:16:52 2011 -0400

    printers: fix alignment in secondary notebook pages

 panels/printers/printers.ui |  114 ++++++++++++++++++++++++++-----------------
 1 files changed, 69 insertions(+), 45 deletions(-)
---
diff --git a/panels/printers/printers.ui b/panels/printers/printers.ui
index cb45ca4..6ac2844 100644
--- a/panels/printers/printers.ui
+++ b/panels/printers/printers.ui
@@ -482,8 +482,9 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel" id="label13">
+                      <object class="GtkLabel" id="back-spacer-label-1">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                       </object>
                       <packing>
                         <property name="left_attach">2</property>
@@ -626,8 +627,9 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel" id="label7">
+                      <object class="GtkLabel" id="back-spacer-label-2">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                       </object>
                       <packing>
                         <property name="left_attach">2</property>
@@ -645,81 +647,87 @@
                 <child>
                   <object class="GtkViewport" id="viewport1">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="resize_mode">queue</property>
                     <child>
                       <object class="GtkFrame" id="frame1">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label_xalign">0</property>
                         <property name="shadow_type">none</property>
                         <child>
-                          <object class="GtkAlignment" id="alignment1">
+                          <object class="GtkVBox" id="vbox6">
                             <property name="visible">True</property>
-                            <property name="left_padding">12</property>
+                            <property name="can_focus">False</property>
                             <child>
-                              <object class="GtkVBox" id="vbox6">
+                              <object class="GtkScrolledWindow" id="allowed-users-scrolledwindow">
+                                <property name="height_request">90</property>
                                 <property name="visible">True</property>
-                                <property name="orientation">vertical</property>
+                                <property name="can_focus">True</property>
+                                <property name="hscrollbar_policy">never</property>
+                                <property name="shadow_type">in</property>
                                 <child>
-                                  <object class="GtkScrolledWindow" id="allowed-users-scrolledwindow">
-                                    <property name="height_request">90</property>
+                                  <object class="GtkTreeView" id="allowed-users-treeview">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="hscrollbar_policy">never</property>
-                                    <property name="vscrollbar_policy">automatic</property>
-                                    <property name="shadow_type">in</property>
-                                    <child>
-                                      <object class="GtkTreeView" id="allowed-users-treeview">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                      </object>
+                                    <child internal-child="selection">
+                                      <object class="GtkTreeSelection" id="treeview-selection"/>
                                     </child>
                                   </object>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToolbar" id="allowed-users-toolbar">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="icon_size">1</property>
+                                <child>
+                                  <object class="GtkToolButton" id="allowed-user-add-button">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="label">toolbutton1</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="icon_name">list-add-symbolic</property>
+                                  </object>
                                   <packing>
-                                    <property name="position">0</property>
+                                    <property name="expand">False</property>
+                                    <property name="homogeneous">True</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkToolbar" id="allowed-users-toolbar">
+                                  <object class="GtkToolButton" id="allowed-user-remove-button">
                                     <property name="visible">True</property>
-                                    <property name="icon_size">1</property>
-                                    <property name="icon_size_set">True</property>
-                                    <child>
-                                      <object class="GtkToolButton" id="allowed-user-add-button">
-                                        <property name="visible">True</property>
-                                        <property name="label">toolbutton1</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="icon_name">list-add-symbolic</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToolButton" id="allowed-user-remove-button">
-                                        <property name="visible">True</property>
-                                        <property name="label">toolbutton2</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="icon_name">list-remove-symbolic</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="homogeneous">True</property>
-                                      </packing>
-                                    </child>
+                                    <property name="can_focus">False</property>
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="label">toolbutton2</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="icon_name">list-remove-symbolic</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
-                                    <property name="position">1</property>
+                                    <property name="homogeneous">True</property>
                                   </packing>
                                 </child>
                               </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
                             </child>
                           </object>
                         </child>
                         <child type="label">
                           <object class="GtkLabel" id="label11">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="label" translatable="yes">Allowed users</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
@@ -801,13 +809,29 @@ doesn't seem to be available.</property>
             </child>
           </object>
           <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
       </object>
       <packing>
+        <property name="expand">True</property>
+        <property name="fill">True</property>
         <property name="position">0</property>
       </packing>
     </child>
   </object>
+  <object class="GtkSizeGroup" id="sizegroup1">
+   <widgets>
+      <widget name="back-button-1"/>
+      <widget name="back-spacer-label-1"/>
+   </widgets>
+  </object>
+  <object class="GtkSizeGroup" id="sizegroup2">
+   <widgets>
+      <widget name="back-button-2"/>
+      <widget name="back-spacer-label-2"/>
+   </widgets>
+  </object>
 </interface>