[tuxdroid-svn] r803 - in software/gadgets/micro_monitor/trunk: . micro_monitor micro_monitor/Scripts/Python micro_monitor/Strings

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

Author: Paul_R
Date: 2007-12-18 11:44:29 +0100 (Tue, 18 Dec 2007)
New Revision: 803

Modified:
   software/gadgets/micro_monitor/trunk/micro_monitor.tgf
   software/gadgets/micro_monitor/trunk/micro_monitor/Scripts/Python/main.pyp
   software/gadgets/micro_monitor/trunk/micro_monitor/Strings/fr_ALL.xml
   software/gadgets/micro_monitor/trunk/micro_monitor/about.xml
   software/gadgets/micro_monitor/trunk/micro_monitor/settings.xml
   software/gadgets/micro_monitor/trunk/micro_monitor/strings.xml
Log:
* Removed 'dict' as global variable.


Modified: software/gadgets/micro_monitor/trunk/micro_monitor/Scripts/Python/main.pyp
===================================================================
--- software/gadgets/micro_monitor/trunk/micro_monitor/Scripts/Python/main.pyp	2007-12-18 07:32:04 UTC (rev 802)
+++ software/gadgets/micro_monitor/trunk/micro_monitor/Scripts/Python/main.pyp	2007-12-18 10:44:29 UTC (rev 803)
@@ -24,12 +24,11 @@
    
     gadgets['micro_monitor'].notify.set_active(True)
     _me.set_param('stdby', False)
-    tux.cmd.mouth_open()     
+    tux.cmd.mouth_open()
     _me.set_param('dict', gdg_dict)
     tux.event.on_remote_bt[K_STANDBY] = on_standby
     _me.gui('widget').show_from_main()
     _me.run_main_loop()
- 
 
 _me.insert_funct('on_standby', on_standby)
 start_gadget()

Modified: software/gadgets/micro_monitor/trunk/micro_monitor/Strings/fr_ALL.xml
===================================================================
--- software/gadgets/micro_monitor/trunk/micro_monitor/Strings/fr_ALL.xml	2007-12-18 07:32:04 UTC (rev 802)
+++ software/gadgets/micro_monitor/trunk/micro_monitor/Strings/fr_ALL.xml	2007-12-18 10:44:29 UTC (rev 803)
@@ -1,13 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <strings>
-  <at_gui_widget_lblSpyLevel type='str'>Niveau</at_gui_widget_lblSpyLevel>
+  <Duration type='str'>Durée</Duration>
+  <File type='str'>Fichier</File>
+  <Location type='str'>Sauver les sons :</Location>
   <No type='str'>Non</No>
-  <at_gui_widget_chkDog type='str'>Activer le mode chien de garde</at_gui_widget_chkDog>
-  <at_gui_conf_label13 type='str'>Delay (sec) :</at_gui_conf_label13>
-  <at_gui_conf_label12 type='str'>Configuration</at_gui_conf_label12>
+  <Play type='str'>Lecture</Play>
   <RightClic type='str'>Pour lire un son qui a été enregistré,
 faites un clic droit sur le son, et
 sélectionnez 'Lecture'</RightClic>
+  <Settings type='str'>Configuration</Settings>
+  <Show type='str'>Ne plus afficher ce message</Show>
+  <Standby type='str'>Ceci va mettre fin à l'exécution de ce gadget. Toutes les autres notifications vont être réactivées.
+Plus aucun événement relatif au son seront notifiés.
+Continuer ?</Standby>
+  <Startup type='str'>Ce gadget a un système de notification exclusif. Tant que la fenêtre de ce gadget est ouverte, toutes les autres notifications sont désactivées.</Startup>
+  <Time type='str'>Heure</Time>
+  <Yes type='str'>Oui</Yes>
+  <at_gui_conf_label12 type='str'>Configuration</at_gui_conf_label12>
+  <at_gui_conf_label13 type='str'>Delay (sec) :</at_gui_conf_label13>
+  <at_gui_conf_label5 type='str'>Accept</at_gui_conf_label5>
+  <at_gui_conf_label6 type='str'>Cancel</at_gui_conf_label6>
+  <at_gui_widget_cbbDog type='str'>Chien de garde</at_gui_widget_cbbDog>
+  <at_gui_widget_cbbRecord type='str'>Sons enregistrés</at_gui_widget_cbbRecord>
+  <at_gui_widget_cbbSpy type='str'>Mode espion</at_gui_widget_cbbSpy>
+  <at_gui_widget_chkDog type='str'>Activer le mode chien de garde</at_gui_widget_chkDog>
+  <at_gui_widget_chkDogDefault type='str'>Utiliser un script :</at_gui_widget_chkDogDefault>
+  <at_gui_widget_chkSpy type='str'>Activer le mode espion</at_gui_widget_chkSpy>
+  <at_gui_widget_lblDogLevel type='str'>Niveau</at_gui_widget_lblDogLevel>
+  <at_gui_widget_lblSpyLevel type='str'>Niveau</at_gui_widget_lblSpyLevel>
   <help_text type='str'>-- Moniteur de micro --
 
 Le gadget 'Moniteur de micro' affiche l'énergie sonore perçue par le micro de Tux.
@@ -24,28 +44,8 @@
 Le mode espion permet d'enregistrer le son lorsqu'il dépasse le seuil. Les sons enregistrés peuvent être à tous moment écoutés par simple clic droit sur un son se trouvant dans le tableau, et en sélectionnant 'Lecture'.
 Dans la fenêtre de configuration de ce gadget, accessible à partir du 'Manager', vous pouvez spécifier l'emplacement dans lequel les sons doivent être enregistrés.
 </help_text>
+  <lblSample type='str'>Nombre de points : </lblSample>
+  <name_to_read type='str'>Moniteur de micro</name_to_read>
+  <speaker_name type='str'>Bruno8k</speaker_name>
   <vr_Sound type='str'>Sound</vr_Sound>
-  <Play type='str'>Lecture</Play>
-  <at_gui_widget_cbbDog type='str'>Chien de garde</at_gui_widget_cbbDog>
-  <at_gui_conf_label6 type='str'>Cancel</at_gui_conf_label6>
-  <at_gui_conf_label5 type='str'>Accept</at_gui_conf_label5>
-  <Settings type='str'>Configuration</Settings>
-  <Standby type='str'>Ceci va mettre fin à l'exécution de ce gadget. Toutes les autres notifications vont être réactivées.
-Plus aucun événement relatif au son seront notifiés.
-Continuer ?</Standby>
-  <at_gui_widget_chkDogDefault type='str'>Utiliser un script :</at_gui_widget_chkDogDefault>
-  <at_gui_widget_lblDogLevel type='str'>Niveau</at_gui_widget_lblDogLevel>
-  <Time type='str'>Heure</Time>
-  <at_gui_widget_cbbSpy type='str'>Mode espion</at_gui_widget_cbbSpy>
-  <speaker_name type='str'>Bruno8k</speaker_name>
-  <at_gui_widget_cbbRecord type='str'>Sons enregistrés</at_gui_widget_cbbRecord>
-  <name_to_read type='str'>Moniteur de micro</name_to_read>
-  <Show type='str'>Ne plus afficher ce message</Show>
-  <Startup type='str'>Ce gadget a un système de notification exclusif. Tant que la fenêtre de ce gadget est ouverte, toutes les autres notifications sont désactivées.</Startup>
-  <File type='str'>Fichier</File>
-  <at_gui_widget_chkSpy type='str'>Activer le mode espion</at_gui_widget_chkSpy>
-  <Duration type='str'>Durée</Duration>
-  <lblSample type='str'>Nombre de points : </lblSample>
-  <Yes type='str'>Oui</Yes>
-  <Location type='str'>Sauver les sons :</Location>
 </strings>

Modified: software/gadgets/micro_monitor/trunk/micro_monitor/about.xml
===================================================================
--- software/gadgets/micro_monitor/trunk/micro_monitor/about.xml	2007-12-18 07:32:04 UTC (rev 802)
+++ software/gadgets/micro_monitor/trunk/micro_monitor/about.xml	2007-12-18 10:44:29 UTC (rev 803)
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <about>
   <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'>micro_monitor</gadget_name>
+  <gadget_version type='str'>0.0.1</gadget_version>
 </about>

Modified: software/gadgets/micro_monitor/trunk/micro_monitor/settings.xml
===================================================================
--- software/gadgets/micro_monitor/trunk/micro_monitor/settings.xml	2007-12-18 07:32:04 UTC (rev 802)
+++ software/gadgets/micro_monitor/trunk/micro_monitor/settings.xml	2007-12-18 10:44:29 UTC (rev 803)
@@ -1,45 +1,44 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <settings>
-  <parameters>
-    <dogBehavior type='str'>
-    </dogBehavior>
-    <Sample type='float'>400.0</Sample>
-    <chkDogBehavior type='bool'>False</chkDogBehavior>
-    <SpyThreshold type='int'>30</SpyThreshold>
-    <Standby type='bool'>False</Standby>
-    <MainScript type='str'>None</MainScript>
-    <chkSpy type='bool'>False</chkSpy>
-    <chkDog type='bool'>True</chkDog>
-    <Threshold type='float'>30.0</Threshold>
-    <dict/>
-    <chkSpyRecord type='bool'>False</chkSpyRecord>
-    <chkDogDefault type='bool'>False</chkDogDefault>
-    <Path type='str'>/tmp</Path>
-    <DogThreshold type='int'>30</DogThreshold>
-    <Startup type='bool'>False</Startup>
-    <BehaviorPath type='str'>
-    </BehaviorPath>
-  </parameters>
   <general>
-    <have_settings_part type='bool'>True</have_settings_part>
+    <framework_version type='str'>0.0.0</framework_version>
     <gui_state>
-      <widget>
-        <visible type='bool'>True</visible>
-      </widget>
       <conf>
         <visible type='bool'>False</visible>
       </conf>
+      <widget>
+        <visible type='bool'>True</visible>
+      </widget>
     </gui_state>
+    <have_main_part type='bool'>True</have_main_part>
+    <have_settings_part type='bool'>True</have_settings_part>
+    <have_widget_part type='bool'>False</have_widget_part>
     <language type='str'>en_US</language>
+    <main_priority type='int'>4</main_priority>
+    <menu_active type='bool'>True</menu_active>
     <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>
-    <have_widget_part type='bool'>False</have_widget_part>
-    <speaker type='int'>3</speaker>
-    <pitch type='int'>100</pitch>
-    <have_main_part type='bool'>True</have_main_part>
-    <main_priority type='int'>4</main_priority>
     <notify_priority type='int'>4</notify_priority>
+    <pitch type='int'>100</pitch>
+    <speaker type='int'>3</speaker>
   </general>
+  <parameters>
+    <BehaviorPath type='str'>
+    </BehaviorPath>
+    <DogThreshold type='int'>30</DogThreshold>
+    <MainScript type='str'>None</MainScript>
+    <Path type='str'>/tmp</Path>
+    <Sample type='float'>400.0</Sample>
+    <SpyThreshold type='int'>30</SpyThreshold>
+    <Standby type='bool'>False</Standby>
+    <Startup type='bool'>False</Startup>
+    <Threshold type='float'>30.0</Threshold>
+    <chkDog type='bool'>True</chkDog>
+    <chkDogBehavior type='bool'>False</chkDogBehavior>
+    <chkDogDefault type='bool'>False</chkDogDefault>
+    <chkSpy type='bool'>False</chkSpy>
+    <chkSpyRecord type='bool'>False</chkSpyRecord>
+    <dogBehavior type='str'>
+    </dogBehavior>
+  </parameters>
 </settings>

Modified: software/gadgets/micro_monitor/trunk/micro_monitor/strings.xml
===================================================================
--- software/gadgets/micro_monitor/trunk/micro_monitor/strings.xml	2007-12-18 07:32:04 UTC (rev 802)
+++ software/gadgets/micro_monitor/trunk/micro_monitor/strings.xml	2007-12-18 10:44:29 UTC (rev 803)
@@ -1,12 +1,32 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <strings>
-  <at_gui_widget_lblSpyLevel type='str'>Threshold level</at_gui_widget_lblSpyLevel>
+  <Duration type='str'>Duration</Duration>
+  <File type='str'>File</File>
+  <Location type='str'>Save recorded files to :</Location>
   <No type='str'>No</No>
-  <at_gui_widget_chkDog type='str'>Enable guard dog mode</at_gui_widget_chkDog>
-  <at_gui_conf_label13 type='str'>Delay (sec) :</at_gui_conf_label13>
-  <at_gui_conf_label12 type='str'>Settings</at_gui_conf_label12>
+  <Play type='str'>Play</Play>
   <RightClic type='str'>To play a recorded sound, right click
 a sound and select 'play'</RightClic>
+  <Settings type='str'>Settings</Settings>
+  <Show type='str'>Don't show this message again.</Show>
+  <Standby type='str'>This will stop the gadget execution, and restart all the other notifications.
+No more sound events will be notified.
+Proceed ?</Standby>
+  <Startup type='str'>This gadget has an exclusive priority. As long the Micro Monitor gadget window is opened, all other gadget notifications are disabled.</Startup>
+  <Time type='str'>Time</Time>
+  <Yes type='str'>Yes</Yes>
+  <at_gui_conf_label12 type='str'>Settings</at_gui_conf_label12>
+  <at_gui_conf_label13 type='str'>Delay (sec) :</at_gui_conf_label13>
+  <at_gui_conf_label5 type='str'>Accept</at_gui_conf_label5>
+  <at_gui_conf_label6 type='str'>Cancel</at_gui_conf_label6>
+  <at_gui_widget_cbbDog type='str'>Guard dog mode</at_gui_widget_cbbDog>
+  <at_gui_widget_cbbRecord type='str'>Recorded files</at_gui_widget_cbbRecord>
+  <at_gui_widget_cbbSpy type='str'>Spy mode</at_gui_widget_cbbSpy>
+  <at_gui_widget_chkDog type='str'>Enable guard dog mode</at_gui_widget_chkDog>
+  <at_gui_widget_chkDogDefault type='str'>Use an external script</at_gui_widget_chkDogDefault>
+  <at_gui_widget_chkSpy type='str'>Enable spy mode</at_gui_widget_chkSpy>
+  <at_gui_widget_lblDogLevel type='str'>Threshold level</at_gui_widget_lblDogLevel>
+  <at_gui_widget_lblSpyLevel type='str'>Threshold level</at_gui_widget_lblSpyLevel>
   <help_text type='str'>-- Micro Monitor Gadget --
 
 The 'Micro monitor' gadget displays the signal strength registered with the Tux microphone. This gadget has an exclusive priority. Meaning, as long as the gadget window is open, all other gadget notifications and functions are disabled. When the window is closed all other gadget notifications will be restored, but this will also stop the Micro Monitor functions.
@@ -19,28 +39,8 @@
 - 'Spy' mode -
 This mode will record all the sounds exceeding the threshold. To listen to recorded sounds, select 'Recorded files' in the combo box and right click the displayed files in the list.
 In the settings window, accessed by right clicking the 'Micro Monitor' gadget in the manager window, you can specify the location to store the recorded sounds.</help_text>
+  <lblSample type='str'>Sample rate : </lblSample>
+  <name_to_read type='str'>Micro monitor</name_to_read>
+  <speaker_name type='str'>Ryan8k</speaker_name>
   <vr_Sound type='str'>Sound</vr_Sound>
-  <Play type='str'>Play</Play>
-  <at_gui_widget_cbbDog type='str'>Guard dog mode</at_gui_widget_cbbDog>
-  <at_gui_conf_label6 type='str'>Cancel</at_gui_conf_label6>
-  <at_gui_conf_label5 type='str'>Accept</at_gui_conf_label5>
-  <Settings type='str'>Settings</Settings>
-  <Standby type='str'>This will stop the gadget execution, and restart all the other notifications.
-No more sound events will be notified.
-Proceed ?</Standby>
-  <at_gui_widget_chkDogDefault type='str'>Use an external script</at_gui_widget_chkDogDefault>
-  <at_gui_widget_lblDogLevel type='str'>Threshold level</at_gui_widget_lblDogLevel>
-  <Time type='str'>Time</Time>
-  <at_gui_widget_cbbSpy type='str'>Spy mode</at_gui_widget_cbbSpy>
-  <speaker_name type='str'>Ryan8k</speaker_name>
-  <at_gui_widget_cbbRecord type='str'>Recorded files</at_gui_widget_cbbRecord>
-  <name_to_read type='str'>Micro monitor</name_to_read>
-  <Show type='str'>Don't show this message again.</Show>
-  <Startup type='str'>This gadget has an exclusive priority. As long the Micro Monitor gadget window is opened, all other gadget notifications are disabled.</Startup>
-  <File type='str'>File</File>
-  <at_gui_widget_chkSpy type='str'>Enable spy mode</at_gui_widget_chkSpy>
-  <Duration type='str'>Duration</Duration>
-  <lblSample type='str'>Sample rate : </lblSample>
-  <Yes type='str'>Yes</Yes>
-  <Location type='str'>Save recorded files to :</Location>
 </strings>

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