simplify: "\n" is newline, "::" separates tips
This commit is contained in:
@@ -197,11 +197,7 @@ void ScreenWithMenuElements::LoadHelpText()
|
|||||||
{
|
{
|
||||||
vector<CString> vs;
|
vector<CString> vs;
|
||||||
CString s = THEME->GetString(m_sName,"HelpText");
|
CString s = THEME->GetString(m_sName,"HelpText");
|
||||||
split( s, "\n", vs );
|
split( s, "::", vs );
|
||||||
|
|
||||||
// hack to get newlines in a tip
|
|
||||||
FOREACH( CString, vs, s )
|
|
||||||
s->Replace( "\\n", "\n" );
|
|
||||||
|
|
||||||
m_textHelp->SetTips( vs );
|
m_textHelp->SetTips( vs );
|
||||||
m_textHelp->PlayCommand( "Changed" );
|
m_textHelp->PlayCommand( "Changed" );
|
||||||
|
|||||||
@@ -778,10 +778,6 @@ void ThemeManager::EvaluateString( RString &sText )
|
|||||||
* Still do font aliases on the resulting string. */
|
* Still do font aliases on the resulting string. */
|
||||||
LuaHelpers::RunAtExpressionS( sText );
|
LuaHelpers::RunAtExpressionS( sText );
|
||||||
|
|
||||||
// "::" means newline since you can't use line breaks in an ini file.
|
|
||||||
// XXX: this makes it impossible to put a colon at the end of a line, eg: "Color:\nRed"
|
|
||||||
sText.Replace("::","\n");
|
|
||||||
|
|
||||||
FontCharAliases::ReplaceMarkers( sText );
|
FontCharAliases::ReplaceMarkers( sText );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user