From: Josh Andler Date: Thu, 3 Dec 2009 01:45:27 +0000 (-0800) Subject: Adding Jimmac's multiple icon sizes for Linux. X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1229358ba8ff73a2e8d3b05b9e747620c876eae9;p=inkscape.git Adding Jimmac's multiple icon sizes for Linux. --- diff --git a/Makefile.am b/Makefile.am index 930bfa48b..f07cf6979 100644 --- 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 e34da61c5..27e045484 100644 --- 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 e39174833..d9d2aaefd 100644 --- 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 index 000000000..a87c2cbfa --- /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 index 000000000..e4aed9222 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 index 000000000..8beeed331 --- /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 index 000000000..b1adda08c 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 index 000000000..8fc9b59aa --- /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 index 000000000..4c2cded2c 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 index 000000000..34969a4a9 --- /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 index 000000000..76e07fb3d 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 index 000000000..cdccebd02 --- /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 index 000000000..aa445e4bc 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 index 000000000..ffa5c1a55 --- /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 index 000000000..668acfdef 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 index 000000000..0e9bb7d7d --- /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