Formatting fixes
I remove the old filter bar from ocarina.info, and fix some spacing issues in ocarina.header
This commit is contained in:
parent
5cb70a8b4d
commit
27a964c58a
|
@ -29,5 +29,4 @@ def init():
|
||||||
def add(widget, expand = False, fill = False):
|
def add(widget, expand = False, fill = False):
|
||||||
bar.pack_start(widget, expand, fill)
|
bar.pack_start(widget, expand, fill)
|
||||||
|
|
||||||
|
|
||||||
init()
|
init()
|
||||||
|
|
|
@ -14,7 +14,6 @@ lib_get_cur_id = libsaria.sources.lib_get_cur_id
|
||||||
get_attrs = libsaria.sources.get_attrs
|
get_attrs = libsaria.sources.get_attrs
|
||||||
file_to_id = libsaria.sources.file_to_id
|
file_to_id = libsaria.sources.file_to_id
|
||||||
|
|
||||||
filter = None
|
|
||||||
info = None
|
info = None
|
||||||
|
|
||||||
class Bar(gtk.VBox):
|
class Bar(gtk.VBox):
|
||||||
|
@ -36,20 +35,6 @@ class Bar(gtk.VBox):
|
||||||
self.contents.pack_start(widget, expand, fill)
|
self.contents.pack_start(widget, expand, fill)
|
||||||
|
|
||||||
|
|
||||||
class FilterBar(Bar):
|
|
||||||
def __init__(self):
|
|
||||||
Bar.__init__(self, False)
|
|
||||||
global button
|
|
||||||
global entry
|
|
||||||
|
|
||||||
self.pack(entry.FilterEntry(), True, True)
|
|
||||||
self.pack(button.OpenButton())
|
|
||||||
self.pack(button.ExportButton())
|
|
||||||
self.pack(button.ClearButton())
|
|
||||||
self.pack(button.RandomButton())
|
|
||||||
self.pack(button.VolumeButton())
|
|
||||||
|
|
||||||
|
|
||||||
class InfoBar(Bar):
|
class InfoBar(Bar):
|
||||||
def __init__(self, up_button):
|
def __init__(self, up_button):
|
||||||
Bar.__init__(self, True)
|
Bar.__init__(self, True)
|
||||||
|
@ -175,17 +160,12 @@ def init():
|
||||||
|
|
||||||
libsaria.init_pref("INFOPANEUP", False)
|
libsaria.init_pref("INFOPANEUP", False)
|
||||||
info = TwoWayPane()
|
info = TwoWayPane()
|
||||||
filter = FilterBar()
|
|
||||||
add_info_page("Now Playing", NowPlaying())
|
add_info_page("Now Playing", NowPlaying())
|
||||||
|
|
||||||
def get_info():
|
def get_info():
|
||||||
global info
|
global info
|
||||||
return info
|
return info
|
||||||
|
|
||||||
def get_filter():
|
|
||||||
global filter
|
|
||||||
return filter
|
|
||||||
|
|
||||||
def add_info_page(label, content):
|
def add_info_page(label, content):
|
||||||
global info
|
global info
|
||||||
if label.__class__ == str:
|
if label.__class__ == str:
|
||||||
|
|
Loading…
Reference in New Issue