[tuxdroid-svn] r749 - in software/gadgets/settings/trunk: . settings settings/Scripts/Python/GUI/widget

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

Author: Paul_R
Date: 2007-12-03 17:33:46 +0100 (Mon, 03 Dec 2007)
New Revision: 749

Modified:
   software/gadgets/settings/trunk/settings.tgf
   software/gadgets/settings/trunk/settings/Scripts/Python/GUI/widget/other.pyp
   software/gadgets/settings/trunk/settings/about.xml
   software/gadgets/settings/trunk/settings/settings.xml
   software/gadgets/settings/trunk/settings/strings.xml
Log:
* Fixed a bug in the sound programming sequence


Modified: software/gadgets/settings/trunk/settings/Scripts/Python/GUI/widget/other.pyp
===================================================================
--- software/gadgets/settings/trunk/settings/Scripts/Python/GUI/widget/other.pyp	2007-12-03 16:31:43 UTC (rev 748)
+++ software/gadgets/settings/trunk/settings/Scripts/Python/GUI/widget/other.pyp	2007-12-03 16:33:46 UTC (rev 749)
@@ -819,9 +819,7 @@
         self.get_widget('progressbar1').set_fraction(current)
         current = current + fraction
         tux.cmd.sound_erase()
-        
         tux.sys.wait(1)
-        
         while tux.status.sound_record()[0] != 0:
             tux.sys.wait(0.1)
         
@@ -831,12 +829,8 @@
             self.get_widget('progressbar1').set_fraction(current)
             self.get_widget('lblSoundState').set_text(_me.string('soundProg')+str(i+1))
             tux.cmd.sound_storing()
-            while tux.status.sound_record()[0] != 1:
-                tux.sys.wait(0.1)
             tux.sys.shell("aplay -D %s %s"%(soundcard, sound_table[i]))
-            while tux.status.sound_record()[0] != 2:
-                tux.sys.wait(0.1)
-                
+            tux.sys.wait(0.1)     
             tux.cmd.sound_confirm(True)
             current = current + fraction
             tux.sys.wait(0.1)
@@ -851,6 +845,8 @@
     # On "play" flash sound button clicked
     #--------------------------------------------------------------------------
     def on_wave_internal_play_bt_clicked(self, widget, *args):
+        if self.__sound_mutex.locked():
+            return
         def _funct():
             index=self.get_widget("spinbutton7").get_value()
             tux.cmd.sound_play(int(index),0)
@@ -861,60 +857,80 @@
     # On "play flash sound number 1" button clicked
     #--------------------------------------------------------------------------
     def on_wave_internal_play1_clicked(self, widget, *args):
+        if self.__sound_mutex.locked():
+            return
         thread.start_new_thread(tux.cmd.sound_play,(1,0,))
 
     #--------------------------------------------------------------------------
     # On "play flash sound number 2" button clicked
     #--------------------------------------------------------------------------
     def on_wave_internal_play2_clicked(self, widget, *args):
+        if self.__sound_mutex.locked():
+            return
         thread.start_new_thread(tux.cmd.sound_play,(2,0,))
 
     #--------------------------------------------------------------------------
     # On "play flash sound number 3" button clicked
     #--------------------------------------------------------------------------
     def on_wave_internal_play3_clicked(self, widget, *args):
+        if self.__sound_mutex.locked():
+            return
         thread.start_new_thread(tux.cmd.sound_play,(3,0,))
 
     #--------------------------------------------------------------------------
     # On "play flash sound number 4" button clicked
     #--------------------------------------------------------------------------
     def on_wave_internat_play4_clicked(self, widget, *args):
+        if self.__sound_mutex.locked():
+            return
         thread.start_new_thread(tux.cmd.sound_play,(4,0,))
 
     #--------------------------------------------------------------------------
     # On "play flash sound number 5" button clicked
     #--------------------------------------------------------------------------
     def on_wave_internal_play5_clicked(self, widget, *args):
+        if self.__sound_mutex.locked():
+            return
         thread.start_new_thread(tux.cmd.sound_play,(5,0,))
 
     #--------------------------------------------------------------------------
     # On "play flash sound number 6" button clicked
     #--------------------------------------------------------------------------
     def on_wave_internal_play6_clicked(self, widget, *args):
+        if self.__sound_mutex.locked():
+            return
         thread.start_new_thread(tux.cmd.sound_play,(6,0,))
 
     #--------------------------------------------------------------------------
     # On "play flash sound number 7" button clicked
     #--------------------------------------------------------------------------
     def on_wave_internal_play7_clicked(self, widget, *args):
+        if self.__sound_mutex.locked():
+            return
         thread.start_new_thread(tux.cmd.sound_play,(7,0,))
 
     #--------------------------------------------------------------------------
     # On "play flash sound number 8" button clicked
     #--------------------------------------------------------------------------
     def on_wave_internal_play8_clicked(self, widget, *args):
+        if self.__sound_mutex.locked():
+            return
         thread.start_new_thread(tux.cmd.sound_play,(8,0,))
 
     #--------------------------------------------------------------------------
     # On "play flash sound number 9" button clicked
     #--------------------------------------------------------------------------
     def on_wave_internal_play9_clicked(self, widget, *args):
+        if self.__sound_mutex.locked():
+            return
         thread.start_new_thread(tux.cmd.sound_play,(9,0,))
 
     #--------------------------------------------------------------------------
     # On "play flash sound number 10" button clicked
     #--------------------------------------------------------------------------
     def on_wave_internal_play10_clicked(self, widget, *args):
+        if self.__sound_mutex.locked():
+            return
         thread.start_new_thread(tux.cmd.sound_play,(10,0,))
 
     #--------------------------------------------------------------------------

Modified: software/gadgets/settings/trunk/settings/about.xml
===================================================================
(Binary files differ)

Modified: software/gadgets/settings/trunk/settings/settings.xml
===================================================================
--- software/gadgets/settings/trunk/settings/settings.xml	2007-12-03 16:31:43 UTC (rev 748)
+++ software/gadgets/settings/trunk/settings/settings.xml	2007-12-03 16:33:46 UTC (rev 749)
@@ -14,14 +14,14 @@
         <visible type='bool'>True</visible>
         <x type='int'>0</x>
       </widget>
+      <conf>
+        <visible type='bool'>False</visible>
+      </conf>
       <selftest>
         <y type='int'>25</y>
         <visible type='bool'>True</visible>
         <x type='int'>0</x>
       </selftest>
-      <conf>
-        <visible type='bool'>False</visible>
-      </conf>
     </gui_state>
     <language type='str'>en_US</language>
     <notified type='bool'>True</notified>

Modified: software/gadgets/settings/trunk/settings/strings.xml
===================================================================
--- software/gadgets/settings/trunk/settings/strings.xml	2007-12-03 16:31:43 UTC (rev 748)
+++ software/gadgets/settings/trunk/settings/strings.xml	2007-12-03 16:33:46 UTC (rev 749)
@@ -16,14 +16,14 @@
   <itemCPU type='str'>Flash the CPUs</itemCPU>
   <btnSoundPlayMic type='str'>Play</btnSoundPlayMic>
   <btnUpdate type='str'>Check for updates</btnUpdate>
-  <btnSoundRecordMic type='str'>Record</btnSoundRecordMic>
+  <FVersion type='str'>Version can't be read</FVersion>
   <gui_conf_about_title type='str'>About</gui_conf_about_title>
   <chkSoundOriginal type='str'>Include originals</chkSoundOriginal>
   <btnSoundClear type='str'>Clear list</btnSoundClear>
   <Sound1 type='str'>Be sure that the sound volume control is
 at the maximum.</Sound1>
   <lblIDNum type='str'>Tux's ID : </lblIDNum>
-  <Sound type='str'>Have you heard the sound ?</Sound>
+  <SVN type='str'>SVN</SVN>
   <lblSleepDelay type='str'>Active the sleep mode after a inactivity period of</lblSleepDelay>
   <itemDescription type='str'>Show the description</itemDescription>
   <lblConfigTest type='str'>Self tests</lblConfigTest>
@@ -46,7 +46,7 @@
   <Connect type='str'>Please connect the power plug and 
 press the 'Yes' button</Connect>
   <lblSoundExternal type='str'>Play external wave file</lblSoundExternal>
-  <lblSoundStore type='str'>Store wave files locally</lblSoundStore>
+  <gui_conf_version_lb type='str'>Version</gui_conf_version_lb>
   <btnSleepSleep type='str'>Sleep</btnSleepSleep>
   <gui_conf_remote_set_bt type='str'>Set</gui_conf_remote_set_bt>
   <lblUsedChannel type='str'>Your wifi use the channel :</lblUsedChannel>
@@ -60,11 +60,11 @@
   <Start type='str'>Start</Start>
   <treeFile type='str'>Fichier</treeFile>
   <lblSoundLocal type='str'>Play local wave files</lblSoundLocal>
-  <gui_conf_version_lb type='str'>Version</gui_conf_version_lb>
+  <lblSoundStore type='str'>Store wave files locally</lblSoundStore>
   <gui_conf_update_title type='str'>Update</gui_conf_update_title>
   <lblTabConfig type='str'>Configuration</lblTabConfig>
   <gui_conf_cancel_bt type='str'>Cancel</gui_conf_cancel_bt>
-  <FVersion type='str'>Version can't be read</FVersion>
+  <btnSoundRecordMic type='str'>Record</btnSoundRecordMic>
   <btnSleepWakeup type='str'>Wakeup</btnSleepWakeup>
   <btnCancelT type='str'>No</btnCancelT>
   <itemChangeLog type='str'>Show ChangeLog</itemChangeLog>
@@ -84,7 +84,7 @@
 
 To do this, you need to connect loudspeakers in the
 green connector, and press the 'Yes' button.</Out>
-  <SVN type='str'>SVN</SVN>
+  <Sound type='str'>Have you heard the sound ?</Sound>
   <btnOKT type='str'>Yes</btnOKT>
   <Mic type='str'>After closing this window, say anything to Tux.</Mic>
   <btnStopT type='str'>Stop</btnStopT>

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