From 74a4e107b60ad31147d6a4d7f76b056439996f11 Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Sun, 24 Jul 2016 16:07:18 +0300
Subject: [PATCH] Added: Monospace font options

---
 code/nel/include/nel/gui/widget_manager.h                     | 1 +
 code/nel/src/gui/widget_manager.cpp                           | 1 +
 code/ryzom/client/data/gamedev/interfaces_v3/config.xml       | 2 ++
 code/ryzom/client/data/gamedev/interfaces_v3/login_config.xml | 2 ++
 .../ryzom/client/data/gamedev/interfaces_v3/out_v2_config.xml | 2 ++
 .../client/data/gamedev/interfaces_v3/outgame_config.xml      | 2 ++
 code/ryzom/client/src/interface_v3/interface_manager.cpp      | 4 ++++
 7 files changed, 14 insertions(+)

diff --git a/code/nel/include/nel/gui/widget_manager.h b/code/nel/include/nel/gui/widget_manager.h
index cfb51af8e..2f9220cda 100644
--- a/code/nel/include/nel/gui/widget_manager.h
+++ b/code/nel/include/nel/gui/widget_manager.h
@@ -442,6 +442,7 @@ namespace NLGUI
 			OptionTimeoutMessages,
 			OptionTimeoutContext,
 			OptionTimeoutContextHtml,
+			OptionMonospaceFont,
 			NumSystemOptions
 		};
 		
diff --git a/code/nel/src/gui/widget_manager.cpp b/code/nel/src/gui/widget_manager.cpp
index f866594c9..bd8dfb5fe 100644
--- a/code/nel/src/gui/widget_manager.cpp
+++ b/code/nel/src/gui/widget_manager.cpp
@@ -3170,6 +3170,7 @@ namespace NLGUI
 			_SystemOptions[OptionTimeoutMessages]= opt->getValue("messages_timeout");
 			_SystemOptions[OptionTimeoutContext]= opt->getValue("context_timeout");
 			_SystemOptions[OptionTimeoutContextHtml]= opt->getValue("context_html_timeout");
+			_SystemOptions[OptionMonospaceFont]= opt->getValue("monospace_font");
 		}
 
 	}
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/config.xml b/code/ryzom/client/data/gamedev/interfaces_v3/config.xml
index 5d5e9143b..b74fa9e8b 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/config.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/config.xml
@@ -1916,6 +1916,8 @@ This MUST follow the Enum MISSION_DESC::TIconId
            value="basic.ttf" /> -->
     <param name="font"
            value="ryzom.ttf" />
+    <param name="monospace_font"
+           value="ryzom_monospace.ttf" />
     <param name="add_coef_font"
            value="1" />
     <param name="mul_coef_anim"
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/login_config.xml b/code/ryzom/client/data/gamedev/interfaces_v3/login_config.xml
index e4b2e77e7..47b3c627f 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/login_config.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/login_config.xml
@@ -838,6 +838,8 @@ This MUST follow the Enum MISSION_DESC::TIconId
            value="basic.ttf" /> -->
     <param name="font"
            value="ryzom.ttf" />
+    <param name="monospace_font"
+           value="ryzom_monospace.ttf" />
     <param name="add_coef_font"
            value="3" />
     <param name="mul_coef_anim"
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_config.xml b/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_config.xml
index a0ca1c01b..c218fcbae 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_config.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_config.xml
@@ -25,6 +25,8 @@
            value="basic.ttf" /> -->
     <param name="font"
            value="ryzom.ttf" />
+    <param name="monospace_font"
+           value="ryzom_monospace.ttf" />
     <param name="add_coef_font"
            value="0" />
     <param name="mul_coef_anim"
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/outgame_config.xml b/code/ryzom/client/data/gamedev/interfaces_v3/outgame_config.xml
index a56d622f7..9a55e14bd 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/outgame_config.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/outgame_config.xml
@@ -25,6 +25,8 @@
            value="outgame.ttf" /> -->
     <param name="font"
            value="ryzom.ttf" />
+    <param name="monospace_font"
+           value="ryzom_monospace.ttf" />
     <param name="add_coef_font"
            value="3" />
     <param name="mul_coef_anim"
diff --git a/code/ryzom/client/src/interface_v3/interface_manager.cpp b/code/ryzom/client/src/interface_v3/interface_manager.cpp
index 3e2a0ba0e..e732a1efc 100644
--- a/code/ryzom/client/src/interface_v3/interface_manager.cpp
+++ b/code/ryzom/client/src/interface_v3/interface_manager.cpp
@@ -1572,6 +1572,10 @@ void CInterfaceManager::setupOptions()
 	if ((!sFont.empty()) && (Driver != NULL))
 		resetTextContext(sFont.c_str(), true);
 	// Continue to parse the rest of the interface
+
+	sFont = wm->getSystemOption (CWidgetManager::OptionMonospaceFont).getValStr();
+	if ((!sFont.empty()) && (Driver != NULL))
+		CViewRenderer::registerFont("monospace", sFont);
 }
 
 // ------------------------------------------------------------------------------------------------