Replace images embedded in the sources with proper themable icons

Additionally, provide SVG versions of the icons as well as them
rendered at the various icons sizes.

configure.ac

@@ -102,8 +102,16 @@ AC_CONFIG_FILES([
 		Makefile
 		icons/Makefile
 		icons/16x16/Makefile
+		icons/24x24/Makefile
+		icons/32x32/Makefile
 		icons/48x48/Makefile
 		icons/scalable/Makefile
+		icons/tango/Makefile
+		icons/tango/16x16/Makefile
+		icons/tango/24x24/Makefile
+		icons/tango/32x32/Makefile
+		icons/tango/48x48/Makefile
+		icons/tango/scalable/Makefile
 		tagmanager/Makefile
 		tagmanager/ctags/Makefile
 		tagmanager/mio/Makefile

data/geany.glade

@@ -3,6 +3,13 @@
   <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy project-wide -->
   <object class="GtkAccelGroup" id="accelgroup1"/>
+  <object class="GtkIconFactory" id="iconfactory1">
+    <sources>
+      <source stock-id="geany-build" icon-name="geany-build"/>
+      <source stock-id="geany-close-all" icon-name="geany-close-all"/>
+      <source stock-id="geany-save-all" icon-name="geany-save-all"/>
+    </sources>
+  </object>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">3</property>
     <property name="upper">1000</property>
@@ -467,7 +474,7 @@
   <object class="GtkImage" id="image4061">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="stock">gtk-close</property>
+    <property name="stock">geany-close-all</property>
     <property name="icon-size">1</property>
   </object>
   <object class="GtkImage" id="image4062">
@@ -671,7 +678,7 @@
   <object class="GtkImage" id="image4057">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="stock">gtk-save</property>
+    <property name="stock">geany-save-all</property>
     <property name="icon-size">1</property>
   </object>
   <object class="GtkImage" id="image4058">

icons/16x16/Makefile.am

@@ -1,6 +1,8 @@
-iconsdir = $(datadir)/icons/hicolor/16x16/apps
+iconsdir = $(datadir)/icons/hicolor/16x16
+icons_appsdir = $(iconsdir)/apps
+icons_actionsdir = $(iconsdir)/actions
 
-icons_DATA =									\
+dist_icons_apps_DATA =							\
 	classviewer-class.png						\
 	classviewer-macro.png						\
 	classviewer-member.png						\
@@ -11,6 +13,11 @@ icons_DATA =									\
 	classviewer-var.png							\
 	geany.png
 
-EXTRA_DIST = $(icons_DATA) \
+dist_icons_actions_DATA =						\
+	geany-build.png								\
+	geany-close-all.png							\
+	geany-save-all.png
+
+dist_noinst_DATA = \
 	classviewer-var.xpm \
 	classviewer-method.xpm

icons/24x24/Makefile.am

@@ -0,0 +1,6 @@
+icons_actionsdir = $(datadir)/icons/hicolor/24x24/actions
+
+dist_icons_actions_DATA =	\
+	geany-build.png			\
+	geany-close-all.png		\
+	geany-save-all.png

icons/32x32/Makefile.am

@@ -0,0 +1,6 @@
+icons_actionsdir = $(datadir)/icons/hicolor/32x32/actions
+
+dist_icons_actions_DATA =	\
+	geany-build.png			\
+	geany-close-all.png		\
+	geany-save-all.png

icons/48x48/Makefile.am

@@ -1,4 +1,11 @@
-iconsdir = $(datadir)/icons/hicolor/48x48/apps
-icons_DATA = geany.png
+iconsdir = $(datadir)/icons/hicolor/48x48
+icons_appsdir = $(iconsdir)/apps
+icons_actionsdir = $(iconsdir)/actions
 
-EXTRA_DIST = $(icons_DATA)
+dist_icons_apps_DATA =		\
+	geany.png
+
+dist_icons_actions_DATA =	\
+	geany-build.png			\
+	geany-close-all.png		\
+	geany-save-all.png

icons/Makefile.am

@@ -1,20 +1,23 @@
-SUBDIRS =  16x16 48x48 scalable
+SUBDIRS =  16x16 24x24 32x32 48x48 scalable tango
 
 EXTRA_DIST = geany.ico
 
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+gtk_update_icon_cache = gtk-update-icon-cache -f -t
 
 install-data-hook:
 	@-if test -z "$(DESTDIR)"; then					\
 		echo "Updating Gtk icon cache.";			\
-		$(gtk_update_icon_cache);				\
+		$(gtk_update_icon_cache) "$(datadir)/icons/hicolor";	\
+		$(gtk_update_icon_cache) "$(datadir)/icons/Tango"; \
 	else								\
 		echo "*** Icon cache not updated. Remember to run:";	\
 		echo "***";						\
-		echo "***   $(gtk_update_icon_cache)";			\
+		echo "***   $(gtk_update_icon_cache) '$(datadir)/icons/hicolor'";\
+		echo "***   $(gtk_update_icon_cache) '$(datadir)/icons/Tango'";\
 		echo "***";						\
 	fi
 
 uninstall-local:
-	rm -f $(DESTDIR)$(datadir)/icons/hicolor/icon-theme.cache;
+	rm -f $(DESTDIR)$(datadir)/icons/hicolor/icon-theme.cache
+	rm -f $(DESTDIR)$(datadir)/icons/Tango/icon-theme.cache
 

icons/scalable/Makefile.am

@@ -1,4 +1,11 @@
-iconsdir = $(datadir)/icons/hicolor/scalable/apps
-icons_DATA = geany.svg
+iconsdir = $(datadir)/icons/hicolor/scalable
+icons_appsdir = $(iconsdir)/apps
+icons_actionsdir = $(iconsdir)/actions
 
-EXTRA_DIST = $(icons_DATA)
+dist_icons_apps_DATA =		\
+	geany.svg
+
+dist_icons_actions_DATA =	\
+	geany-build.svg			\
+	geany-close-all.svg		\
+	geany-save-all.svg