[tuxdroid-svn] r795 - in software/gadgets/tux_controller/trunk: . TuxController TuxController/Pictures/Icons TuxController/Scripts/Python TuxController/Scripts/Python/GUI/widget TuxController/Strings

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

Author: Paul_R
Date: 2007-12-14 12:27:13 +0100 (Fri, 14 Dec 2007)
New Revision: 795

Added:
   software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/gear-off.png
   software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/spin_off_charging.png
Modified:
   software/gadgets/tux_controller/trunk/TuxController.tgf
   software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/battery.png
   software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/light.png
   software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/microphone.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/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 new images

* Added functions to stop the movements


Modified: software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/battery.png
===================================================================
(Binary files differ)

Added: software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/gear-off.png
===================================================================
(Binary files differ)


Property changes on: software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/gear-off.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/light.png
===================================================================
(Binary files differ)

Modified: software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/microphone.png
===================================================================
(Binary files differ)

Added: software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/spin_off_charging.png
===================================================================
(Binary files differ)


Property changes on: software/gadgets/tux_controller/trunk/TuxController/Pictures/Icons/spin_off_charging.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

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-14 10:40:27 UTC (rev 794)
+++ software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/GUI/widget/other.glade	2007-12-14 11:27:13 UTC (rev 795)
@@ -685,7 +685,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 255 1 10 10</property>
+		      <property name="adjustment">1 0 127 1 10 10</property>
 		    </widget>
 		    <packing>
 		      <property name="x">70</property>
@@ -872,7 +872,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 255 1 10 10</property>
+		      <property name="adjustment">1 0 127 1 10 10</property>
 		    </widget>
 		    <packing>
 		      <property name="x">72</property>
@@ -1040,7 +1040,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 255 1 10 10</property>
+		      <property name="adjustment">1 0 127 1 10 10</property>
 		    </widget>
 		    <packing>
 		      <property name="x">70</property>
@@ -1208,7 +1208,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 255 1 10 10</property>
+		      <property name="adjustment">1 0 127 1 10 10</property>
 		    </widget>
 		    <packing>
 		      <property name="x">70</property>
@@ -1396,7 +1396,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 255 1 10 10</property>
+		      <property name="adjustment">1 0 127 1 10 10</property>
 		    </widget>
 		    <packing>
 		      <property name="x">70</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-14 10:40:27 UTC (rev 794)
+++ software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/GUI/widget/other.pyp	2007-12-14 11:27:13 UTC (rev 795)
@@ -24,7 +24,7 @@
     def new(self):
         global __led_toggled_by_event
         __led_toggled_by_event = False    
-            
+        _me.set_param('generalStop', False)
         self.get_widget("window1").set_title(_me.string('name_to_read'))
         self.create_tooltips()
         thread.start_new_thread(self.update,())
@@ -44,6 +44,19 @@
         _me.voice_recognition.set_rules(rules)  
             
     def update(self):
+        self.__eyes_active = False
+        self.__eyes_stop = False
+        self.__eyes_infinite = False
+        self.__mouth_active = False
+        self.__mouth_stop = False
+        self.__mouth_infinite = False
+        self.__wings_active = False
+        self.__wings_stop = False
+        self.__wings_infinite = False
+        self.__spin_active = False
+        self.__spin_stop = False
+        self.__spin_infinite = False
+        
         _me.set_var('pitch', _me.get_param('pitch'))
         _me.set_var('speaker', _me.get_param('speaker'))
         
@@ -57,8 +70,6 @@
         self.update_labels()
         self.update_pix()
         
-        
-        
         tux.cmd.raw(0x31, 0, 0, 0)
         self.update_status()
         
@@ -83,6 +94,7 @@
         tux.event.on_mouth_open = None
         tux.event.on_mouth_close = None
         tux.event.on_spin_stop = None
+        tux.event.on_power_unplugged = 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
@@ -110,6 +122,7 @@
         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_power_unplugged = self.on_unplugged
         
         tux.event.on_remote_bt[K_UP] = self.on_key_up #eyes
         tux.event.on_remote_bt[K_DOWN] = self.on_key_down #wings
@@ -123,6 +136,7 @@
         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)
         
@@ -165,6 +179,7 @@
         self.spin_left = gtk.gdk.pixbuf_new_from_file(self.path+'spin_left.png')
         self.spin_right = gtk.gdk.pixbuf_new_from_file(self.path+'spin_right.png')
         self.spin_off = gtk.gdk.pixbuf_new_from_file(self.path+'spin_off.png')
+        self.spin_transfo = gtk.gdk.pixbuf_new_from_file(self.path+'spin_off_charging.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')
@@ -172,6 +187,7 @@
         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.stop = gtk.gdk.pixbuf_new_from_file(self.path+'gear-off.png')
         
         self.get_widget('imgLEDRun').set_from_pixbuf(self.run)
         
@@ -190,6 +206,8 @@
         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.get_widget('imgStopAll').set_from_pixbuf(self.stop)
         self.show_tab()
         
         if tux.status.rled():
@@ -329,7 +347,6 @@
         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)
@@ -358,29 +375,42 @@
             self.hide_tab()
         
     def __stop_all(self):
-        if tux.status.eyes_motor():
+        if self.__eyes_active:
             tux.cmd.eyes_off()
-            tux.sys.wait(0.2)
-            tux.cmd.eyes_close()
+            self.__eyes_active = False
+            self.__eyes_stop = True
+            self.__eyes_infinite = False
+            self.get_widget('imgEyesRun').set_from_pixbuf(self.run)
             tux.cmd.eyes_open()
         
-        if tux.status.mouth_motor():
+        if self.__mouth_active:
             tux.cmd.mouth_off()
-            tux.cmd.mouth_open()
-            tux.sys.wait(0.2)
+            self.__mouth_active = False
+            self.__mouth_stop = True
+            self.__mouth_infinite = False
+            self.get_widget('imgMouthRun').set_from_pixbuf(self.run)
             tux.cmd.mouth_close()
             
-        if tux.status.wings_motor():
+            
+        if self.__wings_active:
             tux.cmd.wings_off()
-            tux.sys.wait(0.2)
-            tux.cmd.raw(0x31, 0, 0, 0)
+            self.__wings_active = False
+            self.__wings_stop = True
+            self.__wings_infinite = False
+            self.get_widget('imgWingsRun').set_from_pixbuf(self.run)
             self.get_widget('imgWings').set_from_pixbuf(self.wings_down)
-            
-        tux.cmd.spinl_off()
-        tux.cmd.spinr_off()
+            tux.cmd.raw(0x3A, 0, 0, 0)
         
+        if self.__spin_active:
+            self.__spin_active = False
+            self.__spin_infinite = False
+            self.get_widget('imgSpinRun').set_from_pixbuf(self.run)
+            self.get_widget('imgSpin').set_from_pixbuf(self.spin_off)
+            tux.cmd.spinl_off()
+            tux.cmd.spinr_off()
         
         
+        
     def on_btnStopAll_clicked(self, widget, *args):
         thread.start_new_thread(self.__stop_all, ())
         
@@ -400,9 +430,29 @@
         tux.cmd.eyes_close()
 
     def on_btnEyesRun_clicked(self, widget, *args):
-        value = self.get_widget('spinEyes').get_value()
-        value = value * 2
-        tux.cmd.eyes_on_free(int(value))
+        if self.__mouth_active:
+            tux.cmd.mouth_off()
+            self.__mouth_active = False
+            self.__mouth_stop = True
+            self.__mouth_infinite = False
+            self.get_widget('imgMouthRun').set_from_pixbuf(self.run)
+            
+        if self.__eyes_active == False:
+            self.__eyes_active = True
+            self.get_widget('imgEyesRun').set_from_pixbuf(self.stop)
+            value = self.get_widget('spinEyes').get_value()
+            value = value * 2
+            if value == 0:
+                self.__eyes_infinite = True
+            tux.cmd.eyes_on_free(int(value))
+            tux.sys.looped_function(self.__update_eyes_buttons, 0.2)
+        else:
+            tux.cmd.eyes_off()
+            self.__eyes_active = False
+            self.__eyes_stop = True
+            self.__eyes_infinite = False
+            self.get_widget('imgEyesRun').set_from_pixbuf(self.run)
+            
          
     def on_btnMouthClose_released(self, widget, *args):
         tux.cmd.mouth_close() 
@@ -411,9 +461,28 @@
         tux.cmd.mouth_open()
 
     def on_btnMouthRun_clicked(self, widget, *args):
-        value = self.get_widget('spinMouth').get_value()
-        value = value * 2
-        tux.cmd.mouth_on_free(int(value))
+        if self.__eyes_active:
+            tux.cmd.eyes_off()
+            self.__eyes_active = False
+            self.__eyes_stop = True
+            self.__eyes_infinite = False
+            self.get_widget('imgEyesRun').set_from_pixbuf(self.run)
+            
+        if self.__mouth_active == False:
+            self.__mouth_active = True
+            self.get_widget('imgMouthRun').set_from_pixbuf(self.stop)
+            value = self.get_widget('spinMouth').get_value()
+            value = value * 2
+            if value == 0:
+                self.__mouth_infinite = True
+            tux.cmd.mouth_on_free(int(value))
+            tux.sys.looped_function(self.__update_mouth_buttons, 0.2)
+        else:
+            tux.cmd.mouth_off()
+            self.__mouth_active = False
+            self.__mouth_stop = True
+            self.__mouth_infinite = False
+            self.get_widget('imgMouthRun').set_from_pixbuf(self.run)
 
     def on_btnWingsUp_released(self, widget, *args):
         self.get_widget('imgWings').set_from_file(self.path+'wings_up.png')
@@ -424,44 +493,76 @@
         tux.cmd.raw(0x3A, 0, 0, 0)
 
     def on_btnWingsRun_clicked(self, widget, *args):
-        value = self.get_widget('spinWings').get_value()
-        value = value * 2
-        freq = self.get_widget('slideWings').get_value()
-        tux.cmd.wings_on_free(int(value), int(freq))
+        if self.__wings_active == False:
+            self.__wings_active = True
+            self.get_widget('imgWingsRun').set_from_pixbuf(self.stop)
+            value = self.get_widget('spinWings').get_value()
+            value = value * 2
+            if value == 0:
+                self.__wings_infinite = True
+            freq = self.get_widget('slideWings').get_value()
+            tux.cmd.wings_on_free(int(value), int(freq))
+            tux.sys.looped_function(self.__update_wings_buttons, 0.2)
+        else:
+            tux.cmd.wings_off()
+            self.__wings_active = False
+            self.__wings_stop = True
+            self.__wings_infinite = False
+            self.get_widget('imgWingsRun').set_from_pixbuf(self.run)
         
     def on_btnSpinLeft_pressed(self, widget, *args):
-        if tux.status.charger_state():
+        if tux.status.power_plug():
+            self.get_widget('imgSpin').set_from_pixbuf(self.spin_transfo)
             return
         self.get_widget('imgSpin').set_from_pixbuf(self.spin_left)
         tux.cmd.spinl_on_free(0)
         
     def on_btnSpinLeft_released(self, widget, *args):
-        if tux.status.charger_state():
+        if tux.status.power_plug():
+            self.get_widget('imgSpin').set_from_pixbuf(self.spin_transfo)
             return
         tux.cmd.spinl_on_free(1)
 
     def on_btnSpinRight_pressed(self, widget, *args):
-        if tux.status.charger_state():
+        if tux.status.power_plug():
+            self.get_widget('imgSpin').set_from_pixbuf(self.spin_transfo)
             return
         self.get_widget('imgSpin').set_from_file(self.path+'spin_right.png')
         tux.cmd.spinr_on_free(0)
         
     def on_btnSpinRight_released(self, widget, *args):
-        if tux.status.charger_state():
+        if tux.status.power_plug():
+            self.get_widget('imgSpin').set_from_pixbuf(self.spin_transfo)
             return
         tux.cmd.spinr_on_free(1) 
 
     def on_btnSpinRun_clicked(self, widget, *args):
-        if tux.status.charger_state():
+        if tux.status.power_plug():
+            self.get_widget('imgSpin').set_from_pixbuf(self.spin_transfo)
             return
-        value = self.get_widget('spinSpin').get_value()
-        freq = self.get_widget('slideSpin').get_value()
-        if self.get_widget('radSpinDirLeft').get_active():
-            tux.cmd.spinl_on_free(int(value), int(freq))
-            self.get_widget('imgSpin').set_from_pixbuf(self.spin_left)
+        if self.__spin_active == False:
+            self.__spin_active = True
+            
+            value = self.get_widget('spinSpin').get_value()
+            if value == 0:
+                self.__spin_infite = True
+                
+            freq = self.get_widget('slideSpin').get_value()
+            if self.get_widget('radSpinDirLeft').get_active():
+                tux.cmd.spinl_on_free(int(value), int(freq))
+                self.get_widget('imgSpin').set_from_pixbuf(self.spin_left)
+            else:
+                tux.cmd.spinr_on_free(int(value), int(freq))
+                self.get_widget('imgSpin').set_from_pixbuf(self.spin_right)
+            self.get_widget('imgSpinRun').set_from_pixbuf(self.stop)    
+
         else:
-            tux.cmd.spinr_on_free(int(value), int(freq))
-            self.get_widget('imgSpin').set_from_pixbuf(self.spin_right)
+            tux.cmd.spinl_off()
+            tux.cmd.spinr_off()
+            self.__spin_active = False
+            self.__spin_stop = True
+            self.__spin_infinite = False
+            self.get_widget('imgSpinRun').set_from_pixbuf(self.run)
 
 
 ## chkLEDRight
@@ -552,11 +653,13 @@
         
     def on_eyes_close(self):
         self.get_widget('imgLed').set_from_pixbuf(self.eyes_close)
+        
 
     def on_eyes_open(self):
         tux.status.lled()
         tux.status.rled()
 
+
     def on_mouth_open(self):
         self.get_widget('imgMouth').set_from_pixbuf(self.beak_open)
         
@@ -565,8 +668,11 @@
         
     def on_spin_stop(self):
         self.get_widget('imgSpin').set_from_pixbuf(self.spin_off)
+        self.__spin_active = False
+        self.get_widget('imgSpinRun').set_from_pixbuf(self.run)
 
-
+    def on_unplugged(self):
+        self.get_widget('imgSpin').set_from_pixbuf(self.spin_off)
 #--------------------------------
 # Remote events
 #--------------------------------        
@@ -628,4 +734,56 @@
         self.get_widget('lblSound').set_text('%.1f%s'%(val*100, '%'))
         self.get_widget('SoundLevel').set_fraction(val)
 
+    
+    def __update_eyes_buttons(self):
+        print '3'
+        if _me.get_param('generalStop'):
+            return False
+        tux.sys.wait(0.2)
+        if self.__eyes_stop:
+            self.__eyes_stop = False
+            return False
+            
+        if tux.status.eyes_counter() == 0 and self.__eyes_active == True and self.__eyes_infinite == False:
+            self.__eyes_active = False
+            self.get_widget('imgEyesRun').set_from_pixbuf(self.run)
+            return False
+            
+        return True
+        
+        
+    def __update_mouth_buttons(self):
+        print '2'
+        if _me.get_param('generalStop'):
+            return False
+        tux.sys.wait(0.2)
+        if self.__mouth_stop:
+            self.__mouth_stop = False
+            return False
+            
+        if tux.status.mouth_counter() == 0 and self.__mouth_active == True and self.__mouth_infinite == False:
+            self.__mouth_active = False
+            self.get_widget('imgMouthRun').set_from_pixbuf(self.run)
+            return False
+            
+        return True
+        
 
+    def __update_wings_buttons(self):
+        print '1'
+        if _me.get_param('generalStop'):
+            return False
+        tux.sys.wait(0.2)
+        if self.__wings_stop:
+            self.__wings_stop = False
+            return False
+            
+        if tux.status.wings_counter() == 0 and self.__wings_active == True and self.__wings_infinite == False:
+            self.__wings_active = False
+            self.get_widget('imgWingsRun').set_from_pixbuf(self.run)
+            return False
+            
+        return True
+
+
+        

Modified: software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/main.pyp
===================================================================
--- software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/main.pyp	2007-12-14 10:40:27 UTC (rev 794)
+++ software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/main.pyp	2007-12-14 11:27:13 UTC (rev 795)
@@ -5,12 +5,17 @@
 import time
 
 def on_standby():
+    tux.cmd.eyes_off()
+    tux.cmd.spinl_off()
+    tux.cmd.spinr_off()
+    tux.cmd.mouth_off()
+    tux.sys.wait(1)
     tux.cmd.eyes_close()
     tux.cmd.raw(0x31, 0, 0, 0)
     tux.cmd.eyes_open()
     tux.cmd.mouth_close()
 
-
+    _me.set_param('generalStop', True)
     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-14 10:40:27 UTC (rev 794)
+++ software/gadgets/tux_controller/trunk/TuxController/Strings/fr_ALL.xml	2007-12-14 11:27:13 UTC (rev 795)
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <strings>
+  <vr_Panel type='str'>Panneau</vr_Panel>
   <toolWingsUp type='str'>Lever les ailes</toolWingsUp>
   <toolMove type='str'>Nombre de mouvements</toolMove>
   <chkShow type='str'>Commandes avancées</chkShow>
@@ -24,9 +25,8 @@
 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>
+  <vr_Eyes type='str'>Yeux</vr_Eyes>
   <lblConf type='str'>Divers</lblConf>
-  <gui_conf_cancel_bt type='str'>Annuler</gui_conf_cancel_bt>
-  <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>
@@ -39,9 +39,9 @@
   <toolStopAll type='str'>Ce bouton arrête tous les mouvements.</toolStopAll>
   <lblWings type='str'>Ailes</lblWings>
   <toolMouthClose type='str'>Fermer le bec</toolMouthClose>
+  <toolBattery type='str'>Niveau de la batterie</toolBattery>
   <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>
@@ -50,7 +50,8 @@
   <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>
+  <toolEyesRun type='str'>Ce bouton fait actionne les yeux
+en utilisant les paramêtres définis.</toolEyesRun>
   <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
@@ -64,11 +65,11 @@
   <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>
+  <gui_conf_cancel_bt type='str'>Annuler</gui_conf_cancel_bt>
   <name_to_read type='str'>Commande du robot</name_to_read>
   <gui_conf_window_title type='str'>Paramètres</gui_conf_window_title>
   <toolEyesOpen type='str'>Ouvrir les yeux</toolEyesOpen>
-  <toolBattery type='str'>Niveau de la batterie</toolBattery>
+  <toolLang type='str'>Configurer la langue TTS</toolLang>
   <lblLightL type='str'>Niveau de lumière</lblLightL>
   <toolSpinRight type='str'>Tourner vers la droite</toolSpinRight>
   <lblEyes type='str'>Yeux</lblEyes>
@@ -79,9 +80,8 @@
   <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>
+  <lblSoundL type='str'>Niveau de son</lblSoundL>
   <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>
+  <TTSClear type='str'>Effacer</TTSClear>
 </strings>

Modified: software/gadgets/tux_controller/trunk/TuxController/about.xml
===================================================================
--- software/gadgets/tux_controller/trunk/TuxController/about.xml	2007-12-14 10:40:27 UTC (rev 794)
+++ software/gadgets/tux_controller/trunk/TuxController/about.xml	2007-12-14 11:27:13 UTC (rev 795)
@@ -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_description type='str'>Empty gadget for Tux Droid.</gadget_description>
   <gadget_version type='str'>0.0.1</gadget_version>
-  <gadget_description type='str'>Empty gadget for Tux Droid.</gadget_description>
-  <gadget_name type='str'>tux_controller</gadget_name>
 </about>

Modified: software/gadgets/tux_controller/trunk/TuxController/strings.xml
===================================================================
--- software/gadgets/tux_controller/trunk/TuxController/strings.xml	2007-12-14 10:40:27 UTC (rev 794)
+++ software/gadgets/tux_controller/trunk/TuxController/strings.xml	2007-12-14 11:27:13 UTC (rev 795)
@@ -1,7 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <strings>
   <toolWingsUp type='str'>Lever les ailes</toolWingsUp>
+  <lblLightL type='str'>Light level</lblLightL>
   <toolMove type='str'>Nombre de mouvements</toolMove>
+  <gui_conf_cancel_bt type='str'>Cancel</gui_conf_cancel_bt>
   <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>
@@ -9,6 +11,7 @@
   <lblStop type='str'>Stop all movements</lblStop>
   <radSpinDirRight type='str'>Spin right</radSpinDirRight>
   <gui_conf_accept_bt type='str'>Accept</gui_conf_accept_bt>
+  <gui_conf_remote_set_bt type='str'>Set</gui_conf_remote_set_bt>
   <lblLED type='str'>LEDs</lblLED>
   <help_text type='str'>
   </help_text>
@@ -24,12 +27,10 @@
 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>
+  <vr_Eyes type='str'>Eyes</vr_Eyes>
   <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>
@@ -37,16 +38,15 @@
   <toolTTS type='str'>Dire la phrase</toolTTS>
   <radSpinDirLeft type='str'>Spin left</radSpinDirLeft>
   <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>
+  <lblWings type='str'>Wings</lblWings>
+  <speaker_name type='str'>Ryan8k</speaker_name>
   <Count type='str'>count</Count>
+  <tabStatus type='str'>Status</tabStatus>
   <vr_Flash type='str'>Flash</vr_Flash>
+  <TTSClear type='str'>Clear</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>
+  <gui_conf_window_title type='str'>Parameters</gui_conf_window_title>
+  <lblSoundL type='str'>Sound level</lblSoundL>
   <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_author_lb>
@@ -54,34 +54,34 @@
 en utilisant les paramètres définis.</toolEyesRun>
   <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'>Value</colValue>
-  <lblSpin type='str'>Spinning</lblSpin>
-  <tabStatus type='str'>Status</tabStatus>
+  <toolSpinRun type='str'>Ce bouton fait tourner Tux en 
+utilisant les paramètres définis.</toolSpinRun>
   <toolMouthOpen type='str'>Ouvrir le bec</toolMouthOpen>
-  <speaker_name type='str'>Ryan8k</speaker_name>
+  <toolMouthClose type='str'>Fermer le bec</toolMouthClose>
   <vr_Hide type='str'>Hide</vr_Hide>
-  <gui_conf_remote_set_bt type='str'>Set</gui_conf_remote_set_bt>
+  <toolLEDslide type='str'>Vous pouvez régler ici la fréquence de 
+clignotement des LEDs</toolLEDslide>
   <toolSound type='str'>Niveau sonore</toolSound>
   <toolLight type='str'>Niveau de lumière</toolLight>
-  <gui_conf_cancel_bt type='str'>Cancel</gui_conf_cancel_bt>
+  <toolLEDLeft type='str'>Allumer/Eteindre la LED gauche</toolLEDLeft>
   <name_to_read type='str'>Controller</name_to_read>
-  <gui_conf_window_title type='str'>Parameters</gui_conf_window_title>
-  <toolEyesOpen type='str'>Ouvrir les yeux</toolEyesOpen>
-  <toolLang type='str'>Configurer la langue TTS</toolLang>
-  <lblLightL type='str'>Light level</lblLightL>
+  <lblSpin type='str'>Spinning</lblSpin>
+  <toolAdvanced type='str'>Monter/Cacher les propriété avancées</toolAdvanced>
+  <toolBattery type='str'>Niveau de la batterie</toolBattery>
+  <vr_Panel type='str'>Panel</vr_Panel>
   <toolSpinRight type='str'>Tourner vers la droite</toolSpinRight>
+  <lblMouth type='str'>Beak</lblMouth>
   <lblEyes type='str'>Eyes</lblEyes>
-  <lblMouth type='str'>Beak</lblMouth>
   <Second type='str'>sec.</Second>
   <vr_Mouth type='str'>Mouth</vr_Mouth>
   <colStatus type='str'>Status</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>
-  <lblSoundL type='str'>Sound level</lblSoundL>
+  <toolWingsRun type='str'>Ce bouton fait bouger les ailes
+en utilisant les paramètres définis.</toolWingsRun>
   <toolPitch type='str'>Configurer la hauteur du son</toolPitch>
-  <toolAdvanced type='str'>Monter/Cacher les propriété avancées</toolAdvanced>
-  <TTSClear type='str'>Clear</TTSClear>
+  <toolEyesOpen type='str'>Ouvrir les yeux</toolEyesOpen>
+  <toolLang type='str'>Configurer la langue TTS</toolLang>
 </strings>

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