From: pin <pin@fe552daf-6dbe-4428-90eb-1537e0879342>
Date: Wed, 26 May 2010 11:47:31 +0000 (+0000)
Subject: Résolution du path absolu.
X-Git-Url: https://scm.cri.mines-paristech.fr/git/minwii.git/commitdiff_plain/bac4e6ad74c4a1d5ce041c566c439973273ce572?ds=inline;hp=886983ad09edd97504d714017bd02ed92ce0f401

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 f98238b..9313339 100755
--- 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]
+if _here[-2].endswith('.exe') or _here[-2].endswith('*.zip') :
+    _here.pop(-2)
+
 def _computePath(path) :
     path = path.split('/')
     path = _here + path
@@ -18,6 +21,8 @@ def _computePath(path) :
 
 
 pygame.font.init()
+pygamedir = os.path.split(pygame.base.__file__)[0]
+default_font_file = os.path.join(pygamedir, pygame.font.get_default_font())
 
 
 # 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)
-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)
@@ -84,4 +89,4 @@ INSTRUMENTS = (
 )
 
 for i in INSTRUMENTS :
-    i['octave'] = i.get('octave', 0)
\ No newline at end of file
+    i['octave'] = i.get('octave', 0)