Febbweiss/mopidy-touchscreen
1
0
Fork 0
mirror of https://github.com/Febbweiss/mopidy-touchscreen.git synced 2026-03-05 06:35:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix flake8

Browse Source
This commit is contained in:
9and3r
2015-05-23 15:04:02 +02:00
parent f4074da9e1
commit eefc6c40ef
4 changed files with 55 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mopidy_touchscreen/screens/keyboard_screen.py
View File

@@ -119,7 +119,7 @@ class Keyboard(BaseScreen):
self.listener.text_input(text)
self.manager.close_keyboard()
elif touch_event.type == InputManager.key:
if isinstance(touch_event.unicode, unicode):
if not isinstance(touch_event.unicode, int):
if touch_event.unicode == u'\x08':
self.other_objects.get_object("text").remove_text(1, False)
else:

88
mopidy_touchscreen/screens/main_screen.py
View File

@@ -107,9 +107,9 @@ class MainScreen(BaseScreen):
screen.blit(self.top_bar, (0, 0))
self.touch_text_manager.render(screen)
if self.image is not None:
screen.blit(self.image, (
self.base_size / 2, self.base_size +
self.base_size / 2))
screen.blit(self.image, (
self.base_size / 2, self.base_size +
self.base_size / 2))
elif update_type == BaseScreen.update_partial \
and self.track is not None:
@@ -150,26 +150,26 @@ class MainScreen(BaseScreen):
# Track name
label = TextItem(self.fonts['base'],
MainScreen.get_track_name(track),
(x, self.base_size * 2), (width, -1))
MainScreen.get_track_name(track),
(x, self.base_size * 2), (width, -1))
if not label.fit_horizontal:
self.update_keys.append("track_name")
self.touch_text_manager.set_object("track_name", label)
# Album name
label = TextItem(self.fonts['base'],
MainScreen.get_track_album_name
(track), (x, self.base_size * 3),
(width, -1))
MainScreen.get_track_album_name
(track), (x, self.base_size * 3),
(width, -1))
if not label.fit_horizontal:
self.update_keys.append("album_name")
self.touch_text_manager.set_object("album_name", label)
# Artist
label = TextItem(self.fonts['base'],
self.get_artist_string(),
(x, self.base_size * 4),
(width, -1))
self.get_artist_string(),
(x, self.base_size * 4),
(width, -1))
if not label.fit_horizontal:
self.update_keys.append("artist_name")
self.touch_text_manager.set_object("artist_name", label)
@@ -276,36 +276,33 @@ class MainScreen(BaseScreen):
width = self.size[0] - self.base_size
current = TextItem(self.fonts['base'],
MainScreen.get_track_name
(self.track),
(self.base_size / 2,
self.base_size * 2),
(width, -1))
MainScreen.get_track_name
(self.track),
(self.base_size / 2,
self.base_size * 2),
(width, -1))
if not current.fit_horizontal:
self.update_keys.append("track_name")
self.touch_text_manager.set_object("track_name",
current)
self.touch_text_manager.set_object("track_name", current)
current = TextItem(self.fonts['base'],
MainScreen.get_track_album_name
(self.track),
(self.base_size / 2,
self.base_size * 3),
(width, -1))
MainScreen.get_track_album_name
(self.track),
(self.base_size / 2,
self.base_size * 3),
(width, -1))
if not current.fit_horizontal:
self.update_keys.append("album_name")
self.touch_text_manager.set_object("album_name",
current)
self.touch_text_manager.set_object("album_name", current)
current = TextItem(self.fonts['base'],
self.get_artist_string(),
(self.base_size / 2,
self.base_size * 4),
(width, -1))
self.get_artist_string(),
(self.base_size / 2,
self.base_size * 4),
(width, -1))
if not current.fit_horizontal:
self.update_keys.append("artist_name")
self.touch_text_manager.set_object("artist_name",
current)
self.touch_text_manager.set_object("artist_name", current)
self.background.set_background_image(None)
@@ -317,25 +314,22 @@ class MainScreen(BaseScreen):
width = self.size[0] - self.base_size
current = TextItem(self.fonts['base'], "",
(self.base_size / 2,
self.base_size * 2),
(width, -1))
self.touch_text_manager.set_object("track_name",
current)
(self.base_size / 2,
self.base_size * 2),
(width, -1))
self.touch_text_manager.set_object("track_name", current)
current = TextItem(self.fonts['base'], "",
(self.base_size / 2,
self.base_size * 3),
(width, -1))
self.touch_text_manager.set_object("album_name",
current)
(self.base_size / 2,
self.base_size * 3),
(width, -1))
self.touch_text_manager.set_object("album_name", current)
current = TextItem(self.fonts['base'], "",
(self.base_size / 2,
self.base_size * 4),
(width, -1))
self.touch_text_manager.set_object("artist_name",
current)
(self.base_size / 2,
self.base_size * 4),
(width, -1))
self.touch_text_manager.set_object("artist_name", current)
def load_image(self):
size = self.base_size * 4
@@ -484,7 +478,7 @@ class MainScreen(BaseScreen):
@staticmethod
def get_track_album_name(track):
if track.album is not None and track.album.name is not None\
if track.album is not None and track.album.name is not None \
and len(track.album.name) > 0:
return track.album.name
else: