mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-11 23:50:58 +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 
Conflicts:
	data/locale/deutsch.locale


Origin commit data
------------------
Branch: ni/coolstream
Commit: 66e3c79ee1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-09 (Tue, 09 May 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-05-09 13:19:56 +02:00
parent 805d3f56b5 aab9c8df90
commit 355698c6f4
5 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
data/locale/deutsch.locale
View File

@@ -1,5 +1,5 @@
AUDIOSelectMenue.head Tonoptionen
EPGMenu.epgplus Vorschauübersicht
EPGMenu.epgplus Vorschau-Übersicht
EPGMenu.eventinfo Info zur Sendung
EPGMenu.eventlist Vorschau aktuelles Programm
EPGMenu.head EPG - Programminformation
@@ -7,7 +7,7 @@ EPGMenu.streaminfo Technische Information
EPGPlus.actions Aktionen
EPGPlus.bybouquet_mode bouquetweise
EPGPlus.bypage_mode seitenweise
EPGPlus.head Vorschau Übersicht (EPG Plus)
EPGPlus.head Vorschau-Übersicht (EPG Plus)
EPGPlus.next_bouquet Bouquet vor
EPGPlus.options Optionen
EPGPlus.page_down Seite zurück
@@ -19,7 +19,7 @@ EPGPlus.remind Vormerken
EPGPlus.scroll_mode Scroll-Modus
EPGPlus.stretch_mode Stretch-Modus
EPGPlus.swap_mode Blättern
EPGPlus.view_mode Modus
EPGPlus.view_mode Ansicht
GENRE.ALL aus
GENRE.ARTS Kultur
GENRE.ARTS.0 Kunst/Kultur

24
data/locale/english.locale
View File

@@ -2,24 +2,24 @@ AUDIOSelectMenue.head Audio Selection
EPGMenu.epgplus Eventlist overview
EPGMenu.eventinfo Details current program
EPGMenu.eventlist Eventlist current programm
EPGMenu.head EPG - Program Information
EPGMenu.streaminfo technical information
EPGMenu.head EPG - Program information
EPGMenu.streaminfo Technical information
EPGPlus.actions Actions
EPGPlus.bybouquet_mode by bouquet
EPGPlus.bypage_mode by page
EPGPlus.head Eventlist Overview (EPG Plus)
EPGPlus.next_bouquet next bouquet
EPGPlus.options options
EPGPlus.page_down page down
EPGPlus.page_up page up
EPGPlus.prev_bouquet prev bouquet
EPGPlus.head Eventlist overview (EPG Plus)
EPGPlus.next_bouquet Next bouquet
EPGPlus.options Options
EPGPlus.page_down Page down
EPGPlus.page_up Page up
EPGPlus.prev_bouquet Prev bouquet
EPGPlus.record Record
EPGPlus.refresh_epg Refresh
EPGPlus.remind Schedule
EPGPlus.scroll_mode Scroll Mode
EPGPlus.stretch_mode Stretch Mode
EPGPlus.swap_mode swap mode
EPGPlus.view_mode view mode
EPGPlus.scroll_mode Scroll mode
EPGPlus.stretch_mode Stretch mode
EPGPlus.swap_mode Swap mode
EPGPlus.view_mode View mode
GENRE.ALL off
GENRE.ARTS Arts
GENRE.ARTS.0 arts/culture

2
src/gui/buildinfo.cpp
View File

@@ -53,7 +53,7 @@ void CBuildInfo::initVarBuildInfo()
setWindowHeaderButtons(CComponentsHeader::CC_BTN_MENU | CComponentsHeader::CC_BTN_EXIT);
shadow = true;
shadow = CC_SHADOW_ON;
}

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 73
#define LUA_API_VERSION_MINOR 74

7
src/gui/lua/lua_cc_window.cpp
View File

@@ -89,12 +89,13 @@ int CLuaInstCCWindow::CCWindowNew(lua_State *L)
tableLookup(L, "name", name) || tableLookup(L, "title", name) || tableLookup(L, "caption", name);
tableLookup(L, "icon", icon);
bool has_shadow = false;
int has_shadow = CC_SHADOW_OFF;
if (!tableLookup(L, "has_shadow", has_shadow)) {
tmp1 = "false";
if (tableLookup(L, "has_shadow", tmp1))
paramBoolDeprecated(L, tmp1.c_str());
has_shadow = (tmp1 == "true" || tmp1 == "1" || tmp1 == "yes");
if ((tmp1 == "true" || tmp1 == "1" || tmp1 == "yes"))
has_shadow = CC_SHADOW_ON;
}
tableLookup(L, "color_frame" , color_frame);
@@ -126,7 +127,7 @@ int CLuaInstCCWindow::CCWindowNew(lua_State *L)
CLuaCCWindow **udata = (CLuaCCWindow **) lua_newuserdata(L, sizeof(CLuaCCWindow *));
*udata = new CLuaCCWindow();
(*udata)->w = new CComponentsWindow(x, y, dx, dy, name.c_str(), icon.c_str(), 0, has_shadow, (fb_pixel_t)color_frame, (fb_pixel_t)color_body, (fb_pixel_t)color_shadow);
(*udata)->w = new CComponentsWindow(x, y, dx, dy, name.c_str(), icon.c_str(), NULL, has_shadow, (fb_pixel_t)color_frame, (fb_pixel_t)color_body, (fb_pixel_t)color_shadow);
/* Ignore percent conversion of width and height
to remain compatible with the Lua API */
(*udata)->w->setWidth(dx);