[tuxdroid-svn] r804 - in software/gadgets/tux_controller/trunk: . TuxController TuxController/Scripts/Python TuxController/Scripts/Python/GUI/widget

[Paul_R <c2m...@c2...>]

Author: Paul_R
Date: 2007-12-20 09:19:50 +0100 (Thu, 20 Dec 2007)
New Revision: 804

Modified:
   software/gadgets/tux_controller/trunk/TuxController.tgf
   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.xml
Log:
* Added the english help file, and the tooltips translations.

* Improve the main window destroy function.


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-18 10:44:29 UTC (rev 803)
+++ software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/GUI/widget/other.pyp	2007-12-20 08:19:50 UTC (rev 804)
@@ -82,7 +82,7 @@
         '''
         When the window is destroyed, don't forget to remove the monitoring vectors
         '''
-        pass
+        _me.get_funct('on_standby')()
         
     def binding(self):
         '''

Modified: software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/main.pyp
===================================================================
--- software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/main.pyp	2007-12-18 10:44:29 UTC (rev 803)
+++ software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/main.pyp	2007-12-20 08:19:50 UTC (rev 804)
@@ -27,6 +27,7 @@
     tux.event.on_remote_bt[K_GREEN] = None
     tux.event.on_remote_bt[K_BLUE] = None
     tux.event.on_remote_bt[K_YELLOW] = None
+    tux.sys.wait(0.5)
     tux.cmd.eyes_off()
     tux.cmd.spinl_off()
     tux.cmd.spinr_off()
@@ -57,4 +58,5 @@
     [['none', 'none', 'Flash'], tux.cmd.sound_play, (2,)],
 ]
 _me.voice_recognition.set_rules(rules)  
+_me.insert_funct('on_standby', on_standby)
 start_gadget()

Modified: software/gadgets/tux_controller/trunk/TuxController/strings.xml
===================================================================
--- software/gadgets/tux_controller/trunk/TuxController/strings.xml	2007-12-18 10:44:29 UTC (rev 803)
+++ software/gadgets/tux_controller/trunk/TuxController/strings.xml	2007-12-20 08:19:50 UTC (rev 804)
@@ -19,8 +19,28 @@
   <gui_conf_update_title type='str'>Update</gui_conf_update_title>
   <gui_conf_version_lb type='str'>Version</gui_conf_version_lb>
   <gui_conf_window_title type='str'>Parameters</gui_conf_window_title>
-  <help_text type='str'>
-  </help_text>
+  <help_text type='str'>-- Tux Controller gadget --
+        
+With this gadget Tux can be controlled directly. The window exists out of 2 parts:
+The left part, displaying Tux, allows to send simple commands.
+In the right part more advanced settings can be specified. After setting the number
+of movements and the speed, the movements are started by clicking the gear button.
+The right window part can be hidden by deselecting 'Advanced view' on the left.
+        
+You can also make Tux say a text, using the Text To Speech engine. This part is found
+in the lower portion of the window. Click the 'TTS' arrow to expand the text field. It's
+also possible to change the language or voice in the advanced view.
+        
+The movements can also be actuated, using the remote control buttons :
+        
+Part :     Simple mov :    Adv mov :
+Eyes       Arrow down      Red
+Beak      OK                    Green
+Wings     Arrow up          Blue
+Spin       Left / right        Yellow
+        
+Known issue:
+Actuating the left or right LED separately is not displayed in the gadget window.</help_text>
   <lblBatteryL type='str'>Battery level</lblBatteryL>
   <lblConf type='str'>Misc</lblConf>
   <lblEyes type='str'>Eyes</lblEyes>
@@ -42,42 +62,42 @@
   <speaker_name type='str'>Ryan8k</speaker_name>
   <tabControl type='str'>Control</tabControl>
   <tabStatus type='str'>Status</tabStatus>
-  <toolAdvanced type='str'>Monter/Cacher les propriété avancées</toolAdvanced>
-  <toolBattery type='str'>Niveau de la batterie</toolBattery>
-  <toolEyesClose type='str'>Fermer les yeux</toolEyesClose>
-  <toolEyesOpen type='str'>Ouvrir les yeux</toolEyesOpen>
-  <toolEyesRun type='str'>Ce bouton actionne les yeux
-en utilisant les paramètres définis.</toolEyesRun>
-  <toolLEDLeft type='str'>Allumer/Eteindre la LED gauche</toolLEDLeft>
-  <toolLEDRight type='str'>Allumer/Eteindre la LED droite</toolLEDRight>
-  <toolLEDRun type='str'>Ce bouton fait clignoter les LEDs
-en utilisant les paramètres définis.</toolLEDRun>
-  <toolLEDslide type='str'>Vous pouvez régler ici la fréquence de 
-clignotement des LEDs</toolLEDslide>
-  <toolLEDspin type='str'>Réglage du nombre de clignotement.</toolLEDspin>
-  <toolLang type='str'>Configurer la langue TTS</toolLang>
-  <toolLight type='str'>Niveau de lumière</toolLight>
-  <toolMouthClose type='str'>Fermer le bec</toolMouthClose>
-  <toolMouthOpen type='str'>Ouvrir le bec</toolMouthOpen>
-  <toolMouthRun type='str'>Ce bouton actionne le bec
-en utilisant les paramètres définis.</toolMouthRun>
-  <toolMove type='str'>Nombre de mouvements</toolMove>
-  <toolPWM type='str'>Réglage de la vitesse</toolPWM>
-  <toolPitch type='str'>Configurer la hauteur du son</toolPitch>
-  <toolSound type='str'>Niveau sonore</toolSound>
-  <toolSpinDir type='str'>Choix du sens de rotation</toolSpinDir>
-  <toolSpinLeft type='str'>Tourner vers la gauche</toolSpinLeft>
-  <toolSpinRight type='str'>Tourner vers la droite</toolSpinRight>
-  <toolSpinRun type='str'>Ce bouton fait tourner Tux en 
-utilisant les paramètres définis.</toolSpinRun>
-  <toolStopAll type='str'>Ce bouton arrête tous les mouvements.</toolStopAll>
-  <toolTTS type='str'>Dire la phrase</toolTTS>
-  <toolTTSClear type='str'>Effacer la zone de texte</toolTTSClear>
-  <toolTTSText type='str'>Entrer le texte ici</toolTTSText>
-  <toolWingsDown type='str'>Baisser les ailes</toolWingsDown>
-  <toolWingsRun type='str'>Ce bouton fait bouger les ailes
-en utilisant les paramètres définis.</toolWingsRun>
-  <toolWingsUp type='str'>Lever les ailes</toolWingsUp>
+  <toolAdvanced type='str'>Hide/Expand advanced view</toolAdvanced>
+  <toolBattery type='str'>Battery level</toolBattery>
+  <toolEyesClose type='str'>Close the eyes</toolEyesClose>
+  <toolEyesOpen type='str'>Open the eyes</toolEyesOpen>
+  <toolEyesRun type='str'>This button actuates the eyes
+using the defined settings</toolEyesRun>
+  <toolLEDLeft type='str'>Turn on/off the left LED</toolLEDLeft>
+  <toolLEDRight type='str'>Turn on/off the right LED</toolLEDRight>
+  <toolLEDRun type='str'>This button makes the LED's blink
+using the defined settings</toolLEDRun>
+  <toolLEDslide type='str'>Here you can modify the blinking
+frequency of the eyes</toolLEDslide>
+  <toolLEDspin type='str'>Set the number of eye blinks</toolLEDspin>
+  <toolLang type='str'>Configure the TTS language</toolLang>
+  <toolLight type='str'>Light level</toolLight>
+  <toolMouthClose type='str'>Close the beak</toolMouthClose>
+  <toolMouthOpen type='str'>Open the beak</toolMouthOpen>
+  <toolMouthRun type='str'>This button actuates the beak
+using the defined setting</toolMouthRun>
+  <toolMove type='str'>Number of movements</toolMove>
+  <toolPWM type='str'>Set the speed</toolPWM>
+  <toolPitch type='str'>Configure the sound volume</toolPitch>
+  <toolSound type='str'>Sound level</toolSound>
+  <toolSpinDir type='str'>Choose the spinning direction</toolSpinDir>
+  <toolSpinLeft type='str'>Spin to the left</toolSpinLeft>
+  <toolSpinRight type='str'>Spin to the right</toolSpinRight>
+  <toolSpinRun type='str'>This button makes Tux spin
+using the defined setting</toolSpinRun>
+  <toolStopAll type='str'>This button stops all movements</toolStopAll>
+  <toolTTS type='str'>Say the text</toolTTS>
+  <toolTTSClear type='str'>Clear the text field</toolTTSClear>
+  <toolTTSText type='str'>Enter the text here</toolTTSText>
+  <toolWingsDown type='str'>Lower the wings</toolWingsDown>
+  <toolWingsRun type='str'>This button makes the wings move
+using the defined setting</toolWingsRun>
+  <toolWingsUp type='str'>Raise the wings</toolWingsUp>
   <vr_Eyes type='str'>Eyes</vr_Eyes>
   <vr_Flash type='str'>Flash</vr_Flash>
   <vr_Hide type='str'>Hide</vr_Hide>

Modified: software/gadgets/tux_controller/trunk/TuxController.tgf
===================================================================
(Binary files differ)