gcompris r3672 - in branches/gcomprixogoo: boards/skins/gartoon src/redraw-activity src/redraw-activity/resources/redraw

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Thu Jan 15 22:11:46 2009
New Revision: 3672
URL: http://svn.gnome.org/viewvc/gcompris?rev=3672&view=rev

Log:
one more image moved out of skin


Added:
   branches/gcomprixogoo/src/redraw-activity/resources/redraw/mini_bad.png   (props changed)
      - copied unchanged from r3668, /branches/gcomprixogoo/boards/skins/gartoon/mini_bad.png
Removed:
   branches/gcomprixogoo/boards/skins/gartoon/mini_bad.png
Modified:
   branches/gcomprixogoo/boards/skins/gartoon/skin.svg
   branches/gcomprixogoo/src/redraw-activity/redraw.py
   branches/gcomprixogoo/src/redraw-activity/resources/redraw/Makefile.am

Modified: branches/gcomprixogoo/boards/skins/gartoon/skin.svg
==============================================================================
--- branches/gcomprixogoo/boards/skins/gartoon/skin.svg	(original)
+++ branches/gcomprixogoo/boards/skins/gartoon/skin.svg	Thu Jan 15 22:11:46 2009
@@ -808,23 +808,14 @@
        y2="480.46399" />
     <linearGradient
        gradientUnits="userSpaceOnUse"
-       y2="275.67569"
-       x2="-7.5184274"
-       y1="271.91644"
-       x1="80.196571"
-       id="linearGradient5808"
-       xlink:href="#linearGradient5802"
-       inkscape:collect="always"
-       gradientTransform="matrix(0.9998905,0,0,1.0580951,3.8231749e-2,-27.929599)" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="43.482586"
-       x2="-50.122849"
-       y1="43.482586"
+       y2="-31.710501"
+       x2="87.299004"
+       y1="78.486267"
        x1="85.208847"
        id="linearGradient5800"
-       xlink:href="#linearGradient5794"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient10498"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.9901683,0,0,1.0002288,0.2146492,-9.9536653e-3)" />
     <linearGradient
        id="linearGradient2252">
       <stop
@@ -836,30 +827,6 @@
          offset="1"
          style="stop-color:#a1d5ff;stop-opacity:0.81412637;" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient5794"
-       inkscape:collect="always">
-      <stop
-         id="stop5796"
-         offset="0"
-         style="stop-color:#e0cca6;stop-opacity:1;" />
-      <stop
-         id="stop5798"
-         offset="1"
-         style="stop-color:#e0cca6;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5802"
-       inkscape:collect="always">
-      <stop
-         id="stop5804"
-         offset="0"
-         style="stop-color:#f3eacd;stop-opacity:1;" />
-      <stop
-         id="stop5806"
-         offset="1"
-         style="stop-color:#f3eacd;stop-opacity:0;" />
-    </linearGradient>
     <inkscape:perspective
        id="perspective3057"
        inkscape:persp3d-origin="350 : 170 : 1"
@@ -952,6 +919,24 @@
        y1="362.61246"
        x2="1118.8473"
        y2="456.37189" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3195"
+       id="linearGradient3416"
+       x1="1.2561376"
+       y1="255.00002"
+       x2="701.71686"
+       y2="255.00002"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15037"
+       id="linearGradient3424"
+       x1="23.691101"
+       y1="280.05331"
+       x2="23.691101"
+       y2="92.070595"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      inkscape:document-units="mm"
@@ -961,13 +946,13 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="0.7713475"
-     inkscape:cx="249.2935"
-     inkscape:cy="256.74494"
-     inkscape:current-layer="BUTTON_TEXT"
+     inkscape:cx="88.036077"
+     inkscape:cy="171.98117"
+     inkscape:current-layer="DIALOG"
      id="namedview6255"
-     inkscape:window-width="1107"
-     inkscape:window-height="726"
-     inkscape:window-x="108"
+     inkscape:window-width="1280"
+     inkscape:window-height="974"
+     inkscape:window-x="0"
      inkscape:window-y="25"
      showguides="true"
      inkscape:guide-bbox="true"
@@ -1016,16 +1001,16 @@
          height="507.53482"
          width="698.00165"
          id="rect2250"
-         style="opacity:1;fill:#e9e7e2;fill-opacity:0.96078431;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.45905685;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+         style="opacity:1;fill:url(#linearGradient3416);fill-opacity:1.0;fill-rule:nonzero;stroke:#000000;stroke-width:2.45905685000000007;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
       <rect
          ry="20.049141"
          rx="20.049141"
-         y="17.360764"
-         x="22.440418"
-         height="52.243645"
-         width="658.09216"
+         y="17.354784"
+         x="22.434439"
+         height="52.255604"
+         width="651.62195"
          id="rect2260"
-         style="opacity:1;fill:url(#linearGradient5800);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.48417807;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+         style="opacity:1;fill:url(#linearGradient5800);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.47221875;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
       <rect
          ry="21.213898"
          rx="20.046944"
@@ -1034,7 +1019,7 @@
          height="400.11282"
          width="648.05005"
          id="rect3242"
-         style="opacity:1;fill:url(#linearGradient5808);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.55517888;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+         style="opacity:1;fill:url(#linearGradient3424);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.55517888000000015;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
     </g>
   </g>
   <g
@@ -1766,7 +1751,7 @@
          height="111.05777"
          width="671.32794"
          id="rect3479"
-         style="opacity:1;fill:#151515;fill-opacity:1;stroke:url(#linearGradient3483);stroke-width:3.03117203999999996;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:1;fill:#151515;fill-opacity:1;stroke:url(#linearGradient3483);stroke-width:3.03117204;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          rx="23.049728" />
       <path
          style="opacity:1;fill:url(#linearGradient3485);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1"
@@ -1785,7 +1770,7 @@
          height="111.05777"
          width="671.32794"
          id="rect3489"
-         style="opacity:1;fill:#42aa42;fill-opacity:1;stroke:url(#linearGradient3493);stroke-width:3.03117203999999996;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:1;fill:#42aa42;fill-opacity:1;stroke:url(#linearGradient3493);stroke-width:3.03117204;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          rx="23.049728" />
       <path
          style="opacity:1;fill:url(#linearGradient3495);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1"

Modified: branches/gcomprixogoo/src/redraw-activity/redraw.py
==============================================================================
--- branches/gcomprixogoo/src/redraw-activity/redraw.py	(original)
+++ branches/gcomprixogoo/src/redraw-activity/redraw.py	Thu Jan 15 22:11:46 2009
@@ -229,21 +229,21 @@
       if(t.has_key('points')):
         goocanvas.Image(
           parent = self.root_erroritem,
-          pixbuf = gcompris.utils.load_pixmap(gcompris.skin.image_to_skin("mini_bad.png")),
+          pixbuf = gcompris.utils.load_pixmap("redraw/mini_bad.png"),
           x = t['points'][0] + (t['points'][2]-t['points'][0])/2 - icw + xofset,
           y = t['points'][1] + (t['points'][3]-t['points'][1])/2 -ich
           )
       elif(t.has_key('width')):
         goocanvas.Image(
           parent = self.root_erroritem,
-          pixbuf = gcompris.utils.load_pixmap(gcompris.skin.image_to_skin("mini_bad.png")),
+          pixbuf = gcompris.utils.load_pixmap("redraw/mini_bad.png"),
           x = t['x'] + t['width']/2 - icw + xofset,
           y = t['y'] + t['height']/2 - ich
           )
       elif(t.has_key('radius_x')):
         goocanvas.Image(
           parent = self.root_erroritem,
-          pixbuf = gcompris.utils.load_pixmap(gcompris.skin.image_to_skin("mini_bad.png")),
+          pixbuf = gcompris.utils.load_pixmap("redraw/mini_bad.png"),
           x = t['center_x'] -icw + xofset,
           y = t['center_y'] -ich
           )

Modified: branches/gcomprixogoo/src/redraw-activity/resources/redraw/Makefile.am
==============================================================================
--- branches/gcomprixogoo/src/redraw-activity/resources/redraw/Makefile.am	(original)
+++ branches/gcomprixogoo/src/redraw-activity/resources/redraw/Makefile.am	Thu Jan 15 22:11:46 2009
@@ -1,5 +1,6 @@
 imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/redraw
 img_DATA = \
-	redraw.svg
+	redraw.svg \
+	mini_bad.png
 
 EXTRA_DIST = $(img_DATA)