Make all fonts default to default.ttf if they are missing

stump · Aug 15, 2010 · 15446a1 · 15446a1
1 parent 0ac3802
commit 15446a1
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/src/Data.py b/src/Data.py
@@ -184,7 +184,7 @@ def __init__(self, resource, svg):
     fontSize  = [44, 108, 34, 32, 30]
 
     if asciiOnly:
-      font    = resource.fileName("default.ttf")
+      font    = resource.fileName(os.path.join("themes",themename,"default.ttf"))
       bigFont = resource.fileName("title.ttf")
     else:
       Log.debug("Main font International.ttf used!")
@@ -260,19 +260,26 @@ def __init__(self, resource, svg):
 
       if self.fileExists(os.path.join("themes",themename,"songlist.ttf")):
         songListFont = resource.fileName(os.path.join("themes",themename,"songlist.ttf"))
-      else:
+      elif self.fileExists(os.path.join("themes",themename,"menu.ttf")):
         songListFont = menuFont
+      else:
+        songListFont = font
+
 
       if self.fileExists(os.path.join("themes",themename,"songlist.ttf")):
         shadowfont = resource.fileName(os.path.join("themes",themename,"songlist.ttf"))
-      else:
+      elif self.fileExists(os.path.join("themes",themename,"menu.ttf")):
         shadowfont = menuFont
-
+      else:
+        shadowfont = font
+
       #blazingamer
       if self.fileExists(os.path.join("themes",themename,"streakphrase.ttf")):
         streakFont2 = resource.fileName(os.path.join("themes",themename,"streakphrase.ttf"))
-      else:
+      elif self.fileExists(os.path.join("themes",themename,"menu.ttf")):
         streakFont2 = menuFont
+      else:
+        streakFont2 = font
 
       #blazingamer:Reorganized
       if self.theme == 0: