diff --git a/nel/include/nel/gui/group_html.h b/nel/include/nel/gui/group_html.h index 600c9b248..a16a16d82 100644 --- a/nel/include/nel/gui/group_html.h +++ b/nel/include/nel/gui/group_html.h @@ -139,37 +139,15 @@ namespace NLGUI float getTimeout() const {return (float)_TimeoutValue;} // Some constants - NLMISC::CRGBA BgColor; NLMISC::CRGBA ErrorColor; NLMISC::CRGBA LinkColor; - NLMISC::CRGBA TextColor; - NLMISC::CRGBA H1Color; - NLMISC::CRGBA H2Color; - NLMISC::CRGBA H3Color; - NLMISC::CRGBA H4Color; - NLMISC::CRGBA H5Color; - NLMISC::CRGBA H6Color; bool ErrorColorGlobalColor; bool LinkColorGlobalColor; bool TextColorGlobalColor; - bool H1ColorGlobalColor; - bool H2ColorGlobalColor; - bool H3ColorGlobalColor; - bool H4ColorGlobalColor; - bool H5ColorGlobalColor; - bool H6ColorGlobalColor; - uint TextFontSize; - uint H1FontSize; - uint H2FontSize; - uint H3FontSize; - uint H4FontSize; - uint H5FontSize; - uint H6FontSize; uint TDBeginSpace; uint PBeginSpace; uint LIBeginSpace; uint ULBeginSpace; - uint LIIndent; uint ULIndent; float LineSpaceFontFactor; std::string DefaultButtonGroup; @@ -184,7 +162,6 @@ namespace NLGUI std::string DefaultRadioButtonBitmapPushed; std::string DefaultRadioButtonBitmapOver; std::string DefaultBackgroundBitmapView; - std::string CurrentLinkTitle; struct TFormField { public: diff --git a/nel/src/gui/group_html.cpp b/nel/src/gui/group_html.cpp index 04988b790..9939b4794 100644 --- a/nel/src/gui/group_html.cpp +++ b/nel/src/gui/group_html.cpp @@ -1460,37 +1460,15 @@ namespace NLGUI CWidgetManager::getInstance()->registerClockMsgTarget(this); // HTML parameters - BgColor = CRGBA::Black; ErrorColor = CRGBA(255, 0, 0); LinkColor = CRGBA(0, 0, 255); - TextColor = CRGBA(255, 255, 255); - H1Color = CRGBA(255, 255, 255); - H2Color = CRGBA(255, 255, 255); - H3Color = CRGBA(255, 255, 255); - H4Color = CRGBA(255, 255, 255); - H5Color = CRGBA(255, 255, 255); - H6Color = CRGBA(255, 255, 255); ErrorColorGlobalColor = false; LinkColorGlobalColor = false; TextColorGlobalColor = false; - H1ColorGlobalColor = false; - H2ColorGlobalColor = false; - H3ColorGlobalColor = false; - H4ColorGlobalColor = false; - H5ColorGlobalColor = false; - H6ColorGlobalColor = false; - TextFontSize = 9; - H1FontSize = 18; - H2FontSize = 15; - H3FontSize = 12; - H4FontSize = 9; - H5FontSize = 9; - H6FontSize = 9; LIBeginSpace = 4; ULBeginSpace = 12; PBeginSpace = 12; TDBeginSpace = 0; - LIIndent = -10; ULIndent = 30; LineSpaceFontFactor = 0.5f; DefaultButtonGroup = "html_text_button"; @@ -1562,11 +1540,6 @@ namespace NLGUI return _TitlePrefix; } else - if( name == "background_color" ) - { - return toString( BgColor ); - } - else if( name == "error_color" ) { return toString( ErrorColor ); @@ -1577,36 +1550,6 @@ namespace NLGUI return toString( LinkColor ); } else - if( name == "h1_color" ) - { - return toString( H1Color ); - } - else - if( name == "h2_color" ) - { - return toString( H2Color ); - } - else - if( name == "h3_color" ) - { - return toString( H3Color ); - } - else - if( name == "h4_color" ) - { - return toString( H4Color ); - } - else - if( name == "h5_color" ) - { - return toString( H5Color ); - } - else - if( name == "h6_color" ) - { - return toString( H6Color ); - } - else if( name == "error_color_global_color" ) { return toString( ErrorColorGlobalColor ); @@ -1622,71 +1565,6 @@ namespace NLGUI return toString( TextColorGlobalColor ); } else - if( name == "h1_color_global_color" ) - { - return toString( H1ColorGlobalColor ); - } - else - if( name == "h2_color_global_color" ) - { - return toString( H2ColorGlobalColor ); - } - else - if( name == "h3_color_global_color" ) - { - return toString( H3ColorGlobalColor ); - } - else - if( name == "h4_color_global_color" ) - { - return toString( H4ColorGlobalColor ); - } - else - if( name == "h5_color_global_color" ) - { - return toString( H5ColorGlobalColor ); - } - else - if( name == "h6_color_global_color" ) - { - return toString( H6ColorGlobalColor ); - } - else - if( name == "text_font_size" ) - { - return toString( TextFontSize ); - } - else - if( name == "h1_font_size" ) - { - return toString( H1FontSize ); - } - else - if( name == "h2_font_size" ) - { - return toString( H2FontSize ); - } - else - if( name == "h3_font_size" ) - { - return toString( H3FontSize ); - } - else - if( name == "h4_font_size" ) - { - return toString( H4FontSize ); - } - else - if( name == "h5_font_size" ) - { - return toString( H5FontSize ); - } - else - if( name == "h6_font_size" ) - { - return toString( H6FontSize ); - } - else if( name == "td_begin_space" ) { return toString( TDBeginSpace ); @@ -1707,11 +1585,6 @@ namespace NLGUI return toString( ULBeginSpace ); } else - if( name == "li_indent" ) - { - return toString( LIIndent ); - } - else if( name == "ul_indent" ) { return toString( ULIndent ); @@ -1824,14 +1697,6 @@ namespace NLGUI return; } else - if( name == "background_color" ) - { - CRGBA c; - if( fromString( value, c ) ) - BgColor = c; - return; - } - else if( name == "error_color" ) { CRGBA c; @@ -1848,54 +1713,6 @@ namespace NLGUI return; } else - if( name == "h1_color" ) - { - CRGBA c; - if( fromString( value, c ) ) - H1Color = c; - return; - } - else - if( name == "h2_color" ) - { - CRGBA c; - if( fromString( value, c ) ) - H2Color = c; - return; - } - else - if( name == "h3_color" ) - { - CRGBA c; - if( fromString( value, c ) ) - H3Color = c; - return; - } - else - if( name == "h4_color" ) - { - CRGBA c; - if( fromString( value, c ) ) - H4Color = c; - return; - } - else - if( name == "h5_color" ) - { - CRGBA c; - if( fromString( value, c ) ) - H5Color = c; - return; - } - else - if( name == "h6_color" ) - { - CRGBA c; - if( fromString( value, c ) ) - H6Color = c; - return; - } - else if( name == "error_color_global_color" ) { bool b; @@ -1920,110 +1737,6 @@ namespace NLGUI return; } else - if( name == "h1_color_global_color" ) - { - bool b; - if( fromString( value, b ) ) - H1ColorGlobalColor = b; - return; - } - else - if( name == "h2_color_global_color" ) - { - bool b; - if( fromString( value, b ) ) - H2ColorGlobalColor = b; - return; - } - else - if( name == "h3_color_global_color" ) - { - bool b; - if( fromString( value, b ) ) - H3ColorGlobalColor = b; - return; - } - else - if( name == "h4_color_global_color" ) - { - bool b; - if( fromString( value, b ) ) - H4ColorGlobalColor = b; - return; - } - else - if( name == "h5_color_global_color" ) - { - bool b; - if( fromString( value, b ) ) - H5ColorGlobalColor = b; - return; - } - else - if( name == "h6_color_global_color" ) - { - bool b; - if( fromString( value, b ) ) - H6ColorGlobalColor = b; - return; - } - else - if( name == "text_font_size" ) - { - uint i; - if( fromString( value, i ) ) - TextFontSize = i; - return; - } - else - if( name == "h1_font_size" ) - { - uint i; - if( fromString( value, i ) ) - H1FontSize = i; - return; - } - else - if( name == "h2_font_size" ) - { - uint i; - if( fromString( value, i ) ) - H2FontSize = i; - return; - } - else - if( name == "h3_font_size" ) - { - uint i; - if( fromString( value, i ) ) - H3FontSize = i; - return; - } - else - if( name == "h4_font_size" ) - { - uint i; - if( fromString( value, i ) ) - H4FontSize = i; - return; - } - else - if( name == "h5_font_size" ) - { - uint i; - if( fromString( value, i ) ) - H5FontSize = i; - return; - } - else - if( name == "h6_font_size" ) - { - uint i; - if( fromString( value, i ) ) - H6FontSize = i; - return; - } - else if( name == "td_begin_space" ) { uint i; @@ -2056,14 +1769,6 @@ namespace NLGUI return; } else - if( name == "li_indent" ) - { - uint i; - if( fromString( value, i ) ) - LIIndent = i; - return; - } - else if( name == "ul_indent" ) { uint i; @@ -2222,16 +1927,8 @@ namespace NLGUI xmlSetProp( node, BAD_CAST "type", BAD_CAST "html" ); xmlSetProp( node, BAD_CAST "url", BAD_CAST _URL.c_str() ); xmlSetProp( node, BAD_CAST "title_prefix", BAD_CAST _TitlePrefix.c_str() ); - xmlSetProp( node, BAD_CAST "background_color", BAD_CAST toString( BgColor ).c_str() ); xmlSetProp( node, BAD_CAST "error_color", BAD_CAST toString( ErrorColor ).c_str() ); xmlSetProp( node, BAD_CAST "link_color", BAD_CAST toString( LinkColor ).c_str() ); - xmlSetProp( node, BAD_CAST "background_color", BAD_CAST toString( BgColor ).c_str() ); - xmlSetProp( node, BAD_CAST "h1_color", BAD_CAST toString( H1Color ).c_str() ); - xmlSetProp( node, BAD_CAST "h2_color", BAD_CAST toString( H2Color ).c_str() ); - xmlSetProp( node, BAD_CAST "h3_color", BAD_CAST toString( H3Color ).c_str() ); - xmlSetProp( node, BAD_CAST "h4_color", BAD_CAST toString( H4Color ).c_str() ); - xmlSetProp( node, BAD_CAST "h5_color", BAD_CAST toString( H5Color ).c_str() ); - xmlSetProp( node, BAD_CAST "h6_color", BAD_CAST toString( H6Color ).c_str() ); xmlSetProp( node, BAD_CAST "error_color_global_color", BAD_CAST toString( ErrorColorGlobalColor ).c_str() ); @@ -2239,31 +1936,11 @@ namespace NLGUI BAD_CAST toString( LinkColorGlobalColor ).c_str() ); xmlSetProp( node, BAD_CAST "text_color_global_color", BAD_CAST toString( TextColorGlobalColor ).c_str() ); - xmlSetProp( node, BAD_CAST "h1_color_global_color", - BAD_CAST toString( H1ColorGlobalColor ).c_str() ); - xmlSetProp( node, BAD_CAST "h2_color_global_color", - BAD_CAST toString( H2ColorGlobalColor ).c_str() ); - xmlSetProp( node, BAD_CAST "h3_color_global_color", - BAD_CAST toString( H3ColorGlobalColor ).c_str() ); - xmlSetProp( node, BAD_CAST "h4_color_global_color", - BAD_CAST toString( H4ColorGlobalColor ).c_str() ); - xmlSetProp( node, BAD_CAST "h5_color_global_color", - BAD_CAST toString( H5ColorGlobalColor ).c_str() ); - xmlSetProp( node, BAD_CAST "h6_color_global_color", - BAD_CAST toString( H6ColorGlobalColor ).c_str() ); - - xmlSetProp( node, BAD_CAST "text_font_size", BAD_CAST toString( TextFontSize ).c_str() ); - xmlSetProp( node, BAD_CAST "h1_font_size", BAD_CAST toString( H1FontSize ).c_str() ); - xmlSetProp( node, BAD_CAST "h2_font_size", BAD_CAST toString( H2FontSize ).c_str() ); - xmlSetProp( node, BAD_CAST "h3_font_size", BAD_CAST toString( H3FontSize ).c_str() ); - xmlSetProp( node, BAD_CAST "h4_font_size", BAD_CAST toString( H4FontSize ).c_str() ); - xmlSetProp( node, BAD_CAST "h5_font_size", BAD_CAST toString( H5FontSize ).c_str() ); - xmlSetProp( node, BAD_CAST "h6_font_size", BAD_CAST toString( H6FontSize ).c_str() ); + xmlSetProp( node, BAD_CAST "td_begin_space", BAD_CAST toString( TDBeginSpace ).c_str() ); xmlSetProp( node, BAD_CAST "paragraph_begin_space", BAD_CAST toString( PBeginSpace ).c_str() ); xmlSetProp( node, BAD_CAST "li_begin_space", BAD_CAST toString( LIBeginSpace ).c_str() ); xmlSetProp( node, BAD_CAST "ul_begin_space", BAD_CAST toString( ULBeginSpace ).c_str() ); - xmlSetProp( node, BAD_CAST "li_indent", BAD_CAST toString( LIIndent ).c_str() ); xmlSetProp( node, BAD_CAST "ul_indent", BAD_CAST toString( ULIndent ).c_str() ); xmlSetProp( node, BAD_CAST "multi_line_space_factor", BAD_CAST toString( LineSpaceFontFactor ).c_str() ); xmlSetProp( node, BAD_CAST "form_text_area_group", BAD_CAST DefaultFormTextGroup.c_str() ); @@ -2315,36 +1992,12 @@ namespace NLGUI _TitlePrefix = CI18N::get((const char*)ptr); // Parameters - ptr = xmlGetProp (cur, (xmlChar*)"background_color"); - if (ptr) - BgColor = convertColor(ptr); ptr = xmlGetProp (cur, (xmlChar*)"error_color"); if (ptr) ErrorColor = convertColor(ptr); ptr = xmlGetProp (cur, (xmlChar*)"link_color"); if (ptr) LinkColor = convertColor(ptr); - ptr = xmlGetProp (cur, (xmlChar*)"text_color"); - if (ptr) - TextColor = convertColor(ptr); - ptr = xmlGetProp (cur, (xmlChar*)"h1_color"); - if (ptr) - H1Color = convertColor(ptr); - ptr = xmlGetProp (cur, (xmlChar*)"h2_color"); - if (ptr) - H2Color = convertColor(ptr); - ptr = xmlGetProp (cur, (xmlChar*)"h3_color"); - if (ptr) - H3Color = convertColor(ptr); - ptr = xmlGetProp (cur, (xmlChar*)"h4_color"); - if (ptr) - H4Color = convertColor(ptr); - ptr = xmlGetProp (cur, (xmlChar*)"h5_color"); - if (ptr) - H5Color = convertColor(ptr); - ptr = xmlGetProp (cur, (xmlChar*)"h6_color"); - if (ptr) - H6Color = convertColor(ptr); ptr = xmlGetProp (cur, (xmlChar*)"error_color_global_color"); if (ptr) ErrorColorGlobalColor = convertBool(ptr); @@ -2354,45 +2007,6 @@ namespace NLGUI ptr = xmlGetProp (cur, (xmlChar*)"text_color_global_color"); if (ptr) TextColorGlobalColor = convertBool(ptr); - ptr = xmlGetProp (cur, (xmlChar*)"h1_color_global_color"); - if (ptr) - H1ColorGlobalColor = convertBool(ptr); - ptr = xmlGetProp (cur, (xmlChar*)"h2_color_global_color"); - if (ptr) - H2ColorGlobalColor = convertBool(ptr); - ptr = xmlGetProp (cur, (xmlChar*)"h3_color_global_color"); - if (ptr) - H3ColorGlobalColor = convertBool(ptr); - ptr = xmlGetProp (cur, (xmlChar*)"h4_color_global_color"); - if (ptr) - H4ColorGlobalColor = convertBool(ptr); - ptr = xmlGetProp (cur, (xmlChar*)"h5_color_global_color"); - if (ptr) - H5ColorGlobalColor = convertBool(ptr); - ptr = xmlGetProp (cur, (xmlChar*)"h6_color_global_color"); - if (ptr) - H6ColorGlobalColor = convertBool(ptr); - ptr = xmlGetProp (cur, (xmlChar*)"text_font_size"); - if (ptr) - fromString((const char*)ptr, TextFontSize); - ptr = xmlGetProp (cur, (xmlChar*)"h1_font_size"); - if (ptr) - fromString((const char*)ptr, H1FontSize); - ptr = xmlGetProp (cur, (xmlChar*)"h2_font_size"); - if (ptr) - fromString((const char*)ptr, H2FontSize); - ptr = xmlGetProp (cur, (xmlChar*)"h3_font_size"); - if (ptr) - fromString((const char*)ptr, H3FontSize); - ptr = xmlGetProp (cur, (xmlChar*)"h4_font_size"); - if (ptr) - fromString((const char*)ptr, H4FontSize); - ptr = xmlGetProp (cur, (xmlChar*)"h5_font_size"); - if (ptr) - fromString((const char*)ptr, H5FontSize); - ptr = xmlGetProp (cur, (xmlChar*)"h6_font_size"); - if (ptr) - fromString((const char*)ptr, H6FontSize); ptr = xmlGetProp (cur, (xmlChar*)"td_begin_space"); if (ptr) fromString((const char*)ptr, TDBeginSpace); @@ -2405,9 +2019,6 @@ namespace NLGUI ptr = xmlGetProp (cur, (xmlChar*)"ul_begin_space"); if (ptr) fromString((const char*)ptr, ULBeginSpace); - ptr = xmlGetProp (cur, (xmlChar*)"li_indent"); - if (ptr) - fromString((const char*)ptr, LIIndent); ptr = xmlGetProp (cur, (xmlChar*)"ul_indent"); if (ptr) fromString((const char*)ptr, ULIndent); @@ -4395,7 +4006,7 @@ namespace NLGUI clearContext(); // Reset default background color - setBackgroundColor (BgColor); + setBackgroundColor (_BrowserStyle.Current.BackgroundColor); setBackground ("blank.tga", true, false); paragraphChange (); diff --git a/ryzom/client/src/interface_v3/group_quick_help.cpp b/ryzom/client/src/interface_v3/group_quick_help.cpp index 8a5e925cf..c8d5fdd9b 100644 --- a/ryzom/client/src/interface_v3/group_quick_help.cpp +++ b/ryzom/client/src/interface_v3/group_quick_help.cpp @@ -168,8 +168,8 @@ void CGroupQuickHelp::setGroupTextSize (CInterfaceGroup *group, bool selected) { bool globalColor = selected ? TextColorGlobalColor : _NonSelectedGlobalColor; bool linkGlobalColor = selected ? LinkColorGlobalColor : _NonSelectedGlobalColor; - uint fontSize = selected ? TextFontSize : _NonSelectedSize; - NLMISC::CRGBA color = selected ? TextColor : _NonSelectedColor; + uint fontSize = selected ? _BrowserStyle.Current.FontSize : _NonSelectedSize; + NLMISC::CRGBA color = selected ? _BrowserStyle.Current.TextColor : _NonSelectedColor; NLMISC::CRGBA linkColor = selected ? LinkColor : _NonSelectedLinkColor; // Look for text in this group