[tuxdroid-svn] r781 - in software/gadgets/settings/trunk: . settings settings/Scripts/Python/GUI/se
Status: Beta
Brought to you by:
ks156
Menu
▾
▴
[tuxdroid-svn] r781 - in software/gadgets/settings/trunk: . settings settings/Scripts/Python/GUI/selftest settings/Scripts/Python/GUI/widget settings/Strings
|
From: Paul_R <c2m...@c2...> - 2007-12-12 11:46:35
|
Author: Paul_R
Date: 2007-12-12 12:46:24 +0100 (Wed, 12 Dec 2007)
New Revision: 781
Modified:
software/gadgets/settings/trunk/settings.tgf
software/gadgets/settings/trunk/settings/Scripts/Python/GUI/selftest/other.glade
software/gadgets/settings/trunk/settings/Scripts/Python/GUI/selftest/other.pyp
software/gadgets/settings/trunk/settings/Scripts/Python/GUI/widget/other.pyp
software/gadgets/settings/trunk/settings/Strings/fr_ALL.xml
software/gadgets/settings/trunk/settings/about.xml
software/gadgets/settings/trunk/settings/settings.xml
software/gadgets/settings/trunk/settings/strings.xml
Log:
* Optimized the english (by Se)
* Removed the 'audio in' test
* Corrected some bugs in the log file
Modified: software/gadgets/settings/trunk/settings/Scripts/Python/GUI/selftest/other.glade
===================================================================
--- software/gadgets/settings/trunk/settings/Scripts/Python/GUI/selftest/other.glade 2007-12-12 10:35:05 UTC (rev 780)
+++ software/gadgets/settings/trunk/settings/Scripts/Python/GUI/selftest/other.glade 2007-12-12 11:46:24 UTC (rev 781)
@@ -18,6 +18,7 @@
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="focus_on_map">True</property>
<property name="urgency_hint">False</property>
+ <signal name="destroy" handler="on_window1_destroy" last_modification_time="Wed, 12 Dec 2007 11:18:27 GMT"/>
<child>
<widget class="GtkVBox" id="vbox1">
Modified: software/gadgets/settings/trunk/settings/Scripts/Python/GUI/selftest/other.pyp
===================================================================
--- software/gadgets/settings/trunk/settings/Scripts/Python/GUI/selftest/other.pyp 2007-12-12 10:35:05 UTC (rev 780)
+++ software/gadgets/settings/trunk/settings/Scripts/Python/GUI/selftest/other.pyp 2007-12-12 11:46:24 UTC (rev 781)
@@ -15,10 +15,32 @@
self.ok_flag = False
self.cancel_flag = False
self.error = []
+ gdg_dict = {}
+ for Gdgname in gadgets.keys():
+ if Gdgname != 'Manager':
+ gdg_dict[Gdgname] = gadgets[Gdgname].get_var('notified')
+ gadgets[Gdgname].notify.set_active(False)
+ _me.voice_recognition.off()
+ _me.set_param('dict', gdg_dict)
+ print gdg_dict
+
def new(self):
self.get_widget("window1").set_title(_me.string('name_to_read'))
thread.start_new_thread(self.update,())
+
+ def on_window1_destroy(self, widget, *args):
+ tux.cmd.eyes_open()
+ tux.cmd.raw(0x31, 0, 0, 0)
+ tux.cmd.mouth_close()
+
+ gdg_dict = _me.get_param('dict')
+ for keys in gdg_dict:
+ print keys
+ gadgets[keys].notify.set_active(gdg_dict[keys])
+
+ _me.voice_recognition.on()
+ self.f.close()
#==================================================================
# SELF TEST FUNCTIONS
@@ -50,7 +72,7 @@
self.tree_store.append(None, [_me.string('Selftest')+'/home/%s/TuxSelftest_%s.txt' %(self.path, self.date)])
self.get_widget('progressbar2T').set_fraction(0)
- STEPS = 30.0
+ STEPS = 28.0
self.fraction = float(1.0 / STEPS)
self.actual_fraction = 0
@@ -71,10 +93,10 @@
self.f = open('/home/%s/TuxSelftest_%s.txt' %(self.path, self.date), 'w')
self.f.write('%s : Self test start \n'%time.asctime())
self.f.write('%s : ============================================================= \n'%time.asctime())
- self.f.write('%s : First step - Reset tux \n'%time.asctime())
+ self.f.write('%s : Step 1 - Resetting Tux Droid\n'%time.asctime())
self.f.write('%s : ------------------------------------------------------------- \n'%time.asctime())
self.tree_store.clear()
- self.tree_store.append(None, ['Reset Tux ...'])
+ self.tree_store.append(None, ['Resetting Tux Droid ...'])
tux.cmd.raw(0x31, 0, 0, 0)
tux.cmd.mouth_close()
tux.sys.wait(1)
@@ -100,7 +122,7 @@
elif tux.status.charger_state() == 2:
self.f.write('%s : Trickle mode\n'%time.asctime())
elif tux.status.charger_state() == 3:
- self.f.write('%s : Power plug detected, no charge\n'%time.asctime())
+ self.f.write('%s : Power plug detected, not charging\n'%time.asctime())
except:
if tux.status.power_plug() == 0:
self.f.write('%s : Power plug not detected\n'%time.asctime())
@@ -111,7 +133,7 @@
def measure_tests(self):
self.f.write('%s :\n'%time.asctime())
- self.f.write('%s : Second step : Measures\n'%time.asctime())
+ self.f.write('%s : Step 2 : Measurements\n'%time.asctime())
self.f.write('%s : ------------------------------------------------------------- \n'%time.asctime())
self.tree_store.clear()
level1 = tux.status.light_level()
@@ -130,7 +152,7 @@
self.f.write('%s : Light level with the eyes closed : %s\n'%(time.asctime(), level2))
if level2 + 10 >= level1:
- self.error.append('The light level seems bad')
+ self.error.append('The light sensor has a problem')
self.progress_bar()
tux.sys.wait(1)
@@ -159,7 +181,7 @@
self.f.write(' with one or more motor(s) running\n')
if level2[0] <= level1[0] - 30:
- self.error.append('The batteries seems bad')
+ self.error.append('The batteries have a problem')
self.progress_bar()
tux.cmd.eyes_close()
@@ -168,7 +190,7 @@
def buttons_tests(self):
self.f.write('%s :\n'%time.asctime())
- self.f.write('%s : Third step : Buttons\n'%time.asctime())
+ self.f.write('%s : Step 3 : Buttons/switches\n'%time.asctime())
self.f.write('%s : ------------------------------------------------------------- \n'%time.asctime())
self.head = [False, False]
@@ -178,7 +200,7 @@
self.progress_bar()
self.warning(_me.string('Switch'))
- self.f.write('%s : Test the switches with the wings low\n'%time.asctime())
+ self.f.write('%s : Switch test with the wings in the lower position\n'%time.asctime())
tux.event.on_head_bt_pushed = self.on_head_bt_pushed
tux.event.on_lwing_bt_pushed = self.on_lwing_bt_pushed
tux.event.on_rwing_bt_pushed = self.on_rwing_bt_pushed
@@ -193,19 +215,19 @@
self.progress_bar()
- self.f.write('%s : Head button pressed : %s\n'%(time.asctime(), str(self.head[0])))
+ self.f.write('%s : Head button pushed : %s\n'%(time.asctime(), str(self.head[0])))
self.f.write('%s : Head button released : %s\n'%(time.asctime(), str(self.head[1])))
- self.f.write('%s : Left wing pressed : %s\n'%(time.asctime(), str(self.lwing[0])))
+ self.f.write('%s : Left wing pushed : %s\n'%(time.asctime(), str(self.lwing[0])))
self.f.write('%s : Left wing released : %s\n'%(time.asctime(), str(self.lwing[1])))
- self.f.write('%s : Right wing pressed : %s\n'%(time.asctime(), str(self.rwing[0])))
+ self.f.write('%s : Right wing pushed : %s\n'%(time.asctime(), str(self.rwing[0])))
self.f.write('%s : Right wing released : %s\n'%(time.asctime(), str(self.rwing[1])))
if self.head[0] == False or self.head[1] == False:
- self.error.append('The head button seems bad')
+ self.error.append('The head button has a problem')
if self.lwing[0] == False or self.lwing[1] == False:
- self.error.append('The left wing button seems bad (low position)')
+ self.error.append('The left wing switch has a problem (in lower position)')
if self.rwing[0] == False or self.rwing[1] == False:
- self.error.append('The right wing button seems bad (low position)')
+ self.error.append('The right wing button has a problem (in lower position)')
self.progress_bar()
@@ -215,7 +237,7 @@
tux.cmd.wings_on(1)
self.warning(_me.string('Switch'))
- self.f.write('%s : Test the switches with the wings up\n'%time.asctime())
+ self.f.write('%s : Switch test with the wings in the upper position\n'%time.asctime())
self.head = [False, False]
self.lwing = [False, False]
self.rwing = [False, False]
@@ -228,23 +250,23 @@
self.progress_bar()
- self.f.write('%s : Head button pressed : %s\n'%(time.asctime(), str(self.head[0])))
+ self.f.write('%s : Head button pushed : %s\n'%(time.asctime(), str(self.head[0])))
self.f.write('%s : Head button released : %s\n'%(time.asctime(), str(self.head[1])))
- self.f.write('%s : Left wing pressed : %s\n'%(time.asctime(), str(self.lwing[0])))
+ self.f.write('%s : Left wing pushed : %s\n'%(time.asctime(), str(self.lwing[0])))
self.f.write('%s : Left wing released : %s\n'%(time.asctime(), str(self.lwing[1])))
- self.f.write('%s : Right wing pressed : %s\n'%(time.asctime(), str(self.rwing[0])))
+ self.f.write('%s : Right wing pushed : %s\n'%(time.asctime(), str(self.rwing[0])))
self.f.write('%s : Right wing released : %s\n'%(time.asctime(), str(self.rwing[1])))
if self.head[0] == False or self.head[1] == False:
- self.error.append('The head button seems bad')
+ self.error.append('The head button has a problem')
if self.lwing[0] == False or self.lwing[1] == False:
- self.error.append('The left wing button seems bad (high position)')
+ self.error.append('The left wing switch has a problem (in higher position)')
if self.rwing[0] == False or self.rwing[1] == False:
- self.error.append('The right wing button seems bad (high position)')
+ self.error.append('The right wing button has a problem (in higher position)')
def leds_tests(self):
self.f.write('%s :\n'%time.asctime())
- self.f.write('%s : Fourth step : IR and LEDs\n'%time.asctime())
+ self.f.write('%s : Step 4 : IR and LEDs\n'%time.asctime())
self.f.write('%s : ------------------------------------------------------------- \n'%time.asctime())
self.f.write('%s : Switch on the LEDs '%time.asctime())
tux.cmd.eyes_open()
@@ -288,29 +310,29 @@
timer = time.time()
while time.time() <= timer + 15:
if self.key1 and self.key2 and self.key3:
- self.f.write('%s : Tux received correctly the remote control signal\n'%time.asctime())
+ self.f.write('%s : Tux Droid received the remote control signals correctly\n'%time.asctime())
break
tux.sys.wait(0.5)
if time.time() >= timer + 15:
- self.f.write('%s : Tux not received correctly the remote control signal\n'%time.asctime())
- self.error.append('The IR captor seems bad')
+ self.f.write('%s : Tux Droid did not receive the remote control signals correctly\n'%time.asctime())
+ self.error.append('The IR receiver has a problem')
self.progress_bar()
def sound_tests(self):
self.f.write('%s :\n'%time.asctime())
- self.f.write('%s : Fifth step : Sound\n'%time.asctime())
+ self.f.write('%s : Step 4 : Sound\n'%time.asctime())
self.f.write('%s : ------------------------------------------------------------- \n'%time.asctime())
if tux.status.sounds_count() == 0:
- self.f.write('%s : The sound flash is empty\n'%time.asctime())
+ self.f.write('%s : The sound flash memory is empty\n'%time.asctime())
self.tree_store.clear()
- self.tree_store.append(None, ['Sound flash empty ...'])
+ self.tree_store.append(None, ['Sound flash memory empty ...'])
self.error.append('The flash memory is empty')
else:
self.tree_store.clear()
- self.tree_store.append(None, ['Playing a sound from the flash memory'])
+ self.tree_store.append(None, ['Playing a sound from the sound flash memory'])
tux.cmd.sound_play(1)
try:
while tux.status.sound_play()[0] != 0:
@@ -325,7 +347,7 @@
self.warning(_me.string('Sound1'))
self.tree_store.clear()
- self.tree_store.append(None, ['Playing a sound from the flash memory'])
+ self.tree_store.append(None, ['Playing a sound from the sound flash memory'])
tux.cmd.sound_play(1)
try:
while tux.status.sound_play()[0] != 0:
@@ -358,7 +380,7 @@
self.warning(_me.string('Mic'))
self.tree_store.clear()
- self.tree_store.append(None, ['Recording the microphone'])
+ self.tree_store.append(None, ['Recording with the microphone'])
tux.micro.on()
tux.cmd.mouth_open()
tux.micro.capture_start('/tmp/capture.wav', 3)
@@ -373,8 +395,8 @@
if self.ok_flag == True:
self.f.write('%s : Microphone OK\n'%time.asctime())
else:
- self.f.write('%s : No micro signal\n'%time.asctime())
- self.error.append('The micro seems bad')
+ self.f.write('%s : No microphone signal\n'%time.asctime())
+ self.error.append('The microphone has a problem')
self.progress_bar()
@@ -394,7 +416,7 @@
self.f.write('%s : The sound output has not been tested\n'%time.asctime())
self.progress_bar()
-
+ '''
self.question(_me.string('In'))
if self.ok_flag == True:
tux.sys.wait(5)
@@ -406,18 +428,18 @@
self.error.append('No sound input ...')
else:
self.f.write('%s : The sound input has not been tested\n'%time.asctime())
-
+
self.progress_bar()
-
+ '''
def motors_tests(self):
self.f.write('%s :\n'%time.asctime())
- self.f.write('%s : Sixth step : Motors\n'%time.asctime())
+ self.f.write('%s : Step 6 : Motors\n'%time.asctime())
self.f.write('%s : ------------------------------------------------------------- \n'%time.asctime())
self.head = [False, False]
self.lwing = [False, False]
self.rwing = [False, False]
- self.f.write('%s : Reset tux ... '%time.asctime())
+ self.f.write('%s : Resetting tux ... '%time.asctime())
tux.cmd.raw(0x31, 0, 0, 0)
tux.cmd.mouth_close()
tux.sys.wait(1)
@@ -440,15 +462,15 @@
self.progress_bar()
- self.f.write('%s : Move the wings 8 time'%time.asctime())
+ self.f.write('%s : Move the wings 8 times'%time.asctime())
self.tree_store.clear()
- self.tree_store.append(None, ['Move the wings 8 time'])
+ self.tree_store.append(None, ['Move the wings 8 times'])
self.send_command(tux.cmd.wings_on(8), tux.status.wings_counter, 0)
self.progress_bar()
- self.f.write('%s : Left wing pressed : %s\n'%(time.asctime(), str(self.lwing[0])))
- self.f.write('%s : Right wing pressed : %s\n'%(time.asctime(), str(self.rwing[0])))
+ self.f.write('%s : Left wing pushed : %s\n'%(time.asctime(), str(self.lwing[0])))
+ self.f.write('%s : Right wing pushed : %s\n'%(time.asctime(), str(self.rwing[0])))
if self.lwing[0] == True:
self.error.append('Left wing switch pressed while moving')
if self.rwing[0] == True:
@@ -461,7 +483,7 @@
self.send_command(tux.cmd.eyes_close(), tux.status.eyes_closed, 0)
self.progress_bar()
-
+ '''
self.question(_me.string('Eyes'))
if self.ok_flag == True:
self.f.write('%s : The eyes are correctly closed\n'%time.asctime())
@@ -470,7 +492,7 @@
self.error.append('The eyes are not correctly closed')
self.progress_bar()
-
+ '''
self.f.write('%s : Send a command to open the eyes'%time.asctime())
self.tree_store.clear()
self.tree_store.append(None, ['Send a command to open the eyes'])
@@ -478,40 +500,48 @@
self.progress_bar()
- self.f.write('%s : Send a command to open the mouth'%time.asctime())
+ self.f.write('%s : Send a command to open the beak'%time.asctime())
self.tree_store.clear()
- self.tree_store.append(None, ['Send a command to open the mouth'])
+ self.tree_store.append(None, ['Send a command to open the beak'])
self.send_command(tux.cmd.mouth_open(), tux.status.mouth_closed, 1)
self.progress_bar()
- self.f.write('%s : Send a command to close the mouth'%time.asctime())
+ self.f.write('%s : Send a command to close the beak'%time.asctime())
self.tree_store.clear()
- self.tree_store.append(None, ['Send a command to close the mouth'])
+ self.tree_store.append(None, ['Send a command to close the beak'])
self.send_command(tux.cmd.mouth_close(), tux.status.mouth_closed, 0)
self.progress_bar()
+ while(1):
+ self.warning(_me.string('Disconnect'))
+ try:
+ if tux.status.charger_state() == 0:
+ break
+ except:
+ if tux.status.power_plug() == 0:
+ break
- self.warning(_me.string('Disconnect'))
+ self.warning(_me.string('StartSpin'))
- self.f.write('%s : Send a command to spin right'%time.asctime())
+ self.f.write('%s : Send a command to spin to the right'%time.asctime())
self.tree_store.clear()
- self.tree_store.append(None, ['Send a command to spin right'])
+ self.tree_store.append(None, ['Send a command to spin to the right'])
self.send_command(tux.cmd.spinr_on(4), tux.status.spin_counter, 0)
self.progress_bar()
- self.f.write('%s : Send a command to spin left'%time.asctime())
+ self.f.write('%s : Send a command to spin to the left'%time.asctime())
self.tree_store.clear()
- self.tree_store.append(None, ['Send a command to spin left'])
+ self.tree_store.append(None, ['Send a command to spin to the left'])
self.send_command(tux.cmd.spinl_on(4), tux.status.spin_counter, 0)
self.progress_bar()
- self.f.write('%s : Send a command to shake Tux'%time.asctime())
+ self.f.write('%s : Send a command to shake Tux\n'%time.asctime())
self.tree_store.clear()
- self.tree_store.append(None, ['Send a command to shake Tux'])
+ self.tree_store.append(None, ['Send a command to shake Tux '])
tux.sys.wait(1)
@@ -565,7 +595,7 @@
self.f.write(str(time.asctime())+' : '+self.error[i]+'\n')
self.tree_store.append(None, [self.error[i]])
- self.f.write("%s : Don't forget to see the motors section\n"%time.asctime())
+ self.f.write("%s : Don't forget to check the motors section\n"%time.asctime())
self.f.close()
self.get_widget('progressbar2T').hide()
@@ -594,31 +624,31 @@
def on_head_bt_released(self):
self.head[1] = True
- self.tree_store.append(None, ['Head clicked'])
+ self.tree_store.append(None, ['Head button pushed'])
def on_lwing_bt_released(self):
self.lwing[1] = True
- self.tree_store.append(None, ['left wing clicked'])
+ self.tree_store.append(None, ['left wing pushed'])
def on_rwing_bt_released(self):
self.rwing[1] = True
- self.tree_store.append(None, ['right wing clicked'])
+ self.tree_store.append(None, ['right wing pushed'])
def on_remote(self, key):
if key == 1:
self.key1 = True
- self.f.write("%s : Key '1' pressed\n"%time.asctime())
- self.tree_store.append(None, ['key1 pressed'])
+ self.f.write("%s : Key '1' pushed\n"%time.asctime())
+ self.tree_store.append(None, ['key1 pushed'])
elif key == 2:
self.key2 = True
- self.f.write("%s : Key '2' pressed\n"%time.asctime())
- self.tree_store.append(None, ['key2 pressed'])
+ self.f.write("%s : Key '2' pushed\n"%time.asctime())
+ self.tree_store.append(None, ['key2 pushed'])
elif key == 3:
self.key3 = True
- self.f.write("%s : Key '3' pressed\n"%time.asctime())
- self.tree_store.append(None, ['key3 pressed'])
+ self.f.write("%s : Key '3' pushed\n"%time.asctime())
+ self.tree_store.append(None, ['key3 pushed'])
else:
- self.f.write("%s : Key '%d' pressed\n"%(time.asctime(), key))
+ self.f.write("%s : Key '%d' pushed\n"%(time.asctime(), key))
def send_command(self, command, status, stat_val):
for i in range(2):
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-12 10:35:05 UTC (rev 780)
+++ software/gadgets/settings/trunk/settings/Scripts/Python/GUI/widget/other.pyp 2007-12-12 11:46:24 UTC (rev 781)
@@ -819,7 +819,9 @@
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)
@@ -829,8 +831,12 @@
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]))
- tux.sys.wait(0.1)
+ while tux.status.sound_record()[0] != 2:
+ tux.sys.wait(0.1)
+
tux.cmd.sound_confirm(True)
current = current + fraction
tux.sys.wait(0.1)
@@ -845,8 +851,6 @@
# 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)
@@ -857,80 +861,60 @@
# 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/Strings/fr_ALL.xml
===================================================================
--- software/gadgets/settings/trunk/settings/Strings/fr_ALL.xml 2007-12-12 10:35:05 UTC (rev 780)
+++ software/gadgets/settings/trunk/settings/Strings/fr_ALL.xml 2007-12-12 11:46:24 UTC (rev 781)
@@ -85,6 +85,11 @@
appuyez sur 'oui'.</Connect>
<lblCurrentIDName type='str'>Le nom acteul est : </lblCurrentIDName>
<Close type='str'>Fermer</Close>
+ <StartSpin type='str'>La prochaine test est celui des moteurs
+faisant tourner Tux.
+Afin de faire ce test dans les meilleures
+conditions, merci de faire un peu de place
+autour du Tux.</StartSpin>
<Out type='str'>Voulez-vous tester la sortie son de Tux?
Vous devez connecter des haut-parleurs
dans la prise verte.</Out>
@@ -110,7 +115,7 @@
<gui_conf_current_bind_lb type='str'>Assignation</gui_conf_current_bind_lb>
<speaker_name type='str'>Bruno8k</speaker_name>
<btnSoundModify type='str'>Modifier</btnSoundModify>
- <Iwlist type='str'>iwlist n'a pas été trouvée.
+ <Iwlist type='str'>iwlist n'a pas été trouvé.
Assurez-vous que le paquet 'wireless tools' est correctement installé sur votre ordinateur.
(http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html#latest)</Iwlist>
<btnSoundPlayNum type='str'>Lire</btnSoundPlayNum>
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-12 10:35:05 UTC (rev 780)
+++ software/gadgets/settings/trunk/settings/settings.xml 2007-12-12 11:46:24 UTC (rev 781)
@@ -4,24 +4,20 @@
<AvoidChannel type='int'>0</AvoidChannel>
<hidden_in_manager type='bool'>True</hidden_in_manager>
<SleepDelay type='str'>5</SleepDelay>
- <EnableSleep type='bool'>True</EnableSleep>
+ <EnableSleep type='bool'>False</EnableSleep>
</parameters>
<general>
<have_settings_part type='bool'>True</have_settings_part>
<gui_state>
<widget>
- <y type='int'>25</y>
- <visible type='bool'>True</visible>
- <x type='int'>0</x>
+ <visible type='bool'>False</visible>
</widget>
+ <selftest>
+ <visible type='bool'>False</visible>
+ </selftest>
<conf>
<visible type='bool'>False</visible>
</conf>
- <selftest>
- <y type='int'>25</y>
- <visible type='bool'>True</visible>
- <x type='int'>0</x>
- </selftest>
</gui_state>
<language type='str'>en_US</language>
<notified type='bool'>True</notified>
@@ -30,7 +26,7 @@
<menu_active type='bool'>True</menu_active>
<have_widget_part type='bool'>True</have_widget_part>
<speaker type='int'>3</speaker>
- <pitch type='int'>100</pitch>
+ <pitch type='int'>129</pitch>
<have_main_part type='bool'>False</have_main_part>
<main_priority type='int'>0</main_priority>
<notify_priority type='int'>0</notify_priority>
Modified: software/gadgets/settings/trunk/settings/strings.xml
===================================================================
--- software/gadgets/settings/trunk/settings/strings.xml 2007-12-12 10:35:05 UTC (rev 780)
+++ software/gadgets/settings/trunk/settings/strings.xml 2007-12-12 11:46:24 UTC (rev 781)
@@ -2,11 +2,11 @@
<strings>
<lblLocal type='str'>Available versions</lblLocal>
<gui_conf_remote_title type='str'>Remote</gui_conf_remote_title>
- <Firmware type='str'>Be sure that the firmware updater gadget is correctly installed.</Firmware>
+ <Firmware type='str'>Make sure the firmware updater gadget is correctly installed.</Firmware>
<Selftest type='str'>This is a self test program for Tux Droid.
-Please follow the instructions and execute the
-requested tasks.
+Please follow the instructions and do the
+requested tests.
At the end, a log file can be found here :
</Selftest>
@@ -16,14 +16,14 @@
<itemCPU type='str'>Flash the CPUs</itemCPU>
<btnSoundPlayMic type='str'>Play</btnSoundPlayMic>
<btnUpdate type='str'>Check for updates</btnUpdate>
- <FVersion type='str'>Version can't be read</FVersion>
+ <btnSoundRecordMic type='str'>Record</btnSoundRecordMic>
<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>
+ <Sound1 type='str'>Make sure that the sound volume control dial on
+the back of Tux Droid is at the maximum.</Sound1>
<lblIDNum type='str'>Tux's ID : </lblIDNum>
- <SVN type='str'>SVN</SVN>
+ <Sound type='str'>Have you heard the sound ?</Sound>
<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>
@@ -39,14 +39,14 @@
<btnID type='str'>Change ID</btnID>
<official type='str'>Official version</official>
<Disconnect type='str'>Please disconnect the power plug and
-press the 'Yes' button.</Disconnect>
+click the 'Yes' button.</Disconnect>
<btnSoundAdd type='str'>Add</btnSoundAdd>
<gui_conf_accept_bt type='str'>Accept</gui_conf_accept_bt>
<lblCurrentIDNum type='str'>The current ID is : </lblCurrentIDNum>
<Connect type='str'>Please connect the power plug and
-press the 'Yes' button</Connect>
+click the 'Yes' button</Connect>
<lblSoundExternal type='str'>Play external wave file</lblSoundExternal>
- <gui_conf_version_lb type='str'>Version</gui_conf_version_lb>
+ <lblSoundStore type='str'>Store wave files locally</lblSoundStore>
<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,19 +60,19 @@
<Start type='str'>Start</Start>
<treeFile type='str'>Fichier</treeFile>
<lblSoundLocal type='str'>Play local wave files</lblSoundLocal>
- <lblSoundStore type='str'>Store wave files locally</lblSoundStore>
+ <gui_conf_version_lb type='str'>Version</gui_conf_version_lb>
<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>
- <btnSoundRecordMic type='str'>Record</btnSoundRecordMic>
+ <FVersion type='str'>Version can't be read</FVersion>
<btnSleepWakeup type='str'>Wakeup</btnSleepWakeup>
<btnCancelT type='str'>No</btnCancelT>
<itemChangeLog type='str'>Show ChangeLog</itemChangeLog>
<lblSoundLocalSelect type='str'>Select sound</lblSoundLocalSelect>
<lblCurrentIDNumError type='str'>Unable to read the current ID.</lblCurrentIDNumError>
- <Switch type='str'>After pressing the 'Yes' button, press on
-the wings and on the head.
-You've 15 seconds to perform this task.</Switch>
+ <Switch type='str'>After clicking the 'Yes' button, push on
+the wings and on the head button.
+You have 15 seconds to do this test.</Switch>
<gui_conf_author_lb type='str'>Author</gui_conf_author_lb>
<lblTabSound type='str'>Audio</lblTabSound>
<btnSoundStore type='str'>Store</btnSoundStore>
@@ -80,38 +80,44 @@
<lblIDName type='str'>Tux's name : </lblIDName>
<lblCurrentIDName type='str'>The current name is : </lblCurrentIDName>
<Close type='str'>Close</Close>
+ <StartSpin type='str'>The next step is to test the spin motors.
+To perfom correctly this task, please clear
+the surface around Tux.
+</StartSpin>
<Out type='str'>Would you like to test the sound output interface?
-To do this, you need to connect loudspeakers in the
-green connector, and press the 'Yes' button.</Out>
- <Sound type='str'>Have you heard the sound ?</Sound>
+To do this, you need to plug speakers or headphones
+into the green connector, and click the 'Yes' button.</Out>
+ <SVN type='str'>SVN</SVN>
<btnOKT type='str'>Yes</btnOKT>
- <Mic type='str'>After closing this window, say anything to Tux.</Mic>
+ <Mic type='str'>After clicking the 'Yes' button, say something
+to Tux Droid.</Mic>
<btnStopT type='str'>Stop</btnStopT>
<soundErase type='str'>Erasing flash ...</soundErase>
- <Eyes type='str'>Are the eyes correctly closed ?</Eyes>
+ <Eyes type='str'>Are the eyes closed correctly?</Eyes>
<lblSoundExternalPlay type='str'>Play</lblSoundExternalPlay>
<lblNoChannel type='str'>No wifi connection found</lblNoChannel>
<gui_conf_delay_lb type='str'>Delay (sec)</gui_conf_delay_lb>
<lblConfigSleep type='str'>Sleep configuration</lblConfigSleep>
<lblSleepStateSleep type='str'>Tux is currently sleeping</lblSleepStateSleep>
- <IR type='str'>After pressing the 'Yes' button, press the
-keys '1', '2' and '3' of the remote control.
+ <IR type='str'>After clicking the 'Yes' button, push the
+keys '1', '2' and '3' on the remote control.
-You've 15 seconds to perform this task.</IR>
+You have 15 seconds to do this test.</IR>
<btnSelfTest type='str'>Start self test</btnSelfTest>
<lblSleepStateWork type='str'>Tux isn't in sleep mode</lblSleepStateWork>
<treeVersionProg type='str'>Component</treeVersionProg>
<gui_conf_current_bind_lb type='str'>Current</gui_conf_current_bind_lb>
<speaker_name type='str'>Ryan8k</speaker_name>
<btnSoundModify type='str'>Modify</btnSoundModify>
- <Iwlist type='str'>iwlist package isn't found.
-Be sure that wireless tools package is instelled on your computer.
+ <Iwlist type='str'>iwlist package is not found.
+Make sure the wireless tools package is installed on your computer.
(http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html#latest)</Iwlist>
<unreleased type='str'>Unreleased version</unreleased>
<In type='str'>Would you like to test the sound input interface?
-To do this, you need to connect an input device
-in the blue connector and then click 'Yes'.</In>
+To do this, you need to plug an input device
+into the blue connector on the back of Tux Droid
+and then click 'Yes'.</In>
<IDErrorOverflow type='str'>The ID must be included between 1 and 65534.</IDErrorOverflow>
</strings>
Modified: software/gadgets/settings/trunk/settings.tgf
===================================================================
(Binary files differ)
|
