toggle toolbar button statesv5

8 files changed, 234 insertions, 8 deletions

diff --git a/MANIFEST b/MANIFEST
index 8be0c7c..a27ca74 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -14,10 +14,14 @@ images/D.svg
 images/reticule.svg
 images/C.svg
 po/Sliderule.pot
-icons/blank-out.svg
-icons/buxton.svg
-icons/blank-in.svg
+
+
+
 constants.py
 sprite_factory.py
 activity/activity-sliderule.png
 images/tab.svg
+A.py
+images/A.svg
+icons/A.svg
+icons/C.svg
diff --git a/NEWS b/NEWS
index 7273067..59f1437 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+5
+
+* toggle toolbar button states
+
 4
 
 * fixed typos in pre-0.86 code
diff --git a/SlideruleActivity.py b/SlideruleActivity.py
index ab89891..417a4da 100644
--- a/SlideruleActivity.py
+++ b/SlideruleActivity.py
@@ -68,7 +68,7 @@ class SlideruleActivity(activity.Activity):
             activity_button.show()
 
             # C slider
-            self.c_slider = ToolButton( "C" )
+            self.c_slider = ToolButton( "Con" )
             self.c_slider.set_tooltip(_('C'))
             self.c_slider.props.sensitive = True
             self.c_slider.connect('clicked', self._c_slider_cb)
@@ -76,7 +76,7 @@ class SlideruleActivity(activity.Activity):
             self.c_slider.show()
 
             # A slider
-            self.a_slider = ToolButton( "A" )
+            self.a_slider = ToolButton( "Aoff" )
             self.a_slider.set_tooltip(_('A'))
             self.a_slider.props.sensitive = True
             self.a_slider.connect('clicked', self._a_slider_cb)
@@ -155,6 +155,8 @@ class SlideruleActivity(activity.Activity):
         return True
 
     def _show_c(self):
+        self.c_slider.set_icon("Con")
+        self.a_slider.set_icon("Aoff")
         hide(self.tw.A.spr)
         self.tw.C.draw_slider(1000)
         self.tw.C_tab_left.draw_slider(1000)
@@ -166,6 +168,8 @@ class SlideruleActivity(activity.Activity):
         return True
 
     def _show_a(self):
+        self.c_slider.set_icon("Coff")
+        self.a_slider.set_icon("Aon")
         hide(self.tw.C.spr)
         hide(self.tw.C_tab_left.spr)
         hide(self.tw.C_tab_right.spr)
@@ -199,7 +203,7 @@ class ProjectToolbar(gtk.Toolbar):
         self.activity = pc
 
         # C slider
-        self.activity.c_sliders = ToolButton( "C" )
+        self.activity.c_sliders = ToolButton( "Con" )
         self.activity.c_sliders.set_tooltip(_('C'))
         self.activity.c_sliders.props.sensitive = True
         self.activity.c_sliders.connect('clicked', self.activity._c_slider_cb)
@@ -207,7 +211,7 @@ class ProjectToolbar(gtk.Toolbar):
         self.activity.c_sliders.show()
 
         # A slider
-        self.activity.a_sliders = ToolButton( "A" )
+        self.activity.a_sliders = ToolButton( "Aoff" )
         self.activity.a_sliders.set_tooltip(_('A'))
         self.activity.a_sliders.props.sensitive = True
         self.activity.a_sliders.connect('clicked', self.activity._a_slider_cb)
diff --git a/activity/activity.info b/activity/activity.info
index 95167df..9d0425c 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,6 +1,6 @@
 [Activity]
 name = Sliderule
-activity_version = 4
+activity_version = 5
 license = GPLv3
 bundle_id = org.sugarlabs.SlideruleActivity
 exec = sugar-activity SlideruleActivity.SlideruleActivity
diff --git a/icons/Aoff.svg b/icons/Aoff.svg
new file mode 100644
index 0000000..61f4d34
--- /dev/null
+++ b/icons/Aoff.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- 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="55"
+   height="55"
+   id="svg2">
+  <defs
+     id="defs4" />
+  <rect
+     style="fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:4.05900620999999973;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     id="rect2817"
+     width="50.94099"
+     height="50.940994"
+     x="2.0295048"
+     y="2.0295029"
+     ry="7.0263433"
+     rx="8.1506357" />
+  <text
+     x="13.496094"
+     y="42.060547"
+     id="text2394"
+     xml:space="preserve"
+     style="font-size:40px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"><tspan
+       x="13.496094"
+       y="42.060547"
+       id="tspan2396">A</tspan></text>
+</svg>
diff --git a/icons/Aon.svg b/icons/Aon.svg
new file mode 100644
index 0000000..a434afb
--- /dev/null
+++ b/icons/Aon.svg
@@ -0,0 +1,77 @@
+<?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"
+   version="1.0"
+   width="55"
+   height="55"
+   id="svg2"
+   inkscape:version="0.47pre4 r22446"
+   sodipodi:docname="Aon.svg">
+  <metadata
+     id="metadata9">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </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="1680"
+     inkscape:window-height="972"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="13.181818"
+     inkscape:cx="14.110345"
+     inkscape:cy="27.5"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 27.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="55 : 27.5 : 1"
+       inkscape:persp3d-origin="27.5 : 18.333333 : 1"
+       id="perspective11" />
+  </defs>
+  <rect
+     style="fill:#000000;fill-opacity:1;stroke:#808080;stroke-width:4.05900620999999973;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     id="rect2817"
+     width="50.94099"
+     height="50.940994"
+     x="2.0295048"
+     y="2.0295029"
+     ry="7.0263433"
+     rx="8.1506357" />
+  <text
+     x="13.496094"
+     y="42.060547"
+     id="text2394"
+     xml:space="preserve"
+     style="font-size:40px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"><tspan
+       x="13.496094"
+       y="42.060547"
+       id="tspan2396">A</tspan></text>
+</svg>
diff --git a/icons/Coff.svg b/icons/Coff.svg
new file mode 100644
index 0000000..b95814a
--- /dev/null
+++ b/icons/Coff.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- 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="55"
+   height="55"
+   id="svg2">
+  <defs
+     id="defs4" />
+  <rect
+     style="fill:#808080;fill-opacity:1;stroke:#808080;stroke-width:4.05900620999999973;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     id="rect2817"
+     width="50.94099"
+     height="50.940994"
+     x="2.0295048"
+     y="2.0295029"
+     ry="7.0263433"
+     rx="8.1506357" />
+  <text
+     x="13.496094"
+     y="42.060547"
+     id="text2394"
+     xml:space="preserve"
+     style="font-size:40px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"><tspan
+       x="13.496094"
+       y="42.060547"
+       id="tspan2396">C</tspan></text>
+</svg>
diff --git a/icons/Con.svg b/icons/Con.svg
new file mode 100644
index 0000000..e92b0b1
--- /dev/null
+++ b/icons/Con.svg
@@ -0,0 +1,77 @@
+<?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"
+   version="1.0"
+   width="55"
+   height="55"
+   id="svg2"
+   inkscape:version="0.47pre4 r22446"
+   sodipodi:docname="Aon.svg">
+  <metadata
+     id="metadata9">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </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="1680"
+     inkscape:window-height="972"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="13.181818"
+     inkscape:cx="14.110345"
+     inkscape:cy="27.5"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 27.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="55 : 27.5 : 1"
+       inkscape:persp3d-origin="27.5 : 18.333333 : 1"
+       id="perspective11" />
+  </defs>
+  <rect
+     style="fill:#000000;fill-opacity:1;stroke:#808080;stroke-width:4.05900620999999973;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     id="rect2817"
+     width="50.94099"
+     height="50.940994"
+     x="2.0295048"
+     y="2.0295029"
+     ry="7.0263433"
+     rx="8.1506357" />
+  <text
+     x="13.496094"
+     y="42.060547"
+     id="text2394"
+     xml:space="preserve"
+     style="font-size:40px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"><tspan
+       x="13.496094"
+       y="42.060547"
+       id="tspan2396">C</tspan></text>
+</svg>