From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Sun, 26 Jun 2016 17:21:10 +0000 (+0200)
Subject: Move kv file
X-Git-Tag: 1.0.0~73
X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git;a=commitdiff_plain;h=e4846541aa226de8b231cc401fcaa6f058246d1c

Move kv file
---

diff --git a/musicsampler.kv b/music_sampler.kv
similarity index 100%
rename from musicsampler.kv
rename to music_sampler.kv
diff --git a/music_sampler.py b/music_sampler.py
index a7faea2..81b96c4 100644
--- a/music_sampler.py
+++ b/music_sampler.py
@@ -9,11 +9,7 @@ from kivy.core.window import Window
 from kivy.lang import Builder
 from helpers.key import Key
 from helpers.mapping import Mapping
-
-import sys
-
-if getattr(sys, 'frozen', False):
-    Builder.load_file(sys._MEIPASS + '/musicsampler.kv')
+import helpers
 
 class PlayList(RelativeLayout):
     playlist = ListProperty([])
@@ -67,4 +63,5 @@ class MusicSamplerApp(App):
         return Screen()
 
 if __name__ == '__main__':
+    Builder.load_file(helpers.path() + "/music_sampler.kv")
     MusicSamplerApp().run()
diff --git a/music_sampler.spec b/music_sampler.spec
index a56c2dd..ef949f2 100644
--- a/music_sampler.spec
+++ b/music_sampler.spec
@@ -8,7 +8,7 @@ a = Analysis(['music_sampler.py'],
              binaries=None,
              datas=[
               ('fonts/*', 'fonts'),
-              ('musicsampler.kv', '.')
+              ('music_sampler.kv', '.')
              ],
              hookspath=hookspath(),
              runtime_hooks=runtime_hooks(),