From 260032a9ff49e78d4081b40e5f7102d2928fc572 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 20 Mar 2010 00:32:47 +0000 Subject: Add extensions to configure calender widgets. Make ECalendarItem, ECalendarView, ECalModel, EDateEdit, EMeetingStore, and EMeetingTimeSelector extensible and register extensions to automatically bind every instance to the appropriate EShellSettings. Conflicts: calendar/gui/gnome-cal.c modules/calendar/e-cal-shell-content.c --- calendar/gui/dialogs/event-page.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'calendar/gui/dialogs/event-page.c') diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index 7d79a2bfb7..a74cb64991 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -2219,7 +2219,6 @@ get_widgets (EventPage *epage) /* Glade's visibility flag doesn't seem to work for custom widgets */ priv->start_time = GW ("start-time"); - comp_editor_bind_date_edit_settings (priv->start_time, NULL); gtk_widget_show (priv->start_time); priv->time_hour = GW ("time-hour"); @@ -2228,7 +2227,6 @@ get_widgets (EventPage *epage) priv->end_time_combo = GW ("end-time-combobox"); priv->end_time = GW ("end-time"); - comp_editor_bind_date_edit_settings (priv->end_time, NULL); gtk_widget_show_all (priv->time_hour); gtk_widget_hide (priv->end_time); -- cgit v1.2.3 From 81e6232269b61e0abe287f4cf183988bf08fc04b Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Mon, 19 Apr 2010 09:57:48 +0100 Subject: Re-work the over-complicated event editor as a tabbed notebook. Thanks to Sashwaat. --- calendar/gui/dialogs/event-page.c | 47 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 44 insertions(+), 3 deletions(-) (limited to 'calendar/gui/dialogs/event-page.c') diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index a74cb64991..7627e4af4c 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -825,7 +825,8 @@ sensitize_widgets (EventPage *epage) } else { gtk_widget_show (priv->calendar_label); gtk_widget_show (priv->list_box); - gtk_widget_show (priv->attendee_box); + if (e_shell_get_express_mode(e_shell_get_default())) + gtk_widget_show (priv->attendee_box); gtk_widget_show (priv->organizer); gtk_label_set_text_with_mnemonic ((GtkLabel *) priv->org_cal_label, _("Or_ganizer:")); } @@ -2194,7 +2195,7 @@ get_widgets (EventPage *epage) priv->invite = GW ("invite"); priv->invite_label = GW ("invite-label"); - if (comp_editor_get_lite ()) + if (e_shell_get_express_mode (e_shell_get_default ())) gtk_widget_hide (priv->invite); else gtk_widget_hide (priv->invite_label); @@ -2234,7 +2235,6 @@ get_widgets (EventPage *epage) priv->source_selector = GW ("source"); -#undef GW e_util_set_source_combo_box_list (priv->source_selector, "/apps/evolution/calendar/sources"); @@ -3254,3 +3254,44 @@ event_page_remove_all_attendees (EventPage *epage) e_meeting_list_view_remove_all_attendees_from_name_selector (E_MEETING_LIST_VIEW (priv->list_view)); } + +GtkWidget * +event_page_get_alarm_page (EventPage *epage) +{ + EventPagePrivate *priv; + GtkWidget *alarm_page, *tmp; + + g_return_val_if_fail (epage != NULL, NULL); + g_return_val_if_fail (IS_EVENT_PAGE (epage), NULL); + + priv = epage->priv; + + tmp = GW("dialog-vbox1"); + alarm_page = GW("vbox2"); + g_object_ref(alarm_page); + gtk_container_remove ((GtkContainer *)tmp, alarm_page); + + return alarm_page; +} + +GtkWidget * +event_page_get_attendee_page (EventPage *epage) +{ + EventPagePrivate *priv; + GtkWidget *apage; + + g_return_val_if_fail (epage != NULL, NULL); + g_return_val_if_fail (IS_EVENT_PAGE (epage), NULL); + + priv = epage->priv; + + apage = priv->list_box; + g_object_ref(apage); + gtk_container_remove ((GtkContainer *)gtk_widget_get_parent(apage), apage); + gtk_widget_hide (priv->attendee_box); + + return apage; +} + + +#undef GW -- cgit v1.2.3 From f26a82441354513e83f8e47187a65e0a9a7ad955 Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Mon, 19 Apr 2010 17:07:05 +0530 Subject: Hide attendees box --- calendar/gui/dialogs/event-page.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'calendar/gui/dialogs/event-page.c') diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index 7627e4af4c..3aa42a48b0 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -825,7 +825,7 @@ sensitize_widgets (EventPage *epage) } else { gtk_widget_show (priv->calendar_label); gtk_widget_show (priv->list_box); - if (e_shell_get_express_mode(e_shell_get_default())) + if (!e_shell_get_express_mode(e_shell_get_default())) gtk_widget_show (priv->attendee_box); gtk_widget_show (priv->organizer); gtk_label_set_text_with_mnemonic ((GtkLabel *) priv->org_cal_label, _("Or_ganizer:")); -- cgit v1.2.3 From 9df9e2390311a76bc137c743d5adb996184f6413 Mon Sep 17 00:00:00 2001 From: Jim Ramsay Date: Tue, 18 May 2010 16:39:47 -0400 Subject: Bug 594153 (1/3) - Allow setting alarms on any meeting This introduces a new action_group called "editable" in the comp-editor that can be used by other components to assign actions that should be sensitized separately from the existing "individual" group, such as the "Alarms" and "Show Time as Busy" event actions. This fixes a bug introduced in 0597b877c5bf4d21ac4048742ddf6b11e24877ba where these two actions were accidentally grouped with other actions that should legitimately be in the "individual" group. --- calendar/gui/dialogs/event-page.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'calendar/gui/dialogs/event-page.c') diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index 7d79a2bfb7..6308cda647 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -809,6 +809,9 @@ sensitize_widgets (EventPage *epage) gtk_widget_set_sensitive (priv->invite, (!read_only && sens) || delegate); gtk_widget_set_sensitive (GTK_WIDGET (priv->list_view), !read_only); + action_group = comp_editor_get_action_group (editor, "editable"); + gtk_action_group_set_sensitive (action_group, !read_only); + action_group = comp_editor_get_action_group (editor, "individual"); gtk_action_group_set_sensitive (action_group, sensitize); -- cgit v1.2.3 From 96538878911586a9e9ca26b81e1916c04e538980 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 25 May 2010 10:15:32 -0400 Subject: Coding style and whitespace cleanup. --- calendar/gui/dialogs/event-page.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'calendar/gui/dialogs/event-page.c') diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index 74d6af4c4b..f37861827d 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -2238,7 +2238,6 @@ get_widgets (EventPage *epage) priv->source_selector = GW ("source"); - e_util_set_source_combo_box_list (priv->source_selector, "/apps/evolution/calendar/sources"); completion = e_category_completion_new (); @@ -3257,7 +3256,6 @@ event_page_remove_all_attendees (EventPage *epage) e_meeting_list_view_remove_all_attendees_from_name_selector (E_MEETING_LIST_VIEW (priv->list_view)); } - GtkWidget * event_page_get_alarm_page (EventPage *epage) { @@ -3275,7 +3273,7 @@ event_page_get_alarm_page (EventPage *epage) gtk_container_remove ((GtkContainer *)tmp, alarm_page); return alarm_page; -} +} GtkWidget * event_page_get_attendee_page (EventPage *epage) @@ -3287,14 +3285,13 @@ event_page_get_attendee_page (EventPage *epage) g_return_val_if_fail (IS_EVENT_PAGE (epage), NULL); priv = epage->priv; - + apage = priv->list_box; g_object_ref(apage); gtk_container_remove ((GtkContainer *)gtk_widget_get_parent(apage), apage); gtk_widget_hide (priv->attendee_box); return apage; -} - +} #undef GW -- cgit v1.2.3