[tuxdroid-svn] r779 - in software/gadgets/sound_monitor/trunk: . audio_monitor audio_monitor/Script
Status: Beta
Brought to you by:
ks156
Menu
▾
▴
[tuxdroid-svn] r779 - in software/gadgets/sound_monitor/trunk: . audio_monitor audio_monitor/Scripts/Python audio_monitor/Scripts/Python/GUI/conf audio_monitor/Scripts/Python/GUI/dialog audio_monitor/Scripts/Python/GUI/widget audio_monitor/Strings
Author: Paul_R
Date: 2007-12-11 17:20:06 +0100 (Tue, 11 Dec 2007)
New Revision: 779
Modified:
software/gadgets/sound_monitor/trunk/audio_monitor.tgf
software/gadgets/sound_monitor/trunk/audio_monitor/Scripts/Python/GUI/conf/other.glade
software/gadgets/sound_monitor/trunk/audio_monitor/Scripts/Python/GUI/conf/other.pyp
software/gadgets/sound_monitor/trunk/audio_monitor/Scripts/Python/GUI/dialog/other.glade
software/gadgets/sound_monitor/trunk/audio_monitor/Scripts/Python/GUI/dialog/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/Strings/fr_ALL.xml
software/gadgets/sound_monitor/trunk/audio_monitor/about.xml
software/gadgets/sound_monitor/trunk/audio_monitor/settings.xml
software/gadgets/sound_monitor/trunk/audio_monitor/strings.xml
Log:
* Settings GUI :
- Changed the alignment and some labels
* Dialog GUI :
- Reduced the size of the window.
- Added a button 'No'
* Widget GUI :
- Resolved a bug in the graph (two lines were visible on graph window)
* Added a popup to notify the user that this gadget had an exclusive priority.
If the user wants to keep the GUI open, He can.
The gadget can't be closed with the 'cross' button's on the top of the window.
M trunk/audio_monitor.tgf
M trunk/audio_monitor/settings.xml
M trunk/audio_monitor/Scripts/Python/GUI/dialog/other.pyp
M trunk/audio_monitor/Scripts/Python/GUI/dialog/other.glade
M trunk/audio_monitor/Scripts/Python/GUI/widget/other.pyp
M trunk/audio_monitor/Scripts/Python/GUI/widget/other.glade
M trunk/audio_monitor/Scripts/Python/GUI/conf/other.pyp
M trunk/audio_monitor/Scripts/Python/GUI/conf/other.glade
M trunk/audio_monitor/Scripts/Python/main.pyp
M trunk/audio_monitor/strings.xml
M trunk/audio_monitor/Strings/fr_ALL.xml
M trunk/audio_monitor/about.xml
Modified: software/gadgets/sound_monitor/trunk/audio_monitor/Scripts/Python/GUI/conf/other.glade
===================================================================
(Binary files differ)
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 15:09:41 UTC (rev 778)
+++ software/gadgets/sound_monitor/trunk/audio_monitor/Scripts/Python/GUI/conf/other.pyp 2007-12-11 16:20:06 UTC (rev 779)
@@ -17,6 +17,7 @@
txt = "%s : %s" % (_me.string('name_to_read'), _me.string('gui_conf_window_title'))
self.get_widget("window1").set_title(txt)
self.get_widget('lblLocation').set_label(_me.string('Location'))
+ self.get_widget('lblFiles').set_label(_me.string('Settings'))
self.get_widget('spinSample').set_value(_me.get_param('Sample'))
self.get_widget('lblSample').set_label(_me.string('lblSample'))
if os.path.exists(_me.get_param('Path')):
Modified: software/gadgets/sound_monitor/trunk/audio_monitor/Scripts/Python/GUI/dialog/other.glade
===================================================================
--- software/gadgets/sound_monitor/trunk/audio_monitor/Scripts/Python/GUI/dialog/other.glade 2007-12-11 15:09:41 UTC (rev 778)
+++ software/gadgets/sound_monitor/trunk/audio_monitor/Scripts/Python/GUI/dialog/other.glade 2007-12-11 16:20:06 UTC (rev 779)
@@ -3,9 +3,9 @@
<glade-interface>
-<widget class="GtkDialog" id="window1">
+<widget class="GtkWindow" id="window1">
<property name="visible">True</property>
- <property name="title" translatable="yes">dialog1</property>
+ <property name="title" translatable="yes">window1</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">False</property>
@@ -14,102 +14,222 @@
<property name="decorated">True</property>
<property name="skip_taskbar_hint">False</property>
<property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="focus_on_map">True</property>
<property name="urgency_hint">False</property>
- <property name="has_separator">True</property>
- <signal name="destroy" handler="on_window1_destroy" last_modification_time="Mon, 10 Dec 2007 10:54:18 GMT"/>
- <child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox1">
+ <child>
+ <widget class="GtkFixed" id="fixed1">
+ <property name="width_request">294</property>
+ <property name="height_request">200</property>
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area1">
+ <child>
+ <widget class="GtkButton" id="btnNo">
+ <property name="width_request">102</property>
+ <property name="height_request">29</property>
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="can_focus">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <signal name="clicked" handler="on_btnNo_clicked" last_modification_time="Tue, 11 Dec 2007 14:56:24 GMT"/>
<child>
- <widget class="GtkButton" id="okbutton1">
+ <widget class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-ok</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="response_id">-5</property>
- <signal name="clicked" handler="on_okbutton1_clicked" last_modification_time="Mon, 10 Dec 2007 11:12:39 GMT"/>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">0</property>
+ <property name="right_padding">0</property>
+
+ <child>
+ <widget class="GtkHBox" id="hbox2">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
+
+ <child>
+ <widget class="GtkImage" id="image2">
+ <property name="visible">True</property>
+ <property name="stock">gtk-cancel</property>
+ <property name="icon_size">4</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="lblNo">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">button2</property>
+ <property name="use_underline">True</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
</widget>
</child>
</widget>
<packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="x">72</property>
+ <property name="y">160</property>
</packing>
</child>
<child>
- <widget class="GtkFixed" id="fixed1">
+ <widget class="GtkButton" id="btnYes">
+ <property name="width_request">102</property>
+ <property name="height_request">29</property>
<property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <signal name="clicked" handler="on_btnYes_clicked" last_modification_time="Tue, 11 Dec 2007 14:56:28 GMT"/>
<child>
- <widget class="GtkCheckButton" id="checkbutton1">
- <property name="width_request">272</property>
- <property name="height_request">24</property>
+ <widget class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">checkbutton1</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="x">16</property>
- <property name="y">176</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label1">
- <property name="width_request">280</property>
- <property name="height_request">168</property>
- <property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">True</property>
- <property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">0</property>
+ <property name="right_padding">0</property>
+
+ <child>
+ <widget class="GtkHBox" id="hbox1">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
+
+ <child>
+ <widget class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="stock">gtk-apply</property>
+ <property name="icon_size">4</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="lblOK">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">button1</property>
+ <property name="use_underline">True</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
</widget>
- <packing>
- <property name="x">8</property>
- <property name="y">8</property>
- </packing>
</child>
</widget>
<packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="x">184</property>
+ <property name="y">160</property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkCheckButton" id="checkbutton1">
+ <property name="width_request">272</property>
+ <property name="height_request">21</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">checkbutton1</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="x">8</property>
+ <property name="y">136</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label1">
+ <property name="width_request">280</property>
+ <property name="height_request">120</property>
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">True</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="x">8</property>
+ <property name="y">8</property>
+ </packing>
+ </child>
</widget>
</child>
</widget>
Modified: software/gadgets/sound_monitor/trunk/audio_monitor/Scripts/Python/GUI/dialog/other.pyp
===================================================================
--- software/gadgets/sound_monitor/trunk/audio_monitor/Scripts/Python/GUI/dialog/other.pyp 2007-12-11 15:09:41 UTC (rev 778)
+++ software/gadgets/sound_monitor/trunk/audio_monitor/Scripts/Python/GUI/dialog/other.pyp 2007-12-11 16:20:06 UTC (rev 779)
@@ -11,8 +11,24 @@
def new(self):
self.get_widget("window1").set_title(_me.string('name_to_read'))
self.get_widget('label1').set_label(_me.get_param('string'))
- self.get_widget('checkbutton1').set_label(_me.get_param('check'))
+ self.get_widget('lblOK').set_label(_me.get_param('btnYes'))
+ if _me.get_param('btnNo') != False:
+ self.get_widget('lblNo').set_label(_me.get_param('btnNo'))
+ else:
+ self.get_widget('btnNo').hide()
+ if _me.get_param('chkHide') == True:
+ self.get_widget('checkbutton1').hide()
+ else:
+ self.get_widget('checkbutton1').set_label(_me.get_param('check'))
- def on_okbutton1_clicked(self, widget, *args):
+ def on_btnYes_clicked(self, widget, *args):
+ _me.set_param('chkHide', False)
_me.set_param(_me.get_param('param'), self.get_widget('checkbutton1').get_active())
+ _me.set_param('return', True)
self.get_widget('window1').destroy()
+
+ def on_btnNo_clicked(self, widget, *args):
+ _me.set_param('chkHide', False)
+ _me.set_param(_me.get_param('param'), self.get_widget('checkbutton1').get_active())
+ _me.set_param('return', False)
+ self.get_widget('window1').destroy()
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 15:09:41 UTC (rev 778)
+++ software/gadgets/sound_monitor/trunk/audio_monitor/Scripts/Python/GUI/widget/other.pyp 2007-12-11 16:20:06 UTC (rev 779)
@@ -27,6 +27,8 @@
_me.set_param('string', _me.string('Startup'))
_me.set_param('check', _me.string('Show'))
_me.set_param('param', 'Startup')
+ _me.set_param('btnNo', False)
+ _me.set_param('btnYes', 'OK')
_me.gui('dialog').show_from_main()
thread.start_new_thread(self.update, ())
@@ -52,9 +54,12 @@
self.get_widget('spinDog').set_value(_me.get_param('Threshold'))
print _me.get_param('dogBehavior')
- if os.path.exists(_me.get_param('dogBehavior')):
- print _me.get_param('dogBehavior')
- self.get_widget('fileDogBehavior').set_filename(_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('chkSpy').set_label(_me.string('at_gui_widget_chkSpy'))
self.get_widget('chkSpy').set_active(_me.get_param('chkSpy'))
@@ -109,12 +114,13 @@
self.measure.refresh_treeview = self.refresh_treeview
self.graph.measure = self.measure
- if os.path.exists(_me.get_param('Path')):
- self.measure.capture_path = _me.get_param('Path')
- else:
- user = commands.getoutput('echo $USER')
- self.measure.capture_path = '/home/%s'%user
- _me.set_param('Path', 'home/%s'%user)
+ if _me.get_param('Path') != None:
+ if os.path.exists(_me.get_param('Path')):
+ self.measure.capture_path = _me.get_param('Path')
+ else:
+ 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()
@@ -163,12 +169,8 @@
# Event functions
#
###########################################################
- def on_window1_destroy(self, widget, *args):
- if _me.get_param('Standby') == False:
- _me.set_param('string', _me.string('Standby'))
- _me.set_param('check', _me.string('Show'))
- _me.set_param('param', 'Standby')
- _me.gui('dialog').show_from_main()
+ def on_window1_delete_event(self, widget, *args):
+ return True
def on_cbbType_changed(self, widget, *args):
if self.get_widget('cbbType').get_active() == 0:
@@ -316,17 +318,17 @@
#and trace the curce
self.context.set_line_width(0.6)
self.context.set_source_rgb(0.9, 0.6,0)
- self.context.move_to(self.rect.x - 2, self.rect.height / 2)
- self.context.line_to(self.rect.x, self.rect.height - (self.measure.val_table_pos[0] * coeff_y))
+ self.context.move_to(self.rect.x - 10, self.rect.height / 2)
+ self.context.line_to(self.rect.x, self.rect.height/2 - (self.measure.val_table_pos[0] * coeff_y))
for i, val in enumerate(self.measure.val_table_pos):
self.context.line_to(self.rect.x + ((i) * coeff_x), self.rect.height - ((self.measure.RANGE/2 + val) * coeff_y))
- self.context.line_to(self.rect.x + ((i) * coeff_x), self.rect.height + 5)
+ self.context.line_to(self.rect.x + ((i) * coeff_x), self.rect.height/2 )
- self.context.move_to(self.rect.x - 2, self.rect.height / 2)
- self.context.line_to(self.rect.x, self.rect.height - (self.measure.val_table_pos[0] * coeff_y))
+ self.context.move_to(self.rect.x - 10, self.rect.height / 2)
+ self.context.line_to(self.rect.x, self.rect.height/2 - (self.measure.val_table_pos[0] * coeff_y))
for i, val in enumerate(self.measure.val_table_pos):
self.context.line_to(self.rect.x + ((i) * coeff_x), self.rect.height - ((self.measure.RANGE/2 - val) * coeff_y))
- self.context.line_to(self.rect.x + ((i) * coeff_x), self.rect.height + 5)
+ self.context.line_to(self.rect.x + ((i) * coeff_x), self.rect.height/2)
self.context.stroke()
self.draw_events(coeff_x, coeff_y)
@@ -348,7 +350,7 @@
def fill(self, coeff_x, coeff_y):
#determine the coefficients to adjust the curve in the window space
- self.context.move_to(self.rect.x - 2, self.rect.height / 2)
+ self.context.move_to(self.rect.x - 10, self.rect.height / 2)
for i, val in enumerate(self.measure.val_table_pos):
self.context.line_to(self.rect.x + ((i) * coeff_x), self.rect.height - ((self.measure.RANGE/2 + val) * coeff_y))
self.context.line_to(self.rect.x + ((i) * coeff_x), self.rect.height/2)
@@ -356,7 +358,7 @@
self.context.set_source_rgba(0.9, 0.6, 0, 0.2)
self.context.fill()
- self.context.move_to(self.rect.x - 2, self.rect.height / 2)
+ self.context.move_to(self.rect.x - 10, self.rect.height / 2)
for i, val in enumerate(self.measure.val_table_pos):
self.context.line_to(self.rect.x + ((i) * coeff_x), self.rect.height - ((self.measure.RANGE/2 - val) * coeff_y))
self.context.line_to(self.rect.x + ((i) * coeff_x), self.rect.height/2)
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 15:09:41 UTC (rev 778)
+++ software/gadgets/sound_monitor/trunk/audio_monitor/Scripts/Python/main.pyp 2007-12-11 16:20:06 UTC (rev 779)
@@ -2,23 +2,41 @@
import time
def on_standby():
- gdg_dict = _me.get_param('dict')
- for keys in gdg_dict:
- gadgets[keys].notify.set_active(gdg_dict[keys])
-
- gadgets['sound_monitor'].notify.set_active(False)
- tux.micro.off()
- tux.cmd.mouth_close()
- tux.event.on_remote_bt[K_STANDBY] = None
- tux.monitoring.remove(_me.get_param('monitor_id'))
- tux.micro.on_buffer.disconnect(_me.get_param('buffer_idx'))
+ print 'standby function'
+ _me.set_param('stdby', True)
+ _me.set_param('string', _me.string('Standby'))
+ _me.set_param('check', _me.string('Show'))
+ _me.set_param('btnYes', _me.string('Yes'))
+ _me.set_param('btnNo', _me.string('No'))
+ _me.set_param('chkHide', True)
+ _me.set_param('param', 'Standby')
+ _me.gui('dialog').show_from_main()
+
+ tux.sys.wait(1)
+
while _me.gui('dialog').showed():
+ print 'while'
tux.sys.wait(0.5)
-
- _me.gui('widget').hide_from_main()
- _me.exit_main_loop()
+ 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:
+ gadgets[keys].notify.set_active(gdg_dict[keys])
+
+ gadgets['sound_monitor'].notify.set_active(False)
+ tux.micro.off()
+ tux.cmd.mouth_close()
+ tux.event.on_remote_bt[K_STANDBY] = None
+ tux.monitoring.remove(_me.get_param('monitor_id'))
+ tux.micro.on_buffer.disconnect(_me.get_param('buffer_idx'))
+ _me.gui('widget').hide_from_main()
+ _me.exit_main_loop()
def start_gadget():
gdg_dict = {}
@@ -28,12 +46,14 @@
gadgets[Gdgname].notify.set_active(False)
gadgets['sound_monitor'].notify.set_active(True)
-
+ _me.set_param('stdby', False)
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/sound_monitor/trunk/audio_monitor/Strings/fr_ALL.xml
===================================================================
--- software/gadgets/sound_monitor/trunk/audio_monitor/Strings/fr_ALL.xml 2007-12-11 15:09:41 UTC (rev 778)
+++ software/gadgets/sound_monitor/trunk/audio_monitor/Strings/fr_ALL.xml 2007-12-11 16:20:06 UTC (rev 779)
@@ -1,6 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<strings>
<at_gui_widget_lblSpyLevel type='str'>Niveau</at_gui_widget_lblSpyLevel>
+ <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>
@@ -11,8 +12,10 @@
<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.</Standby>
+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>
@@ -20,11 +23,12 @@
<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 son</name_to_read>
- <Show type='str'>Don't show this message again</Show>
+ <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'>Selectionner ou les sons doivent être sauvés.</Location>
</strings>
Modified: software/gadgets/sound_monitor/trunk/audio_monitor/about.xml
===================================================================
--- software/gadgets/sound_monitor/trunk/audio_monitor/about.xml 2007-12-11 15:09:41 UTC (rev 778)
+++ software/gadgets/sound_monitor/trunk/audio_monitor/about.xml 2007-12-11 16:20:06 UTC (rev 779)
@@ -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_name type='str'>sound_monitor</gadget_name>
<gadget_description type='str'>
</gadget_description>
+ <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-11 15:09:41 UTC (rev 778)
+++ software/gadgets/sound_monitor/trunk/audio_monitor/settings.xml 2007-12-11 16:20:06 UTC (rev 779)
@@ -1,24 +1,21 @@
<?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='NoneType'>None</BehaviorPath>
<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>
- <chkSpyRecord type='bool'>False</chkSpyRecord>
+ <MainScript type='str'>None</MainScript>
+ <Sample type='float'>400.0</Sample>
<chkDogDefault type='bool'>False</chkDogDefault>
- <Path type='str'>
- </Path>
+ <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>
- <BehaviorPath type='str'>
- </BehaviorPath>
+ <dogBehavior type='NoneType'>None</dogBehavior>
</parameters>
<general>
<have_settings_part type='bool'>True</have_settings_part>
Modified: software/gadgets/sound_monitor/trunk/audio_monitor/strings.xml
===================================================================
--- software/gadgets/sound_monitor/trunk/audio_monitor/strings.xml 2007-12-11 15:09:41 UTC (rev 778)
+++ software/gadgets/sound_monitor/trunk/audio_monitor/strings.xml 2007-12-11 16:20:06 UTC (rev 779)
@@ -1,6 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<strings>
<at_gui_widget_lblSpyLevel type='str'>Threshold level</at_gui_widget_lblSpyLevel>
+ <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>
@@ -11,8 +12,10 @@
<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.</Standby>
+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>
@@ -26,5 +29,6 @@
<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/sound_monitor/trunk/audio_monitor.tgf
===================================================================
(Binary files differ)
|
