Refactored album-art download dialog code

[mussorgsky] / src / album_art_panel.py

diff --git a/src/album_art_panel.py b/src/album_art_panel.py
index 0bd2871..42287ca 100644 (file)
--- a/src/album_art_panel.py
+++ b/src/album_art_panel.py
@@ -3,9 +3,8 @@ import hildon
 import gtk, gobject
 from album_art_spec import getCoverArtThumbFileName
 from download_dialog import MussorgskyAlbumArtDownloadDialog
-
-def escape_html (text):
-    return text.replace ("&","&amp;").replace ("<", "&lt;").replace (">", "&gt;").replace ("\"", "&quote;")
+from utils import escape_html
+from aa_selection_dialog import AlbumArtSelectionDialog, RESPONSE_CLICK
 
 class MussorgskyAlbumArtPanel (hildon.StackableWindow):
 
@@ -14,37 +13,37 @@ class MussorgskyAlbumArtPanel (hildon.StackableWindow):
         self.set_title ("Album art handling")
         self.set_border_width (12)
         self.__create_view ()
+        self.downloader = None
+        # Visible string, image, artist, album
         self.model = gtk.ListStore (str, gtk.gdk.Pixbuf, str, str)
 
         for p in album_artists:
-            if (not p[1]):
+            if (not p[0]):
                 continue
-            album_art_path = getCoverArtThumbFileName (p[1])
+            album_art_path = getCoverArtThumbFileName (p[0])
             try:
-                pixbuf = gtk.gdk.pixbuf_new_from_file_at_size (album_art_path, 124, 124)
+                pixbuf = gtk.gdk.pixbuf_new_from_file_at_size (album_art_path, 64, 64)
             except gobject.GError:
                 pixbuf = None
-            t = ("<b>%s</b>\n<small>%s</small>" % (escape_html(p[1]), escape_html(p[0])), pixbuf, p[0], p[1])
+            t = ("<b>%s</b>\n<small>%s</small>" % (escape_html(p[0]), escape_html(p[1])), pixbuf, p[1], p[0])
             self.model.append (t)
-                
             
         self.treeview.set_model (self.model)
 
     def __create_view (self):
-        vbox = gtk.VBox (spacing=12, homogeneous=False)
-
         self.treeview = gtk.TreeView ()
         self.treeview.connect ("row-activated", self.row_activated_cb)
 
         artist_column = gtk.TreeViewColumn ("Artist", gtk.CellRendererText (), markup=0)
+        artist_column.set_expand (True)
         self.treeview.append_column (artist_column)
 
         album_art = gtk.TreeViewColumn ("Album art", gtk.CellRendererPixbuf (), pixbuf=1)
         self.treeview.append_column (album_art)
 
-        vbox.add (self.treeview)
-        
-        self.add (vbox)
+        pannable_area = hildon.PannableArea ()
+        pannable_area.add (self.treeview)
+        self.add (pannable_area)
 
         # Menu
         menu = hildon.AppMenu ()
@@ -62,15 +61,26 @@ class MussorgskyAlbumArtPanel (hildon.StackableWindow):
         dialog.do_the_job (self.model)
 
     def row_activated_cb (self, treeview, path, view_colum):
-        print "Get alternatives for..."
         it = treeview.get_model ().get_iter (path)
-        print treeview.get_model ().get_value (it, 3)
-
-
+        album = treeview.get_model ().get_value (it, 3)
+        artist = treeview.get_model ().get_value (it, 2)
 
+        dialog = AlbumArtSelectionDialog (self, artist, album, 5)
+        dialog.show_all ()
+        
+        response = dialog.run ()
+        if (response == RESPONSE_CLICK):
+            (img, thumb) = dialog.get_selection ()
+            if img and thumb:
+                pixbuf = gtk.gdk.pixbuf_new_from_file_at_size (thumb, 64, 64)
+                treeview.get_model ().set (it, 1, pixbuf)
+            else:
+                treeview.get_model ().set (it, 1, None)
+        dialog.destroy ()
+            
 if __name__ == "__main__":
 
-    artists_albums = [("Artist &%d" % i, "Album <%d>" % i) for i in range (0, 100)]
+    artists_albums = [("Artist %d the greatest bolero singer in the universe" % i, "Album <%d>" % i) for i in range (0, 100)]
 
 
     window = MussorgskyAlbumArtPanel (artists_albums)