alacarte r395 - in trunk: . data data/icons data/icons/svg po

[vuntz svn gnome org]

Author: vuntz
Date: Thu Sep 11 14:11:52 2008
New Revision: 395
URL: http://svn.gnome.org/viewvc/alacarte?rev=395&view=rev

Log:
2008-09-11  Vincent Untz  <vuntz gnome org>

	* Makefile.am:
	* alacarte.desktop.in.in:
	* alacarte.glade:
	* configure.ac:
	* data/Makefile.am:
	* data/icons/Makefile.am:
	* po/POTFILES.in:
	* po/POTFILES.skip:
	Create a data directory, and put data in there.
	Add all sizes for icons.
	Fix bug #549994
	Based on work by Michael Monreal <michael monreal gmx net>


Added:
   trunk/data/
   trunk/data/Makefile.am
   trunk/data/alacarte.desktop.in.in   (props changed)
      - copied unchanged from r393, /trunk/alacarte.desktop.in.in
   trunk/data/alacarte.glade   (props changed)
      - copied unchanged from r393, /trunk/alacarte.glade
   trunk/data/icons/
   trunk/data/icons/Makefile.am
   trunk/data/icons/hicolor_apps_16x16_alacarte.png   (contents, props changed)
   trunk/data/icons/hicolor_apps_22x22_alacarte.png   (contents, props changed)
   trunk/data/icons/hicolor_apps_24x24_alacarte.png   (contents, props changed)
   trunk/data/icons/hicolor_apps_256x256_alacarte.png   (contents, props changed)
   trunk/data/icons/hicolor_apps_32x32_alacarte.png   (contents, props changed)
   trunk/data/icons/hicolor_apps_48x48_alacarte.png   (contents, props changed)
   trunk/data/icons/svg/
   trunk/data/icons/svg/alacarte.svg   (contents, props changed)
Removed:
   trunk/alacarte.desktop.in.in
   trunk/alacarte.glade
   trunk/logo.svg
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.ac
   trunk/po/POTFILES.in
   trunk/po/POTFILES.skip

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Thu Sep 11 14:11:52 2008
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = po Alacarte
+SUBDIRS = data po Alacarte
 
 CLEANFILES=
 
@@ -12,14 +12,6 @@
 
 install-data-local:
 
- INTLTOOL_DESKTOP_RULE@
-
-desktopdir = $(datadir)/applications
-desktop_in_files = alacarte.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-EXTRA_DIST += $(desktop_in_files)
-CLEANFILES += $(desktop_DATA)
-
 alacarte: alacarte.in
 	sed -e s!\ PYTHON\@! PYTHON@!		\
 	    -e s!\ PYOPTIONS\@!-OOt!		\
@@ -27,26 +19,3 @@
 alacarte: Makefile
 
 EXTRA_DIST += alacarte.in
-
-pkgdata_DATA = alacarte.glade logo.svg
-EXTRA_DIST += $(pkgdata_DATA)
-
-icondir = $(datadir)/icons/hicolor/22x22/apps
-icon_DATA = alacarte.png
-EXTRA_DIST += $(icon_DATA)
-svgicondir = $(datadir)/icons/hicolor/scalable/apps
-svgicon_DATA = alacarte.svg
-EXTRA_DIST += $(svgicon_DATA)
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
-
-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

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Thu Sep 11 14:11:52 2008
@@ -54,7 +54,9 @@
         Makefile
         po/Makefile.in
         Alacarte/Makefile
-        alacarte.desktop.in
+        data/alacarte.desktop.in
+	data/Makefile
+	data/icons/Makefile
         ])
 
 AC_OUTPUT

Added: trunk/data/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/data/Makefile.am	Thu Sep 11 14:11:52 2008
@@ -0,0 +1,18 @@
+SUBDIRS = icons
+
+ INTLTOOL_DESKTOP_RULE@
+
+desktopdir = $(datadir)/applications
+desktop_in_files = alacarte.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+
+pkgdata_DATA = alacarte.glade
+
+CLEANFILES = $(desktop_DATA)
+
+EXTRA_DIST = $(pkgdata_DATA)
+
+install-data-hook: $(UPDATE_DESKTOP)
+
+uninstall-hook: $(UPDATE_DESKTOP)
+

Added: trunk/data/icons/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/data/icons/Makefile.am	Thu Sep 11 14:11:52 2008
@@ -0,0 +1,81 @@
+NULL =
+
+public_icons_themes = \
+	hicolor	\
+	$(NULL)
+
+public_icons = \
+	hicolor_apps_16x16_alacarte.png \
+	hicolor_apps_22x22_alacarte.png \
+	hicolor_apps_24x24_alacarte.png \
+	hicolor_apps_32x32_alacarte.png \
+	hicolor_apps_48x48_alacarte.png \
+	hicolor_apps_256x256_alacarte.png \
+	$(NULL)
+
+private_icons = \
+	$(NULL)
+
+noinst_DATA = \
+	$(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."; \
+		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:"; \
+		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

Added: trunk/data/icons/hicolor_apps_16x16_alacarte.png
==============================================================================
Binary file. No diff available.

Added: trunk/data/icons/hicolor_apps_22x22_alacarte.png
==============================================================================
Binary file. No diff available.

Added: trunk/data/icons/hicolor_apps_24x24_alacarte.png
==============================================================================
Binary file. No diff available.

Added: trunk/data/icons/hicolor_apps_256x256_alacarte.png
==============================================================================
Binary file. No diff available.

Added: trunk/data/icons/hicolor_apps_32x32_alacarte.png
==============================================================================
Binary file. No diff available.

Added: trunk/data/icons/hicolor_apps_48x48_alacarte.png
==============================================================================
Binary file. No diff available.

Added: trunk/data/icons/svg/alacarte.svg
==============================================================================
Binary file. No diff available.

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Thu Sep 11 14:11:52 2008
@@ -1,5 +1,5 @@
 [encoding: UTF-8]
 Alacarte/MainWindow.py
 Alacarte/MenuEditor.py
-alacarte.desktop.in.in
-alacarte.glade
+data/alacarte.desktop.in.in
+data/alacarte.glade

Modified: trunk/po/POTFILES.skip
==============================================================================
--- trunk/po/POTFILES.skip	(original)
+++ trunk/po/POTFILES.skip	Thu Sep 11 14:11:52 2008
@@ -1 +1 @@
-alacarte.desktop.in
+data/alacarte.desktop.in