From 6787bbf3787decb0c274e6f23d8bf8fefc9e464f Mon Sep 17 00:00:00 2001 From: kaetemi Date: Tue, 3 Nov 2020 08:04:35 +0800 Subject: [PATCH] Use localized font --- ryzom/client/data/gamedev/interfaces_v3/config.xml | 4 ++-- ryzom/client/data/gamedev/interfaces_v3/login_config.xml | 4 ++-- ryzom/client/data/gamedev/interfaces_v3/out_v2_config.xml | 4 ++-- ryzom/client/data/gamedev/interfaces_v3/outgame_config.xml | 4 ++-- ryzom/client/src/connection.cpp | 4 ++-- ryzom/client/src/init.cpp | 2 +- studio/src/plugins/gui_editor/nelgui_ctrl.cpp | 2 +- studio/src/plugins/object_viewer/object_viewer.cpp | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ryzom/client/data/gamedev/interfaces_v3/config.xml b/ryzom/client/data/gamedev/interfaces_v3/config.xml index d14d799ef..2d681a75f 100644 --- a/ryzom/client/data/gamedev/interfaces_v3/config.xml +++ b/ryzom/client/data/gamedev/interfaces_v3/config.xml @@ -919,8 +919,8 @@ This MUST follow the Enum MISSION_DESC::TIconId - - + + diff --git a/ryzom/client/data/gamedev/interfaces_v3/login_config.xml b/ryzom/client/data/gamedev/interfaces_v3/login_config.xml index f9be0aa43..7a7617e1c 100644 --- a/ryzom/client/data/gamedev/interfaces_v3/login_config.xml +++ b/ryzom/client/data/gamedev/interfaces_v3/login_config.xml @@ -428,8 +428,8 @@ This MUST follow the Enum MISSION_DESC::TIconId - - + + diff --git a/ryzom/client/data/gamedev/interfaces_v3/out_v2_config.xml b/ryzom/client/data/gamedev/interfaces_v3/out_v2_config.xml index 28edb2e98..9dd1b9a4e 100644 --- a/ryzom/client/data/gamedev/interfaces_v3/out_v2_config.xml +++ b/ryzom/client/data/gamedev/interfaces_v3/out_v2_config.xml @@ -13,8 +13,8 @@ - - + + diff --git a/ryzom/client/data/gamedev/interfaces_v3/outgame_config.xml b/ryzom/client/data/gamedev/interfaces_v3/outgame_config.xml index 210313745..cabc9e02c 100644 --- a/ryzom/client/data/gamedev/interfaces_v3/outgame_config.xml +++ b/ryzom/client/data/gamedev/interfaces_v3/outgame_config.xml @@ -13,8 +13,8 @@ - - + + diff --git a/ryzom/client/src/connection.cpp b/ryzom/client/src/connection.cpp index 3cde75dd9..f6a04eabf 100644 --- a/ryzom/client/src/connection.cpp +++ b/ryzom/client/src/connection.cpp @@ -514,7 +514,7 @@ bool connection (const string &cookie, const string &fsaddr) Actions.enable(false); EditActions.enable(false); - resetTextContext("noto_sans.ttf", true); + resetTextContext("uiFontSans", true); if (InterfaceState == GOGOGO_IN_THE_GAME) { @@ -655,7 +655,7 @@ bool reconnection() Actions.enable(false); EditActions.enable(false); - resetTextContext("noto_sans.ttf", true); + resetTextContext("uiFontSans", true); if (InterfaceState == GOGOGO_IN_THE_GAME) { diff --git a/ryzom/client/src/init.cpp b/ryzom/client/src/init.cpp index e770745c6..208b2f70e 100644 --- a/ryzom/client/src/init.cpp +++ b/ryzom/client/src/init.cpp @@ -1342,7 +1342,7 @@ void prelogInit() // Create a text context. We need to put the full path because we not already add search path - resetTextContext("noto_sans.ttf", true); + resetTextContext("uiFontSans", true); CInterfaceManager::getInstance(); diff --git a/studio/src/plugins/gui_editor/nelgui_ctrl.cpp b/studio/src/plugins/gui_editor/nelgui_ctrl.cpp index 6b4517304..804dad8e1 100644 --- a/studio/src/plugins/gui_editor/nelgui_ctrl.cpp +++ b/studio/src/plugins/gui_editor/nelgui_ctrl.cpp @@ -71,7 +71,7 @@ namespace GUIEditor NLMISC::CPath::remapExtension( "png", "tga", true ); w->init(); - w->createTextContext("noto_sans.ttf"); + w->createTextContext("uiFontSans"); NLGUI::CAHManager::setEditorMode( true ); NLGUI::CLuaManager::setEditorMode( true ); diff --git a/studio/src/plugins/object_viewer/object_viewer.cpp b/studio/src/plugins/object_viewer/object_viewer.cpp index 528d34bc6..efac76aec 100644 --- a/studio/src/plugins/object_viewer/object_viewer.cpp +++ b/studio/src/plugins/object_viewer/object_viewer.cpp @@ -460,7 +460,7 @@ void CObjectViewer::loadConfig() #endif _CameraFocal = settings->value("CameraFocal", 75).toInt(); - _FontName = settings->value(Constants::FONT, "noto_sans.ttf").toString().toUtf8().constData(); + _FontName = settings->value(Constants::FONT, "uiFontSans").toString().toUtf8().constData(); _BloomEffect = settings->value(Constants::ENABLE_BLOOM, false).toBool(); _BloomDensity = settings->value(Constants::BLOOM_DENSITY, 0).toInt(); _BloomSquare = settings->value(Constants::ENABLE_SQUARE_BLOOM, false).toBool();