From eb06572d5c693daefcaa1324db0e8720d1d38eed Mon Sep 17 00:00:00 2001
From: Manuel Kaufmann <humitos@gmail.com>
Date: Tue, 26 Jun 2012 09:08:03 -0300
Subject: [PATCH Jukebox] Design review SL #3714
- 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 <humitos@gmail.com>
---
ControlToolbar.py | 34 +++++++++++++++-------------------
1 file changed, 15 insertions(+), 19 deletions(-)
diff --git a/ControlToolbar.py b/ControlToolbar.py
index a4f9225..4bb4935 100644
|
a
|
b
|
class ViewToolbar(gtk.Toolbar): |
| 39 | 39 | def __init__(self): |
| 40 | 40 | gtk.Toolbar.__init__(self) |
| 41 | 41 | |
| 42 | | self._fullscreen = ToolButton('view-fullscreen') |
| 43 | | self._fullscreen.set_tooltip(_('Fullscreen')) |
| 44 | | self._fullscreen.connect('clicked', self._fullscreen_cb) |
| 45 | | self.insert(self._fullscreen, -1) |
| 46 | | self._fullscreen.show() |
| 47 | | |
| 48 | 42 | self._show_playlist = ToggleToolButton('view-list') |
| 49 | 43 | self._show_playlist.set_active(True) |
| 50 | 44 | self._show_playlist.set_tooltip(_('Show Playlist')) |
| … |
… |
class ViewToolbar(gtk.Toolbar): |
| 52 | 46 | self.insert(self._show_playlist, -1) |
| 53 | 47 | self._show_playlist.show() |
| 54 | 48 | |
| | 49 | self._fullscreen = ToolButton('view-fullscreen') |
| | 50 | self._fullscreen.set_tooltip(_('Fullscreen')) |
| | 51 | self._fullscreen.connect('clicked', self._fullscreen_cb) |
| | 52 | self.insert(self._fullscreen, -1) |
| | 53 | self._fullscreen.show() |
| | 54 | |
| 55 | 55 | def _fullscreen_cb(self, button): |
| 56 | 56 | self.emit('go-fullscreen') |
| 57 | 57 | |
| … |
… |
class Control(gobject.GObject): |
| 68 | 68 | self.toolbar = toolbar |
| 69 | 69 | self.jukebox = jukebox |
| 70 | 70 | |
| 71 | | self.open_button = ToolButton('sound') |
| | 71 | self.open_button = ToolButton('list-add') |
| | 72 | self.open_button.set_tooltip(_('Add track')) |
| 72 | 73 | self.open_button.show() |
| 73 | 74 | self.open_button.connect('clicked', jukebox.open_button_clicked_cb) |
| 74 | 75 | self.toolbar.insert(self.open_button, -1) |
| 75 | 76 | |
| 76 | | erase_playlist_entry_btn = ToolButton(icon_name='edit-delete') |
| 77 | | erase_playlist_entry_btn.set_tooltip(_('Remove selected track' \ |
| 78 | | ' from the playlist')) |
| | 77 | erase_playlist_entry_btn = ToolButton(icon_name='list-remove') |
| | 78 | erase_playlist_entry_btn.set_tooltip(_('Remove track')) |
| 79 | 79 | erase_playlist_entry_btn.connect('clicked', |
| 80 | 80 | jukebox._erase_playlist_entry_clicked_cb) |
| 81 | 81 | self.toolbar.insert(erase_playlist_entry_btn, -1) |
| 82 | 82 | |
| | 83 | spacer = gtk.SeparatorToolItem() |
| | 84 | spacer.props.draw = False |
| | 85 | self.toolbar.insert(spacer, -1) |
| | 86 | spacer.show() |
| | 87 | |
| 83 | 88 | self.prev_button = ToolButton('player_rew') |
| 84 | 89 | self.prev_button.set_tooltip(_('Previous')) |
| 85 | 90 | self.prev_button.show() |
| … |
… |
class Control(gobject.GObject): |
| 126 | 131 | self.toolbar.insert(spacer, -1) |
| 127 | 132 | spacer.show() |
| 128 | 133 | |
| 129 | | self.audioscale = gtk.VolumeButton() |
| 130 | | self.audioscale.connect('value-changed', jukebox.volume_changed_cb) |
| 131 | | self.audioscale.set_value(1) |
| 132 | | |
| 133 | | self.audio_scale_item = gtk.ToolItem() |
| 134 | | self.audio_scale_item.set_expand(False) |
| 135 | | self.audio_scale_item.add(self.audioscale) |
| 136 | | self.toolbar.insert(self.audio_scale_item, -1) |
| 137 | | |
| 138 | 134 | spacer = gtk.SeparatorToolItem() |
| 139 | 135 | spacer.props.draw = False |
| 140 | 136 | self.toolbar.insert(spacer, -1) |
