WebSVN – tpanel – Diff – /trunk/tfont.cpp

         font.faceIndex = 29;
         font.size = 8;
         mFonts.insert(pair<int, FONT_T>(font.number, font));
+    }
+    // Now the fonts for setup pages
+    systemFonts(true);
     // read the individual fonts from file
     TError::clear();
     string projectPath = TConfig::getProjectPath();
-    if (!fs::exists(projectPath + "/prj.xma"))
-        projectPath += "/__system";
     string path = makeFileName(projectPath, "fnt.xma");
     if (!isValidFile())
+    {
         MSG_ERROR("File " << path << " doesn't exist or is not readable!");
+    }
     mutex_font.unlock();
+}
-bool TFont::systemFonts()
+bool TFont::systemFonts(bool setup)
+{
-    DECL_TRACER("TFont::systemFonts()");
+    DECL_TRACER("TFont::systemFonts(bool setup)");
+    string path;
+    if (setup)
+        path = makeFileName(TConfig::getSystemProjectPath(), "/fnt.xma");
+    else
-    string path = makeFileName(TConfig::getProjectPath(), "__system/graphics/fnt.xma");
+        path = makeFileName(TConfig::getSystemProjectPath(), "/graphics/fnt.xma");
     if (!isValidFile())
+    {
         MSG_ERROR("File " << path << " doesn't exist or is not readable!");
         TError::setError();

Subversion Repositories tpanel