[gnome-control-center/single-window-shell] [shell] Center title label with respect to window

[William Jon McCann <mccann src gnome org>]

commit a63ed735c6ce14a7346881b7c93cabeaed616fe0
Author: William Jon McCann <jmccann redhat com>
Date:   Mon Jan 11 13:40:54 2010 -0500

    [shell] Center title label with respect to window
    
    Change the design from using breadcrumbs to centering the title
    with respect to the top level window.  This probably makes more
    sense since we expect panels to hopefully be only one level deep.

 shell/control-center.c |   23 +++++++++++++++++------
 shell/shell.ui         |   36 +++++++++++++++++++-----------------
 2 files changed, 36 insertions(+), 23 deletions(-)
---
diff --git a/shell/control-center.c b/shell/control-center.c
index 8a91051..7278551 100644
--- a/shell/control-center.c
+++ b/shell/control-center.c
@@ -213,7 +213,7 @@ item_activated_cb (GtkIconView *icon_view,
 {
   GtkTreeModel *model;
   GtkTreeIter iter = {0,};
-  gchar *name, *exec, *command;
+  gchar *name, *exec, *command, *markup;
   GtkWidget *socket, *notebook;
   guint socket_id = 0;
   static gint index = -1;
@@ -239,10 +239,11 @@ item_activated_cb (GtkIconView *icon_view,
 
   gtk_tree_model_get (model, &iter, 0, &name, 1, &exec, -1);
 
-  gtk_label_set_text (GTK_LABEL (W (builder, "applet-label")),
-                      name);
+  markup = g_strdup_printf ("<b>%s</b>", name);
+  gtk_label_set_markup (GTK_LABEL (W (builder, "applet-label")),
+                        markup);
+  g_free (markup);
   gtk_widget_show (W (builder, "applet-label"));
-  gtk_widget_show (W (builder, "arrow"));
 
   /* start app */
   command = g_strdup_printf ("%s --socket=%u", exec, socket_id);
@@ -258,16 +259,16 @@ 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_widget_hide (W (builder, "arrow"));
 }
 
 int
 main (int argc, char **argv)
 {
   GtkBuilder *b;
-  GtkWidget *window, *notebook;
+  GtkWidget *window, *notebook, *widget;
   guint ret;
   GdkColor color = {0, 32767, 32767, 32767};
+  GtkSizeGroup *group;
 
   gtk_init (&argc, &argv);
 
@@ -288,6 +289,16 @@ main (int argc, char **argv)
 
   gtk_widget_modify_text (W (b,"search-entry"), GTK_STATE_NORMAL, &color);
 
+  group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+  widget = W (b, "button-box");
+  if (widget) {
+    gtk_size_group_add_widget (group, widget);
+  }
+  widget = W (b, "search-entry");
+  if (widget) {
+    gtk_size_group_add_widget (group, widget);
+  }
+  g_object_unref (group);
 
   g_signal_connect (gtk_builder_get_object (b, "home-button"), "clicked",
                     G_CALLBACK (home_button_clicked_cb), b);
diff --git a/shell/shell.ui b/shell/shell.ui
index f0184bc..b040502 100644
--- a/shell/shell.ui
+++ b/shell/shell.ui
@@ -22,11 +22,20 @@
                     <property name="visible">True</property>
                     <property name="border_width">3</property>
                     <child>
-                      <object class="GtkButton" id="home-button">
-                        <property name="label" translatable="yes">All Settings</property>
+                      <object class="GtkHBox" id="button-box">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">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>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -34,22 +43,13 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkArrow" id="arrow">
-                        <property name="no_show_all">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </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>
-                        <property name="expand">False</property>
-                        <property name="position">2</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
@@ -62,13 +62,15 @@
                             <property name="width_request">210</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="invisible_char">&#x25CF;</property>
+                            <property name="invisible_char">&#x2022;</property>
                             <property name="text" translatable="yes">Type to search your settings</property>
                           </object>
                         </child>
                       </object>
                       <packing>
-                        <property name="position">3</property>
+                        <property name="expand">False</property>
+                        <property name="pack_type">end</property>
+                        <property name="position">2</property>
                       </packing>
                     </child>
                   </object>