evolution r36988 - in trunk/calendar: . gui/dialogs
- From: msuman svn gnome org
- To: svn-commits-list gnome org
- Subject: evolution r36988 - in trunk/calendar: . gui/dialogs
- Date: Mon, 5 Jan 2009 07:44:23 +0000 (UTC)
Author: msuman
Date: Mon Jan 5 07:44:23 2009
New Revision: 36988
URL: http://svn.gnome.org/viewvc/evolution?rev=36988&view=rev
Log:
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).
Modified:
trunk/calendar/ChangeLog
trunk/calendar/gui/dialogs/comp-editor.c
trunk/calendar/gui/dialogs/event-editor.c
Modified: trunk/calendar/gui/dialogs/comp-editor.c
==============================================================================
--- trunk/calendar/gui/dialogs/comp-editor.c (original)
+++ trunk/calendar/gui/dialogs/comp-editor.c Mon Jan 5 07:44:23 2009
@@ -164,6 +164,7 @@
" <toolitem action='close'/>"
" <separator/>"
" <toolitem action='attach'/>"
+" <separator/>"
" </toolbar>"
"</ui>";
Modified: trunk/calendar/gui/dialogs/event-editor.c
==============================================================================
--- trunk/calendar/gui/dialogs/event-editor.c (original)
+++ trunk/calendar/gui/dialogs/event-editor.c Mon Jan 5 07:44:23 2009
@@ -79,20 +79,21 @@
" <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 @@
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 @@
FALSE },
{ "show-time-busy",
- NULL,
+ GTK_STOCK_DIALOG_ERROR,
N_("Show Time as _Busy"),
NULL,
N_("Toggles whether to show time as busy"),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]