diff options
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 6 | ||||
| -rw-r--r-- | calendar/gui/calendar-commands.c | 62 | ||||
| -rw-r--r-- | calendar/gui/tasks-control.c | 12 |
3 files changed, 41 insertions, 39 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 92668ba1e8..e29149e637 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,9 @@ +2001-04-01 Gediminas Paulauskas <menesis@delfi.lt> + + * gui/calendar-commands.c: use new pixmap cache. Added some menu icons + and changed filenames of renamed icons. + * gui/tasks-control.c: added icons for new task and print in menu. + 2001-03-29 Federico Mena Quintero <federico@ximian.com> Engine for live queries to calendars. A query object watches a diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c index e60f381f47..029e417b2e 100644 --- a/calendar/gui/calendar-commands.c +++ b/calendar/gui/calendar-commands.c @@ -32,11 +32,17 @@ #include <string.h> #include <ctype.h> #include <errno.h> -#include <glib.h> + #include <gdk-pixbuf/gdk-pixbuf.h> +#include <gtk/gtkfilesel.h> +#include <gtk/gtkmain.h> +#include <gtk/gtksignal.h> + +#include <libgnomeui/gnome-dialog-util.h> +#include <libgnomeui/gnome-messagebox.h> +#include <libgnomeui/gnome-stock.h> #include <libgnome/gnome-defs.h> #include <libgnome/gnome-i18n.h> -#include <libgnomeui/gnome-messagebox.h> #include <bonobo/bonobo-ui-util.h> #include <cal-util/timeutil.h> #include "calendar-commands.h" @@ -44,7 +50,7 @@ #include "goto.h" #include "print.h" #include "dialogs/cal-prefs-dialog.h" - +#include "e-util/e-gui-utils.h" /* A list of all of the calendars started */ static GList *all_calendars = NULL; @@ -372,40 +378,22 @@ static BonoboUIVerb verbs [] = { BONOBO_UI_VERB_END }; -static void -set_pixmap (BonoboUIComponent *uic, - const char *xml_path, - const char *icon) +static EPixmap pixmaps [] = { - char *path; - GdkPixbuf *pixbuf; - - path = g_concat_dir_and_file (EVOLUTION_DATADIR "/images/evolution", icon); - - pixbuf = gdk_pixbuf_new_from_file (path); - if (pixbuf == NULL) { - g_warning ("Cannot load image -- %s", path); - g_free (path); - return; - } - - bonobo_ui_util_set_pixbuf (uic, xml_path, pixbuf); - - gdk_pixbuf_unref (pixbuf); - - g_free (path); -} - -static void -update_pixmaps (BonoboUIComponent *uic) -{ - set_pixmap (uic, "/Toolbar/New", "buttons/new_appointment.png"); - - set_pixmap (uic, "/Toolbar/DayView", "buttons/dayview.xpm"); - set_pixmap (uic, "/Toolbar/WorkWeekView", "buttons/workweekview.xpm"); - set_pixmap (uic, "/Toolbar/WeekView", "buttons/weekview.xpm"); - set_pixmap (uic, "/Toolbar/MonthView", "buttons/monthview.xpm"); -} + E_PIXMAP ("/menu/File/New/NewFirstItem/CalendarNew", "new_appointment.xpm"), + E_PIXMAP ("/menu/File/Print/Print", "print.xpm"), + E_PIXMAP ("/menu/File/Print/Print Preview", "print-preview.xpm"), + E_PIXMAP ("/menu/Actions/Component/CalendarNew", "new_appointment.xpm"), + E_PIXMAP ("/menu/Tools/Component/CalendarPreferences", "configure_16_calendar.xpm"), + E_PIXMAP ("/Toolbar/New", "buttons/new_appointment.png"), + + E_PIXMAP ("/Toolbar/DayView", "buttons/dayview.xpm"), + E_PIXMAP ("/Toolbar/WorkWeekView", "buttons/workweekview.xpm"), + E_PIXMAP ("/Toolbar/WeekView", "buttons/weekview.xpm"), + E_PIXMAP ("/Toolbar/MonthView", "buttons/monthview.xpm"), + + E_PIXMAP_END +}; void calendar_control_activate (BonoboControl *control, @@ -446,7 +434,7 @@ calendar_control_activate (BonoboControl *control, "evolution-calendar.xml", "evolution-calendar"); - update_pixmaps (uic); + e_pixmaps_update (uic, pixmaps); bonobo_ui_component_thaw (uic, NULL); } diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c index 7fb981d868..eb99241262 100644 --- a/calendar/gui/tasks-control.c +++ b/calendar/gui/tasks-control.c @@ -23,15 +23,15 @@ */ #include <config.h> -#include <glib.h> #include <gtk/gtksignal.h> #include <libgnome/gnome-defs.h> #include <libgnome/gnome-i18n.h> +#include <libgnome/gnome-util.h> #include <bonobo/bonobo-control.h> #include <bonobo/bonobo-ui-util.h> #include "e-tasks.h" #include "tasks-control.h" - +#include "e-util/e-gui-utils.h" #define TASKS_CONTROL_PROPERTY_URI "folder_uri" #define TASKS_CONTROL_PROPERTY_URI_IDX 1 @@ -183,6 +183,12 @@ static BonoboUIVerb verbs [] = { BONOBO_UI_VERB_END }; +static EPixmap pixmaps [] = { + E_PIXMAP ("/menu/File/New/NewFirstItem/NewTask", "evolution-tasks-mini.png"), + E_PIXMAP ("/menu/File/Print/Print", "print.xpm"), + E_PIXMAP_END +}; + static void tasks_control_activate (BonoboControl *control, ETasks *tasks) @@ -207,6 +213,8 @@ tasks_control_activate (BonoboControl *control, e_tasks_setup_menus(tasks, uic); + e_pixmaps_update (uic, pixmaps); + bonobo_ui_component_thaw (uic, NULL); } |