Xcos: update sum and prod by using the new icons
Clément DAVID [Tue, 9 Mar 2010 09:51:26 +0000 (10:51 +0100)]
scilab/modules/xcos/etc/Xcos-style.xml
scilab/modules/xcos/images/blocks/BIGSOM_f.gif [deleted file]
scilab/modules/xcos/images/blocks/BIGSOM_f.svg [deleted file]
scilab/modules/xcos/images/blocks/PRODUCT.gif [deleted file]
scilab/modules/xcos/images/blocks/PROD_f.gif [deleted file]
scilab/modules/xcos/images/blocks/SUM.svg [new file with mode: 0644]
scilab/modules/xcos/images/blocks/SUMMATION.gif [deleted file]
scilab/modules/xcos/images/blocks/SUM_f.gif [deleted file]
scilab/modules/xcos/images/blocks/SUM_f.svg [new file with mode: 0644]

index 726e1e7..e8c70ca 100644 (file)
                <add as="displayedLabel" value="LOG" />
        </add>
        <add as="SUMMATION" extend="Icon">
-               <add as="image" value="$SCILAB/modules/xcos/images/blocks/BIGSOM_f.svg" />
+               <add as="image" value="$SCILAB/modules/xcos/images/blocks/SUM.svg" />
                <!--
                        <add as="displayedLabel" value="&lt;TABLE&gt; &lt;TR&gt;
                        &lt;TD&gt;+&lt;/TD&gt; &lt;TD ROWSPAN=&quot;2&quot;&gt; &lt;FONT
                <add as="displayedLabel" value="SIGN" />
        </add>
        <add as="SUM_f" extend="Icon">
-               <add as="image" value="$SCILAB/modules/xcos/images/blocks/SUM_f.gif" />
+               <add as="image" value="$SCILAB/modules/xcos/images/blocks/SUM_f.svg" />
                <!--
                        <add as="shape" value="ellipse"/> <add as="perimeter"
                        value="ellipsePerimeter"/> <add as="displayedLabel" value="&lt;FONT
diff --git a/scilab/modules/xcos/images/blocks/BIGSOM_f.gif b/scilab/modules/xcos/images/blocks/BIGSOM_f.gif
deleted file mode 100644 (file)
index 7a4cdf5..0000000
Binary files a/scilab/modules/xcos/images/blocks/BIGSOM_f.gif and /dev/null differ
diff --git a/scilab/modules/xcos/images/blocks/BIGSOM_f.svg b/scilab/modules/xcos/images/blocks/BIGSOM_f.svg
deleted file mode 100644 (file)
index 4430454..0000000
+++ /dev/null
@@ -1,239 +0,0 @@
-<?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"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:export-ydpi="90.000000"
-   inkscape:export-xdpi="90.000000"
-   inkscape:export-filename="/Users/izo/Dropbox/scilab/palette/png/BIGSOM_f.png"
-   width="30.135286"
-   height="23.283943"
-   id="svg11300"
-   sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="BIGSOM_f.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
-  <title
-     id="title3289">base scilan</title>
-  <defs
-     id="defs3">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="52 : 24 : 1"
-       inkscape:persp3d-origin="26 : 16 : 1"
-       id="perspective4222" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5060">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop5062" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5064" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5048">
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="0"
-         id="stop5050" />
-      <stop
-         id="stop5056"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5052" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11520">
-      <stop
-         id="stop11522"
-         offset="0.0000000"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-      <stop
-         id="stop11524"
-         offset="1.0000000"
-         style="stop-color:#dcdcdc;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5048"
-       id="linearGradient9582"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
-       x1="302.85715"
-       y1="366.64789"
-       x2="302.85715"
-       y2="609.50507" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient9584"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient9586"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11520"
-       id="radialGradient9588"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.2094353,0,0,2.9246144,-100.39161,-63.780856)"
-       cx="24.44569"
-       cy="35.87817"
-       fx="24.44569"
-       fy="35.87817"
-       r="20.530962" />
-  </defs>
-  <sodipodi:namedview
-     stroke="#ef2929"
-     fill="#eeeeec"
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="0.25490196"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.97558"
-     inkscape:cx="0.089892414"
-     inkscape:cy="22.624007"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="1594"
-     inkscape:window-height="1152"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid7516"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Mathieu Drouet / Take a sip</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source>http://www.takeasip.net/</dc:source>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
-        <dc:title>base scilan</dc:title>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/publicdomain/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(-9.3959022e-8,-24.716057)">
-    <g
-       inkscape:label="Layer 1"
-       id="layer1-0"
-       transform="matrix(0,0.68137179,-0.68137179,0,28.938139,20.184192)">
-      <g
-         id="g9544"
-         transform="translate(-2.0023665,2.2530854)">
-        <g
-           id="g4015"
-           style="fill:#cc0000"
-           transform="translate(-32.678117,-12.686395)">
-          <g
-             transform="matrix(0.71550799,0,0,0.71552662,29.621686,47.585767)"
-             id="g4010"
-             style="fill:#2e3436">
-            <g
-               inkscape:label="Layer 1"
-               id="layer1-1"
-               style="fill:#2e3436" />
-            <g
-               id="layer2-2"
-               inkscape:label="arrow"
-               style="fill:#2e3436" />
-          </g>
-          <path
-             style="fill:none;stroke:#2e3436;stroke-width:2.93525505;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             d="m 47.410446,10.143972 0,22.014412 11.007207,-11.007205 11.007205,11.007205 0,-22.014412 0,0"
-             id="path7518" />
-          <g
-             id="g8070"
-             transform="translate(0.2083628,0)">
-            <text
-               transform="matrix(0,-1,1,0,0,0)"
-               id="text8062"
-               y="49.611885"
-               x="-53.43898"
-               style="font-size:12.36912346px;font-style:normal;font-weight:normal;fill:#2e3436;fill-opacity:1;stroke:#2e3436;stroke-width:1.46762753;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;font-family:Bitstream Vera Sans"
-               xml:space="preserve"><tspan
-                 y="49.611885"
-                 x="-53.43898"
-                 id="tspan8064"
-                 sodipodi:role="line">+</tspan></text>
-            <text
-               transform="matrix(0,-1,1,0,0,0)"
-               id="text8066"
-               y="74.561554"
-               x="-53.494556"
-               style="font-size:12.5017767px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:#2e3436;stroke-width:1.46762753;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;font-family:Bitstream Vera Sans"
-               xml:space="preserve"><tspan
-                 y="74.561554"
-                 x="-53.494556"
-                 id="tspan8068"
-                 sodipodi:role="line">+</tspan></text>
-          </g>
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/scilab/modules/xcos/images/blocks/PRODUCT.gif b/scilab/modules/xcos/images/blocks/PRODUCT.gif
deleted file mode 100644 (file)
index 59aef09..0000000
Binary files a/scilab/modules/xcos/images/blocks/PRODUCT.gif and /dev/null differ
diff --git a/scilab/modules/xcos/images/blocks/PROD_f.gif b/scilab/modules/xcos/images/blocks/PROD_f.gif
deleted file mode 100644 (file)
index b5847b3..0000000
Binary files a/scilab/modules/xcos/images/blocks/PROD_f.gif and /dev/null differ
diff --git a/scilab/modules/xcos/images/blocks/SUM.svg b/scilab/modules/xcos/images/blocks/SUM.svg
new file mode 100644 (file)
index 0000000..795ddf9
--- /dev/null
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="40"
+       height="40">
+       <text x="14" y="30" font-family="serif" font-size="30" fill="black">
+               &#931;
+       </text>
+</svg>
diff --git a/scilab/modules/xcos/images/blocks/SUMMATION.gif b/scilab/modules/xcos/images/blocks/SUMMATION.gif
deleted file mode 100644 (file)
index f3d65a8..0000000
Binary files a/scilab/modules/xcos/images/blocks/SUMMATION.gif and /dev/null differ
diff --git a/scilab/modules/xcos/images/blocks/SUM_f.gif b/scilab/modules/xcos/images/blocks/SUM_f.gif
deleted file mode 100644 (file)
index 07d27ec..0000000
Binary files a/scilab/modules/xcos/images/blocks/SUM_f.gif and /dev/null differ
diff --git a/scilab/modules/xcos/images/blocks/SUM_f.svg b/scilab/modules/xcos/images/blocks/SUM_f.svg
new file mode 100644 (file)
index 0000000..47c7ce8
--- /dev/null
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="40"
+       height="40">
+       <g id="layer1">
+               <path d="M20,5 v30 M5,20 h30"
+                       style="fill:none;stroke:#000000;stroke-width:2px;stroke-linejoin:round;stroke-linecap:round" />
+       </g>
+</svg>