From df17adc5aa4ff6af69686d0957e1ab6dfa58732d Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 9 Jun 2009 00:28:07 -0400 Subject: Search bar improvements. Split the search entry into a new widget to manage hints (EHintedEntry). Let the search entry expand to use available horizontal space. --- calendar/module/e-memo-shell-view-actions.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) (limited to 'calendar/module/e-memo-shell-view-actions.c') diff --git a/calendar/module/e-memo-shell-view-actions.c b/calendar/module/e-memo-shell-view-actions.c index ab0b9f0fe3..855a7b18b4 100644 --- a/calendar/module/e-memo-shell-view-actions.c +++ b/calendar/module/e-memo-shell-view-actions.c @@ -504,6 +504,29 @@ action_memo_save_as_cb (GtkAction *action, g_free (string); } +static void +action_memo_search_cb (GtkRadioAction *action, + GtkRadioAction *current, + EMemoShellView *memo_shell_view) +{ + EShellView *shell_view; + EShellContent *shell_content; + const gchar *search_hint; + + /* XXX Figure out a way to handle this in EShellContent + * instead of every shell view having to handle it. + * The problem is EShellContent does not know what + * the search option actions are for this view. It + * would have to dig up the popup menu and retrieve + * the action for each menu item. Seems messy. */ + + shell_view = E_SHELL_VIEW (memo_shell_view); + shell_content = e_shell_view_get_shell_content (shell_view); + + search_hint = gtk_action_get_label (GTK_ACTION (current)); + e_shell_content_set_search_hint (shell_content, search_hint); +} + static void action_search_execute_cb (GtkAction *action, EMemoShellView *memo_shell_view) @@ -803,7 +826,7 @@ e_memo_shell_view_actions_init (EMemoShellView *memo_shell_view) action_group, memo_search_entries, G_N_ELEMENTS (memo_search_entries), MEMO_SEARCH_SUMMARY_CONTAINS, - NULL, NULL); + G_CALLBACK (action_memo_search_cb), memo_shell_view); /* Lockdown Printing Actions */ action_group = ACTION_GROUP (LOCKDOWN_PRINTING); -- cgit v1.2.3