From 71e92f3f2c45cd8dd9f44d8226e23603164974a5 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 24 Jun 2010 20:23:07 -0400 Subject: EShellContent: Add a focus_search_results() method. This gives EShellSearchbar something concrete to call to direct focus away from itself instead of tabbing forward and hoping for the best. --- modules/addressbook/e-book-shell-content.c | 13 +++++++++++++ modules/calendar/e-cal-shell-content.c | 21 +++++++++++++++++++++ modules/calendar/e-memo-shell-content.c | 11 +++++++++++ modules/calendar/e-task-shell-content.c | 11 +++++++++++ modules/mail/e-mail-shell-content.c | 11 +++++++++++ 5 files changed, 67 insertions(+) (limited to 'modules') diff --git a/modules/addressbook/e-book-shell-content.c b/modules/addressbook/e-book-shell-content.c index 66cd6a4660..bc374079a3 100644 --- a/modules/addressbook/e-book-shell-content.c +++ b/modules/addressbook/e-book-shell-content.c @@ -363,6 +363,18 @@ book_shell_content_check_state (EShellContent *shell_content) return state; } +static void +book_shell_content_focus_search_results (EShellContent *shell_content) +{ + EBookShellContent *book_shell_content; + EAddressbookView *view; + + book_shell_content = E_BOOK_SHELL_CONTENT (shell_content); + view = e_book_shell_content_get_current_view (book_shell_content); + + gtk_widget_grab_focus (GTK_WIDGET (view)); +} + static void book_shell_content_class_init (EBookShellContentClass *class) { @@ -380,6 +392,7 @@ book_shell_content_class_init (EBookShellContentClass *class) shell_content_class = E_SHELL_CONTENT_CLASS (class); shell_content_class->check_state = book_shell_content_check_state; + shell_content_class->focus_search_results = book_shell_content_focus_search_results; g_object_class_install_property ( object_class, diff --git a/modules/calendar/e-cal-shell-content.c b/modules/calendar/e-cal-shell-content.c index a51a072f66..146d9b964a 100644 --- a/modules/calendar/e-cal-shell-content.c +++ b/modules/calendar/e-cal-shell-content.c @@ -357,6 +357,7 @@ cal_shell_content_constructed (GObject *object) foreign_content = e_shell_view_get_shell_content (foreign_view); g_object_get (foreign_content, "model", &task_model, NULL); } + /* Build content widgets. */ container = GTK_WIDGET (object); @@ -546,11 +547,28 @@ cal_shell_content_map (GtkWidget *widget) GTK_WIDGET_CLASS (parent_class)->map (widget); } +static void +cal_shell_content_focus_search_results (EShellContent *shell_content) +{ + ECalShellContent *cal_shell_content; + GnomeCalendar *calendar; + GnomeCalendarViewType view_type; + ECalendarView *calendar_view; + + cal_shell_content = E_CAL_SHELL_CONTENT (shell_content); + calendar = e_cal_shell_content_get_calendar (cal_shell_content); + view_type = gnome_calendar_get_view (calendar); + calendar_view = gnome_calendar_get_calendar_view (calendar, view_type); + + gtk_widget_grab_focus (GTK_WIDGET (calendar_view)); +} + static void 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)); @@ -564,6 +582,9 @@ cal_shell_content_class_init (ECalShellContentClass *class) widget_class = GTK_WIDGET_CLASS (class); widget_class->map = cal_shell_content_map; + shell_content_class = E_SHELL_CONTENT_CLASS (class); + shell_content_class->focus_search_results = cal_shell_content_focus_search_results; + g_object_class_install_property ( object_class, PROP_CALENDAR, diff --git a/modules/calendar/e-memo-shell-content.c b/modules/calendar/e-memo-shell-content.c index f9188dedc5..663920044c 100644 --- a/modules/calendar/e-memo-shell-content.c +++ b/modules/calendar/e-memo-shell-content.c @@ -600,6 +600,16 @@ memo_shell_content_check_state (EShellContent *shell_content) return state; } +static void +memo_shell_content_focus_search_results (EShellContent *shell_content) +{ + EMemoShellContentPrivate *priv; + + priv = E_MEMO_SHELL_CONTENT_GET_PRIVATE (shell_content); + + gtk_widget_grab_focus (priv->memo_table); +} + static void memo_shell_content_class_init (EMemoShellContentClass *class) { @@ -618,6 +628,7 @@ memo_shell_content_class_init (EMemoShellContentClass *class) shell_content_class = E_SHELL_CONTENT_CLASS (class); shell_content_class->check_state = memo_shell_content_check_state; + shell_content_class->focus_search_results = memo_shell_content_focus_search_results; g_object_class_install_property ( object_class, diff --git a/modules/calendar/e-task-shell-content.c b/modules/calendar/e-task-shell-content.c index b2744a883e..bb2017fa8a 100644 --- a/modules/calendar/e-task-shell-content.c +++ b/modules/calendar/e-task-shell-content.c @@ -620,6 +620,16 @@ task_shell_content_check_state (EShellContent *shell_content) return state; } +static void +task_shell_content_focus_search_results (EShellContent *shell_content) +{ + ETaskShellContentPrivate *priv; + + priv = E_TASK_SHELL_CONTENT_GET_PRIVATE (shell_content); + + gtk_widget_grab_focus (priv->task_table); +} + static void task_shell_content_class_init (ETaskShellContentClass *class) { @@ -638,6 +648,7 @@ task_shell_content_class_init (ETaskShellContentClass *class) shell_content_class = E_SHELL_CONTENT_CLASS (class); shell_content_class->check_state = task_shell_content_check_state; + shell_content_class->focus_search_results = task_shell_content_focus_search_results; g_object_class_install_property ( object_class, diff --git a/modules/mail/e-mail-shell-content.c b/modules/mail/e-mail-shell-content.c index d0e3ffa0e9..e7fb20d1cf 100644 --- a/modules/mail/e-mail-shell-content.c +++ b/modules/mail/e-mail-shell-content.c @@ -489,6 +489,16 @@ mail_shell_content_check_state (EShellContent *shell_content) return e_mail_reader_check_state (E_MAIL_READER (shell_content)); } +static void +mail_shell_content_focus_search_results (EShellContent *shell_content) +{ + EMailShellContentPrivate *priv; + + priv = E_MAIL_SHELL_CONTENT_GET_PRIVATE (shell_content); + + gtk_widget_grab_focus (priv->message_list); +} + static GtkActionGroup * mail_shell_content_get_action_group (EMailReader *reader) { @@ -695,6 +705,7 @@ mail_shell_content_class_init (EMailShellContentClass *class) shell_content_class = E_SHELL_CONTENT_CLASS (class); shell_content_class->check_state = mail_shell_content_check_state; + shell_content_class->focus_search_results = mail_shell_content_focus_search_results; /* Inherited from EMailReader */ g_object_class_override_property ( -- cgit