[tuxdroid-svn] r321 - software/tuxgi/trunk

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

Author: neimad
Date: 2007-05-19 13:04:04 +0200 (Sat, 19 May 2007)
New Revision: 321

Modified:
   software/tuxgi/trunk/tuxgi.py
Log:
* Removed unnecessary line continuation tokens and indented
  continued lines properly.



Modified: software/tuxgi/trunk/tuxgi.py
===================================================================
--- software/tuxgi/trunk/tuxgi.py	2007-05-13 15:31:44 UTC (rev 320)
+++ software/tuxgi/trunk/tuxgi.py	2007-05-19 11:04:04 UTC (rev 321)
@@ -73,7 +73,7 @@
 for term in terminal_shells:
     if not os.popen('type %s'%term[0]).close():
         xterm_cmd = '%s %s %s -i /opt/tuxdroid/api/python/tux.py' \
-        % (term[0], term[1], py_cmd)
+            % (term[0], term[1], py_cmd)
         break
 #==============================================================================
 # Main window class
@@ -226,31 +226,31 @@
                     soundcard = tux.hw.alsa_device
                     self.get_widget("togglebutton3").set_active(False)
                     toggled_by_event=False
-                    self.get_widget("image2").set_from_stock(gtk.STOCK_APPLY\
-                    ,gtk.ICON_SIZE_BUTTON)
+                    self.get_widget("image2").set_from_stock(gtk.STOCK_APPLY,
+                        gtk.ICON_SIZE_BUTTON)
                     self.on_mouth_stop()
                     self.on_eyes_stop()
                     tux.cmd.leds_blink(2,1)
                 else:
-                    self.get_widget("image2").set_from_stock(gtk.STOCK_CANCEL\
-                    ,gtk.ICON_SIZE_BUTTON)
+                    self.get_widget("image2").set_from_stock(gtk.STOCK_CANCEL,
+                        gtk.ICON_SIZE_BUTTON)
                     tux.status.rf_connected = False
             if tux.tts.connected!=last_tuxttsdaemon_connect:
                 last_tuxttsdaemon_connect=tux.tts.connected
                 if tux.tts.connected:
-                    self.get_widget("image3").set_from_stock(gtk.STOCK_APPLY\
-                    ,gtk.ICON_SIZE_BUTTON)
+                    self.get_widget("image3").set_from_stock(gtk.STOCK_APPLY,
+                        gtk.ICON_SIZE_BUTTON)
                 else:
-                    self.get_widget("image3").set_from_stock(gtk.STOCK_CANCEL\
-                    ,gtk.ICON_SIZE_BUTTON)
+                    self.get_widget("image3").set_from_stock(gtk.STOCK_CANCEL,
+                        gtk.ICON_SIZE_BUTTON)
             if tux.status.rf_state()!=last_rf_state:
                 last_rf_state = tux.status.rf_connected
                 if last_rf_state:
-                    self.get_widget("image4").set_from_stock(gtk.STOCK_APPLY\
-                    ,gtk.ICON_SIZE_BUTTON)
+                    self.get_widget("image4").set_from_stock(gtk.STOCK_APPLY,
+                        gtk.ICON_SIZE_BUTTON)
                 else:
-                    self.get_widget("image4").set_from_stock(gtk.STOCK_CANCEL\
-                    ,gtk.ICON_SIZE_BUTTON)
+                    self.get_widget("image4").set_from_stock(gtk.STOCK_CANCEL,
+                        gtk.ICON_SIZE_BUTTON)
             tux.sys.wait(0.5)
 # -----------------------------------------------------------------------------
 # Tab "main" events
@@ -499,8 +499,8 @@
     #--------------------------------------------------------------------------
     def on_wave_external_play_bt_clicked(self, widget, *args):
         if str(self.get_widget("filechooserbutton1").get_filename())=="None": return
-        tux.sys.shell_free("aplay -D %s %s"% (soundcard,\
-        self.get_widget("filechooserbutton1").get_filename()))
+        tux.sys.shell_free("aplay -D %s %s"% (soundcard,
+            self.get_widget("filechooserbutton1").get_filename()))
         
     #--------------------------------------------------------------------------
     # On select original sounds
@@ -588,27 +588,27 @@
         wav_te=self.get_widget("textview3")
         wav_buffer=wav_te.get_buffer()
         if not wavs.wavs_merging("merged.wav"):
-            print wav_buffer.insert(wav_buffer.get_end_iter(),\
-            "Sound storing : Error : file merged is too big\n")
+            print wav_buffer.insert(wav_buffer.get_end_iter(),
+                "Sound storing : Error : file merged is too big\n")
             return
-        wav_buffer.insert(wav_buffer.get_end_iter(),\
-        "Sound storing : Erase flash\n")
+        wav_buffer.insert(wav_buffer.get_end_iter(),
+            "Sound storing : Erase flash\n")
         tux.cmd.sound_storing(len(wavs.wav_sizes))
         tux.sys.wait(10)
         current_pos=0x0400
         tux.sys.wait(0.1)
-        wav_buffer.insert(wav_buffer.get_end_iter(),\
-        "Sound storing : Indexes\n")
+        wav_buffer.insert(wav_buffer.get_end_iter(),
+            "Sound storing : Indexes\n")
         tux.cmd.sound_store_index(0x00,0x04,0x00)
         for size in wavs.wav_sizes:
             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)
+            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 : Record\n")
         tux.sys.shell("aplay -D %s merged.wav"%soundcard)
-        wav_buffer.insert(wav_buffer.get_end_iter(),\
-        "Sound storing : Storage done.\n")
+        wav_buffer.insert(wav_buffer.get_end_iter(),
+            "Sound storing : Storage done.\n")
         tux.sys.wait(0.3)
 
     #--------------------------------------------------------------------------
@@ -736,8 +736,8 @@
                     commandp[i]=int(commands[i][2:],16)
                 else:
                     commandp[i]=int(commands[i])
-            tux.cmd.raw(int(commandp[0]),int(commandp[1]),int(commandp[2]),\
-            int(commandp[3]))
+            tux.cmd.raw(int(commandp[0]),int(commandp[1]),int(commandp[2]),
+                int(commandp[3]))
 
 
 #------------------------------------------------------------------------------