Move the icons geany.png and geany.ico into the icons directory.

Add a 16x16 pixel Geany icon and the scalable SVG icon.
Drop the pixmaps directory.

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3816 ea778897-0a13-0410-b9d1-a72fbfd435f5

ChangeLog

@@ -5,6 +5,15 @@
  * src/project.c:
    Fix wrong initialisation of the default project path button callback
    in the preferences dialog.
+ * Makefile.am, configure.in, geany.nsi, geany.spec.in, wscript,
+   geany_private.rc, icons/16x16/Makefile.am, icons/16x16/geany.png,
+   icons/48x48, icons/48x48/Makefile.am, icons/48x48/geany.png,
+   icons/Makefile.am, icons/geany.ico, icons/scalable,
+   icons/scalable/Makefile.am, icons/scalable/geany.svg,
+   src/makefile.win32:
+   Move the icons geany.png and geany.ico into the icons directory.
+   Add a 16x16 pixel Geany icon and the scalable SVG icon.
+   Drop the pixmaps directory.
 
 
 2009-05-22  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Makefile.am

@@ -52,15 +52,9 @@ DISTCLEANFILES = \
 
 uninstall-local:
 	rm -rf $(DESTDIR)$(pkgdatadir);
-	rm -f $(DESTDIR)$(datadir)/pixmaps/geany.png;
-	rm -f $(DESTDIR)$(datadir)/pixmaps/geany.ico;
 
 install-data-local:
 	@$(NORMAL_INSTALL)
-	if test -d $(srcdir)/pixmaps; then \
-	  $(mkinstalldirs) $(DESTDIR)$(datadir)/pixmaps; \
-	  $(INSTALL_DATA) $(srcdir)/pixmaps/geany.png $(DESTDIR)$(datadir)/pixmaps; \
-	fi
 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir); \
 	$(INSTALL_DATA) $(srcdir)/data/c99.tags $(DESTDIR)$(pkgdatadir); \
 	$(INSTALL_DATA) $(srcdir)/data/php.tags $(DESTDIR)$(pkgdatadir); \
@@ -75,15 +69,6 @@ install-data-local:
 	  fi \
 	done
 
-dist-hook:
-	if test -d pixmaps; then \
-	  mkdir $(distdir)/pixmaps; \
-	  for pixmap in $(srcdir)/pixmaps/*; do \
-	    if test -f $$pixmap; then \
-	      cp -p $$pixmap $(distdir)/pixmaps; \
-	    fi \
-	  done \
-	fi
 
 BZIP2_ENV =--best
 
@@ -105,8 +90,6 @@ rpm: dist
 	rpmbuild -ta $(distdir).tar.gz
 
 
-logodir = $(datadir)/pixmaps
-
 pkgconfig_DATA = geany.pc
 pkgconfigdir = $(libdir)/pkgconfig
 

configure.in

@@ -259,8 +259,6 @@ if test -z "${docdir}"; then
 	AC_SUBST(docdir)
 fi
 
-GEANY_PIXMAPS_DIR=`eval echo ${datarootdir}/pixmaps`
-AC_SUBST(GEANY_PIXMAPS_DIR)
 GEANY_DATA_DIR=`eval echo ${datarootdir}/geany`
 AC_SUBST(GEANY_DATA_DIR)
 
@@ -274,6 +272,8 @@ AC_OUTPUT([
 Makefile
 icons/Makefile
 icons/16x16/Makefile
+icons/48x48/Makefile
+icons/scalable/Makefile
 tagmanager/Makefile
 tagmanager/include/Makefile
 scintilla/Makefile

geany.nsi

@@ -78,7 +78,7 @@ Var UNINSTDIR
 !include "MUI2.nsh"
 
 !define MUI_ABORTWARNING
-!define MUI_ICON "pixmaps\geany.ico"
+!define MUI_ICON "icons\geany.ico"
 !define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall-full.ico"
 
 ; Welcome page

geany.spec.in

@@ -62,7 +62,7 @@ Some basic features of Geany:
 %{_datadir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/locale/*/LC_MESSAGES/%{name}.mo
-%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/icons/48x48/%{name}.png
 %{_datadir}/doc/%{name}/
 %{_mandir}/man1/%{name}.1.gz
 %{_datadir}/icons/hicolor/16x16/apps/classviewer-*.png

geany_private.rc

@@ -2,7 +2,7 @@
 #include <windows.h> // include for version info constants
 
 
-A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../pixmaps/geany.ico"
+A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../icons/geany.ico"
 
 1 VERSIONINFO
 FILEVERSION 0,18,0,0

icons/16x16/Makefile.am

@@ -1,13 +1,14 @@
 iconsdir = $(datadir)/icons/hicolor/16x16/apps
-icons_DATA =  	                                    			\
+
+icons_DATA =									\
 	classviewer-class.png						\
 	classviewer-macro.png						\
 	classviewer-member.png						\
 	classviewer-method.png						\
 	classviewer-namespace.png					\
 	classviewer-other.png						\
 	classviewer-struct.png						\
-	classviewer-var.png						
-		
-EXTRA_DIST = 								\
-	$(icons_DATA)
+	classviewer-var.png							\
+	geany.png
+
+EXTRA_DIST = $(icons_DATA)

icons/48x48/Makefile.am

@@ -0,0 +1,4 @@
+iconsdir = $(datadir)/icons/hicolor/48x48/apps
+icons_DATA = geany.png
+
+EXTRA_DIST = $(icons_DATA)

icons/Makefile.am

@@ -1,5 +1,4 @@
-SUBDIRS = 								\
-	16x16
+SUBDIRS =  16x16 48x48 scalable
 
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 

icons/scalable/Makefile.am

@@ -0,0 +1,4 @@
+iconsdir = $(datadir)/icons/hicolor/scalable/apps
+icons_DATA = geany.svg
+
+EXTRA_DIST = $(icons_DATA)