Adding Jimmac's multiple icon sizes for Linux.

diff --git a/Makefile.am b/Makefile.am
index 930bfa48bce93cd56a3c08e1df7c0358b9144be2..f07cf697990a270fe302944d432f2145fe9dc12e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,9 +4,6 @@ AUTOMAKE_OPTIONS = foreign
 
 SUBDIRS = src doc share po
 
-appicondir = $(datadir)/pixmaps
-appicon_DATA = inkscape.png
-
 Graphicsdir = $(datadir)/applications
 Graphics_in_files = inkscape.desktop.in
 Graphics_DATA = $(Graphics_in_files:.desktop.in=.desktop)

diff --git a/configure.ac b/configure.ac
index e34da61c5b0be609c20fddaef542ad56ca0e3d23..27e04548406bcbcbca2d0ee8ae0c7ac6dc2855f4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -968,6 +968,13 @@ share/filters/Makefile
 share/fonts/Makefile
 share/gradients/Makefile
 share/icons/Makefile
+share/icons/application/Makefile
+share/icons/application/16x16/Makefile
+share/icons/application/22x22/Makefile
+share/icons/application/24x24/Makefile
+share/icons/application/32x32/Makefile
+share/icons/application/48x48/Makefile
+share/icons/application/256x256/Makefile
 share/keys/Makefile
 share/markers/Makefile
 share/palettes/Makefile

diff --git a/share/icons/Makefile.am b/share/icons/Makefile.am
index e39174833ba753db09552c7c54c804d85e3784dc..d9d2aaefdb19f7165a691d7da24e84694ac25d49 100644 (file)
--- a/share/icons/Makefile.am
+++ b/share/icons/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = application
+
 iconsdir = $(datadir)/inkscape/icons
 
 pixmaps = \

diff --git a/share/icons/application/16x16/Makefile.am b/share/icons/application/16x16/Makefile.am
new file mode 100644 (file)
index 0000000..a87c2cb
--- /dev/null
+++ b/share/icons/application/16x16/Makefile.am
@@ -0,0 +1,5 @@
+icondir = $(datadir)/icons/hicolor/16x16/apps
+icon_DATA = inkscape.png
+
+EXTRA_DIST = $(icon_DATA)
+

diff --git a/share/icons/application/16x16/inkscape.png b/share/icons/application/16x16/inkscape.png
new file mode 100644 (file)
index 0000000..e4aed92
Binary files /dev/null and b/share/icons/application/16x16/inkscape.png differ

diff --git a/share/icons/application/22x22/Makefile.am b/share/icons/application/22x22/Makefile.am
new file mode 100644 (file)
index 0000000..8beeed3
--- /dev/null
+++ b/share/icons/application/22x22/Makefile.am
@@ -0,0 +1,5 @@
+icondir = $(datadir)/icons/hicolor/22x22/apps
+icon_DATA = inkscape.png
+
+EXTRA_DIST = $(icon_DATA)
+

diff --git a/share/icons/application/22x22/inkscape.png b/share/icons/application/22x22/inkscape.png
new file mode 100644 (file)
index 0000000..b1adda0
Binary files /dev/null and b/share/icons/application/22x22/inkscape.png differ

diff --git a/share/icons/application/24x24/Makefile.am b/share/icons/application/24x24/Makefile.am
new file mode 100644 (file)
index 0000000..8fc9b59
--- /dev/null
+++ b/share/icons/application/24x24/Makefile.am
@@ -0,0 +1,5 @@
+icondir = $(datadir)/icons/hicolor/24x24/apps
+icon_DATA = inkscape.png
+
+EXTRA_DIST = $(icon_DATA)
+

diff --git a/share/icons/application/24x24/inkscape.png b/share/icons/application/24x24/inkscape.png
new file mode 100644 (file)
index 0000000..4c2cded
Binary files /dev/null and b/share/icons/application/24x24/inkscape.png differ

diff --git a/share/icons/application/256x256/Makefile.am b/share/icons/application/256x256/Makefile.am
new file mode 100644 (file)
index 0000000..34969a4
--- /dev/null
+++ b/share/icons/application/256x256/Makefile.am
@@ -0,0 +1,5 @@
+icondir = $(datadir)/icons/hicolor/256x256/apps
+icon_DATA = inkscape.png
+
+EXTRA_DIST = $(icon_DATA)
+

diff --git a/share/icons/application/256x256/inkscape.png b/share/icons/application/256x256/inkscape.png
new file mode 100644 (file)
index 0000000..76e07fb
Binary files /dev/null and b/share/icons/application/256x256/inkscape.png differ

diff --git a/share/icons/application/32x32/Makefile.am b/share/icons/application/32x32/Makefile.am
new file mode 100644 (file)
index 0000000..cdccebd
--- /dev/null
+++ b/share/icons/application/32x32/Makefile.am
@@ -0,0 +1,5 @@
+icondir = $(datadir)/icons/hicolor/32x32/apps
+icon_DATA = inkscape.png
+
+EXTRA_DIST = $(icon_DATA)
+

diff --git a/share/icons/application/32x32/inkscape.png b/share/icons/application/32x32/inkscape.png
new file mode 100644 (file)
index 0000000..aa445e4
Binary files /dev/null and b/share/icons/application/32x32/inkscape.png differ

diff --git a/share/icons/application/48x48/Makefile.am b/share/icons/application/48x48/Makefile.am
new file mode 100644 (file)
index 0000000..ffa5c1a
--- /dev/null
+++ b/share/icons/application/48x48/Makefile.am
@@ -0,0 +1,5 @@
+icondir = $(datadir)/icons/hicolor/48x48/apps
+icon_DATA = inkscape.png
+
+EXTRA_DIST = $(icon_DATA)
+

diff --git a/share/icons/application/48x48/inkscape.png b/share/icons/application/48x48/inkscape.png
new file mode 100644 (file)
index 0000000..668acfd
Binary files /dev/null and b/share/icons/application/48x48/inkscape.png differ

diff --git a/share/icons/application/Makefile.am b/share/icons/application/Makefile.am
new file mode 100644 (file)
index 0000000..0e9bb7d
--- /dev/null
+++ b/share/icons/application/Makefile.am
@@ -0,0 +1,15 @@
+SUBDIRS = 16x16 22x22 24x24 32x32 48x48 256x256
+
+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