mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 16:01:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: ecb0bdca43
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-31 (Fri, 31 Mar 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-03-31 17:42:07 +02:00
parent 5c0f53bc08 ed105ffa82
commit fcb3a99ce0
6 changed files with 259 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/gui/lua/luainstance.cpp
View File

@@ -51,6 +51,7 @@
#include "lua_menue.h"
#include "lua_messagebox.h"
#include "lua_misc.h"
#include "lua_progresswindow.h"
#include "lua_stringinput.h"
#include "lua_threads.h"
#include "lua_video.h"
@@ -383,22 +384,35 @@ static void set_lua_variables(lua_State *L)
{ NULL, 0 }
};
/*
* possible text allignment modes usable for window header caption
* API: >= v1.71
*/
table_key text_alignment[] =
{
{ "DEFAULT", (lua_Integer)CTextBox::NO_AUTO_LINEBREAK},
{ "CENTER", (lua_Integer)CTextBox::CENTER},
{ "RIGHT", (lua_Integer)CTextBox::RIGHT},
{ NULL, 0 }
};
/* list of environment variable arrays to be exported */
lua_envexport e[] =
{
{ "RC", keyname },
{ "SCREEN", screenopts },
{ "FONT", fontlist },
{ "CORNER", corners },
{ "OFFSET", offsets },
{ "MENU_RETURN", menureturn },
{ "APIVERSION", apiversion },
{ "PLAYSTATE", playstate },
{ "CC", ccomponents },
{ "DYNFONT", dynfont },
{ "CURL", curl_status },
{ "NMODE", neutrino_mode },
{ "POSTMSG", post_msg },
{ "RC", keyname },
{ "SCREEN", screenopts },
{ "FONT", fontlist },
{ "CORNER", corners },
{ "OFFSET", offsets },
{ "MENU_RETURN", menureturn },
{ "APIVERSION", apiversion },
{ "PLAYSTATE", playstate },
{ "CC", ccomponents },
{ "DYNFONT", dynfont },
{ "CURL", curl_status },
{ "NMODE", neutrino_mode },
{ "POSTMSG", post_msg },
{ "TEXT_ALIGNMENT", text_alignment },
{ NULL, NULL }
};
@@ -660,6 +674,8 @@ void LuaInstRegisterFunctions(lua_State *L, bool fromThreads/*=false*/)
CLuaInstStringInput::getInstance()->StringInputRegister(L);
CLuaInstMisc::getInstance()->LuaMiscRegister(L);
CLuaInstVideo::getInstance()->LuaVideoRegister(L);
CLuaInstProgressWindow::getInstance()->ProgressWindowRegister(L);
if (!fromThreads)
CLLThread::getInstance()->LuaThreadsRegister(L);
}