[tuxdroid-svn] r765 - in software/gadgets/tux_controller/trunk: . TuxController TuxController/Scrip
Status: Beta
Brought to you by:
ks156
Menu
▾
▴
[tuxdroid-svn] r765 - in software/gadgets/tux_controller/trunk: . TuxController TuxController/Scripts/Python TuxController/Scripts/Python/GUI/widget TuxController/Strings
|
From: Paul_R <c2m...@c2...> - 2007-12-07 12:54:17
|
Author: Paul_R
Date: 2007-12-07 13:54:13 +0100 (Fri, 07 Dec 2007)
New Revision: 765
Modified:
software/gadgets/tux_controller/trunk/TuxController.tgf
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/strings.xml
Log:
* Added the remote control functions and the voice recognition.
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-07 10:55:13 UTC (rev 764)
+++ software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/GUI/widget/other.glade 2007-12-07 12:54:13 UTC (rev 765)
@@ -56,7 +56,7 @@
<property name="label" translatable="yes">checkbutton1</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
+ <property name="focus_on_click">False</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -109,8 +109,6 @@
<child>
<widget class="GtkFixed" id="fixed24">
- <property name="width_request">372</property>
- <property name="height_request">0</property>
<property name="visible">True</property>
<child>
@@ -238,67 +236,6 @@
</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">True</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">8</property>
- <property name="y">25</property>
- </packing>
- </child>
-
- <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">True</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">40</property>
- <property name="y">25</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHScale" id="slideLED">
- <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">150 1 255 1 0 0</property>
- <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">208</property>
- <property name="y">17</property>
- </packing>
- </child>
-
- <child>
<widget class="GtkButton" id="btnLEDRun">
<property name="width_request">36</property>
<property name="height_request">36</property>
@@ -331,7 +268,7 @@
<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="stock">gtk-refresh</property>
<property name="icon_size">4</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
@@ -392,6 +329,67 @@
<property name="y">4</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">8</property>
+ <property name="y">25</property>
+ </packing>
+ </child>
+
+ <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">40</property>
+ <property name="y">25</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHScale" id="slideLED">
+ <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">150 1 255 1 0 0</property>
+ <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">208</property>
+ <property name="y">17</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -472,7 +470,7 @@
<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="stock">gtk-refresh</property>
<property name="icon_size">4</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
@@ -650,7 +648,7 @@
<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="stock">gtk-go-down</property>
<property name="icon_size">4</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
@@ -792,7 +790,7 @@
<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="stock">gtk-refresh</property>
<property name="icon_size">4</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
@@ -958,7 +956,7 @@
<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="stock">gtk-go-down</property>
<property name="icon_size">4</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
@@ -1076,7 +1074,7 @@
<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="stock">gtk-refresh</property>
<property name="icon_size">4</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
@@ -1286,7 +1284,7 @@
<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="stock">gtk-go-down</property>
<property name="icon_size">4</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
@@ -1384,26 +1382,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">264</property>
- <property name="y">56</property>
- </packing>
- </child>
-
- <child>
<widget class="GtkRadioButton" id="radSpinDirLeft">
<property name="width_request">136</property>
<property name="height_request">24</property>
@@ -1416,7 +1394,6 @@
<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">120</property>
@@ -1458,7 +1435,7 @@
<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="stock">gtk-go-back</property>
<property name="icon_size">4</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
@@ -1542,7 +1519,7 @@
<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="stock">gtk-go-forward</property>
<property name="icon_size">4</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
@@ -1625,7 +1602,7 @@
<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="stock">gtk-refresh</property>
<property name="icon_size">4</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
@@ -1706,6 +1683,27 @@
<property name="y">7</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">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>
+ <property name="group">radSpinDirLeft</property>
+ </widget>
+ <packing>
+ <property name="x">264</property>
+ <property name="y">56</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -1719,6 +1717,7 @@
<child>
<widget class="GtkFixed" id="fixed32">
+ <property name="width_request">310</property>
<property name="visible">True</property>
<child>
@@ -1796,15 +1795,15 @@
</child>
<child>
- <widget class="GtkLabel" id="lblSound">
- <property name="width_request">46</property>
- <property name="height_request">17</property>
+ <widget class="GtkLabel" id="lblBatteryL">
+ <property name="width_request">138</property>
+ <property name="height_request">16</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">False</property>
+ <property name="justify">GTK_JUSTIFY_RIGHT</property>
+ <property name="wrap">True</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -1816,13 +1815,13 @@
<property name="angle">0</property>
</widget>
<packing>
- <property name="x">312</property>
- <property name="y">56</property>
+ <property name="x">0</property>
+ <property name="y">32</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="lblBatteryL">
+ <widget class="GtkLabel" id="lblSoundL">
<property name="width_request">138</property>
<property name="height_request">16</property>
<property name="visible">True</property>
@@ -1843,12 +1842,12 @@
</widget>
<packing>
<property name="x">0</property>
- <property name="y">32</property>
+ <property name="y">56</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="lblSoundL">
+ <widget class="GtkLabel" id="lblLightL">
<property name="width_request">138</property>
<property name="height_request">16</property>
<property name="visible">True</property>
@@ -1869,20 +1868,20 @@
</widget>
<packing>
<property name="x">0</property>
- <property name="y">56</property>
+ <property name="y">8</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="lblLightL">
- <property name="width_request">138</property>
- <property name="height_request">16</property>
+ <widget class="GtkLabel" id="lblSound">
+ <property name="width_request">46</property>
+ <property name="height_request">17</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_RIGHT</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>
@@ -1894,8 +1893,8 @@
<property name="angle">0</property>
</widget>
<packing>
- <property name="x">0</property>
- <property name="y">8</property>
+ <property name="x">312</property>
+ <property name="y">56</property>
</packing>
</child>
@@ -1967,7 +1966,6 @@
<child>
<widget class="GtkTextView" id="txtTTS">
- <property name="border_width">2</property>
<property name="width_request">348</property>
<property name="height_request">62</property>
<property name="visible">True</property>
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-07 10:55:13 UTC (rev 764)
+++ software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/GUI/widget/other.pyp 2007-12-07 12:54:13 UTC (rev 765)
@@ -25,6 +25,17 @@
self.__eyes_mutex = threading.Lock()
self.__mouth_mutex = threading.Lock()
self.__wings_mutex = threading.Lock()
+
+ rules = [
+ [['none', 'none', 'Eyes'], self.on_btnEyesRun_clicked, (None,)],
+ [['none', 'none', 'Mouth'], self.on_btnMouthRun_clicked, (None,)],
+ [['none', 'none', 'Wings'], self.on_btnWingsRun_clicked, (None,)],
+ [['none', 'none', 'Leds'], self.on_btnLEDRun_clicked, (None,)],
+ [['none', 'none', 'Flash'], tux.cmd.sound_play, (4,)],
+ [['none', 'Hide', 'Panel'], self.hide_tab, ()],
+ [['none', 'Show', 'Panel'], self.show_tab, ()],
+ ]
+ _me.voice_recognition.set_rules(rules)
def update(self):
tux.cmd.raw(0x31, 0, 0, 0)
@@ -50,6 +61,15 @@
tux.event.on_mouth_open = None
tux.event.on_mouth_close = None
tux.event.on_spin_stop = None
+ tux.event.on_remote_bt[K_UP] = None
+ tux.event.on_remote_bt[K_DOWN] = None
+ tux.event.on_remote_bt[K_OK] = None
+ tux.event.on_remote_bt[K_LEFT] = None
+ tux.event.on_remote_bt[K_RIGHT] = None
+ tux.event.on_remote_bt[K_RED] = None
+ tux.event.on_remote_bt[K_GREEN] = None
+ tux.event.on_remote_bt[K_BLUE] = None
+ tux.event.on_remote_bt[K_YELLOW] = None
def binding(self):
'''
@@ -58,16 +78,29 @@
The light, battery and audio monitoring are also initialized here.
'''
- tux.event.on_left_blue_led_on = self.on_left_led_on
- tux.event.on_left_blue_led_off = self.on_left_led_off
- tux.event.on_right_blue_led_on = self.on_right_led_on
- tux.event.on_right_blue_led_off = self.on_right_led_off
+ ### Correct the leds inversion on the next daemon
+ tux.event.on_left_blue_led_on = self.on_right_led_on
+ tux.event.on_left_blue_led_off = self.on_right_led_off
+ tux.event.on_right_blue_led_on = self.on_left_led_on
+ tux.event.on_right_blue_led_off = self.on_left_led_off
tux.event.on_eyes_open = self.on_eyes_open
tux.event.on_eyes_close = self.on_eyes_close
tux.event.on_mouth_open = self.on_mouth_open
tux.event.on_mouth_close = self.on_mouth_close
tux.event.on_spin_stop = self.on_spin_stop
+ tux.event.on_remote_bt[K_UP] = self.on_key_up #eyes
+ tux.event.on_remote_bt[K_DOWN] = self.on_key_down #wings
+ tux.event.on_remote_bt[K_OK] = self.on_key_ok #mouth
+ tux.event.on_remote_bt[K_LEFT] = self.on_key_left #spin right
+ tux.event.on_remote_bt[K_RIGHT] = self.on_key_right #spin left
+ tux.event.on_remote_bt[K_RED] = self.on_key_red #Run eyes
+ tux.event.on_remote_bt[K_GREEN] = self.on_key_green #Run mouth
+ tux.event.on_remote_bt[K_BLUE] = self.on_key_blue #Run wings
+ tux.event.on_remote_bt[K_YELLOW] = self.on_key_yellow #Run spinning
+
+
+
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()
@@ -260,21 +293,30 @@
tux.cmd.wings_on_free(int(value), int(freq))
def on_btnSpinLeft_pressed(self, widget, *args):
+ if tux.status.charger_state():
+ return
+ self.get_widget('imgSpin').set_from_pixbuf(self.spin_left)
tux.cmd.spinl_on_free(0)
- self.get_widget('imgSpin').set_from_pixbuf(self.spin_left)
-
def on_btnSpinLeft_released(self, widget, *args):
+ if tux.status.charger_state():
+ return
tux.cmd.spinl_on_free(1)
def on_btnSpinRight_pressed(self, widget, *args):
+ if tux.status.charger_state():
+ return
+ self.get_widget('imgSpin').set_from_file(self.path+'spin_right.png')
tux.cmd.spinr_on_free(0)
- self.get_widget('imgSpin').set_from_file(self.path+'spin_right.png')
def on_btnSpinRight_released(self, widget, *args):
+ if tux.status.charger_state():
+ return
tux.cmd.spinr_on_free(1)
def on_btnSpinRun_clicked(self, widget, *args):
+ if tux.status.charger_state():
+ return
value = self.get_widget('spinSpin').get_value()
freq = self.get_widget('slideSpin').get_value()
if self.get_widget('radSpinDirLeft').get_active():
@@ -296,7 +338,8 @@
LED has been toggled by an event, and not by the user.
'''
global __led_toggled_by_event
- if __led_toggled_by_event: return
+ if __led_toggled_by_event:
+ return
if widget.get_active():
tux.cmd.ledr_on()
else:
@@ -305,14 +348,14 @@
## chkLEDLeft
def on_chkLEDLeft_toggled(self, widget, *args):
global __led_toggled_by_event
- if __led_toggled_by_event: return
+ if __led_toggled_by_event:
+ return
+
if widget.get_active():
tux.cmd.ledl_on()
else:
tux.cmd.ledl_off()
- def on_chkLEDRight_clicked(self, widget, *args):
- print 'clicked'
def on_btnTTS_clicked(self, widget, *args):
textedit=self.get_widget('txtTTS')
@@ -324,6 +367,8 @@
textedit=self.get_widget('txtTTS')
buffer=textedit.get_buffer()
buffer.set_text("")
+
+
####################################################################
#
# Tux events functions
@@ -332,7 +377,6 @@
# All of these functions are declared in the 'binding' function.
#
####################################################################
-
def on_right_led_on(self):
global __led_toggled_by_event
__led_toggled_by_event = True
@@ -378,6 +422,39 @@
def on_spin_stop(self):
self.get_widget('imgSpin').set_from_pixbuf(self.spin_off)
+
+
+#--------------------------------
+# Remote events
+#--------------------------------
+ def on_key_up(self):
+ tux.cmd.eyes_on(2)
+
+ def on_key_down(self):
+ tux.cmd.wings_on(2, 5)
+
+ def on_key_ok(self):
+ tux.cmd.mouth_on(2)
+
+ def on_key_left(self):
+ self.get_widget('imgSpin').set_from_pixbuf(self.spin_right)
+ tux.cmd.spinr_on(4)
+
+ def on_key_right(self):
+ self.get_widget('imgSpin').set_from_pixbuf(self.spin_left)
+ tux.cmd.spinl_on(4)
+
+ def on_key_red(self):
+ self.on_btnEyesRun_clicked(None)
+
+ def on_key_green(self):
+ self.on_btnMouthRun_clicked(None)
+
+ def on_key_blue(self):
+ self.on_btnWingsRun_clicked(None)
+
+ def on_key_yellow(self):
+ self.on_btnSpinRun_clicked(None)
def on_light_level(self, args):
level = args[0]*256 + args[1]
Modified: software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/main.pyp
===================================================================
--- software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/main.pyp 2007-12-07 10:55:13 UTC (rev 764)
+++ software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/main.pyp 2007-12-07 12:54:13 UTC (rev 765)
@@ -11,9 +11,19 @@
-def start_gadget():
+def start_gadget():
+
tux.event.on_remote_bt[K_STANDBY] = on_standby
_me.gui('widget').show_from_main()
_me.run_main_loop()
-
+
+
+rules = [
+ [['none', 'none', 'Eyes'], tux.cmd.eyes_on, (2,)],
+ [['none', 'none', 'Mouth'], tux.cmd.mouth_on, (2,)],
+ [['none', 'none', 'Wings'], tux.cmd.wings_on, (2,)],
+ [['none', 'none', 'Leds'], tux.cmd.leds_blink, (100,20)],
+ [['none', 'none', 'Flash'], tux.cmd.sound_play, (2,)],
+]
+_me.voice_recognition.set_rules(rules)
start_gadget()
Modified: software/gadgets/tux_controller/trunk/TuxController/Strings/fr_ALL.xml
===================================================================
--- software/gadgets/tux_controller/trunk/TuxController/Strings/fr_ALL.xml 2007-12-07 10:55:13 UTC (rev 764)
+++ software/gadgets/tux_controller/trunk/TuxController/Strings/fr_ALL.xml 2007-12-07 12:54:13 UTC (rev 765)
@@ -7,10 +7,13 @@
<gui_conf_accept_bt type='str'>Valider</gui_conf_accept_bt>
<help_text type='str'>
</help_text>
+ <vr_Wings type='str'>Ailes</vr_Wings>
<tabControl type='str'>Contrôle</tabControl>
+ <vr_Show type='str'>Afficher</vr_Show>
<gui_conf_version_lb type='str'>Version</gui_conf_version_lb>
<gui_conf_update_title type='str'>Mise à jour</gui_conf_update_title>
<gui_conf_cancel_bt type='str'>Annuler</gui_conf_cancel_bt>
+ <vr_Panel type='str'>Panneau</vr_Panel>
<TTS type='str'>Lire</TTS>
<gui_conf_delay_lb type='str'>Délai (sec)</gui_conf_delay_lb>
<gui_conf_about_title type='str'>A propos</gui_conf_about_title>
@@ -18,16 +21,21 @@
<radSpinDirLeft type='str'>A gauche</radSpinDirLeft>
<tabStatus type='str'>Statuts</tabStatus>
<Count type='str'>mouv.</Count>
+ <vr_Flash type='str'>Flash</vr_Flash>
<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>
<colValue type='str'>Valeur</colValue>
<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>
+ <vr_Eyes type='str'>Yeux</vr_Eyes>
<name_to_read type='str'>Commande de Tux Droid</name_to_read>
<gui_conf_window_title type='str'>Paramètres</gui_conf_window_title>
<TTSClear type='str'>Effacer</TTSClear>
<lblLightL type='str'>Niveau de lumière</lblLightL>
<Second type='str'>sec.</Second>
+ <vr_Mouth type='str'>Bouche</vr_Mouth>
<colStatus type='str'>Statut</colStatus>
+ <vr_Leds type='str'>Leds</vr_Leds>
</strings>
Modified: software/gadgets/tux_controller/trunk/TuxController/about.xml
===================================================================
--- software/gadgets/tux_controller/trunk/TuxController/about.xml 2007-12-07 10:55:13 UTC (rev 764)
+++ software/gadgets/tux_controller/trunk/TuxController/about.xml 2007-12-07 12:54:13 UTC (rev 765)
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<about>
+ <gadget_author type='str'>Paul Rathgeb</gadget_author>
+ <gadget_version type='str'>0.0.1</gadget_version>
<gadget_name type='str'>tux_controller</gadget_name>
- <gadget_author type='str'>Paul Rathgeb</gadget_author>
<gadget_description type='str'>Empty gadget for Tux Droid.</gadget_description>
- <gadget_version type='str'>0.0.1</gadget_version>
</about>
Modified: software/gadgets/tux_controller/trunk/TuxController/strings.xml
===================================================================
--- software/gadgets/tux_controller/trunk/TuxController/strings.xml 2007-12-07 10:55:13 UTC (rev 764)
+++ software/gadgets/tux_controller/trunk/TuxController/strings.xml 2007-12-07 12:54:13 UTC (rev 765)
@@ -7,10 +7,13 @@
<gui_conf_accept_bt type='str'>Accept</gui_conf_accept_bt>
<help_text type='str'>
</help_text>
+ <vr_Wings type='str'>Wings</vr_Wings>
<tabControl type='str'>Control</tabControl>
+ <vr_Show type='str'>Show</vr_Show>
<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>
+ <vr_Panel type='str'>Panel</vr_Panel>
<TTS type='str'>Play</TTS>
<gui_conf_delay_lb type='str'>Delay (sec)</gui_conf_delay_lb>
<gui_conf_about_title type='str'>About</gui_conf_about_title>
@@ -18,16 +21,21 @@
<radSpinDirLeft type='str'>Spin left</radSpinDirLeft>
<tabStatus type='str'>Status</tabStatus>
<Count type='str'>count</Count>
+ <vr_Flash type='str'>Flash</vr_Flash>
<gui_conf_current_bind_lb type='str'>Current</gui_conf_current_bind_lb>
<gui_conf_author_lb type='str'>Author</gui_conf_author_lb>
<lblSoundL type='str'>Sound level</lblSoundL>
<colValue type='str'>Value</colValue>
<speaker_name type='str'>Ryan8k</speaker_name>
+ <vr_Hide type='str'>Hide</vr_Hide>
<gui_conf_remote_set_bt type='str'>Set</gui_conf_remote_set_bt>
+ <vr_Eyes type='str'>Eyes</vr_Eyes>
<name_to_read type='str'>Tux Droid Controler</name_to_read>
<gui_conf_window_title type='str'>Parameters</gui_conf_window_title>
<TTSClear type='str'>Clear</TTSClear>
<lblLightL type='str'>Light level</lblLightL>
<Second type='str'>sec.</Second>
+ <vr_Mouth type='str'>Mouth</vr_Mouth>
<colStatus type='str'>Status</colStatus>
+ <vr_Leds type='str'>Leds</vr_Leds>
</strings>
Modified: software/gadgets/tux_controller/trunk/TuxController.tgf
===================================================================
(Binary files differ)
|
