[gnome-color-manager] Add a gnome-color-manager application icon

From: Richard Hughes <rhughes src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [gnome-color-manager] Add a gnome-color-manager application icon
Date: Sun, 1 Nov 2009 18:07:39 +0000 (UTC)
commit c9462dc9e5e7e5884138d3628cc4b4a1ad3f42c2
Author: Richard Hughes <richard hughsie com>
Date:   Sun Nov 1 18:06:46 2009 +0000

    Add a gnome-color-manager application icon

 configure.ac                                |    7 +
 contrib/gnome-color-manager.spec.in         |   15 ++-
 data/Makefile.am                            |    1 +
 data/gcm-import.desktop.in                  |    2 +-
 data/gcm-prefs.desktop.in                   |    2 +-
 data/icons/16x16/Makefile.am                |   14 ++
 data/icons/16x16/gnome-color-manager.png    |  Bin 0 -> 762 bytes
 data/icons/22x22/Makefile.am                |   14 ++
 data/icons/22x22/gnome-color-manager.png    |  Bin 0 -> 946 bytes
 data/icons/24x24/Makefile.am                |   14 ++
 data/icons/24x24/gnome-color-manager.png    |  Bin 0 -> 968 bytes
 data/icons/32x32/Makefile.am                |   14 ++
 data/icons/32x32/gnome-color-manager.png    |  Bin 0 -> 1397 bytes
 data/icons/48x48/Makefile.am                |   14 ++
 data/icons/48x48/gnome-color-manager.png    |  Bin 0 -> 2216 bytes
 data/icons/Makefile.am                      |   15 ++
 data/icons/scalable/Makefile.am             |   14 ++
 data/icons/scalable/gnome-color-manager.svg |  223 +++++++++++++++++++++++++++
 src/gcm-utils.h                             |    2 +-
 19 files changed, 344 insertions(+), 7 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f64ef43..fd31df2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -139,6 +139,13 @@ Makefile
 src/Makefile
 data/Makefile
 data/profiles/Makefile
+data/icons/Makefile
+data/icons/16x16/Makefile
+data/icons/22x22/Makefile
+data/icons/24x24/Makefile
+data/icons/32x32/Makefile
+data/icons/48x48/Makefile
+data/icons/scalable/Makefile
 po/Makefile.in
 ])
 
diff --git a/contrib/gnome-color-manager.spec.in b/contrib/gnome-color-manager.spec.in
index e644c15..9f195c7 100644
--- a/contrib/gnome-color-manager.spec.in
+++ b/contrib/gnome-color-manager.spec.in
@@ -20,6 +20,7 @@ Requires:  gnome-icon-theme
 Requires:  unique >= %{unique_version}
 Requires:  shared-mime-info
 Requires:  vte
+Requires:  argyllcms
 
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
@@ -39,7 +40,7 @@ gnome-color-manager provides a way to control ICC colour profiles.
 %setup -q
 
 %build
-%configure --disable-scrollkeeper
+%configure --disable-scrollkeeper --disable-schemas-install
 make %{?_smp_mflags}
 
 %install
@@ -54,7 +55,7 @@ for i in gcm-prefs gcm-import ; do
     $RPM_BUILD_ROOT%{_datadir}/applications/$i.desktop
 done
 
-#%find_lang %name --with-gnome
+%find_lang %name --with-gnome
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -86,11 +87,15 @@ if [ "$1" -eq 0 ]; then
 fi
 
 %postun
+scrollkeeper-update -q &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    gtk-update-icon-cache -q %{_datadir}/icons/hicolor &> /dev/null || :
+fi
 update-desktop-database %{_datadir}/applications &> /dev/null || :
 update-mime-database %{_datadir}/mime &> /dev/null || :
 
-%files
-# -f %{name}.lang
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README
 %{_bindir}/gcm-prefs
@@ -103,6 +108,8 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 #%{_datadir}/man/man1/*.1.gz
 #%{_datadir}/gnome/help/gnome-color-manager
 #%{_datadir}/omf/gnome-color-manager
+%{_datadir}/icons/hicolor/*/*/*.png
+%{_datadir}/icons/hicolor/scalable/*/*.svg*
 %config(noreplace) %{_sysconfdir}/gconf/schemas/*.schemas
 %{_datadir}/applications/gcm-prefs.desktop
 %{_datadir}/applications/gcm-import.desktop
diff --git a/data/Makefile.am b/data/Makefile.am
index 9d0eeb4..441ea99 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,4 +1,5 @@
 SUBDIRS = 						\
+	icons						\
 	profiles
 
 @INTLTOOL_SCHEMAS_RULE@
diff --git a/data/gcm-import.desktop.in b/data/gcm-import.desktop.in
index 30bc7b5..5e464d2 100644
--- a/data/gcm-import.desktop.in
+++ b/data/gcm-import.desktop.in
@@ -7,7 +7,7 @@ Categories=System;X-Red-Hat-Base;X-Fedora;
 Exec=/usr/bin/gcm-import %F
 Terminal=false
 Type=Application
-Icon=system-software-install
+Icon=gnome-color-manager
 StartupNotify=true
 NoDisplay=true
 MimeType=application/vnd.iccprofile;
diff --git a/data/gcm-prefs.desktop.in b/data/gcm-prefs.desktop.in
index 0facf8b..56e11ee 100644
--- a/data/gcm-prefs.desktop.in
+++ b/data/gcm-prefs.desktop.in
@@ -3,7 +3,7 @@ Encoding=UTF-8
 _Name=Color Profiles
 _GenericName=Color Profiles
 _Comment=Manage ICC color profiles
-Icon=video-display
+Icon=gnome-color-manager
 Exec=gcm-prefs
 Terminal=false
 Type=Application
diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am
new file mode 100644
index 0000000..905783e
--- /dev/null
+++ b/data/icons/16x16/Makefile.am
@@ -0,0 +1,14 @@
+themedir = $(datadir)/icons/hicolor
+size = 16x16
+context = apps
+
+iconsdir = $(themedir)/$(size)/$(context)
+
+icons_DATA = 			  	\
+	gnome-color-manager.png
+
+noinst_DATA = 
+
+EXTRA_DIST =		\
+	$(icons_DATA)	\
+	$(noinst_DATA)
diff --git a/data/icons/16x16/gnome-color-manager.png b/data/icons/16x16/gnome-color-manager.png
new file mode 100644
index 0000000..e3ff71c
Binary files /dev/null and b/data/icons/16x16/gnome-color-manager.png differ
diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am
new file mode 100644
index 0000000..2bb47da
--- /dev/null
+++ b/data/icons/22x22/Makefile.am
@@ -0,0 +1,14 @@
+themedir = $(datadir)/icons/hicolor
+size = 22x22
+context = apps
+
+iconsdir = $(themedir)/$(size)/$(context)
+
+icons_DATA = 			  	\
+	gnome-color-manager.png
+
+noinst_DATA = 
+
+EXTRA_DIST =		\
+	$(icons_DATA)	\
+	$(noinst_DATA)
diff --git a/data/icons/22x22/gnome-color-manager.png b/data/icons/22x22/gnome-color-manager.png
new file mode 100644
index 0000000..476eb70
Binary files /dev/null and b/data/icons/22x22/gnome-color-manager.png differ
diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am
new file mode 100644
index 0000000..3afafbe
--- /dev/null
+++ b/data/icons/24x24/Makefile.am
@@ -0,0 +1,14 @@
+themedir = $(datadir)/icons/hicolor
+size = 24x24
+context = apps
+
+iconsdir = $(themedir)/$(size)/$(context)
+
+icons_DATA = 			  	\
+	gnome-color-manager.png
+
+noinst_DATA = 
+
+EXTRA_DIST =		\
+	$(icons_DATA)	\
+	$(noinst_DATA)
diff --git a/data/icons/24x24/gnome-color-manager.png b/data/icons/24x24/gnome-color-manager.png
new file mode 100644
index 0000000..842bd98
Binary files /dev/null and b/data/icons/24x24/gnome-color-manager.png differ
diff --git a/data/icons/32x32/Makefile.am b/data/icons/32x32/Makefile.am
new file mode 100644
index 0000000..e75f08b
--- /dev/null
+++ b/data/icons/32x32/Makefile.am
@@ -0,0 +1,14 @@
+themedir = $(datadir)/icons/hicolor
+size = 32x32
+context = apps
+
+iconsdir = $(themedir)/$(size)/$(context)
+
+icons_DATA = 			  	\
+	gnome-color-manager.png
+
+noinst_DATA = 
+
+EXTRA_DIST =		\
+	$(icons_DATA)	\
+	$(noinst_DATA)
diff --git a/data/icons/32x32/gnome-color-manager.png b/data/icons/32x32/gnome-color-manager.png
new file mode 100644
index 0000000..12a9a50
Binary files /dev/null and b/data/icons/32x32/gnome-color-manager.png differ
diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am
new file mode 100644
index 0000000..2f1da00
--- /dev/null
+++ b/data/icons/48x48/Makefile.am
@@ -0,0 +1,14 @@
+themedir = $(datadir)/icons/hicolor
+size = 48x48
+context = apps
+
+iconsdir = $(themedir)/$(size)/$(context)
+
+icons_DATA = 			  	\
+	gnome-color-manager.png
+
+noinst_DATA = 
+
+EXTRA_DIST =		\
+	$(icons_DATA)	\
+	$(noinst_DATA)
diff --git a/data/icons/48x48/gnome-color-manager.png b/data/icons/48x48/gnome-color-manager.png
new file mode 100644
index 0000000..712528f
Binary files /dev/null and b/data/icons/48x48/gnome-color-manager.png differ
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
new file mode 100644
index 0000000..17dca13
--- /dev/null
+++ b/data/icons/Makefile.am
@@ -0,0 +1,15 @@
+SUBDIRS = scalable 16x16 22x22 24x24 32x32 48x48
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(pkgdatadir)/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
+
diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am
new file mode 100644
index 0000000..f5bd8d1
--- /dev/null
+++ b/data/icons/scalable/Makefile.am
@@ -0,0 +1,14 @@
+themedir = $(datadir)/icons/hicolor
+size = scalable
+context = apps
+
+iconsdir = $(themedir)/$(size)/$(context)
+
+icons_DATA = 			  	\
+	gnome-color-manager.svg
+
+noinst_DATA = 
+
+EXTRA_DIST =		\
+	$(icons_DATA)	\
+	$(noinst_DATA)
diff --git a/data/icons/scalable/gnome-color-manager.svg b/data/icons/scalable/gnome-color-manager.svg
new file mode 100644
index 0000000..34d6faa
--- /dev/null
+++ b/data/icons/scalable/gnome-color-manager.svg
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   width="744.09448819"
+   height="1052.3622047"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.46+devel"
+   sodipodi:docname="gnome-color-manager.svg"
+   inkscape:export-filename="/home/hughsie/Code/gnome-color-manager/data/icons/22x22/gnome-color-manager.png"
+   inkscape:export-xdpi="6.1111107"
+   inkscape:export-ydpi="6.1111107">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+    <inkscape:perspective
+       id="perspective2824"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective2848"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective2870"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective2892"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective2914"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective2914-7"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective2914-76"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective2954"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective2980"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.7"
+     inkscape:cx="54.892679"
+     inkscape:cy="427.46635"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     objecttolerance="20"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     gridtolerance="1"
+     inkscape:window-width="1680"
+     inkscape:window-height="976"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2830"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       sodipodi:type="arc"
+       id="path2838"
+       sodipodi:cx="675"
+       sodipodi:cy="477.36218"
+       sodipodi:rx="115"
+       sodipodi:ry="115"
+       d="m 790,477.36218 a 115,115 0 0 1 -57.5,99.59293 L 675,477.36218 z"
+       sodipodi:start="0"
+       sodipodi:end="1.0471976"
+       transform="matrix(1.3913045,0,0,1.3913045,-569.13054,149.64195)"
+       style="fill:#c83737" />
+    <path
+       sodipodi:type="arc"
+       id="path2838-3"
+       sodipodi:cx="675"
+       sodipodi:cy="477.36218"
+       sodipodi:rx="115"
+       sodipodi:ry="115"
+       d="m 732.5,576.95511 a 115,115 0 0 1 -115,-10e-6 L 675,477.36218 z"
+       sodipodi:start="1.0471976"
+       sodipodi:end="2.0943951"
+       transform="matrix(1.3913045,0,0,1.3913045,-569.13054,149.64195)"
+       style="fill:#00369d;fill-opacity:1" />
+    <path
+       sodipodi:type="arc"
+       id="path2838-3-8"
+       sodipodi:cx="675"
+       sodipodi:cy="477.36218"
+       sodipodi:rx="115"
+       sodipodi:ry="115"
+       d="M 617.5,576.9551 A 115,115 0 0 1 560,477.36218 l 115,0 z"
+       transform="matrix(1.3913045,0,0,1.3913045,-569.13053,149.64195)"
+       sodipodi:start="2.0943951"
+       sodipodi:end="3.1415927"
+       style="fill:#008ad4;fill-opacity:1" />
+    <path
+       sodipodi:type="arc"
+       id="path2838-3-8-0"
+       sodipodi:cx="675"
+       sodipodi:cy="477.36218"
+       sodipodi:rx="115"
+       sodipodi:ry="115"
+       d="m 560,477.36218 a 115,115 0 0 1 57.5,-99.59292 l 57.5,99.59292 z"
+       sodipodi:start="3.1415927"
+       sodipodi:end="4.1887902"
+       transform="matrix(1.3913045,0,0,1.3913045,-569.32705,149.90517)"
+       style="fill:#00aa21;fill-opacity:1" />
+    <path
+       sodipodi:type="arc"
+       id="path2838-3-8-7"
+       sodipodi:cx="675"
+       sodipodi:cy="477.36218"
+       sodipodi:rx="115"
+       sodipodi:ry="115"
+       d="m 617.5,377.76926 a 115,115 0 0 1 115,0 L 675,477.36218 z"
+       sodipodi:start="4.1887902"
+       sodipodi:end="5.2359878"
+       transform="matrix(1.3913045,0,0,1.3913045,-569.13053,150.17687)"
+       style="fill:#ffff00" />
+    <path
+       sodipodi:type="arc"
+       id="path2838-3-8-7-8"
+       sodipodi:cx="675"
+       sodipodi:cy="477.36218"
+       sodipodi:rx="115"
+       sodipodi:ry="115"
+       d="m 732.5,377.76926 a 115,115 0 0 1 57.5,99.59292 l -115,0 z"
+       sodipodi:start="5.2359878"
+       sodipodi:end="6.2831853"
+       transform="matrix(1.3913045,0,0,1.3913045,-569.13055,149.64729)"
+       style="fill:#ff7f2a" />
+    <path
+       sodipodi:type="arc"
+       id="path2838-3-8-9"
+       sodipodi:cx="675"
+       sodipodi:cy="477.36218"
+       sodipodi:rx="115"
+       sodipodi:ry="115"
+       d="m 790,477.36218 a 115,115 0 1 1 -230,0 115,115 0 1 1 230,0 z"
+       transform="matrix(1.3913045,0,0,1.3913045,-569.13053,149.64195)"
+       style="fill:none;stroke:#000000;stroke-opacity:1;stroke-width:2.87499969000000011;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round;opacity:0.45013245" />
+  </g>
+</svg>
diff --git a/src/gcm-utils.h b/src/gcm-utils.h
index 86151fa..bc81bb2 100644
--- a/src/gcm-utils.h
+++ b/src/gcm-utils.h
@@ -31,7 +31,7 @@
 
 #include "gcm-clut.h"
 
-#define GCM_STOCK_ICON		"video-display"
+#define GCM_STOCK_ICON		"gnome-color-manager"
 #define GCM_PROFILE_PATH	"/.color/icc"
 
 gchar		*gcm_utils_get_output_name		(GnomeRROutput		*output);
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]