Tons of fixes/tweaks/changes in general

[jamaendo] / jamaui / showalbum.py

diff --git a/jamaui/showalbum.py b/jamaui/showalbum.py
index 773db8c..4325622 100644 (file)
--- a/jamaui/showalbum.py
+++ b/jamaui/showalbum.py
@@ -22,6 +22,7 @@
 #  (based on http://pygstdocs.berlios.de/pygst-tutorial/seeking.html)
 #
 import gtk
+import cgi
 import hildon
 import jamaendo
 from playerwindow import open_playerwindow
@@ -45,6 +46,9 @@ class ShowAlbum(hildon.StackableWindow):
         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)
@@ -58,7 +62,7 @@ class ShowAlbum(hildon.StackableWindow):
 
         vbox2 = gtk.VBox()
         self.albumname = gtk.Label()
-        self.albumname.set_markup('<big>%s</big>'%(album.name))
+        self.albumname.set_markup('<big>%s</big>'%(cgi.escape(album.name)))
         self.trackarea = hildon.PannableArea()
 
         self.tracks = TrackList(numbers=True)
@@ -82,13 +86,25 @@ class ShowAlbum(hildon.StackableWindow):
 
         self.add(top_hbox)
 
-        postoffice.connect('album-cover', self.on_album_cover)
+        postoffice.connect('album-cover', self, self.on_album_cover)
         postoffice.notify('request-album-cover', self.album.ID, 300)
 
-        self.show_all()
+        self.create_menu()
+
+    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)
+        self.menu.show_all()
+        self.set_app_menu(self.menu)
 
     def on_destroy(self, wnd):
-        postoffice.disconnect('album-cover', self.on_album_cover)
+        postoffice.disconnect('album-cover', self)
 
     def on_album_cover(self, albumid, size, cover):
         if albumid == self.album.ID and size == 300:
@@ -133,7 +149,8 @@ class ShowAlbum(hildon.StackableWindow):
 
     def row_activated(self, treeview, path, view_column):
         _id = self.tracks.get_track_id(path)
-        log.debug("clicked %s", _id)
+        track = jamaendo.get_track(_id)
+        self.open_item(track)
 
     def open_item(self, item):
         if isinstance(item, jamaendo.Album):