Febbweiss/mopidy-touchscreen
1
0
Fork 0
mirror of https://github.com/Febbweiss/mopidy-touchscreen.git synced 2026-03-04 22:25:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed cache folder from config file

Browse Source
This commit is contained in:
9and3r
2014-07-29 15:09:25 +02:00
parent 910368fc87
commit 6f8df2b55c
3 changed files with 43 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
mopidy_touchscreen/.idea/workspace.xml generated
View File

@@ -23,11 +23,11 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf> <leaf>
<file leaf-file-name="screen_manager.py" pinned="false" current="true" current-in-tab="true"> <file leaf-file-name="screen_manager.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/screen_manager.py"> <entry file="file://$PROJECT_DIR$/screen_manager.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-3.128788" vertical-offset="2619" max-vertical-offset="3015"> <state vertical-scroll-proportion="0.0" vertical-offset="225" max-vertical-offset="3015">
<caret line="92" column="20" selection-start-line="92" selection-start-column="20" selection-end-line="92" selection-end-column="20" /> <caret line="26" column="24" selection-start-line="26" selection-start-column="24" selection-end-line="26" selection-end-column="24" />
<folding> <folding>
<element signature="e#0#35#0" expanded="true" /> <element signature="e#0#35#0" expanded="true" />
</folding> </folding>
@@ -35,11 +35,23 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="screen_objects.py" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="touch_screen.py" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/screen_objects.py"> <entry file="file://$PROJECT_DIR$/touch_screen.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="2229" max-vertical-offset="3765"> <state vertical-scroll-proportion="1.1363636" vertical-offset="0" max-vertical-offset="1335">
<caret line="152" column="32" selection-start-line="152" selection-start-column="32" selection-end-line="152" selection-end-column="32" /> <caret line="30" column="23" selection-start-line="30" selection-start-column="23" selection-end-line="30" selection-end-column="23" />
<folding>
<element signature="e#0#12#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="main_screen.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/main_screen.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2175">
<caret line="113" column="47" selection-start-line="113" selection-start-column="47" selection-end-line="113" selection-end-column="47" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@@ -60,6 +72,7 @@
<option value="$PROJECT_DIR$/list_view.py" /> <option value="$PROJECT_DIR$/list_view.py" />
<option value="$PROJECT_DIR$/screen_objects.py" /> <option value="$PROJECT_DIR$/screen_objects.py" />
<option value="$PROJECT_DIR$/screen_manager.py" /> <option value="$PROJECT_DIR$/screen_manager.py" />
<option value="$PROJECT_DIR$/touch_screen.py" />
</list> </list>
</option> </option>
</component> </component>
@@ -342,13 +355,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/main_screen.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-0.6840731" vertical-offset="1792" max-vertical-offset="2175">
<caret line="113" column="47" selection-start-line="113" selection-start-column="47" selection-end-line="113" selection-end-column="47" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/menu_screen.py"> <entry file="file://$PROJECT_DIR$/menu_screen.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.3524804" vertical-offset="0" max-vertical-offset="383"> <state vertical-scroll-proportion="0.3524804" vertical-offset="0" max-vertical-offset="383">
@@ -378,16 +384,34 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/main_screen.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2175">
<caret line="113" column="47" selection-start-line="113" selection-start-column="47" selection-end-line="113" selection-end-column="47" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/screen_manager.py"> <entry file="file://$PROJECT_DIR$/screen_manager.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-3.128788" vertical-offset="2619" max-vertical-offset="3015"> <state vertical-scroll-proportion="0.0" vertical-offset="225" max-vertical-offset="3015">
<caret line="92" column="20" selection-start-line="92" selection-start-column="20" selection-end-line="92" selection-end-column="20" /> <caret line="26" column="24" selection-start-line="26" selection-start-column="24" selection-end-line="26" selection-end-column="24" />
<folding> <folding>
<element signature="e#0#35#0" expanded="true" /> <element signature="e#0#35#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/touch_screen.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="1.1363636" vertical-offset="0" max-vertical-offset="1335">
<caret line="30" column="23" selection-start-line="30" selection-start-column="23" selection-end-line="30" selection-end-column="23" />
<folding>
<element signature="e#0#12#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component> </component>
</project> </project>

4
mopidy_touchscreen/screen_manager.py
View File

@@ -15,7 +15,7 @@ logger = logging.getLogger(__name__)
class ScreenManager(): class ScreenManager():
def __init__(self, size, core, backend): def __init__(self, size, core, backend, cache):
self.size = size self.size = size
self.core = core self.core = core
self.backend = backend self.backend = backend
@@ -27,7 +27,7 @@ class ScreenManager():
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:
self.screens = [MainScreen(size, self, "/home/ander", core, self.fonts), self.screens = [MainScreen(size, self, cache, core, self.fonts),
Tracklist(size, self.base_size, self), Tracklist(size, self.base_size, self),
PlaylistScreen(size, self.base_size, self), PlaylistScreen(size, self.base_size, self),
MenuScreen(size, self.base_size, self)] MenuScreen(size, self.base_size, self)]

2
mopidy_touchscreen/touch_screen.py
View File

@@ -24,7 +24,7 @@ class TouchScreen(pykka.ThreadingActor, core.CoreListener):
self.fullscreen = config['touchscreen']['fullscreen'] self.fullscreen = config['touchscreen']['fullscreen']
pygame.init() pygame.init()
pygame.mouse.set_visible(config['touchscreen']['cursor']) pygame.mouse.set_visible(config['touchscreen']['cursor'])
self.screen_manager = ScreenManager(self.screen_size,self.core, self.backend) self.screen_manager = ScreenManager(self.screen_size,self.core, self.backend, self.cache_dir)
def start_thread(self): def start_thread(self):
clock = pygame.time.Clock() clock = pygame.time.Clock()