From 92eef239ef8959f5dc73d9a90c95d87bc8521b4e Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Mon, 11 Feb 2019 11:14:12 +0100 Subject: [PATCH] osd_setup.cpp: move radiotext option it osd main menue This option is not really specific for infobar. --- src/gui/osd_setup.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index b2a78c6f3..a96bc104a 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -562,6 +562,7 @@ const CMenuOptionChooser::keyval PROGRESSBAR_COLOR_OPTIONS[PROGRESSBAR_COLOR_OPT int COsdSetup::showOsdSetup() { int shortcut = 1; + CMenuOptionChooser * mc = NULL; //osd main menu osd_menu = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_COLORS, width, MN_WIDGET_ID_OSDSETUP); @@ -662,6 +663,11 @@ int COsdSetup::showOsdSetup() osd_menu->addItem(mf); #endif + // radiotext + mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_RADIOTEXT, &g_settings.radiotext_enable, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this); + mc->setHint("", LOCALE_MENU_HINT_INFOBAR_RADIOTEXT); + osd_menu->addItem(mc); + //screensaver CMenuWidget osd_menu_screensaver(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_OSDSETUP_SCREENSAVER); showOsdScreensaverSetup(&osd_menu_screensaver); @@ -701,7 +707,6 @@ int COsdSetup::showOsdSetup() #endif //monitor - CMenuOptionChooser *mc; if (cs_get_revision() != 1) { /* 1 == Tripledragon */ mc = new CMenuOptionChooser(LOCALE_COLORMENU_OSD_PRESET, &g_settings.screen_preset, OSD_PRESET_OPTIONS, OSD_PRESET_OPTIONS_COUNT, true, this); mc->setHint("", LOCALE_MENU_HINT_OSD_PRESET); @@ -1228,12 +1233,12 @@ void COsdSetup::showOsdInfobarSetup(CMenuWidget *menu_infobar) mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW, &g_settings.infobar_show, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); mc->setHint("", LOCALE_MENU_HINT_INFOBAR_ON_EPG); menu_infobar->addItem(mc); - +#if 0 // radiotext mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_RADIOTEXT, &g_settings.radiotext_enable, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this); mc->setHint("", LOCALE_MENU_HINT_INFOBAR_RADIOTEXT); menu_infobar->addItem(mc); - +#endif // buttons usertitle mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_BUTTONS_USERTITLE, &g_settings.infobar_buttons_usertitle, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this); mc->setHint("", LOCALE_MENU_HINT_INFOBAR_BUTTONS_USERTITLE);