From 7d36fb52d63d630191dd0f79a45abd27f221a03d Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Mon, 11 Feb 2019 11:14:12 +0100 Subject: [PATCH] osd_setup.cpp: resort and cleanup osd setup menue --- src/gui/osd_setup.cpp | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index c42a23cc7..80cf6eb2d 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -663,11 +663,6 @@ 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); @@ -677,6 +672,16 @@ int COsdSetup::showOsdSetup() 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 // osd resolution size_t resCount = frameBuffer->osd_resolutions.size(); @@ -713,7 +718,6 @@ int COsdSetup::showOsdSetup() osd_menu->addItem(mc); } - osd_menu->addItem(GenericMenuSeparatorLine); #if 0 // 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); @@ -733,13 +737,6 @@ int COsdSetup::showOsdSetup() mfWindowSize->setHint("", LOCALE_MENU_HINT_WINDOW_SIZE); 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 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);