mirror of
https://github.com/Febbweiss/mopidy-touchscreen.git
synced 2026-03-04 22:25:39 +00:00
Progressbar color
Volume control working
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
from .main_screen import MainScreen
|
||||
from .touch_manager import TouchManager
|
||||
from .screen_objects import ScreenObjectsManager
|
||||
import pygame
|
||||
import logging
|
||||
|
||||
@@ -8,14 +9,37 @@ logger = logging.getLogger(__name__)
|
||||
|
||||
class ScreenManager():
|
||||
|
||||
def __init__(self, size, core):
|
||||
self.screen_size = size
|
||||
self.screens = [MainScreen(size, self, "/home/ander", core)]
|
||||
def __init__(self, size, core, backend):
|
||||
self.size = size
|
||||
self.core = core
|
||||
self.backend = backend
|
||||
self.fonts = {}
|
||||
self.base_size = self.size[1] / 8
|
||||
self.fonts['dejavuserif'] = pygame.font.SysFont("dejavuserif", self.base_size)
|
||||
self.fonts['dejavusans'] = pygame.font.SysFont("dejavusans", self.base_size)
|
||||
self.screens = [MainScreen(size, self, "/home/ander", core,self.fonts)]
|
||||
self.track = None
|
||||
self.touch_manager = TouchManager()
|
||||
self.touch_manager = TouchManager(size)
|
||||
self.screen_objects_manager = ScreenObjectsManager(size,self.base_size)
|
||||
x = self.screen_objects_manager.add_touch_object("pause_play",self.fonts['dejavusans'],u" ll",(0,0),(255,255,255))
|
||||
x = x + self.base_size / 2
|
||||
x = self.screen_objects_manager.add_touch_object("random",self.fonts['dejavuserif'],u"\u2928",(x,0),(255,255,255))
|
||||
x = x + self.base_size / 2
|
||||
x = self.screen_objects_manager.add_touch_object("repeat",self.fonts['dejavuserif'],u"\u27F21",(x,0),(255,255,255))
|
||||
x = x + self.base_size / 2
|
||||
x = self.screen_objects_manager.add_touch_object("mute",self.fonts['dejavusans'],"Mute",(x,0),(255,255,255))
|
||||
x = x + self.base_size / 2
|
||||
self.screen_objects_manager.add_progressbar("volume",self.fonts['dejavusans'],"100", (x,0), (self.size[0],self.base_size),100, True)
|
||||
self.screen_objects_manager.get_touch_object("volume").set_value(self.core.playback.volume.get())
|
||||
self.top_bar = pygame.Surface((self.size[0],self.base_size),pygame.SRCALPHA)
|
||||
self.top_bar.fill((0,0,0,128))
|
||||
|
||||
def update(self):
|
||||
return self.screens[0].update()
|
||||
surface = pygame.Surface(self.size)
|
||||
self.screens[0].update(surface)
|
||||
surface.blit(self.top_bar,(0,0))
|
||||
self.screen_objects_manager.render(surface)
|
||||
return surface
|
||||
|
||||
def track_started(self, track):
|
||||
self.track = track
|
||||
@@ -24,7 +48,18 @@ class ScreenManager():
|
||||
def event(self, event):
|
||||
touch_event = self.touch_manager.event(event)
|
||||
if touch_event is not None:
|
||||
if touch_event.type == TouchManager.click:
|
||||
objects = self.screen_objects_manager.get_touch_objects_in_pos(touch_event.current_pos)
|
||||
if objects is not None:
|
||||
for key in objects:
|
||||
if key == "volume":
|
||||
value = self.screen_objects_manager.get_touch_object(key).get_pos_value(touch_event.current_pos)
|
||||
self.backend.tell({'action':'volume','value':value})
|
||||
self.screen_objects_manager.get_touch_object(key).set_value(value)
|
||||
self.screens[0].touch_event(touch_event)
|
||||
|
||||
def volume_changed(self, volume):
|
||||
self.screen_objects_manager.get_touch_object("volume").set_value(volume)
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user