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

osd_setup.cpp: resort and cleanup osd setup menue

Browse Source
This commit is contained in:
Thilo Graf
2019-02-11 11:14:12 +01:00
parent f9e1fc30e4
commit 7d36fb52d6
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/gui/osd_setup.cpp
View File

@@ -663,11 +663,6 @@ 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);
@@ -677,6 +672,16 @@ int COsdSetup::showOsdSetup()
osd_menu->addItem(GenericMenuSeparatorLine); osd_menu->addItem(GenericMenuSeparatorLine);
// 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);
// scrambled
mc = new CMenuOptionChooser(LOCALE_EXTRA_SCRAMBLED_MESSAGE, &g_settings.scrambled_message, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
mc->setHint("", LOCALE_MENU_HINT_SCRAMBLED_MESSAGE);
osd_menu->addItem(mc);
#ifdef ENABLE_CHANGE_OSD_RESOLUTION #ifdef ENABLE_CHANGE_OSD_RESOLUTION
// osd resolution // osd resolution
size_t resCount = frameBuffer->osd_resolutions.size(); size_t resCount = frameBuffer->osd_resolutions.size();
@@ -713,7 +718,6 @@ int COsdSetup::showOsdSetup()
osd_menu->addItem(mc); osd_menu->addItem(mc);
} }
osd_menu->addItem(GenericMenuSeparatorLine);
#if 0 #if 0
// round corners // round corners
mc = new CMenuOptionChooser(LOCALE_EXTRA_ROUNDED_CORNERS, &g_settings.theme.rounded_corners, MENU_CORNERSETTINGS_TYPE_OPTIONS, MENU_CORNERSETTINGS_TYPE_OPTION_COUNT, true, this); mc = new CMenuOptionChooser(LOCALE_EXTRA_ROUNDED_CORNERS, &g_settings.theme.rounded_corners, MENU_CORNERSETTINGS_TYPE_OPTIONS, MENU_CORNERSETTINGS_TYPE_OPTION_COUNT, true, this);
@@ -733,13 +737,6 @@ int COsdSetup::showOsdSetup()
mfWindowSize->setHint("", LOCALE_MENU_HINT_WINDOW_SIZE); mfWindowSize->setHint("", LOCALE_MENU_HINT_WINDOW_SIZE);
osd_menu->addItem(mfWindowSize); osd_menu->addItem(mfWindowSize);
osd_menu->addItem(GenericMenuSeparatorLine);
// scrambled
mc = new CMenuOptionChooser(LOCALE_EXTRA_SCRAMBLED_MESSAGE, &g_settings.scrambled_message, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
mc->setHint("", LOCALE_MENU_HINT_SCRAMBLED_MESSAGE);
osd_menu->addItem(mc);
// subchannel menu position // subchannel menu position
mc = 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); mc = 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);
mc->setHint("", LOCALE_MENU_HINT_SUBCHANNEL_POS); mc->setHint("", LOCALE_MENU_HINT_SUBCHANNEL_POS);