From 50fe7b28dc28cac67f594d127a5de54dacf662d9 Mon Sep 17 00:00:00 2001
From: Ander <9and3r@gmail.com>
Date: Thu, 22 Jan 2015 11:57:16 +0100
Subject: [PATCH] Code cleanup

---
 mopidy_touchscreen/graphic_utils/list_view.py | 3 ++-
 mopidy_touchscreen/screen_manager.py          | 7 ++++---
 mopidy_touchscreen/screens/library_screen.py  | 3 ++-
 mopidy_touchscreen/screens/main_screen.py     | 6 +++++-
 mopidy_touchscreen/screens/menu_screen.py     | 3 ++-
 mopidy_touchscreen/screens/playlist_screen.py | 3 ++-
 mopidy_touchscreen/screens/search_screen.py   | 6 +++---
 mopidy_touchscreen/screens/tracklist.py       | 4 +++-
 mopidy_touchscreen/touch_screen.py            | 3 +++
 9 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/mopidy_touchscreen/graphic_utils/list_view.py b/mopidy_touchscreen/graphic_utils/list_view.py
index cc39b7c..01ebd3d 100644
--- a/mopidy_touchscreen/graphic_utils/list_view.py
+++ b/mopidy_touchscreen/graphic_utils/list_view.py
@@ -1,6 +1,7 @@
 import logging
 
-from ..input import *
+from ..input import InputManager
+
 from screen_objects import ScreenObjectsManager, ScrollBar, \
     TouchAndTextItem
 
diff --git a/mopidy_touchscreen/screen_manager.py b/mopidy_touchscreen/screen_manager.py
index 8ba4a30..fcf4d37 100644
--- a/mopidy_touchscreen/screen_manager.py
+++ b/mopidy_touchscreen/screen_manager.py
@@ -3,9 +3,10 @@ import traceback
 from pkg_resources import Requirement, resource_filename
 import pygame
 
-from graphic_utils import *
-from input import *
-from screens import *
+from graphic_utils import DynamicBackground, ScreenObjectsManager, TouchAndTextItem
+from input import InputManager
+from screens import LibraryScreen, MainScreen, MenuScreen,\
+    PlaylistScreen, SearchScreen, Tracklist
 
 
 logger = logging.getLogger(__name__)
diff --git a/mopidy_touchscreen/screens/library_screen.py b/mopidy_touchscreen/screens/library_screen.py
index 0a8cfac..63e25a7 100644
--- a/mopidy_touchscreen/screens/library_screen.py
+++ b/mopidy_touchscreen/screens/library_screen.py
@@ -1,7 +1,8 @@
 import mopidy.models
 
 from base_screen import BaseScreen
-from ..graphic_utils import *
+
+from ..graphic_utils import ListView
 
 
 class LibraryScreen(BaseScreen):
diff --git a/mopidy_touchscreen/screens/main_screen.py b/mopidy_touchscreen/screens/main_screen.py
index 4c4e347..fa30e28 100644
--- a/mopidy_touchscreen/screens/main_screen.py
+++ b/mopidy_touchscreen/screens/main_screen.py
@@ -6,11 +6,15 @@ import time
 import urllib
 import urllib2
 from threading import Thread
+
 import mopidy.core
 
+import pygame
+
 from base_screen import BaseScreen
+
 from ..input import InputManager
-from ..graphic_utils import *
+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 1e62e29..aae4109 100644
--- a/mopidy_touchscreen/screens/menu_screen.py
+++ b/mopidy_touchscreen/screens/menu_screen.py
@@ -3,8 +3,9 @@ import socket
 import mopidy
 
 from base_screen import BaseScreen
+
 from ..input import InputManager
-from ..graphic_utils import *
+from ..graphic_utils import ScreenObjectsManager, TouchAndTextItem
 
 
 class MenuScreen(BaseScreen):
diff --git a/mopidy_touchscreen/screens/playlist_screen.py b/mopidy_touchscreen/screens/playlist_screen.py
index bdb7f53..27f4ace 100644
--- a/mopidy_touchscreen/screens/playlist_screen.py
+++ b/mopidy_touchscreen/screens/playlist_screen.py
@@ -1,5 +1,6 @@
 from base_screen import BaseScreen
-from ..graphic_utils import *
+
+from ..graphic_utils import ListView
 
 
 class PlaylistScreen(BaseScreen):
diff --git a/mopidy_touchscreen/screens/search_screen.py b/mopidy_touchscreen/screens/search_screen.py
index a8b4d7f..38305e7 100644
--- a/mopidy_touchscreen/screens/search_screen.py
+++ b/mopidy_touchscreen/screens/search_screen.py
@@ -1,8 +1,8 @@
-import pygame
-
 from base_screen import BaseScreen
+
 from ..input import InputManager
-from ..graphic_utils import *
+from ..graphic_utils import ListView,\
+    ScreenObjectsManager, TextItem, TouchAndTextItem
 
 mode_track_name = 0
 mode_album_name = 1
diff --git a/mopidy_touchscreen/screens/tracklist.py b/mopidy_touchscreen/screens/tracklist.py
index deba7ab..a2beceb 100644
--- a/mopidy_touchscreen/screens/tracklist.py
+++ b/mopidy_touchscreen/screens/tracklist.py
@@ -1,5 +1,7 @@
 from base_screen import BaseScreen
-from ..graphic_utils import *
+
+from ..graphic_utils import ListView
+
 from .main_screen import MainScreen
 
 
diff --git a/mopidy_touchscreen/touch_screen.py b/mopidy_touchscreen/touch_screen.py
index ad826ca..22a5632 100644
--- a/mopidy_touchscreen/touch_screen.py
+++ b/mopidy_touchscreen/touch_screen.py
@@ -2,8 +2,11 @@ import logging
 import os
 import traceback
 from threading import Thread
+
 from mopidy import core, utils
+
 import pygame
+
 import pykka
 
 from .screen_manager import ScreenManager