aboutsummaryrefslogtreecommitdiffstats
path: root/doc/reference
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-03-27 06:33:00 +0800
committerMichael Meeks <michael.meeks@novell.com>2010-04-07 19:25:13 +0800
commitd9fb3008135d71dcbc512325087aceb19016ace7 (patch)
treeacac1032028ab6c239e020238718e266ef3e3f5e /doc/reference
parent0fbbec2153df8664d0b94a65d9e9df465fa8432c (diff)
downloadgsoc2013-evolution-d9fb3008135d71dcbc512325087aceb19016ace7.tar
gsoc2013-evolution-d9fb3008135d71dcbc512325087aceb19016ace7.tar.gz
gsoc2013-evolution-d9fb3008135d71dcbc512325087aceb19016ace7.tar.bz2
gsoc2013-evolution-d9fb3008135d71dcbc512325087aceb19016ace7.tar.lz
gsoc2013-evolution-d9fb3008135d71dcbc512325087aceb19016ace7.tar.xz
gsoc2013-evolution-d9fb3008135d71dcbc512325087aceb19016ace7.tar.zst
gsoc2013-evolution-d9fb3008135d71dcbc512325087aceb19016ace7.zip
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
Diffstat (limited to 'doc/reference')
-rw-r--r--doc/reference/shell/eshell-sections.txt12
-rw-r--r--doc/reference/shell/tmpl/e-shell-content.sgml13
-rw-r--r--doc/reference/shell/tmpl/e-shell-searchbar.sgml31
-rw-r--r--doc/reference/shell/tmpl/e-shell-view.sgml20
-rw-r--r--doc/reference/shell/tmpl/e-util.sgml8
-rw-r--r--doc/reference/shell/tmpl/eshell-unused.sgml38
6 files changed, 103 insertions, 19 deletions
diff --git a/doc/reference/shell/eshell-sections.txt b/doc/reference/shell/eshell-sections.txt
index 0fba5ee5b9..c176e23ee3 100644
--- a/doc/reference/shell/eshell-sections.txt
+++ b/doc/reference/shell/eshell-sections.txt
@@ -70,12 +70,11 @@ EShellBackendPrivate
<TITLE>EShellContent</TITLE>
EShellContent
e_shell_content_new
-e_shell_content_get_searchbar
+e_shell_content_set_searchbar
e_shell_content_check_state
e_shell_content_get_shell_view
e_shell_content_get_view_id
e_shell_content_set_view_id
-e_shell_content_get_search_name
e_shell_content_run_advanced_search_dialog
e_shell_content_run_edit_searches_dialog
e_shell_content_run_save_search_dialog
@@ -98,11 +97,13 @@ EShellContentPrivate
EShellSearchbar
e_shell_searchbar_new
e_shell_searchbar_get_shell_view
+e_shell_searchbar_get_express_mode
+e_shell_searchbar_set_express_mode
e_shell_searchbar_get_filter_combo_box
e_shell_searchbar_get_filter_visible
e_shell_searchbar_set_filter_visible
-e_shell_searchbar_get_label_visible
-e_shell_searchbar_set_label_visible
+e_shell_searchbar_get_labels_visible
+e_shell_searchbar_set_labels_visible
e_shell_searchbar_get_search_hint
e_shell_searchbar_set_search_hint
e_shell_searchbar_get_search_option
@@ -260,6 +261,8 @@ e_shell_view_set_view_id
e_shell_view_is_active
e_shell_view_get_page_num
e_shell_view_set_page_num
+e_shell_view_get_searchbar
+e_shell_view_get_search_name
e_shell_view_get_search_rule
e_shell_view_set_search_rule
e_shell_view_get_search_query
@@ -645,6 +648,7 @@ e_run_signature_script
<FILE>e-util</FILE>
<TITLE>Miscellaneous Utilities</TITLE>
e_get_user_data_dir
+e_get_gnome2_user_dir
e_get_accels_filename
e_show_uri
e_display_help
diff --git a/doc/reference/shell/tmpl/e-shell-content.sgml b/doc/reference/shell/tmpl/e-shell-content.sgml
index b4803b93b0..3f53314db7 100644
--- a/doc/reference/shell/tmpl/e-shell-content.sgml
+++ b/doc/reference/shell/tmpl/e-shell-content.sgml
@@ -37,13 +37,13 @@ EShellContent
@Returns:
-<!-- ##### FUNCTION e_shell_content_get_searchbar ##### -->
+<!-- ##### FUNCTION e_shell_content_set_searchbar ##### -->
<para>
</para>
@shell_content:
-@Returns:
+@searchbar:
<!-- ##### FUNCTION e_shell_content_check_state ##### -->
@@ -82,15 +82,6 @@ EShellContent
@view_id:
-<!-- ##### FUNCTION e_shell_content_get_search_name ##### -->
-<para>
-
-</para>
-
-@shell_content:
-@Returns:
-
-
<!-- ##### FUNCTION e_shell_content_run_advanced_search_dialog ##### -->
<para>
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 ##### -->
diff --git a/doc/reference/shell/tmpl/e-shell-view.sgml b/doc/reference/shell/tmpl/e-shell-view.sgml
index 03d8830fdb..5efb4d7921 100644
--- a/doc/reference/shell/tmpl/e-shell-view.sgml
+++ b/doc/reference/shell/tmpl/e-shell-view.sgml
@@ -133,6 +133,8 @@ EShellView
@new_shell_content:
@new_shell_sidebar:
@new_shell_taskbar:
+@construct_searchbar:
+@get_search_name:
@toggled:
@clear_search:
@custom_search:
@@ -220,6 +222,24 @@ EShellView
@page_num:
+<!-- ##### FUNCTION e_shell_view_get_searchbar ##### -->
+<para>
+
+</para>
+
+@shell_view:
+@Returns:
+
+
+<!-- ##### FUNCTION e_shell_view_get_search_name ##### -->
+<para>
+
+</para>
+
+@shell_view:
+@Returns:
+
+
<!-- ##### FUNCTION e_shell_view_get_search_rule ##### -->
<para>
diff --git a/doc/reference/shell/tmpl/e-util.sgml b/doc/reference/shell/tmpl/e-util.sgml
index 72bf737586..82be9d041b 100644
--- a/doc/reference/shell/tmpl/e-util.sgml
+++ b/doc/reference/shell/tmpl/e-util.sgml
@@ -25,6 +25,14 @@ Miscellaneous Utilities
@Returns:
+<!-- ##### FUNCTION e_get_gnome2_user_dir ##### -->
+<para>
+
+</para>
+
+@Returns:
+
+
<!-- ##### FUNCTION e_get_accels_filename ##### -->
<para>
diff --git a/doc/reference/shell/tmpl/eshell-unused.sgml b/doc/reference/shell/tmpl/eshell-unused.sgml
index e69de29bb2..93f3a149fa 100644
--- a/doc/reference/shell/tmpl/eshell-unused.sgml
+++ b/doc/reference/shell/tmpl/eshell-unused.sgml
@@ -0,0 +1,38 @@
+<!-- ##### ARG EShellSearchbar:label-visible ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### FUNCTION e_shell_content_get_search_name ##### -->
+<para>
+
+</para>
+
+@shell_content:
+@Returns:
+
+<!-- ##### FUNCTION e_shell_content_get_searchbar ##### -->
+<para>
+
+</para>
+
+@shell_content:
+@Returns:
+
+<!-- ##### FUNCTION e_shell_searchbar_get_label_visible ##### -->
+<para>
+
+</para>
+
+@searchbar:
+@Returns:
+
+<!-- ##### FUNCTION e_shell_searchbar_set_label_visible ##### -->
+<para>
+
+</para>
+
+@searchbar:
+@label_visible:
+