mirror of
https://github.com/Febbweiss/mopidy-touchscreen.git
synced 2026-03-04 22:25:39 +00:00
Code cleanup
This commit is contained in:
9and3r
@@ -1,9 +1,7 @@
|
||||
import logging
|
||||
import traceback
|
||||
import os
|
||||
import pygame
|
||||
|
||||
import mopidy
|
||||
from pkg_resources import Requirement, resource_filename
|
||||
|
||||
from .main_screen import MainScreen
|
||||
from .touch_manager import TouchManager
|
||||
@@ -14,8 +12,6 @@ from .dynamic_background import DynamicBackground
|
||||
from .library_screen import LibraryScreen
|
||||
from .menu_screen import MenuScreen
|
||||
|
||||
from pkg_resources import Requirement, resource_filename
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
@@ -28,7 +24,8 @@ class ScreenManager():
|
||||
self.background = DynamicBackground()
|
||||
self.current_screen = 0
|
||||
self.base_size = self.size[1] / 8
|
||||
font = resource_filename(Requirement.parse("mopidy-touchscreen"),"mopidy_touchscreen/icomoon.ttf")
|
||||
font = resource_filename(Requirement.parse("mopidy-touchscreen"),
|
||||
"mopidy_touchscreen/icomoon.ttf")
|
||||
self.fonts['base'] = pygame.font.SysFont("verdana", self.base_size)
|
||||
self.fonts['icon'] = pygame.font.Font(font, self.base_size)
|
||||
try:
|
||||
@@ -44,7 +41,8 @@ class ScreenManager():
|
||||
self.screen_objects_manager = ScreenObjectsManager()
|
||||
|
||||
# Top bar
|
||||
self.top_bar = pygame.Surface((self.size[0], self.base_size), pygame.SRCALPHA)
|
||||
self.top_bar = pygame.Surface((self.size[0], self.base_size),
|
||||
pygame.SRCALPHA)
|
||||
self.top_bar.fill((0, 0, 0, 128))
|
||||
|
||||
# Play/pause
|
||||
@@ -52,12 +50,12 @@ class ScreenManager():
|
||||
self.screen_objects_manager.set_touch_object("pause_play", button)
|
||||
x = button.get_right_pos()
|
||||
|
||||
#Random
|
||||
# Random
|
||||
button = TouchAndTextItem(self.fonts['icon'], u"\ue629 ", (x, 0), None)
|
||||
self.screen_objects_manager.set_touch_object("random", button)
|
||||
x = button.get_right_pos()
|
||||
|
||||
#Repeat
|
||||
# Repeat
|
||||
button = TouchAndTextItem(self.fonts['icon'], u"\ue626", (x, 0), None)
|
||||
self.screen_objects_manager.set_touch_object("repeat", button)
|
||||
x = button.get_right_pos()
|
||||
@@ -78,7 +76,8 @@ class ScreenManager():
|
||||
x = button.get_right_pos()
|
||||
|
||||
#Volume
|
||||
progress = Progressbar(self.fonts['base'], "100", (x, 0), (self.size[0] - x, self.base_size), 100, True)
|
||||
progress = Progressbar(self.fonts['base'], "100", (x, 0),
|
||||
(self.size[0] - x, self.base_size), 100, True)
|
||||
self.screen_objects_manager.set_touch_object("volume", progress)
|
||||
progress.set_value(self.core.playback.volume.get())
|
||||
|
||||
@@ -87,37 +86,44 @@ class ScreenManager():
|
||||
button_size = (self.size[0] / 5, self.base_size)
|
||||
|
||||
#Main button
|
||||
button = TouchAndTextItem(self.fonts['icon'], u" \ue600", (0, self.base_size * 7), button_size)
|
||||
button = TouchAndTextItem(self.fonts['icon'], u" \ue600",
|
||||
(0, self.base_size * 7), button_size)
|
||||
self.screen_objects_manager.set_touch_object("menu_0", button)
|
||||
x = button.get_right_pos()
|
||||
|
||||
#Tracklist button
|
||||
button = TouchAndTextItem(self.fonts['icon'], u" \ue60d", (x, self.base_size * 7), button_size)
|
||||
button = TouchAndTextItem(self.fonts['icon'], u" \ue60d",
|
||||
(x, self.base_size * 7), button_size)
|
||||
self.screen_objects_manager.set_touch_object("menu_1", button)
|
||||
x = button.get_right_pos()
|
||||
|
||||
#Library button
|
||||
button = TouchAndTextItem(self.fonts['icon'], u" \ue604", (x, self.base_size * 7), button_size)
|
||||
button = TouchAndTextItem(self.fonts['icon'], u" \ue604",
|
||||
(x, self.base_size * 7), button_size)
|
||||
self.screen_objects_manager.set_touch_object("menu_2", button)
|
||||
x = button.get_right_pos()
|
||||
|
||||
#Playlist button
|
||||
button = TouchAndTextItem(self.fonts['icon'], u" \ue605", (x, self.base_size * 7), button_size)
|
||||
button = TouchAndTextItem(self.fonts['icon'], u" \ue605",
|
||||
(x, self.base_size * 7), button_size)
|
||||
self.screen_objects_manager.set_touch_object("menu_3", button)
|
||||
x = button.get_right_pos()
|
||||
|
||||
#Menu button
|
||||
button = TouchAndTextItem(self.fonts['icon'], u" \ue60a", (x, self.base_size * 7), None)
|
||||
button = TouchAndTextItem(self.fonts['icon'], u" \ue60a",
|
||||
(x, self.base_size * 7), None)
|
||||
self.screen_objects_manager.set_touch_object("menu_4", button)
|
||||
x = button.get_right_pos()
|
||||
|
||||
#Down bar
|
||||
self.down_bar = pygame.Surface((self.size[0], self.size[1] - self.base_size * 7), pygame.SRCALPHA)
|
||||
self.down_bar = pygame.Surface(
|
||||
(self.size[0], self.size[1] - self.base_size * 7), pygame.SRCALPHA)
|
||||
self.down_bar.fill((0, 0, 0, 128))
|
||||
|
||||
self.options_changed()
|
||||
self.mute_changed(self.core.playback.mute.get())
|
||||
self.playback_state_changed(self.core.playback.state.get(), self.core.playback.state.get())
|
||||
self.playback_state_changed(self.core.playback.state.get(),
|
||||
self.core.playback.state.get())
|
||||
self.screens[4].check_connection()
|
||||
self.change_screen(self.current_screen)
|
||||
|
||||
@@ -142,13 +148,16 @@ class ScreenManager():
|
||||
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)
|
||||
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(
|
||||
value = self.screen_objects_manager.get_touch_object(
|
||||
key).get_pos_value(
|
||||
touch_event.current_pos)
|
||||
self.backend.tell({'action': 'volume', 'value': value})
|
||||
self.backend.tell(
|
||||
{'action': 'volume', 'value': value})
|
||||
self.volume_changed(value)
|
||||
elif key == "pause_play":
|
||||
if self.core.playback.state.get() == mopidy.core.PlaybackState.PLAYING:
|
||||
@@ -166,9 +175,11 @@ class ScreenManager():
|
||||
self.core.tracklist.set_random(random)
|
||||
self.options_changed()
|
||||
elif key == "repeat":
|
||||
self.core.tracklist.set_repeat(not self.core.tracklist.repeat.get())
|
||||
self.core.tracklist.set_repeat(
|
||||
not self.core.tracklist.repeat.get())
|
||||
elif key == "single":
|
||||
self.core.tracklist.set_single(not self.core.tracklist.single.get())
|
||||
self.core.tracklist.set_single(
|
||||
not self.core.tracklist.single.get())
|
||||
elif key == "internet":
|
||||
self.screens[4].check_connection()
|
||||
elif key[:-1] == "menu_":
|
||||
@@ -178,26 +189,34 @@ class ScreenManager():
|
||||
def volume_changed(self, volume):
|
||||
if not self.core.playback.mute.get():
|
||||
if volume > 80:
|
||||
self.screen_objects_manager.get_touch_object("mute").set_text(u"\ue61f", False)
|
||||
self.screen_objects_manager.get_touch_object("mute").set_text(
|
||||
u"\ue61f", False)
|
||||
elif volume > 50:
|
||||
self.screen_objects_manager.get_touch_object("mute").set_text(u"\ue620", False)
|
||||
self.screen_objects_manager.get_touch_object("mute").set_text(
|
||||
u"\ue620", False)
|
||||
elif volume > 20:
|
||||
self.screen_objects_manager.get_touch_object("mute").set_text(u"\ue621", False)
|
||||
self.screen_objects_manager.get_touch_object("mute").set_text(
|
||||
u"\ue621", False)
|
||||
else:
|
||||
logger.error("sartu naiz")
|
||||
self.screen_objects_manager.get_touch_object("mute").set_text(u"\ue622", False)
|
||||
self.screen_objects_manager.get_touch_object("mute").set_text(
|
||||
u"\ue622", False)
|
||||
self.screen_objects_manager.get_touch_object("volume").set_value(volume)
|
||||
|
||||
def playback_state_changed(self, old_state, new_state):
|
||||
if new_state == mopidy.core.PlaybackState.PLAYING:
|
||||
self.screen_objects_manager.get_touch_object("pause_play").set_text(u"\ue616", False)
|
||||
self.screen_objects_manager.get_touch_object("pause_play").set_text(
|
||||
u"\ue616", False)
|
||||
else:
|
||||
self.screen_objects_manager.get_touch_object("pause_play").set_text(u"\ue615", False)
|
||||
self.screen_objects_manager.get_touch_object("pause_play").set_text(
|
||||
u"\ue615", False)
|
||||
|
||||
def mute_changed(self, mute):
|
||||
self.screen_objects_manager.get_touch_object("mute").set_active(not mute)
|
||||
self.screen_objects_manager.get_touch_object("mute").set_active(
|
||||
not mute)
|
||||
if mute:
|
||||
self.screen_objects_manager.get_touch_object("mute").set_text(u"\ue623", False)
|
||||
self.screen_objects_manager.get_touch_object("mute").set_text(
|
||||
u"\ue623", False)
|
||||
else:
|
||||
self.volume_changed(self.core.playback.volume.get())
|
||||
|
||||
@@ -205,14 +224,19 @@ class ScreenManager():
|
||||
self.screens[1].tracklist_changed()
|
||||
|
||||
def options_changed(self):
|
||||
self.screen_objects_manager.get_touch_object("random").set_active(self.core.tracklist.random.get())
|
||||
self.screen_objects_manager.get_touch_object("repeat").set_active(self.core.tracklist.repeat.get())
|
||||
self.screen_objects_manager.get_touch_object("single").set_active(self.core.tracklist.single.get())
|
||||
self.screen_objects_manager.get_touch_object("random").set_active(
|
||||
self.core.tracklist.random.get())
|
||||
self.screen_objects_manager.get_touch_object("repeat").set_active(
|
||||
self.core.tracklist.repeat.get())
|
||||
self.screen_objects_manager.get_touch_object("single").set_active(
|
||||
self.core.tracklist.single.get())
|
||||
|
||||
def change_screen(self, new_screen):
|
||||
self.screen_objects_manager.get_touch_object("menu_" + str(self.current_screen)).set_active(False)
|
||||
self.screen_objects_manager.get_touch_object(
|
||||
"menu_" + str(self.current_screen)).set_active(False)
|
||||
self.current_screen = new_screen
|
||||
self.screen_objects_manager.get_touch_object("menu_" + str(new_screen)).set_active(True)
|
||||
self.screen_objects_manager.get_touch_object(
|
||||
"menu_" + str(new_screen)).set_active(True)
|
||||
|
||||
def playlists_loaded(self):
|
||||
self.screens[3].playlists_loaded()
|
||||
|
||||
Reference in New Issue
Block a user