diff --git a/data/locale/english.locale b/data/locale/english.locale index 21620470f..6d56d31c1 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -230,6 +230,9 @@ colormenu.statusbar Infobar colormenu.textcolor Textcolor colormenu.themeselect select theme colormenu.timing OSD Timing +colormenu.osd_preset TV preset +colormenu.hd_preset LCD +colormenu.sd_preset CRT colormenusetup.head Menu Colors colormenusetup.menucontent Window-Content colormenusetup.menucontent_inactive Window-Content inactive diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index f169393f1..2d5987ad9 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -172,6 +172,12 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &) if (parent) parent->hide(); + /* set the max height to 9/10 of usable screen height + debatable, if the callers need a possibility to set this */ + //FIXME width ?? + height = frameBuffer->getScreenHeight() / 20 * 18; /* make sure its a multiple of 2 */ + wanted_height = height; + bool fadeIn = g_settings.widget_fade; bool fadeOut = false; int fadeValue; diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 9676dfe2b..fa2127fad 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -725,6 +725,12 @@ const lcd_setting_struct_t lcd_setting[LCD_SETTING_COUNT] = #define DEFAULT_Y_START 20 #define DEFAULT_X_END 1220 #define DEFAULT_Y_END 560 + +#define DEFAULT_X_START 60 +#define DEFAULT_Y_START 20 +#define DEFAULT_X_END 1220 +#define DEFAULT_Y_END 560 + std::string ttx_font_file = ""; int CNeutrinoApp::loadSetup(const char * fname) diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index 28da162f6..017bd62b2 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -2337,6 +2337,12 @@ void CNeutrinoApp::InitFontSettings(CMenuWidget &fontSettings) fontSettings.addItem(new CMenuForwarder(LOCALE_OPTIONS_DEFAULT, true, NULL, this, font_sizes_groups[5].actionkey)); } +#define OSD_PRESET_OPTIONS_COUNT 2 +const CMenuOptionChooser::keyval OSD_PRESET_OPTIONS[OSD_PRESET_OPTIONS_COUNT] = +{ + { 560, LOCALE_COLORMENU_SD_PRESET }, + { 696, LOCALE_COLORMENU_HD_PRESET } +}; void CNeutrinoApp::InitColorSettings(CMenuWidget &colorSettings, CMenuWidget &fontSettings ) { CScreenSetup * ScreenSetup = new CScreenSetup(); @@ -2365,6 +2371,7 @@ void CNeutrinoApp::InitColorSettings(CMenuWidget &colorSettings, CMenuWidget &fo colorSettings.addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_VIDEOMENU_OSD)); colorSettings.addItem(new CMenuForwarder(LOCALE_TIMING_HEAD, true, NULL, colorSettings_timing)); colorSettings.addItem(new CMenuForwarder(LOCALE_VIDEOMENU_SCREENSETUP, true, NULL, ScreenSetup));//, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED)); + colorSettings.addItem(new CMenuOptionChooser(LOCALE_COLORMENU_OSD_PRESET, &g_settings.screen_EndY, OSD_PRESET_OPTIONS, OSD_PRESET_OPTIONS_COUNT, true)); #if 0 colorSettings.addItem(GenericMenuSeparatorLine); //menuefaden nur bei enx-chips! diff --git a/src/system/locals.h b/src/system/locals.h index 4078c0387..3f6acb2eb 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -251,6 +251,9 @@ typedef enum { LOCALE_COLORMENU_TEXTCOLOR, LOCALE_COLORMENU_THEMESELECT, LOCALE_COLORMENU_TIMING, + LOCALE_COLORMENU_OSD_PRESET, + LOCALE_COLORMENU_HD_PRESET, + LOCALE_COLORMENU_SD_PRESET, LOCALE_COLORMENUSETUP_HEAD, LOCALE_COLORMENUSETUP_MENUCONTENT, LOCALE_COLORMENUSETUP_MENUCONTENT_INACTIVE, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index c937b6a5a..53eb85afc 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -251,6 +251,9 @@ const char *locale_real_names[] = { "colormenu.textcolor", "colormenu.themeselect", "colormenu.timing", + "colormenu.osd_preset", + "colormenu.hd_preset", + "colormenu.sd_preset", "colormenusetup.head", "colormenusetup.menucontent", "colormenusetup.menucontent_inactive",