diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/configuration.h | 1 | ||||
| -rw-r--r-- | src/gui/gui.cpp | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/configuration.h b/src/configuration.h index a2d3b55d..72ae866c 100644 --- a/src/configuration.h +++ b/src/configuration.h @@ -105,6 +105,7 @@ class Configuration std::string mConfigPath; /**< Location of config file */ }; +extern Configuration branding; extern Configuration config; #endif diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index 6803be65..930d4939 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -103,14 +103,16 @@ Gui::Gui(Graphics *graphics): ResourceManager *resman = ResourceManager::getInstance(); // Set global font - std::string path = resman->getPath("fonts/dejavusans.ttf"); + std::string path = resman->getPath( + branding.getValue("guiFont","fonts/dejavusans.ttf")); if (!path.empty()) { mGuiFont = new TrueTypeFont(path.c_str(), 11); } // Set speech font - path = resman->getPath("fonts/dejavusans.ttf"); + path = resman->getPath( + branding.getValue("speechFont","fonts/dejavusans.ttf")); if (!path.empty()) { speechFont = new TrueTypeFont(path.c_str(), 11); |