diff options
| author | Thomas Wood <thomas.wood@intel.com> | 2010-01-13 12:11:53 +0000 |
|---|---|---|
| committer | Thomas Wood <thomas.wood@intel.com> | 2010-01-13 12:11:53 +0000 |
| commit | eb90411b3a1e7cb99d71e8c919ebdd6bbb1cd0df (patch) | |
| tree | 1bfab561d1c55c9f7f025ce43157e0379a821e44 | |
| parent | e6b366f84dbd24ceee9a58a4e8afa03cb6429244 (diff) | |
| download | gnome-control-center-eb90411b3a1e7cb99d71e8c919ebdd6bbb1cd0df.tar.gz | |
[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.
| -rw-r--r-- | shell/control-center.c | 3 | ||||
| -rw-r--r-- | shell/shell.ui | 37 |
2 files changed, 10 insertions, 30 deletions
diff --git a/shell/control-center.c b/shell/control-center.c index 72785515c..60c67595d 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 b04050293..27b47fc8b 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">•</property> - <property name="text" translatable="yes">Type to search your settings</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="invisible_char">●</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> |