Update action_handler_item.cpp

develop
Jan Boon 4 years ago committed by GitHub
parent 2bb13937e8
commit 9d3891f1aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -161,28 +161,29 @@ void CInterfaceItemEdition::CItemEditionWindow::infoReceived()
} }
else else
{ {
const char *localDesc = STRING_MANAGER::CStringManagerClient::getItemLocalizedDescription(pIS->Id);
if (itemInfo.CustomText.empty()) if (itemInfo.CustomText.empty())
display->setTextFormatTaged(STRING_MANAGER::CStringManagerClient::getItemLocalizedDescription(pIS->Id)); display->setTextFormatTaged(localDesc);
else else
{ {
ucstring text = itemInfo.CustomText; string text = itemInfo.CustomText.toUtf8();
if (text.size() > 3 && text[0]=='@' && text[1]=='W' && text[2]=='E' && text[3]=='B') if (text.size() > 3 && text[0]=='@' && text[1]=='W' && text[2]=='E' && text[3]=='B')
{ {
CGroupHTML *pGH = dynamic_cast<CGroupHTML*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:web_transactions:content:html")); CGroupHTML *pGH = dynamic_cast<CGroupHTML*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:web_transactions:content:html"));
if (pGH) if (pGH)
pGH->browse(text.substr(4, text.size()-4).toString().c_str()); pGH->browse(text.substr(4, text.size()-4).c_str());
text = localDesc; text = localDesc;
} }
else if (text.size() > 3 && text[0]=='@' && text[1]=='L' && text[2]=='U' && text[3]=='A') else if (text.size() > 3 && text[0]=='@' && text[1]=='L' && text[2]=='U' && text[3]=='A')
{ {
string code = text.substr(4, text.size()-4).toString(); string code = text.substr(4, text.size()-4);
if (!code.empty()) if (!code.empty())
CLuaManager::getInstance().executeLuaScript(code); CLuaManager::getInstance().executeLuaScript(code);
text = localDesc; text = localDesc;
} }
if (!text.empty()) if (!text.empty())
{ {
display->setTextFormatTaged(text.toUtf8()); display->setTextFormatTaged(text);
group->setActive(true); group->setActive(true);
} }
} }

Loading…
Cancel
Save