diff options
| author | Thomas Wood <thomas.wood@intel.com> | 2010-01-14 09:45:29 +0000 |
|---|---|---|
| committer | Thomas Wood <thomas.wood@intel.com> | 2010-01-14 09:45:29 +0000 |
| commit | 67619e3bd7880013738304d685d879363dabba73 (patch) | |
| tree | 91aaa9de36bda0d66ca4b691555fd6c5ce5dd3e6 | |
| parent | 2249ec8551ba336cc651af6126568b81336cf701 (diff) | |
| download | gnome-control-center-67619e3bd7880013738304d685d879363dabba73.tar.gz | |
[shell] use the window title rather than a separate header label
Remove the header label and use the window title to display the current
capplet's name.
| -rw-r--r-- | shell/control-center.c | 10 | ||||
| -rw-r--r-- | shell/shell.ui | 28 |
2 files changed, 17 insertions, 21 deletions
diff --git a/shell/control-center.c b/shell/control-center.c index 1736dffcd..4c30577cc 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, *markup; + gchar *name, *exec, *command; GtkWidget *socket, *notebook; guint socket_id = 0; static gint index = -1; @@ -239,10 +239,7 @@ item_activated_cb (GtkIconView *icon_view, gtk_tree_model_get (model, &iter, 0, &name, 1, &exec, -1); - markup = g_strdup_printf ("<b>%s</b>", name); - gtk_label_set_markup (GTK_LABEL (W (builder, "applet-label")), - markup); - g_free (markup); + gtk_window_set_title (GTK_WINDOW (W (builder, "main-window")), name); /* start app */ command = g_strdup_printf ("%s --socket=%u", exec, socket_id); @@ -257,7 +254,8 @@ void home_button_clicked_cb (GtkButton *button, GtkBuilder *builder) { gtk_notebook_set_current_page (GTK_NOTEBOOK (W (builder, "notebook")), 0); - gtk_label_set_text (GTK_LABEL (W (builder, "applet-label")), ""); + gtk_window_set_title (GTK_WINDOW (W (builder, "main-window")), + "System Settings"); } int diff --git a/shell/shell.ui b/shell/shell.ui index 27b47fc8b..ee6e2cf4f 100644 --- a/shell/shell.ui +++ b/shell/shell.ui @@ -34,24 +34,22 @@ </packing> </child> <child> - <object class="GtkLabel" id="applet-label"> - <property name="use_markup">True</property> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="search-entry"> - <property name="width_request">210</property> + <object class="GtkAlignment" id="alignment1"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">●</property> - <property name="text" translatable="yes">Type to search your settings</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">●</property> + <property name="text" translatable="yes">Type to search your settings</property> + </object> + </child> </object> <packing> - <property name="expand">False</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> </object> |