[tuxdroid-svn] r115 - in software: alarm_clock/trunk email_alert/trunk gtdi/trunk

[remi <c2m...@c2...>]

Author: remi
Date: 2007-03-01 12:27:14 +0100 (Thu, 01 Mar 2007)
New Revision: 115

Added:
   software/alarm_clock/trunk/version.py
   software/email_alert/trunk/version.py
   software/gtdi/trunk/version.py
Removed:
   software/alarm_clock/trunk/version.txt
   software/email_alert/trunk/version.txt
   software/gtdi/trunk/version.txt
Modified:
   software/alarm_clock/trunk/sample_behavior_script.py
   software/alarm_clock/trunk/tdac.py
   software/email_alert/trunk/sample_behavior_script.py
   software/email_alert/trunk/tdema.py
   software/gtdi/trunk/gtdi.py
Log:
UPD : tux python api import path has been moved to "/opt/tuxdroid/api/python"

Modified: software/alarm_clock/trunk/sample_behavior_script.py
===================================================================
--- software/alarm_clock/trunk/sample_behavior_script.py	2007-03-01 11:19:13 UTC (rev 114)
+++ software/alarm_clock/trunk/sample_behavior_script.py	2007-03-01 11:27:14 UTC (rev 115)
@@ -5,7 +5,7 @@
 # uses objects "tux" and "tss"
 # -----------------------------------------------
 import sys
-sys.path.append('/opt/kysoh/tuxdroid/pythonlibs')
+sys.path.append('/opt/tuxdroid/api/python')
 from tux import *
 # -----------------------------------------------
 # Your script

Modified: software/alarm_clock/trunk/tdac.py
===================================================================
--- software/alarm_clock/trunk/tdac.py	2007-03-01 11:19:13 UTC (rev 114)
+++ software/alarm_clock/trunk/tdac.py	2007-03-01 11:27:14 UTC (rev 115)
@@ -28,7 +28,7 @@
 # use object "tux"
 # -----------------------------------------------
 import sys
-sys.path.append('/opt/kysoh/tuxdroid/pythonlibs')
+sys.path.append('/opt/tuxdroid/api/python')
 from tux import *
 # -----------------------------------------------
 # Your script
@@ -41,11 +41,9 @@
 
 from SimpleGladeApp import SimpleGladeApp
 from SimpleGladeApp import bindtextdomain
+from version import app_version
 
 app_name = "tdac"
-f = open('version.txt', 'r')
-app_version = f.readline()[0:-1] # strip the \n at the EOL
-f.close()
 print "Alarm Clock version " + app_version
 
 glade_dir = ""

Added: software/alarm_clock/trunk/version.py


Property changes on: software/alarm_clock/trunk/version.py
___________________________________________________________________
Name: svn:eol-style
   + native

Deleted: software/alarm_clock/trunk/version.txt

Modified: software/email_alert/trunk/sample_behavior_script.py
===================================================================
--- software/email_alert/trunk/sample_behavior_script.py	2007-03-01 11:19:13 UTC (rev 114)
+++ software/email_alert/trunk/sample_behavior_script.py	2007-03-01 11:27:14 UTC (rev 115)
@@ -5,7 +5,7 @@
 # uses objects "tux" and "tss"
 # -----------------------------------------------
 import sys
-sys.path.append('/opt/kysoh/tuxdroid/pythonlibs')
+sys.path.append('/opt/tuxdroid/api/python')
 from tux import *
 # -----------------------------------------------
 # Your script

Modified: software/email_alert/trunk/tdema.py
===================================================================
--- software/email_alert/trunk/tdema.py	2007-03-01 11:19:13 UTC (rev 114)
+++ software/email_alert/trunk/tdema.py	2007-03-01 11:27:14 UTC (rev 115)
@@ -28,7 +28,7 @@
 # use object "tux"
 # -----------------------------------------------
 import sys
-sys.path.append('/opt/kysoh/tuxdroid/pythonlibs')
+sys.path.append('/opt/tuxdroid/api/python')
 from tux import *
 # -----------------------------------------------
 # Your script
@@ -45,14 +45,12 @@
 import string
 import email.Parser
 from email.Header import decode_header
+from version import app_version
 
 from SimpleGladeApp import SimpleGladeApp
 from SimpleGladeApp import bindtextdomain
 
 app_name = "tdema"
-f = open('version.txt', 'r')
-app_version = f.readline()[0:-1] # strip the \n at the EOL
-f.close()
 
 print "Email Alert version " + app_version
 

Added: software/email_alert/trunk/version.py


Property changes on: software/email_alert/trunk/version.py
___________________________________________________________________
Name: svn:eol-style
   + native

Deleted: software/email_alert/trunk/version.txt

Modified: software/gtdi/trunk/gtdi.py
===================================================================
--- software/gtdi/trunk/gtdi.py	2007-03-01 11:19:13 UTC (rev 114)
+++ software/gtdi/trunk/gtdi.py	2007-03-01 11:27:14 UTC (rev 115)
@@ -28,7 +28,7 @@
 # uses objects "tux" and "tss"
 # -----------------------------------------------
 import sys
-sys.path.append('/opt/kysoh/tuxdroid/pythonlibs')
+sys.path.append('/opt/tuxdroid/api/python')
 from tux import *
 # -----------------------------------------------
 # Your script
@@ -36,6 +36,7 @@
 import thread
 import os
 import gtk
+from version import app_version
 from SimpleGladeApp import SimpleGladeApp
 from SimpleGladeApp import bindtextdomain
 
@@ -48,9 +49,6 @@
 "K_FASTFORWARD","K_PLAYPAUSE","K_STOP","K_RECORDING","K_PREVIOUS","K_NEXT",\
 "K_MENU","K_MOUSE","K_ALT","None","None","None"]
 app_name = "GTDI"
-f = open('version.txt', 'r')
-app_version = f.readline()[0:-1] # strip the \n at the EOL
-f.close()
 
 print "Graphical TuxDroid Interface " + app_version
 
@@ -59,7 +57,6 @@
 
 bindtextdomain(app_name, locale_dir)
 
-sounds = TuxFlashUploader.TuxFlashUploader(tux)
 wav_count = 0
 
 #------------------------------------------------------------------------------
@@ -325,13 +322,12 @@
     # On add sound button clicked
     #--------------------------------------------------------------------------
     def on_sound_add_clicked(self, widget, *args):
-        global sounds
         global wav_count
         filename=self.get_widget("filechooserbutton1").get_filename()
         if str(filename)=="None": return
         ext=len(filename)-filename.find(".wav")
         if ext == 4 :
-            sounds.add_wav_path(filename)
+            wavs.add_wav_path(filename)
             wav_te=self.get_widget("textview4")
             wav_buffer=wav_te.get_buffer()
             wav_buffer.insert(wav_buffer.get_end_iter(),filename+"\n")
@@ -345,8 +341,8 @@
     def on_sound_clear_clicked(self, widget, *args):
         global wav_count
         wav_count=0
-        sounds.wav_sizes=[]
-        sounds.wav_paths=[]
+        wavs.wav_sizes=[]
+        wavs.wav_paths=[]
         wav_te=self.get_widget("textview4")
         wav_buffer=wav_te.get_buffer()
         wav_buffer.set_text("")
@@ -361,10 +357,9 @@
     # Store sound function
     #--------------------------------------------------------------------------   
     def sound_storing(self):
-        global sounds
         global wav_count
         if wav_count==0: return
-        sounds.wavs_merging("merged.wav")
+        wavs.wavs_merging("merged.wav")
         wav_te=self.get_widget("textview4")
         wav_buffer=wav_te.get_buffer()
         wav_buffer.insert(wav_buffer.get_end_iter(),"Sound storing : Erase flash\n")
@@ -379,7 +374,7 @@
             tux.sys.wait(0.1)
             tux.cmd.sound_store_index((current_pos & 0xFF0000)>>16,(current_pos & 0x00FF00)>>8,current_pos & 0x0000FF)
         wav_buffer.insert(wav_buffer.get_end_iter(),"Sound storing : Play\n")
-        tux.sys.shell("aplay -D hw:1,0 merged.wav")
+        tux.sys.shell("xmms merged.wav")
         wav_buffer.insert(wav_buffer.get_end_iter(),"Sound storing : Storage done.\n")
         tux.sys.wait(0.3)
 

Added: software/gtdi/trunk/version.py


Property changes on: software/gtdi/trunk/version.py
___________________________________________________________________
Name: svn:eol-style
   + native

Deleted: software/gtdi/trunk/version.txt