Recover files

This commit is contained in:
Ander
2015-04-09 01:21:50 +02:00
parent c2b3a16cd3
commit 660258f044
26 changed files with 687 additions and 595 deletions

View File

@@ -1,18 +1,17 @@
import logging
import traceback
import pygame
from graphic_utils import DynamicBackground, \
ScreenObjectsManager, TouchAndTextItem
from input import InputManager
from pkg_resources import Requirement, resource_filename
from .search_screen import SearchScreen
from .library_screen import LibraryScreen
from .main_screen import MainScreen
from .menu_screen import MenuScreen
from .playlist_screen import PlaylistScreen
from .screen_objects import ScreenObjectsManager, \
TouchAndTextItem
from .input_manager import InputManager
from .tracklist import Tracklist
from .dynamic_background import DynamicBackground
import pygame
from screens import LibraryScreen, MainScreen, MenuScreen,\
PlaylistScreen, SearchScreen, Tracklist
logger = logging.getLogger(__name__)
@@ -29,41 +28,49 @@ class ScreenManager():
self.core = core
self.cache = cache
self.fonts = {}
self.background = None
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.input_manager = InputManager(size)
self.down_bar_objects = ScreenObjectsManager()
self.down_bar = None
self.init_manager(size)
def init_manager(self, size):
self.size = size
self.background = DynamicBackground(self.size)
self.current_screen = 0
self.base_size = self.size[1] / 8
font = resource_filename(
Requirement.parse("mopidy-touchscreen"),
"mopidy_touchscreen/icomoon.ttf")
self.fonts['base'] = pygame.font.SysFont("verdana",
self.fonts['base'] = pygame.font.SysFont("arial",
self.base_size)
self.fonts['icon'] = pygame.font.Font(font, self.base_size)
try:
self.screens = [
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),
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)]
except:
traceback.print_exc()
self.track = None
self.input_manager = InputManager(size)
self.down_bar_objects = ScreenObjectsManager()
self.screen_changed = True
# Menu buttons
button_size = (self.size[0] / 6, self.base_size)
# Search button
# Search button
button = TouchAndTextItem(self.fonts['icon'], u" \ue986",
(0, self.base_size * 7),
button_size, center=True)
@@ -101,14 +108,16 @@ class ScreenManager():
# Menu button
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)
# Down bar
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.down_bar.fill((0, 0, 0, 200))
self.options_changed()
self.mute_changed(self.core.playback.mute.get())
@@ -118,13 +127,10 @@ class ScreenManager():
self.change_screen(self.current_screen)
def update(self):
surface = pygame.Surface(self.size)
self.background.draw_background(surface)
self.screens[self.current_screen].update(surface,
self.screen_changed)
surface = self.background.draw_background()
self.screens[self.current_screen].update(surface)
surface.blit(self.down_bar, (0, self.base_size * 7))
self.down_bar_objects.render(surface)
self.screen_changed = False
return surface
def track_started(self, track):
@@ -133,7 +139,8 @@ class ScreenManager():
self.screens[tracklist_index].track_started(track)
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):
event = self.input_manager.event(event)
@@ -143,16 +150,26 @@ class ScreenManager():
def manage_event(self, event):
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)
else:
if event.type == InputManager.key:
if event.direction == InputManager.right:
self.change_screen(self.current_screen+1)
return True
elif event.direction == InputManager.left:
self.change_screen(self.current_screen-1)
return True
return False
def volume_changed(self, volume):
self.screens[main_screen_index].volume_changed(volume)
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):
self.screens[main_screen_index].mute_changed(mute)
@@ -164,12 +181,12 @@ class ScreenManager():
self.screens[main_screen_index].options_changed()
def change_screen(self, new_screen):
self.screen_changed = True
self.down_bar_objects.get_touch_object(
"menu_" + str(self.current_screen)).set_active(False)
self.current_screen = new_screen
self.down_bar_objects.get_touch_object(
"menu_" + str(new_screen)).set_active(True)
if new_screen > -1 and new_screen < len(self.screens):
self.down_bar_objects.get_touch_object(
"menu_" + str(self.current_screen)).set_active(False)
self.current_screen = new_screen
self.down_bar_objects.get_touch_object(
"menu_" + str(new_screen)).set_active(True)
def click_on_objects(self, objects, event):
if objects is not None:
@@ -183,7 +200,8 @@ class ScreenManager():
self.screens[playlist_index].playlists_loaded()
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):
self.screens[menu_index].check_connection()