diff options
-rw-r--r-- | music_sampler.spec | 10 | ||||
-rw-r--r-- | music_sampler/app.py | 7 |
2 files changed, 12 insertions, 5 deletions
diff --git a/music_sampler.spec b/music_sampler.spec index 5549b76..bd69562 100644 --- a/music_sampler.spec +++ b/music_sampler.spec | |||
@@ -6,7 +6,7 @@ from kivy.tools.packaging.pyinstaller_hooks import get_deps_minimal,\ | |||
6 | 6 | ||
7 | import importlib.machinery | 7 | import importlib.machinery |
8 | sysfont = importlib.machinery\ | 8 | sysfont = importlib.machinery\ |
9 | .SourceFileLoader('sysfont', os.getcwd() + '/music_sampler/sysfont.py') \ | 9 | .SourceFileLoader('sysfont', os.getcwd()+'/music_sampler/sysfont.py') \ |
10 | .load_module() | 10 | .load_module() |
11 | 11 | ||
12 | excluded_and_hidden_modules = get_deps_minimal( | 12 | excluded_and_hidden_modules = get_deps_minimal( |
@@ -40,7 +40,13 @@ a = Analysis(['run.py'], | |||
40 | runtime_hooks=runtime_hooks(), | 40 | runtime_hooks=runtime_hooks(), |
41 | **excluded_and_hidden_modules) | 41 | **excluded_and_hidden_modules) |
42 | 42 | ||
43 | for fontname, style in [("Ubuntu", sysfont.STYLE_NORMAL), ("Ubuntu", sysfont.STYLE_BOLD), ("Symbola", sysfont.STYLE_NONE)]: | 43 | fonts = [ |
44 | ("Ubuntu", sysfont.STYLE_NORMAL), | ||
45 | ("Ubuntu", sysfont.STYLE_BOLD), | ||
46 | ("Symbola", sysfont.STYLE_NONE) | ||
47 | ] | ||
48 | |||
49 | for fontname, style in fonts: | ||
44 | font = sysfont.get_font(fontname, style=style) | 50 | font = sysfont.get_font(fontname, style=style) |
45 | a.datas.append(( | 51 | a.datas.append(( |
46 | 'fonts/{}_{}.ttf'.format(fontname, style), | 52 | 'fonts/{}_{}.ttf'.format(fontname, style), |
diff --git a/music_sampler/app.py b/music_sampler/app.py index cce3969..08a8891 100644 --- a/music_sampler/app.py +++ b/music_sampler/app.py | |||
@@ -6,16 +6,17 @@ import kivy | |||
6 | kivy.require("1.9.1") | 6 | kivy.require("1.9.1") |
7 | from kivy.app import App | 7 | from kivy.app import App |
8 | from kivy.uix.floatlayout import FloatLayout | 8 | from kivy.uix.floatlayout import FloatLayout |
9 | from kivy.uix.stacklayout import StackLayout | ||
10 | from kivy.uix.relativelayout import RelativeLayout | 9 | from kivy.uix.relativelayout import RelativeLayout |
11 | from kivy.properties import ListProperty, StringProperty | 10 | from kivy.properties import ListProperty, StringProperty |
12 | from kivy.core.window import Window | 11 | from kivy.core.window import Window |
13 | from kivy.lang import Builder | 12 | from kivy.lang import Builder |
14 | from .key import Key | ||
15 | from .mapping import Mapping | ||
16 | 13 | ||
17 | register_fonts() | 14 | register_fonts() |
18 | 15 | ||
16 | |||
17 | from .key import Key | ||
18 | from .mapping import Mapping | ||
19 | |||
19 | from .app_blocks.actionlist import * | 20 | from .app_blocks.actionlist import * |
20 | from .app_blocks.playlist import * | 21 | from .app_blocks.playlist import * |
21 | 22 | ||