Simplify the search UI for express mode.

For express mode:

- Move the search bar up to the toolbar.

- Hide the "filter" combo box and lock down the first item.

- Hide the "scope" combo box and lock down the first item.
  (This is the combo box with "Current Folder" only in the mailer.)

- EShellView owns the search bar widget now instead of EShellContent.

- Insert several nasty hacks that will likely come back to bite me.

Conflicts:

	doc/reference/shell/eshell-sections.txt

1 files changed, 8 insertions, 3 deletions

diff --git a/shell/e-shell-searchbar.h b/shell/e-shell-searchbar.h
index 77860cdfdb..84049e99e0 100644
--- a/shell/e-shell-searchbar.h
+++ b/shell/e-shell-searchbar.h
@@ -69,6 +69,11 @@ struct _EShellSearchbarClass {
 GType		e_shell_searchbar_get_type	(void);
 GtkWidget *	e_shell_searchbar_new		(EShellView *shell_view);
 EShellView *	e_shell_searchbar_get_shell_view(EShellSearchbar *searchbar);
+gboolean	e_shell_searchbar_get_express_mode
+						(EShellSearchbar *searchbar);
+void		e_shell_searchbar_set_express_mode
+						(EShellSearchbar *searchbar,
+						 gboolean express_mode);
 EActionComboBox *
 		e_shell_searchbar_get_filter_combo_box
 						(EShellSearchbar *searchbar);
@@ -77,11 +82,11 @@ gboolean	e_shell_searchbar_get_filter_visible
 void		e_shell_searchbar_set_filter_visible
 						(EShellSearchbar *searchbar,
 						 gboolean filter_visible);
-gboolean	e_shell_searchbar_get_label_visible
+gboolean	e_shell_searchbar_get_labels_visible
 						(EShellSearchbar *searchbar);
-void		e_shell_searchbar_set_label_visible
+void		e_shell_searchbar_set_labels_visible
 						(EShellSearchbar *searchbar,
-						 gboolean label_visible);
+						 gboolean labels_visible);
 const gchar *	e_shell_searchbar_get_search_hint
 						(EShellSearchbar *searchbar);
 void		e_shell_searchbar_set_search_hint