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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7bccd83b07
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-27 (Thu, 27 Apr 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-04-27 14:02:32 +02:00
parent c548a68954 70d2aa725d
commit 8af0c9668b
30 changed files with 149 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/lua/lua_api_version.h
View File

@@ -4,4 +4,4 @@
* to luainstance.h changes
*/
#define LUA_API_VERSION_MAJOR 1
#define LUA_API_VERSION_MINOR 72
#define LUA_API_VERSION_MINOR 73

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

@@ -175,6 +175,7 @@ static void set_lua_variables(lua_State *L)
{ "MENUCONTENTINACTIVE", MAGIC_COLOR | (COL_MENUCONTENTINACTIVE) },
{ "MENUFOOT", MAGIC_COLOR | (COL_MENUFOOT) },
{ "FRAME", MAGIC_COLOR | (COL_FRAME) },
{ "SCROLLBAR", MAGIC_COLOR | (COL_SCROLLBAR) },
{ "SCROLLBAR_ACTIVE", MAGIC_COLOR | (COL_SCROLLBAR_ACTIVE) },
{ "SCROLLBAR_PASSIVE", MAGIC_COLOR | (COL_SCROLLBAR_PASSIVE) },
{ "PROGRESSBAR_ACTIVE", MAGIC_COLOR | (COL_PROGRESSBAR_ACTIVE_PLUS_0) }, //NI
@@ -226,6 +227,7 @@ static void set_lua_variables(lua_State *L)
{ "MENUCONTENTINACTIVE_PLUS_0", (lua_Unsigned) (COL_MENUCONTENTINACTIVE_PLUS_0) },
{ "MENUFOOT_PLUS_0", (lua_Unsigned) (COL_MENUFOOT_PLUS_0) },
{ "FRAME_PLUS_0", (lua_Unsigned) (COL_FRAME_PLUS_0) },
{ "SCROLLBAR_PLUS_0", (lua_Unsigned) (COL_SCROLLBAR_PLUS_0) },
{ "SCROLLBAR_ACTIVE_PLUS_0", (lua_Unsigned) (COL_SCROLLBAR_ACTIVE_PLUS_0) },
{ "SCROLLBAR_PASSIVE_PLUS_0", (lua_Unsigned) (COL_SCROLLBAR_PASSIVE_PLUS_0) },
{ "PROGRESSBAR_ACTIVE_PLUS_0", (lua_Unsigned) (COL_PROGRESSBAR_ACTIVE_PLUS_0) },