mirror of
https://github.com/Febbweiss/mopidy-touchscreen.git
synced 2026-03-05 06:35:43 +00:00
Cleanup
This commit is contained in:
@@ -20,40 +20,43 @@ class SearchScreen(BaseScreen):
|
||||
def __init__(self, size, base_size, manager, fonts):
|
||||
BaseScreen.__init__(self, size, base_size, manager, fonts)
|
||||
self.list_view = ListView((0, self.base_size*2), (
|
||||
self.size[0], self.size[1] - 3*self.base_size),
|
||||
self.base_size,
|
||||
manager.fonts['base'])
|
||||
self.size[0], self.size[1] -
|
||||
3*self.base_size), self.base_size, manager.fonts['base'])
|
||||
self.results_strings = []
|
||||
self.results = []
|
||||
self.screen_objects = ScreenObjectsManager()
|
||||
self.query = ""
|
||||
|
||||
# Query text
|
||||
text = TextItem(self.fonts['base'],self.query, (0, 0), (self.size[0], self.base_size), center=True)
|
||||
text = TextItem(self.fonts['base'], self.query, (0, 0),
|
||||
(self.size[0], self.base_size), center=True)
|
||||
self.screen_objects.set_object("query", text)
|
||||
|
||||
# Mode buttons
|
||||
button_size = (self.size[0] / 3, self.base_size)
|
||||
self.mode_objects_keys = ["mode_track", "mode_album", "mode_artist"]
|
||||
self.mode_objects_keys = ["mode_track", "mode_album",
|
||||
"mode_artist"]
|
||||
|
||||
# Track button
|
||||
button = TouchAndTextItem(self.fonts['base'], "Track",
|
||||
(0, self.base_size),
|
||||
button_size, center=True)
|
||||
self.screen_objects.set_touch_object(self.mode_objects_keys[0], button)
|
||||
self.screen_objects.set_touch_object(
|
||||
self.mode_objects_keys[0], button)
|
||||
|
||||
# Album button
|
||||
button = TouchAndTextItem(self.fonts['base'], "Album",
|
||||
(button_size[0], self.base_size),
|
||||
button_size, center=True)
|
||||
self.screen_objects.set_touch_object(self.mode_objects_keys[1], button)
|
||||
self.screen_objects.set_touch_object(
|
||||
self.mode_objects_keys[1], button)
|
||||
|
||||
# Artist button
|
||||
button = TouchAndTextItem(self.fonts['base'], "Artist",
|
||||
(button_size[0]*2, self.base_size),
|
||||
button_size, center=True)
|
||||
self.screen_objects.set_touch_object(self.mode_objects_keys[2], button)
|
||||
|
||||
self.screen_objects.set_touch_object(
|
||||
self.mode_objects_keys[2], button)
|
||||
|
||||
# Top Bar
|
||||
self.top_bar = pygame.Surface(
|
||||
@@ -74,12 +77,15 @@ class SearchScreen(BaseScreen):
|
||||
if mode is not self.mode:
|
||||
self.mode = mode
|
||||
for key in self.mode_objects_keys:
|
||||
self.screen_objects.get_touch_object(key).set_active(False)
|
||||
self.screen_objects.get_touch_object(self.mode_objects_keys[self.mode]).set_active(True)
|
||||
self.screen_objects.get_touch_object(key).\
|
||||
set_active(False)
|
||||
self.screen_objects.get_touch_object(
|
||||
self.mode_objects_keys[self.mode]).set_active(True)
|
||||
|
||||
def set_query(self, query=""):
|
||||
self.query = query
|
||||
self.screen_objects.get_object("query").set_text(self.query, False)
|
||||
self.screen_objects.get_object("query").set_text(
|
||||
self.query, False)
|
||||
|
||||
def search(self, query=None, mode=None):
|
||||
if query is not None:
|
||||
@@ -92,8 +98,9 @@ class SearchScreen(BaseScreen):
|
||||
search_query = {'album': [self.query]}
|
||||
else:
|
||||
search_query = {'artist': [self.query]}
|
||||
if len(self.query)>0:
|
||||
current_results = self.manager.core.library.search(search_query).get()
|
||||
if len(self.query) > 0:
|
||||
current_results = self.manager.core.library.search(
|
||||
search_query).get()
|
||||
self.results = []
|
||||
self.results_strings = []
|
||||
for backend in current_results:
|
||||
@@ -109,8 +116,6 @@ class SearchScreen(BaseScreen):
|
||||
self.results_strings.append(result.name)
|
||||
self.list_view.set_list(self.results_strings)
|
||||
|
||||
|
||||
|
||||
def touch_event(self, touch_event):
|
||||
if touch_event.type == InputManager.click:
|
||||
clicked = self.list_view.touch_event(touch_event)
|
||||
@@ -120,7 +125,8 @@ class SearchScreen(BaseScreen):
|
||||
uri=self.results[clicked].uri)
|
||||
self.manager.core.playback.play()
|
||||
else:
|
||||
clicked = self.screen_objects.get_touch_objects_in_pos(touch_event.down_pos)
|
||||
clicked = self.screen_objects.get_touch_objects_in_pos(
|
||||
touch_event.down_pos)
|
||||
if len(clicked) > 0:
|
||||
clicked = clicked[0]
|
||||
if clicked == self.mode_objects_keys[0]:
|
||||
@@ -130,4 +136,4 @@ class SearchScreen(BaseScreen):
|
||||
if clicked == self.mode_objects_keys[2]:
|
||||
self.search(mode=2)
|
||||
else:
|
||||
self.list_view.touch_event(touch_event)
|
||||
self.list_view.touch_event(touch_event)
|
||||
|
||||
Reference in New Issue
Block a user