diff options
| -rw-r--r-- | ControlToolbar.py | 53 | ||||
| -rw-r--r-- | jukeboxactivity.py | 19 | ||||
| -rw-r--r-- | locale/bn_IN/LC_MESSAGES/org.laptop.sugar.Jukebox.mo | bin | 738 -> 0 bytes |
3 files changed, 38 insertions, 34 deletions
diff --git a/ControlToolbar.py b/ControlToolbar.py index a4f9225..87a9b50 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,22 @@ 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() + self.toolbar.insert(spacer, -1) + spacer.show() + self.prev_button = ToolButton('player_rew') self.prev_button.set_tooltip(_('Previous')) self.prev_button.show() @@ -107,6 +111,12 @@ class Control(gobject.GObject): self.next_button.connect('clicked', self.next_button_clicked_cb) self.toolbar.insert(self.next_button, -1) + current_time = gtk.ToolItem() + self.current_time_label = gtk.Label('') + current_time.add(self.current_time_label) + current_time.show() + toolbar.insert(current_time, -1) + self.adjustment = gtk.Adjustment(0.0, 0.00, 100.0, 0.1, 1.0, 1.0) self.hscale = gtk.HScale(self.adjustment) self.hscale.set_draw_value(False) @@ -121,24 +131,11 @@ class Control(gobject.GObject): self.scale_item.add(self.hscale) self.toolbar.insert(self.scale_item, -1) - spacer = gtk.SeparatorToolItem() - spacer.props.draw = False - 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) - spacer.show() + total_time = gtk.ToolItem() + self.total_time_label = gtk.Label('') + total_time.add(self.total_time_label) + total_time.show() + toolbar.insert(total_time, -1) def prev_button_clicked_cb(self, widget): self.jukebox.songchange('prev') diff --git a/jukeboxactivity.py b/jukeboxactivity.py index a16fbd1..8ad59d6 100644 --- a/jukeboxactivity.py +++ b/jukeboxactivity.py @@ -124,11 +124,6 @@ class JukeboxActivity(activity.Activity): self.control = Control(toolbar_box.toolbar, self) - separator = gtk.SeparatorToolItem() - separator.props.draw = False - separator.set_expand(True) - toolbar_box.toolbar.insert(separator, -1) - toolbar_box.toolbar.insert(StopButton(self), -1) self.set_toolbar_box(toolbar_box) @@ -396,7 +391,7 @@ class JukeboxActivity(activity.Activity): """ jobject = datastore.create() jobject.metadata['mime_type'] = "audio/x-mpegurl" - jobject.metadata['title'] = _('Jukebox playlist') + jobject.metadata['title'] = _('Jukebox playlist') temp_path = os.path.join(activity.get_activity_root(), 'instance') @@ -597,6 +592,18 @@ class JukeboxActivity(activity.Activity): value = self.p_position * 100.0 / self.p_duration self.control.adjustment.set_value(value) + # Update the current time + seconds = self.p_position * 10 ** -9 + time = '%2d:%02d' % (int(seconds / 60), int(seconds % 60)) + self.control.current_time_label.set_text(time) + + # FIXME: this should be updated just once when the file starts + # the first time + if self.p_duration != gst.CLOCK_TIME_NONE: + seconds = self.p_duration * 10 ** -9 + time = '%2d:%02d' % (int(seconds / 60), int(seconds % 60)) + self.control.total_time_label.set_text(time) + return True def _erase_playlist_entry_clicked_cb(self, widget): diff --git a/locale/bn_IN/LC_MESSAGES/org.laptop.sugar.Jukebox.mo b/locale/bn_IN/LC_MESSAGES/org.laptop.sugar.Jukebox.mo Binary files differdeleted file mode 100644 index 2b8f564..0000000 --- a/locale/bn_IN/LC_MESSAGES/org.laptop.sugar.Jukebox.mo +++ /dev/null |