Ander 11 lat temu
rodzic
commit
50fe7b28dc

+ 2 - 1
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
 

+ 4 - 3
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__)

+ 2 - 1
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):

+ 5 - 1
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__)

+ 2 - 1
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):

+ 2 - 1
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):

+ 3 - 3
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

+ 3 - 1
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
 
 

+ 3 - 0
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