From 70c3f379d422f0bd729c93161bb5d9e28afc9040 Mon Sep 17 00:00:00 2001
From: jpbruyere <jp.bruyere@hotmail.com>
Date: Sat, 23 May 2015 15:20:53 +0200
Subject: [PATCH] Image loading detecting svg with extension, ressource tag (#)
 for pathes -svg sub element drawing

---
 GOLib.csproj                        |   5 +-
 Images/Icons/IconAlerte.svg         | 177 ++++++++++++++++++++++++++++
 Images/Icons/icon_alert.gif         | Bin 585 -> 0 bytes
 Images/Icons/question_mark.svg      | 105 -----------------
 Images/Icons/updown.svg             |  66 +++++++++--
 Tests/Interfaces/test4.goml         |   2 +-
 Tests/Tests.csproj                  |   5 +-
 Tests/image/tetra.png               | Bin 0 -> 17748 bytes
 src/GraphicObjects/Container.cs     |   4 +-
 src/GraphicObjects/GraphicObject.cs |   2 +-
 src/GraphicObjects/Image.cs         | 113 +++++++++++-------
 11 files changed, 316 insertions(+), 163 deletions(-)
 create mode 100755 Images/Icons/IconAlerte.svg
 delete mode 100755 Images/Icons/icon_alert.gif
 delete mode 100644 Images/Icons/question_mark.svg
 create mode 100755 Tests/image/tetra.png

diff --git a/GOLib.csproj b/GOLib.csproj
index 3cc7e7e2..b8b0fb24 100644
--- a/GOLib.csproj
+++ b/GOLib.csproj
@@ -306,11 +306,8 @@
     </Folder>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Images\Icons\question_mark.svg">
-      <LogicalName>go.image.icons.question_mark</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Images\Icons\icon_alert.gif" />
     <EmbeddedResource Include="Images\Icons\updown.svg" />
+    <EmbeddedResource Include="Images\Icons\IconAlerte.svg" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="OpenTK\Source\OpenTK\OpenTK.csproj">
diff --git a/Images/Icons/IconAlerte.svg b/Images/Icons/IconAlerte.svg
new file mode 100755
index 00000000..286dbf3a
--- /dev/null
+++ b/Images/Icons/IconAlerte.svg
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   version="1.0"
+   width="64"
+   height="64"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="IconAlerte.svg">
+  <metadata
+     id="metadata49">
+    <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>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1280"
+     inkscape:window-height="984"
+     id="namedview47"
+     showgrid="false"
+     fit-margin-top="1"
+     fit-margin-left="1"
+     fit-margin-right="1"
+     fit-margin-bottom="1"
+     inkscape:zoom="4.2211598"
+     inkscape:cx="60.205288"
+     inkscape:cy="44.735206"
+     inkscape:window-x="0"
+     inkscape:window-y="16"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <linearGradient
+       id="Grad1"
+       x1="41.194874"
+       y1="616.47717"
+       x2="118.93135"
+       y2="527.55511"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.48821801,0,0,-0.48010384,3.766054,311.02113)">
+      <stop
+         offset="0"
+         stop-color="#bb0000"
+         id="stop7" />
+      <stop
+         offset="1"
+         stop-color="#5f0000"
+         id="stop9" />
+    </linearGradient>
+    <linearGradient
+       id="Grad2"
+       x1="530.80951"
+       y1="486.63101"
+       x2="174.80548"
+       y2="211.22995"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.1028564,0,0,0.10681322,1.0000004,5.1888378)">
+      <stop
+         offset="0"
+         stop-color="#9a0000"
+         id="stop12" />
+      <stop
+         offset="1"
+         stop-color="#f22803"
+         id="stop14" />
+    </linearGradient>
+    <linearGradient
+       id="Grad3"
+       x1="187.87357"
+       y1="224.59892"
+       x2="581.83746"
+       y2="483.10001"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.1028564,0,0,0.10681322,1.0000004,5.1888372)">
+      <stop
+         offset="0"
+         stop-color="#ec6c60"
+         id="stop17" />
+      <stop
+         offset="1"
+         stop-color="#d11412"
+         id="stop19" />
+    </linearGradient>
+    <linearGradient
+       id="Grad4"
+       x1="250.39845"
+       y1="101.53633"
+       x2="412.0943"
+       y2="264.54187"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.1028564,0,0,0.10681322,1.0000004,5.1888378)">
+      <stop
+         offset="0"
+         stop-color="#ffd9d9"
+         id="stop22" />
+      <stop
+         offset="1"
+         stop-color="#ff2727"
+         id="stop24" />
+    </linearGradient>
+    <radialGradient
+       id="Grad5"
+       cx="295.47125"
+       cy="186.09634"
+       r="179.55"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,0.17037225,-0.09390987,-2.4099214e-6,49.328051,-23.159866)">
+      <stop
+         offset="0"
+         stop-color="#ffffff"
+         id="stop27" />
+      <stop
+         offset="0.5"
+         stop-color="#ffffff"
+         id="stop29" />
+      <stop
+         offset="1"
+         stop-color="#d5d5d5"
+         id="stop31" />
+    </radialGradient>
+  </defs>
+  <path
+     d="m 30.5028,7.5139081 c 0,0 -27.8740714,47.5318579 -27.8740714,47.5318579 -0.5348541,0.907918 -0.5348541,2.029451 0,2.937368 0.5245675,0.897228 1.5119883,1.463345 2.5816945,1.463345 l 55.7481489,0 c 1.059418,0 2.046843,-0.566117 2.58169,-1.463345 0.524565,-0.907917 0.524565,-2.02945 0,-2.937368 L 35.666191,7.5139081 c -0.534848,-0.9079111 -1.522275,-1.4740216 -2.5817,-1.4740216 -1.059414,0 -2.04684,0.5661105 -2.581691,1.4740216 z"
+     style="fill-opacity:0.17857104"
+     id="path33"
+     inkscape:connector-curvature="0" />
+  <path
+     d="m 29.275219,6.6628606 c 0,0 -27.8740792,47.5318564 -27.8740792,47.5318564 -0.53485309,0.907918 -0.53485309,2.029463 0,2.937369 0.5245677,0.897237 1.5119881,1.463341 2.5816944,1.463341 l 55.7481458,0 c 1.059424,0 2.046838,-0.566104 2.581701,-1.463341 0.52456,-0.907906 0.52456,-2.029451 0,-2.937369 L 34.438597,6.6628606 C 33.903747,5.7549484 32.916334,5.188839 31.856907,5.188839 c -1.059426,0 -2.046838,0.5661094 -2.581688,1.4740216 z"
+     style="fill:url(#Grad1)"
+     id="path35"
+     inkscape:connector-curvature="0" />
+  <path
+     d="m 31.856907,7.6348601 c -0.174854,0 -0.339422,0.096135 -0.431993,0.2456701 L 17.487873,31.646467 3.550838,55.41239 c -0.092571,0.14954 -0.092571,0.341802 0,0.491339 0.09257,0.149539 0.2571403,0.245671 0.4319962,0.245671 l 55.7481458,0 c 0.174855,0 0.339424,-0.09613 0.432007,-0.245671 0.09256,-0.149537 0.09256,-0.341799 0,-0.491339 L 32.288901,7.8805302 C 32.196331,7.7309918 32.031763,7.6348601 31.856907,7.6348601 Z"
+     style="fill:url(#Grad2)"
+     id="path37"
+     inkscape:connector-curvature="0" />
+  <path
+     d="m 31.853051,7.6348601 c -0.174856,0 -0.339436,0.096135 -0.432004,0.2456701 L 17.484016,31.646467 3.5469789,55.41239 c -0.092572,0.14954 -0.092572,0.341802 0,0.491339 0.09257,0.149539 0.2571404,0.245671 0.4319963,0.245671 l 55.7481468,0 c 0.174855,0 0.339424,-0.09613 0.431994,-0.245671 0.09257,-0.149537 0.09257,-0.341799 0,-0.491339 L 32.285045,7.8805302 C 32.192475,7.7309918 32.027904,7.6348601 31.853051,7.6348601 Z"
+     style="fill:none;stroke:url(#Grad3);stroke-width:1.2577858;stroke-linejoin:round"
+     id="path39"
+     inkscape:connector-curvature="0" />
+  <path
+     d="m 31.8643,8.4908547 c -0.165609,0.00854 -0.319978,0.1044731 -0.408207,0.2470058 L 17.519052,32.503792 15.577638,35.815003 c 4.728601,2.947692 10.261233,4.646368 16.174165,4.646368 5.996896,0 11.604186,-1.744327 16.376659,-4.769869 L 32.320723,8.7378605 c -0.09257,-0.1495396 -0.255854,-0.2470058 -0.430709,-0.2470058 -0.0082,0 -0.01758,-4.087e-4 -0.02572,0 z"
+     style="fill:url(#Grad4);stroke-width:10;stroke-linejoin:round"
+     id="path41"
+     inkscape:connector-curvature="0" />
+  <path
+     d="m 30.437499,20.313589 -16.837595,28.70071 c -0.287995,0.502028 -0.287995,1.121539 0,1.612881 0.288007,0.502017 0.833143,0.811785 1.419421,0.811785 l 33.664901,0 c 0.58628,0 1.131427,-0.309768 1.419424,-0.811785 0.287994,-0.502022 0.287994,-1.110853 0,-1.612881 L 33.276338,20.313589 c -0.287995,-0.502021 -0.833141,-0.811777 -1.419419,-0.811777 -0.586279,0 -1.131423,0.309756 -1.41942,0.811777 z"
+     style="fill:url(#Grad5)"
+     id="path43"
+     inkscape:connector-curvature="0" />
+  <path
+     d="m 30.969176,50.420598 c -0.964669,-0.479803 -1.699326,-1.633479 -1.699326,-2.668545 0,-1.92727 1.939303,-3.37905 3.774142,-2.825358 1.237815,0.373544 2.079121,1.533547 2.068815,2.852514 -0.0088,1.120421 -0.475773,1.945794 -1.428956,2.525663 -0.729622,0.44385 -1.950349,0.495876 -2.714675,0.115726 z m 0.219256,-7.610173 c -0.120588,-0.06883 -0.404599,-0.308433 -0.631097,-0.532473 -0.791399,-0.78278 -0.790414,-0.775892 -1.30629,-9.151632 -0.458585,-7.445434 -0.462378,-7.561125 -0.265603,-8.095945 0.442678,-1.203277 1.429043,-1.730174 3.071401,-1.640697 1.043956,0.05689 1.847956,0.437609 2.370558,1.122567 0.446394,0.585054 0.543443,0.915796 0.543036,1.850484 -4.75e-4,1.015697 -0.625235,13.471485 -0.714045,14.234796 -0.116279,0.999709 -0.678344,1.810994 -1.502164,2.168205 -0.470757,0.204147 -1.247544,0.22632 -1.565796,0.04469 z"
+     id="path45"
+     inkscape:connector-curvature="0" />
+</svg>
diff --git a/Images/Icons/icon_alert.gif b/Images/Icons/icon_alert.gif
deleted file mode 100755
index f3d409618dfce5fb8a892b2ea8a9bcf2debd3dc2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 585
zcmZ?wbhEHb6krfwc;?RV|Mt@V-(LQIefIy``~QEv{l6vQe~-ie6;}V3+5W#i|NqJ2
z{|$owpRPD}?%e-d#s4q#{$H5z|5EY)dWQdBpZ$MazO>5v|L2GQ3mE?2?fw5~*Z&7A
zmNt0)pQ`=;N$>ybz5iDhoI8E;|M99RQ>Og?{r3O&hyPb4{C|J{|JR5AKi>bp#sB}e
z%l}&>{=b-SYi08E*!2I;r+qr!Zfj#XWy<6$=a2ti@9E`g`@fq1_SG|)8R<87Px!w~
z{rZVb|9?I_yMMK<mFfRK-~V6i{l72z|7NHE$4maN()<quX$(MuVTb_5pDc_F4DJj%
zAoqgegn@logL_l6mWYT=b7z;Vj=pTy1QkAIWj>V&of15*t~?Smn$!hZ=CBB=FOZXR
z<yGR9lA9sMC2X&tq#(>CHi4g$k<r-5oRO2iOM_jKiOJT&nn{vfqmz|`;fAH5-VF}c
zW;G#2hbIQ6PaG75)S6UfoIia0B%|uiEN<fX%Td}+`nRSYPeX!phhwv7REUK}3M&gU
bcZbIukBJ?9tZa4?H&1L#KF;6Bz+epk+1<@7

diff --git a/Images/Icons/question_mark.svg b/Images/Icons/question_mark.svg
deleted file mode 100644
index 9272381f..00000000
--- a/Images/Icons/question_mark.svg
+++ /dev/null
@@ -1,105 +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"
-   width="100"
-   height="100"
-   id="svg2858"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="exclamation_mark.svg">
-  <defs
-     id="defs2860">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3795">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3797" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3799" />
-    </linearGradient>
-    <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="perspective2866" />
-    <inkscape:perspective
-       id="perspective2853"
-       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" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3795"
-       id="linearGradient3801"
-       x1="29.834375"
-       y1="999.20284"
-       x2="72.173357"
-       y2="999.20284"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5"
-     inkscape:cx="24.413577"
-     inkscape:cy="49.523097"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1280"
-     inkscape:window-height="949"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata2863">
-    <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"
-     transform="translate(0,-952.36218)">
-    <text
-       xml:space="preserve"
-       style="font-size:129.98471069px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#e00000;fill-opacity:1;stroke:#000000;stroke-width:1.78699994;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Rachana;-inkscape-font-specification:Rachana"
-       x="18.646267"
-       y="1045.775"
-       id="text3791"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan3793"
-         x="18.646267"
-         y="1045.775"
-         style="fill:#e00000;fill-opacity:1;stroke-width:1.78699994;stroke-miterlimit:4;stroke-dasharray:none">?</tspan></text>
-  </g>
-</svg>
diff --git a/Images/Icons/updown.svg b/Images/Icons/updown.svg
index df22a28b..a4d5fcb4 100644
--- a/Images/Icons/updown.svg
+++ b/Images/Icons/updown.svg
@@ -5,10 +5,47 @@
    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"
    viewBox="0 0 65.480012 51.479989"
    height="51.479988"
-   width="65.480011">
-
+   width="65.480011"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="updown.svg">
+  <metadata
+     id="metadata13">
+    <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>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1260"
+     inkscape:window-height="644"
+     id="namedview11"
+     showgrid="false"
+     inkscape:zoom="3.2415936"
+     inkscape:cx="30.089585"
+     inkscape:cy="-4.9619855"
+     inkscape:window-x="0"
+     inkscape:window-y="16"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
   <defs
      id="defs4">
     <filter
@@ -22,10 +59,21 @@
          id="feGaussianBlur4393"
          stdDeviation="3.225" />
     </filter>
+    <filter
+       height="1.4299999"
+       y="-0.215"
+       width="1.3096"
+       x="-0.1548"
+       id="filter4391-5"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur4393-0"
+         stdDeviation="3.225" />
+    </filter>
   </defs>
-
   <g
-     id="up">
+     id="up"
+     transform="matrix(0.88780545,0,0,0.79362094,4.0529638,4.3893292)">
     <path
        style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4391)"
        d="M 32,9 7,44 57,44 Z"
@@ -35,12 +83,12 @@
   </g>
   <g
      id="down"
-     transform="matrix(-1,0,0,-1,64,53)">
+     transform="matrix(0.88780545,0,0,0.79362094,4.0529638,4.3893292)">
     <path
-       sodipodi:nodetypes="cccc"
+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4391-5)"
+       d="M 7,9 57,9 32,44 Z"
+       id="path4144-0"
        inkscape:connector-curvature="0"
-       id="path4142"
-       d="M 32,9 7,44 57,44 Z"
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4391)" />
+       sodipodi:nodetypes="cccc" />
   </g>
 </svg>
diff --git a/Tests/Interfaces/test4.goml b/Tests/Interfaces/test4.goml
index 4118e075..13d1a9f6 100755
--- a/Tests/Interfaces/test4.goml
+++ b/Tests/Interfaces/test4.goml
@@ -57,7 +57,7 @@
 			</VerticalStack>
 			<VerticalStack Width="-1" Height="-1" BorderWidth="1" Margin="5" WidgetSpacing="4">
 				<Button Width="-1" Height="-1" Margin="5">
-					<Image Path="/mnt/data/Images/130px-Blason_ville_fr_Aubure_(Haut-Rhin).svg.png"/>
+					<Image Path="#Tests.image.tetra.png"/>
 				</Button>
 				<HorizontalStack>
 					<Label Text="Update" FontColor="White" VerticalAlignment="Center" />
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index d80400f0..7dca8bda 100644
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -8,7 +8,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>Tests</RootNamespace>
     <AssemblyName>Tests</AssemblyName>
-    <StartupObject>test.GOLIBTest_fps</StartupObject>
+    <StartupObject>test.GOLIBTest_0</StartupObject>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <OutputPath>..\bin\$(configuration)</OutputPath>
     <IntermediateOutputPath>obj\$(configuration)</IntermediateOutputPath>
@@ -168,4 +168,7 @@
       <Name>OpenTK</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="image\tetra.png" />
+  </ItemGroup>
 </Project>
diff --git a/Tests/image/tetra.png b/Tests/image/tetra.png
new file mode 100755
index 0000000000000000000000000000000000000000..be7edbe750f85cdb5858423c5277aed38d68f9d3
GIT binary patch
literal 17748
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
NFRd(9B=Oqs{{XWfG3NjP

literal 0
HcmV?d00001

diff --git a/src/GraphicObjects/Container.cs b/src/GraphicObjects/Container.cs
index 0d0ad5b3..298f1873 100644
--- a/src/GraphicObjects/Container.cs
+++ b/src/GraphicObjects/Container.cs
@@ -177,8 +177,8 @@ namespace go
 
             using (System.Xml.XmlReader subTree = reader.ReadSubtree())
             {
-                subTree.Read();
-                subTree.Read(); //move to first child
+                subTree.Read(); //skip current node
+                subTree.Read(); //read first child
 
                 if (!subTree.IsStartElement())
                     return;
diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs
index 683e88f3..094bc453 100644
--- a/src/GraphicObjects/GraphicObject.cs
+++ b/src/GraphicObjects/GraphicObject.cs
@@ -213,7 +213,7 @@ namespace go
 				registerForGraphicUpdate ();
 			}
 		}
-		[XmlAttributeAttribute()][DefaultValue(5)]
+		[XmlAttributeAttribute()][DefaultValue(2)]
 		public virtual double CornerRadius {
 			get { return _cornerRadius; }
 			set {
diff --git a/src/GraphicObjects/Image.cs b/src/GraphicObjects/Image.cs
index 3858aebc..863c95cc 100755
--- a/src/GraphicObjects/Image.cs
+++ b/src/GraphicObjects/Image.cs
@@ -5,89 +5,108 @@ using System.Text;
 using Cairo;
 using System.IO;
 using System.Runtime.InteropServices;
+using System.Xml.Serialization;
+using System.ComponentModel;
 
 namespace go
 {
 	public class Image : GraphicObject
 	{
-
 		byte[] image;
 		Rsvg.Handle hSVG;
 		Size imgSize;
         string _imgPath;
-
-        [System.Xml.Serialization.XmlIgnore]
-		public System.Drawing.Bitmap Bitmap {
-			set {
-				loadImage (value);                
-			}
-		}
+		string _svgSub;
 		
-        [System.Xml.Serialization.XmlAttributeAttribute("Path")]        
+        [XmlAttributeAttribute("Path")]        
 		public string ImagePath {
 			get { return _imgPath; }
 			set {
 				_imgPath = value;
-				loadImage (_imgPath);
+				LoadImage (_imgPath);
 			}
 		}
 
+		[XmlAttributeAttribute()][DefaultValue(null)]
+		public string SvgSub {
+			get { return _svgSub; }
+			set {
+				_svgSub = value;
+				registerForGraphicUpdate ();
+			}
+		}
+			
+		#region CTOR
 		public Image () : base()
 		{
 		}
-
 		public Image (string ImagePath, Rectangle _bounds)
             : base(_bounds)
 		{
 			_imgPath = ImagePath;
-            loadImage(_imgPath);
+            LoadImage(_imgPath);
         }
-
 		public Image (string ImagePath)
             : base()
 		{
 			_imgPath = ImagePath;
-            loadImage(_imgPath);
+            LoadImage(_imgPath);
 		}
-
 		public Image (System.Drawing.Bitmap _bitmap)
             : base()
 		{
-			Bitmap = _bitmap;
+			LoadImage (_bitmap);
 		}
+		#endregion
 
-		protected override Size measureRawSize ()
+		#region Image Loading
+		void loadFromRessource(string resId)
 		{
-			if (image == null && hSVG == null)
-				loadRessourceSvg ("go.image.icons.question_mark");				
+			Stream stream = null;
 
-			return imgSize + Margin*2;
-		}
-		void loadRessourceSvg(string resId)
-		{
-			Stream s = System.Reflection.Assembly.GetExecutingAssembly().GetManifestResourceStream(resId);
+			//first, search for ressource in main executable assembly
+			stream = System.Reflection.Assembly.GetEntryAssembly().GetManifestResourceStream(resId);
+			if (stream == null)//try to find ressource in golib assembly				
+				stream = System.Reflection.Assembly.GetExecutingAssembly().GetManifestResourceStream(resId);
+			if (stream == null)
+				return;
+			
 			using (MemoryStream ms = new MemoryStream ()) {
-				s.CopyTo (ms);
-				hSVG = new Rsvg.Handle (ms.ToArray ());
-				imgSize = new Size (hSVG.Dimensions.Width, hSVG.Dimensions.Height);
-				_imgPath = resId;
+				stream.CopyTo (ms);
+
+				if (resId.EndsWith (".svg", true, System.Globalization.CultureInfo.InvariantCulture)) {
+					hSVG = new Rsvg.Handle (ms.ToArray ());
+					imgSize = new Size (hSVG.Dimensions.Width, hSVG.Dimensions.Height);
+				} else
+					LoadImage (new System.Drawing.Bitmap (ms));					
 			}
 		}
-		//load image via System.Drawing.Bitmap, cairo load png only
-		public void loadImage (string path)
+		void loadFromFile(string path)
 		{
-            if (!File.Exists(path))
-                return;
-            
-			if (path.EndsWith (".svg", true,System.Globalization.CultureInfo.InvariantCulture)) {
+			if (!File.Exists(path))
+				return;
+
+			if (path.EndsWith (".svg", true, System.Globalization.CultureInfo.InvariantCulture)) {
 				hSVG = new Rsvg.Handle (path);								 
 				imgSize = new Size (hSVG.Dimensions.Width, hSVG.Dimensions.Height);
 			}else
-				loadImage (new System.Drawing.Bitmap (path));
-            _imgPath = path;
+				LoadImage (new System.Drawing.Bitmap (path));
+
 		}
+		public void LoadImage (string path)
+		{
+			hSVG = null;
+			image = null;
 
-		public void loadImage (System.Drawing.Bitmap bitmap)
+			if (path.StartsWith ("#"))
+				loadFromRessource (path.Substring (1));
+			else
+				loadFromFile (path);
+
+			_imgPath = path;
+		}
+		//load image via System.Drawing.Bitmap, cairo load png only
+		public void LoadImage (System.Drawing.Bitmap bitmap)
 		{
 			if (bitmap == null)
 				return;
@@ -104,8 +123,18 @@ namespace go
 			image = new byte[bitmapSize];
 			System.Runtime.InteropServices.Marshal.Copy (data.Scan0, image, 0, bitmapSize);
 
-			bitmap.UnlockBits (data);
-			//bitmap.Dispose();            
+			bitmap.UnlockBits (data);           
+		}
+		#endregion
+
+		#region GraphicObject overrides
+		protected override Size measureRawSize ()
+		{
+			if (image == null && hSVG == null) {
+				loadFromRessource ("go.Images.Icons.IconAlerte.svg");
+			}
+
+			return imgSize + Margin * 2;
 		}
 		protected override void onDraw (Context gr)
 		{
@@ -126,9 +155,13 @@ namespace go
 				}
 			} else {
 				gr.Translate (rImg.X/widthRatio, rImg.Y/heightRatio);
-				hSVG.RenderCairo (gr);
+				if (string.IsNullOrEmpty (_svgSub))
+					hSVG.RenderCairo (gr);
+				else
+					hSVG.RenderCairoSub (gr, "#" + _svgSub);
 			}
 			gr.Restore ();
 		}
+		#endregion
 	}
 }
-- 
2.47.3