From 27a964c58ab031dee8e73abafa1fef02d476a6f4 Mon Sep 17 00:00:00 2001 From: Bryan Schumaker Date: Thu, 25 Nov 2010 13:35:07 -0500 Subject: [PATCH] Formatting fixes I remove the old filter bar from ocarina.info, and fix some spacing issues in ocarina.header --- ocarina/header.py | 1 - ocarina/info.py | 20 -------------------- 2 files changed, 21 deletions(-) diff --git a/ocarina/header.py b/ocarina/header.py index 59b47631..968d41e7 100644 --- a/ocarina/header.py +++ b/ocarina/header.py @@ -29,5 +29,4 @@ def init(): def add(widget, expand = False, fill = False): bar.pack_start(widget, expand, fill) - init() diff --git a/ocarina/info.py b/ocarina/info.py index ca32dade..9fa0ba92 100644 --- a/ocarina/info.py +++ b/ocarina/info.py @@ -14,7 +14,6 @@ lib_get_cur_id = libsaria.sources.lib_get_cur_id get_attrs = libsaria.sources.get_attrs file_to_id = libsaria.sources.file_to_id -filter = None info = None class Bar(gtk.VBox): @@ -36,20 +35,6 @@ class Bar(gtk.VBox): 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): def __init__(self, up_button): Bar.__init__(self, True) @@ -175,17 +160,12 @@ def init(): libsaria.init_pref("INFOPANEUP", False) info = TwoWayPane() - filter = FilterBar() add_info_page("Now Playing", NowPlaying()) def get_info(): global info return info -def get_filter(): - global filter - return filter - def add_info_page(label, content): global info if label.__class__ == str: