[tuxdroid-svn] r697 - in software/gadgets/settings/trunk: . settings settings/Scripts/Python/GUI/wi

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Author: Paul_R
Date: 2007-11-13 17:07:09 +0100 (Tue, 13 Nov 2007)
New Revision: 697

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:
* Set the sound treeview reorderable


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 14:31:33 UTC (rev 696)
+++ software/gadgets/settings/trunk/settings/Scripts/Python/GUI/widget/other.pyp	2007-11-13 16:07:09 UTC (rev 697)
@@ -17,6 +17,8 @@
         self.prev = False
         self.flag = True
         self.__sound_mutex = threading.Lock()
+        self.__tree_mutex = threading.Lock()
+        self.my_dict = {}
 
     def new(self):
         self.widget_window = True
@@ -183,12 +185,14 @@
         self.event_column.pack_start(self.event_cell, True)
         self.event_column.add_attribute(self.event_cell, 'text', 1)
 
-        self.value_list = gtk.TreeStore(int, str)
+        self.value_list = gtk.ListStore(int, str)
         self.gadget_viewer = gtk.TreeView(self.value_list)
         self.gadget_viewer.append_column(self.index_column)
         self.gadget_viewer.append_column(self.event_column)
+        self.gadget_viewer.set_reorderable(True)
         self.gadget_viewer.set_rules_hint(True)
         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)
         self.get_widget("scrolledwindow1").show_all()  
 
@@ -560,6 +564,7 @@
     # On select original sounds
     #--------------------------------------------------------------------------
     def on_incl_orig_toggled(self, widget, *args):
+        self.refresh_flag = True
         st_wav_paths = wavs.wav_paths
         if widget.get_active():
             wavs.wav_paths=[]
@@ -577,6 +582,7 @@
                 wavs.wav_paths=[]
                 wavs.wav_sizes=[]
         self.refresh_wav_list()
+        self.refresh_flag = False
 
 
     #--------------------------------------------------------------------------
@@ -584,9 +590,33 @@
     #--------------------------------------------------------------------------
     def on_row_selected(self, obj):
         path = obj.get_selected_rows()
-        self.__iter = self.value_list.get_iter(path[1][0])
+        #self.__iter = self.value_list.get_iter(path[1][0])
         self.__path = path[1][0]
         
+    def on_row_changed(self, model, path, treeiter):
+        if self.refresh_flag == True:
+            return
+        print 'changed'
+        rejected = False
+        tmp_name = model[path[0]][1]
+        wav_order = wavs.wav_paths
+        new_wav_order = []
+        for i, test in enumerate(self.value_list):
+            if (i == path[0]) or (tmp_name != model[i][1]) or rejected == True:
+                print i
+                path = self.my_dict[model[i][1]]
+                new_wav_order.append(path)
+            else:
+                rejected = True
+        
+        wavs.wav_paths = []
+        wavs.wav_sizes = []
+        print new_wav_order
+        for i in range (len(new_wav_order)):
+            wavs.add_wav_path(new_wav_order[i])
+        self.refresh_flag = True
+        self.refresh_wav_list()
+        self.refresh_flag = False
 
 
     #--------------------------------------------------------------------------
@@ -604,8 +634,12 @@
     def on_wave_internal_add_bt_clicked(self, widget, *args):
         if str(self.get_widget("soundInternalChooser").get_filename())=="None": return
         wavs.add_wav_path(self.get_widget("soundInternalChooser").get_filename())
+        
+        self.refresh_flag = True
         self.refresh_wav_list()
+        self.refresh_flag = False
 
+
     #--------------------------------------------------------------------------
     # On "remove" button clicked
     #--------------------------------------------------------------------------
@@ -613,8 +647,11 @@
         index = self.__path[0]
         wavs.wav_sizes.pop(index)
         wavs.wav_paths.pop(index)
+        self.refresh_flag = True
         self.refresh_wav_list()
+        self.refresh_flag = False
 
+
     #--------------------------------------------------------------------------
     # On "modify" button clicked
     #--------------------------------------------------------------------------
@@ -632,21 +669,25 @@
 
         #Add path to the table
         wavs.wav_paths[index] = path
-
+        self.refresh_flag = True
         self.refresh_wav_list()
+        self.refresh_flag = False
 
     #--------------------------------------------------------------------------
     # Refreshing wave list function
     #--------------------------------------------------------------------------
     def refresh_wav_list(self):
+        print 'refresh'
         i = 0
-
+        self.my_dict = {}
         self.value_list.clear()
         for wavfile in wavs.wav_paths:
             filename=wavfile[wavfile.rfind('/')+1:]
-            self.value_list.append(None,[(i+1),str(filename)])
-            i += 1
-
+            self.my_dict[filename] = wavs.wav_paths[i]
+            self.value_list.append([(i+1),str(filename)])
+            i += 1  
+        print wavs.wav_paths
+        print wavs.wav_sizes
     #--------------------------------------------------------------------------
     # On "clear" internal wave file list button clicked
     #--------------------------------------------------------------------------
@@ -654,8 +695,11 @@
         wavs.wav_sizes=[]
         wavs.wav_paths=[]
         self.get_widget("chkSoundOriginal").set_active(False)
+        self.refresh_flag = True
         self.refresh_wav_list()
+        self.refresh_flag = False
 
+
     #--------------------------------------------------------------------------
     # On "store" button clicked
     #--------------------------------------------------------------------------
@@ -1321,11 +1365,11 @@
 
 
 
-        text = gtk.TreeStore(str)
+        text = gtk.ListStore(str)
         text_viewer = gtk.TreeView(text)
         text_viewer.append_column(index_column)
         text_viewer.set_headers_visible(False)
-        text.append(None, [self.message])
+        text.append([self.message])
         
 
         scroll.add(text_viewer)

Modified: software/gadgets/settings/trunk/settings/Strings/fr_ALL.xml
===================================================================
--- software/gadgets/settings/trunk/settings/Strings/fr_ALL.xml	2007-11-13 14:31:33 UTC (rev 696)
+++ software/gadgets/settings/trunk/settings/Strings/fr_ALL.xml	2007-11-13 16:07:09 UTC (rev 697)
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <strings>
+  <lblCurrentIDName type='str'>Le nom acteul est : </lblCurrentIDName>
   <chkSleepEnable type='str'>Permettre la mise en veille</chkSleepEnable>
   <lblLocal type='str'>Versions disponibles</lblLocal>
   <Disconnect type='str'>Déconnectez l'alimentation de tux puis fermez cette fenêtre.</Disconnect>
@@ -13,7 +14,6 @@
   <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>
@@ -43,8 +43,6 @@
   <Sound type='str'>Avez vous correctement entendu le son ?</Sound>
   <itemChangeLog type='str'>Voir les changements</itemChangeLog>
   <lblSoundLocalSelect type='str'>Selectionner un son :</lblSoundLocalSelect>
-  <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>
   <lblSoundExternal type='str'>Lire un wave externe</lblSoundExternal>
   <IR type='str'>Après avoir fermer cette fenêtre, trois touches de la télécommande.
 Vous vez 15 secondes pour realiser cette opération.</IR>
@@ -55,12 +53,12 @@
   <lblSleepStateWork type='str'>Tux n'est pas en veille pour le moment</lblSleepStateWork>
   <Switch type='str'>Après avoir fermer cette fenêtre, pressez successivement sur les ailes puis sur la tête.
 Vous vez 15 secondes pour realiser cette opération.</Switch>
-  <gui_conf_author_lb type='str'>Auteur</gui_conf_author_lb>
+  <lblSoundStore type='str'>Enregistrer des fichiers wave</lblSoundStore>
   <lblConfigTest type='str'>Auto tests</lblConfigTest>
   <treeVersionVer type='str'>Version</treeVersionVer>
   <lblConfigWifi type='str'>Configuration wifi</lblConfigWifi>
   <treeVersionProg type='str'>Composant</treeVersionProg>
-  <lblSoundStore type='str'>Enregistrer des fichiers wave</lblSoundStore>
+  <Settingsgadget type='str'>Gadget de configuration</Settingsgadget>
   <gui_conf_current_bind_lb type='str'>Assignation</gui_conf_current_bind_lb>
   <speaker_name type='str'>Bruno8k</speaker_name>
   <gui_conf_remote_set_bt type='str'>Set</gui_conf_remote_set_bt>
@@ -77,11 +75,13 @@
   <Iwlist type='str'>iwlist n'a pas été trouvée.
 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>
-  <Warning type='str'>Attention</Warning>
+  <gui_conf_author_lb type='str'>Auteur</gui_conf_author_lb>
   <gui_conf_description_lb type='str'>Description</gui_conf_description_lb>
   <Connect type='str'>Connectez l'alimentation de tux puis fermez cette fenêtre.</Connect>
-  <lblCurrentIDName type='str'>Le nom acteul est : </lblCurrentIDName>
+  <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>
   <lblConfigID type='str'>Configuration de l'ID</lblConfigID>
+  <Warning type='str'>Attention</Warning>
   <lblTabVersion type='str'>Versions</lblTabVersion>
   <btnSoundPlayNum type='str'>Lire</btnSoundPlayNum>
   <Out type='str'>Voulez-vous tester la sortie son de Tux?

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-13 14:31:33 UTC (rev 696)
+++ software/gadgets/settings/trunk/settings/settings.xml	2007-11-13 16:07:09 UTC (rev 697)
@@ -10,7 +10,9 @@
     <have_settings_part type='bool'>True</have_settings_part>
     <gui_state>
       <widget>
-        <visible type='bool'>False</visible>
+        <y type='int'>25</y>
+        <visible type='bool'>True</visible>
+        <x type='int'>0</x>
       </widget>
       <conf>
         <visible type='bool'>False</visible>

Modified: software/gadgets/settings/trunk/settings/strings.xml
===================================================================
--- software/gadgets/settings/trunk/settings/strings.xml	2007-11-13 14:31:33 UTC (rev 696)
+++ software/gadgets/settings/trunk/settings/strings.xml	2007-11-13 16:07:09 UTC (rev 697)
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <strings>
+  <lblCurrentIDName type='str'>The current name is : </lblCurrentIDName>
   <chkSleepEnable type='str'>Enable sleep mode</chkSleepEnable>
   <lblLocal type='str'>Available versions</lblLocal>
   <Disconnect type='str'>Please disconnect the power plug andpress the 'OK' button.</Disconnect>
@@ -12,7 +13,6 @@
   <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>
@@ -37,7 +37,9 @@
   <btnSoundClear type='str'>Clear list</btnSoundClear>
   <Sound1 type='str'>Be sure that the sound volume control is at the maximum.</Sound1>
   <lblSleepStateSleep type='str'>Tux is currently sleeping</lblSleepStateSleep>
+  <soundProg type='str'>Sound programming ...</soundProg>
   <lblSoundMic type='str'>Microphone</lblSoundMic>
+  <lblSoundStore type='str'>Store wave files locally</lblSoundStore>
   <lblIDNum type='str'>Tux's ID : </lblIDNum>
   <Sound type='str'>Have you heard the sound ?</Sound>
   <itemChangeLog type='str'>Show ChangeLog</itemChangeLog>
@@ -57,7 +59,7 @@
   <treeVersionVer type='str'>Version</treeVersionVer>
   <lblConfigWifi type='str'>Wifi configuration</lblConfigWifi>
   <treeVersionProg type='str'>Component</treeVersionProg>
-  <lblSoundStore type='str'>Store wave files locally</lblSoundStore>
+  <Settingsgadget type='str'>Settings gadget</Settingsgadget>
   <gui_conf_current_bind_lb type='str'>Current</gui_conf_current_bind_lb>
   <speaker_name type='str'>Ryan8k</speaker_name>
   <gui_conf_remote_set_bt type='str'>Set</gui_conf_remote_set_bt>
@@ -65,8 +67,7 @@
   <name_to_read type='str'>Tux settings</name_to_read>
   <btnID type='str'>Change ID</btnID>
   <gui_conf_window_title type='str'>Parameters</gui_conf_window_title>
-  <soundProg type='str'>Sound programming ...</soundProg>
-  <lblSleepDelay type='str'>Active the sleep mode after a inactivity period of</lblSleepDelay>
+  <lblUsedChannel type='str'>Your wifi use the channel :</lblUsedChannel>
   <lblTabSound type='str'>Audio</lblTabSound>
   <btnSoundStore type='str'>Store</btnSoundStore>
   <lblVersions type='str'>Installed versions</lblVersions>
@@ -78,12 +79,11 @@
   <Warning type='str'>Warning</Warning>
   <gui_conf_description_lb type='str'>Description</gui_conf_description_lb>
   <lblIDName type='str'>Tux's name : </lblIDName>
-  <lblCurrentIDName type='str'>The current name is : </lblCurrentIDName>
+  <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>
   <lblConfigID type='str'>ID configuration</lblConfigID>
+  <lblTabVersion type='str'>Versions</lblTabVersion>
+  <lblSleepDelay type='str'>Active the sleep mode after a inactivity period of</lblSleepDelay>
   <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>
-  <lblTabVersion type='str'>Versions</lblTabVersion>
-  <lblUsedChannel type='str'>Your wifi use the channel :</lblUsedChannel>
-  <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>
 </strings>

Modified: software/gadgets/settings/trunk/settings.tgf
===================================================================
(Binary files differ)





[tuxdroid-svn] r697 - in software/gadgets/settings/trunk: . settings settings/Scripts/Python/GUI/wi

[tuxdroid-svn] r697 - in software/gadgets/settings/trunk: . settings settings/Scripts/Python/GUI/widget settings/Strings