New progress bar

[jamaendo] / jamaui / playerwindow.py

diff --git a/jamaui/playerwindow.py b/jamaui/playerwindow.py
index 2bb6598..1ff65f8 100644 (file)
--- a/jamaui/playerwindow.py
+++ b/jamaui/playerwindow.py
@@ -23,7 +23,10 @@
 #
 import gtk
 import gobject
-import hildon
+try:
+    import hildon
+except:
+    import helldon as hildon
 import util
 import pango
 import jamaendo
@@ -35,6 +38,7 @@ import cgi
 
 from songposition import SongPosition
 from listbox import ListDialog
+import colors
 log = logging.getLogger(__name__)
 
 class PlayerWindow(hildon.StackableWindow):
@@ -51,9 +55,9 @@ class PlayerWindow(hildon.StackableWindow):
         self.player = the_player
         self.playlist = the_player.playlist
 
-        vbox = gtk.VBox()
+        vbox = gtk.VBox(False, 8)
 
-        hbox = gtk.HBox(False, 8)
+        hbox = gtk.HBox(False)
 
         self.cover = gtk.Image()
         self.set_default_cover()
@@ -81,8 +85,10 @@ class PlayerWindow(hildon.StackableWindow):
         vbox2.pack_start(self.track, True)
         vbox2.pack_start(self.artist, True)
         vbox2.pack_start(self.album, True)
+        vbox2.pack_start(self.progress, False, True)
 
-        hbox.pack_start(self.cover, False, True, 0)
+        hbox.set_border_width(8)
+        hbox.pack_start(self.cover, False, True, 8)
         hbox.pack_start(vbox2, True, True, 0)
 
         vbox.pack_start(hbox, True, True, 0)
@@ -92,8 +98,6 @@ class PlayerWindow(hildon.StackableWindow):
 
         vbox.pack_start(btns, False, True, 0)
 
-        vbox.pack_start(self.progress, False)
-
         self.add_stock_button(btns, gtk.STOCK_MEDIA_PREVIOUS, self.on_prev)
         self.add_play_button(btns)
         self.add_stock_button(btns, gtk.STOCK_MEDIA_STOP, self.on_stop)
@@ -169,6 +173,7 @@ class PlayerWindow(hildon.StackableWindow):
     def add_stock_button(self, btns, stock, cb):
         btn = hildon.GtkButton(gtk.HILDON_SIZE_FINGER_HEIGHT)
         btn.set_relief(gtk.RELIEF_NONE)
+        btn.set_focus_on_click(False)
         sz = gtk.ICON_SIZE_BUTTON
         btn.set_image(gtk.image_new_from_stock(stock, sz))
         btn.connect('clicked', cb)
@@ -199,14 +204,15 @@ class PlayerWindow(hildon.StackableWindow):
             self.playbtn.set_data('state', 'play')
 
     def set_labels(self, track, artist, album, playlist_pos, playlist_size):
+
         if self.playlist.radio_mode:
             ppstr = '<span size="small">Radio: %s</span>'%(cgi.escape(self.playlist.radio_name))
         else:
-            ppstr = '<span size="small">Track %s of %s</span>'%(int(playlist_pos)+1, playlist_size)
+            ppstr = '<span font_desc="%s" foreground="%s">Track %s of %s</span>'%(colors.SmallSystemFont(), colors.SecondaryTextColor(), int(playlist_pos)+1, playlist_size)
         self.playlist_pos.set_markup(ppstr)
-        self.track.set_markup('<span size="x-large">%s</span>'%(cgi.escape(track)))
-        self.artist.set_markup('<span size="large">%s</span>'%(cgi.escape(artist)))
-        self.album.set_markup('<span foreground="#aaaaaa">%s</span>'%(cgi.escape(album)))
+        self.track.set_markup('<span font_desc="%s">%s</span>'%(colors.LargeSystemFont(), cgi.escape(track)))
+        self.artist.set_markup('%s'%(cgi.escape(artist)))
+        self.album.set_markup('<span foreground="%s">%s</span>'%(colors.SecondaryTextColor(), cgi.escape(album)))
 
     def show_banner(self, message, timeout = 2000):
         banner = hildon.hildon_banner_show_information(self, '', message)