Merge lp:~alphapapa/pithos/908389-osdtext into lp:~kevin-mehall/pithos/trunk

[Adam Porter]

[lp:~alphapapa/pithos/908389-osdtext]

183. By Adam Porter on 2011-12-24

Display album art icon in notification when unpausing. The icons display as question marks in KDE, anyway.

184. By Adam Porter on 2011-12-25

Adds heart and broken-heart icons (LGPL from Oxygen icons--need to add license somewhere?).
Puts icon at right side of notify OSD, but still experimenting.

185. By Adam Porter on 2011-12-25

I can't get the icon to align to the middle of the text, or vice-versa. Maybe someone else can.

186. By Adam Porter on 2011-12-25

Added 16px versions of icons.
Switched love/unlove to heart/broken-heart.
CellRendererAlbumArt.on_render() takes filenames or stock icons.

187. By Adam Porter on 2011-12-25

Use 'gtk' instead of 'stock' to determine stock icons--not all have 'stock' in their names.

188. By Adam Porter on 2011-12-25

Add unlove for loved songs.
Use cancel icon for ban, not heartbroken.

Unmerged revisions

188. By Adam Porter on 2011-12-25

Add unlove for loved songs.
Use cancel icon for ban, not heartbroken.

187. By Adam Porter on 2011-12-25

Use 'gtk' instead of 'stock' to determine stock icons--not all have 'stock' in their names.

186. By Adam Porter on 2011-12-25

Added 16px versions of icons.
Switched love/unlove to heart/broken-heart.
CellRendererAlbumArt.on_render() takes filenames or stock icons.

185. By Adam Porter on 2011-12-25

I can't get the icon to align to the middle of the text, or vice-versa. Maybe someone else can.

184. By Adam Porter on 2011-12-25

Adds heart and broken-heart icons (LGPL from Oxygen icons--need to add license somewhere?).
Puts icon at right side of notify OSD, but still experimenting.

183. By Adam Porter on 2011-12-24

Display album art icon in notification when unpausing. The icons display as question marks in KDE, anyway.

182. By Adam Porter on 2011-12-24

Make artist bold and album italic in OSD.

=== modified file 'bin/pithos'
--- bin/pithos	2011-12-15 00:15:02 +0000
+++ bin/pithos	2011-12-25 13:04:23 +0000
@@ -76,13 +76,17 @@
 
 ALBUM_ART_SIZE = 96
 ALBUM_ART_X_PAD = 6
+LOVE_ICON = 'media/heart.png'
+UNLOVE_ICON = 'media/heart-broken.png'
+BAN_ICON = gtk.STOCK_CANCEL
+TIRED_ICON = gtk.STOCK_JUMP_TO
 
 class CellRendererAlbumArt(gtk.GenericCellRenderer):  
     def __init__(self):
         self.__gobject_init__()
         self.icon = None
         self.pixbuf = None
-        self.rate_bg = gtk.gdk.pixbuf_new_from_file(os.path.join(getdatapath(), 'media', 'rate_bg.png'))
+        self.rate_bg = gtk.gdk.pixbuf_new_from_file(os.path.join(getdatapath(), 'media', 'rate_bg.png'))  # FIXME: use get_data_file() ?
         
     __gproperties__ = {
         'icon': (str, 'icon', 'icon', '', gobject.PARAM_READWRITE),
@@ -102,9 +106,13 @@
             x = cell_area.x+(cell_area.width-self.rate_bg.get_width()) - ALBUM_ART_X_PAD # right
             y = cell_area.y+(cell_area.height-self.rate_bg.get_height()) # bottom
             window.draw_pixbuf(None, self.rate_bg, 0, 0, x, y, width=-1, height=-1, dither=gtk.gdk.RGB_DITHER_NORMAL, x_dither=0, y_dither=0)
-            
-            icon = widget.style.lookup_icon_set(self.icon)
-            pixbuf = icon.render_icon(widget.style, widget.get_direction(), gtk.STATE_ACTIVE, gtk.ICON_SIZE_MENU, widget, detail=None)
+
+            if 'gtk' in self.icon:
+                icon = widget.style.lookup_icon_set(self.icon)
+                pixbuf = icon.render_icon(widget.style, widget.get_direction(), gtk.STATE_ACTIVE, gtk.ICON_SIZE_MENU, widget, detail=None)
+            else:
+                pixbuf = gtk.gdk.pixbuf_new_from_file(get_data_file(self.icon))
+                
             x = cell_area.x+(cell_area.width-pixbuf.get_width())-5 - ALBUM_ART_X_PAD # right
             y = cell_area.y+(cell_area.height-pixbuf.get_height())-5 # bottom
             window.draw_pixbuf(None, pixbuf, 0, 0, x, y, width=-1, height=-1, dither=gtk.gdk.RGB_DITHER_NORMAL, x_dither=0, y_dither=0)
@@ -574,11 +582,11 @@
             
     def song_icon(self, song):
         if song.tired:
-            return gtk.STOCK_JUMP_TO
+            return TIRED_ICON
         if song.rating == RATE_LOVE:
-            return gtk.STOCK_ABOUT
+            return LOVE_ICON
         if song.rating == RATE_BAN:
-            return gtk.STOCK_CANCEL       
+            return BAN_ICON
             
     def update_song_row(self, song = None):
         if song is None:

=== added file 'data/media/heart-broken.png'
Binary files data/media/heart-broken.png	1970-01-01 00:00:00 +0000 and data/media/heart-broken.png	2011-12-25 13:04:23 +0000 differ
=== added file 'data/media/heart-broken16.png'
Binary files data/media/heart-broken16.png	1970-01-01 00:00:00 +0000 and data/media/heart-broken16.png	2011-12-25 13:04:23 +0000 differ
=== added file 'data/media/heart.png'
Binary files data/media/heart.png	1970-01-01 00:00:00 +0000 and data/media/heart.png	2011-12-25 13:04:23 +0000 differ
=== added file 'data/media/heart16.png'
Binary files data/media/heart16.png	1970-01-01 00:00:00 +0000 and data/media/heart16.png	2011-12-25 13:04:23 +0000 differ
=== modified file 'data/ui/PithosWindow.ui'
--- data/ui/PithosWindow.ui	2011-11-09 15:44:39 +0000
+++ data/ui/PithosWindow.ui	2011-12-25 13:04:23 +0000
@@ -272,7 +272,7 @@
   </object>
   <object class="GtkImage" id="image2">
     <property name="visible">True</property>
-    <property name="stock">gtk-about</property>
+    <property name="file">data/media/heart16.png</property>
   </object>
   <object class="GtkImage" id="image3">
     <property name="visible">True</property>
@@ -462,7 +462,7 @@
   </object>
   <object class="GtkImage" id="image12">
     <property name="visible">True</property>
-    <property name="stock">gtk-about</property>
+    <property name="file">data/media/heart-broken16.png</property>
   </object>
   <object class="GtkImage" id="image13">
     <property name="visible">True</property>

=== modified file 'pithos/plugins/notification_icon.py'
--- pithos/plugins/notification_icon.py	2010-09-08 18:36:53 +0000
+++ pithos/plugins/notification_icon.py	2011-12-25 13:04:23 +0000
@@ -59,7 +59,10 @@
                 item.set_active(True)
             elif icon:
                 item = gtk.ImageMenuItem(text)
-                item.set_image(gtk.image_new_from_stock(icon, gtk.ICON_SIZE_MENU))
+                if 'gtk' in icon:
+                    item.set_image(gtk.image_new_from_stock(icon, gtk.ICON_SIZE_MENU))
+                else:
+                    item.set_image(gtk.image_new_from_file(icon))
             else:
                 item = gtk.MenuItem(text)
             item.connect('activate', action) 
@@ -71,9 +74,15 @@
             # We have to add another entry for show / hide Pithos window
             self.visible_check = button("Show Pithos", self._toggle_visible, 'check')
         
+        # Make menu items
         self.playpausebtn = button("Pause", self.window.playpause, gtk.STOCK_MEDIA_PAUSE)
         button("Skip",  self.window.next_song,                     gtk.STOCK_MEDIA_NEXT)
-        button("Love",  (lambda *i: self.window.love_song()),      gtk.STOCK_ABOUT)
+        
+        if self.window.current_song.rating:  # == None if not loved
+            button("Unlove",  (lambda *i: self.window.unrate_song()),      get_data_file('media/heart-broken16.png'))
+        else:
+            button("Love",  (lambda *i: self.window.love_song()),      get_data_file('media/heart16.png'))
+            
         button("Ban",   (lambda *i: self.window.ban_song()),       gtk.STOCK_CANCEL)
         button("Tired", (lambda *i: self.window.tired_song()),     gtk.STOCK_JUMP_TO)
         button("Quit",  self.window.quit,                          gtk.STOCK_QUIT )

=== modified file 'pithos/plugins/notify.py'
--- pithos/plugins/notify.py	2011-11-09 14:58:43 +0000
+++ pithos/plugins/notify.py	2011-12-25 13:04:23 +0000
@@ -26,14 +26,36 @@
         pynotify.init('pithos')
         self.notification = pynotify.Notification("Pithos","Pithos")
         
+        # check notification capabilities for HTML use
+        self.caps = pynotify.get_server_caps()
+        
     def on_enable(self):
         self.song_callback_handle = self.window.connect("song-changed", self.song_changed)
         self.state_changed_handle = self.window.connect("user-changed-play-state", self.playstate_changed)
+        # TODO: connect to song-rating-changed so the notification can have the heart added/removed if it's still on-screen when rating is changed?
         
     def set_for_song(self, song):
         self.notification.clear_hints()
-        msg = escape("by %s from %s"%(song.artist, song.album))
-        self.notification.update(song.title, msg, 'audio-x-generic')
+        
+        # Escape special chars
+        title = escape(song.title)
+        artist = escape(song.artist)
+        album = escape(song.album)
+        
+        # Don't use HTML if by some chance the notification agent/daemon doesn't support it
+        if self.caps and 'body-markup' in self.caps:
+            
+            if song.rating:  # == 'love' if loved, None if not
+                heart = "<img src='%s'>&nbsp;" % get_data_file('media/heart16.png')
+            else:
+                heart = ''
+                
+            title = ("%s<b>%s</b>" % (heart, title))
+            msg = "&nbsp;<b>%s</b><br>&nbsp;<i>%s</i>" % (artist, album)
+        else:
+            msg = "by %s on %s" % (artist, album)
+            
+        self.notification.update(title, msg, 'audio-x-generic')
         
     def song_changed(self, window,  song):
         if not self.window.is_active():
@@ -48,8 +70,12 @@
     def playstate_changed(self, window, state):
         if not self.window.is_active():
             self.set_for_song(window.current_song)
-            if state:
-                self.notification.props.icon_name = 'gtk-media-play-ltr'
+            
+            if state:  # state means playing, apparently
+                if window.current_song.art_pixbuf:
+                    self.notification.set_icon_from_pixbuf(window.current_song.art_pixbuf)
+                else:
+                    self.notification.props.icon_name = 'gtk-media-play-ltr'
             else:
                 self.notification.props.icon_name = 'gtk-media-pause'