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

locale: add usermenu title locales ...

Browse Source 
some small reworks; cleanup from #if 0'ed code


Origin commit data
------------------
Commit: 5860045999
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-02 (Sat, 02 Jan 2016)

Origin message was:
------------------
- locale: add usermenu title locales ...

 some small reworks; cleanup from #if 0'ed code
This commit is contained in:
vanhofen
2016-01-02 12:18:06 +01:00
parent a5c80536e0
commit a4fd788090
10 changed files with 43 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/neutrino.cpp
View File

@@ -283,14 +283,7 @@ const lcd_setting_struct_t lcd_setting[SNeutrinoSettings::LCD_SETTING_COUNT] =
,{ "lcd_epgmode" , 0 /*DEFAULT_LCD_EPGMODE*/ }
#endif
};
#if 0
const char* usermenu_default[SNeutrinoSettings::BUTTON_MAX]={
"2,3,4,13", // RED
"6", // GREEN
"7", // YELLOW
"12,11,20,21,19,14,15" // BLUE
};
#endif
static SNeutrinoSettings::usermenu_t usermenu_default[] = {
{ CRCInput::RC_red, "2,3,4,13", "", "red" },
{ CRCInput::RC_green, "6", "", "green" },
@@ -298,11 +291,6 @@ static SNeutrinoSettings::usermenu_t usermenu_default[] = {
{ CRCInput::RC_blue, "12,11,20,21,19,14,29,30,15", "", "blue" },
{ CRCInput::RC_play, "9", "", "5" },
{ CRCInput::RC_audio, "27", "", "6" },
#if 0
{ CRCInput::RC_timer, "19", "", "7" },
{ CRCInput::RC_usb, "31", "", "6" },
{ CRCInput::RC_archive, "30", "", "4" },
#endif
{ CRCInput::RC_nokey, "", "", "" },
};
@@ -1916,13 +1904,13 @@ TIMER_START();
// default usermenu titles correspond to gui/user_menue_setup.h:struct usermenu_props_t usermenu
if (g_settings.usermenu[0]->title.empty())
g_settings.usermenu[0]->title = g_Locale->getText(LOCALE_INFOVIEWER_EVENTLIST);
g_settings.usermenu[0]->title = g_Locale->getText(LOCALE_USERMENU_TITLE_RED);
if (g_settings.usermenu[1]->title.empty())
g_settings.usermenu[1]->title = g_Locale->getText(LOCALE_AUDIOSELECTMENUE_HEAD);
g_settings.usermenu[1]->title = g_Locale->getText(LOCALE_USERMENU_TITLE_GREEN);
if (g_settings.usermenu[2]->title.empty())
g_settings.usermenu[2]->title = g_Locale->getText(LOCALE_INFOVIEWER_SUBSERVICE);
g_settings.usermenu[2]->title = g_Locale->getText(LOCALE_USERMENU_TITLE_YELLOW);
if (g_settings.usermenu[3]->title.empty())
g_settings.usermenu[3]->title = g_Locale->getText(LOCALE_INFOVIEWER_STREAMINFO);
g_settings.usermenu[3]->title = g_Locale->getText(LOCALE_USERMENU_TITLE_BLUE);
/* setup GUI */
neutrinoFonts = CNeutrinoFonts::getInstance();