From 864f64cc8442016d6cc8ee01b22625cbfa73666f Mon Sep 17 00:00:00 2001 From: Bryan Schumaker Date: Thu, 21 Apr 2011 08:21:32 -0400 Subject: [PATCH] ocarina: Move goto and clear functions Now they are created right before the buttons are. This makes it so I can return buttons that do exactly what I want every time. --- ocarina/body/button.py | 10 ++++++++-- ocarina/body/header/__init__.py | 12 ++---------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/ocarina/body/button.py b/ocarina/body/button.py index 62e2568a..7c387d70 100644 --- a/ocarina/body/button.py +++ b/ocarina/body/button.py @@ -76,10 +76,16 @@ def stop_button(show): def next_button(show): return make_button(gtk.STOCK_MEDIA_NEXT, controls.next, "Next", show) -def goto_button(goto_func, show): +def goto_button(show): + def goto_func(): + from ocarina import body + body.cur_page_goto() return make_button(gtk.STOCK_JUMP_TO, goto_func, "Go To Current Song", show) -def clear_button(clear_func, show): +def clear_button(show): + def clear_func(): + from ocarina import body + body.cur_page_clear() return make_button(gtk.STOCK_CLEAR, clear_func, "Clear Current Source", show) def random_button(is_active, show): diff --git a/ocarina/body/header/__init__.py b/ocarina/body/header/__init__.py index f1139d57..a99d7e89 100644 --- a/ocarina/body/header/__init__.py +++ b/ocarina/body/header/__init__.py @@ -13,21 +13,13 @@ header.pack_start(header_body) header.pack_start(header_sep) header.show_all() -def goto_func(): - from ocarina import body - body.cur_page_goto() - -def clear_func(): - from ocarina import body - body.cur_page_clear() - def add_button(name, button): globals()[name] = button header_body.pack_start(button, False, False) header_body.pack_start(entry.entry) -add_button( "GOTO", button.goto_button(goto_func, True)) -add_button( "CLEAR", button.clear_button(clear_func, True)) +add_button( "GOTO", button.goto_button(True)) +add_button( "CLEAR", button.clear_button(True)) add_button("RANDOM", button.random_button(libsaria.prefs.get_pref("libsaria.random"), True)) #import ocarina