[gnome-control-center/extensible-shell] shell: Add a title inside the capplet area instead of using the titlebar

[Thomas Wood <thos src gnome org>]

commit 85c8273f3981409867d17cb3eea0a0acc1960caa
Author: Thomas Wood <thomas wood intel com>
Date:   Wed Feb 24 16:40:10 2010 +0000

    shell: Add a title inside the capplet area instead of using the titlebar

 shell/control-center.c |    7 +++++--
 shell/shell.ui         |   26 ++++++++++++++++++++++++--
 2 files changed, 29 insertions(+), 4 deletions(-)
---
diff --git a/shell/control-center.c b/shell/control-center.c
index 6a18ba5..17985c6 100644
--- a/shell/control-center.c
+++ b/shell/control-center.c
@@ -468,7 +468,9 @@ item_activated_cb (GtkIconView *icon_view,
 
       gtk_notebook_set_current_page (GTK_NOTEBOOK (data->notebook), CAPPLET_PAGE);
 
-      gtk_window_set_title (GTK_WINDOW (data->window), data->current_title);
+      gtk_label_set_text (GTK_LABEL (gtk_builder_get_object (data->builder, "label-title")),
+                          data->current_title);
+      gtk_widget_show (GTK_WIDGET (gtk_builder_get_object (data->builder, "title-alignment")));
     }
   else
     {
@@ -491,7 +493,8 @@ shell_show_overview_page (ShellData *data)
   if (data->current_panel != NULL)
     cc_panel_set_active (data->current_panel, FALSE);
 
-  gtk_window_set_title (GTK_WINDOW (data->window), _("System Settings"));
+  gtk_label_set_text (GTK_LABEL (gtk_builder_get_object (data->builder, "label-title")), "");
+  gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (data->builder, "title-alignment")));
 
   /* clear the search text */
   g_free (data->filter_string);
diff --git a/shell/shell.ui b/shell/shell.ui
index de4c6f9..69620da 100644
--- a/shell/shell.ui
+++ b/shell/shell.ui
@@ -68,6 +68,28 @@
           </packing>
         </child>
         <child>
+          <object class="GtkAlignment" id="title-alignment">
+            <property name="no_show_all">True</property>
+            <property name="top_padding">12</property>
+            <property name="left_padding">12</property>
+            <child>
+              <object class="GtkLabel" id="label-title">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="yalign">0</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                  <attribute name="size" value="12000"/>
+                </attributes>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
           <object class="GtkNotebook" id="notebook">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
@@ -125,7 +147,7 @@
             </child>
           </object>
           <packing>
-            <property name="position">1</property>
+            <property name="position">2</property>
           </packing>
         </child>
       </object>
@@ -144,8 +166,8 @@
   <object class="GtkSizeGroup" id="sizegroup">
     <property name="mode">vertical</property>
     <widgets>
-      <widget name="home-button"/>
       <widget name="entry-alignment"/>
+      <widget name="home-button"/>
     </widgets>
   </object>
 </interface>