From a4e299e698ea90ef8dae62e3210cc02f7c51aafc Mon Sep 17 00:00:00 2001
From: Wade Brainerd <wadetb@gmail.com>
Date: Fri, 09 May 2008 03:51:07 +0000
Subject: New icons.

---
diff --git a/MANIFEST b/MANIFEST
index d51bc81..cfe5724 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -23,7 +23,9 @@ data/intro.drw
 data/castle.png
 data/castle.drw
 icons/erase.svg
+icons/take-reference.svg
+icons/show-reference.svg
+icons/video-paint.svg
 icons/palette.svg
-icons/reference.svg
 activity/activity.info
-activity/activity.svg
+activity/Colors-activity.svg
diff --git a/NEWS b/NEWS
index 3739edd..f2fd769 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Colors-4
+
+* New toolbar icons.
+
 Colors-3
 
 * Add icons & descriptions to samples.
diff --git a/activity/activity.info b/activity/activity.info
index 7ccb003..9e7db3f 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,7 +1,7 @@
 [Activity]
 name = Colors!
-activity_version = 3
+activity_version = 4
 host_version = 1
 service_name = org.laptop.community.Colors
-icon = activity
+icon = Colors-activity
 exec = sugar-activity colors.Colors
diff --git a/activity/activity.svg b/activity/activity.svg
deleted file mode 100644
index 8ed9c46..0000000
--- a/activity/activity.svg
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-        <!ENTITY ns_svg "http://www.w3.org/2000/svg">
-        <!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-        <!ENTITY fill_color "#FFFFFF">
-        <!ENTITY stroke_color "#000000">
-]>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.0"
-   width="45"
-   height="45"
-   id="svg2">
-  <defs
-     id="defs5">
-    <clipPath
-       id="clip1">
-      <path
-         d="M 22.5,54.319809 L -9.319809,22.5 L 3.408112,9.772079 L 16.136032,22.5 L 22.5,16.136032 L 9.772079,3.408112 L 22.5,-9.319809 L 54.319809,22.5 L 22.5,54.319809 z "
-         id="path5722" />
-    </clipPath>
-    <clipPath
-       id="clip0">
-      <rect
-         width="45"
-         height="45"
-         x="0"
-         y="0"
-         id="rect5719" />
-    </clipPath>
-    <clipPath
-       id="clipPath22110">
-      <rect
-         width="45"
-         height="45"
-         x="0"
-         y="0"
-         id="rect22112" />
-    </clipPath>
-    <clipPath
-       id="clipPath22106">
-      <path
-         d="M 22.5,54.319809 L -9.319809,22.5 L 3.408112,9.772079 L 16.136032,22.5 L 22.5,16.136032 L 9.772079,3.408112 L 22.5,-9.319809 L 54.319809,22.5 L 22.5,54.319809 z "
-         id="path22108" />
-    </clipPath>
-    <clipPath
-       id="clipPath22305">
-      <rect
-         width="45"
-         height="45"
-         x="0"
-         y="0"
-         id="rect22307" />
-    </clipPath>
-    <clipPath
-       id="clipPath22301">
-      <path
-         d="M 22.5,54.319809 L -9.319809,22.5 L 3.408112,9.772079 L 16.136032,22.5 L 22.5,16.136032 L 9.772079,3.408112 L 22.5,-9.319809 L 54.319809,22.5 L 22.5,54.319809 z "
-         id="path22303" />
-    </clipPath>
-  </defs>
-  <g
-     transform="translate(-18.266264,-19.0671)"
-     id="layer2" />
-  <g
-     transform="translate(0.8874094,27.650381)"
-     id="g22116" />
-  <g
-     transform="translate(2.1840441,4.6840148e-2)"
-     id="g22332">
-    <path
-       d="M 17.3205,22.182585 C 21.33214,25.04709 21.513685,25.447204 22.726745,26.526335 C 23.939805,27.605466 25.108845,28.73092 26.180035,29.875578 C 26.715635,30.447907 29.107965,32.635197 28.327845,33.778659 C 27.547725,34.922122 25.810655,40.053366 27.144805,41.471367 C 28.832095,43.654981 31.807185,43.78633 33.158905,41.453134 C 34.555365,39.885594 32.153025,34.168149 32.511765,33.683401 C 33.229945,32.712951 34.722005,32.222981 36.083605,31.540057 C 37.445205,30.857133 38.676339,29.981253 38.872649,28.238981 C 39.068959,25.14706 36.12938,22.461793 31.53201,18.251653 C 26.93464,14.041513 32.034486,17.930914 25.681681,13.16877 C 19.328876,8.4066264 12.04171,4.6513343 6.6017505,4.6513343 C 6.6017505,4.6513343 2.7425005,9.2451085 8.7580007,10.338835 C 10.13218,12.301959 4.8969605,17.401336 8.1642507,17.401334 C 9.6340104,17.401334 13.30886,19.31808 17.3205,22.182585 z "
-       
-style="fill:&fill_color;;fill-opacity:1;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path22313" />
-    <g
-       transform="translate(-1.1078786,0.2015846)"
-       id="g22328">
-      <path
-         d="M 2.9818548,42.033534 C 1.3762287,38.516248 15.806007,23.224025 20.843349,19.467062 C 22.522482,17.972582 28.146986,12.992284 28.146986,12.992284 C 28.146986,12.992284 28.953429,9.108277 31.725501,6.5220425 C 35.434037,3.0621267 37.380584,4.8972017 39.455759,1.5484155 C 39.455759,1.5484155 40.142838,4.3201323 39.911765,5.2887595 C 39.675428,6.2794243 38.687798,10.595475 38.015218,11.827164 C 36.277482,15.044615 31.354721,16.303366 31.354721,16.303366 C 31.354721,16.303366 28.033979,21.203555 27.015039,22.430711 C 22.014508,30.486743 3.0122299,42.775886 2.9818548,42.033534 z "
-         
-style="fill:&fill_color;;fill-opacity:1;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:3.50000024;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path22123" />
-      <path
-         d="M 26.765447,12.804034 C 27.78242,13.743475 31.074521,16.016869 31.639705,16.659846"
-         
-style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:&stroke_color;;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path22125" />
-    </g>
-  </g>
-  <g
-     transform="translate(59.375211,-25.654121)"
-     id="g22311" />
-</svg>
diff --git a/colors.changes b/colors.changes
index 21efe12..3f6c3b0 100644
--- a/colors.changes
+++ b/colors.changes
@@ -1,3 +1,9 @@
+Colors-4.xo
+
+  * New toolbar icons.
+
+  -- Wade Brainerd <wadetb@gmail.com>  May 8th, 2008
+
 Colors-3.xo
 
   * Initial push of Colors!.
diff --git a/colors.py b/colors.py
index 4666f6d..c262f55 100755
--- a/colors.py
+++ b/colors.py
@@ -434,19 +434,19 @@ class Colors(activity.Activity, ExportedGObject):
 
         self.refsep = gtk.SeparatorToolItem()
 
-        self.takerefbtn = toolbutton.ToolButton('reference')
+        self.takerefbtn = toolbutton.ToolButton('take-reference')
         self.takerefbtn.set_tooltip(_("Take Reference Picture"))
         self.takerefbtn.connect('clicked', self.on_take_reference)
         self.take_reference = False
 
-        self.showrefbtn = toggletoolbutton.ToggleToolButton('zoom-out')
+        self.showrefbtn = toggletoolbutton.ToggleToolButton('show-reference')
         self.showrefbtn.set_tooltip(_("Show Reference Picture"))
         self.showrefbtn.connect('clicked', self.on_show_reference)
         self.reference_forced = False
 
         self.videopaintsep = gtk.SeparatorToolItem()
 
-        self.videopaintbtn = toggletoolbutton.ToggleToolButton('zoom-out')
+        self.videopaintbtn = toggletoolbutton.ToggleToolButton('video-paint')
         self.videopaintbtn.set_tooltip(_("Video Paint"))
         self.videopaintbtn.connect('clicked', self.on_videopaint)
         self.videopaintpreview = gtk.DrawingArea()
diff --git a/icons/palette.svg b/icons/palette.svg
index c4f10bf..eeb686c 100644
--- a/icons/palette.svg
+++ b/icons/palette.svg
@@ -1,20 +1,21 @@
-<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
-	<!ENTITY stroke_color "#010101">
-	<!ENTITY fill_color "#FFFFFF">
-]><svg enable-background="new 0 0 55 55" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="activity-paint">
-	<g display="inline">
-		<g>
-			<g>
-				<path d="M49.139,40.188c-1.117-8.426-8.688-17.675-21.995-22.376c-7.425-2.623-16.781-1.292-20.503,6.574      C2.619,32.88,10.02,43.082,20.336,42.997c6.866-0.056,13.744,2.591,17.855,5.165C42.897,51.115,50.104,47.47,49.139,40.188z       M42.398,40.273c-0.58,1.677-2.408,2.573-4.096,1.998c-1.677-0.576-2.574-2.408-1.998-4.09c0.577-1.681,2.406-2.577,4.089-2.002      C42.073,36.755,42.972,38.59,42.398,40.273z" fill="&fill_color;"/>
-			</g>
-			<g>
-				<path d="M49.139,40.188c-1.117-8.426-8.688-17.675-21.995-22.376      c-7.425-2.623-16.781-1.292-20.503,6.574C2.619,32.88,10.02,43.082,20.336,42.997c6.866-0.056,13.744,2.591,17.855,5.165      C42.897,51.115,50.104,47.47,49.139,40.188z M42.398,40.273c-0.58,1.677-2.408,2.573-4.096,1.998      c-1.677-0.576-2.574-2.408-1.998-4.09c0.577-1.681,2.406-2.577,4.089-2.002C42.073,36.755,42.972,38.59,42.398,40.273z" fill="none" stroke="&stroke_color;" stroke-width="3.5"/>
-			</g>
-		</g>
-		<g>
-			<path d="M33.104,26.905c0,0,6.854-8.475,8.649-11.625     c2.637-4.629,3.951-9.307,1.935-10.182c-1.482-0.644-5.54,2.84-7.669,6.662c-1.441,2.594-6.557,13.261-6.557,13.261     L33.104,26.905z" fill="&fill_color;" stroke="&stroke_color;" stroke-width="3.5"/>
-			<path d="M33.104,26.905l-3.676-1.908c0,0-2.889,1.954-3.99,3.899     c-1.101,1.956-1.143,5.758-3.071,7.748c-1.159,1.193-0.01,0.943-0.01,0.943s6.959-2.412,8.337-4.542     C32.062,30.935,33.104,26.905,33.104,26.905z" fill="&fill_color;" stroke="&stroke_color;" stroke-width="3.5"/>
-		</g>
-	</g>
-</g></svg>
-
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1"
+	 id="Palette" sodipodi:version="0.32" inkscape:version="0.45.1" sodipodi:docbase="F:\" sodipodi:docname="palette.svg" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://web.resource.org/cc/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" inkscape:output_extension="org.inkscape.output.svg.inkscape"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="55px" height="55px"
+	 viewBox="0 0 55 55" style="enable-background:new 0 0 55 55;" xml:space="preserve">
+<path id="_x3C_Path_x3E__5_" style="fill:#808080;stroke:#FFFFFF;stroke-width:3.5;" d="M49.139,36.188
+	c-1.117-8.423-8.688-17.67-21.995-22.375c-7.425-2.623-16.781-1.292-20.503,6.574c-4.022,8.493,3.379,18.695,13.695,18.61
+	c6.866-0.056,13.744,2.591,17.855,5.165C42.896,47.115,50.104,43.47,49.139,36.188z"/>
+<path id="_x3C_Path_x3E__4_" style="fill:#404040;" d="M42.398,36.273c-0.58,1.677-2.408,2.568-4.101,1.998
+	c-1.677-0.576-2.569-2.408-1.993-4.09c0.572-1.686,2.401-2.578,4.088-2.002C42.073,32.755,42.973,34.59,42.398,36.273z"/>
+<path id="_x3C_Path_x3E__3_" style="fill:#FFFFFF;" d="M24.065,33.523c-0.58,1.677-2.408,2.568-4.097,1.998
+	c-1.677-0.576-2.573-2.408-1.997-4.09c0.576-1.686,2.405-2.578,4.088-2.002C23.74,30.005,24.64,31.84,24.065,33.523z"/>
+<path id="_x3C_Path_x3E__2_" style="fill:#E5E5E5;" d="M16.899,30.189c-0.58,1.677-2.408,2.568-4.097,1.998
+	c-1.677-0.576-2.573-2.408-1.997-4.09c0.576-1.686,2.405-2.581,4.088-2.006C16.574,26.671,17.473,28.506,16.899,30.189z"/>
+<path id="_x3C_Path_x3E__1_" style="fill:#C0C0C0;" d="M16.982,22.19c-0.58,1.677-2.408,2.572-4.097,1.998
+	c-1.677-0.576-2.573-2.407-1.997-4.088c0.576-1.681,2.405-2.578,4.088-2.002C16.657,18.671,17.556,20.506,16.982,22.19z"/>
+<path id="_x3C_Path_x3E_" style="fill:#A6A6A6;" d="M24.898,20.356c-0.58,1.677-2.408,2.572-4.097,1.998
+	c-1.677-0.576-2.573-2.408-1.997-4.09c0.576-1.682,2.405-2.578,4.088-2.002C24.573,16.838,25.472,18.673,24.898,20.356z"/>
+</svg>
diff --git a/icons/reference.svg b/icons/reference.svg
deleted file mode 100644
index a3a81e7..0000000
--- a/icons/reference.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
-	<!ENTITY stroke_color "#010101">
-	<!ENTITY fill_color "#FFFFFF">
-]><svg enable-background="new 0 0 55 55" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="record-photo">
-	<g display="inline">
-		<polygon fill="&fill_color;" points="17.468,16.339 17.468,12.438     8.75,12.438 8.75,16.339 5,16.339 5,42.588 50,42.588 50,16.339   " stroke="&stroke_color;" stroke-linejoin="round" stroke-width="3.5"/>
-		<path d="M20.364,30.209    c0,3.94,3.197,7.137,7.138,7.137c3.937,0,7.135-3.197,7.135-7.137c0-3.937-3.198-7.141-7.135-7.141    C23.562,23.068,20.364,26.273,20.364,30.209z" fill="&fill_color;" stroke="&stroke_color;" stroke-linejoin="round" stroke-width="3.5"/>
-		<rect fill="&stroke_color;" height="4.502" width="6.748" x="39.147" y="20.522"/>
-		<rect fill="&stroke_color;" height="3.438" width="3.438" x="15.688" y="14.625"/>
-		<rect fill="&stroke_color;" height="3.438" width="3.438" x="7.062" y="14.625"/>
-	</g>
-</g></svg>
\ No newline at end of file
diff --git a/icons/show-reference.svg b/icons/show-reference.svg
new file mode 100644
index 0000000..eb97bcf
--- /dev/null
+++ b/icons/show-reference.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Show_Reference" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" width="55px" height="55px" viewBox="0 0 55 55" style="enable-background:new 0 0 55 55;" xml:space="preserve">
+<rect x="13.125" y="11.5" transform="matrix(0.9743 0.2252 -0.2252 0.9743 7.2252 -5.4698)" style="fill:#808080;stroke:#FFFFFF;stroke-width:3.5;" width="28.929" height="34.875"/>
+<rect x="17.413" y="15.3" transform="matrix(0.9743 0.2252 -0.2252 0.9743 6.7127 -5.6328)" style="fill:#FFFFFF;" width="21.27" height="22.618"/>
+</svg>
diff --git a/icons/take-reference.svg b/icons/take-reference.svg
new file mode 100644
index 0000000..2291de9
--- /dev/null
+++ b/icons/take-reference.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Take_Reference" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" width="55px" height="55px" viewBox="0 0 55 55" style="enable-background:new 0 0 55 55;" xml:space="preserve">
+<polygon style="fill:#808080;stroke:#FFFFFF;stroke-width:3.5;stroke-linejoin:round;" points="17.468,16.339 17.468,12.438 
+	8.75,12.438 8.75,16.339 5,16.339 5,42.588 50,42.588 50,16.339 "/>
+<path style="fill:none;stroke:#FFFFFF;stroke-width:3.5;stroke-linejoin:round;" d="M20.364,30.209c0,3.939,3.197,7.137,7.138,7.137
+	c3.938,0,7.135-3.197,7.135-7.137c0-3.937-3.197-7.141-7.135-7.141C23.562,23.068,20.364,26.273,20.364,30.209z"/>
+<rect x="39.146" y="20.522" style="fill:#FFFFFF;stroke:#FFFFFF;" width="6.748" height="4.502"/>
+</svg>
diff --git a/icons/video-paint.svg b/icons/video-paint.svg
new file mode 100644
index 0000000..0ad1c24
--- /dev/null
+++ b/icons/video-paint.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Video_Paint" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" width="55px" height="55px" viewBox="0 0 55 55" style="enable-background:new 0 0 55 55;" xml:space="preserve">
+<polygon style="fill:#808080;stroke:#FFFFFF;stroke-width:3.5;stroke-linejoin:round;" points="8.188,22.891 8.188,40.838 
+	16.5,40.838 12.5,48.5 19.75,48.5 23.75,40.838 23.833,40.838 27.833,48.5 35,48.5 31,40.838 38.954,40.838 38.954,35.195 
+	47.756,37.588 47.756,25.736 38.954,28.699 38.954,22.891 "/>
+<circle style="fill:#808080;stroke:#FFFFFF;stroke-width:3.5;stroke-linejoin:round;" cx="14.398" cy="14.398" r="8.147"/>
+<circle style="fill:#808080;stroke:#FFFFFF;stroke-width:3.5;stroke-linejoin:round;" cx="32.289" cy="14.398" r="8.148"/>
+</svg>
--
cgit v0.9.1