diff options
-rw-r--r-- | calendar/ChangeLog | 10 | ||||
-rw-r--r-- | calendar/gui/calendar-commands.c | 15 | ||||
-rw-r--r-- | calendar/gui/tasks-control.c | 17 |
3 files changed, 10 insertions, 32 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index bbb4425a1e..2dde0122ed 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,13 @@ +2003-07-01 Rodrigo Moya <rodrigo@ximian.com> + + Fixes #45524 + + * gui/calendar-commands.c: use stock icons where approppriate. + + * gui/tasks-control.c: removed EPixmaps structure, since we only use + stock icons now. + (tasks_control_activate): no need to call e_pixmaps_update. + 2003-07-01 Bolian Yin <bolian.yin@sun.com> Fixes #45274 diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c index 6c7030a341..ce921bbc44 100644 --- a/calendar/gui/calendar-commands.c +++ b/calendar/gui/calendar-commands.c @@ -725,21 +725,6 @@ static BonoboUIVerb verbs [] = { static EPixmap pixmaps [] = { - E_PIXMAP ("/menu/EditPlaceholder/Edit/Cut", "16_cut.png"), - E_PIXMAP ("/menu/EditPlaceholder/Edit/Copy", "16_copy.png"), - E_PIXMAP ("/menu/EditPlaceholder/Edit/Paste", "16_paste.png"), - E_PIXMAP ("/menu/EditPlaceholder/Edit/Delete", "evolution-trash-mini.png"), - E_PIXMAP ("/menu/EditPlaceholder/Edit/DeleteOccurrence", "evolution-trash-mini.png"), - E_PIXMAP ("/menu/EditPlaceholder/Edit/DeleteAllOccurrences", "evolution-trash-mini.png"), - E_PIXMAP ("/menu/File/Print/Print", "print.xpm"), - E_PIXMAP ("/menu/File/Print/PrintPreview", "print-preview.xpm"), - E_PIXMAP ("/menu/View/ViewBegin/Goto", "goto-16.png"), - - E_PIXMAP ("/Toolbar/Print", "buttons/print.png"), - E_PIXMAP ("/Toolbar/Delete", "buttons/delete-message.png"), - E_PIXMAP ("/Toolbar/Prev", "buttons/arrow-left-24.png"), - E_PIXMAP ("/Toolbar/Next", "buttons/arrow-right-24.png"), - E_PIXMAP ("/Toolbar/Goto", "buttons/goto-24.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/tasks-control.c b/calendar/gui/tasks-control.c index 8d798768f3..ebd5834f34 100644 --- a/calendar/gui/tasks-control.c +++ b/calendar/gui/tasks-control.c @@ -287,21 +287,6 @@ static BonoboUIVerb verbs [] = { BONOBO_UI_VERB_END }; -static EPixmap pixmaps [] = { - E_PIXMAP ("/menu/File/Print/Print", "print.xpm"), - E_PIXMAP ("/menu/File/Print/PrintPreview", "print-preview.xpm"), - E_PIXMAP ("/menu/EditPlaceholder/Edit/TasksCut", "16_cut.png"), - E_PIXMAP ("/menu/EditPlaceholder/Edit/TasksCopy", "16_copy.png"), - E_PIXMAP ("/menu/EditPlaceholder/Edit/TasksPaste", "16_paste.png"), - E_PIXMAP ("/menu/EditPlaceholder/Edit/TasksDelete", "evolution-trash-mini.png"), - E_PIXMAP ("/Toolbar/Cut", "buttons/cut.png"), - E_PIXMAP ("/Toolbar/Copy", "buttons/copy.png"), - E_PIXMAP ("/Toolbar/Paste", "buttons/paste.png"), - E_PIXMAP ("/Toolbar/Delete", "buttons/delete-message.png"), - E_PIXMAP ("/Toolbar/Print", "buttons/print.png"), - E_PIXMAP_END -}; - static void tasks_control_activate (BonoboControl *control, ETasks *tasks) { @@ -329,8 +314,6 @@ tasks_control_activate (BonoboControl *control, ETasks *tasks) "evolution-tasks", NULL); - e_pixmaps_update (uic, pixmaps); - e_tasks_setup_view_menus (tasks, uic); /* Signals from the tasks widget; also sensitize the menu items as appropriate */ |