Major icon cleanup

1 files changed, 1 insertions, 90 deletions

diff --git a/Welcome.py b/Welcome.py
index bd0f8f8..8a0eef8 100644
--- a/Welcome.py
+++ b/Welcome.py
@@ -53,25 +53,10 @@ class Welcome(SubActivity):
 
             
         title = gtk.Image()
-        title.set_from_file(Config.IMAGE_ROOT + 'TamTam.png')
-
-        buttonBox = gtk.HBox()
-
-        loadButton = ImageButton(Config.IMAGE_ROOT + 'load.png')
-        loadButton.connect("clicked", self.handleLoad, None)
-        buttonBox.pack_start(loadButton, False, False, 275)
-        self.tooltips.set_tip(loadButton,'Load TamTamEdit song')
-
-        self.playMode = "TAM"
-        self.playStopButton = ImageToggleButton(Config.IMAGE_ROOT + 'miniplay.png', Config.IMAGE_ROOT + 'stop.png')
-        self.tooltips.set_tip(self.playStopButton,"Play loaded song")
-        self.playStopButton.connect('button-press-event' , self.handlePlayButton)
-        buttonBox.pack_start(self.playStopButton, False, False, 275)
- 
+        title.set_from_file(Config.IMAGE_ROOT + 'TamTam.png') 
         
         actVBox.pack_start(actHBox,False,False, 200)
         actVBox.pack_start(title,False,False)
-        #actVBox.pack_start(buttonBox, False, False, 100)
         self.add(actVBox)
 
         self.helpWindow = gtk.Window(gtk.WINDOW_POPUP)
@@ -84,77 +69,6 @@ class Welcome(SubActivity):
 
         self.show_all()
 
-    def handleLoad(self, widget, data=None):
-        chooser = gtk.FileChooserDialog(
-                title='Load Tune',
-                action=gtk.FILE_CHOOSER_ACTION_OPEN,
-                buttons=(gtk.STOCK_CANCEL,gtk.RESPONSE_CANCEL,gtk.STOCK_OPEN,gtk.RESPONSE_OK))
-
-        filter = gtk.FileFilter()
-        filter.add_pattern('*.tam')
-        filter.add_pattern('*.ogg')
-        chooser.set_filter(filter)
-        chooser.set_current_folder(Config.TUNE_DIR)
-
-        for f in chooser.list_shortcut_folder_uris():
-            chooser.remove_shortcut_folder_uri(f)
-
-        if chooser.run() == gtk.RESPONSE_OK:
-            if self.playStopButton.get_active():
-                self.playStopButton.set_active( False )
-
-            filename = chooser.get_filename()
-            if filename[-4:] == ".ogg":
-                self.playMode = "OGG"
-                self.playFile = filename
-            else: 
-                self.playMode = "TAM"
-                self.noteDB.deletePages( self.noteDB.pages.keys() )
-                ifile = open(chooser.get_filename(), 'r')
-                tuneStream = ControlStream.TamTamTable ( self.noteDB )
-                tuneStream.parseFile(ifile)
-
-                self.noteDB.deletePages( self.noteDB.tune[0:1])
-                numticks = 0
-                page_onset = {}
-                notes = []
-                for pid in self.noteDB.getTune():
-                    page_onset[pid] = numticks
-                    numticks += self.noteDB.getPage(pid).ticks
-                    notes += self.noteDB.getNotesByPage( pid )
- 
-                self.csnd.connect(True)
-                self.csnd.loopClear()
-                for n in notes:
-                    self.csnd.loopPlay(n, 1)
-                    self.csnd.loopUpdate(n, NoteDB.PARAMETER.ONSET, n.cs.onset + page_onset[n.page] , 1)
-                self.csnd.loopSetNumTicks( numticks )
-                self.csnd.loopSetTick( 0 )
-                self.csnd.setMasterVolume(float(tuneStream.masterVolume))
-                self.csnd.loopSetTempo(float(tuneStream.tempo))
-                for i in range(len(tuneStream.tracks_volume)):
-                    self.csnd.setTrackVolume(float(tuneStream.tracks_volume[i]), i)
-                self.csnd.loopPause()
-                ifile.close()
-        chooser.destroy() 
-
-    def handlePlayButton(self, widget, data):
-        if self.playMode == "OGG":
-            if widget.get_active() == True:
-                os.kill( self.playPID, signal.SIGKILL )
-                if self.csnd:
-                    self.csnd.connect(True)
-            else:
-                if self.csnd:
-                    self.csnd.connect(False)
-                self.playPID = os.spawnl( os.P_NOWAIT, "/usr/bin/gst-launch-0.10", "gst-launch-0.10", "filesrc", "location="+self.playFile, "!", "oggdemux", "!", "vorbisdec", "!", "audioconvert", "!", "osssink" )
-        else:
-            if widget.get_active() == True:
-                self.csnd.loopPause()
-            else:
-                self.csnd.loopSetTick( 0 )
-                self.csnd.loopStart()
-
     def handleHelp(self, widget):
         if widget.get_active():
             helpImg = gtk.Image()
@@ -194,7 +108,4 @@ class Welcome(SubActivity):
         self.helpButton.show()
 
     def onDeactivate(self):
-        if self.playStopButton.get_active():
-            self.playStopButton.set_active(False)
-
         self.helpButton.hide()