Résolution du path absolu.

git-svn-id: https://svn.cri.ensmp.fr/svn/minwii/trunk@189 fe552daf-6dbe-4428-90eb-1537e0879342

diff --git a/src/minwii/config.py b/src/minwii/config.py
index f98238bdbb3a724f96b72a9d4a25b116663937b7..93133392135f4affc5a8f8507e6467d0c5a38942 100755 (executable)
--- a/src/minwii/config.py
+++ b/src/minwii/config.py
@@ -10,6 +10,9 @@ import pygame
 import os.path
 
 _here = os.path.abspath(__file__).split(os.path.sep)[:-1]
 import os.path
 
 _here = os.path.abspath(__file__).split(os.path.sep)[:-1]

+if _here[-2].endswith('.exe') or _here[-2].endswith('*.zip') :
+    _here.pop(-2)
+

 def _computePath(path) :
     path = path.split('/')
     path = _here + path
 def _computePath(path) :
     path = path.split('/')
     path = _here + path


@@ -18,6 +21,8 @@ def _computePath(path) :
 
 
 pygame.font.init()
 
 
 pygame.font.init()

+pygamedir = os.path.split(pygame.base.__file__)[0]
+default_font_file = os.path.join(pygamedir, pygame.font.get_default_font())

 
 
 # playingscreen
 
 
 # playingscreen


@@ -32,7 +37,7 @@ ON_COLUMN_OVERSIZING = 2
 ON_COLUMN_ALPHA = 1
 font_file = _computePath('fonts/Arial Unicode.ttf')
 NOTES_FONT = pygame.font.Font(font_file, 50)
 ON_COLUMN_ALPHA = 1
 font_file = _computePath('fonts/Arial Unicode.ttf')
 NOTES_FONT = pygame.font.Font(font_file, 50)

-LYRICS_FONT = pygame.font.Font(None, 80)
+LYRICS_FONT = pygame.font.Font(default_font_file, 80)

 FONT_COLOR = (0,0,0)
 MIDI_VELOCITY_RANGE = (64, 127)
 MIDI_PAN_RANGE = (32, 96)
 FONT_COLOR = (0,0,0)
 MIDI_VELOCITY_RANGE = (64, 127)
 MIDI_PAN_RANGE = (32, 96)


@@ -84,4 +89,4 @@ INSTRUMENTS = (
 )
 
 for i in INSTRUMENTS :
 )
 
 for i in INSTRUMENTS :

-    i['octave'] = i.get('octave', 0)
\ No newline at end of file
+    i['octave'] = i.get('octave', 0)