Changeset 9990

Timestamp:

07/23/08 01:06:58 (3 months ago)

Author:

js

Message:

Show user tune in conversation window.

Location:

trunk

Files:

• data/glade/message_window.glade (modified) (3 diffs)
• src/chat_control.py (modified) (2 diffs)
• src/tooltips.py (modified) (1 diff)

trunk/data/glade/message_window.glade

@@ -72 +72 @@
                                     <property name="no_show_all">True</property>
                                     <property name="stock">gtk-missing-image</property>
+                                    <property name="icon_size">1</property>
                                   </widget>
                                 </child>
@@ -78 +79 @@
                                     <property name="no_show_all">True</property>
                                     <property name="stock">gtk-missing-image</property>
+                                    <property name="icon_size">1</property>
                                   </widget>
                                   <packing>
@@ -86 +88 @@
                                   <widget class="GtkImage" id="tune_image">
                                     <property name="no_show_all">True</property>
-                                    <property name="stock">gtk-missing-image</property>
+                                    <property name="pixbuf">music.png</property>
+                                    <property name="icon_size">1</property>
                                   </widget>
                                   <packing>

trunk/src/chat_control.py

@@ -1091 +1091 @@
 
                 self.update_mood()
+                self.update_tune()
 
                 # keep timeout id and window obj for possible big avatar
@@ -1225 +1226 @@
                 else:
                         self._mood_image.hide()
+
+        def update_tune(self):
+                artist = None
+                title  = None
+                source = None
+
+                if self.contact.tune.has_key('artist'):
+                        artist = gobject.markup_escape_text(
+                                self.contact.tune['artist'].strip())
+                if self.contact.tune.has_key('title'):
+                        title = gobject.markup_escape_text(
+                                self.contact.tune['title'].strip())
+                if self.contact.tune.has_key('source'):
+                        title = gobject.markup_escape_text(
+                                self.contact.tune['source'].strip())
+
+                if artist or title:
+                        artist = artist if artist else _('Unknown Artist')
+                        title  = title  if title  else _('Unknown Title')
+                        source = source if source else _('Unknown Source')
+
+                        self._tune_image.set_tooltip_markup(_(
+                                '<b>"%(title)s"</b> by <i>%(artist)s</i>\n' +
+                                'from <i>%(source)s</i>') % {'title': title,
+                                'artist': artist, 'source': source})
+                        self._tune_image.show()
+                else:
+                        self._tune_image.hide()
 
         def on_avatar_eventbox_enter_notify_event(self, widget, event):

trunk/src/tooltips.py

@@ -613 +613 @@
                         else:
                                 source = _('Unknown Source')
-                        tune_string = _('Tune:') + ' ' + _('<b>"%(title)s"' +
-                                '</b> by <i>%(artist)s</i>\nfrom ' +
-                                '<i>%(source)s</i>') % {'title': title,
+                        tune_string = _('Tune:') + ' ' + \
+                                _('<b>"%(title)s</b> by <i>%(artist)s</i>\n' +
+                                'from <i>%(source)s</i>') % {'title': title,
                                 'artist': artist, 'source': source}
                         properties.append((tune_string, None))