From 3680035ba1d848d36164c327bb320a0e3e1aaf54 Mon Sep 17 00:00:00 2001
From: Bryan Schumaker <bjschuma@gmail.com>
Date: Tue, 26 Oct 2010 22:35:43 -0400
Subject: [PATCH] Ocarina import pango

Ocarina should import pango so other modules don't have to.  Anything
that wants to use pango can do this instead:
  import ocarina
  pango = ocarina.pango
---
 ocarina/__init__.py |  1 +
 ocarina/info.py     | 22 +++++++++++++++++-----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/ocarina/__init__.py b/ocarina/__init__.py
index c6ae396e..389e6323 100644
--- a/ocarina/__init__.py
+++ b/ocarina/__init__.py
@@ -2,6 +2,7 @@
 
 import gtk
 import gobject
+import pango
 import libsaria
 
 __major__ = 4
diff --git a/ocarina/info.py b/ocarina/info.py
index 14359f42..5288b508 100644
--- a/ocarina/info.py
+++ b/ocarina/info.py
@@ -1,13 +1,14 @@
 # Bryan Schumaker (8/22/2010)
 
 import ocarina
-import pango
 gtk      = ocarina.gtk
+pango    = ocarina.pango
 libsaria = ocarina.libsaria
 button   = None
 entry    = None
 pbar     = None
 label    = None
+image    = None
 
 lib_get_cur_id = libsaria.collection.lib_get_cur_id
 lib_get_attr   = libsaria.collection.lib_get_attr
@@ -107,20 +108,29 @@ class InfoTab(gtk.Notebook):
 
 class NowPlaying(gtk.HBox):
 	def __init__(self):
-		gtk.HBox.__init__(self, True)
+		gtk.HBox.__init__(self, False, 5)
+		inner = gtk.HBox(True, 5)
 
-		tags = gtk.VBox()
+		tsw = gtk.ScrolledWindow()
+		tsw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_NEVER)
+		view = gtk.Viewport()
+		view.set_shadow_type(gtk.SHADOW_NONE)
+		tags = gtk.VBox(True)
 		tags.pack_start(label.TitleLabel())
 		tags.pack_start(label.ArtistLabel())
 		tags.pack_start(label.AlbumLabel())
-		self.pack_start(tags, True, True)
+		view.add(tags)
+		tsw.add(view)
+		inner.pack_start(tsw)
 
 		attrs = gtk.VBox()
 		attrs.pack_start(label.YearLabel())
 		attrs.pack_start(label.LengthLabel())
 		attrs.pack_start(label.CountLabel())
-		self.pack_start(attrs)
+		inner.pack_start(attrs)
 
+		self.pack_start(image.AlbumArt(), False, False)
+		self.pack_start(inner)
 		self.show_all()
 
 
@@ -147,11 +157,13 @@ def init():
 	global entry
 	global pbar
 	global label
+	global image
 
 	import button
 	import entry
 	import pbar
 	import label
+	import image
 
 	info   = TwoWayPane()
 	filter = FilterBar()