add DrawingArea

4 files changed, 22 insertions, 15 deletions

diff --git a/activity.py b/activity.py
index beff0e9..13533b7 100644
--- a/activity.py
+++ b/activity.py
@@ -23,6 +23,7 @@ from sugar3.graphics.toolbarbox import ToolbarBox
 from sugar3.graphics.radiotoolbutton import RadioToolButton
 from sugar3.graphics.toolbutton import ToolButton
 
+
 class Activity(activity.Activity):
     def __init__(self, handle):
         activity.Activity.__init__(self, handle, True)
@@ -94,8 +95,8 @@ class Activity(activity.Activity):
         toolbarbox.toolbar.insert(stopbtn, -1)
 
         #canvas
-        box = Gtk.VBox()
-        self.set_canvas(box)
+        drawingarea = Gtk.DrawingArea()
+        self.set_canvas(drawingarea)
 
         self.set_toolbar_box(toolbarbox)
         self.show_all()
diff --git a/activity/icon.svg b/activity/icon.svg
index 10cdaa1..31b2786 100644
--- a/activity/icon.svg
+++ b/activity/icon.svg
@@ -81,7 +81,7 @@
      borderopacity="1.0"
      id="base"
      inkscape:current-layer="layer1"
-     inkscape:cx="38.14093"
+     inkscape:cx="36.39093"
      inkscape:cy="26.577885"
      inkscape:document-units="px"
      inkscape:pageopacity="0.0"
@@ -123,26 +123,26 @@
        d="m 18.860727,1000.3897 0,48.9451"
        id="path2993"
        inkscape:connector-curvature="0"
-       style="fill:none;stroke:#ffffff;stroke-width:1.05478823000000022px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+       style="fill:none;stroke:#000000;stroke-width:1.05478823000000022px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <path
        d="m 37.174524,1000.3703 0,48.984"
        id="path2993-8"
        inkscape:connector-curvature="0"
-       style="fill:none;stroke:#ffffff;stroke-width:1.01571417000000008px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+       style="fill:none;stroke:#000000;stroke-width:1.01571417000000008px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <g
        id="g3034"
-       style="fill:none;stroke:#ffffff;stroke-opacity:1"
+       style="fill:none;stroke:#000000;stroke-opacity:1"
        transform="matrix(0,-1,1,0,-997.56221,1081.2543)">
       <path
          d="m 47.75287,1001.0896 0,48.9451"
          id="path2993-83"
          inkscape:connector-curvature="0"
-         style="fill:none;stroke:#ffffff;stroke-width:1.05478823000000022px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         style="fill:none;stroke:#000000;stroke-width:1.05478823000000022px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
          d="m 66.066667,1001.0702 0,48.984"
          id="path2993-8-4"
          inkscape:connector-curvature="0"
-         style="fill:none;stroke:#ffffff;stroke-width:1.01571417000000008px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         style="fill:none;stroke:#000000;stroke-width:1.01571417000000008px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     </g>
     <g
        id="g3060"
diff --git a/icons/circle.svg b/icons/circle.svg
index cbc4213..1f45e96 100644
--- a/icons/circle.svg
+++ b/icons/circle.svg
@@ -25,7 +25,7 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="10"
-     inkscape:cx="19.61553"
+     inkscape:cx="23.222963"
      inkscape:cy="24.229734"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -65,7 +65,7 @@
     <path
        transform="matrix(0.07272261,0,0,0.07886364,-5.7446228,982.54017)"
        sodipodi:type="arc"
-       style="fill:none;stroke:#ffffff;stroke-width:56.80570221;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:none;stroke:#ffffff;stroke-width:56.80570220999999265;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        id="path3793-2"
        sodipodi:cx="457.14285"
        sodipodi:cy="536.64789"
@@ -75,12 +75,18 @@
     <path
        transform="matrix(0.04776764,0,0,0.05180136,5.4645328,997.2619)"
        sodipodi:type="arc"
-       style="fill:none;stroke:#ffffff;stroke-width:90.46384449;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:none;stroke:#ffffff;stroke-width:90.46384449000001382;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        id="path3793-2-8"
        sodipodi:cx="457.14285"
        sodipodi:cy="536.64789"
        sodipodi:rx="348.57144"
        sodipodi:ry="321.42856"
        d="m 805.71429,536.64789 c 0,177.52009 -156.06075,321.42856 -348.57144,321.42856 -192.51069,0 -348.57144,-143.90847 -348.57144,-321.42856 0,-177.52009 156.06075,-321.42856 348.57144,-321.42856 192.51069,0 348.57144,143.90847 348.57144,321.42856 z" />
+    <path
+       style="fill:#000000;stroke:none;stroke-width:0.44999999000000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
+       d="m 25.202963,50.540877 c -4.593884,-0.467909 -9.024926,-2.350347 -12.6,-5.352856 -4.470848,-3.754819 -7.4009048,-9.196443 -8.0971198,-15.037755 -0.1455925,-1.221536 -0.1455925,-4.078464 0,-5.3 C 5.5884389,15.767181 11.925556,8.1186453 20.612717,5.4101962 26.269315,3.6466043 32.487523,4.1355504 37.721945,6.7555181 c 2.440895,1.2217327 4.126158,2.4365832 6.091864,4.3914239 3.470206,3.451024 5.629056,7.585029 6.503347,12.453324 0.2053,1.143172 0.233465,1.613656 0.233465,3.9 0,2.920065 -0.14793,4.091252 -0.805383,6.376357 -2.261316,7.859642 -8.618014,14.035578 -16.498234,16.029081 -0.718278,0.181706 -1.775778,0.402678 -2.35,0.491048 -1.276495,0.196446 -4.40332,0.275591 -5.694041,0.144125 l 0,0 z m 5.070622,-4.143725 c 7.438274,-1.176213 13.536696,-6.736147 15.368834,-14.011772 0.755386,-2.999725 0.758472,-6.357772 0.0086,-9.336384 -1.203935,-4.782083 -4.243569,-8.903315 -8.498036,-11.521905 -4.661145,-2.868897 -10.645855,-3.540152 -15.85,-1.7777624 -4.076631,1.3805554 -7.399293,3.9177674 -9.733755,7.4327744 -2.1474029,3.23335 -3.166245,6.617911 -3.166245,10.518163 0,5.159284 1.904337,9.761116 5.54661,13.40339 3.187633,3.187633 7.362625,5.111088 11.90339,5.483994 0.912827,0.07497 3.427015,-0.03338 4.420622,-0.190498 z"
+       id="path3753"
+       inkscape:connector-curvature="0"
+       transform="translate(0,997.36218)" />
   </g>
 </svg>
diff --git a/icons/cross.svg b/icons/cross.svg
index cc20d1c..3c74e64 100644
--- a/icons/cross.svg
+++ b/icons/cross.svg
@@ -14,7 +14,7 @@
    height="55"
    id="svg2"
    inkscape:version="0.48.2 r9819"
-   sodipodi:docname="cros.svg">
+   sodipodi:docname="cross.svg">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -29,7 +29,7 @@
      id="namedview8"
      showgrid="false"
      inkscape:zoom="10.163636"
-     inkscape:cx="24.05635"
+     inkscape:cx="22.334525"
      inkscape:cy="27.5"
      inkscape:window-x="0"
      inkscape:window-y="30"
@@ -52,12 +52,12 @@
   <g
      transform="matrix(1.4784946,0,0,1.4784946,-65.79301,-27.943547)"
      id="g6"
-     style="fill:none;stroke:#ffffff;stroke-width:3.04363641;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
+     style="fill:#000000;stroke:#ffffff;stroke-width:3.04363640999999996;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1">
     <path
        d="m 33.4,62.5 10.1,10.1 c 0.8,0.8 1.2,1.8 1.2,2.9 0,2.3 -1.9,4.1 -4.1,4.1 -1.1,0 -2.2,-0.5 -2.9,-1.2 L 27.6,68.3 17.5,78.4 c -0.8,0.8 -1.8,1.2 -2.9,1.2 -2.3,0 -4.1,-1.9 -4.1,-4.1 0,-1.1 0.5,-2.2 1.2,-2.9 L 21.8,62.5 11.7,52.4 c -0.7,-0.7 -1.2,-1.8 -1.2,-2.9 0,-2.3 1.9,-4.1 4.1,-4.1 1.1,0 2.2,0.5 2.9,1.2 L 27.6,56.7 37.7,46.6 c 0.8,-0.7 1.8,-1.2 2.9,-1.2 2.3,0 4.1,1.9 4.1,4.1 0,1.1 -0.5,2.2 -1.2,2.9 L 33.4,62.5 z"
        transform="translate(35.5,-25)"
        id="path8"
-       style="fill:none;stroke:#ffffff;stroke-width:3.04363641;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:#000000;stroke:#ffffff;stroke-width:3.04363640999999996;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
        inkscape:connector-curvature="0" />
   </g>
 </svg>