[chatzilla] Use an svg icon as source so that chatzilla icon looks better under gnome-shell

Hicham HAOUARI hicham at fedoraproject.org
Thu Mar 31 18:46:44 UTC 2011


commit c44031fa78ab9550af24818cd73bdea04cb1848b
Author: Hicham HAOUARI <hicham.haouari at gmail.com>
Date:   Thu Mar 31 18:46:27 2011 +0000

    Use an svg icon as source so that chatzilla icon looks better under gnome-shell

 chatzilla.spec |   32 ++++++---
 cz_logo.svg    |  208 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 230 insertions(+), 10 deletions(-)
---
diff --git a/chatzilla.spec b/chatzilla.spec
index fd04b26..35d8f73 100644
--- a/chatzilla.spec
+++ b/chatzilla.spec
@@ -4,7 +4,7 @@
 
 Name:           chatzilla
 Version:        0.9.86
-Release:        8.%{rev}hg%{?dist}
+Release:        9.%{rev}hg%{?dist}
 Summary:        Standalone Mozilla IRC Client, no browsers attached
 
 Group:          Applications/Internet
@@ -14,8 +14,10 @@ Source0:        http://hg.mozilla.org/chatzilla/archive/%{changeset}.tar.bz2
 Source1:        %{name}.schemas
 Source2:        %{name}.1
 Source3:        README
+Source4:        http://twpol.dyndns.org/temp/cz_logo.svg
 
 BuildRequires:  zip desktop-file-utils python
+BuildRequires:  ImageMagick
 Requires:       xulrunner hicolor-icon-theme
 
 BuildArch:      noarch
@@ -109,8 +111,21 @@ EOF
 chmod +x $RPM_BUILD_ROOT%{_bindir}/%{name}
 
 # Install Icons
-install -Dpm 644 xpi/resources/chatzilla-window16.xpm $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.xpm
-install -Dpm 644 xpi/resources/chatzilla-window.xpm $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.xpm
+install -Dpm 644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
+for i in 16 20 24 32 36 48 64 72 96 128 192 256; do
+    mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/apps
+    convert -background none %{SOURCE4} -resize ${i}x${i} \
+            $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}.png
+done
+pushd $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/chrome/icons/default
+    rm -f *
+    for i in 16 20 24 32 36 48 64 72 96 128 192 256; do
+        ln -sf ../../../../icons/hicolor/${i}x${i}/apps/%{name}.png \
+               chatzilla-window${i}.png
+        ln -sf ../../../../icons/hicolor/${i}x${i}/apps/%{name}.png \
+               default${i}.png
+    done
+popd
 
 # Install Desktop File
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -139,12 +154,6 @@ cat <<EOF >$RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/chrome.manifest
 manifest chrome/chrome.manifest
 EOF
 
-#Set cZ icons as default ones
-pushd $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/chrome/icons/default
-    ln -s chatzilla-window.xpm default.xpm
-    ln -s chatzilla-window16.xpm default16.xpm
-popd
-
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
@@ -181,7 +190,7 @@ fi
 %{_bindir}/%{name}
 %{_datadir}/%{name}-%{version}
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/hicolor/*/apps/%{name}.xpm
+%{_datadir}/icons/hicolor/*/apps/%{name}.*
 %{_datadir}/man/man1/%{name}.1.gz
 
 %files gnome
@@ -190,6 +199,9 @@ fi
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
+* Thu Mar 31 2011 Hicham HAOUARI <hicham.haouari at gmail.com> - 0.9.86-9.1292hg
+- Use an svg icon as source so that it looks better under gnome-shell
+
 * Mon Mar 07 2011 Hicham HAOUARI <hicham.haouari at gmail.com> - 0.9.86-8.1292hg
 - Use patches from bmo #605001
 - Remove BuildRoot and Clean sections.
diff --git a/cz_logo.svg b/cz_logo.svg
new file mode 100644
index 0000000..956a170
--- /dev/null
+++ b/cz_logo.svg
@@ -0,0 +1,208 @@
+<?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://web.resource.org/cc/"
+   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="2560"
+   height="2560"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="C:\Users\James\Documents\Mozilla.org\ChatZilla"
+   sodipodi:docname="Logo (cZ).svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="C:\Users\James\Documents\Mozilla.org\ChatZilla\Logo (cZ).png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.32851562"
+     inkscape:cx="1280"
+     inkscape:cy="1280"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer3"
+     width="2560px"
+     height="2560px"
+     showgrid="true"
+     gridspacingx="16px"
+     gridspacingy="16px"
+     gridempspacing="8"
+     inkscape:grid-points="true"
+     inkscape:window-width="909"
+     inkscape:window-height="1120"
+     inkscape:window-x="675"
+     inkscape:window-y="14" />
+  <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" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Guide (C)"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:none">
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#ebebeb;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path2575"
+       sodipodi:cx="1165.0532"
+       sodipodi:cy="1718.3562"
+       sodipodi:rx="553.30292"
+       sodipodi:ry="553.30292"
+       d="M 1718.3561 1718.3562 A 553.30292 553.30292 0 1 1  611.75031,1718.3562 A 553.30292 553.30292 0 1 1  1718.3561 1718.3562 z"
+       transform="matrix(1.0988556,0,0,1.0988555,-608.22529,-480.22519)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#d7d7d7;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path3572"
+       sodipodi:cx="1165.0532"
+       sodipodi:cy="1718.3562"
+       sodipodi:rx="553.30292"
+       sodipodi:ry="553.30292"
+       d="M 1718.3561 1718.3562 A 553.30292 553.30292 0 1 1  611.75031,1718.3562 A 553.30292 553.30292 0 1 1  1718.3561 1718.3562 z"
+       transform="matrix(0.4337588,0,0,0.4337588,166.64792,662.64787)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#c3c3c3;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path3574"
+       sodipodi:cx="1165.0532"
+       sodipodi:cy="1718.3562"
+       sodipodi:rx="553.30292"
+       sodipodi:ry="553.30292"
+       d="M 1718.3561 1718.3562 A 553.30292 553.30292 0 1 1  611.75031,1718.3562 A 553.30292 553.30292 0 1 1  1718.3561 1718.3562 z"
+       transform="matrix(0.3759244,0,0,0.375924,538.02814,1002.0288)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#c3c3c3;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path3576"
+       sodipodi:cx="1165.0532"
+       sodipodi:cy="1718.3562"
+       sodipodi:rx="553.30292"
+       sodipodi:ry="553.30292"
+       d="M 1718.3561 1718.3562 A 553.30292 553.30292 0 1 1  611.75031,1718.3562 A 553.30292 553.30292 0 1 1  1718.3561 1718.3562 z"
+       transform="matrix(0.433759,0,0,0.4337585,422.6478,390.64855)" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     inkscape:label="Guide (Z)"
+     style="display:none">
+    <rect
+       style="opacity:1;fill:#ebebeb;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:48;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+       id="rect3582"
+       width="1344"
+       height="1536"
+       x="1184"
+       y="512" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#d7d7d7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:48;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+       id="path3588"
+       sodipodi:cx="1672"
+       sodipodi:cy="816"
+       sodipodi:rx="136"
+       sodipodi:ry="112"
+       d="M 1808 816 A 136 112 0 1 1  1536,816 A 136 112 0 1 1  1808 816 z"
+       transform="matrix(1.0588235,0,0,1.2857142,613.6471,-361.14278)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#d7d7d7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:48;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+       id="path3590"
+       sodipodi:cx="1672"
+       sodipodi:cy="816"
+       sodipodi:rx="136"
+       sodipodi:ry="112"
+       d="M 1808 816 A 136 112 0 1 1  1536,816 A 136 112 0 1 1  1808 816 z"
+       transform="matrix(1.0588235,0,0,1.2857142,-282.35289,-361.1428)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#d7d7d7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:48;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+       id="path3592"
+       sodipodi:cx="1672"
+       sodipodi:cy="816"
+       sodipodi:rx="136"
+       sodipodi:ry="112"
+       d="M 1808 816 A 136 112 0 1 1  1536,816 A 136 112 0 1 1  1808 816 z"
+       transform="matrix(1.0588235,0,0,1.2857142,-378.35289,-73.1428)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#d7d7d7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:48;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+       id="path3594"
+       sodipodi:cx="1672"
+       sodipodi:cy="816"
+       sodipodi:rx="136"
+       sodipodi:ry="112"
+       d="M 1808 816 A 136 112 0 1 1  1536,816 A 136 112 0 1 1  1808 816 z"
+       transform="matrix(1.0588235,0,0,1.2857142,-378.35289,822.8572)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#d7d7d7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:48;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+       id="path3596"
+       sodipodi:cx="1672"
+       sodipodi:cy="816"
+       sodipodi:rx="136"
+       sodipodi:ry="112"
+       d="M 1808 816 A 136 112 0 1 1  1536,816 A 136 112 0 1 1  1808 816 z"
+       transform="matrix(1.0588235,0,0,1.2857142,517.6471,822.8572)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#d7d7d7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:48;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+       id="path3598"
+       sodipodi:cx="1672"
+       sodipodi:cy="816"
+       sodipodi:rx="136"
+       sodipodi:ry="112"
+       d="M 1808 816 A 136 112 0 1 1  1536,816 A 136 112 0 1 1  1808 816 z"
+       transform="matrix(1.0588235,0,0,1.2857142,613.6471,534.8572)" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="C"
+     style="display:inline">
+    <path
+       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#374552;stroke-width:100;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 592,1184 C 656,1168 704,1232 736,1280 C 768,1328 832,1376 944,1376 C 1056,1376 1168,1264 1168,1136 C 1168,976 944,800 672,800 C 336,800 64,1072 64,1408 C 64,1744 336,2016 672,2016 C 880,2016 1184,1872 1184,1648 C 1184,1536 1088,1440 976,1440 C 864,1440 816,1504 784,1568 C 752,1632 656,1648 592,1632 C 528,1616 432,1536 432,1408 C 432,1280 528,1200 592,1184 z "
+       id="path2569"
+       sodipodi:nodetypes="czzcczcczzzzz"
+       inkscape:export-xdpi="0.5625"
+       inkscape:export-ydpi="0.5625" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="Z"
+     style="display:inline">
+    <path
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#374552;stroke-width:100;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 1456,544 L 2352,544 C 2464,544 2528,672 2480,752 L 1760,1728 L 2016,1728 L 2256,1472 C 2336,1376 2544,1456 2496,1632 L 2384,1936 C 2352,2000 2304,2016 2256,2016 L 1360,2016 C 1248,2016 1184,1888 1232,1808 L 1952,832 L 1696,832 L 1456,1088 C 1376,1184 1168,1104 1216,928 L 1328,624 C 1360,560 1408,544 1456,544 z "
+       id="path2571"
+       sodipodi:nodetypes="ccccccccccccccccc"
+       inkscape:export-filename="C:\Users\James\Documents\Mozilla.org\ChatZilla\path2569.png"
+       inkscape:export-xdpi="0.5625"
+       inkscape:export-ydpi="0.5625" />
+  </g>
+</svg>


More information about the scm-commits mailing list