X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Falbum_art_panel.py;h=243f3444d02b6d45d23cce769ff3d2730972c54f;hb=57f89b8fde25f8fdb5184c66d5674e986cbbf62e;hp=6788d1951e0e33ff167d7df9068182a2b115cde2;hpb=beb6836bc1078f976e3fe5c4f2d77804989f9e21;p=mussorgsky
diff --git a/src/album_art_panel.py b/src/album_art_panel.py
index 6788d19..243f344 100644
--- a/src/album_art_panel.py
+++ b/src/album_art_panel.py
@@ -1,38 +1,38 @@
#!/usr/bin/env python2.5
import hildon
import gtk, gobject
+import os
from album_art_spec import getCoverArtThumbFileName
from download_dialog import MussorgskyAlbumArtDownloadDialog
-from album_art import MussorgskyAlbumArt
from utils import escape_html
-from aa_selection_dialog import AlbumArtSelectionDialog
+from aa_selection_dialog import AlbumArtSelectionDialog, RESPONSE_CLICK
+
+import time
+
+EMPTY_PIXBUF = gtk.gdk.Pixbuf (gtk.gdk.COLORSPACE_RGB, False, 8, 64, 64)
+
+import i18n
+_ = i18n.language.gettext
class MussorgskyAlbumArtPanel (hildon.StackableWindow):
def __init__ (self, album_artists):
hildon.StackableWindow.__init__ (self)
- self.set_title ("Album art handling")
+ self.set_title (_("Album art selection"))
self.set_border_width (12)
self.__create_view ()
self.downloader = None
- self.model = gtk.ListStore (str, gtk.gdk.Pixbuf, str, str)
-
+ # Visible string, image, artist, album, painted!
+ self.model = gtk.ListStore (str, gtk.gdk.Pixbuf, str, str, bool)
for p in album_artists:
- if (not p[1]):
+ if (not p[0]):
continue
- album_art_path = getCoverArtThumbFileName (p[1])
- try:
- pixbuf = gtk.gdk.pixbuf_new_from_file_at_size (album_art_path, 64, 64)
- except gobject.GError:
- pixbuf = None
- t = ("%s\n%s" % (escape_html(p[1]), escape_html(p[0])), pixbuf, p[0], p[1])
+ t = (None, None, p[1], p[0], False)
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)
@@ -40,11 +40,15 @@ class MussorgskyAlbumArtPanel (hildon.StackableWindow):
artist_column.set_expand (True)
self.treeview.append_column (artist_column)
- album_art = gtk.TreeViewColumn ("Album art", gtk.CellRendererPixbuf (), pixbuf=1)
+ renderer = gtk.CellRendererPixbuf ()
+ album_art = gtk.TreeViewColumn ("Album art", renderer, pixbuf=1)
+ # This doesn't have real effect:
+ album_art.set_sizing (gtk.TREE_VIEW_COLUMN_FIXED)
+ album_art.set_fixed_width (64)
+
+ album_art.set_cell_data_func (renderer, self.album_art_cell_data_cb)
self.treeview.append_column (album_art)
- #vbox.add (self.treeview)
-
pannable_area = hildon.PannableArea ()
pannable_area.add (self.treeview)
self.add (pannable_area)
@@ -53,12 +57,33 @@ class MussorgskyAlbumArtPanel (hildon.StackableWindow):
menu = hildon.AppMenu ()
automatic_retrieval = hildon.Button (hildon.BUTTON_STYLE_NORMAL,
hildon.BUTTON_ARRANGEMENT_HORIZONTAL)
- automatic_retrieval.set_title ("Automatic retrieval")
+ automatic_retrieval.set_title (_("Automatic download"))
automatic_retrieval.connect ("clicked", self.get_all_album_art)
menu.append (automatic_retrieval)
menu.show_all ()
self.set_app_menu (menu)
+ def album_art_cell_data_cb (self, column, cell, model, iter):
+ text, pixbuf, artist, album, not_first_time = model.get (iter, 0, 1, 2, 3, 4)
+ if (not_first_time):
+ if (text == None):
+ text = "".join (["", escape_html (album),"\n",
+ escape_html(artist), ""])
+ model.set (iter, 0, text)
+
+ if (pixbuf == None):
+ #print "Calling album art cell data cb", model.get (iter, 3)
+ album_art_path = getCoverArtThumbFileName (album)
+ if (os.path.exists (album_art_path)):
+ pxb = gtk.gdk.pixbuf_new_from_file_at_size (album_art_path, 64, 64)
+ model.set (iter, 1, pxb)
+ else:
+ #print "Cannot find thumbnail in '%s'" % (album_art_path)
+ model.set (iter, 1, EMPTY_PIXBUF)
+
+ else:
+ model.set (iter, 4, True)
+
def get_all_album_art (self, user_data):
dialog = MussorgskyAlbumArtDownloadDialog (self)
dialog.show_all ()
@@ -66,29 +91,37 @@ class MussorgskyAlbumArtPanel (hildon.StackableWindow):
def row_activated_cb (self, treeview, path, view_colum):
it = treeview.get_model ().get_iter (path)
- album = treeview.get_model ().get_value (it, 3)
- artist = treeview.get_model ().get_value (it, 2)
- if (not self.downloader):
- self.downloader = MussorgskyAlbumArt ()
-
- dialog = AlbumArtSelectionDialog (self, 4)
- dialog.show_all ()
+ artist = treeview.get_model ().get_value (it, 3)
+ album = treeview.get_model ().get_value (it, 2)
+ print artist
+ if (artist.find ('|') != -1):
+ artist = "Various artists"
- paths = self.downloader.get_alternatives (album, artist, 4)
- dialog.populate (paths)
+ dialog = AlbumArtSelectionDialog (self, artist, album, 5)
+ dialog.show_all ()
response = dialog.run ()
- if (response > -1):
- assert response < len (paths)
- (img, thumb) = self.downloader.save_alternative (artist, album, paths[response])
- pixbuf = gtk.gdk.pixbuf_new_from_file_at_size (thumb, 64, 64)
- treeview.get_model ().set (it, 1, pixbuf)
+ 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, EMPTY_PIXBUF)
dialog.destroy ()
+
if __name__ == "__main__":
+ import random
+
+ artists_albums = [("Artist %d|artist Y" % i, "Album <%d>" % i) for i in range (0, 10)]
- artists_albums = [("Artist %d the greatest bolero singer in the universe" % i, "Album <%d>" % i) for i in range (0, 100)]
+ # Overwrite the get thumb path for testing
+ def local_file (path):
+ return "../thumb%d.124.jpeg" % (random.randint (0, 3))
+ global getCoverArtThumbFileName
+ getCoverArtThumbFileName = local_file
window = MussorgskyAlbumArtPanel (artists_albums)
window.connect ("destroy", gtk.main_quit )