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

- osd-setup: move screen stuff into own submenu

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2021-06-18 23:08:11 +02:00
committed by Thilo Graf
parent 8344d07b20
commit 87ae0b0f58
7 changed files with 40 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/gui/osd_setup.cpp
View File

@@ -577,7 +577,7 @@ int COsdSetup::showOsdSetup()
CMenuOptionChooser * mc = NULL;
// 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_SETTINGS, width, MN_WIDGET_ID_OSDSETUP);
osd_menu->setWizardMode(is_wizard);
// intro with subhead and back button
@@ -594,7 +594,7 @@ int COsdSetup::showOsdSetup()
osd_menu->addItem(mf);
// fonts
CMenuWidget osd_menu_fonts(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_COLORS, width, MN_WIDGET_ID_OSDSETUP_FONT);
CMenuWidget osd_menu_fonts(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_OSDSETUP_FONT);
showOsdFontSizeSetup(&osd_menu_fonts);
mf = new CMenuForwarder(LOCALE_FONTMENU_HEAD, true, NULL, &osd_menu_fonts, NULL, CRCInput::RC_green);
mf->setHint("", LOCALE_MENU_HINT_FONTS);
@@ -608,9 +608,10 @@ int COsdSetup::showOsdSetup()
osd_menu->addItem(mf);
// screen
CScreenSetup screensetup;
mf = new CMenuForwarder(LOCALE_VIDEOMENU_SCREENSETUP, true, NULL, &screensetup, NULL, CRCInput::RC_blue);
mf->setHint("", LOCALE_MENU_HINT_SCREEN_SETUP);
CMenuWidget osd_menu_screen(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_OSDSETUP_SCREEN);
showOsdScreenSetup(&osd_menu_screen);
mf = new CMenuForwarder(LOCALE_SCREEN_MENU, true, NULL, &osd_menu_screen, NULL, CRCInput::RC_blue);
mf->setHint("", LOCALE_MENU_HINT_SCREEN);
osd_menu->addItem(mf);
// menus
@@ -725,11 +726,6 @@ int COsdSetup::showOsdSetup()
osd_menu->addItem(osd_res);
#endif
// monitor
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);
osd_menu->addItem(mc);
#if defined BOXMODEL_CST_HD1
int scart_osd_fix_exist = 0;
if (file_exists("/var/etc/.scart_osd_fix"))
@@ -1706,6 +1702,24 @@ int COsdSetup::showContextChanlistMenu(CChannelList *parent_channellist)
return res;
}
void COsdSetup::showOsdScreenSetup(CMenuWidget *menu_screen)
{
CMenuForwarder *mf = NULL;
CMenuOptionChooser *mc = NULL;
menu_screen->addIntroItems(LOCALE_SCREEN_MENU);
// screen
mf = new CMenuForwarder(LOCALE_VIDEOMENU_SCREENSETUP, true, NULL, new CScreenSetup, NULL, CRCInput::RC_red);
mf->setHint("", LOCALE_MENU_HINT_SCREENSETUP);
menu_screen->addItem(mf);
// monitor
mc = new CMenuOptionChooser(LOCALE_COLORMENU_OSD_PRESET, &g_settings.screen_preset, OSD_PRESET_OPTIONS, OSD_PRESET_OPTIONS_COUNT, true, this, CRCInput::RC_green);
mc->setHint("", LOCALE_MENU_HINT_OSD_PRESET);
menu_screen->addItem(mc);
}
#ifdef SCREENSHOT
//screenshot
#define SCREENSHOT_FMT_OPTION_COUNT 3