[tuxdroid-svn] r800 - in software/gadgets/settings/trunk: . settings settings/Scripts/Python/GUI/wi
Status: Beta
Brought to you by:
ks156
Menu
▾
▴
[tuxdroid-svn] r800 - in software/gadgets/settings/trunk: . settings settings/Scripts/Python/GUI/widget settings/Strings
|
From: Paul_R <c2m...@c2...> - 2007-12-17 13:25:42
|
Author: Paul_R
Date: 2007-12-17 14:25:30 +0100 (Mon, 17 Dec 2007)
New Revision: 800
Modified:
software/gadgets/settings/trunk/settings.tgf
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:
* Changed the name of the gadget + minor changes
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-17 09:35:17 UTC (rev 799)
+++ software/gadgets/settings/trunk/settings/Scripts/Python/GUI/widget/other.pyp 2007-12-17 13:25:30 UTC (rev 800)
@@ -8,7 +8,6 @@
import time
import threading
-
class Window(SimpleGladeApp):
def __init__(self,
path=_me.get_path('root') + '/Scripts/Python/GUI/widget/other.glade',
@@ -21,7 +20,6 @@
self.__tree_mutex = threading.Lock()
self.my_dict = {}
-
def new(self):
self.widget_window = True
self.get_widget("window1").set_title(_me.string('name_to_read'))
@@ -30,11 +28,9 @@
def on_window1_destroy(self, widget, *args):
pass
-
#------------------------------------------------------------
# This function update all labels and create the GUI
-#------------------------------------------------------------
-
+#------------------------------------------------------------
def update(self):
self.SoundLabelUpdate()
@@ -77,7 +73,6 @@
self.gadget_viewer.append_column(self.event_column)
self.gadget_viewer.set_reorderable(True)
self.gadget_viewer.set_rules_hint(True)
- #self.gadget_viewer.connect("button_press_event", self.on_tree_button_pressed)
self.gadget_viewer.get_selection().connect("changed",self.on_row_selected)
self.value_list.connect("row-changed", self.on_row_changed)
self.get_widget("scrolledwindow1").add(self.gadget_viewer)
@@ -195,7 +190,6 @@
self.refresh_wav_list()
self.refresh_flag = False
-
#--------------------------------------------------------------------------
# On "remove" button clicked
#--------------------------------------------------------------------------
@@ -207,7 +201,6 @@
self.refresh_wav_list()
self.refresh_flag = False
-
#--------------------------------------------------------------------------
# On "modify" button clicked
#--------------------------------------------------------------------------
@@ -241,6 +234,7 @@
self.my_dict[filename] = wavs.wav_paths[i]
self.value_list.append([(i+1),str(filename)])
i += 1
+
#--------------------------------------------------------------------------
# On "clear" internal wave file list button clicked
#--------------------------------------------------------------------------
@@ -252,14 +246,12 @@
self.refresh_wav_list()
self.refresh_flag = False
-
#--------------------------------------------------------------------------
# On "store" button clicked
#--------------------------------------------------------------------------
def on_wave_internal_store_bt_clicked(self, widget, *args):
thread.start_new_thread(self.sound_storing,())
-
#--------------------------------------------------------------------------
# Store sound function
#--------------------------------------------------------------------------
@@ -273,15 +265,18 @@
if tux.status.rf_state() == 0:
self.__sound_mutex.release()
- print 'no RF connexion'
+ self.get_widget('lblSoundState').show()
+ self.get_widget('lblSoundState').set_text(_me.string('norf'))
return
if len(wavs.wav_sizes)==0:
self.__sound_mutex.release()
- print 'no wavs to store'
+ self.get_widget('lblSoundState').show()
+ self.get_widget('lblSoundState').set_text(_me.string('nowavs'))
return
if not wavs.wavs_merging("merged.wav"):
self.__sound_mutex.release()
- print "Sound storing : Error : file merged is too big"
+ self.get_widget('lblSoundState').show()
+ self.get_widget('lblSoundState').set_text(_me.string('toobig'))
return
try:
@@ -296,7 +291,7 @@
pass
if audio and behavior:
-
+ ## If tuxaudio and tuxcore are up to date, use the new processus
fraction = float(len(wavs.wav_paths) + 2)
fraction = 1 / fraction
current = fraction
@@ -437,72 +432,3 @@
def on_wave_internal_play10_clicked(self, widget, *args):
thread.start_new_thread(tux.cmd.sound_play,(10,0,))
-
-
-
-class GdgText(object):
-
- def __init__(self, title, message, block = False, center_justify = False):
- self.message = message
- self.title = title
- self.__center_justify = center_justify
- thread.start_new_thread(self.__show_async, ())
-
- def __show_async(self):
- self.__show()
-
- def __show(self):
- dialogue = gtk.Dialog(self.title, None, gtk.DIALOG_MODAL, ())
- _me.set_param('dialog', dialogue)
-
- dialogue.set_property("width-request", 650)
- dialogue.set_property("height-request", 400)
- if gadgets.has_key('Manager'):
- dialogue.set_icon_from_file(gadgets['Manager'].icons['gadget.png'])
- bt_alone = dialogue.add_button("Close", gtk.RESPONSE_APPLY)
-
- def on_click_close(obj):
- dialogue.destroy()
- _me.set_param('dialog', None)
-
- bt_alone.connect("clicked", on_click_close)
-
- text_tree_store = gtk.TreeStore(str)
- text_view = gtk.TreeView(text_tree_store)
-
- text_renderer = gtk.CellRendererText()
- text_column = gtk.TreeViewColumn('',text_renderer, text=0)
- text_column.add_attribute(text_renderer, 'text', 0)
- text_view.append_column(text_column)
-
-
- scroll = gtk.ScrolledWindow()
- scroll.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_ALWAYS)
- scroll.add(text_view)
- scroll.show_all()
-
- box = gtk.HBox(spacing = 5)
- box.set_border_width(5)
- box.show()
- dialogue.vbox.pack_start(box)
-
- box.pack_start(scroll)
-
- def __async():
- time.sleep(0.2)
- text_tree_store.append(None, [self.message])
-
- gtk.gdk.threads_enter()
- thread.start_new_thread(__async, ())
- dialogue.run()
- gtk.gdk.threads_leave()
-
-
-
-
-
-
-
-
-
-
Modified: software/gadgets/settings/trunk/settings/Strings/fr_ALL.xml
===================================================================
--- software/gadgets/settings/trunk/settings/Strings/fr_ALL.xml 2007-12-17 09:35:17 UTC (rev 799)
+++ software/gadgets/settings/trunk/settings/Strings/fr_ALL.xml 2007-12-17 13:25:30 UTC (rev 800)
@@ -1,73 +1,12 @@
<?xml version='1.0' encoding='UTF-8'?>
<strings>
- <Close type='str'>Fermer</Close>
- <Connect type='str'>Connectez l'alimentation de tux puis
-appuyez sur 'oui'.</Connect>
- <Disconnect type='str'>Déconnectez l'alimentation de tux
-puis appuyez sur 'oui'.</Disconnect>
- <Eyes type='str'>Est-ce que les yeux sont correctement fermés ?</Eyes>
- <FVersion type='str'>Pas de version trouvée</FVersion>
- <Firmware type='str'>Assurer-vous que le gadget 'firmware updater' est correctement installé</Firmware>
- <IDErrorOverflow type='str'>L'ID doit être compris entre 1 et 65534</IDErrorOverflow>
- <IR type='str'>Après avoir appuyer sur le bouton 'oui', appuyez
-sur les touches '1', '2' et '3' de la télécommande.
-
-Vous avez 15 secondes pour realiser cette opération.</IR>
- <In type='str'>Voulez-vous tester l'entrée son de Tux?
-Vous devez connecter un périphérique
-d'entrée dans le connecteur bleu.</In>
- <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>
- <Mic type='str'>Après avoir fermer cette fenêtre, dîtes
-quelque chose à Tux.</Mic>
- <Out type='str'>Voulez-vous tester la sortie son de Tux?
-Vous devez connecter des haut-parleurs
-dans la prise verte.</Out>
- <SVN type='str'>SVN</SVN>
- <Selftest type='str'>Ceci est un programme de test pour votre Tux.
-
-Veuillez suivre les étapes en effectuant les
-tâches qui vous serons demandée.
-
-A la fin de ce test, vous trouverez un fichier
-de log à l'emplacement suivant :
-
-</Selftest>
- <Settingsgadget type='str'>Gadget de configuration</Settingsgadget>
- <Sound type='str'>Avez vous correctement entendu le son ?</Sound>
- <Sound1 type='str'>Assurez vous que le réglage de volume soit
-au maximum.</Sound1>
- <Start type='str'>Début</Start>
- <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>
- <Switch type='str'>Après avoir appuyé sur le bouton 'Oui',
-pressez successivement sur les ailes puis
-sur la tête.
-
-Vous vez 15 secondes pour realiser cette
-opération.</Switch>
- <Warning type='str'>Attention</Warning>
- <btnCancelT type='str'>Non</btnCancelT>
- <btnID type='str'>Changer l'ID</btnID>
- <btnOKT type='str'>Oui</btnOKT>
- <btnSelfTest type='str'>Démarrer les tests</btnSelfTest>
- <btnSleepSleep type='str'>Mettre en veille</btnSleepSleep>
- <btnSleepWakeup type='str'>Reveiller</btnSleepWakeup>
+ <Settingsgadget type='str'>Gestion de la mémoire son</Settingsgadget>
<btnSoundAdd type='str'>Ajouter</btnSoundAdd>
<btnSoundClear type='str'>Purger</btnSoundClear>
<btnSoundModify type='str'>Modifier</btnSoundModify>
- <btnSoundPlayMic type='str'>Lire</btnSoundPlayMic>
<btnSoundPlayNum type='str'>Lire</btnSoundPlayNum>
- <btnSoundRecordMic type='str'>Enregistrer</btnSoundRecordMic>
<btnSoundRemove type='str'>Enlever</btnSoundRemove>
<btnSoundStore type='str'>Ecrire</btnSoundStore>
- <btnStopT type='str'>Stop</btnStopT>
- <btnUpdate type='str'>Verifier les mises à jour</btnUpdate>
- <chkSleepEnable type='str'>Permettre la mise en veille</chkSleepEnable>
<chkSoundOriginal type='str'>Fichier originaux</chkSoundOriginal>
<gui_conf_about_title type='str'>A propos</gui_conf_about_title>
<gui_conf_accept_bt type='str'>Valider</gui_conf_accept_bt>
@@ -83,20 +22,6 @@
<gui_conf_window_title type='str'>Paramètres</gui_conf_window_title>
<help_text type='str'>
</help_text>
- <itemCPU type='str'>Flasher les processeurs</itemCPU>
- <itemChangeLog type='str'>Voir les changements</itemChangeLog>
- <itemDescription type='str'>Voir la description</itemDescription>
- <lblConfigID type='str'>Configuration de l'ID</lblConfigID>
- <lblConfigSleep type='str'>Configuration de la veille</lblConfigSleep>
- <lblConfigTest type='str'>Auto tests</lblConfigTest>
- <lblConfigWifi type='str'>Configuration wifi</lblConfigWifi>
- <lblCurrentIDName type='str'>Le nom acteul est : </lblCurrentIDName>
- <lblCurrentIDNum type='str'>L'ID actuel est : </lblCurrentIDNum>
- <lblCurrentIDNumError type='str'>Pas d'ID trouvé.</lblCurrentIDNumError>
- <lblIDName type='str'>Nom du Tux : </lblIDName>
- <lblIDNum type='str'>ID de Tux : </lblIDNum>
- <lblLocal type='str'>Versions disponibles</lblLocal>
- <lblNoChannel type='str'>Pas de connexion wifi trouvée</lblNoChannel>
<lblSleepDelay type='str'>Activer la veille après une période d'inactivité de </lblSleepDelay>
<lblSleepStateSleep type='str'>Tux est actuellement en veille</lblSleepStateSleep>
<lblSleepStateWork type='str'>Tux n'est pas en veille pour le moment</lblSleepStateWork>
@@ -113,13 +38,16 @@
<lblUsedChannel type='str'>Votre wifi utilise le cannal :</lblUsedChannel>
<lblVersions type='str'>Versions installées</lblVersions>
<lblWifiAvoidance type='str'>Eviter le canal wifi n° :</lblWifiAvoidance>
- <name_to_read type='str'>Parametres de Tux</name_to_read>
+ <name_to_read type='str'>Gestion de la mémoire flash</name_to_read>
+ <norf type='str'>Pas de connexion RF</norf>
+ <nowavs type='str'>Pas de fichier à enregistrer</nowavs>
<official type='str'>Version officielle</official>
<soundErase type='str'>Effacement de la mémoire ...</soundErase>
<soundProg type='str'>Ecriture du son n° : </soundProg>
<soundProg1 type='str'>Enregistrement du son ...</soundProg1>
<soundTOC type='str'>Ecriture des index</soundTOC>
<speaker_name type='str'>Bruno8k</speaker_name>
+ <toobig type='str'>Il y a trop de fichiers</toobig>
<treeFile type='str'>Fichier</treeFile>
<treeVersionProg type='str'>Composant</treeVersionProg>
<treeVersionVer type='str'>Version</treeVersionVer>
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-17 09:35:17 UTC (rev 799)
+++ software/gadgets/settings/trunk/settings/settings.xml 2007-12-17 13:25:30 UTC (rev 800)
@@ -14,7 +14,7 @@
</widget>
</gui_state>
<have_main_part type='bool'>False</have_main_part>
- <have_settings_part type='bool'>True</have_settings_part>
+ <have_settings_part type='bool'>False</have_settings_part>
<have_widget_part type='bool'>True</have_widget_part>
<language type='str'>en_US</language>
<main_priority type='int'>0</main_priority>
Modified: software/gadgets/settings/trunk/settings/strings.xml
===================================================================
--- software/gadgets/settings/trunk/settings/strings.xml 2007-12-17 09:35:17 UTC (rev 799)
+++ software/gadgets/settings/trunk/settings/strings.xml 2007-12-17 13:25:30 UTC (rev 800)
@@ -1,70 +1,12 @@
<?xml version='1.0' encoding='UTF-8'?>
<strings>
- <Close type='str'>Close</Close>
- <Connect type='str'>Please connect the power plug and
-click the 'Yes' button</Connect>
- <Disconnect type='str'>Please disconnect the power plug and
-click the 'Yes' button.</Disconnect>
- <Eyes type='str'>Are the eyes closed correctly?</Eyes>
- <FVersion type='str'>Version can't be read</FVersion>
- <Firmware type='str'>Make sure the firmware updater gadget is correctly installed.</Firmware>
- <IDErrorOverflow type='str'>The ID must be included between 1 and 65534.</IDErrorOverflow>
- <IR type='str'>After clicking the 'Yes' button, push the
-keys '1', '2' and '3' on the remote control.
-
-You have 15 seconds to do this test.</IR>
- <In type='str'>Would you like to test the sound input interface?
-
-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>
- <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>
- <Mic type='str'>After clicking the 'Yes' button, say something
-to Tux Droid.</Mic>
- <Out type='str'>Would you like to test the sound output interface?
-
-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>
- <Selftest type='str'>This is a self test program for Tux Droid.
-
-Please follow the instructions and do the
-requested tests.
-
-At the end, a log file can be found here :
-</Selftest>
- <Settingsgadget type='str'>Settings gadget</Settingsgadget>
- <Sound type='str'>Have you heard the sound ?</Sound>
- <Sound1 type='str'>Make sure that the sound volume control dial on
-the back of Tux Droid is at the maximum.</Sound1>
- <Start type='str'>Start</Start>
- <StartSpin type='str'>The next step is to test the spin motors.
-To perfom correctly this task, please clear
-the surface around Tux.
-</StartSpin>
- <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>
- <Warning type='str'>Warning</Warning>
- <btnCancelT type='str'>No</btnCancelT>
- <btnID type='str'>Change ID</btnID>
- <btnOKT type='str'>Yes</btnOKT>
- <btnSelfTest type='str'>Start self test</btnSelfTest>
- <btnSleepSleep type='str'>Sleep</btnSleepSleep>
- <btnSleepWakeup type='str'>Wakeup</btnSleepWakeup>
+ <Settingsgadget type='str'>Sound memory management</Settingsgadget>
<btnSoundAdd type='str'>Add</btnSoundAdd>
<btnSoundClear type='str'>Clear list</btnSoundClear>
<btnSoundModify type='str'>Modify</btnSoundModify>
- <btnSoundPlayMic type='str'>Play</btnSoundPlayMic>
<btnSoundPlayNum type='str'>Play</btnSoundPlayNum>
- <btnSoundRecordMic type='str'>Record</btnSoundRecordMic>
<btnSoundRemove type='str'>Remove</btnSoundRemove>
<btnSoundStore type='str'>Store</btnSoundStore>
- <btnStopT type='str'>Stop</btnStopT>
- <btnUpdate type='str'>Check for updates</btnUpdate>
- <chkSleepEnable type='str'>Enable sleep mode</chkSleepEnable>
<chkSoundOriginal type='str'>Include originals</chkSoundOriginal>
<gui_conf_about_title type='str'>About</gui_conf_about_title>
<gui_conf_accept_bt type='str'>Accept</gui_conf_accept_bt>
@@ -80,20 +22,6 @@
<gui_conf_window_title type='str'>Parameters</gui_conf_window_title>
<help_text type='str'>
</help_text>
- <itemCPU type='str'>Flash the CPUs</itemCPU>
- <itemChangeLog type='str'>Show ChangeLog</itemChangeLog>
- <itemDescription type='str'>Show the description</itemDescription>
- <lblConfigID type='str'>ID configuration</lblConfigID>
- <lblConfigSleep type='str'>Sleep configuration</lblConfigSleep>
- <lblConfigTest type='str'>Self tests</lblConfigTest>
- <lblConfigWifi type='str'>Wifi configuration</lblConfigWifi>
- <lblCurrentIDName type='str'>The current name is : </lblCurrentIDName>
- <lblCurrentIDNum type='str'>The current ID is : </lblCurrentIDNum>
- <lblCurrentIDNumError type='str'>Unable to read the current ID.</lblCurrentIDNumError>
- <lblIDName type='str'>Tux's name : </lblIDName>
- <lblIDNum type='str'>Tux's ID : </lblIDNum>
- <lblLocal type='str'>Available versions</lblLocal>
- <lblNoChannel type='str'>No wifi connection found</lblNoChannel>
<lblSleepDelay type='str'>Active the sleep mode after a inactivity period of</lblSleepDelay>
<lblSleepStateSleep type='str'>Tux is currently sleeping</lblSleepStateSleep>
<lblSleepStateWork type='str'>Tux isn't in sleep mode</lblSleepStateWork>
@@ -110,13 +38,16 @@
<lblUsedChannel type='str'>Your wifi use the channel :</lblUsedChannel>
<lblVersions type='str'>Installed versions</lblVersions>
<lblWifiAvoidance type='str'>Avoid the wifi channel number :</lblWifiAvoidance>
- <name_to_read type='str'>Tux settings</name_to_read>
+ <name_to_read type='str'>Flash memory management</name_to_read>
+ <norf type='str'>No RF connection detected</norf>
+ <nowavs type='str'>No wavs to store</nowavs>
<official type='str'>Official version</official>
<soundErase type='str'>Erasing flash ...</soundErase>
<soundProg type='str'>Programming sound n° : </soundProg>
<soundProg1 type='str'>Recording ...</soundProg1>
<soundTOC type='str'>Writing indexes ...</soundTOC>
<speaker_name type='str'>Ryan8k</speaker_name>
+ <toobig type='str'>Wavs files are too big ...</toobig>
<treeFile type='str'>File</treeFile>
<treeVersionProg type='str'>Component</treeVersionProg>
<treeVersionVer type='str'>Version</treeVersionVer>
Modified: software/gadgets/settings/trunk/settings.tgf
===================================================================
(Binary files differ)
|
