diff options
author | amartin <olpc@xo-05-28-21.localdomain> | 2007-09-10 05:03:46 (GMT) |
---|---|---|
committer | amartin <olpc@xo-05-28-21.localdomain> | 2007-09-10 05:03:46 (GMT) |
commit | 94bb67b45c07c8ba6fa94be17852e29958d6c75d (patch) | |
tree | e09658498ce3d6e2b2841cb57b2390363a9f149b /Jam/Toolbars.py | |
parent | 7e682ce7620f1f8a9fb9b4ffc4f4039dbfdffc56 (diff) | |
parent | f5c1a8c3c8fa92d25c45345f971e2789ffb58271 (diff) |
Merge branch 'master' of git+ssh://amartin@dev.laptop.org/git/projects/tamtam
Diffstat (limited to 'Jam/Toolbars.py')
-rw-r--r-- | Jam/Toolbars.py | 20 |
1 files changed, 11 insertions, 9 deletions
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 ): |