[gnome-control-center/single-window-shell] [shell] simplify the toolbar packing

[Thomas Wood <thos src gnome org>]

commit eb90411b3a1e7cb99d71e8c919ebdd6bbb1cd0df
Author: Thomas Wood <thomas wood intel com>
Date:   Wed Jan 13 12:11:53 2010 +0000

    [shell] simplify the toolbar packing
    
    Remove the unnecessary containers and don't hide the applet title label when
    not in use. Keeping the title label visible ensures the alignment of the
    search box is always correct.

 shell/control-center.c |    3 +--
 shell/shell.ui         |   37 +++++++++----------------------------
 2 files changed, 10 insertions(+), 30 deletions(-)
---
diff --git a/shell/control-center.c b/shell/control-center.c
index 7278551..60c6759 100644
--- a/shell/control-center.c
+++ b/shell/control-center.c
@@ -243,7 +243,6 @@ item_activated_cb (GtkIconView *icon_view,
   gtk_label_set_markup (GTK_LABEL (W (builder, "applet-label")),
                         markup);
   g_free (markup);
-  gtk_widget_show (W (builder, "applet-label"));
 
   /* start app */
   command = g_strdup_printf ("%s --socket=%u", exec, socket_id);
@@ -258,7 +257,7 @@ void
 home_button_clicked_cb (GtkButton *button, GtkBuilder *builder)
 {
   gtk_notebook_set_current_page (GTK_NOTEBOOK (W (builder, "notebook")), 0);
-  gtk_widget_hide (W (builder, "applet-label"));
+  gtk_label_set_text (GTK_LABEL (W (builder, "applet-label")), "");
 }
 
 int
diff --git a/shell/shell.ui b/shell/shell.ui
index b040502..27b47fc 100644
--- a/shell/shell.ui
+++ b/shell/shell.ui
@@ -22,20 +22,11 @@
                     <property name="visible">True</property>
                     <property name="border_width">3</property>
                     <child>
-                      <object class="GtkHBox" id="button-box">
+                      <object class="GtkButton" id="home-button">
+                        <property name="label" translatable="yes">All Settings</property>
                         <property name="visible">True</property>
-                        <child>
-                          <object class="GtkButton" id="home-button">
-                            <property name="label" translatable="yes">All Settings</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -44,8 +35,6 @@
                     </child>
                     <child>
                       <object class="GtkLabel" id="applet-label">
-                        <property name="no_show_all">True</property>
-                        <property name="label" translatable="yes">Applet</property>
                         <property name="use_markup">True</property>
                       </object>
                       <packing>
@@ -53,23 +42,15 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkAlignment" id="alignment1">
+                      <object class="GtkEntry" id="search-entry">
+                        <property name="width_request">210</property>
                         <property name="visible">True</property>
-                        <property name="xalign">1</property>
-                        <property name="xscale">0</property>
-                        <child>
-                          <object class="GtkEntry" id="search-entry">
-                            <property name="width_request">210</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="invisible_char">&#x2022;</property>
-                            <property name="text" translatable="yes">Type to search your settings</property>
-                          </object>
-                        </child>
+                        <property name="can_focus">True</property>
+                        <property name="invisible_char">&#x25CF;</property>
+                        <property name="text" translatable="yes">Type to search your settings</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
-                        <property name="pack_type">end</property>
                         <property name="position">2</property>
                       </packing>
                     </child>