From d9fb3008135d71dcbc512325087aceb19016ace7 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 26 Mar 2010 22:33:00 +0000 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. Conflicts: doc/reference/shell/eshell-sections.txt --- modules/calendar/e-cal-shell-content.c | 9 +++------ modules/calendar/e-memo-shell-content.c | 4 +++- modules/calendar/e-task-shell-content.c | 4 +++- 3 files changed, 9 insertions(+), 8 deletions(-) (limited to 'modules/calendar') diff --git a/modules/calendar/e-cal-shell-content.c b/modules/calendar/e-cal-shell-content.c index e9bba7a83b..e35b935f05 100644 --- a/modules/calendar/e-cal-shell-content.c +++ b/modules/calendar/e-cal-shell-content.c @@ -544,7 +544,6 @@ cal_shell_content_class_init (ECalShellContentClass *class) { GObjectClass *object_class; GtkWidgetClass *widget_class; - EShellContentClass *shell_content_class; parent_class = g_type_class_peek_parent (class); g_type_class_add_private (class, sizeof (ECalShellContentPrivate)); @@ -555,10 +554,6 @@ cal_shell_content_class_init (ECalShellContentClass *class) object_class->dispose = cal_shell_content_dispose; object_class->constructed = cal_shell_content_constructed; - shell_content_class = E_SHELL_CONTENT_CLASS (class); - if(e_shell_get_express_mode(e_shell_get_default())) - shell_content_class->construct_searchbar = NULL; - widget_class = GTK_WIDGET_CLASS (class); widget_class->map = cal_shell_content_map; @@ -682,6 +677,7 @@ e_cal_shell_content_get_task_table (ECalShellContent *cal_shell_content) EShellSearchbar * e_cal_shell_content_get_searchbar (ECalShellContent *cal_shell_content) { + EShellView *shell_view; EShellContent *shell_content; GtkWidget *widget; @@ -689,7 +685,8 @@ e_cal_shell_content_get_searchbar (ECalShellContent *cal_shell_content) E_IS_CAL_SHELL_CONTENT (cal_shell_content), NULL); shell_content = E_SHELL_CONTENT (cal_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); } diff --git a/modules/calendar/e-memo-shell-content.c b/modules/calendar/e-memo-shell-content.c index fe952eda3f..d56a6105d1 100644 --- a/modules/calendar/e-memo-shell-content.c +++ b/modules/calendar/e-memo-shell-content.c @@ -730,6 +730,7 @@ e_memo_shell_content_set_preview_visible (EMemoShellContent *memo_shell_content, EShellSearchbar * e_memo_shell_content_get_searchbar (EMemoShellContent *memo_shell_content) { + EShellView *shell_view; EShellContent *shell_content; GtkWidget *widget; @@ -737,7 +738,8 @@ e_memo_shell_content_get_searchbar (EMemoShellContent *memo_shell_content) E_IS_MEMO_SHELL_CONTENT (memo_shell_content), NULL); shell_content = E_SHELL_CONTENT (memo_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); } diff --git a/modules/calendar/e-task-shell-content.c b/modules/calendar/e-task-shell-content.c index ab813d5b2c..910b4da48e 100644 --- a/modules/calendar/e-task-shell-content.c +++ b/modules/calendar/e-task-shell-content.c @@ -752,6 +752,7 @@ e_task_shell_content_set_preview_visible (ETaskShellContent *task_shell_content, EShellSearchbar * e_task_shell_content_get_searchbar (ETaskShellContent *task_shell_content) { + EShellView *shell_view; EShellContent *shell_content; GtkWidget *widget; @@ -759,7 +760,8 @@ e_task_shell_content_get_searchbar (ETaskShellContent *task_shell_content) E_IS_TASK_SHELL_CONTENT (task_shell_content), NULL); shell_content = E_SHELL_CONTENT (task_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