anna
/
ocarina
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

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
This commit is contained in:
Bryan Schumaker 2010-10-26 22:35:43 -04:00
parent 3b92b00d87
commit 3680035ba1
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ocarina/__init__.py
View File

@ -2,6 +2,7 @@
import gtk import gtk
import gobject import gobject
import pango
import libsaria import libsaria
__major__ = 4 __major__ = 4

22
ocarina/info.py
View File

@ -1,13 +1,14 @@
# Bryan Schumaker (8/22/2010) # Bryan Schumaker (8/22/2010)
import ocarina import ocarina
import pango
gtk = ocarina.gtk gtk = ocarina.gtk
pango = ocarina.pango
libsaria = ocarina.libsaria libsaria = ocarina.libsaria
button = None button = None
entry = None entry = None
pbar = None pbar = None
label = None label = None
image = None
lib_get_cur_id = libsaria.collection.lib_get_cur_id lib_get_cur_id = libsaria.collection.lib_get_cur_id
lib_get_attr = libsaria.collection.lib_get_attr lib_get_attr = libsaria.collection.lib_get_attr
@ -107,20 +108,29 @@ class InfoTab(gtk.Notebook):
class NowPlaying(gtk.HBox): class NowPlaying(gtk.HBox):
def __init__(self): 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.TitleLabel())
tags.pack_start(label.ArtistLabel()) tags.pack_start(label.ArtistLabel())
tags.pack_start(label.AlbumLabel()) 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 = gtk.VBox()
attrs.pack_start(label.YearLabel()) attrs.pack_start(label.YearLabel())
attrs.pack_start(label.LengthLabel()) attrs.pack_start(label.LengthLabel())
attrs.pack_start(label.CountLabel()) 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() self.show_all()
@ -147,11 +157,13 @@ def init():
global entry global entry
global pbar global pbar
global label global label
global image
import button import button
import entry import entry
import pbar import pbar
import label import label
import image
info = TwoWayPane() info = TwoWayPane()
filter = FilterBar() filter = FilterBar()