diff options
| author | Suman Manjunath <msuman@src.gnome.org> | 2009-01-05 15:44:23 +0800 |
|---|---|---|
| committer | Suman Manjunath <msuman@src.gnome.org> | 2009-01-05 15:44:23 +0800 |
| commit | d8ae130852f29e722a52af48d8e1aaaea4b8d69a (patch) | |
| tree | 8ff44b24ffa2cd8a40a7d9d3851e34ab84296509 /calendar | |
| parent | 5d4a1a112e97581bec590dece9cd05ebe188be60 (diff) | |
| download | gsoc2013-evolution-d8ae130852f29e722a52af48d8e1aaaea4b8d69a.tar.gz gsoc2013-evolution-d8ae130852f29e722a52af48d8e1aaaea4b8d69a.tar.zst gsoc2013-evolution-d8ae130852f29e722a52af48d8e1aaaea4b8d69a.zip | |
Patch from Ashish Shrivastava <shashish@novell.com> ** Fix for bug #458153 (bugzilla.novell.com) - Provide a 'Show time as busy' button in the toolbar (like the other items in the 'Options' menu).
svn path=/trunk/; revision=36988
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 8 | ||||
| -rw-r--r-- | calendar/gui/dialogs/comp-editor.c | 1 | ||||
| -rw-r--r-- | calendar/gui/dialogs/event-editor.c | 15 |
3 files changed, 20 insertions, 4 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index f8f9c02517..534acd4507 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,11 @@ +2009-01-05 Ashish Shrivastava <shashish@novell.com> + + ** Fix for bug #458153 (bugzilla.novell.com) + + * gui/dialogs/comp-editor.c: Added a separator in the toolbar. + * gui/dialogs/event-editor.c (action_all_day_event_cb): Toggle 'Show + time as busy' in all_day_event callback. + 2008-01-04 Matthew Barnes <mbarnes@redhat.com> ** Fixes bug #566566 diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index 04f910745b..c69ad004cc 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -164,6 +164,7 @@ static const gchar *ui = " <toolitem action='close'/>" " <separator/>" " <toolitem action='attach'/>" +" <separator/>" " </toolbar>" "</ui>"; diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c index 815ee76312..161ed598b7 100644 --- a/calendar/gui/dialogs/event-editor.c +++ b/calendar/gui/dialogs/event-editor.c @@ -79,20 +79,21 @@ static const gchar *ui = " <menu action='options-menu'>" " <menuitem action='alarms'/>" " <menuitem action='show-time-busy'/>" +" <menuitem action='recurrence'/>" " <menuitem action='all-day-event'/>" +" <menuitem action='free-busy'/>" " <menu action='classification-menu'>" " <menuitem action='classify-public'/>" " <menuitem action='classify-private'/>" " <menuitem action='classify-confidential'/>" " </menu>" -" <menuitem action='recurrence'/>" -" <menuitem action='free-busy'/>" " </menu>" " </menubar>" " <toolbar name='main-toolbar'>" " <toolitem action='alarms'/>" -" <toolitem action='all-day-event'/>" +" <toolitem action='show-time-busy'/>" " <toolitem action='recurrence'/>" +" <toolitem action='all-day-event'/>" " <toolitem action='free-busy'/>" " </toolbar>" "</ui>"; @@ -149,9 +150,15 @@ action_all_day_event_cb (GtkToggleAction *action, EventEditor *editor) { gboolean active; + GtkAction *action_show_busy; + CompEditor *comp_editor = COMP_EDITOR (editor); active = gtk_toggle_action_get_active (action); event_page_set_all_day_event (editor->priv->event_page, active); + + action_show_busy = comp_editor_get_action (comp_editor, "show-time-busy"); + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action_show_busy), !active); + event_page_set_show_time_busy (editor->priv->event_page, !active); } static void @@ -223,7 +230,7 @@ static GtkToggleActionEntry event_toggle_entries[] = { FALSE }, { "show-time-busy", - NULL, + GTK_STOCK_DIALOG_ERROR, N_("Show Time as _Busy"), NULL, N_("Toggles whether to show time as busy"), |