Updating branch refs/heads/master to 03876d5c64dcae169c7dbecb6557d46f59f0cfe8 (commit) from c195a87ee320bb3c75380d02e749669817e3241f (commit)
commit 03876d5c64dcae169c7dbecb6557d46f59f0cfe8 Author: Christian Dywan <christ...@twotoasts.de> Date: Thu Feb 24 22:51:52 2011 +0100 Ship and install internet-mail icon data/internet-mail.svg | 412 ++++++++++++++++++++++++++++++++++++++++++++++++ icons/wscript_build | 44 ----- wscript | 10 +- 3 files changed, 415 insertions(+), 51 deletions(-) diff --git a/data/internet-mail.svg b/data/internet-mail.svg new file mode 100644 index 0000000..20fc8ed --- /dev/null +++ b/data/internet-mail.svg @@ -0,0 +1,412 @@ +<?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:xlink="http://www.w3.org/1999/xlink" + version="1.1" + width="48" + height="48" + id="svg4555"> + <metadata + id="metadata82"> + <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> + <defs + id="defs4557"> + <linearGradient + id="linearGradient8265-821-176-38-919-66-249-7-7"> + <stop + id="stop2687-1-9" + style="stop-color:#ffffff;stop-opacity:1" + offset="0" /> + <stop + id="stop2689-5-4" + style="stop-color:#ffffff;stop-opacity:0" + offset="1" /> + </linearGradient> + <linearGradient + id="linearGradient3333-4-4"> + <stop + id="stop3335-4-6" + style="stop-color:#ffffff;stop-opacity:1" + offset="0" /> + <stop + id="stop3337-7-2" + style="stop-color:#ffffff;stop-opacity:0" + offset="1" /> + </linearGradient> + <linearGradient + id="linearGradient3495"> + <stop + id="stop3497" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3874" + style="stop-color:#000000;stop-opacity:0.49803922" + offset="0.5" /> + <stop + id="stop3499" + style="stop-color:#000000;stop-opacity:0" + offset="1" /> + </linearGradient> + <linearGradient + id="linearGradient3333-4"> + <stop + id="stop3335-4" + style="stop-color:#ffffff;stop-opacity:1" + offset="0" /> + <stop + id="stop3337-7" + style="stop-color:#ffffff;stop-opacity:0" + offset="1" /> + </linearGradient> + <linearGradient + id="linearGradient3866"> + <stop + id="stop3868" + style="stop-color:#828282;stop-opacity:1" + offset="0" /> + <stop + id="stop3872" + style="stop-color:#8f8f8f;stop-opacity:0.63478261" + offset="0.5" /> + <stop + id="stop3870" + style="stop-color:#9d9d9d;stop-opacity:0" + offset="1" /> + </linearGradient> + <linearGradient + id="linearGradient3242-967-12-570-862-307"> + <stop + id="stop4498" + style="stop-color:#ffffff;stop-opacity:1" + offset="0" /> + <stop + id="stop4502" + style="stop-color:#d7d7d7;stop-opacity:1" + offset="0.87426931" /> + <stop + id="stop4504" + style="stop-color:#999999;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + id="linearGradient2490-495-150-777"> + <stop + id="stop4108" + style="stop-color:#787878;stop-opacity:1" + offset="0" /> + <stop + id="stop4110" + style="stop-color:#b4b4b4;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + x1="302.85715" + y1="366.64789" + x2="302.85715" + y2="609.50507" + id="linearGradient3021" + xlink:href="#linearGradient5048-7-0" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.06553443,0,0,0.02470588,-69.188394,10.577352)" /> + <linearGradient + id="linearGradient5048-7-0"> + <stop + id="stop5050-5-3" + style="stop-color:#000000;stop-opacity:0" + offset="0" /> + <stop + id="stop5056-9-0" + style="stop-color:#000000;stop-opacity:1" + offset="0.5" /> + <stop + id="stop5052-6-4" + style="stop-color:#000000;stop-opacity:0" + offset="1" /> + </linearGradient> + <radialGradient + cx="605.71429" + cy="486.64789" + r="117.14286" + fx="605.71429" + fy="486.64789" + id="radialGradient3023" + xlink:href="#linearGradient5060-6-8" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.06553443,0,0,0.02470588,-69.175497,10.577352)" /> + <linearGradient + id="linearGradient5060-6-8"> + <stop + id="stop5062-3-4" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop5064-1-8" + style="stop-color:#000000;stop-opacity:0" + offset="1" /> + </linearGradient> + <radialGradient + cx="605.71429" + cy="486.64789" + r="117.14286" + fx="605.71429" + fy="486.64789" + id="radialGradient4553" + xlink:href="#linearGradient5060-6-8" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-0.06553443,0,0,0.02470588,-21.829255,10.577352)" /> + <linearGradient + x1="16.626165" + y1="15.298182" + x2="20.054544" + y2="24.627615" + id="linearGradient2891" + xlink:href="#linearGradient8265-821-176-38-919-66-249-7-7" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.9986003,0,0,1.0843613,-0.0131199,3.8058986)" /> + <linearGradient + x1="25.525208" + y1="30.188753" + x2="25.525208" + y2="15.737678" + id="linearGradient2894" + xlink:href="#linearGradient3333-4-4" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-8.8168783e-8,-4.0466448)" + spreadMethod="reflect" /> + <linearGradient + x1="23.903786" + y1="35.75" + x2="23.903786" + y2="20.443331" + id="linearGradient2897" + xlink:href="#linearGradient3495" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.9980111,0,0,1.0672078,0.14375595,-3.0333278)" /> + <linearGradient + x1="25.525208" + y1="30.188753" + x2="25.525208" + y2="15.737678" + id="linearGradient2900" + xlink:href="#linearGradient3333-4" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-8.8168783e-8,-1.3324578)" + spreadMethod="reflect" /> + <linearGradient + x1="25.525208" + y1="30.188753" + x2="25.525208" + y2="15.737678" + id="linearGradient2903" + xlink:href="#linearGradient3866" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-8.8168783e-8,-2.6324578)" + spreadMethod="reflect" /> + <linearGradient + x1="25.57654" + y1="15.000002" + x2="25.57654" + y2="44.00053" + id="linearGradient2911" + xlink:href="#linearGradient3333-4" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.9999999,0,0,1.1071427,9.1183122e-7,-5.6607238)" /> + <linearGradient + x1="20.052792" + y1="8.163353" + x2="20.052792" + y2="48.072277" + id="linearGradient2919" + xlink:href="#linearGradient3242-967-12-570-862-307" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,-0.99999982)" /> + <linearGradient + x1="28.103424" + y1="45.000065" + x2="28.103424" + y2="14.038458" + id="linearGradient2921" + xlink:href="#linearGradient2490-495-150-777" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.9999999,0,0,1.1014118,-8.8168783e-8,-5.5128098)" /> + <linearGradient + x1="20.052792" + y1="8.163353" + x2="20.052792" + y2="48.072277" + id="linearGradient2906-8" + xlink:href="#linearGradient3242-6-9-7" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(1.2624171e-6,-1.0000028)" /> + <linearGradient + id="linearGradient3242-6-9-7"> + <stop + id="stop3244-6-4-2" + style="stop-color:#f89b7e;stop-opacity:1" + offset="0" /> + <stop + id="stop3246-6-8-8" + style="stop-color:#e35d4f;stop-opacity:1" + offset="0.11961333" /> + <stop + id="stop3248-0-9-2" + style="stop-color:#c6262e;stop-opacity:1" + offset="0.81107038" /> + <stop + id="stop3250-9-0-9" + style="stop-color:#690b2c;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + x1="28.103424" + y1="45.000065" + x2="28.103424" + y2="14.038458" + id="linearGradient2908-9" + xlink:href="#linearGradient2490-5-8-6" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.9999999,0,0,1.1014118,2.6241716e-7,-5.5128128)" /> + <linearGradient + id="linearGradient2490-5-8-6"> + <stop + id="stop2492-8-2-0" + style="stop-color:#791235;stop-opacity:1" + offset="0" /> + <stop + id="stop2494-7-2-2" + style="stop-color:#dd3b27;stop-opacity:1" + offset="1" /> + </linearGradient> + <radialGradient + cx="23.895569" + cy="17.529579" + r="20.397499" + fx="23.895569" + fy="17.529579" + id="radialGradient2914-3" + xlink:href="#linearGradient3242-187-536-5-1" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0,1.9355077,-3.0194057,0,76.92218,-36.993597)" /> + <linearGradient + id="linearGradient3242-187-536-5-1"> + <stop + id="stop2778-7-4" + style="stop-color:#8badea;stop-opacity:1" + offset="0" /> + <stop + id="stop2780-6-6" + style="stop-color:#6396cd;stop-opacity:1" + offset="0.26238" /> + <stop + id="stop2782-9-9" + style="stop-color:#3b7caf;stop-opacity:1" + offset="0.66093999" /> + <stop + id="stop2784-5-4" + style="stop-color:#194c70;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + x1="18.379412" + y1="44.980297" + x2="18.379412" + y2="3.0816143" + id="linearGradient2916-2" + xlink:href="#linearGradient2490-182-124-1-2" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.9584364,0,0,0.81097023,41.872268,7.5367172)" /> + <linearGradient + id="linearGradient2490-182-124-1-2"> + <stop + id="stop2788-5-6" + style="stop-color:#1f4b6a;stop-opacity:1" + offset="0" /> + <stop + id="stop2790-5-4" + style="stop-color:#4083c2;stop-opacity:1" + offset="1" /> + </linearGradient> + </defs> + <g + transform="matrix(1.0008068,0,0,1.0008068,69.539093,20.343603)" + id="g3511-3" + style="stroke-width:1.03041875;stroke-miterlimit:4;stroke-dasharray:none"> + <rect + width="31.643764" + height="6.0000005" + x="-61.324265" + y="19.635714" + id="rect2512-1" + style="opacity:0.40206185;fill:url(#linearGradient3021);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.03041875;marker:none;visibility:visible;display:inline;overflow:visible" /> + <path + d="m -29.680498,19.635919 c 0,0 0,5.999669 0,5.999669 3.374861,0.01129 8.158771,-1.344221 8.158769,-3.000221 0,-1.655999 -3.76609,-2.999448 -8.158769,-2.999448 z" + id="path2514-7" + style="opacity:0.40206185;fill:url(#radialGradient3023);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.03041875;marker:none;visibility:visible;display:inline;overflow:visible" /> + <path + d="m -61.324263,19.635919 c 0,0 0,5.999669 0,5.999669 -3.374861,0.01129 -8.158771,-1.344221 -8.158771,-3.000221 0,-1.655999 3.766091,-2.999448 8.158771,-2.999448 z" + id="path2516-5" + style="opacity:0.40206185;fill:url(#radialGradient4553);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.03041875;marker:none;visibility:visible;display:inline;overflow:visible" /> + </g> + <rect + width="45" + height="33" + rx="0.99999994" + ry="1" + x="1.4999998" + y="10.500003" + id="rect2396-9" + style="fill:url(#linearGradient2919);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2921);stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <path + d="m 31,41.5 -2,2 5.6875,0 2,-2 -5.6875,0 z m -24,0 -2,2 5.6875,0 2,-2 L 7,41.5 z M 46.5,26 l -2,2 0,5.6875 2,-2 0,-5.6875 z m -43,-4.96875 -2,2 0,5.65625 2,-2 0,-5.65625 z M 38.03125,10.5 l -2,2 5.625,0 2,-2 -5.625,0 z m -24,0 -2,2 5.625,0 2,-2 -5.625,0 z" + id="rect3049-1-33" + style="color:#000000;fill:url(#radialGradient2914-3);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2916-2);stroke-width:1.003654;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <path + d="m 19,41.5 -2,2 5.6875,0 2,-2 -5.6875,0 z m 27.5,-3.5 -2,2 0,0.5 c 0,0.554 -0.446,1 -1,1 l -0.5,0 -2,2 4.5,0 c 0.554,0 1,-0.446 1,-1 l 0,-4.5 z m -43,-5 -2,2 0,5.6875 2,-2 L 3.5,33 z m 43,-18.96875 -2,2 0,5.625 2,-2 0,-5.625 z M 26.03125,10.5 l -2,2 5.625,0 2,-2 -5.625,0 z M 2.5,10.5 c -0.554,0 -1,0.446 -1,1 l 0,5.15625 2,-2 0,-1.15625 c 0,-0.554 0.446,-1 1,-1 l 1.15625,0 2,-2 -5.15625,0 z" + id="path3212" + style="color:#000000;fill:url(#linearGradient2906-8);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2908-9);stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + width="43.000004" + height="30.999998" + rx="0.082551509" + ry="0.083472483" + x="2.5" + y="11.5" + id="rect3331-6" + style="opacity:0.4;fill:none;stroke:url(#linearGradient2911);stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <path + d="M 3.2367049,13.730544 24,32.367542 45.077093,13.60522 M 18.65625,27.867542 5.1806899,41.5 18.65625,27.867542 z M 29.375,27.930042 42.944313,41.249352 29.375,27.930042 z" + id="path3341-2" + style="fill:none;stroke:url(#linearGradient2903);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <path + d="M 3.2367049,15.030544 24,33.667542 45.077093,14.90522 M 18.65625,29.167542 5.1806899,42.8 18.65625,29.167542 z M 29.375,29.230042 42.944313,42.549352 29.375,29.230042 z" + id="path3341-2-6" + style="opacity:0.7;fill:none;stroke:url(#linearGradient2900);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <path + d="m 8.4623078,19.817648 15.6337142,14 15.44167,-14" + id="path3493" + style="opacity:0.2;fill:none;stroke:url(#linearGradient2897);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + <path + d="M 3.2367049,12.316357 24,30.953355 45.077093,12.191033" + id="path3926" + style="opacity:0.7;fill:none;stroke:url(#linearGradient2894);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <path + d="m 2.4744071,10 c -0.8221289,0 -1.473022,0.760388 -1.473022,1.5 l 0.0153,18.5 C 2.3399132,29.97986 45.99425,22.627577 46.998615,22.273924 l 0,-10.773924 c 0,-0.565337 -0.642963,-1.5 -1.354833,-1.5 L 2.4744062,10 z" + id="path3333" + style="opacity:0.2;fill:url(#linearGradient2891);fill-opacity:1;fill-rule:evenodd;stroke:none" /> +</svg> diff --git a/icons/wscript_build b/icons/wscript_build deleted file mode 100644 index 3cf70a6..0000000 --- a/icons/wscript_build +++ /dev/null @@ -1,44 +0,0 @@ -#! /usr/bin/env python -# WAF build script for Postler (based on Midori's wscript) -# -# This script is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# See the file COPYING for the full license text. - -import Utils -import os - -def add_image (bld, category, name): - - srcdir = os.getcwd () - blddir = bld.bdir - - rsvg_convert = bld.env['RSVG_CONVERT'] - - if rsvg_convert: - Utils.check_dir (blddir + '/icons') - - for size in [16, 22, 24, 32, 48]: - format = str (size) + 'x' + str (size) - if os.access (srcdir + '/icons/' + format + '/' + name + '.png', os.F_OK): - bld.install_files ('${MDATADIR}/icons/hicolor/' + format + '/' + category, - srcdir + '/icons/' + format + '/' + name + '.png') - elif not rsvg_convert: - pass - elif os.access (srcdir + '/icons/scalable/' + name + '.svg', os.F_OK): - Utils.check_dir (blddir + '/icons/' + format) - command = rsvg_convert + ' -w ' + str(size) + \ - ' -h ' + str(size) + \ - ' -o ' + blddir + '/icons/' + format + '/' + name + '.png' + \ - ' ' + srcdir + '/icons/scalable/' + name + '.svg' - if not Utils.exec_command (command): - bld.install_files ('${MDATADIR}/icons/hicolor/' + format + '/' + category, - blddir + '/icons/' + format + '/' + name + '.png') - else: - Utils.pprint ('BLUE', "Optimized icons could not be created.") - break - -# add_image (bld, 'apps', 'postler') diff --git a/wscript b/wscript index 9e6f595..db9c34c 100644 --- a/wscript +++ b/wscript @@ -165,11 +165,6 @@ def configure (conf): conf.env['docs'] = option_enabled ('docs') if 'LINGUAS' in os.environ: conf.env['LINGUAS'] = os.environ['LINGUAS'] - if conf.find_program ('rsvg-convert', var='RSVG_CONVERT'): - icons = 'yes' - else: - icons = 'no ' - dirname_default ('LIBDIR', os.path.join (conf.env['PREFIX'], 'lib')) if conf.env['PREFIX'] == '/usr': dirname_default ('SYSCONFDIR', '/etc') @@ -218,7 +213,6 @@ def configure (conf): print ''' Localization: %(nls)s (intltool) - Icon optimizations: %(icons)s (rsvg-convert) ''' % locals () if conf.check_cfg (modversion='unique-1.0') == '1.0.4': Utils.pprint ('RED', 'unique 1.0.4 found, this version is erroneous.') @@ -281,7 +275,7 @@ def write_linguas_file (self): write_linguas_file = feature ('intltool_po')(write_linguas_file) def build (bld): - bld.add_subdirs ('postler isync icons') + bld.add_subdirs ('postler isync') bld.add_group () @@ -322,6 +316,8 @@ def build (bld): Utils.pprint ('BLUE', 'File ' + desktop + ' not generated') finally: pre.close () + bld.install_files ('${MDATADIR}/icons/hicolor/scalable/apps', + srcdir + '/data/internet-mail.svg') if Options.commands['check']: bld.add_subdirs ('tests') _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits