Remove icon install bits Add icons to SUBDIRS

2007-08-06  Rodney Dawes  <[email protected]>

	* Makefile.am: Remove icon install bits
	Add icons to SUBDIRS

	* configure.in: Create Makefiles for icons subdirectories

	* ghex.desktop.in: Use ghex as the Icon instead of gnome-ghex.png

	* gnome-ghex.png: Replaced with udpated style icons

	* icons: Add new icons subdir with icons and automake files
	New icon original from Matteo Drera <[email protected]>
	
	* src/main.c (main): Set the default window icon from the theme
	rather than a hardcoded path to the old gnome-ghex.png

	Fixes #405331


svn path=/trunk/; revision=1132

ChangeLog

@@ -1,3 +1,22 @@
+2007-08-06  Rodney Dawes  <[email protected]>
+
+	* Makefile.am: Remove icon install bits
+	Add icons to SUBDIRS
+
+	* configure.in: Create Makefiles for icons subdirectories
+
+	* ghex.desktop.in: Use ghex as the Icon instead of gnome-ghex.png
+
+	* gnome-ghex.png: Replaced with udpated style icons
+
+	* icons: Add new icons subdir with icons and automake files
+	New icon original from Matteo Drera <[email protected]>
+
+	* src/main.c (main): Set the default window icon from the theme
+	rather than a hardcoded path to the old gnome-ghex.png
+
+	Fixes #405331
+
 2007-08-03  Rodney Dawes  <[email protected]>
 
 	* ghex.spec: Remove from version control as it is autogenerated

Makefile.am

@@ -2,7 +2,7 @@
 
 #Remove macros intl directory from SUBDIRS -- SnM 
 
-SUBDIRS = po src help omf-install
+SUBDIRS = po src help icons omf-install
 
 schemadir = $(sysconfdir)/gconf/schemas
 schema_DATA = ghex2.schemas
@@ -19,8 +19,7 @@ EXTRA_DIST =			\
 	intltool-extract.in	\
 	intltool-merge.in	\
 	intltool-update.in	\
-	$(schema_DATA)		\
-	$(appicon_DATA)
+	$(schema_DATA)
 
 dist-hook: ghex.spec
 	cp ghex.spec $(distdir)
@@ -31,9 +30,6 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
 @INTLTOOL_DESKTOP_RULE@
 
-appicondir = $(datadir)/pixmaps
-appicon_DATA = gnome-ghex.png
-
 #Install the ghex2 schema file
 if GCONF_SCHEMAS_INSTALL
 install-data-local:

configure.in

@@ -101,6 +101,12 @@ help/sv/Makefile
 help/ko/Makefile
 help/zh_CN/Makefile
 help/zh_TW/Makefile
+icons/Makefile
+icons/16x16/Makefile
+icons/22x22/Makefile
+icons/24x24/Makefile
+icons/32x32/Makefile
+icons/48x48/Makefile
 omf-install/Makefile
 ghex.spec
 gtkhex.pc])

ghex.desktop.in

@@ -5,6 +5,6 @@ _Comment=GNOME Hexadecimal Editor
 Exec=ghex2 %F
 Terminal=false
 Type=Application
-Icon=gnome-ghex.png
+Icon=ghex
 Categories=GNOME;Application;Development;
 StartupNotify=true

icons/16x16/Makefile.am

@@ -0,0 +1,10 @@
+
+size = 16x16
+
+iconsdir = $(datadir)/icons/hicolor/$(size)/apps
+
+icons_DATA =		\
+	ghex.png
+
+EXTRA_DIST =		\
+	$(icons_DATA)