Code cleanup

This commit is contained in:
9and3r
2014-08-04 13:54:59 +02:00
parent 9ade6ebf2d
commit 69020a89de
5 changed files with 20 additions and 14 deletions

View File

@@ -2,6 +2,7 @@ import logging
from .touch_manager import TouchManager
from .screen_objects import ScreenObjectsManager, TouchAndTextItem, ScrollBar
logger = logging.getLogger(__name__)

View File

@@ -13,6 +13,7 @@ from .dynamic_background import DynamicBackground
from .library_screen import LibraryScreen
from .menu_screen import MenuScreen
logger = logging.getLogger(__name__)
@@ -200,15 +201,16 @@ class ScreenManager():
else:
self.screen_objects_manager.get_touch_object("mute").set_text(
u"\ue622", False)
self.screen_objects_manager.get_touch_object("volume").set_value(volume)
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(

View File

@@ -1,6 +1,7 @@
import pygame
import logging
import time
import pygame
logger = logging.getLogger(__name__)
@@ -43,8 +44,8 @@ class TouchManager():
touch_event = self.mouse_up(event)
return touch_event
elif event.button == 3 and self.down_button == 3:
touch_event = TouchEvent(TouchManager.long_click, self.down_pos,
self.up_pos, None)
touch_event = TouchEvent(TouchManager.long_click,
self.down_pos, self.up_pos, None)
return touch_event
else:
return None
@@ -61,7 +62,8 @@ class TouchManager():
self.up_pos = event.pos
if abs(self.down_pos[0] - self.up_pos[0]) < self.max_move_margin:
if abs(self.down_pos[1] - self.up_pos[1]) < self.max_move_margin:
if time.time() - TouchManager.long_click_min_time > self.down_time:
if time.time() - TouchManager.long_click_min_time > \
self.down_time:
return TouchEvent(TouchManager.long_click, self.down_pos,
self.up_pos, None)
else:

View File

@@ -1,5 +1,6 @@
import pykka
import logging
import pykka
from mopidy import backend
@@ -19,4 +20,4 @@ class TouchScreenBackend(pykka.ThreadingActor, backend.Backend):
elif action == "mute":
self.audio.set_mute(message['value'])
elif action == "random":
self.audio.set_random(message['value'])
self.audio.set_random(message['value'])

View File

@@ -18,10 +18,10 @@ class ExtensionTest(unittest.TestCase):
def test_get_config_schema(self):
ext = Extension()
schema = ext.get_config_schema()
# schema = ext.get_config_schema()
# TODO Test the content of your config schema
#self.assertIn('username', schema)
#self.assertIn('password', schema)
# self.assertIn('username', schema)
# self.assertIn('password', schema)
# TODO Write more tests