Change typeface loading methods in CustomLookAndFeel; doesn't fix problem with loading fonts

Source/UI/CustomLookAndFeel.cpp

@@ -60,13 +60,13 @@ CustomLookAndFeel::CustomLookAndFeel() :
 {
 
   // UNCOMMENT AFTER UPDATE
-  // typefaceMap.set(String("Default Extra Light"), cpmonoExtraLight);
-  // typefaceMap.set(String("Default Light"), cpmonoLight);
-  // typefaceMap.set(String("Default"), cpmonoPlain);
-  // typefaceMap.set(String("Default Bold"), cpmonoBold);
-  // typefaceMap.set(String("Default Black"), cpmonoBlack);
-  // typefaceMap.set(String("Paragraph"), misoRegular);
-  // typefaceMap.set(String("Silkscreen"), silkscreen);
+    typefaceMap.set(String("Default Extra Light"), cpmonoExtraLight);
+    typefaceMap.set(String("Default Light"), cpmonoLight);
+    typefaceMap.set(String("Default"), cpmonoPlain);
+    typefaceMap.set(String("Default Bold"), cpmonoBold);
+    typefaceMap.set(String("Default Black"), cpmonoBlack);
+    typefaceMap.set(String("Paragraph"), misoRegular);
+    typefaceMap.set(String("Silkscreen"), silkscreen);
 
   enum {
     PROCESSOR_COLOR = 0x801,
@@ -100,38 +100,38 @@ const Typeface::Ptr CustomLookAndFeel::getTypefaceForFont (const Font& font)
     String typefaceName = font.getTypefaceName();
 
     // some of these names might be unnecessary, and there may be good ones
-    // missing.  adjust as needed
-    if (typefaceName.equalsIgnoreCase("Default Extra Light"))
-    {
-        return cpmonoExtraLight;
-    } else if (typefaceName.equalsIgnoreCase("Default Light"))
-    {
-        return cpmonoLight;
-    } else if (typefaceName.equalsIgnoreCase("Default"))
-    {
-        return cpmonoPlain;
-    } else if (typefaceName.equalsIgnoreCase("Default Bold"))
-    {
-        return cpmonoBold;
-    } else if (typefaceName.equalsIgnoreCase("Default Black"))
-    {
-        return cpmonoBlack;
-    } else if (typefaceName.equalsIgnoreCase("Paragraph"))
-    {
-        return misoRegular;
-    } else if (typefaceName.equalsIgnoreCase("Small Text"))
-    {
-        return silkscreen;
-    } else // default
-    {
-        return LookAndFeel::getTypefaceForFont(font);
-    }
+    // missing. adjust as needed
+//    if (typefaceName.equalsIgnoreCase("Default Extra Light"))
+//    {
+//        return cpmonoExtraLight;
+//    } else if (typefaceName.equalsIgnoreCase("Default Light"))
+//    {
+//        return cpmonoLight;
+//    } else if (typefaceName.equalsIgnoreCase("Default"))
+//    {
+//        return cpmonoPlain;
+//    } else if (typefaceName.equalsIgnoreCase("Default Bold"))
+//    {
+//        return cpmonoBold;
+//    } else if (typefaceName.equalsIgnoreCase("Default Black"))
+//    {
+//        return cpmonoBlack;
+//    } else if (typefaceName.equalsIgnoreCase("Paragraph"))
+//    {
+//        return misoRegular;
+//    } else if (typefaceName.equalsIgnoreCase("Small Text"))
+//    {
+//        return silkscreen;
+//    } else // default
+//    {
+//        return LookAndFeel::getTypefaceForFont(font);
+//    }
 
     // UNCOMMENT AFTER UPDATE
-    // if (typefaceMap.contains(typefaceName))
-    //     return typefaceMap[typefaceName];
-    // else
-    //     return LookAndFeel::getTypefaceForFont(font);
+    if (typefaceMap.contains(typefaceName))
+         return typefaceMap[typefaceName];
+     else
+         return LookAndFeel::getTypefaceForFont(font);
 }
 
 //==================================================================

Source/UI/CustomLookAndFeel.h

@@ -117,7 +117,7 @@ private:
 
     // UNCOMMENT AFTER UPDATE
     // this maps strings to customtypeface pointers
-    //HashMap<String, Typeface::Ptr> typefaceMap;
+    HashMap<String, Typeface::Ptr> typefaceMap;
 
     MemoryInputStream
         cpmonoExtraLightStream,

Source/UI/InfoLabel.cpp

@@ -26,7 +26,7 @@
 InfoLabel::InfoLabel()
 {
 
-	labelFont = Font("Paragraph", 20, Font::plain);
+	labelFont = Font("Small Text", 20, Font::plain);
 
 	infoString = "Welcome to the Open Ephys GUI!\n \n"
 				 "To get starting using the GUI, drag a processor from the list "