Merge lp:~dave-aitken/listen/listen-experimental into lp:listen

[Dave Aitken]

[Dave Aitken (dave-aitken)]

Tidied up a couple of tiny notification issues:
-Fixed track duration on mouseover always showing 00:00
-Shortened the title so it doesn't spill over onto 2 lines in new notify-osd in Ubuntu Jaunty
-Increased the size of the image sent to notification if type is notify-osd, this improves appearance with the scaling used by notify-osd.

=== modified file 'src/widget/notify.py'
--- src/widget/notify.py	2009-04-06 23:06:16 +0000
+++ src/widget/notify.py	2009-05-10 23:38:53 +0000
@@ -42,7 +42,7 @@
     timeout = 10000
     current_song = None
     dbus_notify = None    
-    title = "\xe2\x99\xaa "+_("Listen now playing")+" \xe2\x99\xaa"
+    title = "\xe2\x99\xaa "+_("Now playing")
     actions = []
     hints = []
     last_id = 0
@@ -104,7 +104,7 @@
                 text.append("<i>"+song.get_str("artist",True)+"</i>")
             if song.get("album"):
                 text.append(song.get_str("album",True))
-            text.append(utils.duration_to_string(value,"00:00")+" "+_("of")+" "+utils.duration_to_string(Player.get_length(),"00:00"))
+            text.append(utils.duration_to_string(value,"00:00")+" "+_("of")+" "+utils.duration_to_string(Player.get_length(),"00:00",1))
             
             text = "\n".join(text)
         else:
@@ -158,7 +158,11 @@
             icon = ""  
             if song:
                 try:
-                    pixbuf = CoverManager.get_pixbuf_from_song(song, 40, 40, False)
+                    if self.notify_server_info[0] == "notify-osd":
+                        #Larger image to improve image quality when scaled by notify-osd
+                        pixbuf = CoverManager.get_pixbuf_from_song(song, 256, 256, False)
+                    else:
+                        pixbuf = CoverManager.get_pixbuf_from_song(song, 40, 40, False)
                     w, h = pixbuf.get_width(), pixbuf.get_height()
                     line = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, True, 8, w + 2, h + 2)
                     line.fill(0x000000ff)