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

Merge remote-tracking branch 'check/cst-next'

Browse Source 
*needs buildfixing*

Conflicts:
	src/daemonc/Makefile.am
	src/daemonc/remotecontrol.cpp
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/driver/vfd.cpp
	src/gui/bedit/Makefile.am
	src/gui/components/Makefile.am
	src/gui/luainstance.cpp
	src/gui/widget/Makefile.am
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am
This commit is contained in:
Stefan Seyfried
2015-01-26 17:26:26 +01:00
parent ea6b7e2514 ed03bf9f6e
commit b5a64e6887
106 changed files with 6374 additions and 5374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/gui/luainstance.cpp
View File

@@ -1273,7 +1273,7 @@ int CLuaInstance::MenuAddKey(lua_State *L)
std::string id; tableLookup(L, "id", id);
lua_Unsigned directkey = CRCInput::RC_nokey;
tableLookup(L, "directkey", directkey);
if (action != "" && directkey != CRCInput::RC_nokey) {
if ((!action.empty()) && (directkey != CRCInput::RC_nokey)) {
CLuaMenuForwarder *forwarder = new CLuaMenuForwarder(L, action, id);
m->m->addKey(directkey, forwarder, action);
m->targets.push_back(forwarder);
@@ -1807,22 +1807,22 @@ int CLuaInstance::CWindowNew(lua_State *L)
CComponentsFooter* footer = (*udata)->w->getFooterObject();
if (footer) {
int btnCount = 0;
if (btnRed != "") btnCount++;
if (btnGreen != "") btnCount++;
if (btnYellow != "") btnCount++;
if (btnBlue != "") btnCount++;
if (!btnRed.empty()) btnCount++;
if (!btnGreen.empty()) btnCount++;
if (!btnYellow.empty()) btnCount++;
if (!btnBlue.empty()) btnCount++;
if (btnCount) {
fb_pixel_t col = footer->getColorBody();
int btnw = (dx-20) / btnCount;
int btnh = footer->getHeight();
int start = 10;
if (btnRed != "")
if (!btnRed.empty())
footer->addCCItem(new CComponentsButtonRed(start, CC_CENTERED, btnw, btnh, btnRed, 0, false , true, false, col, col));
if (btnGreen != "")
if (!btnGreen.empty())
footer->addCCItem(new CComponentsButtonGreen(start+=btnw, CC_CENTERED, btnw, btnh, btnGreen, 0, false , true, false, col, col));
if (btnYellow != "")
if (!btnYellow.empty())
footer->addCCItem(new CComponentsButtonYellow(start+=btnw, CC_CENTERED, btnw, btnh, btnYellow, 0, false , true, false, col, col));
if (btnBlue != "")
if (!btnBlue.empty())
footer->addCCItem(new CComponentsButtonBlue(start+=btnw, CC_CENTERED, btnw, btnh, btnBlue, 0, false , true, false, col, col));
}
}