Tons of fixes/tweaks/changes in general

[jamaendo] / jamaui / showartist.py

diff --git a/jamaui/showartist.py b/jamaui/showartist.py
index 005a651..9cae975 100644 (file)
--- a/jamaui/showartist.py
+++ b/jamaui/showartist.py
@@ -1,43 +1,54 @@
+#!/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 <http://www.gnu.org/licenses/>.
+#
+# 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 <thpinfo.com>
+#  (based on http://pygstdocs.berlios.de/pygst-tutorial/seeking.html)
+#
 import gtk
 import hildon
 import jamaendo
 from playerwindow import open_playerwindow
+from albumlist import AlbumList
 
 class ShowArtist(hildon.StackableWindow):
     def __init__(self, artist):
         hildon.StackableWindow.__init__(self)
-        self.set_title("Artist")
+        self.set_title(artist.name)
         self.artist = artist
 
         self.panarea = hildon.PannableArea()
         vbox = gtk.VBox(False, 0)
 
-        name = gtk.Label()
-        name.set_markup('<big>%s</big>'%(artist.name))
-        vbox.pack_start(name, False)
+        self.albums = AlbumList()
+        self.albums.show_artist(False)
+        self.albums.connect('row-activated', self.row_activated)
 
-        self.album_store = gtk.ListStore(str, int)
-        self.album_view = gtk.TreeView(self.album_store)
-        col = gtk.TreeViewColumn('Name')
-        self.album_view.append_column(col)
-        cell = gtk.CellRendererText()
-        col.pack_start(cell, True)
-        col.add_attribute(cell, 'text', 0)
-        self.album_view.set_search_column(0)
-        col.set_sort_column_id(0)
-        self.album_view.connect('row-activated', self.row_activated)
-
-
-        self.panarea.add(self.album_view)
+        self.panarea.add(self.albums)
         vbox.pack_start(self.panarea, True, True, 0)
         self.add(vbox)
 
         for album in jamaendo.get_albums(artist.ID):
-            self.album_store.append([album.name, album.ID])
+            self.albums.add_album(album)
 
     def row_activated(self, treeview, path, view_column):
-        treeiter = self.album_store.get_iter(path)
-        title, _id = self.album_store.get(treeiter, 0, 1)
+        _id = self.albums.get_album_id(path)
         album = jamaendo.get_album(_id)
         if isinstance(album, list):
             album = album[0]