diff options
| -rw-r--r-- | calendar/ChangeLog | 5 | ||||
| -rw-r--r-- | calendar/gui/dialogs/comp-editor.c | 18 | ||||
| -rw-r--r-- | calendar/gui/dialogs/event-editor.c | 3 |
3 files changed, 16 insertions, 10 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 9eb3184d65..7f870a2e54 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,5 +1,10 @@ 2004-05-17 Jeffrey Stedfast <fejj@novell.com> + * gui/dialogs/event-editor.c: Same. + + * gui/dialogs/comp-editor.c: Change E_PIXMAP size args + over to E_ICON_SIZE_* values. + * gui/alarm-notify/alarm-queue.c (tray_icon_blink_cb): Use E_ICON_SIZE enum here. (display_notification): Same. diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index 57ec2b8cdb..7f67beb2a0 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -122,18 +122,18 @@ static gint delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data); static EPixmap pixmaps [] = { - E_PIXMAP ("/menu/File/FileSave", "stock_save", 16), - E_PIXMAP ("/menu/File/FileSaveAndClose", "stock_save", 16), - E_PIXMAP ("/menu/File/FileSaveAs", "stock_save_as", 16), + E_PIXMAP ("/menu/File/FileSave", "stock_save", E_ICON_SIZE_MENU), + E_PIXMAP ("/menu/File/FileSaveAndClose", "stock_save", E_ICON_SIZE_MENU), + E_PIXMAP ("/menu/File/FileSaveAs", "stock_save_as", E_ICON_SIZE_MENU), - E_PIXMAP ("/menu/File/FileDelete", "stock_delete", 16), + E_PIXMAP ("/menu/File/FileDelete", "stock_delete", E_ICON_SIZE_MENU), - E_PIXMAP ("/menu/File/FilePrint", "stock_print", 16), - E_PIXMAP ("/menu/File/FilePrintPreview", "stock_print-preview", 16), + E_PIXMAP ("/menu/File/FilePrint", "stock_print", E_ICON_SIZE_MENU), + E_PIXMAP ("/menu/File/FilePrintPreview", "stock_print-preview", E_ICON_SIZE_MENU), - E_PIXMAP ("/Toolbar/FileSaveAndClose", "stock_save", 24), - E_PIXMAP ("/Toolbar/FilePrint", "stock_print", 24), - E_PIXMAP ("/Toolbar/FileDelete", "stock_delete", 24), + E_PIXMAP ("/Toolbar/FileSaveAndClose", "stock_save", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/FilePrint", "stock_print", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/FileDelete", "stock_delete", E_ICON_SIZE_LARGE_TOOLBAR), E_PIXMAP_END }; diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c index 8064455ccd..7dee1c54d6 100644 --- a/calendar/gui/dialogs/event-editor.c +++ b/calendar/gui/dialogs/event-editor.c @@ -29,6 +29,7 @@ #include <gal/util/e-util.h> #include <libgnome/gnome-i18n.h> #include <widgets/misc/e-dateedit.h> +#include <e-util/e-icon-factory.h> #include "event-page.h" #include "alarm-page.h" @@ -69,7 +70,7 @@ static void model_row_change_insert_cb (GtkTreeModel *model, GtkTreePath *path, static void model_row_delete_cb (GtkTreeModel *model, GtkTreePath *path, gpointer data); static EPixmap pixmaps [] = { - E_PIXMAP ("/Toolbar/Actions/ActionScheduleMeeting", "stock_people", 24), + E_PIXMAP ("/Toolbar/Actions/ActionScheduleMeeting", "stock_people", E_ICON_SIZE_LARGE_TOOLBAR), E_PIXMAP_END }; |