|
|
|
@ -1034,7 +1034,7 @@ namespace NLGUI
|
|
|
|
|
|
|
|
|
|
|
|
// ***************************************************************************
|
|
|
|
// ***************************************************************************
|
|
|
|
|
|
|
|
|
|
|
|
void CGroupHTML::addText (const char * buf, int len)
|
|
|
|
void CGroupHTML::addText (const char *buf, int len)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (_Browsing)
|
|
|
|
if (_Browsing)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
@ -1042,44 +1042,43 @@ namespace NLGUI
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
// Build a UTF8 string
|
|
|
|
// Build a UTF8 string
|
|
|
|
string inputString(buf, buf+len);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (_ParsingLua && _TrustedDomain)
|
|
|
|
if (_ParsingLua && _TrustedDomain)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
// we are parsing a lua script
|
|
|
|
// we are parsing a lua script
|
|
|
|
_LuaScript += inputString;
|
|
|
|
_LuaScript += string(buf, buf + len);
|
|
|
|
// no more to do
|
|
|
|
// no more to do
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Build a unicode string
|
|
|
|
// Build a unicode string
|
|
|
|
ucstring inputUCString;
|
|
|
|
CUtfStringView inputStringView(buf, len);
|
|
|
|
inputUCString.fromUtf8(inputString);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Build the final unicode string
|
|
|
|
// Build the final unicode string
|
|
|
|
ucstring tmp;
|
|
|
|
string tmp;
|
|
|
|
tmp.reserve(len);
|
|
|
|
tmp.reserve(len);
|
|
|
|
uint ucLen = (uint)inputUCString.size();
|
|
|
|
u32char lastChar = 0;
|
|
|
|
for (uint i=0; i<ucLen; i++)
|
|
|
|
u32char inputStringView0 = *inputStringView.begin();
|
|
|
|
|
|
|
|
for (CUtfStringView::iterator it(inputStringView.begin()), end(inputStringView.end()); it != end; ++it)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
ucchar output;
|
|
|
|
u32char output;
|
|
|
|
bool keep;
|
|
|
|
bool keep;
|
|
|
|
// special treatment for 'nbsp' (which is returned as a discreet space)
|
|
|
|
// special treatment for 'nbsp' (which is returned as a discreet space)
|
|
|
|
if (inputString.size() == 1 && inputString[0] == 32)
|
|
|
|
if (len == 1 && inputStringView0 == 32)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
// this is a nbsp entity
|
|
|
|
// this is a nbsp entity
|
|
|
|
output = inputUCString[i];
|
|
|
|
output = *it;
|
|
|
|
keep = true;
|
|
|
|
keep = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
{
|
|
|
|
{
|
|
|
|
// not nbsp, use normal white space removal routine
|
|
|
|
// not nbsp, use normal white space removal routine
|
|
|
|
keep = translateChar (output, inputUCString[i], (tmp.empty())?0:tmp[tmp.size()-1]);
|
|
|
|
keep = translateChar (output, *it, lastChar);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (keep)
|
|
|
|
if (keep)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
tmp.push_back(output);
|
|
|
|
CUtfStringView::append(tmp, output);
|
|
|
|
|
|
|
|
lastChar = output;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -1293,7 +1292,7 @@ namespace NLGUI
|
|
|
|
pos++;
|
|
|
|
pos++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
token = content.substr(start, pos - start);
|
|
|
|
token = content.substr(start, pos - start);
|
|
|
|
addString(ucstring::makeFromUtf8(token));
|
|
|
|
addString(token);
|
|
|
|
|
|
|
|
|
|
|
|
// skip closing quote
|
|
|
|
// skip closing quote
|
|
|
|
pos++;
|
|
|
|
pos++;
|
|
|
|
@ -1376,7 +1375,7 @@ namespace NLGUI
|
|
|
|
|
|
|
|
|
|
|
|
if (elm.hasAttribute(token))
|
|
|
|
if (elm.hasAttribute(token))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
addString(ucstring::makeFromUtf8(elm.getAttribute(token)));
|
|
|
|
addString(elm.getAttribute(token));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
@ -1562,7 +1561,7 @@ namespace NLGUI
|
|
|
|
else
|
|
|
|
else
|
|
|
|
if( name == "title_prefix" )
|
|
|
|
if( name == "title_prefix" )
|
|
|
|
{
|
|
|
|
{
|
|
|
|
return _TitlePrefix.toString();
|
|
|
|
return _TitlePrefix;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
if( name == "background_color" )
|
|
|
|
if( name == "background_color" )
|
|
|
|
@ -2224,7 +2223,7 @@ namespace NLGUI
|
|
|
|
|
|
|
|
|
|
|
|
xmlSetProp( node, BAD_CAST "type", BAD_CAST "html" );
|
|
|
|
xmlSetProp( node, BAD_CAST "type", BAD_CAST "html" );
|
|
|
|
xmlSetProp( node, BAD_CAST "url", BAD_CAST _URL.c_str() );
|
|
|
|
xmlSetProp( node, BAD_CAST "url", BAD_CAST _URL.c_str() );
|
|
|
|
xmlSetProp( node, BAD_CAST "title_prefix", BAD_CAST _TitlePrefix.toString().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 "background_color", BAD_CAST toString( BgColor ).c_str() );
|
|
|
|
xmlSetProp( node, BAD_CAST "error_color", BAD_CAST toString( ErrorColor ).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 "link_color", BAD_CAST toString( LinkColor ).c_str() );
|
|
|
|
@ -2669,7 +2668,7 @@ namespace NLGUI
|
|
|
|
|
|
|
|
|
|
|
|
// ***************************************************************************
|
|
|
|
// ***************************************************************************
|
|
|
|
|
|
|
|
|
|
|
|
bool CGroupHTML::translateChar(ucchar &output, ucchar input, ucchar lastCharParam) const
|
|
|
|
bool CGroupHTML::translateChar(u32char &output, u32char input, u32char lastCharParam) const
|
|
|
|
{
|
|
|
|
{
|
|
|
|
// Keep this char ?
|
|
|
|
// Keep this char ?
|
|
|
|
bool keep = true;
|
|
|
|
bool keep = true;
|
|
|
|
@ -2691,13 +2690,13 @@ namespace NLGUI
|
|
|
|
else
|
|
|
|
else
|
|
|
|
{
|
|
|
|
{
|
|
|
|
// Get the last char
|
|
|
|
// Get the last char
|
|
|
|
ucchar lastChar = lastCharParam;
|
|
|
|
u32char lastChar = lastCharParam;
|
|
|
|
if (lastChar == 0)
|
|
|
|
if (lastChar == 0)
|
|
|
|
lastChar = getLastChar();
|
|
|
|
lastChar = getLastChar();
|
|
|
|
keep = ((lastChar != (ucchar)' ') &&
|
|
|
|
keep = ((lastChar != (u32char)' ') &&
|
|
|
|
(lastChar != 0)) || getPRE() || (_CurrentViewImage && (lastChar == 0));
|
|
|
|
(lastChar != 0)) || getPRE() || (_CurrentViewImage && (lastChar == 0));
|
|
|
|
if(!getPRE())
|
|
|
|
if(!getPRE())
|
|
|
|
input = ' ';
|
|
|
|
input = (u32char)' ';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
@ -2710,11 +2709,11 @@ namespace NLGUI
|
|
|
|
else
|
|
|
|
else
|
|
|
|
{
|
|
|
|
{
|
|
|
|
// Get the last char
|
|
|
|
// Get the last char
|
|
|
|
ucchar lastChar = lastCharParam;
|
|
|
|
u32char lastChar = lastCharParam;
|
|
|
|
if (lastChar == 0)
|
|
|
|
if (lastChar == 0)
|
|
|
|
lastChar = getLastChar();
|
|
|
|
lastChar = getLastChar();
|
|
|
|
keep = ((lastChar != (ucchar)' ') &&
|
|
|
|
keep = ((lastChar != (u32char)' ') &&
|
|
|
|
(lastChar != (ucchar)'\n') &&
|
|
|
|
(lastChar != (u32char)'\n') &&
|
|
|
|
(lastChar != 0)) || getPRE() || (_CurrentViewImage && (lastChar == 0));
|
|
|
|
(lastChar != 0)) || getPRE() || (_CurrentViewImage && (lastChar == 0));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -2753,13 +2752,13 @@ namespace NLGUI
|
|
|
|
|
|
|
|
|
|
|
|
// ***************************************************************************
|
|
|
|
// ***************************************************************************
|
|
|
|
|
|
|
|
|
|
|
|
void CGroupHTML::addString(const ucstring &str)
|
|
|
|
void CGroupHTML::addString(const std::string &str)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
ucstring tmpStr = str;
|
|
|
|
string tmpStr = str;
|
|
|
|
|
|
|
|
|
|
|
|
if (_Localize)
|
|
|
|
if (_Localize)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
string _str = tmpStr.toString();
|
|
|
|
string _str = tmpStr;
|
|
|
|
string::size_type p = _str.find('#');
|
|
|
|
string::size_type p = _str.find('#');
|
|
|
|
if (p == string::npos)
|
|
|
|
if (p == string::npos)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
@ -2800,7 +2799,7 @@ namespace NLGUI
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (_Object)
|
|
|
|
else if (_Object)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
_ObjectScript += tmpStr.toString();
|
|
|
|
_ObjectScript += tmpStr;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (_SelectOption)
|
|
|
|
else if (_SelectOption)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
@ -2853,7 +2852,7 @@ namespace NLGUI
|
|
|
|
(style.GlobalColor == _CurrentViewLink->getModulateGlobalColor()))
|
|
|
|
(style.GlobalColor == _CurrentViewLink->getModulateGlobalColor()))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
// Concat the text
|
|
|
|
// Concat the text
|
|
|
|
_CurrentViewLink->setText(_CurrentViewLink->getText()+tmpStr.toUtf8());
|
|
|
|
_CurrentViewLink->setText(_CurrentViewLink->getText()+tmpStr);
|
|
|
|
_CurrentViewLink->invalidateContent();
|
|
|
|
_CurrentViewLink->invalidateContent();
|
|
|
|
added = true;
|
|
|
|
added = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -2888,7 +2887,7 @@ namespace NLGUI
|
|
|
|
ctrlButton->setModulateGlobalColorAll (false);
|
|
|
|
ctrlButton->setModulateGlobalColorAll (false);
|
|
|
|
|
|
|
|
|
|
|
|
// Translate the tooltip
|
|
|
|
// Translate the tooltip
|
|
|
|
ctrlButton->setDefaultContextHelp(ucstring::makeFromUtf8(getLinkTitle()));
|
|
|
|
ctrlButton->setDefaultContextHelp(getLinkTitle());
|
|
|
|
ctrlButton->setText(tmpStr);
|
|
|
|
ctrlButton->setText(tmpStr);
|
|
|
|
// empty url / button disabled
|
|
|
|
// empty url / button disabled
|
|
|
|
bool disabled = string(getLink()).empty();
|
|
|
|
bool disabled = string(getLink()).empty();
|
|
|
|
@ -2916,7 +2915,7 @@ namespace NLGUI
|
|
|
|
newLink->setParamsOnLeftClick("name=" + getId() + "|url=" + newLink->Link);
|
|
|
|
newLink->setParamsOnLeftClick("name=" + getId() + "|url=" + newLink->Link);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
newLink->setText(tmpStr.toUtf8());
|
|
|
|
newLink->setText(tmpStr);
|
|
|
|
newLink->setMultiLineSpace((uint)((float)(style.FontSize)*LineSpaceFontFactor));
|
|
|
|
newLink->setMultiLineSpace((uint)((float)(style.FontSize)*LineSpaceFontFactor));
|
|
|
|
newLink->setMultiLine(true);
|
|
|
|
newLink->setMultiLine(true);
|
|
|
|
newLink->setModulateGlobalColor(style.GlobalColor);
|
|
|
|
newLink->setModulateGlobalColor(style.GlobalColor);
|
|
|
|
@ -2968,7 +2967,7 @@ namespace NLGUI
|
|
|
|
|
|
|
|
|
|
|
|
// ***************************************************************************
|
|
|
|
// ***************************************************************************
|
|
|
|
|
|
|
|
|
|
|
|
CInterfaceGroup *CGroupHTML::addTextArea(const std::string &templateName, const char *name, uint rows, uint cols, bool multiLine, const ucstring &content, uint maxlength)
|
|
|
|
CInterfaceGroup *CGroupHTML::addTextArea(const std::string &templateName, const char *name, uint rows, uint cols, bool multiLine, const std::string &content, uint maxlength)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
// In a paragraph ?
|
|
|
|
// In a paragraph ?
|
|
|
|
if (!_Paragraph)
|
|
|
|
if (!_Paragraph)
|
|
|
|
@ -3024,7 +3023,7 @@ namespace NLGUI
|
|
|
|
CGroupEditBox *eb = dynamic_cast<CGroupEditBox*>(textArea->getGroup("eb"));
|
|
|
|
CGroupEditBox *eb = dynamic_cast<CGroupEditBox*>(textArea->getGroup("eb"));
|
|
|
|
if (eb)
|
|
|
|
if (eb)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
eb->setInputString(CUtfStringView(decodeHTMLEntities(content)).toUtf8());
|
|
|
|
eb->setInputString(decodeHTMLEntities(content));
|
|
|
|
if (style.hasStyle("background-color"))
|
|
|
|
if (style.hasStyle("background-color"))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
CViewBitmap *bg = dynamic_cast<CViewBitmap*>(eb->getView("bg"));
|
|
|
|
CViewBitmap *bg = dynamic_cast<CViewBitmap*>(eb->getView("bg"));
|
|
|
|
@ -3234,7 +3233,7 @@ namespace NLGUI
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
{
|
|
|
|
{
|
|
|
|
ctrlButton->setDefaultContextHelp(ucstring::makeFromUtf8(tooltip));
|
|
|
|
ctrlButton->setDefaultContextHelp(tooltip);
|
|
|
|
//ctrlButton->setOnContextHelp(string(tooltip));
|
|
|
|
//ctrlButton->setOnContextHelp(string(tooltip));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -3310,7 +3309,7 @@ namespace NLGUI
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (_CurrentViewLink)
|
|
|
|
if (_CurrentViewLink)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
u32string str = CUtfStringView(_CurrentViewLink->getText()).toUtf32(); // FIXME: Optimize reverse UTF iteration
|
|
|
|
::u32string str = CUtfStringView(_CurrentViewLink->getText()).toUtf32(); // FIXME: Optimize reverse UTF iteration
|
|
|
|
if (!str.empty())
|
|
|
|
if (!str.empty())
|
|
|
|
return str[str.length()-1];
|
|
|
|
return str[str.length()-1];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -3402,7 +3401,7 @@ namespace NLGUI
|
|
|
|
|
|
|
|
|
|
|
|
// ***************************************************************************
|
|
|
|
// ***************************************************************************
|
|
|
|
|
|
|
|
|
|
|
|
void CGroupHTML::setTitle (const ucstring &title)
|
|
|
|
void CGroupHTML::setTitleRaw (const std::string &title)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
CInterfaceElement *parent = getParent();
|
|
|
|
CInterfaceElement *parent = getParent();
|
|
|
|
if (parent)
|
|
|
|
if (parent)
|
|
|
|
@ -3412,7 +3411,7 @@ namespace NLGUI
|
|
|
|
CGroupContainer *container = dynamic_cast<CGroupContainer*>(parent);
|
|
|
|
CGroupContainer *container = dynamic_cast<CGroupContainer*>(parent);
|
|
|
|
if (container)
|
|
|
|
if (container)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
container->setUCTitle (title);
|
|
|
|
container->setTitleRaw (title);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -3420,21 +3419,18 @@ namespace NLGUI
|
|
|
|
|
|
|
|
|
|
|
|
void CGroupHTML::setTitle(const std::string &title)
|
|
|
|
void CGroupHTML::setTitle(const std::string &title)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
ucstring uctitle;
|
|
|
|
|
|
|
|
uctitle.fromUtf8(title);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
_TitleString.clear();
|
|
|
|
_TitleString.clear();
|
|
|
|
if(!_TitlePrefix.empty())
|
|
|
|
if(!_TitlePrefix.empty())
|
|
|
|
{
|
|
|
|
{
|
|
|
|
_TitleString = _TitlePrefix + " - ";
|
|
|
|
_TitleString = _TitlePrefix + " - ";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
_TitleString += uctitle;
|
|
|
|
_TitleString += title;
|
|
|
|
|
|
|
|
|
|
|
|
setTitle(_TitleString);
|
|
|
|
setTitleRaw(_TitleString);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
std::string CGroupHTML::getTitle() const {
|
|
|
|
std::string CGroupHTML::getTitle() const {
|
|
|
|
return _TitleString.toUtf8();
|
|
|
|
return _TitleString;
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
// ***************************************************************************
|
|
|
|
// ***************************************************************************
|
|
|
|
@ -4685,9 +4681,7 @@ namespace NLGUI
|
|
|
|
CLuaIHM::checkArgType(ls, funcName, 3, LUA_TBOOLEAN);
|
|
|
|
CLuaIHM::checkArgType(ls, funcName, 3, LUA_TBOOLEAN);
|
|
|
|
|
|
|
|
|
|
|
|
string name = ls.toString(1);
|
|
|
|
string name = ls.toString(1);
|
|
|
|
|
|
|
|
string text = ls.toString(2);
|
|
|
|
ucstring text;
|
|
|
|
|
|
|
|
text.fromUtf8(ls.toString(2));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (!_Forms.empty())
|
|
|
|
if (!_Forms.empty())
|
|
|
|
{
|
|
|
|
{
|
|
|
|
@ -4717,7 +4711,7 @@ namespace NLGUI
|
|
|
|
const char *funcName = "addString";
|
|
|
|
const char *funcName = "addString";
|
|
|
|
CLuaIHM::checkArgCount(ls, funcName, 1);
|
|
|
|
CLuaIHM::checkArgCount(ls, funcName, 1);
|
|
|
|
CLuaIHM::checkArgType(ls, funcName, 1, LUA_TSTRING);
|
|
|
|
CLuaIHM::checkArgType(ls, funcName, 1, LUA_TSTRING);
|
|
|
|
addString(ucstring::makeFromUtf8(ls.toString(1)));
|
|
|
|
addString(ls.toString(1));
|
|
|
|
return 0;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -4945,7 +4939,7 @@ namespace NLGUI
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// ***************************************************************************
|
|
|
|
// ***************************************************************************
|
|
|
|
inline bool isDigit(ucchar c, uint base = 16)
|
|
|
|
inline bool isDigit(char c, uint base = 16)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (c>='0' && c<='9') return true;
|
|
|
|
if (c>='0' && c<='9') return true;
|
|
|
|
if (base != 16) return false;
|
|
|
|
if (base != 16) return false;
|
|
|
|
@ -4955,7 +4949,7 @@ namespace NLGUI
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// ***************************************************************************
|
|
|
|
// ***************************************************************************
|
|
|
|
inline ucchar convertHexDigit(ucchar c)
|
|
|
|
inline char convertHexDigit(char c)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (c>='0' && c<='9') return c-'0';
|
|
|
|
if (c>='0' && c<='9') return c-'0';
|
|
|
|
if (c>='A' && c<='F') return c-'A'+10;
|
|
|
|
if (c>='A' && c<='F') return c-'A'+10;
|
|
|
|
@ -4964,9 +4958,10 @@ namespace NLGUI
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// ***************************************************************************
|
|
|
|
// ***************************************************************************
|
|
|
|
ucstring CGroupHTML::decodeHTMLEntities(const ucstring &str)
|
|
|
|
std::string CGroupHTML::decodeHTMLEntities(const std::string &str)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
ucstring result;
|
|
|
|
std::string result;
|
|
|
|
|
|
|
|
result.reserve(str.size() + (str.size() >> 2));
|
|
|
|
uint last, pos;
|
|
|
|
uint last, pos;
|
|
|
|
|
|
|
|
|
|
|
|
for (uint i=0; i<str.length(); ++i)
|
|
|
|
for (uint i=0; i<str.length(); ++i)
|
|
|
|
@ -5002,13 +4997,13 @@ namespace NLGUI
|
|
|
|
continue;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
ucchar c = 0;
|
|
|
|
u32char c = 0;
|
|
|
|
|
|
|
|
|
|
|
|
// convert digits to unicode character
|
|
|
|
// convert digits to unicode character
|
|
|
|
while (pos<last) c = convertHexDigit(str[pos++]) + c*ucchar(base);
|
|
|
|
while (pos < last) c = convertHexDigit(str[pos++]) + (c * u32char(base));
|
|
|
|
|
|
|
|
|
|
|
|
// append our new character to the result string
|
|
|
|
// append our new character to the result string
|
|
|
|
result += c;
|
|
|
|
CUtfStringView::append(result, c);
|
|
|
|
|
|
|
|
|
|
|
|
// move 'i' forward to point at the ';' .. the for(...) will increment i to point to next char
|
|
|
|
// move 'i' forward to point at the ';' .. the for(...) will increment i to point to next char
|
|
|
|
i = last;
|
|
|
|
i = last;
|
|
|
|
@ -5017,10 +5012,10 @@ namespace NLGUI
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// special xml characters
|
|
|
|
// special xml characters
|
|
|
|
if (str.substr(i+1,5)==ucstring("quot;")) { i+=5; result+='\"'; continue; }
|
|
|
|
if (str.substr(i+1,5)=="quot;") { i+=5; result+='\"'; continue; }
|
|
|
|
if (str.substr(i+1,4)==ucstring("amp;")) { i+=4; result+='&'; continue; }
|
|
|
|
if (str.substr(i+1,4)=="amp;") { i+=4; result+='&'; continue; }
|
|
|
|
if (str.substr(i+1,3)==ucstring("lt;")) { i+=3; result+='<'; continue; }
|
|
|
|
if (str.substr(i+1,3)=="lt;") { i+=3; result+='<'; continue; }
|
|
|
|
if (str.substr(i+1,3)==ucstring("gt;")) { i+=3; result+='>'; continue; }
|
|
|
|
if (str.substr(i+1,3)=="gt;") { i+=3; result+='>'; continue; }
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// all the special cases are catered for... treat this as a normal character
|
|
|
|
// all the special cases are catered for... treat this as a normal character
|
|
|
|
@ -5471,11 +5466,11 @@ namespace NLGUI
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
{
|
|
|
|
{
|
|
|
|
ctrlButton->setDefaultContextHelp(ucstring::makeFromUtf8(tooltip));
|
|
|
|
ctrlButton->setDefaultContextHelp(tooltip);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
ctrlButton->setText(ucstring::makeFromUtf8(value));
|
|
|
|
ctrlButton->setText(value);
|
|
|
|
|
|
|
|
|
|
|
|
setTextButtonStyle(ctrlButton, _Style.Current);
|
|
|
|
setTextButtonStyle(ctrlButton, _Style.Current);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -5563,8 +5558,7 @@ namespace NLGUI
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (!_Paragraph || _Paragraph->getNumChildren() == 0)
|
|
|
|
if (!_Paragraph || _Paragraph->getNumChildren() == 0)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
ucstring tmp("\n");
|
|
|
|
addString("\n");
|
|
|
|
addString(tmp);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
{
|
|
|
|
{
|
|
|
|
@ -6086,8 +6080,7 @@ namespace NLGUI
|
|
|
|
{
|
|
|
|
{
|
|
|
|
// Get the string name
|
|
|
|
// Get the string name
|
|
|
|
string name = elm.getAttribute("name");
|
|
|
|
string name = elm.getAttribute("name");
|
|
|
|
ucstring ucValue;
|
|
|
|
string ucValue = elm.getAttribute("value");
|
|
|
|
ucValue.fromUtf8(elm.getAttribute("value"));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
uint size = 20;
|
|
|
|
uint size = 20;
|
|
|
|
uint maxlength = 1024;
|
|
|
|
uint maxlength = 1024;
|
|
|
|
@ -6121,12 +6114,12 @@ namespace NLGUI
|
|
|
|
string normal = elm.getAttribute("src");
|
|
|
|
string normal = elm.getAttribute("src");
|
|
|
|
string pushed;
|
|
|
|
string pushed;
|
|
|
|
string over;
|
|
|
|
string over;
|
|
|
|
ucstring ucValue = ucstring("on");
|
|
|
|
string ucValue = "on";
|
|
|
|
bool checked = elm.hasAttribute("checked");
|
|
|
|
bool checked = elm.hasAttribute("checked");
|
|
|
|
|
|
|
|
|
|
|
|
// TODO: unknown if empty attribute should override or not
|
|
|
|
// TODO: unknown if empty attribute should override or not
|
|
|
|
if (elm.hasNonEmptyAttribute("value"))
|
|
|
|
if (elm.hasNonEmptyAttribute("value"))
|
|
|
|
ucValue.fromUtf8(elm.getAttribute("value"));
|
|
|
|
ucValue = elm.getAttribute("value");
|
|
|
|
|
|
|
|
|
|
|
|
if (type == "radio")
|
|
|
|
if (type == "radio")
|
|
|
|
{
|
|
|
|
{
|
|
|
|
@ -6191,8 +6184,7 @@ namespace NLGUI
|
|
|
|
string name = elm.getAttribute("name");
|
|
|
|
string name = elm.getAttribute("name");
|
|
|
|
|
|
|
|
|
|
|
|
// Get the value
|
|
|
|
// Get the value
|
|
|
|
ucstring ucValue;
|
|
|
|
string ucValue = elm.getAttribute("value");
|
|
|
|
ucValue.fromUtf8(elm.getAttribute("value"));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Add an entry
|
|
|
|
// Add an entry
|
|
|
|
CGroupHTML::CForm::CEntry entry;
|
|
|
|
CGroupHTML::CForm::CEntry entry;
|
|
|
|
@ -6224,8 +6216,7 @@ namespace NLGUI
|
|
|
|
if (elm.hasNonEmptyAttribute("value"))
|
|
|
|
if (elm.hasNonEmptyAttribute("value"))
|
|
|
|
fromString(elm.getAttribute("value"), _UL.back().Value);
|
|
|
|
fromString(elm.getAttribute("value"), _UL.back().Value);
|
|
|
|
|
|
|
|
|
|
|
|
ucstring str;
|
|
|
|
string str = _UL.back().getListMarkerText();
|
|
|
|
str.fromUtf8(_UL.back().getListMarkerText());
|
|
|
|
|
|
|
|
addString (str);
|
|
|
|
addString (str);
|
|
|
|
|
|
|
|
|
|
|
|
// list-style-type: outside
|
|
|
|
// list-style-type: outside
|
|
|
|
@ -6429,7 +6420,7 @@ namespace NLGUI
|
|
|
|
// use option text as value
|
|
|
|
// use option text as value
|
|
|
|
if (!elm.hasAttribute("value"))
|
|
|
|
if (!elm.hasAttribute("value"))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
_Forms.back().Entries.back().SelectValues.back() = _SelectOptionStr.toUtf8();
|
|
|
|
_Forms.back().Entries.back().SelectValues.back() = _SelectOptionStr;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// insert the parsed text into the select control
|
|
|
|
// insert the parsed text into the select control
|
|
|
|
@ -6437,7 +6428,7 @@ namespace NLGUI
|
|
|
|
if (cb)
|
|
|
|
if (cb)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
uint lineIndex = cb->getNumTexts();
|
|
|
|
uint lineIndex = cb->getNumTexts();
|
|
|
|
cb->addText(_SelectOptionStr.toUtf8());
|
|
|
|
cb->addText(_SelectOptionStr);
|
|
|
|
if (_Forms.back().Entries.back().sbOptionDisabled == lineIndex)
|
|
|
|
if (_Forms.back().Entries.back().sbOptionDisabled == lineIndex)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
cb->setGrayed(lineIndex, true);
|
|
|
|
cb->setGrayed(lineIndex, true);
|
|
|
|
|
kaetemi
4 years ago