mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

osd_setup.cpp: move radiotext option it osd main menue

Browse Source 
This option is not really specific for infobar.
This commit is contained in:
Thilo Graf
2019-02-11 11:14:12 +01:00
parent 0c73c623fe
commit 92eef239ef
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/osd_setup.cpp
View File

@@ -562,6 +562,7 @@ const CMenuOptionChooser::keyval PROGRESSBAR_COLOR_OPTIONS[PROGRESSBAR_COLOR_OPT
int COsdSetup::showOsdSetup() int COsdSetup::showOsdSetup()
{ {
int shortcut = 1; int shortcut = 1;
CMenuOptionChooser * mc = NULL;
//osd main menu //osd main menu
osd_menu = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_COLORS, width, MN_WIDGET_ID_OSDSETUP); 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); osd_menu->addItem(mf);
#endif #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 //screensaver
CMenuWidget osd_menu_screensaver(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_OSDSETUP_SCREENSAVER); CMenuWidget osd_menu_screensaver(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_OSDSETUP_SCREENSAVER);
showOsdScreensaverSetup(&osd_menu_screensaver); showOsdScreensaverSetup(&osd_menu_screensaver);
@@ -701,7 +707,6 @@ int COsdSetup::showOsdSetup()
#endif #endif
//monitor //monitor
CMenuOptionChooser *mc;
if (cs_get_revision() != 1) { /* 1 == Tripledragon */ 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 = 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); 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 = 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); mc->setHint("", LOCALE_MENU_HINT_INFOBAR_ON_EPG);
menu_infobar->addItem(mc); menu_infobar->addItem(mc);
#if 0
// radiotext // radiotext
mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_RADIOTEXT, &g_settings.radiotext_enable, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this); 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); mc->setHint("", LOCALE_MENU_HINT_INFOBAR_RADIOTEXT);
menu_infobar->addItem(mc); menu_infobar->addItem(mc);
#endif
// buttons usertitle // 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 = 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); mc->setHint("", LOCALE_MENU_HINT_INFOBAR_BUTTONS_USERTITLE);