Febbweiss/mopidy-touchscreen
1
0
Fork 0
mirror of https://github.com/Febbweiss/mopidy-touchscreen.git synced 2026-03-04 22:25:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Ander
2015-01-22 00:23:55 +01:00
parent 3bf0072fdf
commit 161b8381a2
12 changed files with 201 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mopidy_touchscreen/base_screen.py
View File

@@ -1,6 +1,3 @@
__author__ = 'ander'
class BaseScreen(): class BaseScreen():
def __init__(self, size, base_size, manager, fonts): def __init__(self, size, base_size, manager, fonts):

2
mopidy_touchscreen/dynamic_background.py
View File

@@ -1,5 +1,5 @@
import random import random
import logging
change_speed = 2 change_speed = 2

4
mopidy_touchscreen/input_manager.py
View File

@@ -111,8 +111,8 @@ class InputManager():
return InputEvent(InputManager.swipe, self.down_pos, return InputEvent(InputManager.swipe, self.down_pos,
self.up_pos, True, None) self.up_pos, True, None)
elif self.down_pos[1] - self.up_pos[1] < self.max_move_margin: elif self.down_pos[1] - self.up_pos[1] < self.max_move_margin:
if abs(self.down_pos[0] - self.up_pos[ if abs(self.down_pos[0] - self.up_pos[0]) > \
0]) > self.min_swipe_move: self.min_swipe_move:
return InputEvent(InputManager.swipe, self.down_pos, return InputEvent(InputManager.swipe, self.down_pos,
self.up_pos, False, None) self.up_pos, False, None)

13
mopidy_touchscreen/library_screen.py
View File

@@ -54,15 +54,14 @@ class LibraryScreen(BaseScreen):
if clicked == 0: if clicked == 0:
self.go_up_directory() self.go_up_directory()
else: else:
if self.library[ if self.library[clicked - 1].type\
clicked - 1].type == mopidy.models.Ref.TRACK: == mopidy.models.Ref.TRACK:
self.play_uri(self.current_directory, clicked-1) self.play_uri(self.current_directory, clicked-1)
else: else:
self.go_inside_directory( self.go_inside_directory(
self.library[clicked - 1].uri) self.library[clicked - 1].uri)
else: else:
self.go_inside_directory( self.go_inside_directory(self.library[clicked].uri)
self.library[clicked].uri)
def play_uri(self, uri, track_pos): def play_uri(self, uri, track_pos):
self.manager.core.tracklist.clear() self.manager.core.tracklist.clear()
@@ -71,7 +70,9 @@ class LibraryScreen(BaseScreen):
if item.type == mopidy.models.Ref.TRACK: if item.type == mopidy.models.Ref.TRACK:
tracks.append(self.manager.core.library.lookup(item.uri).get()[0]) tracks.append(self.manager.core.library.lookup(item.uri).get()[0])
else: else:
track_pos = track_pos - 1 track_pos -= 1
self.manager.core.tracklist.add(tracks) self.manager.core.tracklist.add(tracks)
self.manager.core.playback.play(tl_track=self.manager.core.tracklist.tl_tracks.get()[track_pos]) self.manager.core.playback.play(
tl_track=self.manager.core.tracklist.tl_tracks.get()
[track_pos])

7
mopidy_touchscreen/list_view.py
View File

@@ -20,10 +20,11 @@ class ListView():
self.list = [] self.list = []
self.scrollbar = False self.scrollbar = False
self.selected = None self.selected = None
self.set_list([])
self.active = [] self.active = []
self.set_list([])
# Sets the list for the lisview. It should be an iterable of strings # Sets the list for the lisview.
# It should be an iterable of strings
def set_list(self, item_list): def set_list(self, item_list):
self.screen_objects.clear() self.screen_objects.clear()
self.list = item_list self.list = item_list
@@ -98,7 +99,6 @@ class ListView():
elif touch_event.direction == InputManager.down: elif touch_event.direction == InputManager.down:
self.move_to(1) self.move_to(1)
# Scroll to direction # Scroll to direction
# direction == 1 will scroll down # direction == 1 will scroll down
# direction == -1 will scroll up # direction == -1 will scroll up
@@ -122,7 +122,6 @@ class ListView():
self.current_item) self.current_item)
self.set_active(self.active) self.set_active(self.active)
# Set active items # Set active items
def set_active(self, active): def set_active(self, active):
for number in self.active: for number in self.active:

83
mopidy_touchscreen/main_screen.py
View File

@@ -8,10 +8,9 @@ import urllib
import urllib2 import urllib2
from threading import Thread from threading import Thread
import pygame import pygame
from .base_screen import BaseScreen
from .base_screen import BaseScreen
from .screen_objects import (Progressbar, ScreenObjectsManager, from .screen_objects import (Progressbar, ScreenObjectsManager,
TextItem,
TouchAndTextItem) TouchAndTextItem)
from .input_manager import InputManager from .input_manager import InputManager
@@ -20,7 +19,8 @@ logger = logging.getLogger(__name__)
class MainScreen(BaseScreen): class MainScreen(BaseScreen):
def __init__(self, size, base_size, manager, fonts, cache, core, background): def __init__(self, size, base_size, manager, fonts, cache, core,
background):
BaseScreen.__init__(self, size, base_size, manager, fonts) BaseScreen.__init__(self, size, base_size, manager, fonts)
self.core = core self.core = core
self.track = None self.track = None
@@ -36,7 +36,6 @@ class MainScreen(BaseScreen):
else: else:
self.track_started(current_track) self.track_started(current_track)
# Top bar # Top bar
self.top_bar = pygame.Surface((self.size[0], self.base_size), self.top_bar = pygame.Surface((self.size[0], self.base_size),
pygame.SRCALPHA) pygame.SRCALPHA)
@@ -94,10 +93,12 @@ class MainScreen(BaseScreen):
self.touch_text_manager.get_touch_object( self.touch_text_manager.get_touch_object(
"time_progress").set_text( "time_progress").set_text(
time.strftime('%M:%S', time.gmtime( time.strftime('%M:%S', time.gmtime(
self.core.playback.time_position.get() / 1000)) + "/" + self.track_duration) self.core.playback.time_position.get() / 1000)) +
"/" + self.track_duration)
if self.image is not None: if self.image is not None:
screen.blit(self.image, ( screen.blit(self.image, (
self.base_size / 2, self.base_size + self.base_size / 2)) self.base_size / 2, self.base_size +
self.base_size / 2))
self.touch_text_manager.render(screen) self.touch_text_manager.render(screen)
return screen return screen
@@ -117,19 +118,19 @@ class MainScreen(BaseScreen):
# Track name # Track name
label = TouchAndTextItem(self.fonts['base'], label = TouchAndTextItem(self.fonts['base'],
MainScreen.get_track_name(track), MainScreen.get_track_name(track),
(x, self.base_size * 2), (x, self.base_size * 2), (width, -1))
(width, -1))
self.touch_text_manager.set_touch_object("track_name", label) self.touch_text_manager.set_touch_object("track_name", label)
# Album name # Album name
label = TouchAndTextItem(self.fonts['base'], label = TouchAndTextItem(self.fonts['base'],
MainScreen.get_track_album_name(track), MainScreen.get_track_album_name
(x, self.base_size * 3), (track), (x, self.base_size * 3),
(width, -1)) (width, -1))
self.touch_text_manager.set_touch_object("album_name", label) self.touch_text_manager.set_touch_object("album_name", label)
# Artist # Artist
label = TouchAndTextItem(self.fonts['base'], self.get_artist_string(), label = TouchAndTextItem(self.fonts['base'],
self.get_artist_string(),
(x, self.base_size * 4), (x, self.base_size * 4),
(width, -1)) (width, -1))
self.touch_text_manager.set_touch_object("artist_name", label) self.touch_text_manager.set_touch_object("artist_name", label)
@@ -150,9 +151,8 @@ class MainScreen(BaseScreen):
# Progress # Progress
progress = Progressbar(self.fonts['base'], progress = Progressbar(self.fonts['base'],
time.strftime('%M:%S', time.gmtime( time.strftime('%M:%S', time.gmtime(
0)) + "/" + time.strftime('%M:%S', 0)) + "/" + time.strftime(
time.gmtime( '%M:%S', time.gmtime(0)),
0)),
(size_1, self.base_size * 6), (size_1, self.base_size * 6),
( (
self.size[0] - size_1 - size_2, self.size[0] - size_1 - size_2,
@@ -220,30 +220,35 @@ class MainScreen(BaseScreen):
logger.info("Cover could not be downloaded") logger.info("Cover could not be downloaded")
# There is no cover so it will use all the screen size for the text # There is no cover
# so it will use all the screen size for the text
width = self.size[0] - self.base_size width = self.size[0] - self.base_size
current = TouchAndTextItem(self.fonts['base'], current = TouchAndTextItem(self.fonts['base'],
MainScreen.get_track_name(self.track), MainScreen.get_track_name
(self.track),
(self.base_size / 2, (self.base_size / 2,
self.base_size * 2), self.base_size * 2),
(width, -1)) (width, -1))
self.touch_text_manager.set_touch_object("track_name", current) self.touch_text_manager.set_touch_object("track_name",
current)
current = TouchAndTextItem(self.fonts['base'], current = TouchAndTextItem(self.fonts['base'],
MainScreen.get_track_album_name( MainScreen.get_track_album_name
self.track), (self.track),
(self.base_size / 2, (self.base_size / 2,
self.base_size * 3), self.base_size * 3),
(width, -1)) (width, -1))
self.touch_text_manager.set_touch_object("album_name", current) self.touch_text_manager.set_touch_object("album_name",
current)
current = TouchAndTextItem(self.fonts['base'], current = TouchAndTextItem(self.fonts['base'],
self.get_artist_string(), self.get_artist_string(),
(self.base_size / 2, (self.base_size / 2,
self.base_size * 4), self.base_size * 4),
(width, -1)) (width, -1))
self.touch_text_manager.set_touch_object("artist_name", current) self.touch_text_manager.set_touch_object("artist_name",
current)
def track_playback_ended(self, tl_track, time_position): def track_playback_ended(self, tl_track, time_position):
self.background.set_target_color(None) self.background.set_target_color(None)
@@ -253,33 +258,39 @@ class MainScreen(BaseScreen):
width = self.size[0] - self.base_size width = self.size[0] - self.base_size
current = TouchAndTextItem(self.fonts['base'], "", current = TouchAndTextItem(self.fonts['base'], "",
(self.base_size / 2, self.base_size * 2), (self.base_size / 2,
self.base_size * 2),
(width, -1)) (width, -1))
self.touch_text_manager.set_touch_object("track_name", current) self.touch_text_manager.set_touch_object("track_name",
current)
current = TouchAndTextItem(self.fonts['base'], "", current = TouchAndTextItem(self.fonts['base'], "",
(self.base_size / 2, self.base_size * 3), (self.base_size / 2,
self.base_size * 3),
(width, -1)) (width, -1))
self.touch_text_manager.set_touch_object("album_name", current) self.touch_text_manager.set_touch_object("album_name",
current)
current = TouchAndTextItem(self.fonts['base'], "", current = TouchAndTextItem(self.fonts['base'], "",
(self.base_size / 2, self.base_size * 4), (self.base_size / 2,
self.base_size * 4),
(width, -1)) (width, -1))
self.touch_text_manager.set_touch_object("artist_name", current) self.touch_text_manager.set_touch_object("artist_name",
current)
def load_image(self): def load_image(self):
size = self.base_size * 4 size = self.base_size * 4
image = pygame.transform.scale(pygame.image.load( image = pygame.transform.scale(pygame.image.load(
self.get_cover_folder() + self.get_cover_folder() +
self.get_image_file_name()).convert(), self.get_image_file_name()).convert(), (size, size))
(size, size)) self.background.set_target_color(
self.background.set_target_color(pygame.transform.average_color(image)) pygame.transform.average_color(image))
self.image = image self.image = image
def touch_event(self, event): def touch_event(self, event):
if event.type == InputManager.click: if event.type == InputManager.click:
objects = self.touch_text_manager.get_touch_objects_in_pos( objects = \
self.touch_text_manager.get_touch_objects_in_pos(
event.current_pos) event.current_pos)
if objects is not None: if objects is not None:
self.click_on_objects(objects, event) self.click_on_objects(objects, event)
@@ -401,7 +412,8 @@ class MainScreen(BaseScreen):
"pause_play").set_text(u"\ue615", False) "pause_play").set_text(u"\ue615", False)
def set_connection(self, connection, loading): def set_connection(self, connection, loading):
internet = self.touch_text_manager.get_touch_object("internet") internet = self.touch_text_manager.get_touch_object(
"internet")
if loading: if loading:
internet.set_text(u"\ue627", None) internet.set_text(u"\ue627", None)
internet.set_active(False) internet.set_active(False)
@@ -409,7 +421,6 @@ class MainScreen(BaseScreen):
internet.set_text(u"\ue602", None) internet.set_text(u"\ue602", None)
internet.set_active(connection) internet.set_active(connection)
@staticmethod @staticmethod
def get_track_name(track): def get_track_name(track):
if track.name is None: if track.name is None:
@@ -419,8 +430,8 @@ class MainScreen(BaseScreen):
@staticmethod @staticmethod
def get_track_album_name(track): def get_track_album_name(track):
if track.album is not None and track.album.name is not None and len( if track.album is not None and track.album.name is not None\
track.album.name) > 0: and len(track.album.name) > 0:
return track.album.name return track.album.name
else: else:
return "Unknow Album" return "Unknow Album"

4
mopidy_touchscreen/menu_screen.py
View File

@@ -66,10 +66,10 @@ class MenuScreen(BaseScreen):
mopidy.utils.process.exit_process() mopidy.utils.process.exit_process()
elif key == "shutdown_icon" or key == "shutdown": elif key == "shutdown_icon" or key == "shutdown":
if os.system("gksu -- shutdown now -h") != 0: if os.system("gksu -- shutdown now -h") != 0:
os.system("shutdown now -h") os.system("sudo shutdown now -h")
elif key == "restart_icon" or key == "restart": elif key == "restart_icon" or key == "restart":
if os.system("gksu -- shutdown -r now") != 0: if os.system("gksu -- shutdown -r now") != 0:
os.system("shutdown -r now") os.system("sudo shutdown -r now")
elif key == "ip": elif key == "ip":
self.check_connection() self.check_connection()

17
mopidy_touchscreen/playlist_screen.py
View File

@@ -6,8 +6,8 @@ class PlaylistScreen(BaseScreen):
def __init__(self, size, base_size, manager, fonts): def __init__(self, size, base_size, manager, fonts):
BaseScreen.__init__(self, size, base_size, manager, fonts) BaseScreen.__init__(self, size, base_size, manager, fonts)
self.list_view = ListView((0, 0), ( self.list_view = ListView((0, 0), (
self.size[0], self.size[1] - self.base_size), self.size[0], self.size[1] -
self.base_size, self.base_size), self.base_size,
self.fonts['base']) self.fonts['base'])
self.playlists_strings = [] self.playlists_strings = []
self.playlists = [] self.playlists = []
@@ -36,7 +36,6 @@ class PlaylistScreen(BaseScreen):
self.playlist_tracks_strings.append(track.name) self.playlist_tracks_strings.append(track.name)
self.list_view.set_list(self.playlist_tracks_strings) self.list_view.set_list(self.playlist_tracks_strings)
def touch_event(self, touch_event): def touch_event(self, touch_event):
clicked = self.list_view.touch_event(touch_event) clicked = self.list_view.touch_event(touch_event)
if clicked is not None: if clicked is not None:
@@ -48,9 +47,9 @@ class PlaylistScreen(BaseScreen):
self.list_view.set_list(self.playlists_strings) self.list_view.set_list(self.playlists_strings)
else: else:
self.manager.core.tracklist.clear() self.manager.core.tracklist.clear()
self.manager.core.tracklist.add(self.playlist_tracks) self.manager.core.tracklist.add(
self.manager.core.playback.play(tl_track=self.manager.core.tracklist.tl_tracks.get()[clicked-1]) self.playlist_tracks)
#self.manager.core.tracklist.clear() self.manager.core.playback.play(
#self.manager.core.tracklist.add( tl_track=
# uri=self.playlists[clicked].uri) self.manager.core.tracklist.tl_tracks.get()
#self.manager.core.playback.play() [clicked-1])

49
mopidy_touchscreen/screen_manager.py
View File

@@ -31,8 +31,19 @@ class ScreenManager():
self.fonts = {} self.fonts = {}
self.background = DynamicBackground() self.background = DynamicBackground()
self.current_screen = library_index self.current_screen = library_index
self.init_manager(size)
# Init variables in init
self.base_size = None
self.size = None
self.screens = None
self.track = None
self.screen_changed = None
self.input_manager = InputManager(size)
self.down_bar_objects = ScreenObjectsManager()
self.down_bar_solid = None
self.down_bar = None
self.init_manager(size)
def init_manager(self, size): def init_manager(self, size):
self.size = size self.size = size
@@ -40,22 +51,22 @@ class ScreenManager():
font = resource_filename( font = resource_filename(
Requirement.parse("mopidy-touchscreen"), Requirement.parse("mopidy-touchscreen"),
"mopidy_touchscreen/icomoon.ttf") "mopidy_touchscreen/icomoon.ttf")
self.fonts['base'] = pygame.font.SysFont("verdana", self.fonts['base'] = pygame.font.SysFont("arial",
self.base_size) self.base_size)
self.fonts['icon'] = pygame.font.Font(font, self.base_size) self.fonts['icon'] = pygame.font.Font(font, self.base_size)
try: try:
self.screens = [ self.screens = [
SearchScreen(size, self.base_size, self, self.fonts), SearchScreen(size, self.base_size, self, self.fonts),
MainScreen(size, self.base_size, self, self.fonts, self.cache, self.core, self.background), MainScreen(size, self.base_size, self, self.fonts,
self.cache, self.core, self.background),
Tracklist(size, self.base_size, self, self.fonts), Tracklist(size, self.base_size, self, self.fonts),
LibraryScreen(size, self.base_size, self, self.fonts), LibraryScreen(size, self.base_size, self, self.fonts),
PlaylistScreen(size, self.base_size, self, self.fonts), PlaylistScreen(size,
self.base_size, self, self.fonts),
MenuScreen(size, self.base_size, self, self.fonts)] MenuScreen(size, self.base_size, self, self.fonts)]
except: except:
traceback.print_exc() traceback.print_exc()
self.track = None self.track = None
self.input_manager = InputManager(size)
self.down_bar_objects = ScreenObjectsManager()
self.screen_changed = True self.screen_changed = True
# Menu buttons # Menu buttons
@@ -100,7 +111,9 @@ class ScreenManager():
# Menu button # Menu button
button = TouchAndTextItem(self.fonts['icon'], u" \ue60a", button = TouchAndTextItem(self.fonts['icon'], u" \ue60a",
(x, self.base_size * 7), button_size, center=True) (x, self.base_size * 7),
button_size,
center=True)
self.down_bar_objects.set_touch_object("menu_5", button) self.down_bar_objects.set_touch_object("menu_5", button)
# Down bar Solid # Down bar Solid
@@ -109,9 +122,9 @@ class ScreenManager():
# Down bar # Down bar
self.down_bar = pygame.Surface( self.down_bar = pygame.Surface(
(self.size[0], self.size[1] - self.base_size * 7), pygame.SRCALPHA) (self.size[0], self.size[1] - self.base_size * 7),
self.down_bar.fill((0,0,0,200)) pygame.SRCALPHA)
self.down_bar.fill((0, 0, 0, 200))
self.options_changed() self.options_changed()
self.mute_changed(self.core.playback.mute.get()) self.mute_changed(self.core.playback.mute.get())
@@ -122,7 +135,8 @@ class ScreenManager():
def update(self): def update(self):
surface = pygame.Surface(self.size) surface = pygame.Surface(self.size)
self.background.draw_background([surface, self.down_bar_solid]) self.background.draw_background([surface,
self.down_bar_solid])
self.screens[self.current_screen].update(surface, self.screens[self.current_screen].update(surface,
self.screen_changed) self.screen_changed)
surface.blit(self.down_bar_solid, (0, self.base_size * 7)) surface.blit(self.down_bar_solid, (0, self.base_size * 7))
@@ -137,7 +151,8 @@ class ScreenManager():
self.screens[tracklist_index].track_started(track) self.screens[tracklist_index].track_started(track)
def track_playback_ended(self, tl_track, time_position): def track_playback_ended(self, tl_track, time_position):
self.screens[main_screen_index].track_playback_ended(tl_track, time_position) self.screens[main_screen_index].track_playback_ended(
tl_track, time_position)
def event(self, event): def event(self, event):
event = self.input_manager.event(event) event = self.input_manager.event(event)
@@ -147,7 +162,9 @@ class ScreenManager():
def manage_event(self, event): def manage_event(self, event):
if event.type == InputManager.click: if event.type == InputManager.click:
objects = self.down_bar_objects.get_touch_objects_in_pos(event.current_pos) objects = \
self.down_bar_objects.get_touch_objects_in_pos(
event.current_pos)
return self.click_on_objects(objects, event) return self.click_on_objects(objects, event)
else: else:
if event.type == InputManager.key: if event.type == InputManager.key:
@@ -163,7 +180,8 @@ class ScreenManager():
self.screens[main_screen_index].volume_changed(volume) self.screens[main_screen_index].volume_changed(volume)
def playback_state_changed(self, old_state, new_state): def playback_state_changed(self, old_state, new_state):
self.screens[main_screen_index].playback_state_changed(old_state, new_state) self.screens[main_screen_index].playback_state_changed(
old_state, new_state)
def mute_changed(self, mute): def mute_changed(self, mute):
self.screens[main_screen_index].mute_changed(mute) self.screens[main_screen_index].mute_changed(mute)
@@ -194,7 +212,8 @@ class ScreenManager():
self.screens[playlist_index].playlists_loaded() self.screens[playlist_index].playlists_loaded()
def set_connection(self, connection, loading): def set_connection(self, connection, loading):
self.screens[main_screen_index].set_connection(connection, loading) self.screens[main_screen_index].set_connection(connection,
loading)
def check_connection(self): def check_connection(self):
self.screens[menu_index].check_connection() self.screens[menu_index].check_connection()

56
mopidy_touchscreen/screen_objects.py
View File

@@ -31,7 +31,6 @@ class ScreenObjectsManager():
def get_touch_object(self, key): def get_touch_object(self, key):
return self.touch_objects[key] return self.touch_objects[key]
def render(self, surface): def render(self, surface):
for key in self.text_objects: for key in self.text_objects:
self.text_objects[key].update() self.text_objects[key].update()
@@ -68,6 +67,7 @@ class ScreenObjectsManager():
self.selected_key = None self.selected_key = None
def change_selected(self, direction, pos): def change_selected(self, direction, pos):
best_key = None
if pos is None: if pos is None:
pos = self.selected.pos pos = self.selected.pos
if direction == InputManager.right: if direction == InputManager.right:
@@ -208,7 +208,6 @@ class BaseItem():
def get_right_pos(self): def get_right_pos(self):
return self.pos[0] + self.size[0] return self.pos[0] + self.size[0]
def update(self): def update(self):
pass pass
@@ -217,7 +216,6 @@ class TextItem(BaseItem):
scroll_speed = 5 scroll_speed = 5
def __init__(self, font, text, pos, size, center=False): def __init__(self, font, text, pos, size, center=False):
self.font = font self.font = font
self.text = text self.text = text
@@ -252,16 +250,19 @@ class TextItem(BaseItem):
self.center = center self.center = center
if self.center: if self.center:
if self.fit_horizontal: if self.fit_horizontal:
self.margin = (self.size[0]-self.box.get_rect().width)/2 self.margin = (self.size[0]-
self.box.get_rect().width)/2
def update(self): def update(self):
if not self.fit_horizontal: if not self.fit_horizontal:
self.step = self.step + TextItem.scroll_speed self.step += TextItem.scroll_speed
if self.step_2 is None: if self.step_2 is None:
if (self.box.get_rect().width - self.step + self.scroll_white_gap) < self.size[0]: if (self.box.get_rect().width - self.step +
self.step_2 = self.box.get_rect().width - self.step + self.scroll_white_gap self.scroll_white_gap) < self.size[0]:
self.step_2 = self.box.get_rect().width \
- self.step + self.scroll_white_gap
else: else:
self.step_2 = self.step_2 - TextItem.scroll_speed self.step_2 -= TextItem.scroll_speed
if self.step_2 < 0: if self.step_2 < 0:
self.step = 0 - self.step_2 self.step = 0 - self.step_2
self.step_2 = None self.step_2 = None
@@ -277,7 +278,8 @@ class TextItem(BaseItem):
area=pygame.Rect(self.step, 0, self.size[0], area=pygame.Rect(self.step, 0, self.size[0],
self.size[1])) self.size[1]))
if self.step_2 is not None: if self.step_2 is not None:
surface.blit(self.box, (self.pos[0]+self.step_2, self.pos[1]), surface.blit(self.box, (self.pos[0]+self.step_2,
self.pos[1]),
area=pygame.Rect(0, 0, self.size[0] - self.step_2, area=pygame.Rect(0, 0, self.size[0] - self.step_2,
self.size[1])) self.size[1]))
@@ -296,9 +298,13 @@ class TouchObject(BaseItem):
BaseItem.__init__(self, pos, size) BaseItem.__init__(self, pos, size)
self.active = False self.active = False
self.selected = False self.selected = False
self.selected_box = pygame.Surface(size,pygame.SRCALPHA) self.selected_box = pygame.Surface(size, pygame.SRCALPHA)
self.selected_box.fill((0,0,0,128)) self.selected_box.fill((0, 0, 0, 128))
pygame.draw.rect(self.selected_box, (255,255,255), self.selected_box.get_rect(), size[1]/10+1) self.selected_box_rectangle = pygame.Surface(size,
pygame.SRCALPHA)
pygame.draw.rect(self.selected_box_rectangle, (255, 255, 255),
self.selected_box_rectangle.get_rect(),
size[1]/10+1)
def is_pos_inside(self, pos): def is_pos_inside(self, pos):
return self.rect_in_pos.collidepoint(pos) return self.rect_in_pos.collidepoint(pos)
@@ -312,6 +318,15 @@ class TouchObject(BaseItem):
def render(self, surface): def render(self, surface):
if self.selected: if self.selected:
surface.blit(self.selected_box, self.pos) surface.blit(self.selected_box, self.pos)
surface.blit(self.selected_box_rectangle, self.pos)
def pre_render(self, surface):
if self.selected:
surface.blit(self.selected_box, self.pos)
def post_render(self, surface):
if self.selected:
surface.blit(self.selected_box_rectangle, self.pos)
class TouchAndTextItem(TouchObject, TextItem): class TouchAndTextItem(TouchObject, TextItem):
@@ -319,7 +334,6 @@ class TouchAndTextItem(TouchObject, TextItem):
TextItem.__init__(self, font, text, pos, size, center=center) TextItem.__init__(self, font, text, pos, size, center=center)
TouchObject.__init__(self, pos, self.size) TouchObject.__init__(self, pos, self.size)
self.active_color = (0, 150, 255) self.active_color = (0, 150, 255)
self.selected_color = (150, 0, 255)
self.normal_box = self.box self.normal_box = self.box
self.active_box = self.font.render(text, True, self.active_box = self.font.render(text, True,
self.active_color) self.active_color)
@@ -341,8 +355,9 @@ class TouchAndTextItem(TouchObject, TextItem):
self.box = self.normal_box self.box = self.normal_box
def render(self, surface): def render(self, surface):
TouchObject.render(self, surface) TouchObject.pre_render(self, surface)
TextItem.render(self, surface) TextItem.render(self, surface)
TouchObject.post_render(self, surface)
class Progressbar(TouchObject): class Progressbar(TouchObject):
@@ -357,8 +372,9 @@ class Progressbar(TouchObject):
self.value_text = value_text self.value_text = value_text
if value_text: if value_text:
self.text = TextItem(font, str(max_value), pos, None) self.text = TextItem(font, str(max_value), pos, None)
self.text.pos = ( self.text.pos = (self.pos[0]
self.pos[0] + self.size[0] / 2 - self.text.size[0] / + self.size[0] / 2 -
self.text.size[0] /
2, self.text.pos[1]) 2, self.text.pos[1])
self.text.set_text(str(self.value), True) self.text.set_text(str(self.value), True)
else: else:
@@ -367,7 +383,6 @@ class Progressbar(TouchObject):
self.pos[0] + self.size[0] / 2 - self.text.size[0] / self.pos[0] + self.size[0] / 2 - self.text.size[0] /
2, self.text.pos[1]) 2, self.text.pos[1])
def render(self, surface): def render(self, surface):
surface.blit(self.surface, self.pos) surface.blit(self.surface, self.pos)
self.text.render(surface) self.text.render(surface)
@@ -377,9 +392,10 @@ class Progressbar(TouchObject):
self.value = value self.value = value
if self.value_text: if self.value_text:
self.set_text(str(self.value)) self.set_text(str(self.value))
self.text.pos = ( self.text.pos = (self.pos[0]
self.pos[0] + self.size[0] / 2 - self.text.size[0] / + self.size[0] / 2 -
2, self.text.pos[1]) self.text.size[0]
/ 2, self.text.pos[1])
self.surface.fill(self.back_color) self.surface.fill(self.back_color)
pos_pixel = value * self.size[0] / self.max pos_pixel = value * self.size[0] / self.max
rect = pygame.Rect(0, 0, pos_pixel, self.size[1]) rect = pygame.Rect(0, 0, pos_pixel, self.size[1])

40
mopidy_touchscreen/search_screen.py
View File

@@ -20,40 +20,43 @@ class SearchScreen(BaseScreen):
def __init__(self, size, base_size, manager, fonts): def __init__(self, size, base_size, manager, fonts):
BaseScreen.__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.list_view = ListView((0, self.base_size*2), (
self.size[0], self.size[1] - 3*self.base_size), self.size[0], self.size[1] -
self.base_size, 3*self.base_size), self.base_size, manager.fonts['base'])
manager.fonts['base'])
self.results_strings = [] self.results_strings = []
self.results = [] self.results = []
self.screen_objects = ScreenObjectsManager() self.screen_objects = ScreenObjectsManager()
self.query = "" self.query = ""
# Query text # 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) self.screen_objects.set_object("query", text)
# Mode buttons # Mode buttons
button_size = (self.size[0] / 3, self.base_size) 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 # Track button
button = TouchAndTextItem(self.fonts['base'], "Track", button = TouchAndTextItem(self.fonts['base'], "Track",
(0, self.base_size), (0, self.base_size),
button_size, center=True) 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 # Album button
button = TouchAndTextItem(self.fonts['base'], "Album", button = TouchAndTextItem(self.fonts['base'], "Album",
(button_size[0], self.base_size), (button_size[0], self.base_size),
button_size, center=True) 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 # Artist button
button = TouchAndTextItem(self.fonts['base'], "Artist", button = TouchAndTextItem(self.fonts['base'], "Artist",
(button_size[0]*2, self.base_size), (button_size[0]*2, self.base_size),
button_size, center=True) 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 # Top Bar
self.top_bar = pygame.Surface( self.top_bar = pygame.Surface(
@@ -74,12 +77,15 @@ class SearchScreen(BaseScreen):
if mode is not self.mode: if mode is not self.mode:
self.mode = mode self.mode = mode
for key in self.mode_objects_keys: for key in self.mode_objects_keys:
self.screen_objects.get_touch_object(key).set_active(False) self.screen_objects.get_touch_object(key).\
self.screen_objects.get_touch_object(self.mode_objects_keys[self.mode]).set_active(True) set_active(False)
self.screen_objects.get_touch_object(
self.mode_objects_keys[self.mode]).set_active(True)
def set_query(self, query=""): def set_query(self, query=""):
self.query = 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): def search(self, query=None, mode=None):
if query is not None: if query is not None:
@@ -92,8 +98,9 @@ class SearchScreen(BaseScreen):
search_query = {'album': [self.query]} search_query = {'album': [self.query]}
else: else:
search_query = {'artist': [self.query]} search_query = {'artist': [self.query]}
if len(self.query)>0: if len(self.query) > 0:
current_results = self.manager.core.library.search(search_query).get() current_results = self.manager.core.library.search(
search_query).get()
self.results = [] self.results = []
self.results_strings = [] self.results_strings = []
for backend in current_results: for backend in current_results:
@@ -109,8 +116,6 @@ class SearchScreen(BaseScreen):
self.results_strings.append(result.name) self.results_strings.append(result.name)
self.list_view.set_list(self.results_strings) self.list_view.set_list(self.results_strings)
def touch_event(self, touch_event): def touch_event(self, touch_event):
if touch_event.type == InputManager.click: if touch_event.type == InputManager.click:
clicked = self.list_view.touch_event(touch_event) clicked = self.list_view.touch_event(touch_event)
@@ -120,7 +125,8 @@ class SearchScreen(BaseScreen):
uri=self.results[clicked].uri) uri=self.results[clicked].uri)
self.manager.core.playback.play() self.manager.core.playback.play()
else: 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: if len(clicked) > 0:
clicked = clicked[0] clicked = clicked[0]
if clicked == self.mode_objects_keys[0]: if clicked == self.mode_objects_keys[0]:

5
mopidy_touchscreen/tracklist.py
View File

@@ -10,10 +10,13 @@ class Tracklist(BaseScreen):
self.base_size = base_size self.base_size = base_size
self.manager = manager self.manager = manager
self.list_view = ListView((0, 0), ( self.list_view = ListView((0, 0), (
self.size[0], self.size[1] - self.base_size), self.base_size, self.fonts['base']) self.size[0], self.size[1] -
self.base_size), self.base_size, self.fonts['base'])
self.tracks = [] self.tracks = []
self.tracks_strings = [] self.tracks_strings = []
self.update_list() self.update_list()
self.track_started(
self.manager.core.playback.current_tl_track.get())
def update(self, screen, update_all): def update(self, screen, update_all):
self.list_view.render(screen) self.list_view.render(screen)