mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 07:23:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

gui/luainstance: recognize menu hints

Browse Source
This commit is contained in:
martii
2013-12-11 12:41:25 +01:00
committed by M. Liebmann
parent 60dbf9194e
commit b59141d1f5
1 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/gui/luainstance.cpp
View File

@@ -960,6 +960,8 @@ int CLuaInstance::MenuAddItem(lua_State *L)
std::string right_icon; tableLookup(L, "right_icon", right_icon); std::string right_icon; tableLookup(L, "right_icon", right_icon);
std::string action; tableLookup(L, "action", action); std::string action; tableLookup(L, "action", action);
std::string value; tableLookup(L, "value", value); std::string value; tableLookup(L, "value", value);
std::string hint; tableLookup(L, "hint", hint);
std::string hint_icon; tableLookup(L, "hint_icon", hint_icon);
std::string id; tableLookup(L, "id", id); std::string id; tableLookup(L, "id", id);
std::string tmp; std::string tmp;
int directkey = CRCInput::RC_nokey; tableLookup(L, "directkey", directkey); int directkey = CRCInput::RC_nokey; tableLookup(L, "directkey", directkey);
@@ -971,12 +973,14 @@ int CLuaInstance::MenuAddItem(lua_State *L)
int range_from = 0, range_to = 99; int range_from = 0, range_to = 99;
sscanf(tmp.c_str(), "%d,%d", &range_from, &range_to); sscanf(tmp.c_str(), "%d,%d", &range_from, &range_to);
CMenuItem *mi = NULL;
if (type == "forwarder") { if (type == "forwarder") {
b->str_val = value; b->str_val = value;
CLuaMenuForwarder *forwarder = new CLuaMenuForwarder(L, action, id); CLuaMenuForwarder *forwarder = new CLuaMenuForwarder(L, action, id);
CMenuItem *mi = new CMenuForwarder(b->name, enabled, b->str_val, forwarder, NULL/*ActionKey*/, directkey, icon.c_str(), right_icon.c_str()); mi = new CMenuForwarder(b->name, enabled, b->str_val, forwarder, NULL/*ActionKey*/, directkey, icon.c_str(), right_icon.c_str());
mi->setLua(L, action, id); if (!hint.empty() || !hint_icon.empty())
m->m->addItem(mi); mi->setHint(hint_icon, hint);
m->targets.push_back(forwarder); m->targets.push_back(forwarder);
} else if (type == "chooser") { } else if (type == "chooser") {
int options_count = 0; int options_count = 0;
@@ -1009,21 +1013,14 @@ int CLuaInstance::MenuAddItem(lua_State *L)
j++; j++;
} }
lua_pop(L, 1); lua_pop(L, 1);
CMenuItem *mi = new CMenuOptionChooser(b->name.c_str(), &b->i, kext, options_count, enabled, m->observ, directkey, icon.c_str(), pulldown); mi = new CMenuOptionChooser(b->name.c_str(), &b->int_val, kext, options_count, enabled, m->observ, directkey, icon.c_str(), pulldown);
mi->setLua(L, action, id);
m->m->addItem(mi);
} else if (type == "numeric") { } else if (type == "numeric") {
b->i = range_from; b->int_val = range_from;
sscanf(value.c_str(), "%d", &b->i); sscanf(value.c_str(), "%d", &b->int_val);
CMenuItem *mi = new CMenuOptionNumberChooser(NONEXISTANT_LOCALE, &b->i, enabled, range_from, range_to, m->observ, mi = new CMenuOptionNumberChooser(b->name, &b->int_val, enabled, range_from, range_to, m->observ, 0, 0, NONEXISTANT_LOCALE, pulldown);
0, 0, NONEXISTANT_LOCALE, b->name.c_str(), pulldown);
mi->setLua(L, action, id);
m->m->addItem(mi);
} else if (type == "string") { } else if (type == "string") {
strncpy(b->s, value.c_str(), sizeof(b->s)); b->str_val = value;
CMenuItem *mi = new CMenuOptionStringChooser(b->name.c_str(), b->s, enabled, m->observ, directkey, icon.c_str(), pulldown); mi = new CMenuOptionStringChooser(b->name.c_str(), &b->str_val, enabled, m->observ, directkey, icon.c_str(), pulldown);
mi->setLua(L, action, id);
m->m->addItem(mi);
} else if (type == "stringinput") { } else if (type == "stringinput") {
strncpy(b->s, value.c_str(), sizeof(b->s)); strncpy(b->s, value.c_str(), sizeof(b->s));
std::string valid_chars = "abcdefghijklmnopqrstuvwxyz0123456789!\"§$%&/()=?-. "; std::string valid_chars = "abcdefghijklmnopqrstuvwxyz0123456789!\"§$%&/()=?-. ";
@@ -1031,9 +1028,7 @@ int CLuaInstance::MenuAddItem(lua_State *L)
int sms = 0; tableLookup(L, "sms", sms); int sms = 0; tableLookup(L, "sms", sms);
int size = 30; tableLookup(L, "size", size); int size = 30; tableLookup(L, "size", size);
CLuaMenuStringinput *stringinput = new CLuaMenuStringinput(L, action, id, b->name.c_str(), &b->str_val, size, valid_chars, m->observ, icon.c_str(), sms); CLuaMenuStringinput *stringinput = new CLuaMenuStringinput(L, action, id, b->name.c_str(), &b->str_val, size, valid_chars, m->observ, icon.c_str(), sms);
CMenuItem *mi = new CMenuForwarder(b->name, enabled, b->str_val, stringinput, NULL/*ActionKey*/, directkey, icon.c_str(), right_icon.c_str()); mi = new CMenuForwarder(b->name, enabled, b->str_val, stringinput, NULL/*ActionKey*/, directkey, icon.c_str(), right_icon.c_str());
mi->setLua(L, action, id);
m->m->addItem(mi);
m->targets.push_back(stringinput); m->targets.push_back(stringinput);
} else if (type == "filebrowser") { } else if (type == "filebrowser") {
strncpy(b->s, value.c_str(), sizeof(b->s)); strncpy(b->s, value.c_str(), sizeof(b->s));
@@ -1049,12 +1044,15 @@ int CLuaInstance::MenuAddItem(lua_State *L)
} }
lua_pop(L, 1); lua_pop(L, 1);
CMenuItem *mi = new CMenuForwarderNonLocalized( mi = new CMenuForwarder(b->name, enabled, b->str_val, filebrowser, NULL/*ActionKey*/, directkey, icon.c_str(), right_icon.c_str());
b->name.c_str(), enabled, b->s, filebrowser, NULL/*ActionKey*/, directkey, icon.c_str(), right_icon.c_str());
mi->setLua(L, action, id);
m->m->addItem(mi);
m->targets.push_back(filebrowser); m->targets.push_back(filebrowser);
} }
if (mi) {
mi->setLua(L, action, id);
if (!hint.empty() || !hint_icon.empty())
mi->setHint(hint_icon, hint);
m->m->addItem(mi);
}
} }
return 0; return 0;
} }