From 417865bb3affdab89fa6d31dd391bbd0b8e38b94 Mon Sep 17 00:00:00 2001 From: Inky Date: Mon, 8 Apr 2019 02:33:55 +0300 Subject: [PATCH] Added: Store user created channels in xml file --HG-- branch : patches-from-atys --- .../src/interface_v3/action_handler_game.cpp | 9 ++ .../client/src/interface_v3/lua_ihm_ryzom.cpp | 129 ++++++++++++++++++ .../client/src/interface_v3/lua_ihm_ryzom.h | 4 + 3 files changed, 142 insertions(+) diff --git a/code/ryzom/client/src/interface_v3/action_handler_game.cpp b/code/ryzom/client/src/interface_v3/action_handler_game.cpp index 160fc805c..1c68dca8c 100644 --- a/code/ryzom/client/src/interface_v3/action_handler_game.cpp +++ b/code/ryzom/client/src/interface_v3/action_handler_game.cpp @@ -3489,6 +3489,15 @@ class CHandlerGameConfigApply : public IActionHandler } } + // save user created channels options + CCtrlBaseButton *pCS = dynamic_cast(CWidgetManager::getInstance()->getElementFromDefine("game_config_save_channel_cb")); + if (pCS) + NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:CHAT:SAVE_CHANNEL")->setValue32(pCS->getPushed()); + + pCS = dynamic_cast(CWidgetManager::getInstance()->getElementFromDefine("game_config_auto_channel_cb")); + if (pCS) + NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:CHAT:AUTO_CHANNEL")->setValue32(pCS->getPushed()); + CCtrlBaseButton *pBut = dynamic_cast(CWidgetManager::getInstance()->getElementFromId(GAME_CONFIG_VR_ENABLE_BUTTON)); if (pBut) { diff --git a/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp b/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp index e8a632762..1a4f56d14 100644 --- a/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp +++ b/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp @@ -118,6 +118,8 @@ #include "nel/georges/u_form.h" #include "nel/georges/u_form_elm.h" #include "nel/misc/polygon.h" +#include "nel/misc/i_xml.h" +#include "nel/misc/o_xml.h" #include "game_share/scenario_entry_points.h" #include "game_share/bg_downloader_msg.h" #include "game_share/constants.h" @@ -489,6 +491,9 @@ void CLuaIHMRyzom::RegisterRyzomFunctions(NLGUI::CLuaState &ls) ls.registerFunc("delArkPoints", delArkPoints); ls.registerFunc("addRespawnPoint", addRespawnPoint); ls.registerFunc("setArkPowoOptions", setArkPowoOptions); + ls.registerFunc("saveUserChannels", saveUserChannels); + ls.registerFunc("readUserChannels", readUserChannels); + ls.registerFunc("getMaxDynChan", getMaxDynChan); lua_State *L = ls.getStatePointer(); @@ -3975,6 +3980,130 @@ int CLuaIHMRyzom::setArkPowoOptions(CLuaState &ls) return 0; } +// *************************************************************************** +int CLuaIHMRyzom::readUserChannels(CLuaState &ls) +{ + std::string filename = CInterfaceManager::getInstance()->getSaveFileName("channels", "xml"); + try + { + CIFile fd; + if (fd.open(CPath::lookup(filename))) + { + CIXml stream; + stream.init(fd); + + xmlKeepBlanksDefault(0); + xmlNodePtr root = stream.getRootNode(); + if (!root) + return 0; + CXMLAutoPtr prop; + + // table + ls.newTable(); + CLuaObject output(ls); + + uint nb = 0; + xmlNodePtr node = root->children; + while (node) + { + prop = xmlGetProp(node, (xmlChar*)"name"); + if (!prop) + return 0; + std::string name = (const char*)prop; + + prop = xmlGetProp(node, (xmlChar*)"passwd"); + if (!prop) + return 0; + std::string pass = (const char*)prop; + + output.setValue(name.c_str(), pass.c_str()); + node = node->next; + nb++; + } + // no exception + fd.close(); + + // release lua table + output.push(); + } + nlinfo("parse %s", filename.c_str()); + } + catch (const Exception &e) + { + nlwarning("Error while parsing xml file %s : %s", filename.c_str(), e.what()); + return 0; + } + return 1; +} + +// *************************************************************************** +int CLuaIHMRyzom::saveUserChannels(CLuaState &ls) +{ + const char *funcName = "saveUserChannels"; + + CLuaIHM::check(ls, ls.getTop()==1 || ls.getTop()==2, funcName); + CLuaIHM::checkArgType(ls, funcName, 1, LUA_TTABLE); + + bool verbose = false; + if (ls.getTop() > 1) + { + CLuaIHM::checkArgType(ls, funcName, 2, LUA_TBOOLEAN); + verbose = ls.toBoolean(2); + ls.pop(); + } + CLuaObject params; + params.pop(ls); + + std::string filename = CInterfaceManager::getInstance()->getSaveFileName("channels", "xml"); + try + { + COFile fd; + if (fd.open(filename, false, false, true)) + { + COXml stream; + stream.init(&fd); + + xmlDocPtr doc = stream.getDocument(); + xmlNodePtr node = xmlNewDocNode(doc, NULL, (const xmlChar*)"interface_config", NULL); + xmlDocSetRootElement(doc, node); + + ENUM_LUA_TABLE(params, it) + { + if (!it.nextKey().isString()) + continue; + if (!it.nextValue().isString()) + continue; + + std::string name = it.nextKey().toString(); + std::string pass = it.nextValue().toString(); + + xmlNodePtr newNode = xmlNewChild(node, NULL, (const xmlChar*)"channels", NULL); + xmlSetProp(newNode, (const xmlChar*)"name", (const xmlChar*)name.c_str()); + xmlSetProp(newNode, (const xmlChar*)"passwd", (const xmlChar*)pass.c_str()); + } + stream.flush(); + // no exception + fd.close(); + } + nlinfo("save %s", filename.c_str()); + if (verbose) + CInterfaceManager::getInstance()->displaySystemInfo("Saving " + filename); + } + catch (const Exception &e) + { + nlwarning("Error while writing the file %s : %s", filename.c_str(), e.what()); + return 0; + } + return 1; +} + +// *************************************************************************** +int CLuaIHMRyzom::getMaxDynChan(CLuaState &ls) +{ + ls.push((sint32)CChatGroup::MaxDynChanPerPlayer); + return 1; +} + // *************************************************************************** std::string CLuaIHMRyzom::createGotoFileButtonTag(const char *fileName, uint line) { diff --git a/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.h b/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.h index 5e8f8d021..fa27bb5df 100644 --- a/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.h +++ b/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.h @@ -98,6 +98,10 @@ private: static int getSheet2idx(CLuaState &ls); static int getTargetSlot(CLuaState &ls); static int getSlotDataSetId(CLuaState &ls); + // + static int getMaxDynChan(CLuaState &ls); + static int readUserChannels(CLuaState &ls); + static int saveUserChannels(CLuaState &ls); // { name = "pass" } // LUA functions exported for Dev only (debug) static int dumpUI(CLuaState &ls); // params: CInterfaceElement*.... return: none