From 0a180cd281b24884587a1ddf065bdf475ab9659b Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Tue, 18 Nov 2003 17:04:27 +0000 Subject: removed the 'New...' menu items from the UI, it's now implemented in the 2003-11-18 Rodrigo Moya * gui/calendar-commands.c (calendar_control_sensitize_calendar_commands, sensitize_taskpad_commands): removed the 'New...' menu items from the UI, it's now implemented in the shell. svn path=/trunk/; revision=23421 --- calendar/ChangeLog | 7 +++++++ calendar/gui/calendar-commands.c | 16 ---------------- calendar/gui/calendar-component.c | 2 +- 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/calendar/ChangeLog b/calendar/ChangeLog index cf41b539b6..e7fefbe44b 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,10 @@ +2003-11-18 Rodrigo Moya + + * gui/calendar-commands.c + (calendar_control_sensitize_calendar_commands, + sensitize_taskpad_commands): removed the 'New...' menu items + from the UI, it's now implemented in the shell. + 2003-11-18 Rodrigo Moya * gui/calendar-component.c (add_popup_menu_item): added 'sensitive' diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c index c63075f5ea..b0fe09456d 100644 --- a/calendar/gui/calendar-commands.c +++ b/calendar/gui/calendar-commands.c @@ -675,12 +675,6 @@ calendar_control_sensitize_calendar_commands (BonoboControl *control, GnomeCalen read_only = TRUE; } - bonobo_ui_component_set_prop (uic, "/commands/NewAppointment", "sensitive", - read_only ? "0" : "1", NULL); - bonobo_ui_component_set_prop (uic, "/commands/NewAllDayEvent", "sensitive", - read_only ? "0" : "1", NULL); - bonobo_ui_component_set_prop (uic, "/commands/NewMeeting", "sensitive", - read_only ? "0" : "1", NULL); bonobo_ui_component_set_prop (uic, "/commands/Cut", "sensitive", n_selected == 0 || read_only ? "0" : "1", NULL); @@ -738,8 +732,6 @@ sensitize_taskpad_commands (GnomeCalendar *gcal, BonoboControl *control, gboolea else read_only = TRUE; - bonobo_ui_component_set_prop (uic, "/commands/NewTask", "sensitive", - read_only ? "0" : "1", NULL); bonobo_ui_component_set_prop (uic, "/commands/Cut", "sensitive", n_selected == 0 || read_only ? "0" : "1", NULL); @@ -849,10 +841,6 @@ gcal_taskpad_focus_change_cb (GnomeCalendar *gcal, gboolean in, gpointer data) static BonoboUIVerb verbs [] = { BONOBO_UI_VERB ("NewCalendar", file_new_calendar_cb), - BONOBO_UI_VERB ("NewAppointment", file_new_appointment_cb), - BONOBO_UI_VERB ("NewAllDayEvent", file_new_event_cb), - BONOBO_UI_VERB ("NewMeeting", file_new_meeting_cb), - BONOBO_UI_VERB ("NewTask", file_new_task_cb), BONOBO_UI_VERB ("CalendarPrint", file_print_cb), BONOBO_UI_VERB ("CalendarPrintPreview", file_print_preview_cb), @@ -882,10 +870,6 @@ static BonoboUIVerb verbs [] = { static EPixmap pixmaps [] = { - E_PIXMAP ("/commands/NewAppointment", "new_appointment.xpm"), - E_PIXMAP ("/commands/NewAllDayEvent", "new_all_day_event.png"), - E_PIXMAP ("/commands/NewMeeting", "meeting-request-16.png"), - E_PIXMAP ("/commands/NewTask", "new_task-16.png"), E_PIXMAP ("/Toolbar/DayView", "buttons/dayview.xpm"), E_PIXMAP ("/Toolbar/WorkWeekView", "buttons/workweekview.xpm"), E_PIXMAP ("/Toolbar/WeekView", "buttons/weekview.xpm"), diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c index db6a8fc275..6305cda984 100644 --- a/calendar/gui/calendar-component.c +++ b/calendar/gui/calendar-component.c @@ -338,7 +338,7 @@ fill_popup_menu_cb (ESourceSelector *selector, GtkMenu *menu, CalendarComponent sensitive = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (comp->priv->source_selector)) ? TRUE : FALSE; - add_popup_menu_item (menu, _("New Calendar"), NULL, G_CALLBACK (new_calendar_cb), comp, TRUE); + add_popup_menu_item (menu, _("New Calendar"), GTK_STOCK_NEW, G_CALLBACK (new_calendar_cb), comp, TRUE); add_popup_menu_item (menu, _("Delete"), GTK_STOCK_DELETE, G_CALLBACK (delete_calendar_cb), comp, sensitive); add_popup_menu_item (menu, _("Rename"), NULL, G_CALLBACK (rename_calendar_cb), comp, sensitive); } -- cgit v1.2.3