From f7547cc6ac347ea5e9dd92034264a23e6fd48ac4 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 26 Mar 2010 18:33:00 -0400 Subject: 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. --- modules/mail/e-mail-shell-content.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'modules/mail/e-mail-shell-content.c') diff --git a/modules/mail/e-mail-shell-content.c b/modules/mail/e-mail-shell-content.c index 17eb613b32..67d58ce094 100644 --- a/modules/mail/e-mail-shell-content.c +++ b/modules/mail/e-mail-shell-content.c @@ -869,6 +869,7 @@ e_mail_shell_content_set_preview_visible (EMailShellContent *mail_shell_content, EShellSearchbar * e_mail_shell_content_get_searchbar (EMailShellContent *mail_shell_content) { + EShellView *shell_view; EShellContent *shell_content; GtkWidget *widget; @@ -876,7 +877,8 @@ e_mail_shell_content_get_searchbar (EMailShellContent *mail_shell_content) E_IS_MAIL_SHELL_CONTENT (mail_shell_content), NULL); shell_content = E_SHELL_CONTENT (mail_shell_content); - widget = e_shell_content_get_searchbar (shell_content); + shell_view = e_shell_content_get_shell_view (shell_content); + widget = e_shell_view_get_searchbar (shell_view); return E_SHELL_SEARCHBAR (widget); } -- cgit v1.2.3