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

3 files changed, 13 insertions, 14 deletions

diff --git a/Jam/Picker.py b/Jam/Picker.py
index e7f8b82..b69a73f 100644
--- a/Jam/Picker.py
+++ b/Jam/Picker.py
@@ -71,7 +71,7 @@ class Picker( gtk.HBox ):
         # tooltip
         block._palette = Palette( name )
         block._palette.props.invoker = WidgetInvoker(block)
-        block._palette.set_property( "position", Palette.AT_CURSOR )
+        block._palette.props.invoker._position_hint = WidgetInvoker.AT_CURSOR
 
         block.add_events( gtk.gdk.BUTTON_PRESS_MASK
                         | gtk.gdk.BUTTON_RELEASE_MASK
diff --git a/Jam/Popup.py b/Jam/Popup.py
index 2326e3a..6f6a7e1 100644
--- a/Jam/Popup.py
+++ b/Jam/Popup.py
@@ -30,9 +30,7 @@ class NoneInvoker( Invoker ):
 
     def __init__( self ):
         Invoker.__init__( self )
-
-    def get_default_position( self ):
-        return Palette.AT_CURSOR
+        self._position_hint = Invoker.AT_CURSOR
 
     def get_rect( self ):
         return gtk.gdk.Rectangle( 0, 0, 0, 0 )
@@ -50,7 +48,6 @@ class Popup( Palette ):
         self.block = None
 
         self.props.invoker = NoneInvoker()
-        self.set_property( "position", Palette.AT_CURSOR )
         self.set_group_id( "TamTamPopup" )
 
         self._set_state( Palette.SECONDARY ) # skip to fully exposed
diff --git a/Jam/Toolbars.py b/Jam/Toolbars.py
index 08ce06f..194ea5b 100644
--- a/Jam/Toolbars.py
+++ b/Jam/Toolbars.py
@@ -21,8 +21,7 @@ class JamToolbar( gtk.Toolbar ):
         self.toolItem = {}
 
         self.volumeImg = gtk.Image()
-        self.volumeImg.set_from_file( Config.IMAGE_ROOT + 'volume2.png' )
-        self._insert_widget( self.volumeImg, -1 )
+        self.volumeImg.set_from_file( Config.TAM_TAM_ROOT + '/icons/volume2.svg' )
 
         self.volumeAdjustment = gtk.Adjustment( 0.5, 0, 1.0, 0.1, 0.1, 0 )
         self.volumeAdjustment.connect( 'value-changed', self.handleVolume )
@@ -31,12 +30,12 @@ class JamToolbar( gtk.Toolbar ):
         self.volumeSlider.set_draw_value( False )
         self._add_tooltip( self.volumeSlider, _("Master Volume") )
         self._insert_widget( self.volumeSlider, -1 )
+        self._insert_widget( self.volumeImg, -1 )
 
         self._insert_separator( True )
 
         self.tempoImg = gtk.Image()
-        self.tempoImg.set_from_file( Config.IMAGE_ROOT + 'tempo2.png' )
-        self._insert_widget( self.tempoImg, -1 )
+        self.tempoImg.set_from_file( Config.TAM_TAM_ROOT + '/icons/tempo2.svg' )
 
         self.tempoAdjustment = gtk.Adjustment( Config.PLAYER_TEMPO, Config.PLAYER_TEMPO_LOWER, Config.PLAYER_TEMPO_UPPER+1, 10, 10, 0 )
         self.tempoAdjustment.connect( 'value-changed', self.handleTempo )
@@ -45,16 +44,19 @@ class JamToolbar( gtk.Toolbar ):
         self.tempoSlider.set_draw_value( False )
         self._add_tooltip( self.tempoSlider, _("Tempo") )
         self._insert_widget( self.tempoSlider, -1 )
+        self._insert_widget( self.tempoImg, -1 )
 
         self.show_all()
 
-    def _add_palette( self, widget, palette, position = Palette.DEFAULT ):
+    #def _add_palette( self, widget, palette, position = Palette.DEFAULT ):
+    def _add_palette( self, widget, palette ):
         widget._palette = palette
         widget._palette.props.invoker = WidgetInvoker( widget )
-        widget._palette.set_property( "position", position )
+        #widget._palette.set_property( "position", position )
     
     def _add_tooltip( self, widget, tooltip ):
-        self._add_palette( widget, Palette( tooltip ), Palette.DEFAULT )
+        #self._add_palette( widget, Palette( tooltip ), Palette.DEFAULT )
+        self._add_palette( widget, Palette( tooltip ) )
 
     def _insert_widget( self, widget, pos ):
         self.toolItem[ widget ] = gtk.ToolItem()
@@ -77,13 +79,13 @@ class JamToolbar( gtk.Toolbar ):
         self.owner._setVolume( widget.get_value() )
 
         img = self.mapRange( widget.value, widget.lower, widget.upper, 0, 3 )
-        self.volumeImg.set_from_file(Config.IMAGE_ROOT + 'volume' + str(img) + '.png')
+        self.volumeImg.set_from_file(Config.TAM_TAM_ROOT + '/icons/volume' + str(img) + '.svg')
 
     def handleTempo( self, widget ):
         self.owner._setTempo( widget.get_value() )
 
         img = self.mapRange( widget.value, widget.lower, widget.upper, 1, 8 )
-        self.tempoImg.set_from_file(Config.IMAGE_ROOT + 'tempo' + str(img) + '.png')
+        self.tempoImg.set_from_file(Config.TAM_TAM_ROOT + '/icons/tempo' + str(img) + '.svg')
 
 
 class DesktopToolbar( gtk.Toolbar ):