diff options
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 8 | ||||
| -rw-r--r-- | calendar/gui/dialogs/comp-editor.c | 8 | ||||
| -rw-r--r-- | calendar/gui/dialogs/comp-editor.h | 4 | ||||
| -rw-r--r-- | calendar/gui/dialogs/event-editor.c | 7 | ||||
| -rw-r--r-- | calendar/gui/dialogs/task-editor.c | 2 |
5 files changed, 25 insertions, 4 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 88c68f538d..30bc41613c 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,11 @@ +2002-05-20 Ettore Perazzoli <ettore@ximian.com> + + * gui/dialogs/event-editor.c (event_editor_init): Pass the + @component_pixmaps in so we give the new "Meeting" button an icon. + + * gui/dialogs/comp-editor.c (comp_editor_merge_ui): New arg + @component_pixmaps to pass in custom pixmaps. + 2002-05-20 Rodrigo Moya <rodrigo@ximian.com> * gui/alarm-notify/alarm-notify.c: diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index 05710b7581..f2a028a4ee 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -974,7 +974,10 @@ comp_editor_send_comp (CompEditor *editor, CalComponentItipMethod method) * **/ void -comp_editor_merge_ui (CompEditor *editor, const char *filename, BonoboUIVerb *verbs) +comp_editor_merge_ui (CompEditor *editor, + const char *filename, + BonoboUIVerb *verbs, + EPixmap *component_pixmaps) { CompEditorPrivate *priv; @@ -985,6 +988,9 @@ comp_editor_merge_ui (CompEditor *editor, const char *filename, BonoboUIVerb *ve bonobo_ui_util_set_ui (priv->uic, EVOLUTION_DATADIR, filename, "evolution-calendar"); bonobo_ui_component_add_verb_list_with_data (priv->uic, verbs, editor); + + if (component_pixmaps != NULL) + e_pixmaps_update (priv->uic, component_pixmaps); } /** diff --git a/calendar/gui/dialogs/comp-editor.h b/calendar/gui/dialogs/comp-editor.h index f789515ab1..cc5679d1cd 100644 --- a/calendar/gui/dialogs/comp-editor.h +++ b/calendar/gui/dialogs/comp-editor.h @@ -28,6 +28,7 @@ #include "cal-client.h" #include "../itip-utils.h" #include "comp-editor-page.h" +#include "evolution-shell-component-utils.h" BEGIN_GNOME_DECLS @@ -84,7 +85,8 @@ void comp_editor_send_comp (CompEditor *editor, CalComponentItipMethod method); void comp_editor_merge_ui (CompEditor *editor, const char *filename, - BonoboUIVerb *verbs); + BonoboUIVerb *verbs, + EPixmap *pixmaps); void comp_editor_set_ui_prop (CompEditor *editor, const char *path, const char *attr, diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c index 4c0862c9f7..08c98dfaba 100644 --- a/calendar/gui/dialogs/event-editor.c +++ b/calendar/gui/dialogs/event-editor.c @@ -69,6 +69,11 @@ static void forward_cmd (GtkWidget *widget, gpointer data); static void model_row_changed_cb (ETableModel *etm, int row, gpointer data); static void row_count_changed_cb (ETableModel *etm, int row, int count, gpointer data); +static EPixmap pixmaps [] = { + E_PIXMAP ("/Toolbar/Actions/ActionScheduleMeeting", "schedule-meeting-24.png"), + E_PIXMAP_END +}; + static BonoboUIVerb verbs [] = { BONOBO_UI_UNSAFE_VERB ("ActionScheduleMeeting", schedule_meeting_cmd), BONOBO_UI_UNSAFE_VERB ("ActionRefreshMeeting", refresh_meeting_cmd), @@ -206,7 +211,7 @@ event_editor_init (EventEditor *ee) COMP_EDITOR_PAGE (priv->meet_page), _("Meeting")); - comp_editor_merge_ui (COMP_EDITOR (ee), "evolution-event-editor.xml", verbs); + comp_editor_merge_ui (COMP_EDITOR (ee), "evolution-event-editor.xml", verbs, pixmaps); priv->meeting_shown = TRUE; priv->existing_org = FALSE; diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c index 1ede12fff3..e3acaaf13a 100644 --- a/calendar/gui/dialogs/task-editor.c +++ b/calendar/gui/dialogs/task-editor.c @@ -189,7 +189,7 @@ task_editor_init (TaskEditor *te) COMP_EDITOR_PAGE (priv->meet_page), _("Assignment")); - comp_editor_merge_ui (COMP_EDITOR (te), "evolution-task-editor.xml", verbs); + comp_editor_merge_ui (COMP_EDITOR (te), "evolution-task-editor.xml", verbs, NULL); priv->assignment_shown = TRUE; priv->existing_org = FALSE; |