From e0940aa710449e7464f3b03fbe01f7071ff9a087 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Kristoffer=20Gr=C3=B6nlund?=
 <kristoffer.gronlund@purplescout.se>
Date: Thu, 31 Dec 2009 03:51:13 +0100
Subject: [PATCH] Ui work

---
 jamaui/ossohelper.py |    2 +-
 jamaui/player.py     |    6 +++---
 jamaui/ui.py         |   25 +++++++++++++++----------
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/jamaui/ossohelper.py b/jamaui/ossohelper.py
index 00306fb..2f93235 100644
--- a/jamaui/ossohelper.py
+++ b/jamaui/ossohelper.py
@@ -21,7 +21,7 @@
 import os
 import logging
 
-__log = logging.getLogger('panucci.ossohelper')
+__log = logging.getLogger(__name__)
 
 try:
     import osso
diff --git a/jamaui/player.py b/jamaui/player.py
index f641c32..7a5dd7b 100644
--- a/jamaui/player.py
+++ b/jamaui/player.py
@@ -217,14 +217,14 @@ class GStreamer(_Player):
         t = message.type
 
         if t == gst.MESSAGE_EOS:
-            log.info("End of stream")
             self.eos_callback()
+            log.info("End of stream")
         elif t == gst.MESSAGE_STATE_CHANGED:
-            log.info("State changed: %s -> %s -> %s", old, new, pending)
             old, new, pending = message.parse_state_changed()
+            log.info("State changed: %s -> %s -> %s", old, new, pending)
         elif t == gst.MESSAGE_ERROR:
-            log.critical( 'Error: %s %s', err, debug )
             err, debug = message.parse_error()
+            log.critical( 'Error: %s %s', err, debug )
             self.stop()
         else:
             log.info("? %s", message.type)
diff --git a/jamaui/ui.py b/jamaui/ui.py
index a276de7..809255b 100644
--- a/jamaui/ui.py
+++ b/jamaui/ui.py
@@ -53,11 +53,13 @@ class PlayerWindow(hildon.StackableWindow):
 
         vbox2 = gtk.VBox()
 
-        self.playlist_pos = gtk.Label("0/0 songs")
-        self.track = gtk.Label("Track name")
+        self.playlist_pos = gtk.Label()
+        self.track = gtk.Label()
         self.progress = hildon.GtkHScale()
-        self.artist = gtk.Label("Artist")
-        self.album = gtk.Label("Album")
+        self.artist = gtk.Label()
+        self.album = gtk.Label()
+
+        self.set_labels('track name', 'artist', 'album', 0, 0)
 
         vbox2.pack_start(self.playlist_pos, False)
         vbox2.pack_start(self.track, False)
@@ -90,17 +92,20 @@ class PlayerWindow(hildon.StackableWindow):
         btn.connect('clicked', cb)
         btns.add(btn)
 
+    def set_labels(self, track, artist, album, playlist_pos, playlist_size):
+        self.playlist_pos.set_markup('<span size="small">%s/%s songs</span>'%(playlist_pos, playlist_size))
+        self.track.set_markup('<span size="large">%s</span>'%(track))
+        self.artist.set_markup(artist)
+        self.album.set_markup('<span foreground="#cccccc">%s</span>'%(album))
+
     def update_state(self):
         item = self.playlist.current()
         if item:
             if not item.name:
                 item.load()
-            self.track.set_text(item.name)
-            self.playlist_pos.set_text("%d/%d songs",
-                                       self.playlist.current_index(),
-                                       len(self.playlist))
-            self.artist.set_text(item.artist_name)
-            self.album.set_text(item.album_name)
+            print "current:", item
+            self.set_labels(item.name, item.artist_name, item.album_name,
+                            self.playlist.current_index(), len(self.playlist))
             self.cover.set_from_file(jamaendo.get_album_cover(item.album_id, size=160))
 
     def on_play(self, button):
-- 
1.7.9.5