X-Git-Url: http://git.maemo.org/git/?p=jamaendo;a=blobdiff_plain;f=jamaui%2Fshowalbum.py;h=218d99834234b31a732089493a9e3e6215e68b72;hp=ab3371be00bd6c21eb4324f10af1f2a7bd1d88b0;hb=61536ca548691b15e7f63340a0fbfb5a3055d5be;hpb=75215e5b54a5357384db5166fbecaa65164d8b94
diff --git a/jamaui/showalbum.py b/jamaui/showalbum.py
index ab3371b..218d998 100644
--- a/jamaui/showalbum.py
+++ b/jamaui/showalbum.py
@@ -1,78 +1,124 @@
+#!/usr/bin/env python
+#
+# This file is part of Jamaendo.
+# Copyright (c) 2010 Kristoffer Gronlund
+#
+# Jamaendo is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Jamaendo is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Jamaendo. If not, see .
+#
+# Player code heavily based on http://thpinfo.com/2008/panucci/:
+# A resuming media player for Podcasts and Audiobooks
+# Copyright (c) 2008-05-26 Thomas Perl
+# (based on http://pygstdocs.berlios.de/pygst-tutorial/seeking.html)
+#
import gtk
-import hildon
+import cgi
+try:
+ import hildon
+except:
+ import helldon as hildon
import jamaendo
+from player import Playlist
from playerwindow import open_playerwindow
from settings import settings
+from postoffice import postoffice
import util
+import logging
+from albumlist import TrackList
+from playlists import add_to_playlist
+
+import webbrowser
+
+log = logging.getLogger(__name__)
class ShowAlbum(hildon.StackableWindow):
def __init__(self, album):
hildon.StackableWindow.__init__(self)
- self.set_title("Album")
+ self.set_title(album.artist_name)
self.album = album
- top_vbox = gtk.VBox()
+ self.connect('destroy', self.on_destroy)
+
top_hbox = gtk.HBox()
vbox1 = gtk.VBox()
self.cover = gtk.Image()
+ tmp = util.find_resource('album.png')
+ if tmp:
+ self.cover.set_from_file(tmp)
self.bbox = gtk.HButtonBox()
self.bbox.set_property('layout-style', gtk.BUTTONBOX_SPREAD)
self.goto_artist = self.make_imagebutton('artist', self.on_goto_artist)
self.download = self.make_imagebutton('download', self.on_download)
self.favorite = self.make_imagebutton('favorite', self.on_favorite)
self.license = self.make_imagebutton('license', self.on_license)
- self.playbtn = hildon.GtkButton(gtk.HILDON_SIZE_FINGER_HEIGHT)
- self.playbtn.set_label("Play album")
- self.playbtn.set_border_width(0)
- self.playbtn.connect('clicked', self.on_play)
vbox2 = gtk.VBox()
- self.albumtitle = gtk.Label()
- self.albumtitle.set_markup('%s' % (album.name))
- self.artist = gtk.Label()
- self.artist.set_markup('%s'%(album.artist_name))
+ self.albumname = gtk.Label()
+ self.albumname.set_markup('%s'%(cgi.escape(album.name)))
self.trackarea = hildon.PannableArea()
- self.album_store = gtk.ListStore(int, str, int)
- self.album_view = gtk.TreeView(self.album_store)
- col0 = gtk.TreeViewColumn('Num')
- col = gtk.TreeViewColumn('Name')
- self.album_view.append_column(col0)
- self.album_view.append_column(col)
- cell0 = gtk.CellRendererText()
- col0.pack_start(cell0, True)
- col0.add_attribute(cell0, 'text', 0)
- cell = gtk.CellRendererText()
- col.pack_start(cell, True)
- col.add_attribute(cell, 'text', 1)
- self.album_view.set_search_column(1)
- col.set_sort_column_id(0)
- self.album_view.connect('row-activated', self.row_activated)
-
- for track in jamaendo.get_tracks(album.ID):
- self.album_store.append([track.numalbum, track.name, track.ID])
-
- top_vbox.pack_start(self.albumtitle, False)
- top_vbox.pack_start(top_hbox)
+ self.tracks = TrackList(numbers=True)
+ self.tracks.connect('row-activated', self.row_activated)
+
+ self.tracklist = jamaendo.get_tracks(album.ID)
+ for track in self.tracklist:
+ self.tracks.add_track(track)
+
top_hbox.pack_start(vbox1, False)
top_hbox.pack_start(vbox2, True)
vbox1.pack_start(self.cover, True)
- vbox1.pack_start(self.playbtn, False)
vbox1.pack_start(self.bbox, False)
self.bbox.add(self.goto_artist)
self.bbox.add(self.download)
self.bbox.add(self.favorite)
self.bbox.add(self.license)
- vbox2.pack_start(self.artist, False)
+ vbox2.pack_start(self.albumname, False)
vbox2.pack_start(self.trackarea, True)
- self.trackarea.add(self.album_view)
+ self.trackarea.add(self.tracks)
+
+ self.add(top_hbox)
- self.add(top_vbox)
+ postoffice.connect('album-cover', self, self.on_album_cover)
+ postoffice.notify('request-album-cover', self.album.ID, 300)
- coverfile = jamaendo.get_album_cover(self.album.ID, size=200)
- self.cover.set_from_file(coverfile)
+ self.create_menu()
- self.show_all()
+ def create_menu(self):
+ def on_player(*args):
+ from playerwindow import open_playerwindow
+ open_playerwindow()
+ self.menu = hildon.AppMenu()
+ player = hildon.GtkButton(gtk.HILDON_SIZE_AUTO)
+ player.set_label("Open player")
+ player.connect("clicked", on_player)
+ self.menu.append(player)
+ player = hildon.GtkButton(gtk.HILDON_SIZE_AUTO)
+ player.set_label("Add to playlist")
+ player.connect("clicked", self.on_add_to_playlist)
+ self.menu.append(player)
+ self.menu.show_all()
+ self.set_app_menu(self.menu)
+
+ def on_destroy(self, wnd):
+ postoffice.disconnect('album-cover', self)
+
+ def on_album_cover(self, albumid, size, cover):
+ if albumid == self.album.ID and size == 300:
+ self.cover.set_from_file(cover)
+
+
+ def on_add_to_playlist(self, button, user_data=None):
+ add_to_playlist(self, self.tracklist)
def make_imagebutton(self, name, cb):
btn = hildon.GtkButton(gtk.HILDON_SIZE_AUTO)
@@ -91,8 +137,10 @@ class ShowAlbum(hildon.StackableWindow):
self.open_item(artist)
def on_download(self, btn):
- banner = hildon.hildon_banner_show_information(self, '', "Downloads disabled in this version")
+ banner = hildon.hildon_banner_show_information(self, '', "Opening in web browser")
banner.set_timeout(2000)
+ url = self.album.torrent_url()
+ webbrowser.open_new(url)
def on_favorite(self, btn):
settings.favorite(self.album)
@@ -101,15 +149,20 @@ class ShowAlbum(hildon.StackableWindow):
def on_license(self, btn):
+ banner = hildon.hildon_banner_show_information(self, '', "Opening in web browser")
+ banner.set_timeout(2000)
url = self.album.license_url
- import webbrowser
webbrowser.open_new(url)
def on_play(self, btn):
self.open_item(self.album)
def row_activated(self, treeview, path, view_column):
- pass
+ _id = self.tracks.get_track_id(path)
+ playlist = Playlist(self.tracklist)
+ playlist.jump_to(_id)
+ wnd = open_playerwindow()
+ wnd.play_tracks(playlist)
def open_item(self, item):
if isinstance(item, jamaendo.Album):