[tuxdroid-svn] r777 - in software/gadgets/tux_controller/trunk: . TuxController TuxController/Scrip
Status: Beta
Brought to you by:
ks156
Menu
▾
▴
[tuxdroid-svn] r777 - in software/gadgets/tux_controller/trunk: . TuxController TuxController/Scripts/Python TuxController/Scripts/Python/GUI/conf TuxController/Scripts/Python/GUI/widget TuxController/Strings
Author: Paul_R
Date: 2007-12-11 15:31:54 +0100 (Tue, 11 Dec 2007)
New Revision: 777
Modified:
software/gadgets/tux_controller/trunk/TuxController.tgf
software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/GUI/conf/other.glade
software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/GUI/conf/other.pyp
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/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:
* Conf GUI :
- Removed the notification part
* Widget GUI :
- Added tooltips (only in french for now ...)
- Added the TTS config
Modified: software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/GUI/conf/other.glade
===================================================================
--- software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/GUI/conf/other.glade 2007-12-11 10:02:08 UTC (rev 776)
+++ software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/GUI/conf/other.glade 2007-12-11 14:31:54 UTC (rev 777)
@@ -4,7 +4,7 @@
<glade-interface>
<widget class="GtkWindow" id="window1">
- <property name="height_request">159</property>
+ <property name="height_request">102</property>
<property name="visible">True</property>
<property name="title" translatable="yes">Parameters</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
@@ -129,110 +129,6 @@
</child>
<child>
- <widget class="GtkFrame" id="frame5">
- <property name="border_width">5</property>
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.5</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
-
- <child>
- <widget class="GtkAlignment" id="alignment8">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">1</property>
- <property name="yscale">1</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">12</property>
- <property name="right_padding">0</property>
-
- <child>
- <widget class="GtkFixed" id="fixed6">
- <property name="visible">True</property>
-
- <child>
- <widget class="GtkSpinButton" id="delay_spinbutton">
- <property name="width_request">120</property>
- <property name="height_request">24</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="climb_rate">1</property>
- <property name="digits">0</property>
- <property name="numeric">False</property>
- <property name="update_policy">GTK_UPDATE_ALWAYS</property>
- <property name="snap_to_ticks">False</property>
- <property name="wrap">False</property>
- <property name="adjustment">1 1 3600 1 10 10</property>
- </widget>
- <packing>
- <property name="x">88</property>
- <property name="y">0</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label13">
- <property name="width_request">336</property>
- <property name="height_request">16</property>
- <property name="visible">True</property>
- <property name="label" translatable="yes">Delay (sec) :</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</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">0</property>
- <property name="y">0</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label12">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Updates</b></property>
- <property name="use_underline">False</property>
- <property name="use_markup">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>
- <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="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
<widget class="GtkFixed" id="fixed3">
<property name="visible">True</property>
Modified: software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/GUI/conf/other.pyp
===================================================================
--- software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/GUI/conf/other.pyp 2007-12-11 10:02:08 UTC (rev 776)
+++ software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/GUI/conf/other.pyp 2007-12-11 14:31:54 UTC (rev 777)
@@ -37,16 +37,6 @@
txt = _me.string('gui_conf_remote_set_bt')
self.get_widget("button_remote").set_label(txt)
- # Update Frame
- txt = _me.string('gui_conf_update_title')
- self.get_widget("label12").set_text(txt)
-
- txt = "%s : " % _me.string('gui_conf_delay_lb')
- self.get_widget("label13").set_text(txt)
-
- value = _me.get_var('notify_delay')
- self.get_widget("delay_spinbutton").set_value(value)
-
# Bottom buttons
txt = _me.string('gui_conf_cancel_bt')
self.get_widget("label6").set_text(txt)
@@ -76,7 +66,6 @@
"""
On button 'accept' clicked
"""
- _me.set_var('notify_delay', int(self.get_widget("delay_spinbutton").get_value()))
self.get_widget("window1").destroy()
def on_cancel_clicked(self, widget, *args):
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 2007-12-11 10:02:08 UTC (rev 776)
+++ software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/GUI/widget/other.glade 2007-12-11 14:31:54 UTC (rev 777)
@@ -53,7 +53,7 @@
<property name="height_request">24</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">checkbutton1</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>
@@ -176,7 +176,7 @@
</child>
</widget>
<packing>
- <property name="x">4</property>
+ <property name="x">0</property>
<property name="y">24</property>
</packing>
</child>
@@ -260,7 +260,7 @@
</child>
</widget>
<packing>
- <property name="x">37</property>
+ <property name="x">26</property>
<property name="y">24</property>
</packing>
</child>
@@ -706,32 +706,6 @@
</child>
<child>
- <widget class="GtkLabel" id="lblLED">
- <property name="width_request">16</property>
- <property name="height_request">51</property>
- <property name="visible">True</property>
- <property name="label" translatable="yes">label20</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_CENTER</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">True</property>
- <property name="angle">90</property>
- </widget>
- <packing>
- <property name="x">9</property>
- <property name="y">3</property>
- </packing>
- </child>
-
- <child>
<widget class="GtkButton" id="btnLEDRun">
<property name="width_request">36</property>
<property name="height_request">36</property>
@@ -845,6 +819,32 @@
<property name="y">4</property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkLabel" id="lblLED">
+ <property name="width_request">16</property>
+ <property name="height_request">51</property>
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"> </property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_CENTER</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">True</property>
+ <property name="angle">90</property>
+ </widget>
+ <packing>
+ <property name="x">9</property>
+ <property name="y">3</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -905,32 +905,6 @@
</child>
<child>
- <widget class="GtkLabel" id="lblEyes">
- <property name="width_request">16</property>
- <property name="height_request">73</property>
- <property name="visible">True</property>
- <property name="label" translatable="yes">label20</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_CENTER</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">True</property>
- <property name="angle">90</property>
- </widget>
- <packing>
- <property name="x">9</property>
- <property name="y">3</property>
- </packing>
- </child>
-
- <child>
<widget class="GtkButton" id="btnEyesRun">
<property name="width_request">36</property>
<property name="height_request">36</property>
@@ -1012,6 +986,32 @@
<property name="y">22</property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkLabel" id="lblEyes">
+ <property name="width_request">16</property>
+ <property name="height_request">73</property>
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"> </property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_CENTER</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">True</property>
+ <property name="angle">90</property>
+ </widget>
+ <packing>
+ <property name="x">9</property>
+ <property name="y">3</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -1160,7 +1160,7 @@
<property name="width_request">16</property>
<property name="height_request">56</property>
<property name="visible">True</property>
- <property name="label" translatable="yes">label20</property>
+ <property name="label" translatable="yes"> </property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -1348,7 +1348,7 @@
<property name="width_request">16</property>
<property name="height_request">135</property>
<property name="visible">True</property>
- <property name="label" translatable="yes">label20</property>
+ <property name="label" translatable="yes"> </property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -1508,47 +1508,6 @@
</child>
<child>
- <widget class="GtkRadioButton" id="radSpinDirRight">
- <property name="width_request">136</property>
- <property name="height_request">22</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">radiobutton2</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">204</property>
- <property name="y">58</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkRadioButton" id="radSpinDirLeft">
- <property name="width_request">136</property>
- <property name="height_request">24</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">radiobutton1</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">radSpinDirRight</property>
- </widget>
- <packing>
- <property name="x">60</property>
- <property name="y">58</property>
- </packing>
- </child>
-
- <child>
<widget class="GtkVSeparator" id="vseparator17">
<property name="width_request">16</property>
<property name="height_request">77</property>
@@ -1577,7 +1536,7 @@
<property name="width_request">16</property>
<property name="height_request">77</property>
<property name="visible">True</property>
- <property name="label" translatable="yes">label20</property>
+ <property name="label" translatable="yes"> </property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -1597,6 +1556,47 @@
<property name="y">3</property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkRadioButton" id="radSpinDirLeft">
+ <property name="width_request">136</property>
+ <property name="height_request">24</property>
+ <property name="visible">True</property>
+ <property name="can_focus">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">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="x">60</property>
+ <property name="y">58</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkRadioButton" id="radSpinDirRight">
+ <property name="width_request">136</property>
+ <property name="height_request">22</property>
+ <property name="visible">True</property>
+ <property name="can_focus">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">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">radSpinDirLeft</property>
+ </widget>
+ <packing>
+ <property name="x">204</property>
+ <property name="y">58</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -2050,24 +2050,60 @@
<child>
<widget class="GtkExpander" id="expander1">
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="expanded">False</property>
<property name="spacing">0</property>
<child>
<widget class="GtkFixed" id="fixednotuse6">
- <property name="height_request">139</property>
+ <property name="height_request">140</property>
<property name="visible">True</property>
<child>
+ <widget class="GtkButton" id="btnTTSClear">
+ <property name="width_request">90</property>
+ <property name="height_request">28</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">button2</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <signal name="clicked" handler="on_btnTTSClear_clicked" last_modification_time="Thu, 06 Dec 2007 15:25:30 GMT"/>
+ </widget>
+ <packing>
+ <property name="x">128</property>
+ <property name="y">109</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="btnTTS">
+ <property name="width_request">90</property>
+ <property name="height_request">28</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">button1</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <signal name="clicked" handler="on_btnTTS_clicked" last_modification_time="Thu, 06 Dec 2007 15:12:18 GMT"/>
+ </widget>
+ <packing>
+ <property name="x">24</property>
+ <property name="y">109</property>
+ </packing>
+ </child>
+
+ <child>
<widget class="GtkScrolledWindow" id="scrolledwindow1">
+ <property name="border_width">2</property>
<property name="width_request">376</property>
<property name="height_request">104</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<child>
@@ -2097,49 +2133,13 @@
<property name="y">0</property>
</packing>
</child>
-
- <child>
- <widget class="GtkButton" id="btnTTSClear">
- <property name="width_request">90</property>
- <property name="height_request">28</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">button2</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal name="clicked" handler="on_btnTTSClear_clicked" last_modification_time="Thu, 06 Dec 2007 15:25:30 GMT"/>
- </widget>
- <packing>
- <property name="x">128</property>
- <property name="y">109</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="btnTTS">
- <property name="width_request">90</property>
- <property name="height_request">28</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">button1</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <signal name="clicked" handler="on_btnTTS_clicked" last_modification_time="Thu, 06 Dec 2007 15:12:18 GMT"/>
- </widget>
- <packing>
- <property name="x">24</property>
- <property name="y">109</property>
- </packing>
- </child>
</widget>
</child>
<child>
<widget class="GtkLabel" id="lblTTS">
<property name="visible">True</property>
- <property name="label" translatable="yes">label17</property>
+ <property name="label" translatable="yes"> </property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2173,6 +2173,82 @@
<property name="visible">True</property>
<child>
+ <widget class="GtkVSeparator" id="vseparator20">
+ <property name="width_request">16</property>
+ <property name="height_request">94</property>
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="x">0</property>
+ <property name="y">3</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkVSeparator" id="vseparator21">
+ <property name="width_request">16</property>
+ <property name="height_request">94</property>
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="x">20</property>
+ <property name="y">3</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="lblConf">
+ <property name="width_request">16</property>
+ <property name="height_request">94</property>
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"> </property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_CENTER</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">True</property>
+ <property name="angle">90</property>
+ </widget>
+ <packing>
+ <property name="x">9</property>
+ <property name="y">3</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="lblStop">
+ <property name="width_request">233</property>
+ <property name="height_request">21</property>
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"> </property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</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">75</property>
+ <property name="y">40</property>
+ </packing>
+ </child>
+
+ <child>
<widget class="GtkButton" id="btnStopAll">
<property name="width_request">36</property>
<property name="height_request">36</property>
@@ -2254,66 +2330,92 @@
<property name="y">32</property>
</packing>
</child>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_options">fill</property>
+ <property name="y_options">fill</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkFixed" id="fix7">
+ <property name="visible">True</property>
+
<child>
- <widget class="GtkLabel" id="lblStop">
- <property name="width_request">233</property>
- <property name="height_request">21</property>
+ <widget class="GtkVSeparator" id="vseparator22">
+ <property name="width_request">16</property>
+ <property name="height_request">134</property>
<property name="visible">True</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_LEFT</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">75</property>
- <property name="y">40</property>
+ <property name="x">0</property>
+ <property name="y">23</property>
</packing>
</child>
<child>
- <widget class="GtkVSeparator" id="vseparator20">
+ <widget class="GtkVSeparator" id="vseparator23">
<property name="width_request">16</property>
- <property name="height_request">94</property>
+ <property name="height_request">134</property>
<property name="visible">True</property>
</widget>
<packing>
- <property name="x">0</property>
- <property name="y">3</property>
+ <property name="x">20</property>
+ <property name="y">23</property>
</packing>
</child>
<child>
- <widget class="GtkVSeparator" id="vseparator21">
- <property name="width_request">16</property>
- <property name="height_request">94</property>
+ <widget class="GtkSpinButton" id="spinPitch">
+ <property name="width_request">55</property>
+ <property name="height_request">27</property>
<property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="climb_rate">1</property>
+ <property name="digits">0</property>
+ <property name="numeric">False</property>
+ <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>
+ <signal name="changed" handler="on_spinPitch_changed" last_modification_time="Tue, 11 Dec 2007 12:18:41 GMT"/>
</widget>
<packing>
- <property name="x">20</property>
- <property name="y">3</property>
+ <property name="x">216</property>
+ <property name="y">103</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="lblConf">
+ <widget class="GtkComboBoxEntry" id="comboboxentry1">
+ <property name="width_request">216</property>
+ <property name="height_request">27</property>
+ <property name="visible">True</property>
+ <property name="items" translatable="yes"> </property>
+ <property name="add_tearoffs">False</property>
+ <property name="has_frame">True</property>
+ <property name="focus_on_click">True</property>
+ <signal name="changed" handler="on_comboboxentry1_changed" last_modification_time="Tue, 11 Dec 2007 12:01:54 GMT"/>
+ </widget>
+ <packing>
+ <property name="x">56</property>
+ <property name="y">59</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="lblTTSConf">
<property name="width_request">16</property>
- <property name="height_request">94</property>
+ <property name="height_request">134</property>
<property name="visible">True</property>
- <property name="label" translatable="yes">label20</property>
+ <property name="label" translatable="yes"> </property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
@@ -2327,15 +2429,41 @@
</widget>
<packing>
<property name="x">9</property>
- <property name="y">3</property>
+ <property name="y">23</property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkLabel" id="lblPitch">
+ <property name="width_request">152</property>
+ <property name="height_request">24</property>
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"> </property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</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">56</property>
+ <property name="y">103</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
<property name="x_options">fill</property>
<property name="y_options">fill</property>
</packing>
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 2007-12-11 10:02:08 UTC (rev 776)
+++ software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/GUI/widget/other.pyp 2007-12-11 14:31:54 UTC (rev 777)
@@ -1,7 +1,12 @@
bindtextdomain("params", "")
+try:
+ import voice_cb
+except:
+ print sys.exc_info()
+
__led_toggled_by_event = False
-__led_restart = False
+
class Window(SimpleGladeApp):
def __init__(self,
@@ -17,17 +22,15 @@
####################################################################
def new(self):
- self.get_widget("window1").set_title(_me.string('name_to_read'))
- thread.start_new_thread(self.update, ())
global __led_toggled_by_event
- __led_toggled_by_event = False
+ __led_toggled_by_event = False
+
+ self.get_widget("window1").set_title(_me.string('name_to_read'))
+ self.create_tooltips()
+ thread.start_new_thread(self.update,())
+
self.average = 0
self.count = 0
- self.__lled = tux.status.rled
- self.__rled = tux.status.lled
- self.__eyes_mutex = threading.Lock()
- self.__mouth_mutex = threading.Lock()
- self.__wings_mutex = threading.Lock()
rules = [
[['none', 'none', 'Eyes'], self.on_btnEyesRun_clicked, (None,)],
@@ -41,15 +44,28 @@
_me.voice_recognition.set_rules(rules)
def update(self):
+ _me.set_var('pitch', _me.get_param('pitch'))
+ _me.set_var('speaker', _me.get_param('speaker'))
+
+ self.cb_voice = voice_cb.VoiceComboBoxAdd(tux, self.get_widget("comboboxentry1"))
+ self.cb_voice.set_spk(_me.get_var('speaker'))
+ self.get_widget('spinPitch').set_value(_me.get_param('pitch'))
+
+ self.cb_voice.update()
+ self.cb_voice.set_spk(_me.get_param('speaker'))
+
self.update_labels()
self.update_pix()
+
+
+
tux.cmd.raw(0x31, 0, 0, 0)
self.update_status()
self.binding()
+ tux.sys.wait(1)
- #self.status_table()
def on_window1_destroy(self, widget, *args):
'''
@@ -107,9 +123,9 @@
tux.event.on_remote_bt[K_STOP] = self.StopAll
+ self.battery_idx = tux.monitoring.insert(0x25, self.on_battery_level)
+ self.light_idx = tux.monitoring.insert(0x1B, self.on_light_level)
- self.light_idx = tux.monitoring.insert(0x1B, self.on_light_level)
- self.battery_idx = tux.monitoring.insert(0x25, self.on_battery_level)
tux.micro.on()
self.sound_idx = tux.monitoring.insert(0xF0, self.on_microphone_energy)
tux.sys.wait(0.1)
@@ -133,40 +149,14 @@
__led_toggled_by_event = False
def update_pix(self):
- '''
- It's necessary to update the pictures.
- The first step is to determine the path where the pictures are stored.
- To do this, the instruction _me.get_path('pictures') return the path
- of the 'picture' folder of the TGF.
- '''
self.path = _me.get_path('pictures')+'/Icons/'
- ### Update the buttons icons
self.get_widget('chkShow').set_active(True)
self.get_widget('chkShow').set_label(_me.string('chkShow'))
- self.get_widget('imgLEDRun').set_from_file(self.path+'run.png')
- #self.get_widget('imgLEDRun').set_tooltip_text('test 123')
- self.get_widget('imgEyesOpen').set_from_file(self.path+'up.png')
- self.get_widget('imgEyesClose').set_from_file(self.path+'down.png')
- self.get_widget('imgEyesRun').set_from_file(self.path+'run.png')
-
- self.get_widget('imgMouthClose').set_from_file(self.path+'up.png')
- self.get_widget('imgMouthOpen').set_from_file(self.path+'down.png')
- self.get_widget('imgMouthRun').set_from_file(self.path+'run.png')
-
- self.get_widget('imgWingsUp').set_from_file(self.path+'up.png')
- self.get_widget('imgWingsDown').set_from_file(self.path+'down.png')
- self.get_widget('imgWingsRun').set_from_file(self.path+'run.png')
-
- self.get_widget('imgSpinLeft').set_from_file(self.path+'left.png')
- self.get_widget('imgSpinRight').set_from_file(self.path+'right.png')
- self.get_widget('imgSpinRun').set_from_file(self.path+'run.png')
-
self.get_widget('imgLight').set_from_file(self.path+'light.png')
self.get_widget('imgBattery').set_from_file(self.path+'battery.png')
self.get_widget('imgSound').set_from_file(self.path+'microphone.png')
- ### Load image in pixbufs
self.led_on = gtk.gdk.pixbuf_new_from_file(self.path+'led_on.png')
self.led_off = gtk.gdk.pixbuf_new_from_file(self.path+'led_off.png')
self.eyes_close = gtk.gdk.pixbuf_new_from_file(self.path+'eye_closed.png')
@@ -177,17 +167,36 @@
self.spin_off = gtk.gdk.pixbuf_new_from_file(self.path+'spin_off.png')
self.beak_open = gtk.gdk.pixbuf_new_from_file(self.path+'beak_open.png')
self.beak_closed = gtk.gdk.pixbuf_new_from_file(self.path+'beak_closed.png')
+ self.up = gtk.gdk.pixbuf_new_from_file(self.path+'up.png')
+ self.down = gtk.gdk.pixbuf_new_from_file(self.path+'down.png')
+ self.right = gtk.gdk.pixbuf_new_from_file(self.path+'right.png')
+ self.left = gtk.gdk.pixbuf_new_from_file(self.path+'left.png')
+ self.run = gtk.gdk.pixbuf_new_from_file(self.path+'run.png')
+ self.get_widget('imgLEDRun').set_from_pixbuf(self.run)
+
+ self.get_widget('imgEyesOpen').set_from_pixbuf(self.up)
+ self.get_widget('imgEyesClose').set_from_pixbuf(self.down)
+ self.get_widget('imgEyesRun').set_from_pixbuf(self.run)
+
+ self.get_widget('imgMouthClose').set_from_pixbuf(self.up)
+ self.get_widget('imgMouthOpen').set_from_pixbuf(self.down)
+ self.get_widget('imgMouthRun').set_from_pixbuf(self.run)
+
+ self.get_widget('imgWingsUp').set_from_pixbuf(self.up)
+ self.get_widget('imgWingsDown').set_from_pixbuf(self.down)
+ self.get_widget('imgWingsRun').set_from_pixbuf(self.run)
+
+ self.get_widget('imgSpinLeft').set_from_pixbuf(self.left)
+ self.get_widget('imgSpinRight').set_from_pixbuf(self.right)
+ self.get_widget('imgSpinRun').set_from_pixbuf(self.run)
self.show_tab()
- ### Update the Tux pictures
if tux.status.rled():
self.get_widget('imgLed').set_from_pixbuf(self.led_on)
else:
self.get_widget('imgLed').set_from_pixbuf(self.led_off)
-
-
if tux.status.eyes_closed() == 0:
self.get_widget('imgLed').set_from_pixbuf(self.eyes_close)
@@ -200,13 +209,58 @@
self.get_widget('imgSpin').set_from_pixbuf(self.spin_off)
-
- def on_chkShow_toggled(self, widget, *args):
- if widget.get_active():
- self.show_tab()
- else:
- self.hide_tab()
-
+ def create_tooltips(self):
+ self.get_widget('imgLEDRun').set_tooltip_text(_me.string('toolLEDRun'))
+ self.get_widget('slideLED').set_tooltip_text(_me.string('toolLEDslide'))
+ self.get_widget('spinLED').set_tooltip_text(_me.string('toolLEDspin'))
+
+ self.get_widget('imgEyesRun').set_tooltip_text(_me.string('toolEyesRun'))
+ self.get_widget('spinEyes').set_tooltip_text(_me.string('toolMove'))
+
+ self.get_widget('imgMouthRun').set_tooltip_text(_me.string('toolMouthRun'))
+ self.get_widget('spinMouth').set_tooltip_text(_me.string('toolMove'))
+
+ self.get_widget('imgWingsRun').set_tooltip_text(_me.string('toolWingsRun'))
+ self.get_widget('spinWings').set_tooltip_text(_me.string('toolMove'))
+ self.get_widget('slideWings').set_tooltip_text(_me.string('toolPWM'))
+
+ self.get_widget('imgSpinRun').set_tooltip_text(_me.string('toolSpinRun'))
+ self.get_widget('spinSpin').set_tooltip_text(_me.string('toolMove'))
+ self.get_widget('slideSpin').set_tooltip_text(_me.string('toolPWM'))
+ self.get_widget('radSpinDirLeft').set_tooltip_text(_me.string('toolSpinDir'))
+ self.get_widget('radSpinDirRight').set_tooltip_text(_me.string('toolSpinDir'))
+
+ self.get_widget('imgStopAll').set_tooltip_text(_me.string('toolStopAll'))
+
+ self.get_widget('chkShow').set_tooltip_text(_me.string('toolAdvanced'))
+
+ self.get_widget('chkLEDRight').set_tooltip_text(_me.string('toolLEDRight'))
+ self.get_widget('chkLEDLeft').set_tooltip_text(_me.string('toolLEDLeft'))
+
+ self.get_widget('btnEyesOpen').set_tooltip_text(_me.string('toolEyesOpen'))
+ self.get_widget('btnEyesClose').set_tooltip_text(_me.string('toolEyesClose'))
+
+ self.get_widget('btnMouthOpen').set_tooltip_text(_me.string('toolMouthOpen'))
+ self.get_widget('btnMouthClose').set_tooltip_text(_me.string('toolMouthClose'))
+
+ self.get_widget('btnWingsUp').set_tooltip_text(_me.string('toolWingsUp'))
+ self.get_widget('btnWingsDown').set_tooltip_text(_me.string('toolWingsDown'))
+
+ self.get_widget('btnSpinRight').set_tooltip_text(_me.string('toolSpinRight'))
+ self.get_widget('btnSpinLeft').set_tooltip_text(_me.string('toolSpinLeft'))
+
+ self.get_widget('imgLight').set_tooltip_text(_me.string('toolLight'))
+ self.get_widget('imgBattery').set_tooltip_text(_me.string('toolBattery'))
+ self.get_widget('imgSound').set_tooltip_text(_me.string('toolSound'))
+
+ self.get_widget('comboboxentry1').set_tooltip_text(_me.string('toolLang'))
+ self.get_widget('spinPitch').set_tooltip_text(_me.string('toolPitch'))
+
+ self.get_widget('btnTTS').set_tooltip_text(_me.string('toolTTS'))
+ self.get_widget('btnTTSClear').set_tooltip_text(_me.string('toolTTSClear'))
+ self.get_widget('scrolledwindow1').set_tooltip_text(_me.string('toolTTSText'))
+
+
def hide_tab(self):
self.get_widget('fix1').hide()
self.get_widget('fix1').set_size_request(2,0)
@@ -220,6 +274,8 @@
self.get_widget('fix5').set_size_request(2,0)
self.get_widget('fix6').hide()
self.get_widget('fix6').set_size_request(2,0)
+ self.get_widget('fix7').hide()
+ self.get_widget('fix7').set_size_request(2,0)
def show_tab(self):
self.get_widget('fix1').show()
@@ -234,18 +290,12 @@
self.get_widget('fix5').set_size_request(330,0)
self.get_widget('fix6').show()
self.get_widget('fix6').set_size_request(330,0)
+ self.get_widget('fix7').show()
+ self.get_widget('fix7').set_size_request(330,0)
+
def update_labels(self):
- '''
- Update the GUI labels.
-
- To enable the gadget to be translated, all the strings are configured on the
- Tux Gadget Maker strings section.
-
- To load a string, just use _me.get_string('my_string')
- '''
-
## Update the radio button labels
self.get_widget('btnTTS').set_label(_me.string('TTS'))
self.get_widget('btnTTSClear').set_label(_me.string('TTSClear'))
@@ -259,15 +309,14 @@
self.get_widget('lblWings').set_label(_me.string('lblWings'))
self.get_widget('lblSpin').set_label(_me.string('lblSpin'))
self.get_widget('lblConf').set_label(_me.string('lblConf'))
+ self.get_widget('lblTTSConf').set_label(_me.string('lblTTSConf'))
+ self.get_widget('lblPitch').set_label(_me.string('lblPitch'))
self.get_widget('radSpinDirLeft').set_label(_me.string('radSpinDirLeft'))
self.get_widget('radSpinDirRight').set_label(_me.string('radSpinDirRight'))
-
- #self.get_widget('lblBatteryL').set_text(_me.string('lblBatteryL'))
- #self.get_widget('lblSoundL').set_text(_me.string('lblSoundL'))
- #self.get_widget('lblLightL').set_text(_me.string('lblLightL'))
+
####################################################################
#
# Widget items events
@@ -276,26 +325,65 @@
# signals.
#
####################################################################
+ def set_spk(self, speaker):
+ self.cb_voice.set_spk(speaker)
+
+ def on_comboboxentry1_changed(self, widget, *args):
+
+ spk_id, skp_lang = self.cb_voice.get_current_spk_conf()
+ 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())
+ _me.set_var('speaker', spk_id)
+ _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()
+ tux.tts.select_voice(spk_id, widget.get_value())
+ _me.set_param('speaker', spk_id)
+ _me.set_param('pitch', widget.get_value())
+ _me.set_var('speaker', spk_id)
+ _me.set_var('pitch', self.get_widget('spinPitch').get_value())
+
+
def StopAll(self):
- self.on_btnStopAll_clicked(None)
+ thread.start_new_thread(self.__stop_all, ())
- def on_btnStopAll_clicked(self, widget, *args):
- tux.cmd.eyes_off()
- tux.cmd.mouth_off()
- tux.cmd.wings_off()
+ def on_chkShow_toggled(self, widget, *args):
+ if widget.get_active():
+ self.show_tab()
+ else:
+ self.hide_tab()
+
+ def __stop_all(self):
+ if tux.status.eyes_motor():
+ tux.cmd.eyes_off()
+ tux.sys.wait(0.2)
+ tux.cmd.eyes_close()
+ tux.cmd.eyes_open()
+
+ if tux.status.mouth_motor():
+ tux.cmd.mouth_off()
+ tux.cmd.mouth_open()
+ tux.sys.wait(0.2)
+ tux.cmd.mouth_close()
+
+ if tux.status.wings_motor():
+ tux.cmd.wings_off()
+ tux.sys.wait(0.2)
+ tux.cmd.raw(0x31, 0, 0, 0)
+ self.get_widget('imgWings').set_from_pixbuf(self.wings_down)
+
tux.cmd.spinl_off()
tux.cmd.spinr_off()
- tux.sys.wait(0.2)
- tux.cmd.eyes_close()
- tux.cmd.raw(0x3A, 0, 0, 0)
- tux.cmd.mouth_close()
- tux.cmd.eyes_open()
+ def on_btnStopAll_clicked(self, widget, *args):
+ thread.start_new_thread(self.__stop_all, ())
-
-
## btnLEDrun
def on_btnLEDRun_clicked(self, widget, *args):
freq = self.get_widget('slideLED').get_value()
Modified: software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/main.pyp
===================================================================
--- software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/main.pyp 2007-12-11 10:02:08 UTC (rev 776)
+++ software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/main.pyp 2007-12-11 14:31:54 UTC (rev 777)
@@ -5,6 +5,12 @@
import time
def on_standby():
+ tux.cmd.eyes_close()
+ tux.cmd.raw(0x31, 0, 0, 0)
+ tux.cmd.eyes_open()
+ tux.cmd.mouth_close()
+
+
tux.event.on_remote_bt[K_STANDBY] = None
_me.gui('widget').hide_from_main()
_me.exit_main_loop()
Modified: software/gadgets/tux_controller/trunk/TuxController/Strings/fr_ALL.xml
===================================================================
--- software/gadgets/tux_controller/trunk/TuxController/Strings/fr_ALL.xml 2007-12-11 10:02:08 UTC (rev 776)
+++ software/gadgets/tux_controller/trunk/TuxController/Strings/fr_ALL.xml 2007-12-11 14:31:54 UTC (rev 777)
@@ -1,9 +1,11 @@
<?xml version='1.0' encoding='UTF-8'?>
<strings>
- <vr_Panel type='str'>Panneau</vr_Panel>
- <gui_conf_remote_title type='str'>Télécommande</gui_conf_remote_title>
+ <toolWingsUp type='str'>Lever les ailes</toolWingsUp>
+ <toolMove type='str'>Nombre de mouvements</toolMove>
<chkShow type='str'>Commandes avancées</chkShow>
<gui_conf_description_lb type='str'>Description</gui_conf_description_lb>
+ <toolTTSText type='str'>Entrer le texte ici</toolTTSText>
+ <lblPitch type='str'>Hauteur du son : </lblPitch>
<lblStop type='str'>Arrêter tous les mouvements</lblStop>
<radSpinDirRight type='str'>A droite</radSpinDirRight>
<gui_conf_accept_bt type='str'>Valider</gui_conf_accept_bt>
@@ -13,37 +15,73 @@
<vr_Wings type='str'>Ailes</vr_Wings>
<tabControl type='str'>Contrôle</tabControl>
<vr_Show type='str'>Afficher</vr_Show>
+ <lblTTSConf type='str'>Configuration TTS</lblTTSConf>
+ <toolLEDspin type='str'>Réglage du nombre de clignotement.</toolLEDspin>
+ <gui_conf_remote_title type='str'>Télécommande</gui_conf_remote_title>
+ <toolTTSClear type='str'>Effacer la zone de texte</toolTTSClear>
+ <toolLEDRight type='str'>Allumer/Eteindre la LED droite</toolLEDRight>
+ <toolMouthRun type='str'>Ce bouton actionne le bec
+en utilisant les paramètres définis.</toolMouthRun>
<gui_conf_version_lb type='str'>Version</gui_conf_version_lb>
<gui_conf_update_title type='str'>Mise à jour</gui_conf_update_title>
+ <lblConf type='str'>Divers</lblConf>
<gui_conf_cancel_bt type='str'>Annuler</gui_conf_cancel_bt>
- <lblConf type='str'>Divers</lblConf>
+ <vr_Panel type='str'>Panneau</vr_Panel>
<TTS type='str'>Lire</TTS>
+ <toolEyesClose type='str'>Fermer les yeux</toolEyesClose>
+ <toolLEDLeft type='str'>Allumer/Eteindre la LED gauche</toolLEDLeft>
<gui_conf_delay_lb type='str'>Délai (sec)</gui_conf_delay_lb>
<lblTTS type='str'>TTS</lblTTS>
<gui_conf_about_title type='str'>A propos</gui_conf_about_title>
<lblBatteryL type='str'>Niveau des batteries</lblBatteryL>
+ <toolTTS type='str'>Dire la phrase</toolTTS>
<radSpinDirLeft type='str'>A gauche</radSpinDirLeft>
- <tabStatus type='str'>Statuts</tabStatus>
- <lblMouth type='str'>Bec</lblMouth>
+ <toolStopAll type='str'>Ce bouton arrête tous les mouvements.</toolStopAll>
+ <lblWings type='str'>Ailes</lblWings>
+ <toolMouthClose type='str'>Fermer le bec</toolMouthClose>
<Count type='str'>mouv.</Count>
<vr_Flash type='str'>Flash</vr_Flash>
+ <TTSClear type='str'>Effacer</TTSClear>
+ <toolWingsDown type='str'>Baisser les ailes</toolWingsDown>
+ <toolLEDslide type='str'>Vous pouvez régler ici la fréquence de
+clignotement des LEDs</toolLEDslide>
+ <toolSpinRun type='str'>Ce bouton fait tourner Tux en
+utilisant les paramètres définis.</toolSpinRun>
+ <toolPWM type='str'>Réglage de la vitesse</toolPWM>
<gui_conf_current_bind_lb type='str'>Assignation</gui_conf_current_bind_lb>
<gui_conf_author_lb type='str'>Auteur</gui_conf_author_lb>
<lblSoundL type='str'>Niveau de son</lblSoundL>
+ <toolLEDRun type='str'>Ce bouton fait clignoter les LEDs
+en utilisant les paramêtres définis.</toolLEDRun>
+ <toolWingsRun type='str'>Ce bouton fait bouger les ailes
+en utilisant les paramètres définis.</toolWingsRun>
<colValue type='str'>Valeur</colValue>
<lblSpin type='str'>Rotation</lblSpin>
- <lblWings type='str'>Ailes</lblWings>
+ <tabStatus type='str'>Statuts</tabStatus>
+ <toolMouthOpen type='str'>Ouvrir le bec</toolMouthOpen>
<speaker_name type='str'>Bruno8k</speaker_name>
<vr_Hide type='str'>Cacher</vr_Hide>
<gui_conf_remote_set_bt type='str'>Set</gui_conf_remote_set_bt>
+ <toolSound type='str'>Niveau sonore</toolSound>
+ <toolLight type='str'>Niveau de lumière</toolLight>
<vr_Eyes type='str'>Yeux</vr_Eyes>
- <name_to_read type='str'>Commande de Tux</name_to_read>
+ <name_to_read type='str'>Commande du robot</name_to_read>
<gui_conf_window_title type='str'>Paramètres</gui_conf_window_title>
- <TTSClear type='str'>Effacer</TTSClear>
+ <toolEyesOpen type='str'>Ouvrir les yeux</toolEyesOpen>
+ <toolBattery type='str'>Niveau de la batterie</toolBattery>
<lblLightL type='str'>Niveau de lumière</lblLightL>
+ <toolSpinRight type='str'>Tourner vers la droite</toolSpinRight>
<lblEyes type='str'>Yeux</lblEyes>
+ <lblMouth type='str'>Bec</lblMouth>
<Second type='str'>sec.</Second>
<vr_Mouth type='str'>Bouche</vr_Mouth>
<colStatus type='str'>Statut</colStatus>
<vr_Leds type='str'>Leds</vr_Leds>
+ <toolSpinLeft type='str'>Tourner vers la gauche</toolSpinLeft>
+ <toolSpinDir type='str'>Choix du sens de rotation</toolSpinDir>
+ <toolEyesRun type='str'>Ce bouton fait actionne les yeux
+en utilisant les paramêtres définis.</toolEyesRun>
+ <toolPitch type='str'>Configurer la hauteur du son</toolPitch>
+ <toolAdvanced type='str'>Monter/Cacher les propriété avancées</toolAdvanced>
+ <toolLang type='str'>Configurer la langue TTS</toolLang>
</strings>
Modified: software/gadgets/tux_controller/trunk/TuxController/about.xml
===================================================================
--- software/gadgets/tux_controller/trunk/TuxController/about.xml 2007-12-11 10:02:08 UTC (rev 776)
+++ software/gadgets/tux_controller/trunk/TuxController/about.xml 2007-12-11 14:31:54 UTC (rev 777)
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<about>
- <gadget_name type='str'>tux_controller</gadget_name>
<gadget_author type='str'>Paul Rathgeb</gadget_author>
+ <gadget_version type='str'>0.0.1</gadget_version>
<gadget_description type='str'>Empty gadget for Tux Droid.</gadget_description>
- <gadget_version type='str'>0.0.1</gadget_version>
+ <gadget_name type='str'>tux_controller</gadget_name>
</about>
Modified: software/gadgets/tux_controller/trunk/TuxController/settings.xml
===================================================================
--- software/gadgets/tux_controller/trunk/TuxController/settings.xml 2007-12-11 10:02:08 UTC (rev 776)
+++ software/gadgets/tux_controller/trunk/TuxController/settings.xml 2007-12-11 14:31:54 UTC (rev 777)
@@ -2,6 +2,8 @@
<settings>
<parameters>
<hidden_in_manager type='bool'>False</hidden_in_manager>
+ <speaker type='int'>3</speaker>
+ <pitch type='int'>100</pitch>
</parameters>
<general>
<have_settings_part type='bool'>True</have_settings_part>
@@ -21,7 +23,7 @@
<framework_version type='str'>0.0.0</framework_version>
<menu_active type='bool'>True</menu_active>
<have_widget_part type='bool'>False</have_widget_part>
- <speaker type='int'>4</speaker>
+ <speaker type='int'>3</speaker>
<pitch type='int'>100</pitch>
<have_main_part type='bool'>True</have_main_part>
<main_priority type='int'>4</main_priority>
Modified: software/gadgets/tux_controller/trunk/TuxController/strings.xml
===================================================================
--- software/gadgets/tux_controller/trunk/TuxController/strings.xml 2007-12-11 10:02:08 UTC (rev 776)
+++ software/gadgets/tux_controller/trunk/TuxController/strings.xml 2007-12-11 14:31:54 UTC (rev 777)
@@ -1,9 +1,11 @@
<?xml version='1.0' encoding='UTF-8'?>
<strings>
- <lblLightL type='str'>Light level</lblLightL>
- <gui_conf_remote_title type='str'>Remote</gui_conf_remote_title>
+ <toolWingsUp type='str'>Lever les ailes</toolWingsUp>
+ <toolMove type='str'>Nombre de mouvements</toolMove>
<chkShow type='str'>Advanced view</chkShow>
<gui_conf_description_lb type='str'>Description</gui_conf_description_lb>
+ <toolTTSText type='str'>Entrer le texte ici</toolTTSText>
+ <lblPitch type='str'>Pitch : </lblPitch>
<lblStop type='str'>Stop all movements</lblStop>
<radSpinDirRight type='str'>Spin right</radSpinDirRight>
<gui_conf_accept_bt type='str'>Accept</gui_conf_accept_bt>
@@ -13,37 +15,73 @@
<vr_Wings type='str'>Wings</vr_Wings>
<tabControl type='str'>Control</tabControl>
<vr_Show type='str'>Show</vr_Show>
+ <lblTTSConf type='str'>TTS configuration</lblTTSConf>
+ <toolLEDspin type='str'>Réglage du nombre de clignotement.</toolLEDspin>
+ <gui_conf_remote_title type='str'>Remote</gui_conf_remote_title>
+ <toolTTSClear type='str'>Effacer la zone de texte</toolTTSClear>
+ <toolLEDRight type='str'>Allumer/Eteindre la LED droite</toolLEDRight>
+ <toolMouthRun type='str'>Ce bouton actionne le bec
+en utilisant les paramètres définis.</toolMouthRun>
<gui_conf_version_lb type='str'>Version</gui_conf_version_lb>
<gui_conf_update_title type='str'>Update</gui_conf_update_title>
- <gui_conf_cancel_bt type='str'>Cancel</gui_conf_cancel_bt>
<lblConf type='str'>Misc</lblConf>
+ <vr_Eyes type='str'>Eyes</vr_Eyes>
+ <vr_Panel type='str'>Panel</vr_Panel>
<TTS type='str'>Play</TTS>
+ <toolEyesClose type='str'>Fermer les yeux</toolEyesClose>
+ <toolLEDLeft type='str'>Allumer/Eteindre la LED gauche</toolLEDLeft>
<gui_conf_delay_lb type='str'>Delay (sec)</gui_conf_delay_lb>
<lblTTS type='str'>TTS</lblTTS>
<gui_conf_about_title type='str'>About</gui_conf_about_title>
<lblBatteryL type='str'>Battery level</lblBatteryL>
+ <toolTTS type='str'>Dire la phrase</toolTTS>
<radSpinDirLeft type='str'>Spin left</radSpinDirLeft>
- <tabStatus type='str'>Status</tabStatus>
- <speaker_name type='str'>Ryan8k</speaker_name>
+ <toolStopAll type='str'>Ce bouton arrête tous les mouvements.</toolStopAll>
+ <lblWings type='str'>WIngs</lblWings>
+ <toolMouthClose type='str'>Fermer le bec</toolMouthClose>
+ <toolBattery type='str'>Niveau de la batterie</toolBattery>
<Count type='str'>count</Count>
<vr_Flash type='str'>Flash</vr_Flash>
- <gui_conf_window_title type='str'>Parameters</gui_conf_window_title>
+ <toolWingsDown type='str'>Baisser les ailes</toolWingsDown>
+ <toolLEDslide type='str'>Vous pouvez régler ici la fréquence de
+clignotement des LEDs</toolLEDslide>
+ <toolSpinRun type='str'>Ce bouton fait tourner Tux en
+utilisant les paramètres définis.</toolSpinRun>
+ <toolPWM type='str'>Réglage de la vitesse</toolPWM>
<gui_conf_current_bind_lb type='str'>Current</gui_conf_current_bind_lb>
<gui_conf_author_lb type='str'>Author</gui_conf_aut...
[truncated message content] |
