[tuxdroid-svn] r788 - in software/gadgets/sound_monitor/trunk: . audio_monitor audio_monitor/Scripts/Python audio_monitor/Scripts/Python/GUI/widget

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

Author: Paul_R
Date: 2007-12-13 11:23:02 +0100 (Thu, 13 Dec 2007)
New Revision: 788

Modified:
   software/gadgets/sound_monitor/trunk/audio_monitor.tgf
   software/gadgets/sound_monitor/trunk/audio_monitor/Scripts/Python/GUI/widget/other.pyp
   software/gadgets/sound_monitor/trunk/audio_monitor/Scripts/Python/notify.pyp
   software/gadgets/sound_monitor/trunk/audio_monitor/about.xml
   software/gadgets/sound_monitor/trunk/audio_monitor/settings.xml
Log:
* Improved the notifiy actuator function
* Fixed a bug which display a **critical** error in terminal


Modified: software/gadgets/sound_monitor/trunk/audio_monitor/Scripts/Python/GUI/widget/other.pyp
===================================================================
--- software/gadgets/sound_monitor/trunk/audio_monitor/Scripts/Python/GUI/widget/other.pyp	2007-12-12 15:21:16 UTC (rev 787)
+++ software/gadgets/sound_monitor/trunk/audio_monitor/Scripts/Python/GUI/widget/other.pyp	2007-12-13 10:23:02 UTC (rev 788)
@@ -24,8 +24,10 @@
     def new(self):
         self.get_widget('scrolledwindow1').set_tooltip_text(_me.string('RightClic'))
         if _me.get_param('dogBehavior') != None:
-            self.get_widget('fileDogBehavior').select_filename(_me.get_param('dogBehavior'))
-            self.get_widget('fileDogBehavior').show()
+            if os.path.exists(_me.get_param('dogBehavior')):
+                self.get_widget('fileDogBehavior').select_filename(_me.get_param('dogBehavior'))
+                self.get_widget('fileDogBehavior').show()
+                
         orange = gtk.gdk.Color(65535, 45874, 0, 1)
         self.get_widget('draw1').modify_bg(gtk.STATE_NORMAL, orange)
         pink = gtk.gdk.Color(65535, 0, 45874, 1)

Modified: software/gadgets/sound_monitor/trunk/audio_monitor/Scripts/Python/notify.pyp
===================================================================
--- software/gadgets/sound_monitor/trunk/audio_monitor/Scripts/Python/notify.pyp	2007-12-12 15:21:16 UTC (rev 787)
+++ software/gadgets/sound_monitor/trunk/audio_monitor/Scripts/Python/notify.pyp	2007-12-13 10:23:02 UTC (rev 788)
@@ -12,11 +12,18 @@
 def notify_actuator():
     measure = _me.get_param('measure')
     if _me.get_param('chkDogDefault') == False:
-        tux.cmd.wings_on_free(10)
+        tux.cmd.wings_on_free(8)
         for i in range(5):
             tux.cmd.sound_play(14)
-            tux.sys.wait(0.7)
-        tux.sys.wait(0.5)
+            try:
+                while tux.status.sound_play[1] != 0:
+                    tux.sys.wait(0.1)
+            except:
+                while tux.status.flash_status()[0] != 0:
+                    tux.sys.wait(0.1)
+        tux.sys.wait(1)
+        print 'end'
+                
     else:
         path = _me.get_param('dogBehavior')
         path = path.replace('%20', ' ')

Modified: software/gadgets/sound_monitor/trunk/audio_monitor/about.xml
===================================================================
--- software/gadgets/sound_monitor/trunk/audio_monitor/about.xml	2007-12-12 15:21:16 UTC (rev 787)
+++ software/gadgets/sound_monitor/trunk/audio_monitor/about.xml	2007-12-13 10:23:02 UTC (rev 788)
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <about>
+  <gadget_name type='str'>sound_monitor</gadget_name>
   <gadget_author type='str'>Paul Rathgeb</gadget_author>
-  <gadget_version type='str'>0.0.1</gadget_version>
   <gadget_description type='str'>
   </gadget_description>
-  <gadget_name type='str'>sound_monitor</gadget_name>
+  <gadget_version type='str'>0.0.1</gadget_version>
 </about>

Modified: software/gadgets/sound_monitor/trunk/audio_monitor/settings.xml
===================================================================
--- software/gadgets/sound_monitor/trunk/audio_monitor/settings.xml	2007-12-12 15:21:16 UTC (rev 787)
+++ software/gadgets/sound_monitor/trunk/audio_monitor/settings.xml	2007-12-13 10:23:02 UTC (rev 788)
@@ -1,24 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <settings>
   <parameters>
-    <dogBehavior type='str'>
-    </dogBehavior>
-    <Sample type='float'>400.0</Sample>
+    <chkDog type='bool'>True</chkDog>
     <chkDogBehavior type='bool'>False</chkDogBehavior>
+    <BehaviorPath type='str'>
+    </BehaviorPath>
     <SpyThreshold type='int'>30</SpyThreshold>
     <Standby type='bool'>False</Standby>
+    <chkSpy type='bool'>False</chkSpy>
     <MainScript type='str'>None</MainScript>
-    <chkSpy type='bool'>False</chkSpy>
-    <chkDog type='bool'>True</chkDog>
-    <Threshold type='float'>30.0</Threshold>
+    <Sample type='float'>400.0</Sample>
+    <chkDogDefault type='bool'>False</chkDogDefault>
     <dict/>
     <chkSpyRecord type='bool'>False</chkSpyRecord>
-    <chkDogDefault type='bool'>False</chkDogDefault>
+    <Threshold type='float'>30.0</Threshold>
     <Path type='str'>/tmp</Path>
     <DogThreshold type='int'>30</DogThreshold>
     <Startup type='bool'>False</Startup>
-    <BehaviorPath type='str'>
-    </BehaviorPath>
+    <dogBehavior type='str'>
+    </dogBehavior>
   </parameters>
   <general>
     <have_settings_part type='bool'>True</have_settings_part>
@@ -31,7 +31,7 @@
       </conf>
     </gui_state>
     <language type='str'>en_US</language>
-    <notified type='bool'>False</notified>
+    <notified type='bool'>True</notified>
     <notify_delay type='int'>1</notify_delay>
     <framework_version type='str'>0.0.0</framework_version>
     <menu_active type='bool'>True</menu_active>

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