ocarina: Use new filtering functions
I set this up through callbacks. It should filter all sources at once, rather than just the current page.
This commit is contained in:
parent
3f8cba6f16
commit
4f8f4d3ce3
|
@ -54,9 +54,6 @@ def show_page(page, switch = False):
|
||||||
if switch == True:
|
if switch == True:
|
||||||
switch_to_page(page)
|
switch_to_page(page)
|
||||||
|
|
||||||
def cur_page_filter(text):
|
|
||||||
current_page().filter(text)
|
|
||||||
|
|
||||||
def cur_page_goto():
|
def cur_page_goto():
|
||||||
current_page().goto()
|
current_page().goto()
|
||||||
shortcuts.register_shortcut("g", cur_page_goto)
|
shortcuts.register_shortcut("g", cur_page_goto)
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
import gtk
|
import gtk
|
||||||
import ocarina
|
import ocarina
|
||||||
from ocarina import shortcuts
|
from ocarina import shortcuts
|
||||||
|
from libsaria import sources
|
||||||
|
|
||||||
entry = gtk.Entry()
|
entry = gtk.Entry()
|
||||||
entry.show()
|
entry.show()
|
||||||
|
@ -10,7 +11,7 @@ entry.show()
|
||||||
has_focus = entry.is_focus
|
has_focus = entry.is_focus
|
||||||
|
|
||||||
def do_filter(entry):
|
def do_filter(entry):
|
||||||
ocarina.body.cur_page_filter(entry.get_text())
|
sources.filter(entry.get_text())
|
||||||
entry.connect("changed", do_filter)
|
entry.connect("changed", do_filter)
|
||||||
|
|
||||||
shortcuts.register_shortcut("slash", entry.grab_focus)
|
shortcuts.register_shortcut("slash", entry.grab_focus)
|
||||||
|
|
|
@ -45,3 +45,9 @@ callbacks.on_library_updated = library_updated
|
||||||
def on_queue_changed():
|
def on_queue_changed():
|
||||||
queue.refresh()
|
queue.refresh()
|
||||||
callbacks.on_queue_changed = on_queue_changed
|
callbacks.on_queue_changed = on_queue_changed
|
||||||
|
|
||||||
|
def on_refilter():
|
||||||
|
queue.refilter()
|
||||||
|
playlist.refilter()
|
||||||
|
library.refilter()
|
||||||
|
callbacks.on_refilter = on_refilter
|
||||||
|
|
|
@ -27,11 +27,9 @@ def do_refilter(list, iter):
|
||||||
return libsaria.sources.is_visible(list[iter][0])
|
return libsaria.sources.is_visible(list[iter][0])
|
||||||
lib_page.set_filter_func(do_refilter)
|
lib_page.set_filter_func(do_refilter)
|
||||||
|
|
||||||
def filter(text):
|
def refilter():
|
||||||
library.filter(text)
|
|
||||||
lib_page.refilter()
|
lib_page.refilter()
|
||||||
set_label_text()
|
set_label_text()
|
||||||
LIB_PAGE.filter = filter
|
|
||||||
|
|
||||||
import playlist
|
import playlist
|
||||||
import queue
|
import queue
|
||||||
|
|
|
@ -24,15 +24,13 @@ def refresh():
|
||||||
fill_playlist()
|
fill_playlist()
|
||||||
|
|
||||||
def do_refilter(list, iter):
|
def do_refilter(list, iter):
|
||||||
return playlist.is_visible(list[iter][0])
|
return libsaria.sources.is_visible(list[iter][0])
|
||||||
playlist_page.set_filter_func(do_refilter)
|
playlist_page.set_filter_func(do_refilter)
|
||||||
|
|
||||||
def filter(text):
|
def refilter():
|
||||||
playlist.filter(text)
|
|
||||||
playlist_page.refilter()
|
playlist_page.refilter()
|
||||||
playlist_page.goto()
|
playlist_page.goto()
|
||||||
set_label_text()
|
set_label_text()
|
||||||
PLAYLIST_PAGE.filter = filter
|
|
||||||
|
|
||||||
def clear():
|
def clear():
|
||||||
playlist_page.clear()
|
playlist_page.clear()
|
||||||
|
|
|
@ -31,14 +31,12 @@ def refresh():
|
||||||
fill_queue()
|
fill_queue()
|
||||||
|
|
||||||
def do_refilter(list, iter):
|
def do_refilter(list, iter):
|
||||||
return queue.is_visible(list[iter][0])
|
return libsaria.sources.is_visible(list[iter][0])
|
||||||
queue_page.set_filter_func(do_refilter)
|
queue_page.set_filter_func(do_refilter)
|
||||||
|
|
||||||
def filter(text):
|
def refilter():
|
||||||
queue.filter(text)
|
|
||||||
queue_page.refilter()
|
queue_page.refilter()
|
||||||
set_label_text()
|
set_label_text()
|
||||||
QUEUE_PAGE.filter = filter
|
|
||||||
|
|
||||||
def clear():
|
def clear():
|
||||||
queue_page.clear()
|
queue_page.clear()
|
||||||
|
|
Loading…
Reference in New Issue
Block a user