Code fixes

Do not use backend anymore
This commit is contained in:
Ander
2014-11-20 10:56:45 +01:00
parent 9448674301
commit d8839a5559
15 changed files with 2056 additions and 1935 deletions

View File

@@ -1,6 +1,5 @@
import os
import socket
import mopidy
from .screen_objects import ScreenObjectsManager, TouchAndTextItem
@@ -16,29 +15,38 @@ class MenuScreen():
self.screen_objects = ScreenObjectsManager()
# Exit mopidy button
button = TouchAndTextItem(self.manager.fonts['icon'], u"\ue611",
button = TouchAndTextItem(self.manager.fonts['icon'],
u"\ue611",
(0, self.base_size), None)
self.screen_objects.set_touch_object("exit_icon", button)
button = TouchAndTextItem(self.manager.fonts['base'], "Exit Mopidy",
(button.get_right_pos(), self.base_size),
button = TouchAndTextItem(self.manager.fonts['base'],
"Exit Mopidy",
(button.get_right_pos(),
self.base_size),
None)
self.screen_objects.set_touch_object("exit", button)
# Shutdown button
button = TouchAndTextItem(self.manager.fonts['icon'], u"\ue60b",
button = TouchAndTextItem(self.manager.fonts['icon'],
u"\ue60b",
(0, self.base_size * 2), None)
self.screen_objects.set_touch_object("shutdown_icon", button)
button = TouchAndTextItem(self.manager.fonts['base'], "Shutdown",
(button.get_right_pos(), self.base_size * 2),
button = TouchAndTextItem(self.manager.fonts['base'],
"Shutdown",
(button.get_right_pos(),
self.base_size * 2),
None)
self.screen_objects.set_touch_object("shutdown", button)
# Restart button
button = TouchAndTextItem(self.manager.fonts['icon'], u"\ue609",
button = TouchAndTextItem(self.manager.fonts['icon'],
u"\ue609",
(0, self.base_size * 3), None)
self.screen_objects.set_touch_object("restart_icon", button)
button = TouchAndTextItem(self.manager.fonts['base'], "Restart",
(button.get_right_pos(), self.base_size * 3),
button = TouchAndTextItem(self.manager.fonts['base'],
"Restart",
(button.get_right_pos(),
self.base_size * 3),
None)
self.screen_objects.set_touch_object("restart", button)
@@ -50,9 +58,6 @@ class MenuScreen():
def update(self, screen, update_all):
self.screen_objects.render(screen)
def get_dirty_area(self):
return self.screen_objects.get_dirty_area()
def touch_event(self, event):
if event.type == InputManager.click:
clicked = self.screen_objects.get_touch_objects_in_pos(