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

menu fixes

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@712 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: b84449612e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2010-08-07 (Sat, 07 Aug 2010)



------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2010-08-07 14:52:43 +00:00
parent 2a91bc45c6
commit 2b79574ab9
8 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/locale/deutsch.locale
View File

@@ -1367,6 +1367,7 @@ videomenu.dbdr_deblock deBlock
videomenu.dbdr_none aus
videomenu.enabled_modes Videosysteme auf der VF-Taste
videomenu.fullscreen Vollbild
videomenu.hdmi_cec HDMI-CEC
videomenu.hdmi_cec_mode HDMI-CEC Modus
videomenu.hdmi_cec_mode_off aus
videomenu.hdmi_cec_mode_recorder als Recorder

1
data/locale/polski.locale
View File

@@ -908,6 +908,7 @@ videomenu.analog_hd_yprpb_scart YPbPr scart (HD)
videomenu.analog_hd_yprpb_cinch YPbPr cinch (HD)
videomenu.scart Scart
videomenu.cinch Cinch
videomenu.hdmi_cec HDMI-CEC
videomenu.hdmi_cec_mode HDMI-CEC
videomenu.hdmi_cec_mode_off wyłączone
videomenu.hdmi_cec_mode_tuner odbiornik

1
data/locale/slovak.locale
View File

@@ -1192,6 +1192,7 @@ videomenu.analog_hd_yprpb_scart YPbPr na SCART (HD)
videomenu.analog_hd_yprpb_cinch YPbPr na CINCH (HD)
videomenu.scart SCART
videomenu.cinch CINCH
videomenu.hdmi_cec HDMI-CEC
videomenu.hdmi_cec_mode HDMI-CEC mód
videomenu.hdmi_cec_mode_off vyp
videomenu.hdmi_cec_mode_tuner ako Tuner

1
src/gui/widget/icons.h
View File

@@ -81,6 +81,7 @@
#define NEUTRINO_ICON_HIDDEN "hidden"
#define NEUTRINO_ICON_MOUNTED "mounted"
#define NEUTRINO_ICON_MP3 "mp3"
#define NEUTRINO_ICON_MULTIMEDIA "multimedia"
#define NEUTRINO_ICON_NOT_MOUNTED "not_mounted"
#define NEUTRINO_ICON_PAUSE "pause"
#define NEUTRINO_ICON_PLAY "play"

2
src/neutrino.cpp
View File

@@ -2522,7 +2522,7 @@ int CNeutrinoApp::run(int argc, char **argv)
CMenuWidget recordingSettings (LOCALE_RECORDINGMENU_HEAD , NEUTRINO_ICON_RECORDING);
CMenuWidget streamingSettings (LOCALE_STREAMINGMENU_HEAD , NEUTRINO_ICON_STREAMING);
CMenuWidget colorSettings (LOCALE_MAINSETTINGS_OSD , NEUTRINO_ICON_COLORS);
CMenuWidget fontSettings (LOCALE_FONTMENU_HEAD , NEUTRINO_ICON_COLORS);
CMenuWidget fontSettings (LOCALE_FONTMENU_HEAD , NEUTRINO_ICON_KEYBINDING);
CMenuWidget lcdSettings (LOCALE_LCDMENU_HEAD , NEUTRINO_ICON_LCD);
CMenuWidget keySettings (LOCALE_MAINSETTINGS_KEYBINDING , NEUTRINO_ICON_KEYBINDING);
CMenuWidget miscSettings (LOCALE_MISCSETTINGS_HEAD , NEUTRINO_ICON_SETTINGS);

20
src/neutrino_menue.cpp
View File

@@ -293,19 +293,21 @@ CVideoSettings::CVideoSettings() : CMenuWidget(LOCALE_VIDEOMENU_HEAD, NEUTRINO_I
addItem(new CMenuOptionChooser(LOCALE_VIDEOMENU_43MODE, &g_settings.video_43mode, VIDEOMENU_43MODE_OPTIONS, VIDEOMENU_43MODE_OPTION_COUNT, true, this));
addItem(new CMenuOptionChooser(LOCALE_VIDEOMENU_VIDEOMODE, &g_settings.video_Mode, VIDEOMENU_VIDEOMODE_OPTIONS, VIDEOMENU_VIDEOMODE_OPTION_COUNT, true, this, CRCInput::RC_nokey, "", true));
addItem(new CMenuOptionChooser(LOCALE_VIDEOMENU_DBDR, &g_settings.video_dbdr, VIDEOMENU_DBDR_OPTIONS, VIDEOMENU_DBDR_OPTION_COUNT, true, this));
addItem(new CMenuOptionChooser(LOCALE_VIDEOMENU_HDMI_CEC_MODE, &g_settings.hdmi_cec_mode, VIDEOMENU_HDMI_CEC_MODE_OPTIONS, VIDEOMENU_HDMI_CEC_MODE_OPTION_COUNT, true, this));
CMenuWidget* menu = new CMenuWidget(LOCALE_VIDEOMENU_ENABLED_MODES, NEUTRINO_ICON_SETTINGS);
for (int i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT; i++)
menu->addItem(new CMenuOptionChooser(VIDEOMENU_VIDEOMODE_OPTIONS[i].valname, &g_settings.enabled_video_modes[i], OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
addItem(new CMenuForwarder(LOCALE_VIDEOMENU_ENABLED_MODES, true, NULL, menu, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED ));
addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_VIDEOMENU_HDMI_CEC));
addItem(new CMenuOptionChooser(LOCALE_VIDEOMENU_HDMI_CEC_MODE, &g_settings.hdmi_cec_mode, VIDEOMENU_HDMI_CEC_MODE_OPTIONS, VIDEOMENU_HDMI_CEC_MODE_OPTION_COUNT, true, this));
cec1 = new CMenuOptionChooser(LOCALE_VIDEOMENU_HDMI_CEC_VIEW_ON, &g_settings.hdmi_cec_view_on, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, g_settings.hdmi_cec_mode != VIDEO_HDMI_CEC_MODE_OFF, this);
cec2 = new CMenuOptionChooser(LOCALE_VIDEOMENU_HDMI_CEC_STANDBY, &g_settings.hdmi_cec_standby, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, g_settings.hdmi_cec_mode != VIDEO_HDMI_CEC_MODE_OFF, this);
addItem(cec1);
addItem(cec2);
CMenuWidget* menu = new CMenuWidget(LOCALE_VIDEOMENU_ENABLED_MODES, NEUTRINO_ICON_SETTINGS);
for (int i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT; i++)
menu->addItem(new CMenuOptionChooser(VIDEOMENU_VIDEOMODE_OPTIONS[i].valname, &g_settings.enabled_video_modes[i], OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
addItem(new CMenuForwarder(LOCALE_VIDEOMENU_ENABLED_MODES, true, NULL, menu));
#if 0
addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_VIDEOMENU_VCR_SCART));
addItem(new CMenuOptionChooser(LOCALE_VIDEOMENU_VCRSWITCH, &g_settings.vcr_AutoSwitch, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
@@ -746,7 +748,7 @@ void CNeutrinoApp::InitMainMenu(CMenuWidget &mainMenu, CMenuWidget &mainSettings
moviePlayer.addItem(new CMenuForwarder(LOCALE_MOVIEPLAYER_FILEPLAYBACK, true, NULL, moviePlayerGui, "fileplayback", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN));
#if 1
CMenuWidget *media = new CMenuWidget(LOCALE_MAINMENU_MEDIA);
CMenuWidget *media = new CMenuWidget(LOCALE_MAINMENU_MEDIA, NEUTRINO_ICON_MULTIMEDIA);
addMenueIntroItems(*media);
audioPlayer = new CAudioPlayerGui();
media->addItem(new CMenuForwarder(LOCALE_MAINMENU_AUDIOPLAYER, true, NULL, audioPlayer, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED));
@@ -2425,7 +2427,7 @@ void CNeutrinoApp::InitFontSettings(CMenuWidget &fontSettings)
//fontSettings.addItem( new CMenuForwarder(LOCALE_EPGPLUS_SELECT_FONT_NAME, true, NULL, this, "select_font"));
for (int i = 0; i < 6; i++)
{
CMenuWidget * fontSettingsSubMenu = new CMenuWidget(font_sizes_groups[i].groupname, NEUTRINO_ICON_COLORS);
CMenuWidget * fontSettingsSubMenu = new CMenuWidget(font_sizes_groups[i].groupname, NEUTRINO_ICON_KEYBINDING);
addMenueIntroItems(*fontSettingsSubMenu);
for (unsigned int j = 0; j < font_sizes_groups[i].count; j++)
{
@@ -2461,7 +2463,7 @@ void CNeutrinoApp::InitColorSettings(CMenuWidget &colorSettings, CMenuWidget &fo
CScreenSetup * ScreenSetup = new CScreenSetup();
addMenueIntroItems(colorSettings);
CMenuWidget *colorSettings_menuColors = new CMenuWidget(LOCALE_COLORMENUSETUP_HEAD, NEUTRINO_ICON_SETTINGS);
CMenuWidget *colorSettings_menuColors = new CMenuWidget(LOCALE_COLORMENUSETUP_HEAD, NEUTRINO_ICON_COLORS);
InitColorSettingsMenuColors(*colorSettings_menuColors);
colorSettings.addItem( new CMenuForwarder(LOCALE_COLORMENU_MENUCOLORS, true, NULL, colorSettings_menuColors, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED));

1
src/system/locals.h
View File

@@ -1198,6 +1198,7 @@ typedef enum {
LOCALE_VIDEOMENU_ANALOG_MODE_HD_YPRPB_CINCH,
LOCALE_VIDEOMENU_SCART,
LOCALE_VIDEOMENU_CINCH,
LOCALE_VIDEOMENU_HDMI_CEC,
LOCALE_VIDEOMENU_HDMI_CEC_MODE,
LOCALE_VIDEOMENU_HDMI_CEC_MODE_OFF,
LOCALE_VIDEOMENU_HDMI_CEC_MODE_TUNER,

1
src/system/locals_intern.h
View File

@@ -1198,6 +1198,7 @@ const char *locale_real_names[] = {
"videomenu.analog_hd_yprpb_cinch",
"videomenu.scart",
"videomenu.cinch",
"videomenu.hdmi_cec",
"videomenu.hdmi_cec_mode",
"videomenu.hdmi_cec_mode_off",
"videomenu.hdmi_cec_mode_tuner",