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.

1 files changed, 27 insertions, 4 deletions

diff --git a/doc/reference/shell/tmpl/e-shell-searchbar.sgml b/doc/reference/shell/tmpl/e-shell-searchbar.sgml
index 71f8894845..4817ccee6b 100644
--- a/doc/reference/shell/tmpl/e-shell-searchbar.sgml
+++ b/doc/reference/shell/tmpl/e-shell-searchbar.sgml
@@ -23,6 +23,11 @@ EShellSearchbar
 </para>
 
 
+<!-- ##### ARG EShellSearchbar:express-mode ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG EShellSearchbar:filter-combo-box ##### -->
 <para>
 
@@ -33,7 +38,7 @@ EShellSearchbar
 
 </para>
 
-<!-- ##### ARG EShellSearchbar:label-visible ##### -->
+<!-- ##### ARG EShellSearchbar:labels-visible ##### -->
 <para>
 
 </para>
@@ -96,6 +101,24 @@ EShellSearchbar
 @Returns: 
 
 
+<!-- ##### FUNCTION e_shell_searchbar_get_express_mode ##### -->
+<para>
+
+</para>
+
+@searchbar: 
+@Returns: 
+
+
+<!-- ##### FUNCTION e_shell_searchbar_set_express_mode ##### -->
+<para>
+
+</para>
+
+@searchbar: 
+@express_mode: 
+
+
 <!-- ##### FUNCTION e_shell_searchbar_get_filter_combo_box ##### -->
 <para>
 
@@ -123,7 +146,7 @@ EShellSearchbar
 @filter_visible: 
 
 
-<!-- ##### FUNCTION e_shell_searchbar_get_label_visible ##### -->
+<!-- ##### FUNCTION e_shell_searchbar_get_labels_visible ##### -->
 <para>
 
 </para>
@@ -132,13 +155,13 @@ EShellSearchbar
 @Returns: 
 
 
-<!-- ##### FUNCTION e_shell_searchbar_set_label_visible ##### -->
+<!-- ##### FUNCTION e_shell_searchbar_set_labels_visible ##### -->
 <para>
 
 </para>
 
 @searchbar: 
-@label_visible: 
+@labels_visible: 
 
 
 <!-- ##### FUNCTION e_shell_searchbar_get_search_hint ##### -->