diff --git a/data/locale/english.locale b/data/locale/english.locale index 6d56d31c1..ed13b32d4 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -37,7 +37,6 @@ EPGPlus.remind Schedule EPGPlus.reset_settings reset settings EPGPlus.save_settings save settings EPGPlus.scroll_mode Scroll Mode -EPGPlus.select_font_name font name EPGPlus.settings settings EPGPlus.slider_width slider width EPGPlus.stretch_mode Stretch Mode @@ -221,24 +220,22 @@ colorchooser.green green colorchooser.red red colormenu.background Background colormenu.fade Fade menus -colormenu.font Font size -colormenu.font_ttx Teletext font +colormenu.font Select GUI font +colormenu.font_ttx Select Teletext font colormenu.gtx_alpha Transparency (GTX) colormenu.head Color Settings -colormenu.menucolors Menucolor -colormenu.statusbar Infobar -colormenu.textcolor Textcolor +colormenu.menucolors Colors +colormenu.textcolor Text color colormenu.themeselect select theme -colormenu.timing OSD Timing +colormenu.timing OSD Timeouts colormenu.osd_preset TV preset colormenu.hd_preset LCD colormenu.sd_preset CRT -colormenusetup.head Menu Colors -colormenusetup.menucontent Window-Content -colormenusetup.menucontent_inactive Window-Content inactive -colormenusetup.menucontent_selected Window-Content selected -colormenusetup.menuhead Menu Header -colorstatusbar.head Infobar +colormenusetup.head Colors +colormenusetup.menucontent Content +colormenusetup.menucontent_inactive Content inactive +colormenusetup.menucontent_selected Content selected +colormenusetup.menuhead Header colorstatusbar.text Infobar colorthememenu.classic_theme Classic Theme colorthememenu.dblue_theme DarkBlue Theme @@ -363,11 +360,13 @@ flashupdate.versioncheck checking version flashupdate.writeflash Write whole image flashupdate.writeflashmtd Write one partition flashupdate.wrongbase Your Release cycle differs.\nTo continue? +fontmenu.menu Menu +fontmenu.sizes Font sizes fontmenu.channellist Channellist fontmenu.epg EPG fontmenu.eventlist Eventlist fontmenu.gamelist Gamelist -fontmenu.head Fontsize settings +fontmenu.head Font settings fontmenu.infobar Infobar fontsize.channel_num_zap direct selection fontsize.channellist Channellist @@ -460,6 +459,7 @@ lcdmenu.statusline.volume volume mainmenu.audioplayer Audioplayer mainmenu.games Games mainmenu.head Main Menu +mainmenu.media Media mainmenu.movieplayer Movieplayer mainmenu.pausesectionsd Read EPG mainmenu.pictureviewer Picture viewer @@ -884,7 +884,6 @@ timersettings.separator Timer settings timing.chanlist Channellist timing.epg Epg timing.filebrowser Filebrowser -timing.head OSD Timeouts timing.hint_1 Time in sec. After this time the timing.hint_2 infobar will be faded out. timing.infobar Infobar diff --git a/src/neutrino.cpp b/src/neutrino.cpp index fa2127fad..be5867c50 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -3152,6 +3152,7 @@ _repeat: g_RCInput->postMsg(new_msg, 0); return messages_return::cancel_all | messages_return::handled; } +#if 0 else /* data == 1: KEY_POWER released */ if (standby_pressed_at.tv_sec != 0) /* check if we received a KEY_POWER pressed event before */ { /* required for correct handling of KEY_POWER events of */ @@ -3166,6 +3167,7 @@ _repeat: return messages_return::cancel_all | messages_return::handled; } } +#endif } else if ((msg == CRCInput::RC_plus) || (msg == CRCInput::RC_minus)) { diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index 017bd62b2..58b8f7919 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -635,38 +635,47 @@ void CNeutrinoApp::InitMainMenu(CMenuWidget &mainMenu, CMenuWidget &mainSettings //TestMenu->addItem(new CMenuForwarderNonLocalized("22 Khz OFF", true, NULL, testHandler, "22koff")); #endif videoSettings = new CVideoSettings(); + int shortcut = 1; + dprintf(DEBUG_DEBUG, "init mainmenue\n"); mainMenu.addItem(GenericMenuSeparator); mainMenu.addItem(new CMenuForwarder(LOCALE_MAINMENU_TVMODE, true, NULL, this, "tv", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED), true); mainMenu.addItem(new CMenuForwarder(LOCALE_MAINMENU_RADIOMODE, true, NULL, this, "radio", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN)); //mainMenu.addItem(new CMenuForwarder(LOCALE_MAINMENU_SCARTMODE, true, NULL, this, "scart", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW)); - mainMenu.addItem(new CMenuForwarder(LOCALE_MAINMENU_GAMES, true, NULL, new CPluginList(LOCALE_MAINMENU_GAMES,CPlugins::P_TYPE_GAME), "", CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE)); - mainMenu.addItem(GenericMenuSeparatorLine); + mainMenu.addItem(new CMenuForwarder(LOCALE_MAINMENU_GAMES, true, NULL, new CPluginList(LOCALE_MAINMENU_GAMES,CPlugins::P_TYPE_GAME), "", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW)); - mainMenu.addItem(new CMenuForwarder(LOCALE_UPNPBROWSER_HEAD, true, NULL, new CUpnpBrowserGui(), NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW)); audioPlayer = new CAudioPlayerGui(); - mainMenu.addItem(new CMenuForwarder(LOCALE_MAINMENU_AUDIOPLAYER, true, NULL, audioPlayer, NULL, CRCInput::convertDigitToKey(shortcut++))); - moviePlayerGui = new CMoviePlayerGui(); - //mainMenu.addItem(new CMenuForwarder(LOCALE_MAINMENU_MOVIEPLAYER, true, NULL, &moviePlayer, NULL, CRCInput::convertDigitToKey(shortcut++))); -#if 0 - mainMenu.addItem(new CMenuForwarder(LOCALE_MAINMENU_MOVIEPLAYER, true, NULL, moviePlayerGui, "tsmoviebrowser", CRCInput::convertDigitToKey(shortcut++))); -#else addMenueIntroItems(moviePlayer); - moviePlayer.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_HEAD, true, NULL, moviePlayerGui, "tsmoviebrowser", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED)); 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); + addMenueIntroItems(*media); + + media->addItem(new CMenuForwarder(LOCALE_MAINMENU_AUDIOPLAYER, true, NULL, audioPlayer, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED)); + media->addItem(new CMenuForwarder(LOCALE_MAINMENU_MOVIEPLAYER, true, NULL, &moviePlayer, NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN)); + media->addItem(new CMenuForwarder(LOCALE_MAINMENU_PICTUREVIEWER, true, NULL, new CPictureViewerGui(), NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW)); + media->addItem(new CMenuForwarder(LOCALE_UPNPBROWSER_HEAD, true, NULL, new CUpnpBrowserGui(), NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE)); + mainMenu.addItem(new CMenuForwarder(LOCALE_MAINMENU_MEDIA, true, NULL, media, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE)); +#else + mainMenu.addItem(GenericMenuSeparatorLine); + mainMenu.addItem(new CMenuForwarder(LOCALE_UPNPBROWSER_HEAD, true, NULL, new CUpnpBrowserGui(), NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW)); + mainMenu.addItem(new CMenuForwarder(LOCALE_MAINMENU_AUDIOPLAYER, true, NULL, audioPlayer, NULL, CRCInput::convertDigitToKey(shortcut++))); + mainMenu.addItem(new CMenuForwarder(LOCALE_MAINMENU_MOVIEPLAYER, true, NULL, &moviePlayer, NULL, CRCInput::convertDigitToKey(shortcut++))); + mainMenu.addItem(new CMenuForwarder(LOCALE_MAINMENU_PICTUREVIEWER, true, NULL, new CPictureViewerGui(), NULL, CRCInput::convertDigitToKey(shortcut++))); #endif + #if 0 moviePlayer.addItem(GenericMenuSeparator); moviePlayer.addItem(GenericMenuBack); moviePlayer.addItem(GenericMenuSeparatorLine); - //moviePlayer.addItem(new CMenuForwarder(LOCALE_MOVIEPLAYER_PESPLAYBACK, true, NULL, moviePlayerGui, "pesplayback")); //moviePlayer.addItem(new CMenuForwarder(LOCALE_MOVIEPLAYER_TSPLAYBACK_PC, true, NULL, moviePlayerGui, "tsplayback_pc")); moviePlayer.addItem(new CLockedMenuForwarder(LOCALE_MOVIEBROWSER_HEAD, g_settings.parentallock_pincode, false, true, NULL, moviePlayerGui, "tsmoviebrowser")); @@ -681,8 +690,6 @@ void CNeutrinoApp::InitMainMenu(CMenuWidget &mainMenu, CMenuWidget &mainSettings moviePlayer.addItem(new CMenuForwarder(LOCALE_MAINMENU_SETTINGS, true, NULL, &streamingSettings, NULL, CRCInput::RC_help, NEUTRINO_ICON_BUTTON_HELP_SMALL)); moviePlayer.addItem(new CMenuForwarder(LOCALE_NFSMENU_HEAD, true, NULL, new CNFSSmallMenu(), NULL, CRCInput::RC_setup, NEUTRINO_ICON_BUTTON_DBOX_SMALL)); #endif - - mainMenu.addItem(new CMenuForwarder(LOCALE_MAINMENU_PICTUREVIEWER, true, NULL, new CPictureViewerGui(), NULL, CRCInput::convertDigitToKey(shortcut++))); if (g_PluginList->hasPlugin(CPlugins::P_TYPE_SCRIPT)) mainMenu.addItem(new CMenuForwarder(LOCALE_MAINMENU_SCRIPTS, true, NULL, new CPluginList(LOCALE_MAINMENU_SCRIPTS,CPlugins::P_TYPE_SCRIPT), "", CRCInput::convertDigitToKey(shortcut++))); @@ -703,13 +710,13 @@ void CNeutrinoApp::InitMainMenu(CMenuWidget &mainMenu, CMenuWidget &mainSettings mainMenu.addItem( new CMenuSeparator(CMenuSeparator::LINE) ); mainMenu.addItem( new CMenuForwarder(LOCALE_DBOXINFO, true, NULL, new CDBoxInfoWidget, NULL, CRCInput::convertDigitToKey(shortcut++))); + mainMenu.addItem( new CMenuForwarder(LOCALE_CAM_SETTINGS, true, NULL, g_CamHandler, NULL, CRCInput::convertDigitToKey(0))); + //settings menu int sett_count =1; addMenueIntroItems(mainSettings); mainSettings.addItem(new CMenuForwarder(LOCALE_MAINSETTINGS_SAVESETTINGSNOW, true, NULL, this, "savesettings", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED)); - mainSettings.addItem(new CMenuForwarder(LOCALE_EXTRA_LOADCONFIG, true, NULL, this, "loadconfig")); - mainSettings.addItem(new CMenuForwarder(LOCALE_EXTRA_SAVECONFIG, true, NULL, this, "saveconfig")); CDataResetNotifier * resetNotifier = new CDataResetNotifier(); mainSettings.addItem(new CMenuForwarder(LOCALE_RESET_SETTINGS , true, NULL, resetNotifier, "settings")); @@ -718,6 +725,7 @@ void CNeutrinoApp::InitMainMenu(CMenuWidget &mainMenu, CMenuWidget &mainSettings mainSettings.addItem(new CMenuForwarder(LOCALE_MAINSETTINGS_VIDEO , true, NULL, videoSettings , NULL, CRCInput::convertDigitToKey(sett_count++))); mainSettings.addItem(new CMenuForwarder(LOCALE_MAINSETTINGS_AUDIO , true, NULL, &audioSettings , NULL, CRCInput::convertDigitToKey(sett_count++))); mainSettings.addItem(new CLockedMenuForwarder(LOCALE_PARENTALLOCK_PARENTALLOCK, g_settings.parentallock_pincode, true, true, NULL, &parentallockSettings, NULL, CRCInput::convertDigitToKey(sett_count++))); + #if 0 if (g_settings.parentallock_prompt) mainSettings.addItem(new CLockedMenuForwarder(LOCALE_PARENTALLOCK_PARENTALLOCK, g_settings.parentallock_pincode, true, true, NULL, &parentallockSettings, NULL, CRCInput::convertDigitToKey(sett_count++))); @@ -729,31 +737,6 @@ void CNeutrinoApp::InitMainMenu(CMenuWidget &mainMenu, CMenuWidget &mainSettings //mainSettings.addItem(new CMenuForwarder(LOCALE_MAINSETTINGS_STREAMING , true, NULL, &streamingSettings, NULL, CRCInput::convertDigitToKey(sett_count++))); mainSettings.addItem(new CMenuForwarder(LOCALE_MAINSETTINGS_LANGUAGE , true, NULL, &languageSettings , NULL, CRCInput::convertDigitToKey(sett_count++))); -#if 0 - xmlDocPtr parser = parseXmlFile("/etc/timezone.xml"); - if (parser != NULL) { - tzSelect = new CMenuOptionStringChooser(LOCALE_MAINSETTINGS_TIMEZONE, g_settings.timezone, true, new CTZChangeNotifier(), CRCInput::convertDigitToKey(sett_count++), "", true); - xmlNodePtr search = xmlDocGetRootElement(parser)->xmlChildrenNode; - bool found = false; - while (search) { - if (!strcmp(xmlGetName(search), "zone")) { - std::string name = xmlGetAttribute(search, "name"); - std::string zone = xmlGetAttribute(search, "zone"); - //printf("Timezone: %s -> %s\n", name.c_str(), zone.c_str()); - tzSelect->addOption(name.c_str()); - found = true; - } - search = search->xmlNextNode; - } - if (found) - mainSettings.addItem(tzSelect); - else { - delete tzSelect; - tzSelect = NULL; - } - xmlFreeDoc(parser); - } -#endif mainSettings.addItem(new CMenuForwarder(LOCALE_MAINSETTINGS_OSD , true, NULL, &colorSettings , NULL, CRCInput::convertDigitToKey(sett_count++))); if (CVFD::getInstance()->has_lcd) @@ -764,7 +747,11 @@ void CNeutrinoApp::InitMainMenu(CMenuWidget &mainMenu, CMenuWidget &mainSettings mainSettings.addItem(new CMenuForwarder(LOCALE_MAINSETTINGS_MISC , true, NULL, &miscSettings , NULL, CRCInput::RC_green , NEUTRINO_ICON_BUTTON_GREEN )); mainSettings.addItem(new CMenuForwarder(LOCALE_HDD_SETTINGS, true, NULL, new CHDDMenuHandler())); - mainSettings.addItem(new CMenuForwarder(LOCALE_CAM_SETTINGS, true, NULL, g_CamHandler)); + //mainSettings.addItem(new CMenuForwarder(LOCALE_CAM_SETTINGS, true, NULL, g_CamHandler)); + + mainSettings.addItem(new CMenuSeparator(CMenuSeparator::LINE)); + mainSettings.addItem(new CMenuForwarder(LOCALE_EXTRA_LOADCONFIG, true, NULL, this, "loadconfig")); + mainSettings.addItem(new CMenuForwarder(LOCALE_EXTRA_SAVECONFIG, true, NULL, this, "saveconfig")); #ifdef TEST_MENU mainMenu.addItem(new CMenuForwarderNonLocalized("Test menu", true, NULL, TestMenu)); @@ -1513,8 +1500,8 @@ const CMenuOptionChooser::keyval VOLUMEBAR_DISP_POS_OPTIONS[VOLUMEBAR_DISP_POS_ const CMenuOptionChooser::keyval MENU_DISP_POS_OPTIONS[MENU_DISP_POS_OPTIONS_COUNT]= { { 0 , LOCALE_SETTINGS_POS_DEFAULT_CENTER }, - { 1 , LOCALE_SETTINGS_POS_TOP_RIGHT }, - { 2 , LOCALE_SETTINGS_POS_TOP_LEFT }, + { 1 , LOCALE_SETTINGS_POS_TOP_LEFT }, + { 2 , LOCALE_SETTINGS_POS_TOP_RIGHT }, { 3 , LOCALE_SETTINGS_POS_BOTTOM_LEFT }, { 4 , LOCALE_SETTINGS_POS_BOTTOM_RIGHT } }; @@ -1545,7 +1532,6 @@ void CNeutrinoApp::InitMiscSettings(CMenuWidget &miscSettings) miscSettingsGeneral->addItem(new CMenuOptionChooser(LOCALE_EXTRA_ROTORSWAP, &g_settings.rotor_swap, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); - miscSettingsGeneral->addItem(new CMenuOptionChooser(LOCALE_INFOVIEWER_SUBCHAN_DISP_POS, &g_settings.infobar_subchan_disp_pos, INFOBAR_SUBCHAN_DISP_POS_OPTIONS, INFOBAR_SUBCHAN_DISP_POS_OPTIONS_COUNT, true)); miscSettingsGeneral->addItem(new CMenuOptionChooser(LOCALE_EXTRA_CACHE_TXT, (int *)&g_settings.cacheTXT, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); // miscSettings.addItem(new CMenuForwarder(LOCALE_EXTRA_KEY_PLUGIN, true, g_settings.onekey_plugin,this,"onekeyplugin")); funNotifier = new CFanControlNotifier(); @@ -1554,10 +1540,13 @@ void CNeutrinoApp::InitMiscSettings(CMenuWidget &miscSettings) miscSettingsGeneral->addItem(new CMenuOptionNumberChooser(LOCALE_FAN_SPEED, &g_settings.fan_speed, true, 1, 14, funNotifier, 0, 0, LOCALE_OPTIONS_OFF) ); funNotifier->changeNotify(NONEXISTANT_LOCALE, (void*) &g_settings.fan_speed); +#if 0 miscSettingsGeneral->addItem(new CMenuOptionChooser(LOCALE_EXTRA_SCRAMBLED_MESSAGE, &g_settings.scrambled_message, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); + miscSettingsGeneral->addItem(new CMenuOptionChooser(LOCALE_INFOVIEWER_SUBCHAN_DISP_POS, &g_settings.infobar_subchan_disp_pos, INFOBAR_SUBCHAN_DISP_POS_OPTIONS, INFOBAR_SUBCHAN_DISP_POS_OPTIONS_COUNT, true)); miscSettingsGeneral->addItem(new CMenuOptionChooser(LOCALE_EXTRA_VOLUME_POS, &g_settings.volume_pos, VOLUMEBAR_DISP_POS_OPTIONS, VOLUMEBAR_DISP_POS_OPTIONS_COUNT, true)); miscSettingsGeneral->addItem(new CMenuOptionChooser(LOCALE_SETTINGS_MENU_POS, &g_settings.menu_pos, MENU_DISP_POS_OPTIONS, MENU_DISP_POS_OPTIONS_COUNT, true)); miscSettingsGeneral->addItem(new CMenuOptionChooser(LOCALE_EXTRA_ROUNDED_CORNERS, &g_settings.rounded_corners, MENU_CORNERSETTINGS_TYPE_OPTIONS, MENU_CORNERSETTINGS_TYPE_OPTION_COUNT, true)); +#endif miscSettings.addItem( new CMenuForwarder(LOCALE_MISCSETTINGS_GENERAL, true, NULL, miscSettingsGeneral, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED) ); //channellist @@ -1593,17 +1582,6 @@ void CNeutrinoApp::InitMiscSettings(CMenuWidget &miscSettings) miscSettings.addItem(new CMenuOptionChooser(LOCALE_EXTRA_USELOG, &g_settings.emlog, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, new CLogChangeNotifier)); #endif -#if 0 - keySetupNotifier = new CKeySetupNotifier; - CStringInput * keySettings_repeat_genericblocker = new CStringInput(LOCALE_KEYBINDINGMENU_REPEATBLOCKGENERIC, g_settings.repeat_genericblocker, 3, LOCALE_REPEATBLOCKER_HINT_1, LOCALE_REPEATBLOCKER_HINT_2, "0123456789 ", keySetupNotifier); - CStringInput * keySettings_repeatBlocker = new CStringInput(LOCALE_KEYBINDINGMENU_REPEATBLOCK, g_settings.repeat_blocker, 3, LOCALE_REPEATBLOCKER_HINT_1, LOCALE_REPEATBLOCKER_HINT_2, "0123456789 ", keySetupNotifier); - keySetupNotifier->changeNotify(NONEXISTANT_LOCALE, NULL); - - miscSettings.addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_KEYBINDINGMENU_RC)); - miscSettings.addItem(new CMenuForwarder(LOCALE_KEYBINDINGMENU_REPEATBLOCK, true, g_settings.repeat_blocker, keySettings_repeatBlocker)); - miscSettings.addItem(new CMenuForwarder(LOCALE_KEYBINDINGMENU_REPEATBLOCKGENERIC, true, g_settings.repeat_genericblocker, keySettings_repeat_genericblocker)); - miscSettings.addItem(m1); -#endif //filebrowsersettings CMenuWidget *miscSettingsFilebrowser = new CMenuWidget(LOCALE_FILEBROWSER_HEAD, NEUTRINO_ICON_SETTINGS); addMenueIntroItems(*miscSettingsFilebrowser); @@ -1612,6 +1590,7 @@ void CNeutrinoApp::InitMiscSettings(CMenuWidget &miscSettings) miscSettingsFilebrowser->addItem(new CMenuOptionChooser(LOCALE_FILEBROWSER_DENYDIRECTORYLEAVE, &g_settings.filebrowser_denydirectoryleave, MESSAGEBOX_NO_YES_OPTIONS , MESSAGEBOX_NO_YES_OPTION_COUNT , true )); miscSettings.addItem( new CMenuForwarder(LOCALE_FILEBROWSER_HEAD, true, NULL, miscSettingsFilebrowser, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE) ); +#if 0 //infobar CMenuWidget *miscSettingsInfobar = new CMenuWidget(LOCALE_MISCSETTINGS_INFOBAR, NEUTRINO_ICON_SETTINGS); addMenueIntroItems(*miscSettingsInfobar); @@ -1621,7 +1600,7 @@ void CNeutrinoApp::InitMiscSettings(CMenuWidget &miscSettings) miscSettingsInfobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_VIRTUAL_ZAP_MODE, &g_settings.virtual_zap_mode, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); miscSettingsInfobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SAT_DISPLAY, &g_settings.infobar_sat_display, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); miscSettings.addItem(new CMenuForwarder(LOCALE_MISCSETTINGS_INFOBAR, true, NULL, miscSettingsInfobar, NULL, CRCInput::RC_1)); - +#endif #if 0 CCpuFreqNotifier * cpuNotifier = new CCpuFreqNotifier(); miscSettings.addItem(new CMenuOptionChooser(LOCALE_CPU_FREQ_NORMAL, &g_settings.cpufreq, CPU_FREQ_OPTIONS, CPU_FREQ_OPTION_COUNT, true, cpuNotifier)); @@ -2266,12 +2245,12 @@ const SNeutrinoSettings::FONT_TYPES other_font_sizes[4] = font_sizes_groups font_sizes_groups[6] = { + {LOCALE_FONTMENU_MENU , 4, other_font_sizes , "fontsize.doth"}, {LOCALE_FONTMENU_CHANNELLIST, 4, channellist_font_sizes, "fontsize.dcha"}, {LOCALE_FONTMENU_EVENTLIST , 4, eventlist_font_sizes , "fontsize.deve"}, {LOCALE_FONTMENU_EPG , 4, epg_font_sizes , "fontsize.depg"}, {LOCALE_FONTMENU_INFOBAR , 4, infobar_font_sizes , "fontsize.dinf"}, - {LOCALE_FONTMENU_GAMELIST , 2, gamelist_font_sizes , "fontsize.dgam"}, - {NONEXISTANT_LOCALE , 4, other_font_sizes , "fontsize.doth"} + {LOCALE_FONTMENU_GAMELIST , 2, gamelist_font_sizes , "fontsize.dgam"} }; #define FONT_STYLE_REGULAR 0 @@ -2312,13 +2291,20 @@ void CNeutrinoApp::AddFontSettingItem(CMenuWidget &fontSettings, const SNeutrino void CNeutrinoApp::InitFontSettings(CMenuWidget &fontSettings) { addMenueIntroItems(fontSettings); + fontSettings.addItem( new CMenuForwarder(LOCALE_COLORMENU_FONT, true, NULL, this, "select_font")); + fontSettings.addItem( new CMenuForwarder(LOCALE_COLORMENU_FONT_TTX, true, NULL, this, "ttx_font")); + + fontSettings.addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_FONTMENU_SIZES)); + //fontSettings.addItem( new CMenuForwarder(LOCALE_EPGPLUS_SELECT_FONT_NAME, true, NULL, this, "select_font")); +#if 0 AddFontSettingItem(fontSettings, SNeutrinoSettings::FONT_TYPE_MENU); AddFontSettingItem(fontSettings, SNeutrinoSettings::FONT_TYPE_MENU_TITLE); AddFontSettingItem(fontSettings, SNeutrinoSettings::FONT_TYPE_MENU_INFO); fontSettings.addItem(GenericMenuSeparatorLine); +#endif - for (int i = 0; i < 5; i++) + for (int i = 0; i < 6; i++) { CMenuWidget * fontSettingsSubMenu = new CMenuWidget(font_sizes_groups[i].groupname, NEUTRINO_ICON_COLORS); addMenueIntroItems(*fontSettingsSubMenu); @@ -2332,9 +2318,9 @@ void CNeutrinoApp::InitFontSettings(CMenuWidget &fontSettings) fontSettings.addItem(new CMenuForwarder(font_sizes_groups[i].groupname, true, NULL, fontSettingsSubMenu)); } - AddFontSettingItem(fontSettings, SNeutrinoSettings::FONT_TYPE_FILEBROWSER_ITEM); - fontSettings.addItem(GenericMenuSeparatorLine); - fontSettings.addItem(new CMenuForwarder(LOCALE_OPTIONS_DEFAULT, true, NULL, this, font_sizes_groups[5].actionkey)); + //AddFontSettingItem(fontSettings, SNeutrinoSettings::FONT_TYPE_FILEBROWSER_ITEM); + //fontSettings.addItem(GenericMenuSeparatorLine); + //fontSettings.addItem(new CMenuForwarder(LOCALE_OPTIONS_DEFAULT, true, NULL, this, font_sizes_groups[5].actionkey)); } #define OSD_PRESET_OPTIONS_COUNT 2 @@ -2343,35 +2329,45 @@ const CMenuOptionChooser::keyval OSD_PRESET_OPTIONS[OSD_PRESET_OPTIONS_COUNT] = { 560, LOCALE_COLORMENU_SD_PRESET }, { 696, LOCALE_COLORMENU_HD_PRESET } }; + void CNeutrinoApp::InitColorSettings(CMenuWidget &colorSettings, CMenuWidget &fontSettings ) { CScreenSetup * ScreenSetup = new CScreenSetup(); addMenueIntroItems(colorSettings); - CMenuWidget *colorSettings_Themes = new CMenuWidget(LOCALE_COLORTHEMEMENU_HEAD, NEUTRINO_ICON_SETTINGS); - InitColorThemesSettings(*colorSettings_Themes); - - colorSettings.addItem( new CMenuForwarder(LOCALE_COLORMENU_THEMESELECT, true, NULL, colorSettings_Themes, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED) ); CMenuWidget *colorSettings_menuColors = new CMenuWidget(LOCALE_COLORMENUSETUP_HEAD, NEUTRINO_ICON_SETTINGS); + InitColorSettingsMenuColors(*colorSettings_menuColors); - colorSettings.addItem( new CMenuForwarder(LOCALE_COLORMENU_MENUCOLORS, true, NULL, colorSettings_menuColors, NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN) ); + colorSettings.addItem( new CMenuForwarder(LOCALE_COLORMENU_MENUCOLORS, true, NULL, colorSettings_menuColors, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED)); - CMenuWidget *colorSettings_statusbarColors = new CMenuWidget(LOCALE_COLORMENU_STATUSBAR, NEUTRINO_ICON_SETTINGS); - InitColorSettingsStatusBarColors(*colorSettings_statusbarColors); - colorSettings.addItem( new CMenuForwarder(LOCALE_COLORSTATUSBAR_HEAD, true, NULL, colorSettings_statusbarColors, NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW) ); - - colorSettings.addItem(GenericMenuSeparatorLine); - colorSettings.addItem( new CMenuForwarder(LOCALE_COLORMENU_FONT, true, NULL, &fontSettings, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE) ); - colorSettings.addItem( new CMenuForwarder(LOCALE_EPGPLUS_SELECT_FONT_NAME, true, NULL, this, "select_font")); - colorSettings.addItem( new CMenuForwarder(LOCALE_COLORMENU_FONT_TTX, true, NULL, this, "ttx_font")); + colorSettings.addItem( new CMenuForwarder(LOCALE_FONTMENU_HEAD, true, NULL, &fontSettings, NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN)); CMenuWidget *colorSettings_timing = new CMenuWidget(LOCALE_COLORMENU_TIMING, NEUTRINO_ICON_SETTINGS); InitColorSettingsTiming(*colorSettings_timing); - colorSettings.addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_VIDEOMENU_OSD)); - colorSettings.addItem(new CMenuForwarder(LOCALE_TIMING_HEAD, true, NULL, colorSettings_timing)); - colorSettings.addItem(new CMenuForwarder(LOCALE_VIDEOMENU_SCREENSETUP, true, NULL, ScreenSetup));//, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED)); - colorSettings.addItem(new CMenuOptionChooser(LOCALE_COLORMENU_OSD_PRESET, &g_settings.screen_EndY, OSD_PRESET_OPTIONS, OSD_PRESET_OPTIONS_COUNT, true)); + //colorSettings.addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_VIDEOMENU_OSD)); + colorSettings.addItem(new CMenuForwarder(LOCALE_COLORMENU_TIMING, true, NULL, colorSettings_timing, NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW)); + colorSettings.addItem(new CMenuForwarder(LOCALE_VIDEOMENU_SCREENSETUP, true, NULL, ScreenSetup, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE)); + + colorSettings.addItem(new CMenuOptionChooser(LOCALE_COLORMENU_OSD_PRESET, &g_settings.screen_EndY, OSD_PRESET_OPTIONS, OSD_PRESET_OPTIONS_COUNT, true, NULL, CRCInput::RC_1)); + + //infobar + CMenuWidget *miscSettingsInfobar = new CMenuWidget(LOCALE_MISCSETTINGS_INFOBAR, NEUTRINO_ICON_SETTINGS); + addMenueIntroItems(*miscSettingsInfobar); + miscSettingsInfobar->addItem(new CMenuOptionChooser(LOCALE_PROGRESSBAR_COLOR, &g_settings.progressbar_color, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); + miscSettingsInfobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_DISPLAY, &g_settings.casystem_display, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); + miscSettingsInfobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_DISP_LOG, &g_settings.infobar_show_channellogo, LOCALE_MISCSETTINGS_INFOBAR_DISP_OPTIONS, LOCALE_MISCSETTINGS_INFOBAR_DISP_OPTIONS_COUNT, true)); + miscSettingsInfobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_VIRTUAL_ZAP_MODE, &g_settings.virtual_zap_mode, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); + miscSettingsInfobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SAT_DISPLAY, &g_settings.infobar_sat_display, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); + + colorSettings.addItem(new CMenuForwarder(LOCALE_MISCSETTINGS_INFOBAR, true, NULL, miscSettingsInfobar, NULL, CRCInput::RC_2)); + + colorSettings.addItem(GenericMenuSeparatorLine); + colorSettings.addItem(new CMenuOptionChooser(LOCALE_EXTRA_ROUNDED_CORNERS, &g_settings.rounded_corners, MENU_CORNERSETTINGS_TYPE_OPTIONS, MENU_CORNERSETTINGS_TYPE_OPTION_COUNT, true)); + colorSettings.addItem(new CMenuOptionChooser(LOCALE_EXTRA_SCRAMBLED_MESSAGE, &g_settings.scrambled_message, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); + colorSettings.addItem(new CMenuOptionChooser(LOCALE_INFOVIEWER_SUBCHAN_DISP_POS, &g_settings.infobar_subchan_disp_pos, INFOBAR_SUBCHAN_DISP_POS_OPTIONS, INFOBAR_SUBCHAN_DISP_POS_OPTIONS_COUNT, true)); + colorSettings.addItem(new CMenuOptionChooser(LOCALE_EXTRA_VOLUME_POS, &g_settings.volume_pos, VOLUMEBAR_DISP_POS_OPTIONS, VOLUMEBAR_DISP_POS_OPTIONS_COUNT, true)); + colorSettings.addItem(new CMenuOptionChooser(LOCALE_SETTINGS_MENU_POS, &g_settings.menu_pos, MENU_DISP_POS_OPTIONS, MENU_DISP_POS_OPTIONS_COUNT, true)); #if 0 colorSettings.addItem(GenericMenuSeparatorLine); //menuefaden nur bei enx-chips! @@ -2399,8 +2395,15 @@ void CNeutrinoApp::InitColorThemesSettings(CMenuWidget &colorSettings_Themes) void CNeutrinoApp::InitColorSettingsMenuColors(CMenuWidget &colorSettings_menuColors) { + addMenueIntroItems(colorSettings_menuColors); +#if 0 colorSettings_menuColors.addItem(GenericMenuSeparator); colorSettings_menuColors.addItem(GenericMenuBack); + colorSettings_menuColors.addItem(GenericMenuSeparatorLine); +#endif + CMenuWidget *colorSettings_Themes = new CMenuWidget(LOCALE_COLORTHEMEMENU_HEAD, NEUTRINO_ICON_SETTINGS); + InitColorThemesSettings(*colorSettings_Themes); + colorSettings_menuColors.addItem( new CMenuForwarder(LOCALE_COLORMENU_THEMESELECT, true, NULL, colorSettings_Themes, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED) ); CColorChooser* chHeadcolor = new CColorChooser(LOCALE_COLORMENU_BACKGROUND, &g_settings.menu_Head_red, &g_settings.menu_Head_green, &g_settings.menu_Head_blue, &g_settings.menu_Head_alpha, colorSetupNotifier); @@ -2430,10 +2433,20 @@ void CNeutrinoApp::InitColorSettingsMenuColors(CMenuWidget &colorSettings_menuCo colorSettings_menuColors.addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_COLORMENUSETUP_MENUCONTENT_SELECTED)); colorSettings_menuColors.addItem( new CMenuForwarder(LOCALE_COLORMENU_BACKGROUND, true, NULL, chContentSelectedcolor )); colorSettings_menuColors.addItem( new CMenuForwarder(LOCALE_COLORMENU_TEXTCOLOR, true, NULL, chContentSelectedTextcolor )); + + CColorChooser* chInfobarcolor = new CColorChooser(LOCALE_COLORMENU_BACKGROUND, &g_settings.infobar_red, + &g_settings.infobar_green, &g_settings.infobar_blue, &g_settings.infobar_alpha, colorSetupNotifier); + CColorChooser* chInfobarTextcolor = new CColorChooser(LOCALE_COLORMENU_TEXTCOLOR, &g_settings.infobar_Text_red, + &g_settings.infobar_Text_green, &g_settings.infobar_Text_blue, NULL, colorSetupNotifier); + + colorSettings_menuColors.addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_COLORSTATUSBAR_TEXT)); + colorSettings_menuColors.addItem( new CMenuForwarder(LOCALE_COLORMENU_BACKGROUND, true, NULL, chInfobarcolor )); + colorSettings_menuColors.addItem( new CMenuForwarder(LOCALE_COLORMENU_TEXTCOLOR, true, NULL, chInfobarTextcolor )); } void CNeutrinoApp::InitColorSettingsStatusBarColors(CMenuWidget &colorSettings_statusbarColors) { +#if 0 colorSettings_statusbarColors.addItem(GenericMenuSeparator); colorSettings_statusbarColors.addItem(GenericMenuBack); @@ -2446,6 +2459,7 @@ void CNeutrinoApp::InitColorSettingsStatusBarColors(CMenuWidget &colorSettings_s colorSettings_statusbarColors.addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_COLORSTATUSBAR_TEXT)); colorSettings_statusbarColors.addItem( new CMenuForwarder(LOCALE_COLORMENU_BACKGROUND, true, NULL, chInfobarcolor )); colorSettings_statusbarColors.addItem( new CMenuForwarder(LOCALE_COLORMENU_TEXTCOLOR, true, NULL, chInfobarTextcolor )); +#endif } void CNeutrinoApp::InitColorSettingsTiming(CMenuWidget &colorSettings_timing) diff --git a/src/system/locals.h b/src/system/locals.h index 3f6acb2eb..5b36aebaa 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -43,7 +43,6 @@ typedef enum { LOCALE_EPGPLUS_RESET_SETTINGS, LOCALE_EPGPLUS_SAVE_SETTINGS, LOCALE_EPGPLUS_SCROLL_MODE, - LOCALE_EPGPLUS_SELECT_FONT_NAME, LOCALE_EPGPLUS_SETTINGS, LOCALE_EPGPLUS_SLIDER_WIDTH, LOCALE_EPGPLUS_STRETCH_MODE, @@ -247,7 +246,6 @@ typedef enum { LOCALE_COLORMENU_GTX_ALPHA, LOCALE_COLORMENU_HEAD, LOCALE_COLORMENU_MENUCOLORS, - LOCALE_COLORMENU_STATUSBAR, LOCALE_COLORMENU_TEXTCOLOR, LOCALE_COLORMENU_THEMESELECT, LOCALE_COLORMENU_TIMING, @@ -259,7 +257,6 @@ typedef enum { LOCALE_COLORMENUSETUP_MENUCONTENT_INACTIVE, LOCALE_COLORMENUSETUP_MENUCONTENT_SELECTED, LOCALE_COLORMENUSETUP_MENUHEAD, - LOCALE_COLORSTATUSBAR_HEAD, LOCALE_COLORSTATUSBAR_TEXT, LOCALE_COLORTHEMEMENU_CLASSIC_THEME, LOCALE_COLORTHEMEMENU_DBLUE_THEME, @@ -392,12 +389,14 @@ typedef enum { LOCALE_FLASHUPDATE_WRITEFLASH, LOCALE_FLASHUPDATE_WRITEFLASHMTD, LOCALE_FLASHUPDATE_WRONGBASE, + LOCALE_FONTMENU_MENU, LOCALE_FONTMENU_CHANNELLIST, LOCALE_FONTMENU_EPG, LOCALE_FONTMENU_EVENTLIST, LOCALE_FONTMENU_GAMELIST, LOCALE_FONTMENU_HEAD, LOCALE_FONTMENU_INFOBAR, + LOCALE_FONTMENU_SIZES, LOCALE_FONTSIZE_CHANNEL_NUM_ZAP, LOCALE_FONTSIZE_CHANNELLIST, LOCALE_FONTSIZE_CHANNELLIST_DESCR, @@ -493,6 +492,7 @@ typedef enum { LOCALE_MAINMENU_CLEARSECTIONSD, LOCALE_MAINMENU_GAMES, LOCALE_MAINMENU_HEAD, + LOCALE_MAINMENU_MEDIA, LOCALE_MAINMENU_MOVIEPLAYER, LOCALE_MAINMENU_PAUSESECTIONSD, LOCALE_MAINMENU_PICTUREVIEWER, @@ -1132,7 +1132,6 @@ typedef enum { LOCALE_TIMING_CHANLIST, LOCALE_TIMING_EPG, LOCALE_TIMING_FILEBROWSER, - LOCALE_TIMING_HEAD, LOCALE_TIMING_HINT_1, LOCALE_TIMING_HINT_2, LOCALE_TIMING_INFOBAR, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 53eb85afc..1cc24249c 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -43,7 +43,6 @@ const char *locale_real_names[] = { "EPGPlus.reset_settings", "EPGPlus.save_settings", "EPGPlus.scroll_mode", - "EPGPlus.select_font_name", "EPGPlus.settings", "EPGPlus.slider_width", "EPGPlus.stretch_mode", @@ -247,7 +246,6 @@ const char *locale_real_names[] = { "colormenu.gtx_alpha", "colormenu.head", "colormenu.menucolors", - "colormenu.statusbar", "colormenu.textcolor", "colormenu.themeselect", "colormenu.timing", @@ -259,7 +257,6 @@ const char *locale_real_names[] = { "colormenusetup.menucontent_inactive", "colormenusetup.menucontent_selected", "colormenusetup.menuhead", - "colorstatusbar.head", "colorstatusbar.text", "colorthememenu.classic_theme", "colorthememenu.dblue_theme", @@ -392,12 +389,14 @@ const char *locale_real_names[] = { "flashupdate.writeflash", "flashupdate.writeflashmtd", "flashupdate.wrongbase", + "fontmenu.menu", "fontmenu.channellist", "fontmenu.epg", "fontmenu.eventlist", "fontmenu.gamelist", "fontmenu.head", "fontmenu.infobar", + "fontmenu.sizes", "fontsize.channel_num_zap", "fontsize.channellist", "fontsize.channellist_descr", @@ -493,6 +492,7 @@ const char *locale_real_names[] = { "mainmenu.clearsectionsd", "mainmenu.games", "mainmenu.head", + "mainmenu.media", "mainmenu.movieplayer", "mainmenu.pausesectionsd", "mainmenu.pictureviewer", @@ -1132,7 +1132,6 @@ const char *locale_real_names[] = { "timing.chanlist", "timing.epg", "timing.filebrowser", - "timing.head", "timing.hint_1", "timing.hint_2", "timing.infobar",