瀏覽代碼

Font included in package

9and3r 11 年之前
父節點
當前提交
bc3e3c50e8
共有 5 個文件被更改,包括 6 次插入3 次删除
  1. 2 1
      MANIFEST.in
  2. 二進制
      mopidy_touchscreen/icomoon.ttf
  3. 2 1
      mopidy_touchscreen/screen_manager.py
  4. 2 1
      mopidy_touchscreen/touch_screen.py
  5. 二進制
      setuptools-5.4.2.zip

+ 2 - 1
MANIFEST.in

@@ -4,5 +4,6 @@ include LICENSE
 include MANIFEST.in
 include MANIFEST.in
 include README.rst
 include README.rst
 include mopidy_touchscreen/ext.conf
 include mopidy_touchscreen/ext.conf
+include mopidy_touchscreen/icomoon.ttf
 
 
-recursive-include tests *.py
+recursive-include tests *.py

二進制
mopidy_touchscreen/icomoon.ttf


+ 2 - 1
mopidy_touchscreen/screen_manager.py

@@ -14,6 +14,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
 
 
+from pkg_resources import Requirement, resource_filename
 
 
 logger = logging.getLogger(__name__)
 logger = logging.getLogger(__name__)
 
 
@@ -27,7 +28,7 @@ class ScreenManager():
         self.background = DynamicBackground()
         self.background = DynamicBackground()
         self.current_screen = 0
         self.current_screen = 0
         self.base_size = self.size[1] / 8
         self.base_size = self.size[1] / 8
-        font = os.path.join(os.path.dirname(os.path.realpath(__file__)), "fonts", "icomoon", "fonts", "icomoon.ttf")
+        font = resource_filename(Requirement.parse("mopidy-touchscreen"),"mopidy_touchscreen/icomoon.ttf")
         self.fonts['base'] = pygame.font.SysFont("verdana", self.base_size)
         self.fonts['base'] = pygame.font.SysFont("verdana", self.base_size)
         self.fonts['icon'] = pygame.font.Font(font, self.base_size)
         self.fonts['icon'] = pygame.font.Font(font, self.base_size)
         try:
         try:

+ 2 - 1
mopidy_touchscreen/touch_screen.py

@@ -22,7 +22,7 @@ class TouchScreen(pykka.ThreadingActor, core.CoreListener):
         self.cache_dir = config['touchscreen']['cache_dir']
         self.cache_dir = config['touchscreen']['cache_dir']
         self.fullscreen = config['touchscreen']['fullscreen']
         self.fullscreen = config['touchscreen']['fullscreen']
         pygame.init()
         pygame.init()
-        pygame.mouse.set_visible(config['touchscreen']['cursor'])
+        self.cursor = config['touchscreen']['cursor']
         self.screen_manager = ScreenManager(self.screen_size, self.core, self.backend, self.cache_dir)
         self.screen_manager = ScreenManager(self.screen_size, self.core, self.backend, self.cache_dir)
 
 
     def start_thread(self):
     def start_thread(self):
@@ -31,6 +31,7 @@ class TouchScreen(pykka.ThreadingActor, core.CoreListener):
             screen = pygame.display.set_mode(self.screen_size, pygame.FULLSCREEN)
             screen = pygame.display.set_mode(self.screen_size, pygame.FULLSCREEN)
         else:
         else:
             screen = pygame.display.set_mode(self.screen_size)
             screen = pygame.display.set_mode(self.screen_size)
+	pygame.mouse.set_visible(self.cursor)
         while self.running:
         while self.running:
             clock.tick(15)
             clock.tick(15)
             screen.blit(self.screen_manager.update(), (0, 0))
             screen.blit(self.screen_manager.update(), (0, 0))

二進制
setuptools-5.4.2.zip