From 96157b80a0bcc466b904149cfb66a26ecf75ec24 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter@sugarlabs.org>
Date: Tue, 02 Jul 2013 05:13:36 +0000
Subject: more tweaks to rotation support

---
diff --git a/icons/notes.svg b/icons/notes.svg
index fb39918..b020ff7 100644
--- a/icons/notes.svg
+++ b/icons/notes.svg
@@ -7,24 +7,41 @@
    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.1"
    width="55"
    height="55"
    viewBox="0 0 55 55"
    id="svg2"
-   xml:space="preserve"><metadata
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="notes.svg"><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="709"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="4.2909091"
+     inkscape:cx="-13.983051"
+     inkscape:cy="27.5"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" /><metadata
      id="metadata11"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
      id="defs9" /><path
-     d="m 17.666,7.884 v 32.841 c -2.587,-0.614 -7.914,-0.612 -10.755,1.764 -5.688,4.76 -0.695,10.109 5.815,7.456 3.705,-1.512 4.94,-3.937 4.94,-7.597 V 25.997 l 30.952,-3.516 v 12.974 c -4.212,-0.615 -7.915,-0.614 -10.758,1.764 -5.688,4.76 -0.695,10.109 5.815,7.454 3.705,-1.51 4.942,-3.936 4.942,-7.596 V 4.293 L 17.666,7.884 z m 30.952,7.976 -30.952,4.029 0,-5.225 30.953,-4.102 v 5.298 z"
+     d="m 17.666,7.884 0,32.841 c -2.587,-0.614 -7.914,-0.612 -10.755,1.764 -5.688,4.76 -0.695,10.109 5.815,7.456 3.705,-1.512 4.94,-3.937 4.94,-7.597 l 0,-20.351 30.952,-3.516 0,16.974 c -4.212,-0.615 -7.915,-0.614 -10.758,1.764 -5.688,4.76 -0.695,10.109 5.815,7.454 3.705,-1.51 4.942,-3.936 4.942,-7.596 l 0,-32.784 z m 30.952,7.976 -30.952,4.029 0,-9.225 30.953,-4.102 0,9.298 z"
      id="path5"
-     style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3.5;stroke-opacity:1;display:inline" /><path
-     d="m 17.944915,44.396187 a 6.1758475,4.5444913 0 1 1 -12.3516948,0 6.1758475,4.5444913 0 1 1 12.3516948,0 z"
-     transform="matrix(0.83528021,-0.54982449,0.54982449,0.83528021,-22.937614,14.949106)"
-     id="path2985"
-     style="fill:#ffffff;fill-opacity:1;stroke:none" /><path
-     d="m 17.944915,44.396187 a 6.1758475,4.5444913 0 1 1 -12.3516948,0 6.1758475,4.5444913 0 1 1 12.3516948,0 z"
-     transform="matrix(0.83528021,-0.54982449,0.54982449,0.83528021,7.9416232,9.7054617)"
-     id="path2985-3"
-     style="fill:#ffffff;fill-opacity:1;stroke:none" /></svg>
\ No newline at end of file
+     style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:3.5;stroke-opacity:1;display:inline"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccscccccscccccccc" /></svg>
\ No newline at end of file
diff --git a/icons/octaves.svg b/icons/octaves.svg
index 2d2f945..cd25aaa 100644
--- a/icons/octaves.svg
+++ b/icons/octaves.svg
@@ -7,86 +7,31 @@
    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.1"
    width="55"
    height="55"
    viewBox="0 0 55 55"
    id="svg2"
-   xml:space="preserve"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="octaves.svg"><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="709"
-     id="namedview15"
-     showgrid="false"
-     inkscape:zoom="4.2909091"
-     inkscape:cx="-2.0974576"
-     inkscape:cy="27.5"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     showguides="true"
-     inkscape:guide-bbox="true" /><metadata
+   xml:space="preserve"><metadata
      id="metadata11"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs9" /><g
-     id="g3032"
-     transform="matrix(1.1224062,0,0,1.1224062,-0.17410391,-6.1163702)"><g
-       transform="matrix(0.88795632,0,0,1,0.16806548,0)"
-       id="g3027"><path
-         d="m 2.9285712,37.193073 49.1428578,0"
-         id="path3064"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.85714293;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         inkscape:connector-curvature="0" /><path
-         d="m 2.9285712,48.621645 49.1428578,0"
-         id="path3064-1"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.85714293;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         inkscape:connector-curvature="0" /><path
-         d="m 2.9285712,25.764502 49.1428578,0"
-         id="path3064-3"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.85714293;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         inkscape:connector-curvature="0" /></g><g
-       transform="translate(-6,-2)"
-       id="g3016"><path
-         d="m 42.854813,14.151133 0,22.857142"
-         id="path3859"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.85714293;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         inkscape:connector-curvature="0" /><path
-         d="m 36.243493,35.971854 a 4.2661055,5.3834188 30 0 0 7.389111,4.266106 4.2661055,5.3834188 30 1 0 -7.389111,-4.266106 z"
-         id="path3861"
-         style="fill:#ffffff;fill-opacity:1;stroke:none"
-         inkscape:connector-curvature="0" /></g><g
-       transform="matrix(1,0,0,0.86765466,0,4.8499961)"
-       id="g3020"><path
-         d="m 12.634663,18.129921 0,22.857143"
-         id="path3859-6"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.85714293;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         inkscape:connector-curvature="0" /><path
-         d="M 6.0233427,39.950643 A 4.2661055,5.3834188 30 1 0 13.412454,44.216748 4.2661055,5.3834188 30 0 0 6.0233427,39.950643 z"
-         id="path3861-8"
-         style="fill:#ffffff;fill-opacity:1;stroke:none"
-         inkscape:connector-curvature="0" /><path
-         d="m 23.675274,6.7009691 0,22.8571429"
-         id="path3859-63"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.85714293;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         inkscape:connector-curvature="0" /><path
-         d="m 17.063954,28.521691 a 4.2661059,5.3834192 30 0 0 7.389112,4.266106 4.2661059,5.3834192 30 1 0 -7.389112,-4.266106 z"
-         id="path3861-6"
-         style="fill:#ffffff;fill-opacity:1;stroke:none"
-         inkscape:connector-curvature="0" /><path
-         d="M 13.146661,17.716095 23.158643,6.9497838"
-         id="path3902"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:4;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         inkscape:connector-curvature="0" /></g></g></svg>
\ No newline at end of file
+     id="defs9" /><path
+     d="m 12.517176,49.301882 c 0.647737,-0.193553 1.757707,0.299504 2.575609,-1.834902 0.483736,-1.262363 -0.507138,-3.296529 -1.828314,-3.58298 -1.326772,-0.287664 -3.023451,1.168667 -3.4360789,2.462039 -0.3980445,1.247661 0.3992769,2.836376 1.3810199,3.703138 1.236012,1.091252 3.267974,1.372577 4.857411,0.934117 1.488145,-0.410518 3.171168,-1.565407 3.456236,-3.082588 0.347427,-1.849066 -0.121069,-3.781924 -0.373648,-5.698117 -1.170046,-8.876574 -3.996508,-17.391184 -5.604705,-26.342118 -0.429978,-2.393179 -0.101009,-5.05783 1.414353,-6.9593727 0.609033,-0.7642412 1.672049,-1.5322354 2.542274,-1.0876078 1.197117,0.6116476 0.793061,2.6944445 0.434118,3.9899605 -0.71775,2.590543 -2.156321,3.616371 -3.643451,5.458196 -1.882917,2.332011 -6.0448687,5.812774 -7.3050981,8.532236 -1.4517284,3.1327 -1.2039678,5.112554 -0.074431,8.375294 0.9291933,2.684036 3.4129581,4.979255 6.0717641,5.978353 1.985445,0.74607 4.510088,0.678005 6.352,-0.373648 1.889914,-1.07906 3.431693,-3.251901 3.643059,-5.417882 0.26566,-2.722366 -0.83512,-6.151386 -3.176,-7.566353 -1.551282,-0.937687 -3.950965,-0.610927 -5.517882,0.300392 -1.470805,0.855421 -2.69944,2.307894 -3.062432,3.970196 -0.26975,1.235309 0.225483,3.080234 0.920549,4.136471 0.593428,0.901785 1.966495,2.5585 2.708941,1.774824 0.903742,-0.953929 -2.229845,-1.866187 -2.335294,-3.176 -0.115102,-1.429717 0.754155,-2.977041 1.99498,-3.69655 1.159514,-0.672358 2.813622,-0.600894 3.983373,0.05349 1.64308,0.919177 2.645372,2.68788 2.642667,4.570588 -0.0021,1.433665 -0.707849,2.846411 -1.895373,3.649647 -1.426708,0.965019 -3.33562,1.338634 -5.044235,1.120941 -1.630032,-0.20768 -3.207162,-1.10162 -4.3903528,-2.241881 C 8.7041613,36.18775 7.7616252,34.755906 7.5663529,33.235059 7.345143,31.512201 8.0313852,29.709697 8.8741176,28.190824 10.519709,25.224942 13.874282,23.546531 15.88,20.811294 18.071252,17.82304 19.49693,14.812162 19.523059,11.470118 19.545397,8.6130334 18.304968,3.9158712 16.467215,3.7033729 14.629462,3.4908745 14.167109,4.8792542 13.043921,7.1871376 11.920733,9.495021 12.094217,12.691231 12.517178,15.019765 c 1.96074,10.7945 4.873238,20.222785 5.698118,31.573177 0.0919,1.264528 -0.417686,2.435456 -1.400785,3.236078 -0.644236,0.524656 -1.136248,0.685311 -1.962039,0.593804 -0.85821,-0.0951 -2.267916,-0.260112 -2.335296,-1.120942 z"
+     id="path3757"
+     style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:0.94117647" /><g
+     id="g3797"><path
+       d="m 28.243605,33.032751 c 3.402262,-1.341368 7.477036,-3.584483 10.460595,-6.371453 2.127362,-1.987188 4.213259,-4.341003 5.040105,-7.132223 0.459528,-1.551248 0.346071,-3.323493 -0.190193,-4.849912 -0.60101,-1.710711 -1.706573,-3.396204 -3.233275,-4.374431 -1.308623,-0.8384943 -4.184238,-0.9509628 -4.564623,-0.9509628 -0.380385,0 -3.790507,0.428269 -5.135201,1.6166378 -1.201088,1.061457 -2.229078,2.788412 -1.997022,4.37443 0.195131,1.33365 1.366488,2.673563 2.662696,3.043082 1.147521,0.327132 2.799992,-0.02866 3.423468,-1.046059 0.571838,-0.933133 0.16217,-2.420369 -0.570578,-3.233275 -0.309019,-0.342823 -0.872813,-0.327805 -1.331349,-0.380385 -0.630635,-0.07231 -1.341912,0.393955 -1.901926,0.0951 -0.163067,-0.08702 -0.291307,-0.290746 -0.285289,-0.475482 0.03263,-1.001872 0.840974,-1.975927 1.711734,-2.472504 1.545937,-0.881616 3.812341,-1.3173158 5.325393,-0.380385 1.981889,1.227249 2.607242,4.13611 2.662697,6.466549 0.06726,2.826617 -1.31119,5.617975 -2.852889,7.988091 -0.978054,1.503602 -3.518564,3.328371 -3.898949,3.708756 -0.380385,0.380385 -3.955634,2.725601 -5.800875,3.61366 -0.06746,0.291336 0.184487,0.691846 0.475481,0.760766 z"
+       id="path3759"
+       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.94117647" /><path
+       d="m 42.603147,36.170929 a 0.85586685,0.95096314 0 1 1 -1.711734,0 0.85586685,0.95096314 0 1 1 1.711734,0 z"
+       transform="matrix(0.69553117,0,0,0.62597808,18.226331,-9.4845886)"
+       id="path3763"
+       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0.94117647;stroke-dasharray:none" /><path
+       d="m 42.603147,36.170929 a 0.85586685,0.95096314 0 1 1 -1.711734,0 0.85586685,0.95096314 0 1 1 1.711734,0 z"
+       transform="matrix(0.69553117,0,0,0.62597808,18.226333,-1.7817854)"
+       id="path3763-7"
+       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0.94117647;stroke-dasharray:none" /></g><g
+     transform="translate(-24.6,3.8)"
+     id="text2993"
+     style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:0.94117647;font-family:Sans" /></svg>
\ No newline at end of file
diff --git a/measure.py b/measure.py
index 9b4ec5c..4b5b12f 100644
--- a/measure.py
+++ b/measure.py
@@ -286,6 +286,8 @@ class MeasureActivity(activity.Activity):
             if not self._extra_tools in self._extras_toolbar_item:
                 self._extras_toolbar_item.add(self._extra_tools)
             self._extras_toolbar_item.show()
+            self.sensor_toolbar.log_label.hide()
+            self.sensor_toolbar.trigger_label.hide()
         else:
             self._extras_button.hide()
             if self._extra_tools in self._extras_toolbar_item:
@@ -295,6 +297,8 @@ class MeasureActivity(activity.Activity):
             if self._extras_button.is_expanded():
                 self._extras_button.set_expanded(False)
             self._extras_toolbar_item.hide()
+            self.sensor_toolbar.log_label.show()
+            self.sensor_toolbar.trigger_label.show()
         self._extra_tools.show()
 
     def on_quit(self, data=None):
diff --git a/sensor_toolbar.py b/sensor_toolbar.py
index 0737917..a3c6fae 100644
--- a/sensor_toolbar.py
+++ b/sensor_toolbar.py
@@ -118,9 +118,9 @@ of XO)") + ' '
         self.insert(separator, -1)
 
         self._log_value = LOG_TIMER_VALUES[1]
-        self._log_label = gtk.Label(self._log_to_string(self._log_value))
+        self.log_label = gtk.Label(self._log_to_string(self._log_value))
         toolitem = gtk.ToolItem()
-        toolitem.add(self._log_label)
+        toolitem.add(self.log_label)
         self.insert(toolitem, -1)
 
         self._log_button = ToolButton('timer-10')
@@ -140,7 +140,8 @@ of XO)") + ' '
         self.insert(separator, -1)
 
         toolitem = gtk.ToolItem()
-        toolitem.add(gtk.Label(_('Select trigger')))
+        self.trigger_label = gtk.Label(_('Trigger'))
+        toolitem.add(self.trigger_label)
         self.insert(toolitem, -1)
 
         # Set up Trigger Combo box
@@ -181,7 +182,7 @@ of XO)") + ' '
 
     def set_log_idx(self, idx):
         self._log_value = LOG_TIMER_VALUES[idx]
-        self._log_label.set_text(self._log_to_string(self._log_value))
+        self.log_label.set_text(self._log_to_string(self._log_value))
         if hasattr(self, '_log_button'):
             self._log_button.set_icon('timer-%d' % (self._log_value))
 
--
cgit v0.9.1