[tuxdroid-svn] r662 - in software/gadgets/settings/trunk: . settings settings/Scripts/Python/GUI/wi
Status: Beta
Brought to you by:
ks156
Menu
▾
▴
[tuxdroid-svn] r662 - in software/gadgets/settings/trunk: . settings settings/Scripts/Python/GUI/widget settings/Strings
|
From: Paul_R <c2m...@c2...> - 2007-11-07 15:35:24
|
Author: Paul_R
Date: 2007-11-07 16:35:18 +0100 (Wed, 07 Nov 2007)
New Revision: 662
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/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:
* Finish the version tab :
The links with the irmware updater gadget must be created.
* Fixed a bug in the Sound tab - clear list button
* Added the Wifi config
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-06 20:28:52 UTC (rev 661)
+++ software/gadgets/settings/trunk/settings/Scripts/Python/GUI/widget/other.glade 2007-11-07 15:35:18 UTC (rev 662)
@@ -45,7 +45,325 @@
<property name="spacing">0</property>
<child>
- <placeholder/>
+ <widget class="GtkVBox" id="vbox5">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkFrame" id="frame14">
+ <property name="border_width">2</property>
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">0.5</property>
+ <property name="shadow_type">GTK_SHADOW_OUT</property>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment14">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">1</property>
+ <property name="yscale">1</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">12</property>
+ <property name="right_padding">0</property>
+
+ <child>
+ <widget class="GtkFixed" id="fixed13">
+ <property name="height_request">1</property>
+ <property name="visible">True</property>
+
+ <child>
+ <widget class="GtkComboBox" id="cbbWifiChannel">
+ <property name="width_request">120</property>
+ <property name="height_request">24</property>
+ <property name="visible">True</property>
+ <property name="items" translatable="yes"></property>
+ <property name="add_tearoffs">False</property>
+ <property name="focus_on_click">True</property>
+ <signal name="changed" handler="on_cbbWifiChannel_changed" last_modification_time="Wed, 07 Nov 2007 14:23:17 GMT"/>
+ </widget>
+ <packing>
+ <property name="x">240</property>
+ <property name="y">11</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkEntry" id="txtWifiUsed">
+ <property name="width_request">72</property>
+ <property name="height_request">24</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char">●</property>
+ <property name="activates_default">False</property>
+ </widget>
+ <packing>
+ <property name="x">240</property>
+ <property name="y">40</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkEntry" id="txtWifiAvoid">
+ <property name="width_request">72</property>
+ <property name="height_request">24</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char">●</property>
+ <property name="activates_default">False</property>
+ </widget>
+ <packing>
+ <property name="x">240</property>
+ <property name="y">68</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="lblWifiAvoidance">
+ <property name="width_request">224</property>
+ <property name="height_request">16</property>
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">label4</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_RIGHT</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">0</property>
+ <property name="y">16</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="lblUsedChannel">
+ <property name="width_request">224</property>
+ <property name="height_request">16</property>
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">label5</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_RIGHT</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">0</property>
+ <property name="y">45</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="lblAvoidChannel">
+ <property name="width_request">224</property>
+ <property name="height_request">16</property>
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">label6</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_RIGHT</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">0</property>
+ <property name="y">72</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="lblConfigWifi">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>frame14</b></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</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="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkFrame" id="frame15">
+ <property name="border_width">2</property>
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">0.5</property>
+ <property name="shadow_type">GTK_SHADOW_OUT</property>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment15">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">1</property>
+ <property name="yscale">1</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">12</property>
+ <property name="right_padding">0</property>
+
+ <child>
+ <widget class="GtkFixed" id="fixed14">
+ <property name="visible">True</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="lblConfigSleep">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>frame15</b></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</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="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkFrame" id="frame16">
+ <property name="border_width">2</property>
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">0.5</property>
+ <property name="shadow_type">GTK_SHADOW_OUT</property>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment16">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">1</property>
+ <property name="yscale">1</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">12</property>
+ <property name="right_padding">0</property>
+
+ <child>
+ <widget class="GtkFixed" id="fixed15">
+ <property name="visible">True</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="lblConfigID">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>frame16</b></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</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="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
</child>
</widget>
<packing>
@@ -227,6 +545,36 @@
<property name="fill">True</property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkFixed" id="fixed12">
+ <property name="height_request">43</property>
+ <property name="visible">True</property>
+
+ <child>
+ <widget class="GtkButton" id="btnUpdate">
+ <property name="width_request">192</property>
+ <property name="height_request">24</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">button1</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <signal name="clicked" handler="on_btnUpdate_clicked" last_modification_time="Wed, 07 Nov 2007 13:54:56 GMT"/>
+ </widget>
+ <packing>
+ <property name="x">16</property>
+ <property name="y">8</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
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-06 20:28:52 UTC (rev 661)
+++ software/gadgets/settings/trunk/settings/Scripts/Python/GUI/widget/other.pyp 2007-11-07 15:35:18 UTC (rev 662)
@@ -4,6 +4,7 @@
from xml.dom import minidom, Node
from xml.dom.minidom import Document
import subprocess
+import commands
class Window(SimpleGladeApp):
def __init__(self,
@@ -12,26 +13,53 @@
domain="params", **kwargs):
SimpleGladeApp.__init__(self, path, root, domain, **kwargs)
self.prev = False
+ self.flag = True
def new(self):
self.get_widget("window1").set_title(_me.string('name_to_read'))
thread.start_new_thread(self.update, ())
def update(self):
+ self.avoidedchannel = _me.get_param('AvoidChannel')
self.get_widget('lblTabConfig').set_text(_me.string('lblTabConfig'))
self.get_widget('lblTabSound').set_text(_me.string('lblTabSound'))
self.get_widget('lblTabVersion').set_text(_me.string('lblTabVersion'))
+ self.searchWifiChannel()
self.ConfigLabelUpdate()
+ self.avoidchannel()
+
self.VersionsLabelUpdate()
self.SoundLabelUpdate()
def ConfigLabelUpdate(self):
+ self.get_widget('lblConfigWifi').set_text(_me.string('lblConfigWifi'))
+ self.get_widget('lblConfigSleep').set_text(_me.string('lblConfigSleep'))
+ self.get_widget('lblConfigID').set_text(_me.string('lblConfigID'))
+
+ self.get_widget('lblWifiAvoidance').set_text(_me.string('lblWifiAvoidance'))
+ self.get_widget('lblUsedChannel').set_text(_me.string('lblUsedChannel'))
+ self.get_widget('lblAvoidChannel').set_text(_me.string('lblAvoidChannel'))
+
+ self.get_widget('txtWifiUsed').set_text(self.channel)
+ self.get_widget('txtWifiUsed').set_editable(False)
+ self.get_widget('txtWifiAvoid').set_text(str(self.avoidedchannel))
+ self.get_widget('txtWifiAvoid').set_editable(False)
+
+ self.get_widget('cbbWifiChannel').insert_text(0, 'auto')
+ for i in range(13):
+ channel = str(i+1)
+ self.get_widget('cbbWifiChannel').append_text(channel)
+
+
+
+
+
+ def VersionsLabelUpdate(self):
+ self.get_widget('btnUpdate').set_label(_me.string('btnUpdate'))
self.get_widget('lblVersions').set_text(_me.string('lblVersions'))
self.get_widget('lblLocal').set_text(_me.string('lblLocal'))
-
- def VersionsLabelUpdate(self):
self.VersionTreeviewUpdate()
self.FileTreeviewUpdate()
@@ -67,6 +95,7 @@
self.file_view.append_column( self.file_column )
self.file_view.append_column( self.file_ver_column )
self.file_view.connect("button_press_event", self.on_tree_button_pressed)
+ self.file_view.get_selection().connect("changed",self.on_local_version_selected)
self.get_widget("scrolledwindow3").add(self.file_view)
self.get_widget("scrolledwindow3").show_all()
self.searchFiles()
@@ -116,7 +145,41 @@
self.get_widget("scrolledwindow1").add(self.gadget_viewer)
self.get_widget("scrolledwindow1").show_all()
+#---------------------------------------------------------------------------
+#
+# CONFIG TAB
+#
+#---------------------------------------------------------------------------
+ def on_cbbWifiChannel_changed(self, widget, *args):
+ #Reject the first signal
+ if self.flag == True:
+ self.flag = False
+ return
+ self.avoidedchannel = self.get_widget('cbbWifiChannel').get_active()
+ _me.set_param('AvoidChannel', self.avoidedchannel)
+ self.avoidchannel()
+
+
+ def avoidchannel(self):
+ self.get_widget('cbbWifiChannel').set_active(self.avoidedchannel)
+ if self.avoidedchannel == 0:
+ self.get_widget('txtWifiAvoid').set_text(str(self.channel))
+ tux.connect.avoid_wifi(int(self.channel))
+ else:
+ tux.connect.avoid_wifi(self.avoidedchannel)
+ self.get_widget('txtWifiAvoid').set_text(str(self.avoidedchannel))
+
+
+ def searchWifiChannel(self):
+ a = commands.getoutput('iwlist channel')
+ channel_idx = a.rfind('Channel ')+8
+ channel = a[channel_idx:channel_idx+2]
+ if channel.find(')') != -1:
+ channel = channel[0:1]
+ self.channel = channel
+
+
#---------------------------------------------------------------------------
#
# VERSION TAB
@@ -140,31 +203,46 @@
def refresh_files(self):
self.file_tree_store.clear()
+ versions = []
for i in range(len(self.filepath)):
proc = subprocess.Popen("tar -C '/tmp' -xvf '/opt/tuxdroid/firmware/%s'"%self.filepath[i][0], shell = True, stdout = subprocess.PIPE)
proc.wait()
- version = self.get_new_version_infos()
+ version, tux_core, tux_audio, tux_rf, fux_rf, fux_usb, change = self.get_new_version_infos()
self.filepath[i][1] = str(version)
- print self.filepath
+ versions.append([tux_core, tux_audio, tux_rf, fux_rf, fux_usb])
os.system('rm -rf /tmp/tuxdroid-firmware*')
for i in range(len(self.filepath)):
tmp = 0
tmp = self.file_tree_store.append(None, (self.filepath[i][0], self.filepath[i][1]))
- self.file_tree_store.append(tmp, (self.filepath[i][0],self.filepath[i][1]))
+ self.file_tree_store.append(tmp, ('Tux core',versions[i][0]))
+ self.file_tree_store.append(tmp, ('Tux audio',versions[i][1]))
+ self.file_tree_store.append(tmp, ('Tux RF',versions[i][2]))
+ self.file_tree_store.append(tmp, ('Fux RF',versions[i][3]))
+ self.file_tree_store.append(tmp, ('Fux USB',versions[i][4]))
def get_new_version_infos(self):
filelist = os.listdir('/tmp')
tmppath = ''
for file in filelist:
if file.lower().find('tuxdroid-firmware') != -1:
- print 'tick'
tmppath = file
dom = minidom.parse('/tmp/%s/info.xml' % tmppath)
racine = dom.getElementsByTagName('root')
version = racine[0].getElementsByTagName('version')
+ tux_core = version[0].getElementsByTagName('tux_core')[0].childNodes[0].nodeValue
+ tux_core = str(tux_core).replace('\n','').replace('\t', '')
+ tux_audio = version[0].getElementsByTagName('tux_audio')[0].childNodes[0].nodeValue
+ tux_audio = str(tux_audio).replace('\n','').replace('\t', '')
+ fux_rf = version[0].getElementsByTagName('fux_rf')[0].childNodes[0].nodeValue
+ fux_rf = str(fux_rf).replace('\n','').replace('\t', '')
+ tux_rf = version[0].getElementsByTagName('tux_rf')[0].childNodes[0].nodeValue
+ tux_rf = str(tux_rf).replace('\n','').replace('\t', '')
+ fux_usb = version[0].getElementsByTagName('fux_usb')[0].childNodes[0].nodeValue
+ fux_usb = str(fux_usb).replace('\n','').replace('\t', '')
+ change = racine[0].getElementsByTagName('release_notes')[0].childNodes[0].nodeValue
ver = version[0].attributes['tuxdroid_firmware_version'].nodeValue
- return ver
+ return ver, tux_core, tux_audio, tux_rf, fux_rf, fux_usb, change
#--------------------------------------------------------------------------
@@ -244,13 +322,31 @@
def showChangeLog(self, widget):
- print 'show ChangeLog'
+ proc = subprocess.Popen("tar -C '/tmp' -xvf '/opt/tuxdroid/firmware/%s'"%self.selectedfile, shell = True, stdout = subprocess.PIPE)
+ proc.wait()
+ version, tux_core, tux_audio, tux_rf, fux_rf, fux_usb, change = self.get_new_version_infos()
+
+ title = _me.string('itemChangeLog')
+ message = change
+ dialog = GdgDialog(title, message)
+ os.system('rm -rf /tmp/tuxdroid-firmware*')
def flashCPU(self, widget):
- print 'flash CPU'
+ path = '/opt/tuxdroid/firmware/%s'%self.selectedfile
+ 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.')
+
+ def on_local_version_selected(self, obj):
+ path = obj.get_selected_rows()
+ self.selectedfile = self.filepath[path[1][0][0]][0]
-
+ def on_btnUpdate_clicked(self, widget, *args):
+ print ' clicked'
#---------------------------------------------------------------------------
#
# SOUND TAB
@@ -371,7 +467,7 @@
def on_wave_internal_clist_bt_clicked(self, widget, *args):
wavs.wav_sizes=[]
wavs.wav_paths=[]
- self.get_widget("checkbutton4").set_active(False)
+ self.get_widget("chkSoundOriginal").set_active(False)
self.refresh_wav_list()
#--------------------------------------------------------------------------
@@ -506,3 +602,6 @@
tux.cmd.mouth_open()
tux.sys.shell("arecord -D %s -d 10 -t wav rec.wav"%soundcard)
tux.cmd.mouth_close()
+
+
+
Modified: software/gadgets/settings/trunk/settings/Strings/fr_ALL.xml
===================================================================
--- software/gadgets/settings/trunk/settings/Strings/fr_ALL.xml 2007-11-06 20:28:52 UTC (rev 661)
+++ software/gadgets/settings/trunk/settings/Strings/fr_ALL.xml 2007-11-07 15:35:18 UTC (rev 662)
@@ -1,5 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<strings>
+ <lblAvoidChannel type='str'>Cannal rejeté :</lblAvoidChannel>
<lblLocal type='str'>Versions disponibles</lblLocal>
<gui_conf_remote_title type='str'>Télécommande</gui_conf_remote_title>
<btnSoundRemove type='str'>Enlever</btnSoundRemove>
@@ -9,6 +10,7 @@
<gui_conf_accept_bt type='str'>Valider</gui_conf_accept_bt>
<help_text type='str'>
</help_text>
+ <lblWifiAvoidance type='str'>Eviter le cannal wifi n° :</lblWifiAvoidance>
<itemCPU type='str'>Flasher les processeurs</itemCPU>
<btnSoundPlayMic type='str'>Lire</btnSoundPlayMic>
<lblSoundLocal type='str'>Lire un wave local</lblSoundLocal>
@@ -16,6 +18,7 @@
<gui_conf_update_title type='str'>Mise à jour</gui_conf_update_title>
<lblTabConfig type='str'>Configuration</lblTabConfig>
<gui_conf_cancel_bt type='str'>Annuler</gui_conf_cancel_bt>
+ <btnUpdate type='str'>Verifier les mises à jour</btnUpdate>
<gui_conf_delay_lb type='str'>Délai (sec)</gui_conf_delay_lb>
<btnSoundRecordMic type='str'>Enregistrer</btnSoundRecordMic>
<gui_conf_about_title type='str'>A propos</gui_conf_about_title>
@@ -25,9 +28,11 @@
<itemChangeLog type='str'>Voir les changements</itemChangeLog>
<lblSoundLocalSelect type='str'>Selectionner un son :</lblSoundLocalSelect>
<lblSoundExternal type='str'>Lire un wave externe</lblSoundExternal>
+ <lblConfigSleep type='str'>Configuration de la veille</lblConfigSleep>
<gui_conf_description_lb type='str'>Description</gui_conf_description_lb>
<gui_conf_author_lb type='str'>Auteur</gui_conf_author_lb>
<treeVersionVer type='str'>Version</treeVersionVer>
+ <lblConfigWifi type='str'>Configuration wifi</lblConfigWifi>
<treeVersionProg type='str'>Component</treeVersionProg>
<lblSoundExternalPlay type='str'>Lecture</lblSoundExternalPlay>
<gui_conf_current_bind_lb type='str'>Assignation</gui_conf_current_bind_lb>
@@ -35,10 +40,12 @@
<gui_conf_remote_set_bt type='str'>Set</gui_conf_remote_set_bt>
<name_to_read type='str'>Parametres de Tux</name_to_read>
<gui_conf_window_title type='str'>Paramètres</gui_conf_window_title>
+ <lblUsedChannel type='str'>Cannal utilisé :</lblUsedChannel>
<lblTabSound type='str'>Audio</lblTabSound>
<btnSoundStore type='str'>Ecrire</btnSoundStore>
<lblVersions type='str'>Versions installées</lblVersions>
<btnSoundModify type='str'>Modifier</btnSoundModify>
+ <lblConfigID type='str'>Configuration de l'ID</lblConfigID>
<lblTabVersion type='str'>Versions</lblTabVersion>
<btnSoundPlayNum type='str'>Lire</btnSoundPlayNum>
<lblSoundStore type='str'>Enregistrer des fichiers wave</lblSoundStore>
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-11-06 20:28:52 UTC (rev 661)
+++ software/gadgets/settings/trunk/settings/settings.xml 2007-11-07 15:35:18 UTC (rev 662)
@@ -1,6 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<settings>
<parameters>
+ <AvoidChannel type='int'>0</AvoidChannel>
<hidden_in_manager type='bool'>False</hidden_in_manager>
</parameters>
<general>
Modified: software/gadgets/settings/trunk/settings/strings.xml
===================================================================
--- software/gadgets/settings/trunk/settings/strings.xml 2007-11-06 20:28:52 UTC (rev 661)
+++ software/gadgets/settings/trunk/settings/strings.xml 2007-11-07 15:35:18 UTC (rev 662)
@@ -1,5 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<strings>
+ <lblAvoidChannel type='str'>Avoided channel :</lblAvoidChannel>
<lblLocal type='str'>Available versions</lblLocal>
<gui_conf_remote_title type='str'>Remote</gui_conf_remote_title>
<btnSoundRemove type='str'>Remove</btnSoundRemove>
@@ -9,6 +10,7 @@
<gui_conf_accept_bt type='str'>Accept</gui_conf_accept_bt>
<help_text type='str'>
</help_text>
+ <lblWifiAvoidance type='str'>Avoid the wifi channel number :</lblWifiAvoidance>
<itemCPU type='str'>Flash the CPUs</itemCPU>
<btnSoundPlayMic type='str'>Play</btnSoundPlayMic>
<lblSoundLocal type='str'>Play local wave files</lblSoundLocal>
@@ -16,29 +18,34 @@
<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>
+ <btnUpdate type='str'>Check for updates</btnUpdate>
<gui_conf_delay_lb type='str'>Delay (sec)</gui_conf_delay_lb>
<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>
- <lblSoundMic type='str'>Microphone</lblSoundMic>
+ <speaker_name type='str'>Ryan8k</speaker_name>
<itemChangeLog type='str'>Show ChangeLog</itemChangeLog>
<lblSoundLocalSelect type='str'>Select sound</lblSoundLocalSelect>
<lblSoundExternal type='str'>Play external wave file</lblSoundExternal>
+ <lblConfigSleep type='str'>Sleep configuration</lblConfigSleep>
<gui_conf_description_lb type='str'>Description</gui_conf_description_lb>
<gui_conf_author_lb type='str'>Author</gui_conf_author_lb>
<treeVersionVer type='str'>Version</treeVersionVer>
+ <lblConfigWifi type='str'>Wifi configuration</lblConfigWifi>
<treeVersionProg type='str'>Component</treeVersionProg>
<lblSoundExternalPlay type='str'>Play</lblSoundExternalPlay>
<gui_conf_current_bind_lb type='str'>Current</gui_conf_current_bind_lb>
- <speaker_name type='str'>Ryan8k</speaker_name>
+ <lblSoundMic type='str'>Microphone</lblSoundMic>
<gui_conf_remote_set_bt type='str'>Set</gui_conf_remote_set_bt>
<name_to_read type='str'>Tux settings</name_to_read>
<gui_conf_window_title type='str'>Parameters</gui_conf_window_title>
+ <lblUsedChannel type='str'>Used channel :</lblUsedChannel>
<lblTabSound type='str'>Audio</lblTabSound>
<btnSoundStore type='str'>Store</btnSoundStore>
<lblVersions type='str'>Installed versions</lblVersions>
<btnSoundModify type='str'>Modify</btnSoundModify>
+ <lblConfigID type='str'>ID configuration</lblConfigID>
<lblTabVersion type='str'>Versions</lblTabVersion>
<btnSoundPlayNum type='str'>Play</btnSoundPlayNum>
<lblSoundStore type='str'>Store wave files locally</lblSoundStore>
Modified: software/gadgets/settings/trunk/settings.tgf
===================================================================
(Binary files differ)
|
