diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-05-25 21:14:51 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-05-25 21:14:51 +0800 |
| commit | f49077cfb57ade9013674487a1f371da7c038709 (patch) | |
| tree | 58ebabbe624409eed22ed13578eab3ed2d4d0206 /calendar/gui/dialogs/event-editor.c | |
| parent | d3c7420fb977fe5c337f2c917839a6e982a47902 (diff) | |
| parent | 9fb0290d914e63512f6e3fc719b6b0249d787656 (diff) | |
| download | gsoc2013-evolution-f49077cfb57ade9013674487a1f371da7c038709.tar gsoc2013-evolution-f49077cfb57ade9013674487a1f371da7c038709.tar.gz gsoc2013-evolution-f49077cfb57ade9013674487a1f371da7c038709.tar.bz2 gsoc2013-evolution-f49077cfb57ade9013674487a1f371da7c038709.tar.lz gsoc2013-evolution-f49077cfb57ade9013674487a1f371da7c038709.tar.xz gsoc2013-evolution-f49077cfb57ade9013674487a1f371da7c038709.tar.zst gsoc2013-evolution-f49077cfb57ade9013674487a1f371da7c038709.zip | |
Merge branch 'gnome-2-30' into express2
Diffstat (limited to 'calendar/gui/dialogs/event-editor.c')
| -rw-r--r-- | calendar/gui/dialogs/event-editor.c | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c index 687f26a5d5..1ae9595c02 100644 --- a/calendar/gui/dialogs/event-editor.c +++ b/calendar/gui/dialogs/event-editor.c @@ -203,7 +203,7 @@ action_show_time_busy_cb (GtkToggleAction *action, event_page_set_show_time_busy (editor->priv->event_page, active); } -static GtkActionEntry event_entries[] = { +static GtkActionEntry editable_entries[] = { { "alarms", "appointment-soon", @@ -211,6 +211,20 @@ static GtkActionEntry event_entries[] = { NULL, N_("Click here to set or unset alarms for this event"), G_CALLBACK (action_alarms_cb) }, +}; + +static GtkToggleActionEntry editable_toggle_entries[] = { + + { "show-time-busy", + GTK_STOCK_DIALOG_ERROR, + N_("Show Time as _Busy"), + NULL, + N_("Toggles whether to show time as busy"), + G_CALLBACK (action_show_time_busy_cb), + FALSE } +}; + +static GtkActionEntry event_entries[] = { { "recurrence", "stock_task-recurring", @@ -236,14 +250,6 @@ static GtkToggleActionEntry event_toggle_entries[] = { N_("Toggles whether to have All Day Event"), G_CALLBACK (action_all_day_event_cb), FALSE }, - - { "show-time-busy", - GTK_STOCK_DIALOG_ERROR, - N_("Show Time as _Busy"), - NULL, - N_("Toggles whether to show time as busy"), - G_CALLBACK (action_show_time_busy_cb), - FALSE } }; static GtkActionEntry meeting_entries[] = { @@ -525,6 +531,14 @@ event_editor_init (EventEditor *ee) action_group, event_toggle_entries, G_N_ELEMENTS (event_toggle_entries), ee); + action_group = comp_editor_get_action_group (editor, "editable"); + gtk_action_group_add_actions ( + action_group, editable_entries, + G_N_ELEMENTS (editable_entries), ee); + gtk_action_group_add_toggle_actions ( + action_group, editable_toggle_entries, + G_N_ELEMENTS (editable_toggle_entries), ee); + action_group = comp_editor_get_action_group (editor, "coordinated"); gtk_action_group_add_actions ( action_group, meeting_entries, |