[gnome-control-center/gnome-3-2] color: pack the left and right button groups into two GtkBox containers

[Bastien Nocera <hadess src gnome org>]

commit 82bd5c2a2d01a7d20fc236c5da46c262489d9bbf
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Fri Sep 16 13:43:04 2011 -0400

    color: pack the left and right button groups into two GtkBox containers
    
    So that we can link each of the two button groups separately, and apply
    rounded corners properly to both.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=659273

 panels/color/color.ui |  211 ++++++++++++++++++++++---------------------------
 1 files changed, 96 insertions(+), 115 deletions(-)
---
diff --git a/panels/color/color.ui b/panels/color/color.ui
index 1c8e94a..becb5a7 100644
--- a/panels/color/color.ui
+++ b/panels/color/color.ui
@@ -256,141 +256,122 @@
                 <property name="show_arrow">False</property>
                 <property name="icon_size">1</property>
                 <child>
-                  <object class="GtkToolButton" id="toolbutton_device_add">
+                  <object class="GtkToolItem" id="left_button_group">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">Add a virtual device</property>
-                    <property name="tooltip_text">Add a virtual device</property>
-                    <property name="use_action_appearance">False</property>
-                    <property name="is_important">True</property>
-                    <property name="label" translatable="yes">Add device</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkToolButton" id="toolbutton_device_remove">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">Remove a device</property>
-                    <property name="tooltip_text">Remove a device</property>
-                    <property name="use_action_appearance">False</property>
-                    <property name="is_important">True</property>
-                    <property name="label" translatable="yes">Delete device</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkToolItem" id="toolbutton_spacer">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="use_action_appearance">False</property>
                     <child>
-                      <object class="GtkLabel" id="label_toolbar_padding">
+                      <object class="GtkBox" id="left_button_group_box">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="homogeneous">False</property>
+                        <child>
+                          <object class="GtkButton" id="toolbutton_device_add">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="has_tooltip">True</property>
+                            <property name="tooltip_markup" translatable="yes">Add a virtual device</property>
+                            <property name="tooltip_text">Add a virtual device</property>
+                            <property name="label" translatable="yes">Add device</property>
+                            <property name="use_underline">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="toolbutton_device_remove">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="has_tooltip">True</property>
+                            <property name="tooltip_markup" translatable="yes">Remove a device</property>
+                            <property name="tooltip_text">Remove a device</property>
+                            <property name="label" translatable="yes">Delete device</property>
+                            <property name="use_underline">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="toolbutton_device_default">
+                            <property name="can_focus">False</property>
+                            <property name="has_tooltip">True</property>
+                            <property name="tooltip_markup" translatable="yes">Set this device for all users on this computer</property>
+                            <property name="tooltip_text">Set this device for all users on this computer</property>
+                            <property name="label" translatable="yes">Set for all users</property>
+                            <property name="use_underline">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                          </packing>
+                        </child>
                       </object>
                     </child>
                   </object>
                   <packing>
                     <property name="expand">True</property>
-                    <property name="homogeneous">True</property>
+                    <property name="homogeneous">False</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkToolButton" id="toolbutton_device_default">
-                    <property name="can_focus">False</property>
-                    <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">Set this device for all users on this computer</property>
-                    <property name="tooltip_text">Set this device for all users on this computer</property>
-                    <property name="use_action_appearance">False</property>
-                    <property name="is_important">True</property>
-                    <property name="label" translatable="yes">Set for all users</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkToolButton" id="toolbutton_profile_add">
+                  <object class="GtkToolItem" id="right_button_group">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="use_action_appearance">False</property>
-                    <property name="is_important">True</property>
-                    <property name="label" translatable="yes">Add profile</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkToolButton" id="toolbutton_device_calibrate">
-                    <property name="can_focus">False</property>
-                    <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">Calibrate the device</property>
-                    <property name="tooltip_text" translatable="yes">Calibrate the device</property>
-                    <property name="use_action_appearance">False</property>
-                    <property name="is_important">True</property>
-                    <property name="label" translatable="yes">Calibrateâ</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkToolButton" id="toolbutton_profile_remove">
-                    <property name="can_focus">False</property>
-                    <property name="use_action_appearance">False</property>
-                    <property name="is_important">True</property>
-                    <property name="label" translatable="yes">Remove profile</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkToolButton" id="toolbutton_profile_view">
-                    <property name="can_focus">False</property>
-                    <property name="use_action_appearance">False</property>
-                    <property name="is_important">True</property>
-                    <property name="label" translatable="yes">View details</property>
-                    <property name="use_underline">True</property>
+                    <child>
+                      <object class="GtkBox" id="right_button_group_box">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <object class="GtkButton" id="toolbutton_profile_add">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">Add profile</property>
+                            <property name="use_underline">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="toolbutton_device_calibrate">
+                            <property name="can_focus">False</property>
+                            <property name="has_tooltip">True</property>
+                            <property name="tooltip_markup" translatable="yes">Calibrate the device</property>
+                            <property name="tooltip_text" translatable="yes">Calibrate the device</property>
+                            <property name="label" translatable="yes">Calibrateâ</property>
+                            <property name="use_underline">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="toolbutton_profile_remove">
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">Remove profile</property>
+                            <property name="use_underline">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="toolbutton_profile_view">
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">View details</property>
+                            <property name="use_underline">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
                   </object>
-                  <packing>
-                    <property name="expand">False</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>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
         </child>
       </object>
     </child>