diff options
| -rw-r--r-- | addressbook/gui/component/e-book-shell-view-actions.c | 12 | ||||
| -rw-r--r-- | addressbook/gui/component/e-book-shell-view-private.c | 9 | ||||
| -rw-r--r-- | addressbook/gui/component/e-book-shell-view-private.h | 3 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-addressbook-view.c | 7 | ||||
| -rw-r--r-- | doc/reference/shell/tmpl/e-shell-content.sgml | 267 | ||||
| -rw-r--r-- | doc/reference/shell/tmpl/e-shell-sidebar.sgml | 45 | ||||
| -rw-r--r-- | doc/reference/shell/tmpl/e-shell-taskbar.sgml | 35 | ||||
| -rw-r--r-- | doc/reference/shell/tmpl/e-shell-window.sgml | 117 | ||||
| -rw-r--r-- | doc/reference/shell/tmpl/eshell-unused.sgml | 413 | ||||
| -rw-r--r-- | e-util/e-marshal.list | 1 |
10 files changed, 440 insertions, 469 deletions
diff --git a/addressbook/gui/component/e-book-shell-view-actions.c b/addressbook/gui/component/e-book-shell-view-actions.c index 646715d88a..457f15cf1b 100644 --- a/addressbook/gui/component/e-book-shell-view-actions.c +++ b/addressbook/gui/component/e-book-shell-view-actions.c @@ -753,7 +753,14 @@ static GtkRadioActionEntry contact_filter_entries[] = { N_("Any Category"), NULL, NULL, - CONTACT_FILTER_ANY_CATEGORY } + CONTACT_FILTER_ANY_CATEGORY }, + + { "contact-filter-unmatched", + NULL, + N_("Unmatched"), + NULL, + NULL, + CONTACT_FILTER_UNMATCHED } }; static GtkRadioActionEntry contact_search_entries[] = { @@ -898,4 +905,7 @@ e_book_shell_view_update_search_filter (EBookShellView *book_shell_view) /* Use any action in the group; doesn't matter which. */ e_shell_content_set_filter_action (shell_content, radio_action); + + ii = CONTACT_FILTER_UNMATCHED; + e_shell_content_add_filter_separator_after (shell_content, ii); } diff --git a/addressbook/gui/component/e-book-shell-view-private.c b/addressbook/gui/component/e-book-shell-view-private.c index 521260bdeb..509547c6c0 100644 --- a/addressbook/gui/component/e-book-shell-view-private.c +++ b/addressbook/gui/component/e-book-shell-view-private.c @@ -575,6 +575,15 @@ e_book_shell_view_execute_search (EBookShellView *book_shell_view) case CONTACT_FILTER_ANY_CATEGORY: break; + case CONTACT_FILTER_UNMATCHED: + temp = g_strdup_printf ( + "(and (not (and (exists \"CATEGORIES\") " + "(not (is \"CATEGORIES\" \"\")))) %s)", + query); + g_free (query); + query = temp; + break; + default: { GList *categories; diff --git a/addressbook/gui/component/e-book-shell-view-private.h b/addressbook/gui/component/e-book-shell-view-private.h index 9bb4f91a22..0079ca3ec2 100644 --- a/addressbook/gui/component/e-book-shell-view-private.h +++ b/addressbook/gui/component/e-book-shell-view-private.h @@ -78,7 +78,8 @@ struct _EditorUidClosure { /* List these in the order to be displayed. * Positive values are reserved for categories. */ enum { - CONTACT_FILTER_ANY_CATEGORY = -1 + CONTACT_FILTER_ANY_CATEGORY = -2, + CONTACT_FILTER_UNMATCHED = -1 }; /* List these in the order to be displayed. */ diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index 216a7c77a6..a979e5a1cb 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -666,9 +666,10 @@ addressbook_view_class_init (EAddressbookViewClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EAddressbookViewClass, open_contact), NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, 1, - E_TYPE_CONTACT); + e_marshal_VOID__OBJECT_BOOLEAN, + G_TYPE_NONE, 2, + E_TYPE_CONTACT, + G_TYPE_BOOLEAN); signals[POPUP_EVENT] = g_signal_new ( "popup-event", diff --git a/doc/reference/shell/tmpl/e-shell-content.sgml b/doc/reference/shell/tmpl/e-shell-content.sgml index cb09ae28e7..a17f4133d3 100644 --- a/doc/reference/shell/tmpl/e-shell-content.sgml +++ b/doc/reference/shell/tmpl/e-shell-content.sgml @@ -101,270 +101,3 @@ EShellContent @Returns: -<!-- ##### FUNCTION e_shell_content_get_shell_view ##### --> -<para> - -</para> - -@shell_content: -@Returns: - - -<!-- ##### FUNCTION e_shell_content_get_context ##### --> -<para> - -</para> - -@shell_content: -@Returns: - - -<!-- ##### FUNCTION e_shell_content_set_context ##### --> -<para> - -</para> - -@shell_content: -@context: - - -<!-- ##### FUNCTION e_shell_content_get_filter_action ##### --> -<para> - -</para> - -@shell_content: -@Returns: - - -<!-- ##### FUNCTION e_shell_content_set_filter_action ##### --> -<para> - -</para> - -@shell_content: -@filter_action: - - -<!-- ##### FUNCTION e_shell_content_get_filter_value ##### --> -<para> - -</para> - -@shell_content: -@Returns: - - -<!-- ##### FUNCTION e_shell_content_set_filter_value ##### --> -<para> - -</para> - -@shell_content: -@filter_value: - - -<!-- ##### FUNCTION e_shell_content_get_filter_visible ##### --> -<para> - -</para> - -@shell_content: -@Returns: - - -<!-- ##### FUNCTION e_shell_content_set_filter_visible ##### --> -<para> - -</para> - -@shell_content: -@filter_visible: - - -<!-- ##### FUNCTION e_shell_content_add_filter_separator_after ##### --> -<para> - -</para> - -@shell_content: -@action_value: - - -<!-- ##### FUNCTION e_shell_content_get_search_context ##### --> -<para> - -</para> - -@shell_content: -@Returns: - - -<!-- ##### FUNCTION e_shell_content_get_search_rule ##### --> -<para> - -</para> - -@shell_content: -@Returns: - - -<!-- ##### FUNCTION e_shell_content_set_search_rule ##### --> -<para> - -</para> - -@shell_content: -@search_rule: - - -<!-- ##### FUNCTION e_shell_content_get_search_text ##### --> -<para> - -</para> - -@shell_content: -@Returns: - - -<!-- ##### FUNCTION e_shell_content_set_search_text ##### --> -<para> - -</para> - -@shell_content: -@search_text: - - -<!-- ##### FUNCTION e_shell_content_get_search_value ##### --> -<para> - -</para> - -@shell_content: -@Returns: - - -<!-- ##### FUNCTION e_shell_content_set_search_value ##### --> -<para> - -</para> - -@shell_content: -@search_value: - - -<!-- ##### FUNCTION e_shell_content_get_search_visible ##### --> -<para> - -</para> - -@shell_content: -@Returns: - - -<!-- ##### FUNCTION e_shell_content_set_search_visible ##### --> -<para> - -</para> - -@shell_content: -@search_visible: - - -<!-- ##### FUNCTION e_shell_content_get_scope_action ##### --> -<para> - -</para> - -@shell_content: -@Returns: - - -<!-- ##### FUNCTION e_shell_content_set_scope_action ##### --> -<para> - -</para> - -@shell_content: -@scope_action: - - -<!-- ##### FUNCTION e_shell_content_get_scope_value ##### --> -<para> - -</para> - -@shell_content: -@Returns: - - -<!-- ##### FUNCTION e_shell_content_set_scope_value ##### --> -<para> - -</para> - -@shell_content: -@scope_value: - - -<!-- ##### FUNCTION e_shell_content_get_scope_visible ##### --> -<para> - -</para> - -@shell_content: -@Returns: - - -<!-- ##### FUNCTION e_shell_content_set_scope_visible ##### --> -<para> - -</para> - -@shell_content: -@scope_visible: - - -<!-- ##### FUNCTION e_shell_content_get_view_id ##### --> -<para> - -</para> - -@shell_content: -@Returns: - - -<!-- ##### FUNCTION e_shell_content_set_view_id ##### --> -<para> - -</para> - -@shell_content: -@view_id: - - -<!-- ##### FUNCTION e_shell_content_run_advanced_search_dialog ##### --> -<para> - -</para> - -@shell_content: - - -<!-- ##### FUNCTION e_shell_content_run_edit_searches_dialog ##### --> -<para> - -</para> - -@shell_content: - - -<!-- ##### FUNCTION e_shell_content_run_save_search_dialog ##### --> -<para> - -</para> - -@shell_content: - - diff --git a/doc/reference/shell/tmpl/e-shell-sidebar.sgml b/doc/reference/shell/tmpl/e-shell-sidebar.sgml index 6e3d22d620..16c46bc326 100644 --- a/doc/reference/shell/tmpl/e-shell-sidebar.sgml +++ b/doc/reference/shell/tmpl/e-shell-sidebar.sgml @@ -56,48 +56,3 @@ EShellSidebar @Returns: -<!-- ##### FUNCTION e_shell_sidebar_get_shell_view ##### --> -<para> - -</para> - -@shell_sidebar: -@Returns: - - -<!-- ##### FUNCTION e_shell_sidebar_get_primary_text ##### --> -<para> - -</para> - -@shell_sidebar: -@Returns: - - -<!-- ##### FUNCTION e_shell_sidebar_set_primary_text ##### --> -<para> - -</para> - -@shell_sidebar: -@primary_text: - - -<!-- ##### FUNCTION e_shell_sidebar_get_secondary_text ##### --> -<para> - -</para> - -@shell_sidebar: -@Returns: - - -<!-- ##### FUNCTION e_shell_sidebar_set_secondary_text ##### --> -<para> - -</para> - -@shell_sidebar: -@secondary_text: - - diff --git a/doc/reference/shell/tmpl/e-shell-taskbar.sgml b/doc/reference/shell/tmpl/e-shell-taskbar.sgml index 6aa90f1c72..ff99855e5e 100644 --- a/doc/reference/shell/tmpl/e-shell-taskbar.sgml +++ b/doc/reference/shell/tmpl/e-shell-taskbar.sgml @@ -42,38 +42,3 @@ EShellTaskbar @Returns: -<!-- ##### FUNCTION e_shell_taskbar_get_shell_view ##### --> -<para> - -</para> - -@shell_taskbar: -@Returns: - - -<!-- ##### FUNCTION e_shell_taskbar_get_message ##### --> -<para> - -</para> - -@shell_taskbar: -@Returns: - - -<!-- ##### FUNCTION e_shell_taskbar_set_message ##### --> -<para> - -</para> - -@shell_taskbar: -@message: - - -<!-- ##### FUNCTION e_shell_taskbar_unset_message ##### --> -<para> - -</para> - -@shell_taskbar: - - diff --git a/doc/reference/shell/tmpl/e-shell-window.sgml b/doc/reference/shell/tmpl/e-shell-window.sgml index 48f51ef992..750f9cf529 100644 --- a/doc/reference/shell/tmpl/e-shell-window.sgml +++ b/doc/reference/shell/tmpl/e-shell-window.sgml @@ -57,120 +57,3 @@ EShellWindow @Returns: -<!-- ##### FUNCTION e_shell_window_get_shell_view ##### --> -<para> - -</para> - -@shell_window: -@view_name: -@Returns: - - -<!-- ##### FUNCTION e_shell_window_get_shell_view_action ##### --> -<para> - -</para> - -@shell_window: -@view_name: -@Returns: - - -<!-- ##### FUNCTION e_shell_window_get_ui_manager ##### --> -<para> - -</para> - -@shell_window: -@Returns: - - -<!-- ##### FUNCTION e_shell_window_get_action ##### --> -<para> - -</para> - -@shell_window: -@action_name: -@Returns: - - -<!-- ##### FUNCTION e_shell_window_get_action_group ##### --> -<para> - -</para> - -@shell_window: -@group_name: -@Returns: - - -<!-- ##### FUNCTION e_shell_window_get_managed_widget ##### --> -<para> - -</para> - -@shell_window: -@widget_path: -@Returns: - - -<!-- ##### FUNCTION e_shell_window_get_active_view ##### --> -<para> - -</para> - -@shell_window: -@Returns: - - -<!-- ##### FUNCTION e_shell_window_set_active_view ##### --> -<para> - -</para> - -@shell_window: -@view_name: - - -<!-- ##### FUNCTION e_shell_window_get_safe_mode ##### --> -<para> - -</para> - -@shell_window: -@Returns: - - -<!-- ##### FUNCTION e_shell_window_set_safe_mode ##### --> -<para> - -</para> - -@shell_window: -@safe_mode: - - -<!-- ##### FUNCTION e_shell_window_register_new_item_actions ##### --> -<para> - -</para> - -@shell_window: -@module_name: -@entries: -@n_entries: - - -<!-- ##### FUNCTION e_shell_window_register_new_source_actions ##### --> -<para> - -</para> - -@shell_window: -@module_name: -@entries: -@n_entries: - - diff --git a/doc/reference/shell/tmpl/eshell-unused.sgml b/doc/reference/shell/tmpl/eshell-unused.sgml index 3ed67b59d1..0a775062fd 100644 --- a/doc/reference/shell/tmpl/eshell-unused.sgml +++ b/doc/reference/shell/tmpl/eshell-unused.sgml @@ -1721,6 +1721,243 @@ intelligent @revision: @Returns: +<!-- ##### FUNCTION e_shell_content_add_filter_separator_after ##### --> +<para> + +</para> + +@shell_content: +@action_value: + +<!-- ##### FUNCTION e_shell_content_get_context ##### --> +<para> + +</para> + +@shell_content: +@Returns: + +<!-- ##### FUNCTION e_shell_content_get_filter_action ##### --> +<para> + +</para> + +@shell_content: +@Returns: + +<!-- ##### FUNCTION e_shell_content_get_filter_value ##### --> +<para> + +</para> + +@shell_content: +@Returns: + +<!-- ##### FUNCTION e_shell_content_get_filter_visible ##### --> +<para> + +</para> + +@shell_content: +@Returns: + +<!-- ##### FUNCTION e_shell_content_get_scope_action ##### --> +<para> + +</para> + +@shell_content: +@Returns: + +<!-- ##### FUNCTION e_shell_content_get_scope_value ##### --> +<para> + +</para> + +@shell_content: +@Returns: + +<!-- ##### FUNCTION e_shell_content_get_scope_visible ##### --> +<para> + +</para> + +@shell_content: +@Returns: + +<!-- ##### FUNCTION e_shell_content_get_search_context ##### --> +<para> + +</para> + +@shell_content: +@Returns: + +<!-- ##### FUNCTION e_shell_content_get_search_rule ##### --> +<para> + +</para> + +@shell_content: +@Returns: + +<!-- ##### FUNCTION e_shell_content_get_search_text ##### --> +<para> + +</para> + +@shell_content: +@Returns: + +<!-- ##### FUNCTION e_shell_content_get_search_value ##### --> +<para> + +</para> + +@shell_content: +@Returns: + +<!-- ##### FUNCTION e_shell_content_get_search_visible ##### --> +<para> + +</para> + +@shell_content: +@Returns: + +<!-- ##### FUNCTION e_shell_content_get_shell_view ##### --> +<para> + +</para> + +@shell_content: +@Returns: + +<!-- ##### FUNCTION e_shell_content_get_view_id ##### --> +<para> + +</para> + +@shell_content: +@Returns: + +<!-- ##### FUNCTION e_shell_content_run_advanced_search_dialog ##### --> +<para> + +</para> + +@shell_content: + +<!-- ##### FUNCTION e_shell_content_run_edit_searches_dialog ##### --> +<para> + +</para> + +@shell_content: + +<!-- ##### FUNCTION e_shell_content_run_save_search_dialog ##### --> +<para> + +</para> + +@shell_content: + +<!-- ##### FUNCTION e_shell_content_set_context ##### --> +<para> + +</para> + +@shell_content: +@context: + +<!-- ##### FUNCTION e_shell_content_set_filter_action ##### --> +<para> + +</para> + +@shell_content: +@filter_action: + +<!-- ##### FUNCTION e_shell_content_set_filter_value ##### --> +<para> + +</para> + +@shell_content: +@filter_value: + +<!-- ##### FUNCTION e_shell_content_set_filter_visible ##### --> +<para> + +</para> + +@shell_content: +@filter_visible: + +<!-- ##### FUNCTION e_shell_content_set_scope_action ##### --> +<para> + +</para> + +@shell_content: +@scope_action: + +<!-- ##### FUNCTION e_shell_content_set_scope_value ##### --> +<para> + +</para> + +@shell_content: +@scope_value: + +<!-- ##### FUNCTION e_shell_content_set_scope_visible ##### --> +<para> + +</para> + +@shell_content: +@scope_visible: + +<!-- ##### FUNCTION e_shell_content_set_search_rule ##### --> +<para> + +</para> + +@shell_content: +@search_rule: + +<!-- ##### FUNCTION e_shell_content_set_search_text ##### --> +<para> + +</para> + +@shell_content: +@search_text: + +<!-- ##### FUNCTION e_shell_content_set_search_value ##### --> +<para> + +</para> + +@shell_content: +@search_value: + +<!-- ##### FUNCTION e_shell_content_set_search_visible ##### --> +<para> + +</para> + +@shell_content: +@search_visible: + +<!-- ##### FUNCTION e_shell_content_set_view_id ##### --> +<para> + +</para> + +@shell_content: +@view_id: + <!-- ##### FUNCTION e_shell_marshal_BOOLEAN__STRING ##### --> <para> @@ -1766,6 +2003,77 @@ intelligent @online: @Returns: +<!-- ##### FUNCTION e_shell_sidebar_get_primary_text ##### --> +<para> + +</para> + +@shell_sidebar: +@Returns: + +<!-- ##### FUNCTION e_shell_sidebar_get_secondary_text ##### --> +<para> + +</para> + +@shell_sidebar: +@Returns: + +<!-- ##### FUNCTION e_shell_sidebar_get_shell_view ##### --> +<para> + +</para> + +@shell_sidebar: +@Returns: + +<!-- ##### FUNCTION e_shell_sidebar_set_primary_text ##### --> +<para> + +</para> + +@shell_sidebar: +@primary_text: + +<!-- ##### FUNCTION e_shell_sidebar_set_secondary_text ##### --> +<para> + +</para> + +@shell_sidebar: +@secondary_text: + +<!-- ##### FUNCTION e_shell_taskbar_get_message ##### --> +<para> + +</para> + +@shell_taskbar: +@Returns: + +<!-- ##### FUNCTION e_shell_taskbar_get_shell_view ##### --> +<para> + +</para> + +@shell_taskbar: +@Returns: + +<!-- ##### FUNCTION e_shell_taskbar_set_message ##### --> +<para> + +</para> + +@shell_taskbar: +@message: + +<!-- ##### FUNCTION e_shell_taskbar_unset_message ##### --> +<para> + +</para> + +@shell_taskbar: + <!-- ##### FUNCTION e_shell_upgrade_attempt ##### --> <para> @@ -1774,6 +2082,111 @@ intelligent @shell: @Returns: +<!-- ##### FUNCTION e_shell_window_get_action ##### --> +<para> + +</para> + +@shell_window: +@action_name: +@Returns: + +<!-- ##### FUNCTION e_shell_window_get_action_group ##### --> +<para> + +</para> + +@shell_window: +@group_name: +@Returns: + +<!-- ##### FUNCTION e_shell_window_get_active_view ##### --> +<para> + +</para> + +@shell_window: +@Returns: + +<!-- ##### FUNCTION e_shell_window_get_managed_widget ##### --> +<para> + +</para> + +@shell_window: +@widget_path: +@Returns: + +<!-- ##### FUNCTION e_shell_window_get_safe_mode ##### --> +<para> + +</para> + +@shell_window: +@Returns: + +<!-- ##### FUNCTION e_shell_window_get_shell_view ##### --> +<para> + +</para> + +@shell_window: +@view_name: +@Returns: + +<!-- ##### FUNCTION e_shell_window_get_shell_view_action ##### --> +<para> + +</para> + +@shell_window: +@view_name: +@Returns: + +<!-- ##### FUNCTION e_shell_window_get_ui_manager ##### --> +<para> + +</para> + +@shell_window: +@Returns: + +<!-- ##### FUNCTION e_shell_window_register_new_item_actions ##### --> +<para> + +</para> + +@shell_window: +@module_name: +@entries: +@n_entries: + +<!-- ##### FUNCTION e_shell_window_register_new_source_actions ##### --> +<para> + +</para> + +@shell_window: +@module_name: +@entries: +@n_entries: + +<!-- ##### FUNCTION e_shell_window_set_active_view ##### --> +<para> + +</para> + +@shell_window: +@view_name: + +<!-- ##### FUNCTION e_shell_window_set_safe_mode ##### --> +<para> + +</para> + +@shell_window: +@safe_mode: + <!-- ##### VARIABLE e_test_shell_view_type ##### --> <para> diff --git a/e-util/e-marshal.list b/e-util/e-marshal.list index 1ae89a8e20..366602491b 100644 --- a/e-util/e-marshal.list +++ b/e-util/e-marshal.list @@ -42,6 +42,7 @@ NONE:INT,POINTER,INT,OBJECT,INT,INT,BOXED,UINT,UINT NONE:INT,POINTER,INT,OBJECT,UINT NONE:INT,STRING NONE:LONG,LONG +NONE:OBJECT,BOOLEAN NONE:OBJECT,DOUBLE,DOUBLE,BOOLEAN NONE:OBJECT,OBJECT NONE:POINTER,BOOLEAN |