X-Git-Url: http://git.maemo.org/git/?p=jamaendo;a=blobdiff_plain;f=jamaui%2Fplayerwindow.py;h=2fd350a13ecd190c0dcc42ac1715818bfcbd695f;hp=2bb65980e1b5a74e1490953dda8cc7ac4116983b;hb=61536ca548691b15e7f63340a0fbfb5a3055d5be;hpb=593d25b94de93d4d989e1a5d5fce1f1aab2baa2f
diff --git a/jamaui/playerwindow.py b/jamaui/playerwindow.py
index 2bb6598..2fd350a 100644
--- 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):
@@ -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 = 'Radio: %s'%(cgi.escape(self.playlist.radio_name))
else:
- ppstr = 'Track %s of %s'%(int(playlist_pos)+1, playlist_size)
+ ppstr = 'Track %s of %s'%(colors.SmallSystemFont(), colors.SecondaryTextColor(), int(playlist_pos)+1, playlist_size)
self.playlist_pos.set_markup(ppstr)
- self.track.set_markup('%s'%(cgi.escape(track)))
- self.artist.set_markup('%s'%(cgi.escape(artist)))
- self.album.set_markup('%s'%(cgi.escape(album)))
+ self.track.set_markup('%s'%(colors.LargeSystemFont(), cgi.escape(track)))
+ self.artist.set_markup('%s'%(cgi.escape(artist)))
+ self.album.set_markup('%s'%(colors.SecondaryTextColor(), cgi.escape(album)))
def show_banner(self, message, timeout = 2000):
banner = hildon.hildon_banner_show_information(self, '', message)