[tuxdroid-svn] r952 - in software/gadgets/tux_controller/trunk: . TuxController TuxController/Pictu
Status: Beta
Brought to you by:
ks156
From: jerome <c2m...@c2...> - 2008-03-26 13:42:36
|
Author: jerome Date: 2008-03-26 14:42:27 +0100 (Wed, 26 Mar 2008) New Revision: 952 Modified: software/gadgets/tux_controller/trunk/TuxController.tgf software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/eyel_close.png software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/eyer_close.png software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/ledl_off.png software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/ledl_on.png software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/ledr_off.png software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/ledr_on.png software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/GUI/widget/other.glade software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/GUI/widget/other.pyp software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/init.pyp software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/main.pyp software/gadgets/tux_controller/trunk/TuxController/Strings/fr_ALL.xml software/gadgets/tux_controller/trunk/TuxController/about.xml software/gadgets/tux_controller/trunk/TuxController/settings.xml software/gadgets/tux_controller/trunk/TuxController/strings.xml Log: * New tux controller version hidden in manager. Modified: software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/eyel_close.png =================================================================== (Binary files differ) Modified: software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/eyer_close.png =================================================================== (Binary files differ) Modified: software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/ledl_off.png =================================================================== (Binary files differ) Modified: software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/ledl_on.png =================================================================== (Binary files differ) Modified: software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/ledr_off.png =================================================================== (Binary files differ) Modified: software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/ledr_on.png =================================================================== (Binary files differ) Modified: software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/GUI/widget/other.glade =================================================================== --- software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/GUI/widget/other.glade 2008-03-26 13:36:45 UTC (rev 951) +++ software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/GUI/widget/other.glade 2008-03-26 13:42:27 UTC (rev 952) @@ -44,7 +44,7 @@ <child> <widget class="GtkFixed" id="fixed13"> - <property name="height_request">57</property> + <property name="height_request">77</property> <property name="visible">True</property> <child> @@ -82,22 +82,6 @@ <property name="visible">True</property> <child> - <widget class="GtkImage" id="imgSpin"> - <property name="width_request">367</property> - <property name="height_request">83</property> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="x">40</property> - <property name="y">0</property> - </packing> - </child> - - <child> <widget class="GtkButton" id="btnSpinLeft"> <property name="width_request">34</property> <property name="height_request">34</property> @@ -264,6 +248,22 @@ <property name="y">24</property> </packing> </child> + + <child> + <widget class="GtkImage" id="imgSpin"> + <property name="width_request">367</property> + <property name="height_request">83</property> + <property name="visible">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="x">40</property> + <property name="y">0</property> + </packing> + </child> </widget> <packing> <property name="left_attach">0</property> @@ -669,7 +669,8 @@ <child> <widget class="GtkFixed" id="fix1"> - <property name="height_request">21</property> + <property name="width_request">360</property> + <property name="height_request">77</property> <property name="visible">True</property> <child> @@ -685,42 +686,42 @@ <property name="update_policy">GTK_UPDATE_ALWAYS</property> <property name="snap_to_ticks">False</property> <property name="wrap">False</property> - <property name="adjustment">1 0 127 1 10 10</property> + <property name="adjustment">1 1 127 1 10 10</property> </widget> <packing> <property name="x">70</property> - <property name="y">15</property> + <property name="y">25</property> </packing> </child> <child> - <widget class="GtkVSeparator" id="vseparator19"> + <widget class="GtkVSeparator" id="vseparator18"> <property name="width_request">16</property> - <property name="height_request">50</property> + <property name="height_request">71</property> <property name="visible">True</property> </widget> <packing> - <property name="x">20</property> - <property name="y">4</property> + <property name="x">0</property> + <property name="y">3</property> </packing> </child> <child> - <widget class="GtkVSeparator" id="vseparator18"> + <widget class="GtkVSeparator" id="vseparator19"> <property name="width_request">16</property> - <property name="height_request">50</property> + <property name="height_request">71</property> <property name="visible">True</property> </widget> <packing> - <property name="x">0</property> - <property name="y">4</property> + <property name="x">20</property> + <property name="y">3</property> </packing> </child> <child> <widget class="GtkLabel" id="lblLED"> <property name="width_request">16</property> - <property name="height_request">51</property> + <property name="height_request">71</property> <property name="visible">True</property> <property name="label" translatable="yes"> </property> <property name="use_underline">False</property> @@ -822,11 +823,73 @@ </widget> <packing> <property name="x">30</property> - <property name="y">11</property> + <property name="y">21</property> </packing> </child> <child> + <widget class="GtkRadioButton" id="radLEDGradient"> + <property name="width_request">88</property> + <property name="height_request">22</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Gradient</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="x">144</property> + <property name="y">47</property> + </packing> + </child> + + <child> + <widget class="GtkRadioButton" id="radLEDFading"> + <property name="width_request">88</property> + <property name="height_request">22</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Fading</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <property name="group">radLEDGradient</property> + </widget> + <packing> + <property name="x">144</property> + <property name="y">27</property> + </packing> + </child> + + <child> + <widget class="GtkRadioButton" id="radLEDNone"> + <property name="width_request">88</property> + <property name="height_request">22</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">None</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <property name="group">radLEDGradient</property> + </widget> + <packing> + <property name="x">144</property> + <property name="y">8</property> + </packing> + </child> + + <child> <widget class="GtkLabel" id="lblFrequency"> <property name="width_request">144</property> <property name="height_request">16</property> @@ -847,8 +910,8 @@ <property name="angle">0</property> </widget> <packing> - <property name="x">160</property> - <property name="y">7</property> + <property name="x">230</property> + <property name="y">0</property> </packing> </child> @@ -867,21 +930,21 @@ <signal name="value_changed" handler="on_slideLED_value_changed" last_modification_time="Thu, 15 Nov 2007 08:37:21 GMT"/> </widget> <packing> - <property name="x">160</property> - <property name="y">15</property> + <property name="x">230</property> + <property name="y">6</property> </packing> </child> <child> - <widget class="GtkLabel" id="label27"> - <property name="width_request">73</property> + <widget class="GtkLabel" id="lblIntensity"> + <property name="width_request">144</property> <property name="height_request">16</property> <property name="visible">True</property> - <property name="label" translatable="yes">Cycles</property> + <property name="label" translatable="yes">label19</property> <property name="use_underline">False</property> <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_CENTER</property> - <property name="wrap">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> <property name="selectable">False</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> @@ -893,10 +956,30 @@ <property name="angle">0</property> </widget> <packing> - <property name="x">63</property> - <property name="y">0</property> + <property name="x">230</property> + <property name="y">33</property> </packing> </child> + + <child> + <widget class="GtkHScale" id="slideLEDintensity"> + <property name="width_request">160</property> + <property name="height_request">32</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="draw_value">True</property> + <property name="value_pos">GTK_POS_RIGHT</property> + <property name="digits">0</property> + <property name="update_policy">GTK_UPDATE_CONTINUOUS</property> + <property name="inverted">False</property> + <property name="adjustment">10 0 11 1 1 1</property> + <signal name="change_value" handler="on_slideLEDintensity_change_value" last_modification_time="Fri, 25 Jan 2008 09:32:02 GMT"/> + </widget> + <packing> + <property name="x">230</property> + <property name="y">39</property> + </packing> + </child> </widget> <packing> <property name="left_attach">1</property> @@ -909,6 +992,7 @@ <child> <widget class="GtkFixed" id="fix2"> + <property name="width_request">360</property> <property name="height_request">79</property> <property name="visible">True</property> @@ -924,7 +1008,7 @@ <property name="update_policy">GTK_UPDATE_ALWAYS</property> <property name="snap_to_ticks">False</property> <property name="wrap">False</property> - <property name="adjustment">1 0 127 1 10 10</property> + <property name="adjustment">1 1 127 1 10 10</property> </widget> <packing> <property name="x">72</property> @@ -945,18 +1029,6 @@ </child> <child> - <widget class="GtkVSeparator" id="vseparator10"> - <property name="width_request">16</property> - <property name="height_request">73</property> - <property name="visible">True</property> - </widget> - <packing> - <property name="x">0</property> - <property name="y">3</property> - </packing> - </child> - - <child> <widget class="GtkLabel" id="lblEyes"> <property name="width_request">16</property> <property name="height_request">73</property> @@ -1066,30 +1138,59 @@ </child> <child> - <widget class="GtkLabel" id="label26"> - <property name="width_request">73</property> - <property name="height_request">16</property> + <widget class="GtkRadioButton" id="radEyesCycles"> + <property name="width_request">66</property> + <property name="height_request">22</property> <property name="visible">True</property> - <property name="label" translatable="yes">Cycles</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_CENTER</property> - <property name="wrap">True</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">cycles +</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_radEyesCycles_toggled" last_modification_time="Thu, 24 Jan 2008 09:02:18 GMT"/> </widget> <packing> - <property name="x">63</property> - <property name="y">11</property> + <property name="x">144</property> + <property name="y">17</property> </packing> </child> + + <child> + <widget class="GtkRadioButton" id="radEyesSec"> + <property name="width_request">66</property> + <property name="height_request">22</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">sec.</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <property name="group">radEyesCycles</property> + </widget> + <packing> + <property name="x">144</property> + <property name="y">37</property> + </packing> + </child> + + <child> + <widget class="GtkVSeparator" id="vseparator10"> + <property name="width_request">16</property> + <property name="height_request">73</property> + <property name="visible">True</property> + </widget> + <packing> + <property name="x">0</property> + <property name="y">3</property> + </packing> + </child> </widget> <packing> <property name="left_attach">1</property> @@ -1103,6 +1204,7 @@ <child> <widget class="GtkFixed" id="fix3"> + <property name="width_request">360</property> <property name="height_request">62</property> <property name="visible">True</property> @@ -1118,11 +1220,11 @@ <property name="update_policy">GTK_UPDATE_ALWAYS</property> <property name="snap_to_ticks">False</property> <property name="wrap">False</property> - <property name="adjustment">1 0 127 1 10 10</property> + <property name="adjustment">1 1 127 1 10 10</property> </widget> <packing> <property name="x">70</property> - <property name="y">23</property> + <property name="y">16</property> </packing> </child> @@ -1255,35 +1357,53 @@ </widget> <packing> <property name="x">30</property> - <property name="y">18</property> + <property name="y">12</property> </packing> </child> <child> - <widget class="GtkLabel" id="label25"> - <property name="width_request">73</property> - <property name="height_request">16</property> + <widget class="GtkRadioButton" id="radMouthCycles"> + <property name="width_request">66</property> + <property name="height_request">22</property> <property name="visible">True</property> - <property name="label" translatable="yes">Cycles</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_CENTER</property> - <property name="wrap">True</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">cycles +</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_radMouthCycles_toggled" last_modification_time="Thu, 24 Jan 2008 09:20:35 GMT"/> </widget> <packing> - <property name="x">63</property> - <property name="y">8</property> + <property name="x">144</property> + <property name="y">7</property> </packing> </child> + + <child> + <widget class="GtkRadioButton" id="radMouthSec"> + <property name="width_request">66</property> + <property name="height_request">22</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">sec. +</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <property name="group">radMouthCycles</property> + </widget> + <packing> + <property name="x">144</property> + <property name="y">27</property> + </packing> + </child> </widget> <packing> <property name="left_attach">1</property> @@ -1297,6 +1417,7 @@ <child> <widget class="GtkFixed" id="fix4"> + <property name="width_request">360</property> <property name="height_request">142</property> <property name="visible">True</property> @@ -1312,7 +1433,7 @@ <property name="update_policy">GTK_UPDATE_ALWAYS</property> <property name="snap_to_ticks">False</property> <property name="wrap">False</property> - <property name="adjustment">1 0 127 1 10 10</property> + <property name="adjustment">1 1 127 1 10 10</property> </widget> <packing> <property name="x">70</property> @@ -1454,26 +1575,48 @@ </child> <child> - <widget class="GtkHScale" id="slideWings"> - <property name="width_request">160</property> - <property name="height_request">32</property> + <widget class="GtkRadioButton" id="radWingsCycles"> + <property name="width_request">66</property> + <property name="height_request">22</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="draw_value">True</property> - <property name="value_pos">GTK_POS_RIGHT</property> - <property name="digits">0</property> - <property name="update_policy">GTK_UPDATE_CONTINUOUS</property> - <property name="inverted">False</property> - <property name="adjustment">5 1 5 1 0 0</property> - <signal name="value_changed" handler="on_slideWings_value_changed" last_modification_time="Thu, 15 Nov 2007 08:42:15 GMT"/> + <property name="label" translatable="yes">cycles</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_radWingsCycles_toggled" last_modification_time="Thu, 24 Jan 2008 09:38:21 GMT"/> </widget> <packing> - <property name="x">160</property> - <property name="y">55</property> + <property name="x">144</property> + <property name="y">49</property> </packing> </child> <child> + <widget class="GtkRadioButton" id="radWingsSec"> + <property name="width_request">66</property> + <property name="height_request">22</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">sec.</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <property name="group">radWingsCycles</property> + </widget> + <packing> + <property name="x">144</property> + <property name="y">69</property> + </packing> + </child> + + <child> <widget class="GtkLabel" id="lblWingsPWM"> <property name="width_request">144</property> <property name="height_request">16</property> @@ -1494,34 +1637,28 @@ <property name="angle">0</property> </widget> <packing> - <property name="x">160</property> + <property name="x">230</property> <property name="y">47</property> </packing> </child> <child> - <widget class="GtkLabel" id="label24"> - <property name="width_request">73</property> - <property name="height_request">16</property> + <widget class="GtkHScale" id="slideWings"> + <property name="width_request">160</property> + <property name="height_request">32</property> <property name="visible">True</property> - <property name="label" translatable="yes">Cycles</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_CENTER</property> - <property name="wrap">True</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> + <property name="can_focus">True</property> + <property name="draw_value">True</property> + <property name="value_pos">GTK_POS_RIGHT</property> + <property name="digits">0</property> + <property name="update_policy">GTK_UPDATE_CONTINUOUS</property> + <property name="inverted">False</property> + <property name="adjustment">5 1 5 1 0 0</property> + <signal name="value_changed" handler="on_slideWings_value_changed" last_modification_time="Thu, 15 Nov 2007 08:42:15 GMT"/> </widget> <packing> - <property name="x">63</property> - <property name="y">43</property> + <property name="x">232</property> + <property name="y">56</property> </packing> </child> </widget> @@ -1537,6 +1674,7 @@ <child> <widget class="GtkFixed" id="fix5"> + <property name="width_request">360</property> <property name="height_request">83</property> <property name="visible">True</property> @@ -1552,7 +1690,7 @@ <property name="update_policy">GTK_UPDATE_ALWAYS</property> <property name="snap_to_ticks">False</property> <property name="wrap">False</property> - <property name="adjustment">1 0 127 1 10 10</property> + <property name="adjustment">1 1 127 1 10 10</property> </widget> <packing> <property name="x">70</property> @@ -1694,6 +1832,32 @@ </child> <child> + <widget class="GtkLabel" id="lblCyclesSpin"> + <property name="width_request">73</property> + <property name="height_request">16</property> + <property name="visible">True</property> + <property name="label" translatable="yes">Cycles</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_CENTER</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="x">63</property> + <property name="y">14</property> + </packing> + </child> + + <child> <widget class="GtkRadioButton" id="radSpinDirLeft"> <property name="width_request">136</property> <property name="height_request">24</property> @@ -1709,7 +1873,7 @@ </widget> <packing> <property name="x">60</property> - <property name="y">58</property> + <property name="y">62</property> </packing> </child> @@ -1730,31 +1894,53 @@ </widget> <packing> <property name="x">204</property> - <property name="y">58</property> + <property name="y">62</property> </packing> </child> <child> - <widget class="GtkHScale" id="slideSpin"> - <property name="width_request">160</property> - <property name="height_request">32</property> + <widget class="GtkRadioButton" id="radSpinSec"> + <property name="width_request">66</property> + <property name="height_request">22</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="draw_value">True</property> - <property name="value_pos">GTK_POS_RIGHT</property> - <property name="digits">0</property> - <property name="update_policy">GTK_UPDATE_CONTINUOUS</property> - <property name="inverted">False</property> - <property name="adjustment">5 1 5 1 0 0</property> - <signal name="value_changed" handler="on_slideSpin_value_changed" last_modification_time="Thu, 15 Nov 2007 08:42:21 GMT"/> + <property name="label" translatable="yes">sec.</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> </widget> <packing> - <property name="x">160</property> - <property name="y">26</property> + <property name="x">144</property> + <property name="y">41</property> </packing> </child> <child> + <widget class="GtkRadioButton" id="radSpinCycles"> + <property name="width_request">66</property> + <property name="height_request">22</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">cycles</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <property name="group">radSpinSec</property> + <signal name="toggled" handler="on_radSpinCycles_toggled" last_modification_time="Thu, 24 Jan 2008 10:02:29 GMT"/> + </widget> + <packing> + <property name="x">144</property> + <property name="y">21</property> + </packing> + </child> + + <child> <widget class="GtkLabel" id="lblSpinPWM"> <property name="width_request">144</property> <property name="height_request">16</property> @@ -1775,34 +1961,28 @@ <property name="angle">0</property> </widget> <packing> - <property name="x">160</property> + <property name="x">230</property> <property name="y">18</property> </packing> </child> <child> - <widget class="GtkLabel" id="lblCyclesSpin"> - <property name="width_request">73</property> - <property name="height_request">16</property> + <widget class="GtkHScale" id="slideSpin"> + <property name="width_request">160</property> + <property name="height_request">32</property> <property name="visible">True</property> - <property name="label" translatable="yes">Cycles</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_CENTER</property> - <property name="wrap">True</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> + <property name="can_focus">True</property> + <property name="draw_value">True</property> + <property name="value_pos">GTK_POS_RIGHT</property> + <property name="digits">0</property> + <property name="update_policy">GTK_UPDATE_CONTINUOUS</property> + <property name="inverted">False</property> + <property name="adjustment">5 1 5 1 0 0</property> + <signal name="value_changed" handler="on_slideSpin_value_changed" last_modification_time="Thu, 15 Nov 2007 08:42:21 GMT"/> </widget> <packing> - <property name="x">63</property> - <property name="y">14</property> + <property name="x">230</property> + <property name="y">26</property> </packing> </child> </widget> @@ -2012,229 +2192,271 @@ <property name="spacing">0</property> <child> - <widget class="GtkFixed" id="fixed34"> + <widget class="GtkHBox" id="hbox21"> <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> <child> - <widget class="GtkCheckButton" id="chkLEDLeft"> - <property name="width_request">20</property> - <property name="height_request">20</property> + <widget class="GtkFixed" id="fixed34"> + <property name="width_request">220</property> + <property name="height_request">79</property> <property name="visible">True</property> - <property name="label" translatable="yes"> + + <child> + <widget class="GtkCheckButton" id="chkLEDLeft"> + <property name="width_request">20</property> + <property name="height_request">20</property> + <property name="visible">True</property> + <property name="label" translatable="yes"> </property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">False</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_chkLEDLeft_toggled" last_modification_time="Thu, 15 Nov 2007 10:15:58 GMT"/> - </widget> - <packing> - <property name="x">100</property> - <property name="y">24</property> - </packing> - </child> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">False</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_chkLEDLeft_toggled" last_modification_time="Thu, 15 Nov 2007 10:15:58 GMT"/> + </widget> + <packing> + <property name="x">100</property> + <property name="y">24</property> + </packing> + </child> - <child> - <widget class="GtkCheckButton" id="chkLEDRight"> - <property name="width_request">20</property> - <property name="height_request">20</property> - <property name="visible">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">False</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_chkLEDRight_toggled" last_modification_time="Thu, 15 Nov 2007 10:15:35 GMT"/> - </widget> - <packing> - <property name="x">73</property> - <property name="y">24</property> - </packing> - </child> - - <child> - <widget class="GtkButton" id="btnEyesClose"> - <property name="width_request">34</property> - <property name="height_request">34</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="relief">GTK_RELIEF_NONE</property> - <property name="focus_on_click">False</property> - <signal name="clicked" handler="on_btnEyesClose_released" last_modification_time="Thu, 06 Dec 2007 14:29:18 GMT"/> - <child> - <widget class="GtkAlignment" id="alignment3"> + <widget class="GtkButton" id="btnEyesClose"> + <property name="width_request">34</property> + <property name="height_request">34</property> <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">0</property> - <property name="right_padding">0</property> + <property name="can_focus">True</property> + <property name="relief">GTK_RELIEF_NONE</property> + <property name="focus_on_click">False</property> + <signal name="clicked" handler="on_btnEyesClose_released" last_modification_time="Thu, 06 Dec 2007 14:29:18 GMT"/> <child> - <widget class="GtkHBox" id="hbox3"> + <widget class="GtkAlignment" id="alignment3"> <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">2</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xscale">0</property> + <property name="yscale">0</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">0</property> + <property name="right_padding">0</property> <child> - <widget class="GtkImage" id="imgEyesClose"> + <widget class="GtkHBox" id="hbox3"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="has_focus">True</property> - <property name="stock">gtk-go-down</property> - <property name="icon_size">4</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> + <property name="homogeneous">False</property> + <property name="spacing">2</property> - <child> - <widget class="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="label" translatable="yes"> + <child> + <widget class="GtkImage" id="imgEyesClose"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="has_focus">True</property> + <property name="stock">gtk-go-down</property> + <property name="icon_size">4</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="label" translatable="yes"> </property> - <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> + <property name="use_underline">True</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> </child> </widget> </child> </widget> + <packing> + <property name="x">16</property> + <property name="y">40</property> + </packing> </child> - </widget> - <packing> - <property name="x">16</property> - <property name="y">40</property> - </packing> - </child> - <child> - <widget class="GtkButton" id="btnEyesOpen"> - <property name="width_request">34</property> - <property name="height_request">34</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="relief">GTK_RELIEF_NONE</property> - <property name="focus_on_click">False</property> - <signal name="clicked" handler="on_btnEyesOpen_released" last_modification_time="Thu, 06 Dec 2007 14:42:38 GMT"/> - <child> - <widget class="GtkAlignment" id="alignment1"> + <widget class="GtkButton" id="btnEyesOpen"> + <property name="width_request">34</property> + <property name="height_request">34</property> <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">0</property> - <property name="right_padding">0</property> + <property name="can_focus">True</property> + <property name="relief">GTK_RELIEF_NONE</property> + <property name="focus_on_click">False</property> + <signal name="clicked" handler="on_btnEyesOpen_released" last_modification_time="Thu, 06 Dec 2007 14:42:38 GMT"/> <child> - <widget class="GtkHBox" id="hbox1"> + <widget class="GtkAlignment" id="alignment1"> <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">2</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xscale">0</property> + <property name="yscale">0</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">0</property> + <property name="right_padding">0</property> <child> - <widget class="GtkImage" id="imgEyesOpen"> + <widget class="GtkHBox" id="hbox1"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="has_focus">True</property> - <property name="stock">gtk-go-up</property> - <property name="icon_size">4</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> + <property name="homogeneous">False</property> + <property name="spacing">2</property> - <child> - <widget class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="label" translatable="yes"> + <child> + <widget class="GtkImage" id="imgEyesOpen"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="has_focus">True</property> + <property name="stock">gtk-go-up</property> + <property name="icon_size">4</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="label" translatable="yes"> </property> - <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> + <property name="use_underline">True</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> </child> </widget> </child> </widget> + <packing> + <property name="x">16</property> + <property name="y">8</property> + </packing> </child> + + <child> + <widget class="GtkCheckButton" id="chkLEDRight"> + <property name="width_request">20</property> + <property name="height_request">20</property> + <property name="visible">True</property> + <property name="label" translatable="yes"></property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">False</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_chkLEDRight_toggled" last_modification_time="Thu, 15 Nov 2007 10:15:35 GMT"/> + </widget> + <packing> + <property name="x">73</property> + <property name="y">24</property> + </packing> + </child> + + <child> + <widget class="GtkImage" id="imgLedR"> + <property name="width_request">180</property> + <property name="height_request">79</property> + <property name="visible">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="x">40</property> + <property name="y">0</property> + </packing> + </child> </widget> <packing> - <property name="x">16</property> - <property name="y">8</property> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> </packing> </child> <child> - <widget class="GtkImage" id="imgLed"> - <property name="width_request">367</property> - <property name="height_request">79</property> + <widget class="GtkFixed" id="fixed36"> <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> + + <child> + <widget class="GtkImage" id="imgLedL"> + <property name="width_request">187</property> + <property name="height_request">79</property> + <property name="visible">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="x">0</property> + <property name="y">0</property> + </packing> + </child> </widget> <packing> - <property name="x">40</property> - <property name="y">0</property> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> </packing> </child> </widget> @@ -2378,6 +2600,7 @@ <child> <widget class="GtkFixed" id="fix6"> + <property name="width_request">360</property> <property name="visible">True</property> <child> @@ -2551,6 +2774,7 @@ <child> <widget class="GtkFixed" id="fix7"> + <property name="width_request">400</property> <property name="visible">True</property> <child> @@ -2589,7 +2813,7 @@ <property name="update_policy">GTK_UPDATE_ALWAYS</property> <property name="snap_to_ticks">False</property> <property name="wrap">False</property> - <property name="adjustment">100 100 330 1 10 10</property> + <property name="adjustment">100 55 320 1 10 10</property> <signal name="changed" handler="on_spinPitch_changed" last_modification_time="Tue, 11 Dec 2007 12:18:41 GMT"/> </widget> <packing> @@ -2696,7 +2920,28 @@ </child> <child> - <placeholder/> + <widget class="GtkHBox" id="hbox22"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <placeholder/> + </child> + + <child> + <placeholder/> + </child> + + <child> + <placeholder/> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> </child> </widget> </child> Modified: software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/GUI/widget/other.pyp =================================================================== --- software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/GUI/widget/other.pyp 2008-03-26 13:36:45 UTC (rev 951) +++ software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/GUI/widget/other.pyp 2008-03-26 13:42:27 UTC (rev 952) @@ -53,7 +53,8 @@ self.cb_voice.set_spk(speaker) def on_comboboxentry1_changed(self, widget, *args): - spk_id, skp_lang = self.cb_voice.get_current_spk_conf() + spk_id, spk_lang = self.cb_voice.get_current_spk_conf() + if spk_id == None: return tux.tts.select_voice(spk_id, self.get_widget('spinPitch').get_value()) _me.set_param('speaker', spk_id) _me.set_param('pitch', self.get_widget('spinPitch').get_value()) @@ -61,8 +62,8 @@ _me.set_var('pitch', self.get_widget('spinPitch').get_value()) def on_spinPitch_changed(self, widget, *args): - - spk_id, skp_lang = self.cb_voice.get_current_spk_conf() + spk_id, spk_lang = self.cb_voice.get_current_spk_conf() + if spk_id == None: return tux.tts.select_voice(spk_id, widget.get_value()) _me.set_param('speaker', spk_id) _me.set_param('pitch', widget.get_value()) @@ -139,9 +140,27 @@ def refresh_picture(self, widget, picture): self.get_widget(widget).set_from_pixbuf(picture) + def manage_spin_button(self, radio, spin): + if radio.get_active(): + self.get_widget(spin).set_digits(0) + self.get_widget(spin).set_range(1, 127) + self.get_widget(spin).set_increments(1, 5) + self.get_widget(spin).set_value(1) + else: + self.get_widget(spin).set_digits(2) + self.get_widget(spin).set_range(0.01, 10) + self.get_widget(spin).set_increments(0.01, 0.1) + self.get_widget(spin).set_value(0.05) + + def wait_for_events(self, time, param1, param2): + tux.sys.wait(time) + param1 = None + param2 = None + + ############################################################################### # -# LEDs part +# LEDs part # ############################################################################### def on_btnLEDRun_clicked(self, widget, *args): @@ -149,7 +168,14 @@ freq = 256 - freq value = self.get_widget('spinLED').get_value() value = value * 2 - tux.cmd.leds_blink(int(value), int(freq)) + if self.get_widget('radLEDNone').get_active(): + tux.cmd.leds_blink(int(value), int(freq)) + elif self.get_widget('radLEDFading').get_active(): + freq = float(freq) * 0.004 + tux.cmd.led_pulse(leds = BOTH, pulse_count = value, effect_type = FADE_RATE, effect_speed = freq) + else: + freq = float(freq) * 0.004 + tux.cmd.led_pulse(leds = BOTH, pulse_count = value, effect_type = GRADIENT_NBR, effect_speed = freq, effect_step = 3) def on_chkLEDRight_toggled(self, widget, *args): ''' @@ -165,56 +191,54 @@ return if widget.get_active(): tux.cmd.ledr_on() - thread.start_new_thread(self.refresh_picture, ('imgLed', self.led_on)) + #thread.start_new_thread(self.refresh_picture, ('imgLedR', self.ledr_on)) else: tux.cmd.ledr_off() - thread.start_new_thread(self.refresh_picture, ('imgLed', self.led_off)) + #thread.start_new_thread(self.refresh_picture, ('imgLedR', self.ledr_off)) ## chkLEDLeft def on_chkLEDLeft_toggled(self, widget, *args): global __led_toggled_by_event if __led_toggled_by_event: return - if widget.get_active(): tux.cmd.ledl_on() - thread.start_new_thread(self.refresh_picture, ('imgLed', self.led_on)) else: tux.cmd.ledl_off() - thread.start_new_thread(self.refresh_picture, ('imgLed', self.led_off)) def on_right_led_on(self): global __led_toggled_by_event __led_toggled_by_event = True - self.get_widget('chkLEDLeft').set_active(True) - thread.start_new_thread(self.refresh_picture, ('imgLed', self.led_on)) - + self.get_widget('chkLEDRight').set_active(True) + thread.start_new_thread(self.refresh_picture, ('imgLedR', self.ledr_on)) __led_toggled_by_event = False def on_right_led_off(self): global __led_toggled_by_event __led_toggled_by_event = True - self.get_widget('chkLEDLeft').set_active(False) - thread.start_new_thread(self.refresh_picture, ('imgLed', self.led_off)) - + self.get_widget('chkLEDRight').set_active(False) + thread.start_new_thread(self.refresh_picture, ('imgLedR', self.ledr_off)) __led_toggled_by_event = False def on_left_led_on(self): global __led_toggled_by_event __led_toggled_by_event = True - self.get_widget('chkLEDRight').set_active(True) - thread.start_new_thread(self.refresh_picture, ('imgLed', self.led_on)) - + self.get_widget('chkLEDLeft').set_active(True) + thread.start_new_thread(self.refresh_picture, ('imgLedL', self.ledl_on)) __led_toggled_by_event = False def on_left_led_off(self): global __led_toggled_by_event __led_toggled_by_event = True - self.get_widget('chkLEDRight').set_active(False) - thread.start_new_thread(self.refresh_picture, ('imgLed', self.led_off)) - + self.get_widget('chkLEDLeft').set_active(False) + thread.start_new_thread(self.refresh_picture, ('imgLedL', self.ledl_off)) __led_toggled_by_event = False + def on_slideLEDintensity_change_value(self, widget, *args): + if int(args[1]) < 0 or int(args[1]) > 10: return + intensity = int(args[1] * 25) + tux.cmd.led_set(leds = BOTH, intensity = intensity) + ############################################################################### # @@ -222,14 +246,12 @@ # ############################################################################### def on_btnEyesOpen_released(self, widget, *args... [truncated message content] |