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

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

Author: Paul_R
Date: 2008-01-21 13:07:35 +0100 (Mon, 21 Jan 2008)
New Revision: 861

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/about.xml
   software/gadgets/tux_controller/trunk/TuxController/settings.xml
Log:
* Fixed some bug with the graphics's refreshing functions.
* Inc. the version


Modified: software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/GUI/widget/other.pyp
===================================================================
--- software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/GUI/widget/other.pyp	2008-01-21 11:22:16 UTC (rev 860)
+++ software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/GUI/widget/other.pyp	2008-01-21 12:07:35 UTC (rev 861)
@@ -411,10 +411,15 @@
              
     def on_btnEyesOpen_released(self, widget, *args):
         thread.start_new_thread(self.refresh_picture, ('imgLed', self.led_on))
-        #self.get_widget('imgLed').set_from_pixbuf(self.led_on)
+        self.__mouth_active = False
+        if tux.status.eyes_opened():
+            thread.start_new_thread(self.refresh_picture, ('imgMouthRun', self.run))
         tux.cmd.eyes_open()
  
-    def on_btnEyesClose_released(self, widget, *args):  
+    def on_btnEyesClose_released(self, widget, *args):
+        self.__mouth_active = False
+        if tux.status.eyes_closed():
+            thread.start_new_thread(self.refresh_picture, ('imgMouthRun', self.run))
         tux.cmd.eyes_close()
 
     def on_btnEyesRun_clicked(self, widget, *args):
@@ -443,9 +448,15 @@
             
          
     def on_btnMouthClose_released(self, widget, *args):
+        self.__eyes_active = False
+        if tux.status.mouth_closed():
+            thread.start_new_thread(self.refresh_picture, ('imgEyesRun', self.run))
         tux.cmd.mouth_close() 
      
     def on_btnMouthOpen_released(self, widget, *args):
+        self.__eyes_active = False
+        if tux.status.mouth_opened():
+            thread.start_new_thread(self.refresh_picture, ('imgEyesRun', self.run))
         tux.cmd.mouth_open()
 
     def on_btnMouthRun_clicked(self, widget, *args):
@@ -645,12 +656,10 @@
     def on_eyes_close(self):
         thread.start_new_thread(self.refresh_picture, ('imgLed', self.eyes_close))
         
-
     def on_eyes_open(self):
         tux.status.lled()
         tux.status.rled()
 
-
     def on_mouth_open(self):
         thread.start_new_thread(self.refresh_picture, ('imgMouth', self.beak_open))
         
@@ -738,7 +747,7 @@
     def __update_eyes_buttons(self):
         if _me.get_param('generalStop'):
             return False
-        tux.sys.wait(0.2)
+        tux.sys.wait(0.4)
         if self.__eyes_stop:
             self.__eyes_stop = False
             return False
@@ -746,7 +755,6 @@
         if tux.status.eyes_counter() == 0 and self.__eyes_active == True and self.__eyes_infinite == False:
             self.__eyes_active = False
             thread.start_new_thread(self.refresh_picture, ('imgEyesRun', self.run))
-            #self.get_widget('imgEyesRun').set_from_pixbuf(self.run)
             return False
             
         return True
@@ -755,7 +763,9 @@
     def __update_mouth_buttons(self):
         if _me.get_param('generalStop'):
             return False
-        tux.sys.wait(0.2)
+            
+        tux.sys.wait(0.4)
+        
         if self.__mouth_stop:
             self.__mouth_stop = False
             return False
@@ -763,16 +773,15 @@
         if tux.status.mouth_counter() == 0 and self.__mouth_active == True and self.__mouth_infinite == False:
             self.__mouth_active = False
             thread.start_new_thread(self.refresh_picture, ('imgMouthRun', self.run))
-            #self.get_widget('imgMouthRun').set_from_pixbuf(self.run)
             return False
-            
+        
         return True
         
 
     def __update_wings_buttons(self):
         if _me.get_param('generalStop'):
             return False
-        tux.sys.wait(0.2)
+        tux.sys.wait(0.4)
         if self.__wings_stop:
             self.__wings_stop = False
             return False
@@ -780,7 +789,6 @@
         if tux.status.wings_counter() == 0 and self.__wings_active == True and self.__wings_infinite == False:
             self.__wings_active = False
             thread.start_new_thread(self.refresh_picture, ('imgWingsRun', self.run))
-            #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	2008-01-21 11:22:16 UTC (rev 860)
+++ software/gadgets/tux_controller/trunk/TuxController/Scripts/Python/main.pyp	2008-01-21 12:07:35 UTC (rev 861)
@@ -41,8 +41,6 @@
     _me.gui('widget').hide_from_main()
     _me.exit_main_loop()
     
-
-
 def start_gadget(): 
 
     tux.event.on_remote_bt[K_STANDBY] = on_standby

Modified: software/gadgets/tux_controller/trunk/TuxController/about.xml
===================================================================
--- software/gadgets/tux_controller/trunk/TuxController/about.xml	2008-01-21 11:22:16 UTC (rev 860)
+++ software/gadgets/tux_controller/trunk/TuxController/about.xml	2008-01-21 12:07:35 UTC (rev 861)
@@ -1,7 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <about>
   <gadget_author type='str'>Paul Rathgeb</gadget_author>
-  <gadget_description type='str'>Empty gadget for Tux Droid.</gadget_description>
+  <gadget_description type='str'>
+  </gadget_description>
   <gadget_name type='str'>tux_controller</gadget_name>
-  <gadget_version type='str'>0.1.0</gadget_version>
+  <gadget_version type='str'>0.1.1</gadget_version>
 </about>

Modified: software/gadgets/tux_controller/trunk/TuxController/settings.xml
===================================================================
--- software/gadgets/tux_controller/trunk/TuxController/settings.xml	2008-01-21 11:22:16 UTC (rev 860)
+++ software/gadgets/tux_controller/trunk/TuxController/settings.xml	2008-01-21 12:07:35 UTC (rev 861)
@@ -8,8 +8,6 @@
       </conf>
       <widget>
         <visible type='bool'>True</visible>
-        <x type='int'>295</x>
-        <y type='int'>160</y>
       </widget>
     </gui_state>
     <have_main_part type='bool'>True</have_main_part>
@@ -21,12 +19,12 @@
     <notified type='bool'>False</notified>
     <notify_delay type='int'>60</notify_delay>
     <notify_priority type='int'>4</notify_priority>
-    <pitch type='int'>100</pitch>
+    <pitch type='float'>100.0</pitch>
     <speaker type='int'>3</speaker>
   </general>
   <parameters>
     <hidden_in_manager type='bool'>False</hidden_in_manager>
-    <pitch type='int'>100</pitch>
+    <pitch type='float'>100.0</pitch>
     <speaker type='int'>3</speaker>
   </parameters>
 </settings>

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