From f4091840319062be842fb9d178cd425846989660 Mon Sep 17 00:00:00 2001
From: Simon Poirier <simpoir@Eridani.(none)>
Date: Fri, 04 Sep 2009 02:07:24 +0000
Subject: Fix icons to comply to sugar standards.

Set a bundler env path to be conditional as it was broken on SoaS.
---
diff --git a/data/icons/message-bubble.svg b/data/icons/message-bubble.svg
index c81e5bd..e815d13 100644
--- a/data/icons/message-bubble.svg
+++ b/data/icons/message-bubble.svg
@@ -1,70 +1,21 @@
-<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64px"
-   height="64px"
-   id="svg2383"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="message-bubble.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs2385">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective2391" />
+<?xml version="1.0" ?><!-- Created with Inkscape (http://www.inkscape.org/) --><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#000000">
+	<!ENTITY fill_color "#ffffff">
+]><svg height="55px" id="svg2383" inkscape:output_extension="org.inkscape.output.svg.inkscape" inkscape:version="0.47pre1 r21720" sodipodi:docname="message-bubble.svg" sodipodi:version="0.32" version="1.1" width="55px" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg">
+  <defs id="defs2385">
+    <inkscape:perspective id="perspective2391" inkscape:persp3d-origin="32 : 21.333333 : 1" inkscape:vp_x="0 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="64 : 32 : 1" sodipodi:type="inkscape:persp3d"/>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.5"
-     inkscape:cx="36.007299"
-     inkscape:cy="32"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="897"
-     inkscape:window-height="707"
-     inkscape:window-x="507"
-     inkscape:window-y="117" />
-  <metadata
-     id="metadata2388">
+  <sodipodi:namedview bordercolor="#666666" borderopacity="1.0" id="base" inkscape:current-layer="layer1" inkscape:cx="36.007299" inkscape:cy="32" inkscape:document-units="px" inkscape:grid-bbox="true" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-height="707" inkscape:window-maximized="0" inkscape:window-width="897" inkscape:window-x="140" inkscape:window-y="31" inkscape:zoom="5.5" pagecolor="#ffffff" showgrid="true"/>
+  <metadata id="metadata2388">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 21.809659,11.622159 C 15.363113,11.622159 10.184659,16.831862 10.184659,23.278409 L 10.184659,31.997159 C 10.184659,38.443705 15.363112,43.622158 21.809659,43.622159 L 26.215909,43.622159 C 22.132918,47.565767 16.903409,52.372159 16.903409,52.372159 L 32.153409,43.622159 L 40.559659,43.622159 C 47.006205,43.622159 52.18466,38.443704 52.184659,31.997159 L 52.184659,23.278409 C 52.184659,16.831863 47.006206,11.622159 40.559659,11.622159 L 21.809659,11.622159 z"
-       id="rect2393" />
-    <path
-       style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial"
-       d="M 18.334695,35.209134 C 20.335566,29.99905 22.336438,24.788967 24.337309,19.578881 C 25.080083,19.578881 25.822858,19.578881 26.565632,19.578881 C 28.697999,24.788967 30.830367,29.99905 32.962734,35.209134 C 32.177313,35.209134 31.391891,35.209134 30.606468,35.209134 C 29.998744,33.631183 29.39102,32.05323 28.783294,30.475279 C 26.604727,30.475279 24.426157,30.475279 22.247588,30.475279 C 21.675403,32.05323 21.103218,33.631183 20.531033,35.209134 C 19.79892,35.209134 19.066808,35.209134 18.334695,35.209134 z M 22.844653,28.790708 C 24.610963,28.790708 26.377274,28.790708 28.143585,28.790708 C 27.219735,26.27132 26.184464,23.789975 25.403493,21.220804 C 24.864464,23.838474 23.731381,26.28082 22.844653,28.790708 z M 41.780074,33.812434 C 39.898302,35.586767 36.502561,36.237616 34.508367,34.321703 C 32.817426,32.512901 34.101276,29.343387 36.491803,28.971958 C 38.110672,28.434938 40.551516,28.852191 41.628136,27.700541 C 41.994258,25.510211 39.389059,24.83162 37.723242,25.338945 C 36.074545,25.287768 36.544241,27.96543 34.963841,27.238474 C 33.265135,27.462167 34.637954,25.426944 35.239701,24.825177 C 37.094305,23.379343 39.831041,23.302574 41.957988,24.153483 C 43.935866,25.062763 43.516039,27.442288 43.5606,29.230197 C 43.658101,31.226333 43.23926,33.363188 44.168326,35.209134 C 43.500183,35.209134 42.832042,35.209134 42.1639,35.209134 C 41.946384,34.774037 41.831491,34.294111 41.780074,33.812434 z M 41.620146,29.526375 C 39.958489,30.300731 37.963327,29.980103 36.377186,30.899089 C 34.647917,32.477691 37.062735,34.634842 38.86689,33.894231 C 40.636665,33.691112 41.834554,31.957797 41.620146,30.230057 C 41.620146,29.995497 41.620146,29.760935 41.620146,29.526375 z"
-       id="flowRoot3171" />
+  <g id="layer1" inkscape:groupmode="layer" inkscape:label="Layer 1" transform="translate(0,-9)">
+    <path d="m 18.420265,15.588046 c -6.299941,0 -11.3606278,5.091225 -11.3606278,11.391168 l 0,8.52047 c 0,6.299941 5.0606868,11.360627 11.3606278,11.360628 l 4.306045,0 c -3.990137,3.853923 -9.100719,8.55101 -9.100719,8.55101 l 14.90319,-8.55101 8.215077,0 c 6.299941,0 11.360629,-5.060688 11.360628,-11.360628 l 0,-8.52047 c 0,-6.299941 -5.060686,-11.391168 -11.360628,-11.391168 l -18.323593,0 z" id="rect2393" style="fill:&fill_color;;fill-opacity:1;fill-rule:nonzero;stroke:&stroke_color;;stroke-width:2.93177485;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"/>
+    <path d="m 15.024328,38.638614 c 1.955367,-5.091599 3.910736,-10.183195 5.866104,-15.274795 0.725882,0 1.451765,0 2.177647,0 2.083874,5.0916 4.167748,10.183196 6.251621,15.274795 -0.767559,0 -1.535119,0 -2.302681,0 -0.593902,-1.542066 -1.187806,-3.084133 -1.781711,-4.6262 -2.129023,0 -4.258049,0 -6.387073,0 -0.559173,1.542067 -1.118345,3.084134 -1.677518,4.6262 -0.715463,0 -1.430926,0 -2.146389,0 z m 4.407394,-6.272461 c 1.726141,0 3.452282,0 5.178425,0 -0.902841,-2.462093 -1.914567,-4.887008 -2.677778,-7.397751 -0.52677,2.55814 -1.634085,4.944943 -2.500647,7.397751 z m 18.504796,4.907524 c -1.838977,1.733981 -5.157492,2.370029 -7.106335,0.497687 -1.652486,-1.767667 -0.397833,-4.8651 1.93833,-5.228082 1.582053,-0.524808 3.967388,-0.117044 5.019523,-1.242503 0.357796,-2.140519 -2.188156,-2.803677 -3.81609,-2.30789 -1.611203,-0.05002 -1.152189,2.566754 -2.696647,1.856331 -1.660075,0.218606 -0.318477,-1.770333 0.269586,-2.358415 1.812428,-1.412953 4.486925,-1.487977 6.565502,-0.656418 1.932898,0.888601 1.522618,3.214011 1.566166,4.96126 0.09528,1.950742 -0.314033,4.039001 0.593905,5.842967 -0.652949,0 -1.305894,0 -1.958842,0 C 38.099047,38.213411 37.986767,37.7444 37.936518,37.273677 z M 37.780227,33.08509 c -1.623868,0.756746 -3.573656,0.44341 -5.123725,1.341496 -1.689943,1.542703 0.669958,3.650795 2.433084,2.927027 1.729527,-0.198499 2.900173,-1.892395 2.690641,-3.580843 0,-0.229227 0,-0.458454 0,-0.68768 z" id="flowRoot3171" style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:&stroke_color;;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial"/>
   </g>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/data/icons/tutortool.svg b/data/icons/tutortool.svg
index 3965f85..bb28f04 100644
--- a/data/icons/tutortool.svg
+++ b/data/icons/tutortool.svg
@@ -1,72 +1,21 @@
-<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32px"
-   height="32px"
-   id="svg2393"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="tutortool.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs2395">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 16 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="32 : 16 : 1"
-       inkscape:persp3d-origin="16 : 10.666667 : 1"
-       id="perspective2401" />
+<?xml version="1.0" ?><!-- Created with Inkscape (http://www.inkscape.org/) --><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#000000">
+	<!ENTITY fill_color "#ffffff">
+]><svg height="55px" id="svg2393" inkscape:output_extension="org.inkscape.output.svg.inkscape" inkscape:version="0.47pre1 r21720" sodipodi:docname="tutortool.svg" sodipodi:version="0.32" version="1.1" width="55px" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg">
+  <defs id="defs2395">
+    <inkscape:perspective id="perspective2401" inkscape:persp3d-origin="16 : 10.666667 : 1" inkscape:vp_x="0 : 16 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="32 : 16 : 1" sodipodi:type="inkscape:persp3d"/>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.197802"
-     inkscape:cx="20.137915"
-     inkscape:cy="16"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1057"
-     inkscape:window-height="675"
-     inkscape:window-x="1480"
-     inkscape:window-y="62" />
-  <metadata
-     id="metadata2398">
+  <sodipodi:namedview bordercolor="#666666" borderopacity="1.0" id="base" inkscape:current-layer="layer1" inkscape:cx="3.7661233" inkscape:cy="33.132055" inkscape:document-units="px" inkscape:grid-bbox="true" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-height="675" inkscape:window-maximized="0" inkscape:window-width="1057" inkscape:window-x="108" inkscape:window-y="45" inkscape:zoom="3.9590209" pagecolor="#ffffff" showgrid="true"/>
+  <metadata id="metadata2398">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 21.343473,15.032385 C 21.343473,18.680244 17.602739,21.640825 12.993621,21.640825 C 11.841341,21.640825 8.8679679,23.241853 5.9044454,23.800334 C 8.8349369,21.411807 7.845937,20.302616 7.0902753,19.704552 C 5.578952,18.508425 4.6437685,16.856314 4.6437685,15.032385 C 4.6437685,11.384526 8.3845024,8.4239446 12.993621,8.4239446 C 17.602739,8.4239446 21.343473,11.384526 21.343473,15.032385 z"
-       id="path2403"
-       sodipodi:nodetypes="cscsssc" />
-    <path
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 27.505397,17.532875 C 27.505397,18.863851 26.780255,20.069444 25.608373,20.942294 C 25.022432,21.378719 24.682019,22.178474 26.318696,24.387278 C 23.140734,22.360656 21.924391,22.35525 21.030912,22.35525 C 17.456997,22.35525 14.556428,20.194826 14.556428,17.532875 C 14.556428,14.870924 17.456997,12.7105 21.030912,12.7105 C 24.604828,12.7105 27.505397,14.870924 27.505397,17.532875 z"
-       id="path3175"
-       sodipodi:nodetypes="cccsssc" />
+  <g id="layer1" inkscape:groupmode="layer" inkscape:label="Layer 1" transform="translate(0,23)">
+    <path d="m 38.01548,1.5478747 c 0,7.1837999 -7.3667,13.0141283 -16.443525,13.0141283 -2.269208,0 -8.124729,3.152936 -13.9608513,4.252763 C 13.382177,14.110994 11.434521,11.926642 9.9463815,10.748864 6.9701032,8.3933076 5.1284282,5.1397735 5.1284282,1.5478747 c 0,-7.1837994 7.3666998,-13.0141297 16.4435268,-13.0141297 9.076825,0 16.443525,5.8303303 16.443525,13.0141297 z" id="path2403" sodipodi:nodetypes="cscsssc" style="fill:&fill_color;;fill-opacity:1;fill-rule:nonzero;stroke:&stroke_color;;stroke-width:1.96931934;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"/>
+    <path d="m 50.150276,6.4721386 c 0,2.621116 -1.428036,4.9953144 -3.735846,6.7142344 -1.153905,0.85946 -1.824287,2.434433 1.398853,6.784273 -6.258422,-3.991066 -8.65379,-4.001712 -10.413335,-4.001712 -7.03818,0 -12.750327,-4.254565 -12.750327,-9.4967954 0,-5.2422321 5.712147,-9.4967971 12.750327,-9.4967971 7.038182,0 12.750328,4.254565 12.750328,9.4967971 z" id="path3175" sodipodi:nodetypes="cccsssc" style="fill:&fill_color;;fill-opacity:1;fill-rule:nonzero;stroke:&stroke_color;;stroke-width:1.96931934;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"/>
   </g>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/tutorius/bundler.py b/tutorius/bundler.py
index 8e7fc3d..8808d93 100644
--- a/tutorius/bundler.py
+++ b/tutorius/bundler.py
@@ -33,7 +33,9 @@ from ConfigParser import SafeConfigParser
 
 # this is where user installed/generated tutorials will go
 def _get_store_root():
-    return os.path.join(os.getenv("HOME"),".sugar",os.getenv("SUGAR_PROFILE"),"tutorius","data")
+    profile_name = os.getenv("SUGAR_PROFILE") or "default"
+    return os.path.join(os.getenv("HOME"),
+                        ".sugar",profile_name,"tutorius","data")
 # this is where activity bundled tutorials should be, under the activity bundle
 def _get_bundle_root():
     return os.path.join(os.getenv("SUGAR_BUNDLE_PATH"),"data","tutorius","data")
--
cgit v0.9.1