From 4238508b4c9f197bb862855436ab19c8232d0ab5 Mon Sep 17 00:00:00 2001 From: Ander <9and3r@gmail.com> Date: Thu, 22 Jan 2015 12:07:17 +0100 Subject: [PATCH] Code cleanup --- mopidy_touchscreen/graphic_utils/list_view.py | 4 ++-- mopidy_touchscreen/screen_manager.py | 7 +++++-- mopidy_touchscreen/screens/library_screen.py | 4 ++-- mopidy_touchscreen/screens/main_screen.py | 3 ++- mopidy_touchscreen/screens/menu_screen.py | 3 ++- mopidy_touchscreen/screens/search_screen.py | 6 +++--- mopidy_touchscreen/screens/tracklist.py | 3 +-- 7 files changed, 17 insertions(+), 13 deletions(-) diff --git a/mopidy_touchscreen/graphic_utils/list_view.py b/mopidy_touchscreen/graphic_utils/list_view.py index 01ebd3d..68319fd 100644 --- a/mopidy_touchscreen/graphic_utils/list_view.py +++ b/mopidy_touchscreen/graphic_utils/list_view.py @@ -1,10 +1,10 @@ import logging -from ..input import InputManager - from screen_objects import ScreenObjectsManager, ScrollBar, \ TouchAndTextItem +from ..input import InputManager + logger = logging.getLogger(__name__) diff --git a/mopidy_touchscreen/screen_manager.py b/mopidy_touchscreen/screen_manager.py index fcf4d37..9ce8b78 100644 --- a/mopidy_touchscreen/screen_manager.py +++ b/mopidy_touchscreen/screen_manager.py @@ -1,10 +1,13 @@ import logging import traceback from pkg_resources import Requirement, resource_filename + +from graphic_utils import DynamicBackground, \ + ScreenObjectsManager, TouchAndTextItem +from input import InputManager + import pygame -from graphic_utils import DynamicBackground, ScreenObjectsManager, TouchAndTextItem -from input import InputManager from screens import LibraryScreen, MainScreen, MenuScreen,\ PlaylistScreen, SearchScreen, Tracklist diff --git a/mopidy_touchscreen/screens/library_screen.py b/mopidy_touchscreen/screens/library_screen.py index 63e25a7..436990f 100644 --- a/mopidy_touchscreen/screens/library_screen.py +++ b/mopidy_touchscreen/screens/library_screen.py @@ -1,9 +1,9 @@ -import mopidy.models - from base_screen import BaseScreen from ..graphic_utils import ListView +import mopidy.models + class LibraryScreen(BaseScreen): def __init__(self, size, base_size, manager, fonts): diff --git a/mopidy_touchscreen/screens/main_screen.py b/mopidy_touchscreen/screens/main_screen.py index fa30e28..84b4ed2 100644 --- a/mopidy_touchscreen/screens/main_screen.py +++ b/mopidy_touchscreen/screens/main_screen.py @@ -13,8 +13,9 @@ import pygame from base_screen import BaseScreen +from ..graphic_utils import Progressbar, \ + ScreenObjectsManager, TouchAndTextItem from ..input import InputManager -from ..graphic_utils import ScreenObjectsManager, Progressbar, TouchAndTextItem logger = logging.getLogger(__name__) diff --git a/mopidy_touchscreen/screens/menu_screen.py b/mopidy_touchscreen/screens/menu_screen.py index aae4109..131d996 100644 --- a/mopidy_touchscreen/screens/menu_screen.py +++ b/mopidy_touchscreen/screens/menu_screen.py @@ -1,11 +1,12 @@ import os import socket + import mopidy from base_screen import BaseScreen -from ..input import InputManager from ..graphic_utils import ScreenObjectsManager, TouchAndTextItem +from ..input import InputManager class MenuScreen(BaseScreen): diff --git a/mopidy_touchscreen/screens/search_screen.py b/mopidy_touchscreen/screens/search_screen.py index 1cd0df1..c701baf 100644 --- a/mopidy_touchscreen/screens/search_screen.py +++ b/mopidy_touchscreen/screens/search_screen.py @@ -1,10 +1,10 @@ -import pygame - from base_screen import BaseScreen -from ..input import InputManager from ..graphic_utils import ListView,\ ScreenObjectsManager, TextItem, TouchAndTextItem +from ..input import InputManager + +import pygame mode_track_name = 0 mode_album_name = 1 diff --git a/mopidy_touchscreen/screens/tracklist.py b/mopidy_touchscreen/screens/tracklist.py index a2beceb..96d8386 100644 --- a/mopidy_touchscreen/screens/tracklist.py +++ b/mopidy_touchscreen/screens/tracklist.py @@ -1,8 +1,7 @@ from base_screen import BaseScreen -from ..graphic_utils import ListView - from .main_screen import MainScreen +from ..graphic_utils import ListView class Tracklist(BaseScreen):