Reviewed-by: Gonzalo Odiard <<a href="mailto:gonzalo@laptop.org">gonzalo@laptop.org</a>> <div class="gmail_quote">On Tue, Jun 26, 2012 at 4:11 PM, Manuel Kaufmann <<a href="mailto:humitos@gmail.com" target="_blank">humitos@gmail.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> - Switched "Fullscreen" and "Show playlist" buttons in View Toolbar - Added tooltip for "Add Track" button - Changed the icon for "Add Track" button to match the style with the "Remove Track" - Use just "Remove Track" as tooltip on "Remove Track" button - Changed the name of the icon for "Remove Track" - Added a separator between the "Previous" and "Remove Track" buttons - Removed "Volume" slider Signed-off-by: Manuel Kaufmann <<a href="mailto:humitos@gmail.com">humitos@gmail.com</a>> --- ControlToolbar.py | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/ControlToolbar.py b/ControlToolbar.py index a4f9225..4bb4935 100644 --- a/ControlToolbar.py +++ b/ControlToolbar.py @@ -39,12 +39,6 @@ class ViewToolbar(gtk.Toolbar): def __init__(self): gtk.Toolbar.__init__(self) - self._fullscreen = ToolButton('view-fullscreen') - self._fullscreen.set_tooltip(_('Fullscreen')) - self._fullscreen.connect('clicked', self._fullscreen_cb) - self.insert(self._fullscreen, -1) - self._fullscreen.show() - self._show_playlist = ToggleToolButton('view-list') self._show_playlist.set_active(True) self._show_playlist.set_tooltip(_('Show Playlist')) @@ -52,6 +46,12 @@ class ViewToolbar(gtk.Toolbar): self.insert(self._show_playlist, -1) self._show_playlist.show() + self._fullscreen = ToolButton('view-fullscreen') + self._fullscreen.set_tooltip(_('Fullscreen')) + self._fullscreen.connect('clicked', self._fullscreen_cb) + self.insert(self._fullscreen, -1) + self._fullscreen.show() + def _fullscreen_cb(self, button): self.emit('go-fullscreen') @@ -68,18 +68,23 @@ class Control(gobject.GObject): self.toolbar = toolbar self.jukebox = jukebox - self.open_button = ToolButton('sound') + self.open_button = ToolButton('list-add') + self.open_button.set_tooltip(_('Add track')) self.open_button.show() self.open_button.connect('clicked', jukebox.open_button_clicked_cb) self.toolbar.insert(self.open_button, -1) - erase_playlist_entry_btn = ToolButton(icon_name='edit-delete') - erase_playlist_entry_btn.set_tooltip(_('Remove selected track' \ - ' from the playlist')) + erase_playlist_entry_btn = ToolButton(icon_name='list-remove') + erase_playlist_entry_btn.set_tooltip(_('Remove track')) erase_playlist_entry_btn.connect('clicked', jukebox._erase_playlist_entry_clicked_cb) self.toolbar.insert(erase_playlist_entry_btn, -1) + spacer = gtk.SeparatorToolItem() + spacer.props.draw = False + self.toolbar.insert(spacer, -1) + spacer.show() + self.prev_button = ToolButton('player_rew') self.prev_button.set_tooltip(_('Previous')) self.prev_button.show() @@ -126,15 +131,6 @@ class Control(gobject.GObject): self.toolbar.insert(spacer, -1) spacer.show() - self.audioscale = gtk.VolumeButton() - self.audioscale.connect('value-changed', jukebox.volume_changed_cb) - self.audioscale.set_value(1) - - self.audio_scale_item = gtk.ToolItem() - self.audio_scale_item.set_expand(False) - self.audio_scale_item.add(self.audioscale) - self.toolbar.insert(self.audio_scale_item, -1) - spacer = gtk.SeparatorToolItem() spacer.props.draw = False self.toolbar.insert(spacer, -1) -- 1.7.10.2 _______________________________________________ Sugar-devel mailing list <a href="mailto:Sugar-devel@lists.sugarlabs.org">Sugar-devel@lists.sugarlabs.org</a> <a href="http://lists.sugarlabs.org/listinfo/sugar-devel" target="_blank">http://lists.sugarlabs.org/listinfo/sugar-devel</a> </blockquote></div>