aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--Makefile.am1
-rw-r--r--art/Makefile.am20
-rw-r--r--configure.in1
-rw-r--r--widgets/shortcut-bar/e-shortcut-bar.c8
5 files changed, 36 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index bcaea03ce5..ab4f092155 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2000-03-30 Dan Winship <danw@helixcode.com>
+
+ * configure.in:
+ * Makefile.am:
+ * art/Makefile.am: install new shortcut bar pixmaps.
+
+ * widgets/shortcut-bar/e-shortcut-bar.c: Sort of use the new
+ pixmaps. This code needs to be restructured, but Damon is
+ rumored to already be doing it.
+
2000-03-30 Tuomas Kuosmanen <tigert@gimp.org>
* art/evolution-calendar.png art/evolution-inbox.png
diff --git a/Makefile.am b/Makefile.am
index 990957f09c..2fb2b21aee 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,6 +27,7 @@ SUBDIRS = \
addressbook \
calendar \
wombat \
+ art \
po
dist-hook:
diff --git a/art/Makefile.am b/art/Makefile.am
new file mode 100644
index 0000000000..9ae3a7ca90
--- /dev/null
+++ b/art/Makefile.am
@@ -0,0 +1,20 @@
+pixmapdir = $(datadir)/pixmaps/evolution
+
+pixmap_DATA = \
+ evolution-calendar.png \
+ evolution-contacts.png \
+ evolution-inbox.png \
+ evolution-notes.png \
+ evolution-tasks.png \
+ evolution-today.png
+
+EXTRA_DIST = \
+ attachment.xpm \
+ mail-new.xpm \
+ mail-read.xpm \
+ mail-replied.xpm \
+ mark.xpm \
+ meeting.xpm \
+ priority-high.xpm \
+ priority-low.xpm \
+ $(pixmap_DATA)
diff --git a/configure.in b/configure.in
index 8cd6c96fab..d36d9070a3 100644
--- a/configure.in
+++ b/configure.in
@@ -296,4 +296,5 @@ calendar/pcs/Makefile
calendar/gui/Makefile
filter/Makefile
wombat/Makefile
+art/Makefile
])
diff --git a/widgets/shortcut-bar/e-shortcut-bar.c b/widgets/shortcut-bar/e-shortcut-bar.c
index 431b9c1934..6225229d53 100644
--- a/widgets/shortcut-bar/e-shortcut-bar.c
+++ b/widgets/shortcut-bar/e-shortcut-bar.c
@@ -52,10 +52,10 @@ struct _EShortcutBarBuiltinType {
};
EShortcutBarBuiltinType e_shortcut_bar_builtin_types[] = {
- { "folder:", "gnome-word.png", NULL },
- { "calendar:", "gnome-calendar.png", NULL },
- { "todo:", "gnome-cromagnon.png", NULL },
- { "contacts:", "gnome-ccthemes.png", NULL }
+ { "folder:", "evolution/evolution-inbox.png", NULL },
+ { "calendar:", "evolution/evolution-calendar.png", NULL },
+ { "todo:", "evolution/evolution-tasks.png", NULL },
+ { "contacts:", "evolution/evolution-contacts.png", NULL }
};
static gint e_shortcut_bar_num_builtin_types = sizeof (e_shortcut_bar_builtin_types) / sizeof (EShortcutBarBuiltinType);