[tuxdroid-svn] r695 - in software/gadgets/settings/trunk: . settings settings/Scripts/Python setti
Status: Beta
Brought to you by:
ks156
Menu
▾
▴
[tuxdroid-svn] r695 - in software/gadgets/settings/trunk: . settings settings/Scripts/Python settings/Scripts/Python/GUI/widget settings/Strings
|
From: Paul_R <c2m...@c2...> - 2007-11-13 13:43:44
|
Author: Paul_R
Date: 2007-11-13 14:43:41 +0100 (Tue, 13 Nov 2007)
New Revision: 695
Modified:
software/gadgets/settings/trunk/settings.tgf
software/gadgets/settings/trunk/settings/Scripts/Python/GUI/widget/other.glade
software/gadgets/settings/trunk/settings/Scripts/Python/GUI/widget/other.pyp
software/gadgets/settings/trunk/settings/Scripts/Python/init.pyp
software/gadgets/settings/trunk/settings/Scripts/Python/main.pyp
software/gadgets/settings/trunk/settings/Strings/fr_ALL.xml
software/gadgets/settings/trunk/settings/settings.xml
software/gadgets/settings/trunk/settings/strings.xml
Log:
* Added the initialize and destroy function
* Changes the way to store the sounds
Modified: software/gadgets/settings/trunk/settings/Scripts/Python/GUI/widget/other.glade
===================================================================
--- software/gadgets/settings/trunk/settings/Scripts/Python/GUI/widget/other.glade 2007-11-13 12:42:10 UTC (rev 694)
+++ software/gadgets/settings/trunk/settings/Scripts/Python/GUI/widget/other.glade 2007-11-13 13:43:41 UTC (rev 695)
@@ -1169,27 +1169,6 @@
</child>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow1">
- <property name="width_request">376</property>
- <property name="height_request">152</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="x">0</property>
- <property name="y">0</property>
- </packing>
- </child>
-
- <child>
<widget class="GtkFileChooserButton" id="soundInternalChooser">
<property name="width_request">200</property>
<property name="height_request">27</property>
@@ -1324,7 +1303,7 @@
<property name="width_request">360</property>
<property name="height_request">16</property>
<property name="visible">True</property>
- <property name="label" translatable="yes">label5</property>
+ <property name="label" translatable="yes">label3</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1344,6 +1323,27 @@
<property name="y">184</property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkScrolledWindow" id="scrolledwindow1">
+ <property name="width_request">376</property>
+ <property name="height_request">152</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="x">0</property>
+ <property name="y">0</property>
+ </packing>
+ </child>
</widget>
</child>
</widget>
Modified: software/gadgets/settings/trunk/settings/Scripts/Python/GUI/widget/other.pyp
===================================================================
--- software/gadgets/settings/trunk/settings/Scripts/Python/GUI/widget/other.pyp 2007-11-13 12:42:10 UTC (rev 694)
+++ software/gadgets/settings/trunk/settings/Scripts/Python/GUI/widget/other.pyp 2007-11-13 13:43:41 UTC (rev 695)
@@ -6,6 +6,7 @@
import subprocess
import commands
import time
+import threading
class Window(SimpleGladeApp):
def __init__(self,
@@ -15,6 +16,7 @@
SimpleGladeApp.__init__(self, path, root, domain, **kwargs)
self.prev = False
self.flag = True
+ self.__sound_mutex = threading.Lock()
def new(self):
self.widget_window = True
@@ -37,6 +39,7 @@
self.get_widget('lblTabSound').set_text(_me.string('lblTabSound'))
self.get_widget('lblTabVersion').set_text(_me.string('lblTabVersion'))
+
self.searchWifiChannel()
self.ConfigLabelUpdate()
self.avoidchannel()
@@ -72,8 +75,8 @@
txt = _me.string('lblSleepStateWork')
self.get_widget('lblSleepState').set_text(txt)
self.get_widget('btnSleep').set_label(_me.string('btnSleepSleep'))
- self.get_widget('progressbar2').hide()
+
# ID labels
self.get_widget('lblCurrentIDNum').hide()
#thread.start_new_thread(self.id_request,())
@@ -86,6 +89,7 @@
#Tests labels
+ self.get_widget('progressbar2').hide()
self.get_widget('btnSelfTest').set_label(_me.string('btnSelfTest'))
#------------------------------------------------------------
@@ -206,7 +210,7 @@
self.avoidchannel()
#------------------------------------------------------------
-# AVoid a specific channel number
+# Avoid a specific channel number
#------------------------------------------------------------
def avoidchannel(self):
self.get_widget('cbbWifiChannel').set_active(self.avoidedchannel)
@@ -512,12 +516,13 @@
#------------------------------------------------------------
def flashCPU(self, widget):
path = '/opt/tuxdroid/firmware/%s'%self.selectedfile
+ print path
try:
gadgets['firmware_updater'].set_param('setting', True)
gadgets['firmware_updater'].set_param('local_path', path)
gadgets['firmware_updater'].main()
except:
- dialog = GdgDialog('Error', 'Please install the settings gadget in the manager \nBe sure that the firmware updater gadget is correctly installed.')
+ dialog = GdgDialog('Error', 'Please install the settings gadget in the Tux Droid Manager.\nBe sure that the firmware updater gadget is correctly installed.')
def on_local_version_selected(self, obj):
path = obj.get_selected_rows()
@@ -656,48 +661,62 @@
#--------------------------------------------------------------------------
def on_wave_internal_store_bt_clicked(self, widget, *args):
thread.start_new_thread(self.sound_storing,())
+ #self.sound_storing()
#--------------------------------------------------------------------------
# Store sound function
#--------------------------------------------------------------------------
def sound_storing(self):
+ if self.__sound_mutex.locked():
+ return
+
+ self.__sound_mutex.acquire()
if tux.status.rf_state() == 0:
+ self.__sound_mutex.release()
print 'no RF connexion'
return
if len(wavs.wav_sizes)==0:
+ self.__sound_mutex.release()
print 'no wavs to store'
return
if not wavs.wavs_merging("merged.wav"):
+ self.__sound_mutex.release()
print "Sound storing : Error : file merged is too big"
return
self.get_widget('progressbar1').show()
+ self.get_widget('progressbar1').set_fraction(0)
self.get_widget('lblSoundState').show()
- self.get_widget('progressbar1').set_fraction(0)
-
- self.get_widget('lblSoundState').set_text(_me.string('SoundErase'))
+ self.get_widget('lblSoundState').set_text(_me.string('soundErase'))
self.get_widget('progressbar1').set_fraction(0.25)
+
tux.cmd.sound_storing(len(wavs.wav_sizes))
- #tux.sys.wait(10)
- while tux.status.flash_status()[1] <= 3:
- tux.sys.wait(0.1)
+
+ while tux.status.flash_status()[1] != 4:
+ tux.sys.wait(0.05)
current_pos=0x0400
- tux.sys.wait(0.1)
- self.get_widget('lblSoundState').set_text(_me.string('SoundTOC'))
+
+ self.get_widget('lblSoundState').set_text(_me.string('soundTOC'))
self.get_widget('progressbar1').set_fraction(0.5)
+
tux.cmd.sound_store_index(0x00,0x04,0x00)
for size in wavs.wav_sizes:
+ print current_pos
current_pos=current_pos+size
tux.sys.wait(0.1)
tux.cmd.sound_store_index((current_pos & 0xFF0000)>>16,
(current_pos & 0x00FF00)>>8,current_pos & 0x0000FF)
- self.get_widget('lblSoundState').set_text(_me.string('SoundProg'))
+
+ self.get_widget('lblSoundState').set_text(_me.string('soundProg'))
self.get_widget('progressbar1').set_fraction(0.75)
+
tux.sys.shell("aplay -D %s merged.wav"%soundcard)
self.get_widget('progressbar1').hide()
self.get_widget('lblSoundState').hide()
+
tux.sys.wait(0.3)
+ self.__sound_mutex.release()
@@ -776,14 +795,22 @@
# On "Play recorded wave file" button clicked
#--------------------------------------------------------------------------
def on_mic_play_bt_clicked(self, widget, *args):
- tux.sys.shell_free("aplay -D %s rec.wav"%soundcard)
+ try:
+ tux.wav.play('/tmp/record.wav')
+ #tux.sys.shell_free("aplay -D %s rec.wav"%soundcard)
+ except:
+ pass
#--------------------------------------------------------------------------
# On "Record wave file" button clicked
#--------------------------------------------------------------------------
def on_mic_record_bt_clicked(self, widget, *args):
+ tux.micro.on()
tux.cmd.mouth_open()
- tux.sys.shell("arecord -D %s -d 10 -t wav rec.wav"%soundcard)
+ #tux.sys.wait(0.1)
+ tux.micro.capture_start('/tmp/record.wav', 10)
+ tux.micro.off()
+ #tux.sys.shell("arecord -D %s -d 10 -t wav rec.wav"%soundcard)
tux.cmd.mouth_close()
Modified: software/gadgets/settings/trunk/settings/Scripts/Python/init.pyp
===================================================================
--- software/gadgets/settings/trunk/settings/Scripts/Python/init.pyp 2007-11-13 12:42:10 UTC (rev 694)
+++ software/gadgets/settings/trunk/settings/Scripts/Python/init.pyp 2007-11-13 13:43:41 UTC (rev 695)
@@ -10,18 +10,25 @@
# Initialization and finalization shared functions
# ----------------------------------------------------------------------------
def initialization():
+
"""
Function to initialize the gadget. This function is executed when all gadgets
has been loaded.
"""
- pass
+
+ def run(*args):
+ _me.gui('widget').show()
+
+
+ _me.insert_menu(_me.string('Settingsgadget'), run, 'image', False, gtk.STOCK_PROPERTIES)
+
def finalization():
"""
Function to finalize the gadget. This function is executed when the gadget is
destroyed.
"""
- pass
+ _me.remove_menu()
# ----------------------------------------------------------------------------
# Registeration of the shared functions
Modified: software/gadgets/settings/trunk/settings/Scripts/Python/main.pyp
===================================================================
--- software/gadgets/settings/trunk/settings/Scripts/Python/main.pyp 2007-11-13 12:42:10 UTC (rev 694)
+++ software/gadgets/settings/trunk/settings/Scripts/Python/main.pyp 2007-11-13 13:43:41 UTC (rev 695)
@@ -1,2 +1 @@
-# 'Voiceget' part of the gadget. This code is executed when the
-# gadget is run in the gadgets manager.
+
Modified: software/gadgets/settings/trunk/settings/Strings/fr_ALL.xml
===================================================================
--- software/gadgets/settings/trunk/settings/Strings/fr_ALL.xml 2007-11-13 12:42:10 UTC (rev 694)
+++ software/gadgets/settings/trunk/settings/Strings/fr_ALL.xml 2007-11-13 13:43:41 UTC (rev 695)
@@ -13,6 +13,7 @@
<treeFile type='str'>Fichier</treeFile>
<gui_conf_accept_bt type='str'>Valider</gui_conf_accept_bt>
<lblCurrentIDNum type='str'>L'ID actuel est : </lblCurrentIDNum>
+ <Settingsgadget type='str'>Gadget de configuration</Settingsgadget>
<help_text type='str'>
</help_text>
<soundErase type='str'>Effacement de la mémoire ...</soundErase>
Modified: software/gadgets/settings/trunk/settings/settings.xml
===================================================================
--- software/gadgets/settings/trunk/settings/settings.xml 2007-11-13 12:42:10 UTC (rev 694)
+++ software/gadgets/settings/trunk/settings/settings.xml 2007-11-13 13:43:41 UTC (rev 695)
@@ -2,7 +2,7 @@
<settings>
<parameters>
<AvoidChannel type='int'>0</AvoidChannel>
- <hidden_in_manager type='bool'>False</hidden_in_manager>
+ <hidden_in_manager type='bool'>True</hidden_in_manager>
<SleepDelay type='str'>10</SleepDelay>
<EnableSleep type='bool'>True</EnableSleep>
</parameters>
Modified: software/gadgets/settings/trunk/settings/strings.xml
===================================================================
--- software/gadgets/settings/trunk/settings/strings.xml 2007-11-13 12:42:10 UTC (rev 694)
+++ software/gadgets/settings/trunk/settings/strings.xml 2007-11-13 13:43:41 UTC (rev 695)
@@ -12,6 +12,7 @@
<treeFile type='str'>Fichier</treeFile>
<gui_conf_accept_bt type='str'>Accept</gui_conf_accept_bt>
<lblCurrentIDNum type='str'>The current ID is : </lblCurrentIDNum>
+ <Settingsgadget type='str'>Settings gadget</Settingsgadget>
<Connect type='str'>Please connect the power plug, and press the 'OK' button</Connect>
<help_text type='str'>
</help_text>
Modified: software/gadgets/settings/trunk/settings.tgf
===================================================================
(Binary files differ)
|
