Merge branch 'master' of git+ssh://olipet@dev.laptop.org/git/projects/tamtam

1 files changed, 10 insertions, 35 deletions

diff --git a/Edit/MainWindow.py b/Edit/MainWindow.py
index 084c4fc..38b46a2 100644
--- a/Edit/MainWindow.py
+++ b/Edit/MainWindow.py
@@ -28,7 +28,7 @@ from Edit.TrackInterface import TrackInterface, TrackInterfaceParasite
 from Edit.TuneInterface import TuneInterface, TuneInterfaceParasite
 
 from Generation.Generator import generator1, variate
-Tooltips = Config.Tooltips
+Tooltips = Config.Tooltips()
 
 #-----------------------------------
 # The main TamTam window
@@ -229,8 +229,6 @@ class MainWindow( SubActivity ):
                 self.GUI["2toolBox"].pack_start( self.GUI["2toolPencilButton"] )
                 self.GUI["2toolPanel"].pack_start( self.GUI["2toolBox"], False, False )
                 self.GUI["2rightPanel"].pack_start( self.GUI["2toolPanel"], False )
-                self.tooltips.set_tip(self.GUI["2toolPointerButton"],Tooltips.TOOLS_SEL)
-                self.tooltips.set_tip(self.GUI["2toolPencilButton"],Tooltips.TOOLS_DRAW)
                 # + + context box (for context sensitive buttons, nothing to do with CAIRO)
                 contextWidth = 674
                 self.GUI["2contextBox"] = formatRoundBox( RoundFixed(), Config.BG_COLOR )
@@ -267,12 +265,6 @@ class MainWindow( SubActivity ):
                 #self.GUI["2pageBeatsButton"].connect( "clicked", lambda a1:self.pageBeats() )
                 self.GUI["2pageBox"].pack_start( self.GUI["2pageBeatsButton"] )
                 self.GUI["2contextBox"].put( self.GUI["2pageBox"], 25, 0 )
-                self.tooltips.set_tip(self.GUI["2pageGenerateButton"],Tooltips.PAGE_GEN)
-                self.tooltips.set_tip(self.GUI["2pagePropertiesButton"],Tooltips.PAGE_PROP)
-                self.tooltips.set_tip(self.GUI["2pageDeleteButton"],Tooltips.PAGE_DEL)
-                self.tooltips.set_tip(self.GUI["2pageDuplicateButton"],Tooltips.PAGE_DUP)
-                self.tooltips.set_tip(self.GUI["2pageNewButton"],Tooltips.PAGE_ADD)
-                self.tooltips.set_tip(self.GUI["2pageBeatsButton"],Tooltips.PAGE_BEAT)
                 # + + + track box
                 self.GUI["2trackBox"] = gtk.HBox()
                 self.GUI["2trackBox"].set_size_request( contextWidth-50, 73 )
@@ -290,10 +282,6 @@ class MainWindow( SubActivity ):
                 self.GUI["2trackDuplicateButton"].connect( "toggled", self.trackDuplicateWidget )
                 self.GUI["2trackBox"].pack_start( self.GUI["2trackDuplicateButton"] )
                 self.GUI["2contextBox"].put( self.GUI["2trackBox"], 25, 0 )
-                self.tooltips.set_tip(self.GUI["2trackGenerateButton"],Tooltips.TRACK_GEN)
-                self.tooltips.set_tip(self.GUI["2trackPropertiesButton"],Tooltips.TRACK_PROP)
-                self.tooltips.set_tip(self.GUI["2trackDeleteButton"],Tooltips.TRACK_DEL)
-                self.tooltips.set_tip(self.GUI["2trackDuplicateButton"],Tooltips.TRACK_DUP)
                 # + + + note box
                 self.GUI["2noteBox"] = gtk.HBox()
                 self.GUI["2noteBox"].set_size_request( contextWidth-50, 73 )
@@ -345,17 +333,6 @@ class MainWindow( SubActivity ):
                 self.GUI["2noteBox"].pack_start( self.GUI["2noteVolumeBox"] )
                 self.GUI["2contextBox"].put( self.GUI["2noteBox"], 25, 0 )
                 self.GUI["2toolPanel"].pack_start( self.GUI["2contextBox"], False )
-                self.tooltips.set_tip(self.GUI["2notePropertiesButton"],Tooltips.NOTE_PROP)
-                self.tooltips.set_tip(self.GUI["2noteDeleteButton"],Tooltips.NOTE_DEL)
-                self.tooltips.set_tip(self.GUI["2noteDuplicateButton"],Tooltips.NOTE_DUP)
-                self.tooltips.set_tip(self.GUI["2noteOnsetMinusButton"],Tooltips.NOTE_ONSET_MINUS)
-                self.tooltips.set_tip(self.GUI["2noteOnsetPlusButton"],Tooltips.NOTE_ONSET_PLUS)
-                self.tooltips.set_tip(self.GUI["2notePitchMinusButton"],Tooltips.NOTE_PITCH_MINUS)
-                self.tooltips.set_tip(self.GUI["2notePitchPlusButton"],Tooltips.NOTE_PITCH_PLUS)
-                self.tooltips.set_tip(self.GUI["2noteDurationMinusButton"],Tooltips.NOTE_DUR_MINUS)
-                self.tooltips.set_tip(self.GUI["2noteDurationPlusButton"],Tooltips.NOTE_DUR_PLUS)
-                self.tooltips.set_tip(self.GUI["2noteVolumeMinusButton"],Tooltips.NOTE_VOL_MINUS)
-                self.tooltips.set_tip(self.GUI["2noteVolumePlusButton"],Tooltips.NOTE_VOL_PLUS)
                 # + + transport box
                 self.GUI["2transportBox"] = formatRoundBox( RoundHBox(), Config.BG_COLOR )
                 self.GUI["2recordButton"] = ImageButton( Config.IMAGE_ROOT+"recordGray.png", Config.IMAGE_ROOT+"recordGray.png", Config.IMAGE_ROOT+"recordGray.png", backgroundFill = Config.BG_COLOR )
@@ -381,16 +358,10 @@ class MainWindow( SubActivity ):
                 self.GUI["2pauseBox"].show_all()
                 #self.GUI["2loopButton"] = ImageToggleButton( Config.IMAGE_ROOT+"loop.png", Config.IMAGE_ROOT+"loop.png", Config.IMAGE_ROOT+"loop.png", backgroundFill = Config.BG_COLOR )
                 #self.GUI["2loopButton"].connect( "toggled", self.handleLoopButton )
-                self.GUI["2loopButton"] = ImageButton( Config.IMAGE_ROOT+"close.png" )
-                self.GUI["2loopButton"].connect( "pressed", self.handleClose)
-                self.GUI["2transportBox"].pack_start( self.GUI["2loopButton"] )
+                self.GUI["2closeButton"] = ImageButton( Config.IMAGE_ROOT+"close.png" )
+                self.GUI["2closeButton"].connect( "pressed", self.handleClose)
+                self.GUI["2transportBox"].pack_start( self.GUI["2closeButton"] )
                 self.GUI["2toolPanel"].pack_start( self.GUI["2transportBox"] )
-                self.tooltips.set_tip(self.GUI["2recordButton"],Tooltips.TRANSPORT_REC)
-                self.tooltips.set_tip(self.GUI["2rewindButton"],Tooltips.TRANSPORT_RW)
-                self.tooltips.set_tip(self.GUI["2playButton"],Tooltips.TRANSPORT_PLAY)
-                self.tooltips.set_tip(self.GUI["2stopButton"],Tooltips.TRANSPORT_STOP)
-                self.tooltips.set_tip(self.GUI["2pauseButton"],Tooltips.TRANSPORT_PAUSE)
-                self.tooltips.set_tip(self.GUI["2loopButton"],Tooltips.TRANSPORT_CLOSE)
                 # + tune box
                 self.GUI["2tuneBox"] = formatRoundBox( RoundHBox(), Config.BG_COLOR )
                 self.GUI["2tuneHBox"] = gtk.HBox()
@@ -417,7 +388,11 @@ class MainWindow( SubActivity ):
                 self.GUI["2rightPanel"].pack_start( self.GUI["2tuneBox"] )
                 self.GUI["2main"].pack_start( self.GUI["2rightPanel"] )
             TP.ProfileEnd("init_GUI::right panel")
-
+            # set tooltips
+            for key in self.GUI:
+                if Tooltips.Edit.has_key(key):
+                    self.tooltips.set_tip(self.GUI[key],Tooltips.Edit[key])
+                                          
             self.add( self.GUI["2main"] )
 
             self.skipCleanup = "" # used when jumping between duplicate note/track
@@ -755,7 +730,7 @@ class MainWindow( SubActivity ):
     def handleTrackVolume( self, widget, track ):
     	self._data["track_volume"][track] = round( widget.get_value() )
         self.csnd.setTrackVolume(self._data["track_volume"][track], track)
-
+        
     def getTrackInstrument( self, track ):
         return self.trackInstrument[track]