From 953e66428af9639028b3729b448d1fa01c340d09 Mon Sep 17 00:00:00 2001 From: Michael Monreal Date: Fri, 12 Oct 2007 09:49:02 +0000 Subject: ** Migration of theme icons to data/icons/ (bug #479257) 2007-10-12 Michael Monreal ** Migration of theme icons to data/icons/ (bug #479257) * art/Makefile.am: Remove references to art/$size. * configure.in: Include new data/icons/ directory. * file e-util/e-icon-factory.c: Append a private icon directory to the search path. New inbox/outbox/sent icons. * mail/em-folder-tree.c, mail/mail-send-recv.c: Change icon references. New view-calendar icons. * calendar/gui/calendar-commands.c: Change icon references. svn path=/trunk/; revision=34383 --- ChangeLog | 6 + art/16x16/.cvsignore | 2 - art/16x16/Makefile.am | 3 - art/16x16/evolution.png | Bin 769 -> 0 bytes art/22x22/evolution.png | Bin 1132 -> 0 bytes art/24x24/evolution.png | Bin 1139 -> 0 bytes art/32x32/evolution.png | Bin 2109 -> 0 bytes art/48x48/preferences-autocompletion.png | Bin 3291 -> 0 bytes art/48x48/preferences-calendar-and-tasks.png | Bin 2731 -> 0 bytes art/48x48/preferences-certificates.png | Bin 1947 -> 0 bytes art/48x48/preferences-composer.png | Bin 1971 -> 0 bytes art/48x48/preferences-mail-accounts.png | Bin 3261 -> 0 bytes art/48x48/preferences-mail.png | Bin 1532 -> 0 bytes art/ChangeLog | 6 + art/Makefile.am | 43 - art/scalable/evolution.svg | 615 -------- calendar/ChangeLog | 6 + calendar/gui/calendar-commands.c | 10 +- configure.in | 1 + data/Makefile.am | 2 +- data/icons/Makefile.am | 119 ++ .../hicolor_actions_16x16_view-calendar-day.png | Bin 0 -> 540 bytes .../hicolor_actions_16x16_view-calendar-day.svg | 240 ++++ .../hicolor_actions_16x16_view-calendar-list.png | Bin 0 -> 511 bytes .../hicolor_actions_16x16_view-calendar-list.svg | 229 +++ .../hicolor_actions_16x16_view-calendar-month.png | Bin 0 -> 627 bytes .../hicolor_actions_16x16_view-calendar-month.svg | 281 ++++ .../hicolor_actions_16x16_view-calendar-week.png | Bin 0 -> 591 bytes .../hicolor_actions_16x16_view-calendar-week.svg | 207 +++ ...icolor_actions_16x16_view-calendar-workweek.png | Bin 0 -> 491 bytes ...icolor_actions_16x16_view-calendar-workweek.svg | 207 +++ .../hicolor_actions_22x22_view-calendar-day.png | Bin 0 -> 717 bytes .../hicolor_actions_22x22_view-calendar-day.svg | 327 +++++ .../hicolor_actions_22x22_view-calendar-list.png | Bin 0 -> 713 bytes .../hicolor_actions_22x22_view-calendar-list.svg | 316 +++++ .../hicolor_actions_22x22_view-calendar-month.png | Bin 0 -> 968 bytes .../hicolor_actions_22x22_view-calendar-month.svg | 329 +++++ .../hicolor_actions_22x22_view-calendar-week.png | Bin 0 -> 774 bytes .../hicolor_actions_22x22_view-calendar-week.svg | 275 ++++ ...icolor_actions_22x22_view-calendar-workweek.png | Bin 0 -> 699 bytes ...icolor_actions_22x22_view-calendar-workweek.svg | 294 ++++ .../hicolor_actions_24x24_view-calendar-day.png | Bin 0 -> 736 bytes .../hicolor_actions_24x24_view-calendar-list.png | Bin 0 -> 727 bytes .../hicolor_actions_24x24_view-calendar-month.png | Bin 0 -> 988 bytes .../hicolor_actions_24x24_view-calendar-week.png | Bin 0 -> 788 bytes ...icolor_actions_24x24_view-calendar-workweek.png | Bin 0 -> 711 bytes data/icons/hicolor_apps_16x16_evolution.png | Bin 0 -> 769 bytes data/icons/hicolor_apps_22x22_evolution.png | Bin 0 -> 1132 bytes data/icons/hicolor_apps_24x24_evolution.png | Bin 0 -> 1139 bytes data/icons/hicolor_apps_32x32_evolution.png | Bin 0 -> 2109 bytes data/icons/hicolor_apps_48x48_evolution.png | Bin 0 -> 3680 bytes data/icons/hicolor_apps_scalable_evolution.svg | 615 ++++++++ ...categories_48x48_preferences-autocompletion.png | Bin 0 -> 3291 bytes ...gories_48x48_preferences-calendar-and-tasks.png | Bin 0 -> 2731 bytes ...r_categories_48x48_preferences-certificates.png | Bin 0 -> 1947 bytes ...color_categories_48x48_preferences-composer.png | Bin 0 -> 1971 bytes ..._categories_48x48_preferences-mail-accounts.png | Bin 0 -> 3261 bytes .../hicolor_categories_48x48_preferences-mail.png | Bin 0 -> 1532 bytes data/icons/hicolor_places_16x16_mail-inbox.png | Bin 0 -> 674 bytes data/icons/hicolor_places_16x16_mail-inbox.svg | 433 ++++++ data/icons/hicolor_places_16x16_mail-outbox.png | Bin 0 -> 661 bytes data/icons/hicolor_places_16x16_mail-outbox.svg | 1492 ++++++++++++++++++++ data/icons/hicolor_places_16x16_mail-sent.png | Bin 0 -> 723 bytes data/icons/hicolor_places_16x16_mail-sent.svg | 217 +++ data/icons/hicolor_places_22x22_mail-inbox.png | Bin 0 -> 1035 bytes data/icons/hicolor_places_22x22_mail-inbox.svg | 558 ++++++++ data/icons/hicolor_places_22x22_mail-outbox.png | Bin 0 -> 990 bytes data/icons/hicolor_places_22x22_mail-outbox.svg | 563 ++++++++ data/icons/hicolor_places_22x22_mail-sent.png | Bin 0 -> 1103 bytes data/icons/hicolor_places_22x22_mail-sent.svg | 319 +++++ data/icons/hicolor_places_24x24_mail-inbox.png | Bin 0 -> 1075 bytes data/icons/hicolor_places_24x24_mail-outbox.png | Bin 0 -> 1017 bytes data/icons/hicolor_places_24x24_mail-sent.png | Bin 0 -> 1136 bytes e-util/ChangeLog | 7 + e-util/e-icon-factory.c | 4 +- mail/ChangeLog | 7 + mail/em-folder-tree.c | 6 +- mail/mail-send-recv.c | 4 +- 78 files changed, 7068 insertions(+), 675 deletions(-) delete mode 100644 art/16x16/.cvsignore delete mode 100644 art/16x16/Makefile.am delete mode 100644 art/16x16/evolution.png delete mode 100644 art/22x22/evolution.png delete mode 100644 art/24x24/evolution.png delete mode 100644 art/32x32/evolution.png delete mode 100644 art/48x48/preferences-autocompletion.png delete mode 100644 art/48x48/preferences-calendar-and-tasks.png delete mode 100644 art/48x48/preferences-certificates.png delete mode 100644 art/48x48/preferences-composer.png delete mode 100644 art/48x48/preferences-mail-accounts.png delete mode 100644 art/48x48/preferences-mail.png delete mode 100644 art/scalable/evolution.svg create mode 100644 data/icons/Makefile.am create mode 100644 data/icons/hicolor_actions_16x16_view-calendar-day.png create mode 100644 data/icons/hicolor_actions_16x16_view-calendar-day.svg create mode 100644 data/icons/hicolor_actions_16x16_view-calendar-list.png create mode 100644 data/icons/hicolor_actions_16x16_view-calendar-list.svg create mode 100644 data/icons/hicolor_actions_16x16_view-calendar-month.png create mode 100644 data/icons/hicolor_actions_16x16_view-calendar-month.svg create mode 100644 data/icons/hicolor_actions_16x16_view-calendar-week.png create mode 100644 data/icons/hicolor_actions_16x16_view-calendar-week.svg create mode 100644 data/icons/hicolor_actions_16x16_view-calendar-workweek.png create mode 100644 data/icons/hicolor_actions_16x16_view-calendar-workweek.svg create mode 100644 data/icons/hicolor_actions_22x22_view-calendar-day.png create mode 100644 data/icons/hicolor_actions_22x22_view-calendar-day.svg create mode 100644 data/icons/hicolor_actions_22x22_view-calendar-list.png create mode 100644 data/icons/hicolor_actions_22x22_view-calendar-list.svg create mode 100644 data/icons/hicolor_actions_22x22_view-calendar-month.png create mode 100644 data/icons/hicolor_actions_22x22_view-calendar-month.svg create mode 100644 data/icons/hicolor_actions_22x22_view-calendar-week.png create mode 100644 data/icons/hicolor_actions_22x22_view-calendar-week.svg create mode 100644 data/icons/hicolor_actions_22x22_view-calendar-workweek.png create mode 100644 data/icons/hicolor_actions_22x22_view-calendar-workweek.svg create mode 100644 data/icons/hicolor_actions_24x24_view-calendar-day.png create mode 100644 data/icons/hicolor_actions_24x24_view-calendar-list.png create mode 100644 data/icons/hicolor_actions_24x24_view-calendar-month.png create mode 100644 data/icons/hicolor_actions_24x24_view-calendar-week.png create mode 100644 data/icons/hicolor_actions_24x24_view-calendar-workweek.png create mode 100644 data/icons/hicolor_apps_16x16_evolution.png create mode 100644 data/icons/hicolor_apps_22x22_evolution.png create mode 100644 data/icons/hicolor_apps_24x24_evolution.png create mode 100644 data/icons/hicolor_apps_32x32_evolution.png create mode 100644 data/icons/hicolor_apps_48x48_evolution.png create mode 100644 data/icons/hicolor_apps_scalable_evolution.svg create mode 100644 data/icons/hicolor_categories_48x48_preferences-autocompletion.png create mode 100644 data/icons/hicolor_categories_48x48_preferences-calendar-and-tasks.png create mode 100644 data/icons/hicolor_categories_48x48_preferences-certificates.png create mode 100644 data/icons/hicolor_categories_48x48_preferences-composer.png create mode 100644 data/icons/hicolor_categories_48x48_preferences-mail-accounts.png create mode 100644 data/icons/hicolor_categories_48x48_preferences-mail.png create mode 100644 data/icons/hicolor_places_16x16_mail-inbox.png create mode 100644 data/icons/hicolor_places_16x16_mail-inbox.svg create mode 100644 data/icons/hicolor_places_16x16_mail-outbox.png create mode 100644 data/icons/hicolor_places_16x16_mail-outbox.svg create mode 100644 data/icons/hicolor_places_16x16_mail-sent.png create mode 100644 data/icons/hicolor_places_16x16_mail-sent.svg create mode 100644 data/icons/hicolor_places_22x22_mail-inbox.png create mode 100644 data/icons/hicolor_places_22x22_mail-inbox.svg create mode 100644 data/icons/hicolor_places_22x22_mail-outbox.png create mode 100644 data/icons/hicolor_places_22x22_mail-outbox.svg create mode 100644 data/icons/hicolor_places_22x22_mail-sent.png create mode 100644 data/icons/hicolor_places_22x22_mail-sent.svg create mode 100644 data/icons/hicolor_places_24x24_mail-inbox.png create mode 100644 data/icons/hicolor_places_24x24_mail-outbox.png create mode 100644 data/icons/hicolor_places_24x24_mail-sent.png diff --git a/ChangeLog b/ChangeLog index c912ac97ed..cbd8227829 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-10-12 Michael Monreal + + ** Migration of theme icons to data/icons/ (bug #479257) + + * configure.in: Include new data/icons/ directory. + 2007-10-11 Matthew Barnes * configure.in: diff --git a/art/16x16/.cvsignore b/art/16x16/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/art/16x16/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/art/16x16/Makefile.am b/art/16x16/Makefile.am deleted file mode 100644 index 2b5b8ca0fb..0000000000 --- a/art/16x16/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -images16_DATA = - -EXTRA_DIST = $(images16_DATA) diff --git a/art/16x16/evolution.png b/art/16x16/evolution.png deleted file mode 100644 index 0d1ad3496e..0000000000 Binary files a/art/16x16/evolution.png and /dev/null differ diff --git a/art/22x22/evolution.png b/art/22x22/evolution.png deleted file mode 100644 index d069ad9c6f..0000000000 Binary files a/art/22x22/evolution.png and /dev/null differ diff --git a/art/24x24/evolution.png b/art/24x24/evolution.png deleted file mode 100644 index 92c2605f91..0000000000 Binary files a/art/24x24/evolution.png and /dev/null differ diff --git a/art/32x32/evolution.png b/art/32x32/evolution.png deleted file mode 100644 index a24c73d629..0000000000 Binary files a/art/32x32/evolution.png and /dev/null differ diff --git a/art/48x48/preferences-autocompletion.png b/art/48x48/preferences-autocompletion.png deleted file mode 100644 index 49cfc21de3..0000000000 Binary files a/art/48x48/preferences-autocompletion.png and /dev/null differ diff --git a/art/48x48/preferences-calendar-and-tasks.png b/art/48x48/preferences-calendar-and-tasks.png deleted file mode 100644 index 7ce3270e73..0000000000 Binary files a/art/48x48/preferences-calendar-and-tasks.png and /dev/null differ diff --git a/art/48x48/preferences-certificates.png b/art/48x48/preferences-certificates.png deleted file mode 100644 index 7c03a240e5..0000000000 Binary files a/art/48x48/preferences-certificates.png and /dev/null differ diff --git a/art/48x48/preferences-composer.png b/art/48x48/preferences-composer.png deleted file mode 100644 index 49b0575687..0000000000 Binary files a/art/48x48/preferences-composer.png and /dev/null differ diff --git a/art/48x48/preferences-mail-accounts.png b/art/48x48/preferences-mail-accounts.png deleted file mode 100644 index c8ab08f0c3..0000000000 Binary files a/art/48x48/preferences-mail-accounts.png and /dev/null differ diff --git a/art/48x48/preferences-mail.png b/art/48x48/preferences-mail.png deleted file mode 100644 index a68d005edc..0000000000 Binary files a/art/48x48/preferences-mail.png and /dev/null differ diff --git a/art/ChangeLog b/art/ChangeLog index dde3f888c0..1e853a15ee 100644 --- a/art/ChangeLog +++ b/art/ChangeLog @@ -1,3 +1,9 @@ +2007-10-12 Michael Monreal + + ** Migration of theme icons to data/icons/ (bug #479257) + + * art/Makefile.am: Remove references to art/$size. + 2007-06-03 Srinivasa Ragavan ** Fix for version removal from Installed files from Gilles Dartiguelongue diff --git a/art/Makefile.am b/art/Makefile.am index 9f6a989f55..bded28a1a5 100644 --- a/art/Makefile.am +++ b/art/Makefile.am @@ -1,29 +1,3 @@ -icon16dir = $(datadir)/icons/hicolor/16x16/apps -icon16_DATA = 16x16/evolution.png - -icon22dir = $(datadir)/icons/hicolor/22x22/apps -icon22_DATA = 22x22/evolution.png - -icon24dir = $(datadir)/icons/hicolor/24x24/apps -icon24_DATA = 24x24/evolution.png - -icon32dir = $(datadir)/icons/hicolor/32x32/apps -icon32_DATA = 32x32/evolution.png - -icon48dir = $(datadir)/icons/hicolor/48x48/apps -icon48_DATA = \ - 48x48/preferences-autocompletion.png \ - 48x48/preferences-calendar-and-tasks.png \ - 48x48/preferences-certificates.png \ - 48x48/preferences-composer.png \ - 48x48/preferences-mail-accounts.png \ - 48x48/preferences-mail.png - -svgicondir = $(datadir)/icons/hicolor/scalable/apps -svgicon_DATA = scalable/evolution.svg - -gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor - images_DATA = \ evolution-contacts-mini.png \ offline.png \ @@ -33,17 +7,6 @@ images_DATA = \ plus.png \ minus.png -install-data-hook: update-icon-cache -uninstall-hook: update-icon-cache -update-icon-cache: - @-if test -z "$(DESTDIR)"; then \ - echo "Updating Gtk icon cache."; \ - $(gtk_update_icon_cache); \ - else \ - echo "*** Icon cache not updated. After (un)install, run this:"; \ - echo "*** $(gtk_update_icon_cache)"; \ - fi - EXTRA_DIST = \ ChangeLog \ ChangeLog.pre-1-4 \ @@ -52,10 +15,4 @@ EXTRA_DIST = \ broken-image-24.xpm \ empty.xpm \ jump.xpm \ - $(icon16_DATA) \ - $(icon22_DATA) \ - $(icon24_DATA) \ - $(icon32_DATA) \ - $(icon48_DATA) \ - $(svgicon_DATA) \ $(images_DATA) diff --git a/art/scalable/evolution.svg b/art/scalable/evolution.svg deleted file mode 100644 index d44c9b319a..0000000000 --- a/art/scalable/evolution.svg +++ /dev/null @@ -1,615 +0,0 @@ - - - - - - image/svg+xml - - Evolution 2.2 Logo - - - Jakub Steiner - - - - - Andreas Nilsson - - - - http://jimmac.musichall.cz - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/calendar/ChangeLog b/calendar/ChangeLog index a35e024e0d..6f51cdd8cd 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,9 @@ +2007-10-12 Michael Monreal + + ** New view-calendar icons (bug #479257) + + * calendar/gui/calendar-commands.c: Change icon references. + 2007-10-12 Suman Manjunath ** Fix for bug #466659 diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c index 6d7f164491..4e2ccc64d9 100644 --- a/calendar/gui/calendar-commands.c +++ b/calendar/gui/calendar-commands.c @@ -611,11 +611,11 @@ static EPixmap pixmaps [] = { E_PIXMAP ("/Toolbar/Prev", "go-previous", E_ICON_SIZE_LARGE_TOOLBAR), E_PIXMAP ("/Toolbar/Next", "go-next", E_ICON_SIZE_LARGE_TOOLBAR), E_PIXMAP ("/Toolbar/Goto", "go-jump", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/DayView", "stock_calendar-view-day", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/WorkWeekView", "stock_calendar-view-work-week", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/WeekView", "stock_calendar-view-week", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/MonthView", "stock_calendar-view-month", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/ListView", "stock_calendar-view-list", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/DayView", "view-calendar-day", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/WorkWeekView", "view-calendar-workweek", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/WeekView", "view-calendar-week", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/MonthView", "view-calendar-month", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/ListView", "view-calendar-list", E_ICON_SIZE_LARGE_TOOLBAR), E_PIXMAP_END }; diff --git a/configure.in b/configure.in index 2112760f58..a64fbcf336 100644 --- a/configure.in +++ b/configure.in @@ -1880,6 +1880,7 @@ data/cde_app_root/dt/appconfig/icons/C/Makefile data/cde_app_root/dt/appconfig/types/Makefile data/cde_app_root/dt/appconfig/types/C/Makefile data/cde_app_root/dt/appconfig/types/C/Ximian.dt +data/icons/Makefile e-util/Makefile filter/Makefile help/Makefile diff --git a/data/Makefile.am b/data/Makefile.am index 0574e0de62..f94a1e0bb9 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -40,7 +40,7 @@ endif noinst_MANS = evolution.1 noinst_DATA = $(keys_file) $(desktop_file) -SUBDIRS = cde_app_root +SUBDIRS = cde_app_root icons install-data-local: install-kde-applnk $(desktop_file) $(keys_file) $(mime_file) $(mkinstalldirs) $(DESTDIR)$(desktopdir); \ diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am new file mode 100644 index 0000000000..b8bca711a8 --- /dev/null +++ b/data/icons/Makefile.am @@ -0,0 +1,119 @@ +NULL = + +public_icons = \ + hicolor_apps_16x16_evolution.png \ + hicolor_apps_22x22_evolution.png \ + hicolor_apps_24x24_evolution.png \ + hicolor_apps_32x32_evolution.png \ + hicolor_apps_48x48_evolution.png \ + hicolor_apps_scalable_evolution.svg \ + $(NULL) + +private_icons = \ + hicolor_actions_16x16_view-calendar-day.png \ + hicolor_actions_16x16_view-calendar-list.png \ + hicolor_actions_16x16_view-calendar-month.png \ + hicolor_actions_16x16_view-calendar-week.png \ + hicolor_actions_16x16_view-calendar-workweek.png \ + hicolor_actions_22x22_view-calendar-day.png \ + hicolor_actions_22x22_view-calendar-list.png \ + hicolor_actions_22x22_view-calendar-month.png \ + hicolor_actions_22x22_view-calendar-week.png \ + hicolor_actions_22x22_view-calendar-workweek.png \ + hicolor_actions_24x24_view-calendar-day.png \ + hicolor_actions_24x24_view-calendar-list.png \ + hicolor_actions_24x24_view-calendar-month.png \ + hicolor_actions_24x24_view-calendar-week.png \ + hicolor_actions_24x24_view-calendar-workweek.png \ + hicolor_categories_48x48_preferences-autocompletion.png \ + hicolor_categories_48x48_preferences-calendar-and-tasks.png \ + hicolor_categories_48x48_preferences-certificates.png \ + hicolor_categories_48x48_preferences-composer.png \ + hicolor_categories_48x48_preferences-mail.png \ + hicolor_categories_48x48_preferences-mail-accounts.png \ + hicolor_places_16x16_mail-inbox.png \ + hicolor_places_16x16_mail-outbox.png \ + hicolor_places_16x16_mail-sent.png \ + hicolor_places_22x22_mail-inbox.png \ + hicolor_places_22x22_mail-outbox.png \ + hicolor_places_22x22_mail-sent.png \ + hicolor_places_24x24_mail-inbox.png \ + hicolor_places_24x24_mail-outbox.png \ + hicolor_places_24x24_mail-sent.png \ + $(NULL) + +noinst_DATA = \ + hicolor_actions_16x16_view-calendar-day.svg \ + hicolor_actions_16x16_view-calendar-list.svg \ + hicolor_actions_16x16_view-calendar-month.svg \ + hicolor_actions_16x16_view-calendar-week.svg \ + hicolor_actions_16x16_view-calendar-workweek.svg \ + hicolor_actions_22x22_view-calendar-day.svg \ + hicolor_actions_22x22_view-calendar-list.svg \ + hicolor_actions_22x22_view-calendar-month.svg \ + hicolor_actions_22x22_view-calendar-week.svg \ + hicolor_actions_22x22_view-calendar-workweek.svg \ + hicolor_places_16x16_mail-inbox.svg \ + hicolor_places_16x16_mail-outbox.svg \ + hicolor_places_16x16_mail-sent.svg \ + hicolor_places_22x22_mail-inbox.svg \ + hicolor_places_22x22_mail-outbox.svg \ + hicolor_places_22x22_mail-sent.svg \ + $(NULL) + +EXTRA_DIST = \ + $(public_icons) \ + $(private_icons) \ + $(noinst_DATA) \ + $(NULL) + +############################################################################### + +gtk_update_icon_cache = gtk-update-icon-cache -f -t + +update-icon-cache: + @-if test -z "$(DESTDIR)"; then \ + echo "Updating Gtk icon cache."; \ + $(gtk_update_icon_cache) $(datadir)/icons/hicolor; \ + else \ + echo "*** Icon cache not updated. After (un)install, run this:"; \ + echo "*** $(gtk_update_icon_cache) $(datadir)/icons/hicolor"; \ + fi + +install-icons: + for icon in $(public_icons); do \ + THEME=`echo $$icon | cut -d_ -f1`; \ + CONTEXT=`echo $$icon | cut -d_ -f2`; \ + SIZE=`echo $$icon | cut -d_ -f3`; \ + ICONFILE=`echo $$icon | cut -d_ -f4`; \ + mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \ + $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ + done; \ + for icon in $(private_icons); do \ + THEME=`echo $$icon | cut -d_ -f1`; \ + CONTEXT=`echo $$icon | cut -d_ -f2`; \ + SIZE=`echo $$icon | cut -d_ -f3`; \ + ICONFILE=`echo $$icon | cut -d_ -f4`; \ + mkdir -p $(DESTDIR)$(pkgdatadir)/$(BASE_VERSION)/icons/$$THEME/$$SIZE/$$CONTEXT; \ + $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(pkgdatadir)/$(BASE_VERSION)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ + done + +uninstall-icons: + -for icon in $(public_icons); do \ + THEME=`echo $$icon | cut -d_ -f1`; \ + CONTEXT=`echo $$icon | cut -d_ -f2`; \ + SIZE=`echo $$icon | cut -d_ -f3`; \ + ICONFILE=`echo $$icon | cut -d_ -f4`; \ + rm -f $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ + done; \ + for icon in $(private_icons); do \ + THEME=`echo $$icon | cut -d_ -f1`; \ + CONTEXT=`echo $$icon | cut -d_ -f2`; \ + SIZE=`echo $$icon | cut -d_ -f3`; \ + ICONFILE=`echo $$icon | cut -d_ -f4`; \ + rm -f $(DESTDIR)$(pkgdatadir)/$(BASE_VERSION)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ + done + +install-data-local: install-icons update-icon-cache + +uninstall-local: uninstall-icons update-icon-cache diff --git a/data/icons/hicolor_actions_16x16_view-calendar-day.png b/data/icons/hicolor_actions_16x16_view-calendar-day.png new file mode 100644 index 0000000000..d40e9d1b09 Binary files /dev/null and b/data/icons/hicolor_actions_16x16_view-calendar-day.png differ diff --git a/data/icons/hicolor_actions_16x16_view-calendar-day.svg b/data/icons/hicolor_actions_16x16_view-calendar-day.svg new file mode 100644 index 0000000000..bf3d8149d3 --- /dev/null +++ b/data/icons/hicolor_actions_16x16_view-calendar-day.svg @@ -0,0 +1,240 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/data/icons/hicolor_actions_16x16_view-calendar-list.png b/data/icons/hicolor_actions_16x16_view-calendar-list.png new file mode 100644 index 0000000000..f5f68fd7ee Binary files /dev/null and b/data/icons/hicolor_actions_16x16_view-calendar-list.png differ diff --git a/data/icons/hicolor_actions_16x16_view-calendar-list.svg b/data/icons/hicolor_actions_16x16_view-calendar-list.svg new file mode 100644 index 0000000000..113520a82f --- /dev/null +++ b/data/icons/hicolor_actions_16x16_view-calendar-list.svg @@ -0,0 +1,229 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/data/icons/hicolor_actions_16x16_view-calendar-month.png b/data/icons/hicolor_actions_16x16_view-calendar-month.png new file mode 100644 index 0000000000..5b3f70fa26 Binary files /dev/null and b/data/icons/hicolor_actions_16x16_view-calendar-month.png differ diff --git a/data/icons/hicolor_actions_16x16_view-calendar-month.svg b/data/icons/hicolor_actions_16x16_view-calendar-month.svg new file mode 100644 index 0000000000..b13ad7ec84 --- /dev/null +++ b/data/icons/hicolor_actions_16x16_view-calendar-month.svg @@ -0,0 +1,281 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/data/icons/hicolor_actions_16x16_view-calendar-week.png b/data/icons/hicolor_actions_16x16_view-calendar-week.png new file mode 100644 index 0000000000..bdfbdf6877 Binary files /dev/null and b/data/icons/hicolor_actions_16x16_view-calendar-week.png differ diff --git a/data/icons/hicolor_actions_16x16_view-calendar-week.svg b/data/icons/hicolor_actions_16x16_view-calendar-week.svg new file mode 100644 index 0000000000..ba331ee69e --- /dev/null +++ b/data/icons/hicolor_actions_16x16_view-calendar-week.svg @@ -0,0 +1,207 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/data/icons/hicolor_actions_16x16_view-calendar-workweek.png b/data/icons/hicolor_actions_16x16_view-calendar-workweek.png new file mode 100644 index 0000000000..65ea1d2832 Binary files /dev/null and b/data/icons/hicolor_actions_16x16_view-calendar-workweek.png differ diff --git a/data/icons/hicolor_actions_16x16_view-calendar-workweek.svg b/data/icons/hicolor_actions_16x16_view-calendar-workweek.svg new file mode 100644 index 0000000000..c27eb3d2d1 --- /dev/null +++ b/data/icons/hicolor_actions_16x16_view-calendar-workweek.svg @@ -0,0 +1,207 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/data/icons/hicolor_actions_22x22_view-calendar-day.png b/data/icons/hicolor_actions_22x22_view-calendar-day.png new file mode 100644 index 0000000000..58c352eba8 Binary files /dev/null and b/data/icons/hicolor_actions_22x22_view-calendar-day.png differ diff --git a/data/icons/hicolor_actions_22x22_view-calendar-day.svg b/data/icons/hicolor_actions_22x22_view-calendar-day.svg new file mode 100644 index 0000000000..ffd1ea0f8c --- /dev/null +++ b/data/icons/hicolor_actions_22x22_view-calendar-day.svg @@ -0,0 +1,327 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/hicolor_actions_22x22_view-calendar-list.png b/data/icons/hicolor_actions_22x22_view-calendar-list.png new file mode 100644 index 0000000000..baa9961cee Binary files /dev/null and b/data/icons/hicolor_actions_22x22_view-calendar-list.png differ diff --git a/data/icons/hicolor_actions_22x22_view-calendar-list.svg b/data/icons/hicolor_actions_22x22_view-calendar-list.svg new file mode 100644 index 0000000000..7fc1f9fb8a --- /dev/null +++ b/data/icons/hicolor_actions_22x22_view-calendar-list.svg @@ -0,0 +1,316 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/hicolor_actions_22x22_view-calendar-month.png b/data/icons/hicolor_actions_22x22_view-calendar-month.png new file mode 100644 index 0000000000..6dc4ede47d Binary files /dev/null and b/data/icons/hicolor_actions_22x22_view-calendar-month.png differ diff --git a/data/icons/hicolor_actions_22x22_view-calendar-month.svg b/data/icons/hicolor_actions_22x22_view-calendar-month.svg new file mode 100644 index 0000000000..0783e6ed3b --- /dev/null +++ b/data/icons/hicolor_actions_22x22_view-calendar-month.svg @@ -0,0 +1,329 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/hicolor_actions_22x22_view-calendar-week.png b/data/icons/hicolor_actions_22x22_view-calendar-week.png new file mode 100644 index 0000000000..9b529b52fe Binary files /dev/null and b/data/icons/hicolor_actions_22x22_view-calendar-week.png differ diff --git a/data/icons/hicolor_actions_22x22_view-calendar-week.svg b/data/icons/hicolor_actions_22x22_view-calendar-week.svg new file mode 100644 index 0000000000..3597eaa933 --- /dev/null +++ b/data/icons/hicolor_actions_22x22_view-calendar-week.svg @@ -0,0 +1,275 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/hicolor_actions_22x22_view-calendar-workweek.png b/data/icons/hicolor_actions_22x22_view-calendar-workweek.png new file mode 100644 index 0000000000..5bcdcbe952 Binary files /dev/null and b/data/icons/hicolor_actions_22x22_view-calendar-workweek.png differ diff --git a/data/icons/hicolor_actions_22x22_view-calendar-workweek.svg b/data/icons/hicolor_actions_22x22_view-calendar-workweek.svg new file mode 100644 index 0000000000..191837f62d --- /dev/null +++ b/data/icons/hicolor_actions_22x22_view-calendar-workweek.svg @@ -0,0 +1,294 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/hicolor_actions_24x24_view-calendar-day.png b/data/icons/hicolor_actions_24x24_view-calendar-day.png new file mode 100644 index 0000000000..6db6edd053 Binary files /dev/null and b/data/icons/hicolor_actions_24x24_view-calendar-day.png differ diff --git a/data/icons/hicolor_actions_24x24_view-calendar-list.png b/data/icons/hicolor_actions_24x24_view-calendar-list.png new file mode 100644 index 0000000000..ebb23b5bcd Binary files /dev/null and b/data/icons/hicolor_actions_24x24_view-calendar-list.png differ diff --git a/data/icons/hicolor_actions_24x24_view-calendar-month.png b/data/icons/hicolor_actions_24x24_view-calendar-month.png new file mode 100644 index 0000000000..1018214d1b Binary files /dev/null and b/data/icons/hicolor_actions_24x24_view-calendar-month.png differ diff --git a/data/icons/hicolor_actions_24x24_view-calendar-week.png b/data/icons/hicolor_actions_24x24_view-calendar-week.png new file mode 100644 index 0000000000..f9bfc3d59a Binary files /dev/null and b/data/icons/hicolor_actions_24x24_view-calendar-week.png differ diff --git a/data/icons/hicolor_actions_24x24_view-calendar-workweek.png b/data/icons/hicolor_actions_24x24_view-calendar-workweek.png new file mode 100644 index 0000000000..2474b522fc Binary files /dev/null and b/data/icons/hicolor_actions_24x24_view-calendar-workweek.png differ diff --git a/data/icons/hicolor_apps_16x16_evolution.png b/data/icons/hicolor_apps_16x16_evolution.png new file mode 100644 index 0000000000..0d1ad3496e Binary files /dev/null and b/data/icons/hicolor_apps_16x16_evolution.png differ diff --git a/data/icons/hicolor_apps_22x22_evolution.png b/data/icons/hicolor_apps_22x22_evolution.png new file mode 100644 index 0000000000..d069ad9c6f Binary files /dev/null and b/data/icons/hicolor_apps_22x22_evolution.png differ diff --git a/data/icons/hicolor_apps_24x24_evolution.png b/data/icons/hicolor_apps_24x24_evolution.png new file mode 100644 index 0000000000..92c2605f91 Binary files /dev/null and b/data/icons/hicolor_apps_24x24_evolution.png differ diff --git a/data/icons/hicolor_apps_32x32_evolution.png b/data/icons/hicolor_apps_32x32_evolution.png new file mode 100644 index 0000000000..a24c73d629 Binary files /dev/null and b/data/icons/hicolor_apps_32x32_evolution.png differ diff --git a/data/icons/hicolor_apps_48x48_evolution.png b/data/icons/hicolor_apps_48x48_evolution.png new file mode 100644 index 0000000000..e492c8b9cc Binary files /dev/null and b/data/icons/hicolor_apps_48x48_evolution.png differ diff --git a/data/icons/hicolor_apps_scalable_evolution.svg b/data/icons/hicolor_apps_scalable_evolution.svg new file mode 100644 index 0000000000..d44c9b319a --- /dev/null +++ b/data/icons/hicolor_apps_scalable_evolution.svg @@ -0,0 +1,615 @@ + + + + + + image/svg+xml + + Evolution 2.2 Logo + + + Jakub Steiner + + + + + Andreas Nilsson + + + + http://jimmac.musichall.cz + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data/icons/hicolor_categories_48x48_preferences-autocompletion.png b/data/icons/hicolor_categories_48x48_preferences-autocompletion.png new file mode 100644 index 0000000000..49cfc21de3 Binary files /dev/null and b/data/icons/hicolor_categories_48x48_preferences-autocompletion.png differ diff --git a/data/icons/hicolor_categories_48x48_preferences-calendar-and-tasks.png b/data/icons/hicolor_categories_48x48_preferences-calendar-and-tasks.png new file mode 100644 index 0000000000..7ce3270e73 Binary files /dev/null and b/data/icons/hicolor_categories_48x48_preferences-calendar-and-tasks.png differ diff --git a/data/icons/hicolor_categories_48x48_preferences-certificates.png b/data/icons/hicolor_categories_48x48_preferences-certificates.png new file mode 100644 index 0000000000..7c03a240e5 Binary files /dev/null and b/data/icons/hicolor_categories_48x48_preferences-certificates.png differ diff --git a/data/icons/hicolor_categories_48x48_preferences-composer.png b/data/icons/hicolor_categories_48x48_preferences-composer.png new file mode 100644 index 0000000000..49b0575687 Binary files /dev/null and b/data/icons/hicolor_categories_48x48_preferences-composer.png differ diff --git a/data/icons/hicolor_categories_48x48_preferences-mail-accounts.png b/data/icons/hicolor_categories_48x48_preferences-mail-accounts.png new file mode 100644 index 0000000000..c8ab08f0c3 Binary files /dev/null and b/data/icons/hicolor_categories_48x48_preferences-mail-accounts.png differ diff --git a/data/icons/hicolor_categories_48x48_preferences-mail.png b/data/icons/hicolor_categories_48x48_preferences-mail.png new file mode 100644 index 0000000000..a68d005edc Binary files /dev/null and b/data/icons/hicolor_categories_48x48_preferences-mail.png differ diff --git a/data/icons/hicolor_places_16x16_mail-inbox.png b/data/icons/hicolor_places_16x16_mail-inbox.png new file mode 100644 index 0000000000..429ad26c4d Binary files /dev/null and b/data/icons/hicolor_places_16x16_mail-inbox.png differ diff --git a/data/icons/hicolor_places_16x16_mail-inbox.svg b/data/icons/hicolor_places_16x16_mail-inbox.svg new file mode 100644 index 0000000000..5488124dea --- /dev/null +++ b/data/icons/hicolor_places_16x16_mail-inbox.svg @@ -0,0 +1,433 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Lapo Calamandrei + + + + + Andreas Nilsson + + + + + image/svg+xml + + + + Lapo Calamandrei + + + + + Andreas Nilsson + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/hicolor_places_16x16_mail-outbox.png b/data/icons/hicolor_places_16x16_mail-outbox.png new file mode 100644 index 0000000000..1e138289a8 Binary files /dev/null and b/data/icons/hicolor_places_16x16_mail-outbox.png differ diff --git a/data/icons/hicolor_places_16x16_mail-outbox.svg b/data/icons/hicolor_places_16x16_mail-outbox.svg new file mode 100644 index 0000000000..8234cc4fee --- /dev/null +++ b/data/icons/hicolor_places_16x16_mail-outbox.svg @@ -0,0 +1,1492 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Lapo Calamandrei + + + + + Andreas Nilsson + + + + + image/svg+xml + + + + Lapo Calamandrei + + + + + Andreas Nilsson + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/hicolor_places_16x16_mail-sent.png b/data/icons/hicolor_places_16x16_mail-sent.png new file mode 100644 index 0000000000..6470b718bb Binary files /dev/null and b/data/icons/hicolor_places_16x16_mail-sent.png differ diff --git a/data/icons/hicolor_places_16x16_mail-sent.svg b/data/icons/hicolor_places_16x16_mail-sent.svg new file mode 100644 index 0000000000..2f386441a8 --- /dev/null +++ b/data/icons/hicolor_places_16x16_mail-sent.svg @@ -0,0 +1,217 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Lapo Calamandrei + + + Stamp + + + Hylke Bons, Andreas Nilsson + + + + + mail + send + stamp + + + + + + + + + + + + + + + + + + + + + + 50- + + + diff --git a/data/icons/hicolor_places_22x22_mail-inbox.png b/data/icons/hicolor_places_22x22_mail-inbox.png new file mode 100644 index 0000000000..7e9c554baf Binary files /dev/null and b/data/icons/hicolor_places_22x22_mail-inbox.png differ diff --git a/data/icons/hicolor_places_22x22_mail-inbox.svg b/data/icons/hicolor_places_22x22_mail-inbox.svg new file mode 100644 index 0000000000..5b2ec37cce --- /dev/null +++ b/data/icons/hicolor_places_22x22_mail-inbox.svg @@ -0,0 +1,558 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Lapo Calamandrei + + + + + Andreas Nilsson + + + + + image/svg+xml + + + + Lapo Calamandrei + + + + + Andreas Nilsson + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/hicolor_places_22x22_mail-outbox.png b/data/icons/hicolor_places_22x22_mail-outbox.png new file mode 100644 index 0000000000..95ece1939e Binary files /dev/null and b/data/icons/hicolor_places_22x22_mail-outbox.png differ diff --git a/data/icons/hicolor_places_22x22_mail-outbox.svg b/data/icons/hicolor_places_22x22_mail-outbox.svg new file mode 100644 index 0000000000..e3879c82a1 --- /dev/null +++ b/data/icons/hicolor_places_22x22_mail-outbox.svg @@ -0,0 +1,563 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Lapo Calamandrei + + + + + Andreas Nilsson + + + + + image/svg+xml + + + + Lapo Calamandrei + + + + + Andreas Nilsson + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/hicolor_places_22x22_mail-sent.png b/data/icons/hicolor_places_22x22_mail-sent.png new file mode 100644 index 0000000000..4c098f186d Binary files /dev/null and b/data/icons/hicolor_places_22x22_mail-sent.png differ diff --git a/data/icons/hicolor_places_22x22_mail-sent.svg b/data/icons/hicolor_places_22x22_mail-sent.svg new file mode 100644 index 0000000000..4aaa601f6c --- /dev/null +++ b/data/icons/hicolor_places_22x22_mail-sent.svg @@ -0,0 +1,319 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Lapo Calamandrei + + + Stamp + + + Hylke Bons, Andreas Nilsson + + + + + mail + send + stamp + + + + + + + + + + + + + + + + + + + + + + + + + + + + 50- + + + + diff --git a/data/icons/hicolor_places_24x24_mail-inbox.png b/data/icons/hicolor_places_24x24_mail-inbox.png new file mode 100644 index 0000000000..fd9eb74341 Binary files /dev/null and b/data/icons/hicolor_places_24x24_mail-inbox.png differ diff --git a/data/icons/hicolor_places_24x24_mail-outbox.png b/data/icons/hicolor_places_24x24_mail-outbox.png new file mode 100644 index 0000000000..1bdd0c159b Binary files /dev/null and b/data/icons/hicolor_places_24x24_mail-outbox.png differ diff --git a/data/icons/hicolor_places_24x24_mail-sent.png b/data/icons/hicolor_places_24x24_mail-sent.png new file mode 100644 index 0000000000..a723d140b6 Binary files /dev/null and b/data/icons/hicolor_places_24x24_mail-sent.png differ diff --git a/e-util/ChangeLog b/e-util/ChangeLog index b1d1bdce34..02e1bb5968 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,10 @@ +2007-10-12 Michael Monreal + + ** Migration of theme icons to data/icons/ (bug #479257) + + * file e-util/e-icon-factory.c: + Append a private icon directory to the search path. + 2007-10-11 Milan Crha ** Fix for bug #311179 diff --git a/e-util/e-icon-factory.c b/e-util/e-icon-factory.c index 0b313fbfa7..52a7f14e82 100644 --- a/e-util/e-icon-factory.c +++ b/e-util/e-icon-factory.c @@ -213,7 +213,9 @@ e_icon_factory_init (void) icon_theme = gtk_icon_theme_get_default (); gtk_icon_theme_append_search_path (icon_theme, - EVOLUTION_DATADIR G_DIR_SEPARATOR_S "icons"); + EVOLUTION_DATADIR G_DIR_SEPARATOR_S + "evolution" G_DIR_SEPARATOR_S + BASE_VERSION G_DIR_SEPARATOR_S "icons"); g_signal_connect ( icon_theme, "changed", G_CALLBACK (icon_theme_changed_cb), NULL); diff --git a/mail/ChangeLog b/mail/ChangeLog index af72a912f1..959721f7c3 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,10 @@ +2007-10-12 Michael Monreal + + ** New inbox/outbox/sent icons (bug #479257) + + * mail/em-folder-tree.c, mail/mail-send-recv.c: + Change icon references. + 2007-10-11 Matthew Barnes * em-format.c (em_format_add_puri): diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index 3aff4a0358..34dab1767a 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -289,13 +289,13 @@ render_pixbuf (GtkTreeViewColumn *column, GtkCellRenderer *renderer, if (!initialised) { folder_icons[FOLDER_ICON_NORMAL] = e_icon_factory_get_icon ("folder", E_ICON_SIZE_MENU); - folder_icons[FOLDER_ICON_INBOX] = e_icon_factory_get_icon ("stock_inbox", E_ICON_SIZE_MENU); - folder_icons[FOLDER_ICON_OUTBOX] = e_icon_factory_get_icon ("stock_outbox", E_ICON_SIZE_MENU); + folder_icons[FOLDER_ICON_INBOX] = e_icon_factory_get_icon ("mail-inbox", E_ICON_SIZE_MENU); + folder_icons[FOLDER_ICON_OUTBOX] = e_icon_factory_get_icon ("mail-outbox", E_ICON_SIZE_MENU); folder_icons[FOLDER_ICON_TRASH] = e_icon_factory_get_icon ("user-trash", E_ICON_SIZE_MENU); folder_icons[FOLDER_ICON_JUNK] = e_icon_factory_get_icon ("mail-mark-junk", E_ICON_SIZE_MENU); folder_icons[FOLDER_ICON_SHARED_TO_ME] = e_icon_factory_get_icon ("stock_shared-to-me", E_ICON_SIZE_MENU); folder_icons[FOLDER_ICON_SHARED_BY_ME] = e_icon_factory_get_icon ("stock_shared-by-me", E_ICON_SIZE_MENU); - folder_icons[FOLDER_ICON_SENT] = e_icon_factory_get_icon ("stock_sent-mail", E_ICON_SIZE_MENU); + folder_icons[FOLDER_ICON_SENT] = e_icon_factory_get_icon ("mail-sent", E_ICON_SIZE_MENU); initialised = TRUE; } diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index 83f146d5ff..a1580d6788 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -489,7 +489,7 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati info->timeout_id = g_timeout_add (STATUS_TIMEOUT, operation_status_timeout, info); recv_icon = e_icon_factory_get_image ( - "stock_mail-receive", E_ICON_SIZE_LARGE_TOOLBAR); + "mail-inbox", E_ICON_SIZE_LARGE_TOOLBAR); pretty_url = format_url (source->url, account->name); label = gtk_label_new (NULL); gtk_label_set_ellipsize ( @@ -564,7 +564,7 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati info->timeout_id = g_timeout_add (STATUS_TIMEOUT, operation_status_timeout, info); send_icon = e_icon_factory_get_image ( - "mail-send", E_ICON_SIZE_LARGE_TOOLBAR); + "mail-outbox", E_ICON_SIZE_LARGE_TOOLBAR); pretty_url = format_url (destination, NULL); label = gtk_label_new (NULL); gtk_label_set_ellipsize ( -- cgit v1.2.3