Febbweiss/mopidy-touchscreen
1
0
Fork 0
mirror of https://github.com/Febbweiss/mopidy-touchscreen.git synced 2026-03-04 22:25:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

1
mopidy_touchscreen/list_view.py
View File

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

12
mopidy_touchscreen/screen_manager.py
View File

@@ -13,6 +13,7 @@ from .dynamic_background import DynamicBackground
from .library_screen import LibraryScreen from .library_screen import LibraryScreen
from .menu_screen import MenuScreen from .menu_screen import MenuScreen
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@@ -200,15 +201,16 @@ class ScreenManager():
else: else:
self.screen_objects_manager.get_touch_object("mute").set_text( self.screen_objects_manager.get_touch_object("mute").set_text(
u"\ue622", False) 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): def playback_state_changed(self, old_state, new_state):
if new_state == mopidy.core.PlaybackState.PLAYING: if new_state == mopidy.core.PlaybackState.PLAYING:
self.screen_objects_manager.get_touch_object("pause_play").set_text( self.screen_objects_manager.get_touch_object(
u"\ue616", False) "pause_play").set_text(u"\ue616", False)
else: else:
self.screen_objects_manager.get_touch_object("pause_play").set_text( self.screen_objects_manager.get_touch_object(
u"\ue615", False) "pause_play").set_text(u"\ue615", False)
def mute_changed(self, mute): def mute_changed(self, mute):
self.screen_objects_manager.get_touch_object("mute").set_active( self.screen_objects_manager.get_touch_object("mute").set_active(

10
mopidy_touchscreen/touch_manager.py
View File

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

3
mopidy_touchscreen/touch_screen_backend.py
View File

@@ -1,5 +1,6 @@
import pykka
import logging import logging
import pykka
from mopidy import backend from mopidy import backend

6
tests/test_extension.py
View File

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