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

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

Author: Paul_R
Date: 2007-12-12 11:35:05 +0100 (Wed, 12 Dec 2007)
New Revision: 780

Modified:
   software/gadgets/sound_monitor/trunk/audio_monitor.tgf
   software/gadgets/sound_monitor/trunk/audio_monitor/Scripts/Python/GUI/conf/other.pyp
   software/gadgets/sound_monitor/trunk/audio_monitor/Scripts/Python/GUI/widget/other.glade
   software/gadgets/sound_monitor/trunk/audio_monitor/Scripts/Python/GUI/widget/other.pyp
   software/gadgets/sound_monitor/trunk/audio_monitor/Scripts/Python/main.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:
* Added two color lines on the widget GUI to indicate the events diplayed on
  the graph. 
* Fix some bugs with the external behavior file chooser. On my
  desktop, I've a little bug : When the file is on the Desktop, the file chooser
  button don't display the file, but the script is correctly executed when a
  notification occurs.


Modified: software/gadgets/sound_monitor/trunk/audio_monitor/Scripts/Python/GUI/conf/other.pyp
===================================================================
--- software/gadgets/sound_monitor/trunk/audio_monitor/Scripts/Python/GUI/conf/other.pyp	2007-12-11 16:20:06 UTC (rev 779)
+++ software/gadgets/sound_monitor/trunk/audio_monitor/Scripts/Python/GUI/conf/other.pyp	2007-12-12 10:35:05 UTC (rev 780)
@@ -31,7 +31,6 @@
         path = widget.get_current_folder()
         path = path.replace('%20', ' ')
         _me.set_param('Path', path)
-        print path
         
     def on_spinSample_changed(self, widget, *args):
         _me.set_param('Sample', float(widget.get_text()))

Modified: software/gadgets/sound_monitor/trunk/audio_monitor/Scripts/Python/GUI/widget/other.glade
===================================================================
(Binary files differ)

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-11 16:20:06 UTC (rev 779)
+++ software/gadgets/sound_monitor/trunk/audio_monitor/Scripts/Python/GUI/widget/other.pyp	2007-12-12 10:35:05 UTC (rev 780)
@@ -22,6 +22,14 @@
     #
     ###########################################################
     def new(self):
+        if _me.get_param('dogBehavior') != None:
+            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)
+        self.get_widget('draw2').modify_bg(gtk.STATE_NORMAL, pink)
+        
         self.get_widget("window1").set_title(_me.string('name_to_read'))
         if _me.get_param('Startup') == False:
             _me.set_param('string', _me.string('Startup'))
@@ -52,15 +60,10 @@
         self.get_widget('chkDogDefault').set_label(_me.string('at_gui_widget_chkDogDefault'))
         self.get_widget('chkDogDefault').set_active(_me.get_param('chkDogDefault'))
         
-        self.get_widget('spinDog').set_value(_me.get_param('Threshold'))
-        print _me.get_param('dogBehavior')
-        try:
-            if os.path.exists(_me.get_param('dogBehavior')):
-                print _me.get_param('dogBehavior')
-                self.get_widget('fileDogBehavior').set_filename(_me.get_param('dogBehavior'))
-        except:
-            pass
         
+            
+        #self.get_widget('fileDogBehavior').set_title(str(_me.get_param('dogBehavior')))
+
         self.get_widget('chkSpy').set_label(_me.string('at_gui_widget_chkSpy'))
         self.get_widget('chkSpy').set_active(_me.get_param('chkSpy'))
         
@@ -121,7 +124,10 @@
                 user = commands.getoutput('echo $USER')
                 self.measure.capture_path = '/home/%s'%user
                 _me.set_param('Path', 'home/%s'%user)
+                
         
+
+
         self.monitor_id = tux.monitoring.insert(0xF0, self.measure.on_sound_level)
         tux.micro.on()
         self.update_value()
@@ -194,6 +200,7 @@
         _me.set_param('chkSpy', widget.get_active())
         self.measure.spy_enabled = widget.get_active()
         
+        
     def on_chkDog_toggled(self, widget, *args):
         _me.set_param('chkDog', widget.get_active())
         self.measure.dog_enabled = widget.get_active()
@@ -201,10 +208,9 @@
     def on_chkDogDefault_toggled(self, widget, *args):
         _me.set_param('chkDogDefault', widget.get_active())
         
-    def on_fileDogBehavior_selection_changed(self, widget, *args):
-        print widget.get_filename()
-        _me.set_param('dogBehavior', widget.get_filename())
-        print _me.get_param('dogBehavior')
+    def on_fileDogBehavior_current_folder_changed(self, widget, *args):
+        if widget.get_filename() != None:
+            _me.set_param('dogBehavior', widget.get_filename())
 
 class Sound_Graph(gtk.DrawingArea):
     def __init__(self):

Modified: software/gadgets/sound_monitor/trunk/audio_monitor/Scripts/Python/main.pyp
===================================================================
--- software/gadgets/sound_monitor/trunk/audio_monitor/Scripts/Python/main.pyp	2007-12-11 16:20:06 UTC (rev 779)
+++ software/gadgets/sound_monitor/trunk/audio_monitor/Scripts/Python/main.pyp	2007-12-12 10:35:05 UTC (rev 780)
@@ -2,7 +2,6 @@
 import time
 
 def on_standby():
-    print 'standby function'
     _me.set_param('stdby', True)
     _me.set_param('string', _me.string('Standby'))
     _me.set_param('check', _me.string('Show'))
@@ -15,15 +14,12 @@
     tux.sys.wait(1)
 
     while _me.gui('dialog').showed():
-        print 'while'
         tux.sys.wait(0.5)
     
 
     if _me.get_param('return') == False:
-        print 'return = False'
         _me.set_param('stdby', False)
         return
-        #start_gadget()
     else:
         gdg_dict = _me.get_param('dict')
         for keys in gdg_dict:

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-11 16:20:06 UTC (rev 779)
+++ software/gadgets/sound_monitor/trunk/audio_monitor/Scripts/Python/notify.pyp	2007-12-12 10:35:05 UTC (rev 780)
@@ -19,6 +19,7 @@
         tux.sys.wait(0.5)
     else:
         path = _me.get_param('dogBehavior')
+        path = path.replace('%20', ' ')
         if os.path.exists(path) and os.path.isfile(path):
             tux.sys.shell(path)
     

Modified: software/gadgets/sound_monitor/trunk/audio_monitor/about.xml
===================================================================
--- software/gadgets/sound_monitor/trunk/audio_monitor/about.xml	2007-12-11 16:20:06 UTC (rev 779)
+++ software/gadgets/sound_monitor/trunk/audio_monitor/about.xml	2007-12-12 10:35:05 UTC (rev 780)
@@ -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_version type='str'>0.0.1</gadget_version>
+  <gadget_name type='str'>sound_monitor</gadget_name>
 </about>

Modified: software/gadgets/sound_monitor/trunk/audio_monitor/settings.xml
===================================================================
--- software/gadgets/sound_monitor/trunk/audio_monitor/settings.xml	2007-12-11 16:20:06 UTC (rev 779)
+++ software/gadgets/sound_monitor/trunk/audio_monitor/settings.xml	2007-12-12 10:35:05 UTC (rev 780)
@@ -1,21 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <settings>
   <parameters>
-    <chkDog type='bool'>True</chkDog>
+    <dogBehavior type='str'>
+    </dogBehavior>
+    <Sample type='float'>400.0</Sample>
     <chkDogBehavior type='bool'>False</chkDogBehavior>
-    <BehaviorPath type='NoneType'>None</BehaviorPath>
     <SpyThreshold type='int'>30</SpyThreshold>
     <Standby type='bool'>False</Standby>
+    <MainScript type='str'>None</MainScript>
     <chkSpy type='bool'>False</chkSpy>
-    <MainScript type='str'>None</MainScript>
-    <Sample type='float'>400.0</Sample>
+    <chkDog type='bool'>True</chkDog>
+    <Threshold type='float'>30.0</Threshold>
+    <chkSpyRecord type='bool'>False</chkSpyRecord>
     <chkDogDefault type='bool'>False</chkDogDefault>
-    <chkSpyRecord type='bool'>False</chkSpyRecord>
-    <Threshold type='float'>30.0</Threshold>
     <Path type='str'>/tmp</Path>
     <DogThreshold type='int'>30</DogThreshold>
     <Startup type='bool'>False</Startup>
-    <dogBehavior type='NoneType'>None</dogBehavior>
+    <BehaviorPath type='str'>
+    </BehaviorPath>
   </parameters>
   <general>
     <have_settings_part type='bool'>True</have_settings_part>
@@ -28,7 +30,7 @@
       </conf>
     </gui_state>
     <language type='str'>en_US</language>
-    <notified type='bool'>True</notified>
+    <notified type='bool'>False</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)