Bring icon handling to the 21th century. Add an emblem-note icon, this is

2009-01-28  Cosimo Cecchi  <cosimoc@gnome.org>

	* data/icons/*:
	Bring icon handling to the 21th century.
	Add an emblem-note icon, this is copied from g-i-t "stock_note"
	icon right now, but we might change this later.
	* src/nautilus-application.c: (nautilus_application_init):
	add a lookup path for custom themable icons.

	This also fixes bug #569407. Thanks to Lapo Calamandrei for
	the tips on icon naming.

svn path=/trunk/; revision=14891

22 files changed, 78 insertions, 91 deletions

diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am
deleted file mode 100644
index ebbd1452f..000000000
--- a/data/icons/16x16/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = apps
diff --git a/data/icons/16x16/apps/Makefile.am b/data/icons/16x16/apps/Makefile.am
deleted file mode 100644
index e2ac98437..000000000
--- a/data/icons/16x16/apps/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-NULL =
-themedir = $(datadir)/icons/hicolor
-size = 16x16
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA =		\
-	nautilus.png	\
-	$(NULL)
-
-icons_SOURCE =		\
-	nautilus.svg	\
-	$(NULL)
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(icons_SOURCE)
diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am
deleted file mode 100644
index ebbd1452f..000000000
--- a/data/icons/22x22/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = apps
diff --git a/data/icons/22x22/apps/Makefile.am b/data/icons/22x22/apps/Makefile.am
deleted file mode 100644
index 6e00d28c2..000000000
--- a/data/icons/22x22/apps/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-NULL =
-themedir = $(datadir)/icons/hicolor
-size = 22x22
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA =		\
-	nautilus.png	\
-	$(NULL)
-
-icons_SOURCE =		\
-	nautilus.svg	\
-	$(NULL)
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(icons_SOURCE)
diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am
deleted file mode 100644
index ebbd1452f..000000000
--- a/data/icons/24x24/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = apps
diff --git a/data/icons/24x24/apps/Makefile.am b/data/icons/24x24/apps/Makefile.am
deleted file mode 100644
index d653511c9..000000000
--- a/data/icons/24x24/apps/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-NULL =
-themedir = $(datadir)/icons/hicolor
-size = 24x24
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA =		\
-	nautilus.png	\
-	$(NULL)
-
-EXTRA_DIST =		\
-	$(icons_DATA)
diff --git a/data/icons/32x32/Makefile.am b/data/icons/32x32/Makefile.am
deleted file mode 100644
index ebbd1452f..000000000
--- a/data/icons/32x32/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = apps
diff --git a/data/icons/32x32/apps/Makefile.am b/data/icons/32x32/apps/Makefile.am
deleted file mode 100644
index add7a3947..000000000
--- a/data/icons/32x32/apps/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-NULL =
-themedir = $(datadir)/icons/hicolor
-size = 32x32
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA =		\
-	nautilus.png	\
-	$(NULL)
-
-icons_SOURCE =		\
-	nautilus.svg	\
-	$(NULL)
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(icons_SOURCE)
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 87db08603..72d81a3a2 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -1,14 +1,86 @@
-SUBDIRS = 16x16 22x22 24x24 32x32 scalable
+NULL =
 
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+public_icons_themes = \
+	hicolor	\
+	$(NULL)
+
+public_icons = \
+	hicolor_apps_16x16_nautilus.png \
+	hicolor_apps_22x22_nautilus.png \
+	hicolor_apps_24x24_nautilus.png \
+	hicolor_apps_32x32_nautilus.png \
+	hicolor_apps_scalable_nautilus.svg \
+	$(NULL)
+
+private_icons = \
+	hicolor_emblems_16x16_emblem-note.png \
+	hicolor_emblems_24x24_emblem-note.png \
+	hicolor_emblems_48x48_emblem-note.png \
+	$(NULL)
+
+noinst_DATA = \
+	hicolor_apps_16x16_nautilus.svg \
+	hicolor_apps_22x22_nautilus.svg \
+	hicolor_apps_32x32_nautilus.svg \
+	$(NULL)
+
+EXTRA_DIST = \
+	$(public_icons)		\
+	$(private_icons)	\
+	$(noinst_DATA)		\
+	$(NULL)
+
+###############################################################################
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t
 
-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); \
+		for theme in $(public_icons_themes); do \
+			$(gtk_update_icon_cache) $(datadir)/icons/$$theme; \
+		done; \
 	else \
 		echo "*** Icon cache not updated.  After (un)install, run this:"; \
-		echo "***   $(gtk_update_icon_cache)"; \
+		for theme in $(public_icons_themes); do \
+			echo "***   $(gtk_update_icon_cache) $(datadir)/icons/$$theme"; \
+		done; \
 	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)/icons/$$THEME/$$SIZE/$$CONTEXT; \
+		$(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(pkgdatadir)/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)/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/16x16/apps/nautilus.png b/data/icons/hicolor_apps_16x16_nautilus.png
index fa5c46910..fa5c46910 100644
--- a/data/icons/16x16/apps/nautilus.png
+++ b/data/icons/hicolor_apps_16x16_nautilus.png
diff --git a/data/icons/16x16/apps/nautilus.svg b/data/icons/hicolor_apps_16x16_nautilus.svg
index 5bd489464..5bd489464 100644
--- a/data/icons/16x16/apps/nautilus.svg
+++ b/data/icons/hicolor_apps_16x16_nautilus.svg
diff --git a/data/icons/22x22/apps/nautilus.png b/data/icons/hicolor_apps_22x22_nautilus.png
index 945d4d740..945d4d740 100644
--- a/data/icons/22x22/apps/nautilus.png
+++ b/data/icons/hicolor_apps_22x22_nautilus.png
diff --git a/data/icons/22x22/apps/nautilus.svg b/data/icons/hicolor_apps_22x22_nautilus.svg
index d18c6de70..d18c6de70 100644
--- a/data/icons/22x22/apps/nautilus.svg
+++ b/data/icons/hicolor_apps_22x22_nautilus.svg
diff --git a/data/icons/24x24/apps/nautilus.png b/data/icons/hicolor_apps_24x24_nautilus.png
index ea61f182c..ea61f182c 100644
--- a/data/icons/24x24/apps/nautilus.png
+++ b/data/icons/hicolor_apps_24x24_nautilus.png
diff --git a/data/icons/32x32/apps/nautilus.png b/data/icons/hicolor_apps_32x32_nautilus.png
index 3f4f8e0f9..3f4f8e0f9 100644
--- a/data/icons/32x32/apps/nautilus.png
+++ b/data/icons/hicolor_apps_32x32_nautilus.png
diff --git a/data/icons/32x32/apps/nautilus.svg b/data/icons/hicolor_apps_32x32_nautilus.svg
index 2bcf1371b..2bcf1371b 100644
--- a/data/icons/32x32/apps/nautilus.svg
+++ b/data/icons/hicolor_apps_32x32_nautilus.svg
diff --git a/data/icons/scalable/apps/nautilus.svg b/data/icons/hicolor_apps_scalable_nautilus.svg
index df00a0dcd..df00a0dcd 100644
--- a/data/icons/scalable/apps/nautilus.svg
+++ b/data/icons/hicolor_apps_scalable_nautilus.svg
diff --git a/data/icons/hicolor_emblems_16x16_emblem-note.png b/data/icons/hicolor_emblems_16x16_emblem-note.png
new file mode 100644
index 000000000..957a459bb
--- /dev/null
+++ b/data/icons/hicolor_emblems_16x16_emblem-note.png
diff --git a/data/icons/hicolor_emblems_24x24_emblem-note.png b/data/icons/hicolor_emblems_24x24_emblem-note.png
new file mode 100644
index 000000000..00cc47535
--- /dev/null
+++ b/data/icons/hicolor_emblems_24x24_emblem-note.png
diff --git a/data/icons/hicolor_emblems_48x48_emblem-note.png b/data/icons/hicolor_emblems_48x48_emblem-note.png
new file mode 100644
index 000000000..0221d59e5
--- /dev/null
+++ b/data/icons/hicolor_emblems_48x48_emblem-note.png
diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am
deleted file mode 100644
index ebbd1452f..000000000
--- a/data/icons/scalable/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = apps
diff --git a/data/icons/scalable/apps/Makefile.am b/data/icons/scalable/apps/Makefile.am
deleted file mode 100644
index 5c9fc07b2..000000000
--- a/data/icons/scalable/apps/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-NULL =
-themedir = $(datadir)/icons/hicolor
-size = scalable
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA =		\
-	nautilus.svg	\
-	$(NULL)
-
-EXTRA_DIST =		\
-	$(icons_DATA)