mirror of
https://github.com/edubart/otclient.git
synced 2025-10-17 21:13:26 +02:00
many changes and refactoring
This commit is contained in:
Eduardo Bart
@@ -22,13 +22,17 @@
|
||||
*/
|
||||
|
||||
|
||||
#include <prerequisites.h>
|
||||
#include <global.h>
|
||||
#include <core/resources.h>
|
||||
#include <ui/ui.h>
|
||||
#include <ui/uiloader.h>
|
||||
#include <script/luascript.h>
|
||||
#include <script/luafunctions.h>
|
||||
#include "uianchorlayout.h"
|
||||
#include <otml/otml.h>
|
||||
#include <ui/uianchorlayout.h>
|
||||
#include <util/translator.h>
|
||||
|
||||
#include <boost/algorithm/string.hpp>
|
||||
|
||||
UILoader g_uiLoader;
|
||||
|
||||
@@ -41,28 +45,26 @@ UIElementPtr UILoader::createElementFromId(const std::string& id)
|
||||
if(split.size() != 2)
|
||||
return element;
|
||||
|
||||
std::string elementType = split[0];
|
||||
std::string elementType = split[0].substr(1);
|
||||
std::string elementId = split[1];
|
||||
|
||||
if(elementType == "panel") {
|
||||
if(elementType == "panel")
|
||||
element = UIElementPtr(new UIContainer(UI::Panel));
|
||||
} else if(elementType == "button") {
|
||||
else if(elementType == "button")
|
||||
element = UIElementPtr(new UIButton);
|
||||
} else if(elementType == "label") {
|
||||
else if(elementType == "label")
|
||||
element = UIElementPtr(new UILabel);
|
||||
} else if(elementType == "window") {
|
||||
else if(elementType == "window")
|
||||
element = UIElementPtr(new UIWindow);
|
||||
} else if(elementType == "textEdit") {
|
||||
else if(elementType == "textEdit")
|
||||
element = UIElementPtr(new UITextEdit);
|
||||
} else if(elementType == "lineDecoration") {
|
||||
else if(elementType == "lineDecoration")
|
||||
element = UIElementPtr(new UIElement(UI::LineDecoration));
|
||||
} else if(elementType == "checkBox") {
|
||||
else if(elementType == "checkBox")
|
||||
element = UIElementPtr(new UICheckBox);
|
||||
}
|
||||
|
||||
if(element) {
|
||||
if(element)
|
||||
element->setId(elementId);
|
||||
}
|
||||
|
||||
return element;
|
||||
}
|
||||
@@ -71,13 +73,13 @@ UIElementPtr UILoader::loadFromFile(std::string filePath, const UIContainerPtr&
|
||||
{
|
||||
std::stringstream fin;
|
||||
if(!g_resources.loadFile(filePath, fin)) {
|
||||
flogError("ERROR: Could not load ui %s", filePath.c_str());
|
||||
error("ERROR: Could not load ui ", filePath);
|
||||
return UIElementPtr();
|
||||
}
|
||||
|
||||
try {
|
||||
FML::Parser parser(fin, filePath);
|
||||
FML::Node* doc = parser.getDocument();
|
||||
OTMLParser parser(fin, filePath);
|
||||
OTMLNode* doc = parser.getDocument();
|
||||
|
||||
// get element id
|
||||
std::string elementId = doc->front()->tag();
|
||||
@@ -88,7 +90,7 @@ UIElementPtr UILoader::loadFromFile(std::string filePath, const UIContainerPtr&
|
||||
// create element interpreting it's id
|
||||
UIElementPtr element = createElementFromId(elementId);
|
||||
if(!element) {
|
||||
logError(doc->front()->generateErrorMessage("invalid root element type"));
|
||||
error(doc->front()->generateErrorMessage("invalid root element type"));
|
||||
return element;
|
||||
}
|
||||
parent->addChild(element);
|
||||
@@ -103,22 +105,22 @@ UIElementPtr UILoader::loadFromFile(std::string filePath, const UIContainerPtr&
|
||||
// report onLoad events
|
||||
element->onLoad();
|
||||
return element;
|
||||
} catch(FML::Exception e) {
|
||||
flogError("ERROR: Failed to load ui %s: %s", filePath.c_str() % e.what());
|
||||
} catch(OTMLException e) {
|
||||
error("ERROR: Failed to load ui ",filePath,": ", e.what());
|
||||
}
|
||||
|
||||
return UIElementPtr();
|
||||
}
|
||||
|
||||
void UILoader::populateContainer(const UIContainerPtr& parent, FML::Node* node)
|
||||
void UILoader::populateContainer(const UIContainerPtr& parent, OTMLNode* node)
|
||||
{
|
||||
// populate ordered elements
|
||||
foreach(FML::Node* cnode, *node) {
|
||||
foreach(OTMLNode* cnode, *node) {
|
||||
std::string id = cnode->tag();
|
||||
if(id.find("#") != std::string::npos) {
|
||||
if(id[0] == '%') {
|
||||
UIElementPtr element = createElementFromId(id);
|
||||
if(!element) {
|
||||
logError(cnode->generateErrorMessage("invalid element type"));
|
||||
error(cnode->generateErrorMessage("invalid element type"));
|
||||
continue;
|
||||
}
|
||||
parent->addChild(element);
|
||||
@@ -130,13 +132,13 @@ void UILoader::populateContainer(const UIContainerPtr& parent, FML::Node* node)
|
||||
}
|
||||
}
|
||||
|
||||
void UILoader::loadElements(const UIElementPtr& parent, FML::Node* node)
|
||||
void UILoader::loadElements(const UIElementPtr& parent, OTMLNode* node)
|
||||
{
|
||||
loadElement(parent, node);
|
||||
|
||||
if(UIContainerPtr container = parent->asUIContainer()) {
|
||||
foreach(const UIElementPtr& element, container->getChildren()) {
|
||||
foreach(FML::Node* cnode, *node) {
|
||||
foreach(OTMLNode* cnode, *node) {
|
||||
// node found, load it
|
||||
if(boost::ends_with(cnode->tag(), "#" + element->getId())) {
|
||||
loadElements(element, cnode);
|
||||
@@ -147,10 +149,10 @@ void UILoader::loadElements(const UIElementPtr& parent, FML::Node* node)
|
||||
}
|
||||
}
|
||||
|
||||
void UILoader::loadElement(const UIElementPtr& element, FML::Node* node)
|
||||
void UILoader::loadElement(const UIElementPtr& element, OTMLNode* node)
|
||||
{
|
||||
// set element skin
|
||||
if(FML::Node* cnode = node->at("skin")) {
|
||||
if(OTMLNode* cnode = node->at("skin")) {
|
||||
if(cnode->hasValue()) {
|
||||
element->setSkin(g_uiSkins.getElementSkin(element->getElementType(), cnode->value()));
|
||||
} else {
|
||||
@@ -165,72 +167,61 @@ void UILoader::loadElement(const UIElementPtr& element, FML::Node* node)
|
||||
if(node->hasNode("size"))
|
||||
element->setSize(node->readAt<Size>("size"));
|
||||
|
||||
element->setMarginLeft(node->readAt("margin.left", 0));
|
||||
element->setMarginRight(node->readAt("margin.right", 0));
|
||||
element->setMarginTop(node->readAt("margin.top", 0));
|
||||
element->setMarginBottom(node->readAt("margin.bottom", 0));
|
||||
// load margins
|
||||
element->setMarginLeft(node->readAtPath("margin/left", 0));
|
||||
element->setMarginRight(node->readAtPath("margin/right", 0));
|
||||
element->setMarginTop(node->readAtPath("margin/top", 0));
|
||||
element->setMarginBottom(node->readAtPath("margin/bottom", 0));
|
||||
|
||||
if(node->hasNode("anchors.left"))
|
||||
loadElementAnchor(element, UI::AnchorLeft, node->at("anchors.left"));
|
||||
// load anchors
|
||||
loadElementAnchor(element, UI::AnchorLeft, node->atPath("anchors/left"));
|
||||
loadElementAnchor(element, UI::AnchorRight, node->atPath("anchors/right"));
|
||||
loadElementAnchor(element, UI::AnchorTop, node->atPath("anchors/top"));
|
||||
loadElementAnchor(element, UI::AnchorBottom, node->atPath("anchors/bottom"));
|
||||
loadElementAnchor(element, UI::AnchorHorizontalCenter, node->atPath("anchors/horizontalCenter"));
|
||||
loadElementAnchor(element, UI::AnchorVerticalCenter, node->atPath("anchors/verticalCenter"));
|
||||
|
||||
if(node->hasNode("anchors.right"))
|
||||
loadElementAnchor(element, UI::AnchorRight, node->at("anchors.right"));
|
||||
|
||||
if(node->hasNode("anchors.top"))
|
||||
loadElementAnchor(element, UI::AnchorTop, node->at("anchors.top"));
|
||||
|
||||
if(node->hasNode("anchors.bottom"))
|
||||
loadElementAnchor(element, UI::AnchorBottom, node->at("anchors.bottom"));
|
||||
|
||||
if(node->hasNode("anchors.horizontalCenter"))
|
||||
loadElementAnchor(element, UI::AnchorHorizontalCenter, node->at("anchors.horizontalCenter"));
|
||||
|
||||
if(node->hasNode("anchors.verticalCenter"))
|
||||
loadElementAnchor(element, UI::AnchorVerticalCenter, node->at("anchors.verticalCenter"));
|
||||
|
||||
// load events
|
||||
if(FML::Node* cnode = node->at("onLoad")) {
|
||||
if(g_lua.loadBufferAsFunction(cnode->value(), getElementSourceDesc(element, cnode)))
|
||||
g_lua.setScriptableField(element, "onLoad");
|
||||
else
|
||||
logError(cnode->generateErrorMessage("failed to parse inline lua script"));
|
||||
}
|
||||
|
||||
if(FML::Node* cnode = node->at("onDestroy")) {
|
||||
if(g_lua.loadBufferAsFunction(cnode->value(), getElementSourceDesc(element, cnode)))
|
||||
g_lua.setScriptableField(element, "onDestroy");
|
||||
else
|
||||
logError(cnode->generateErrorMessage("failed to parse inline lua script"));
|
||||
}
|
||||
// load basic element events
|
||||
loadElementScriptFunction(element, node->at("onLoad"));
|
||||
loadElementScriptFunction(element, node->at("onDestroy"));
|
||||
|
||||
// load specific element type
|
||||
if(element->getElementType() == UI::Button)
|
||||
loadButton(boost::static_pointer_cast<UIButton>(element), node);
|
||||
else if(element->getElementType() == UI::Window) {
|
||||
UIWindowPtr window = boost::static_pointer_cast<UIWindow>(element);
|
||||
window->setTitle(node->readAt("title", std::string()));
|
||||
}
|
||||
else if(element->getElementType() == UI::Label) {
|
||||
UILabelPtr label = boost::static_pointer_cast<UILabel>(element);
|
||||
label->setText(node->readAt("text", std::string()));
|
||||
label->setAlign(parseAlignment(node->readAt("align", std::string("left"))));
|
||||
}
|
||||
switch(element->getElementType()) {
|
||||
case UI::Button:
|
||||
loadButton(boost::static_pointer_cast<UIButton>(element), node);
|
||||
break;
|
||||
case UI::Window:
|
||||
loadWindow(boost::static_pointer_cast<UIWindow>(element), node);
|
||||
break;
|
||||
case UI::Label:
|
||||
loadLabel(boost::static_pointer_cast<UILabel>(element), node);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void UILoader::loadElementAnchor(const UIElementPtr& anchoredElement, UI::AnchorPoint anchoredEdge, FML::Node* node)
|
||||
void UILoader::loadElementAnchor(const UIElementPtr& anchoredElement, UI::AnchorPoint anchoredEdge, OTMLNode* node)
|
||||
{
|
||||
UIAnchorLayoutPtr layout = boost::dynamic_pointer_cast<UIAnchorLayout>(anchoredElement->getLayout());
|
||||
if(!layout) {
|
||||
logError(node->generateErrorMessage("could not add anchor, because this element does not participate of an anchor layout"));
|
||||
if(!node)
|
||||
return;
|
||||
|
||||
std::string anchorDescription = node->value();
|
||||
if(anchorDescription.empty()) {
|
||||
error(node->generateErrorMessage("anchor is empty, did you forget to fill it?"));
|
||||
return;
|
||||
}
|
||||
|
||||
std::string anchorDescription = node->value();
|
||||
UIAnchorLayoutPtr layout = boost::dynamic_pointer_cast<UIAnchorLayout>(anchoredElement->getLayout());
|
||||
if(!layout) {
|
||||
error(node->generateErrorMessage("could not add anchor, because this element does not participate of an anchor layout"));
|
||||
return;
|
||||
}
|
||||
|
||||
std::vector<std::string> split;
|
||||
boost::split(split, anchorDescription, boost::is_any_of(std::string(".")));
|
||||
if(split.size() != 2) {
|
||||
logError(node->generateErrorMessage("invalid anchor"));
|
||||
error(node->generateErrorMessage("invalid anchor"));
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -238,33 +229,42 @@ void UILoader::loadElementAnchor(const UIElementPtr& anchoredElement, UI::Anchor
|
||||
UI::AnchorPoint anchorLineEdge = UIAnchorLayout::parseAnchorPoint(split[1]);
|
||||
|
||||
if(anchorLineEdge == UI::AnchorNone) {
|
||||
logError(node->generateErrorMessage("invalid anchor type"));
|
||||
error(node->generateErrorMessage("invalid anchor type"));
|
||||
return;
|
||||
}
|
||||
|
||||
if(!layout->addAnchor(anchoredElement, anchoredEdge, AnchorLine(anchorLineElementId, anchorLineEdge)))
|
||||
logError(node->generateErrorMessage("anchoring failed"));
|
||||
error(node->generateErrorMessage("anchoring failed"));
|
||||
}
|
||||
|
||||
void UILoader::loadButton(const UIButtonPtr& button, FML::Node* node)
|
||||
void UILoader::loadElementScriptFunction(const UIElementPtr& element, OTMLNode* node)
|
||||
{
|
||||
if(!node)
|
||||
return;
|
||||
|
||||
std::string functionDesc;
|
||||
functionDesc += g_resources.resolvePath(node->what()) + ":" + element->getId();
|
||||
functionDesc += "[" + node->tag() + "]";
|
||||
|
||||
if(g_lua.loadBufferAsFunction(node->value(), functionDesc))
|
||||
g_lua.setScriptableField(element, node->tag());
|
||||
else
|
||||
error(node->generateErrorMessage("failed to parse inline lua script"));
|
||||
}
|
||||
|
||||
void UILoader::loadButton(const UIButtonPtr& button, OTMLNode* node)
|
||||
{
|
||||
button->setText(node->valueAt("text"));
|
||||
|
||||
// set on click event
|
||||
if(FML::Node* cnode = node->at("onClick")) {
|
||||
if(g_lua.loadBufferAsFunction(cnode->value(), getElementSourceDesc(button, cnode)))
|
||||
g_lua.setScriptableField(button, "onClick");
|
||||
else
|
||||
logError(cnode->generateErrorMessage("failed to parse inline lua script"));
|
||||
}
|
||||
loadElementScriptFunction(button, node->at("onClick"));
|
||||
}
|
||||
|
||||
std::string UILoader::getElementSourceDesc(const UIElementPtr& element, const FML::Node *node)
|
||||
void UILoader::loadWindow(const UIWindowPtr& window, OTMLNode* node)
|
||||
{
|
||||
std::string desc;
|
||||
desc += g_resources.resolvePath(node->what()) + ":" + element->getId();
|
||||
if(!node->tag().empty())
|
||||
desc += "[" + node->tag() + "]";
|
||||
return desc;
|
||||
window->setTitle(node->readAt("title", std::string()));
|
||||
}
|
||||
|
||||
void UILoader::loadLabel(const UILabelPtr& label, OTMLNode* node)
|
||||
{
|
||||
label->setText(node->readAt("text", std::string()));
|
||||
label->setAlign(parseAlignment(node->readAt("align", std::string("left"))));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user