diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 30c6dd14a..2fe698fd3 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1715,6 +1715,7 @@ menu.hint_video_mode Wählen Sie den Modus des Ausgangssignals für den HDMI-Ans menu.hint_video_modes Definiert, welche Videosysteme mit der VF-Taste der Fernbedienung ausgewählt werden können menu.hint_video_modes_auto Definiert, welche Videosysteme automatisch ausgewählt werden können menu.hint_video_pip Bild in Bild Größe und Position +menu.hint_video_psi Menü zur Änderung von Farbe, Kontrast und mehr menu.hint_video_psi_step Setzt die Schrittweite für das On-Screen-Menü menu.hint_video_saturation Ändert die Farbsättigung menu.hint_video_scart_mode Wählen Sie den Modus des Ausgangssignals für den SCART-Anschluss @@ -2784,12 +2785,12 @@ videomenu.panscan Pan & Scan videomenu.panscan2 14:9 Pan & Scan videomenu.pip PiP Setup videomenu.pip_error PiP Startfehler -videomenu.psi Farbeinstellungen +videomenu.psi Farbregler videomenu.psi.brightness Helligkeit videomenu.psi.contrast Kontrast videomenu.psi.reset Standard-Einstellungen videomenu.psi.saturation Sättigung -videomenu.psi.step Videoregler-Schrittweite +videomenu.psi.step Farbregler-Schrittweite videomenu.psi.tint Farbton videomenu.saturation Sättigung videomenu.scart Scart diff --git a/data/locale/english.locale b/data/locale/english.locale index 04126d8a9..d93fce8c6 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1662,6 +1662,7 @@ menu.hint_video_mode HDMI output video mode menu.hint_video_modes VF key will cycle between enabled modes menu.hint_video_modes_auto Enable modes to auto-select based on content menu.hint_video_pip Picture in picture size and position +menu.hint_video_psi Menu for changing color, contrast and more menu.hint_video_psi_step Set the increment for the on-screen menu menu.hint_video_saturation Change picture saturation menu.hint_video_scart_mode Select analog output mode for SCART connectors @@ -1689,7 +1690,7 @@ menu.hint_zap_cycle When swithing channels, stay in current bouquet menu.next Next message.frame_enable Message and hint box frames message.frame_enable_hint Enable frames around message and hint boxes. -messagebox.accept Do you want to keep the changes? +messagebox.accept Keep changes? messagebox.back Back messagebox.cancel Cancel messagebox.discard Discard changes? @@ -2730,12 +2731,12 @@ videomenu.panscan Pan & Scan videomenu.panscan2 14:9 Pan & Scan videomenu.pip PiP setup videomenu.pip_error PiP start failed -videomenu.psi Color settings +videomenu.psi Color sliders videomenu.psi.brightness Brightness videomenu.psi.contrast Contrast videomenu.psi.reset Standard settings videomenu.psi.saturation Saturation -videomenu.psi.step Video slider step size +videomenu.psi.step Color sliders step size videomenu.psi.tint Tint videomenu.saturation Saturation videomenu.scart Scart diff --git a/src/gui/psisetup.cpp b/src/gui/psisetup.cpp index 5a12390b4..2c53a1c8f 100644 --- a/src/gui/psisetup.cpp +++ b/src/gui/psisetup.cpp @@ -130,12 +130,12 @@ int CPSISetup::exec (CMenuTarget * parent, const std::string &) sliderOffset = (locHeight - SLIDERHEIGHT) >> 1; - // [ SLIDERWIDTH ][5][locwidth ] - // [locHeight][XXXXXXXXXXXXX] [XXXXXXXXXXXX] - // [locHeight][XXXXXXXXXXXXX] [XXXXXXXXXXXX] - // [locHeight][XXXXXXXXXXXXX] [XXXXXXXXXXXX] - // [locHeight][XXXXXXXXXXXXX] [XXXXXXXXXXXX] - // [locHeight] [XXXXXXXXXXXX] + // [ SLIDERWIDTH ][5][locwidth ] + // [locHeight][XXXXXXXXXXXXX] [XXXXXXXXXXXX] + // [locHeight][XXXXXXXXXXXXX] [XXXXXXXXXXXX] + // [locHeight][XXXXXXXXXXXXX] [XXXXXXXXXXXX] + // [locHeight][XXXXXXXXXXXXX] [XXXXXXXXXXXX] + // [locHeight] [XXXXXXXXXXXX] dx = SLIDERWIDTH + LOCGAP + locWidth; dy = PSI_SCALE_COUNT * locHeight + (PSI_SCALE_COUNT - 1) * 2; @@ -273,7 +273,7 @@ void CPSISetup::paint () void CPSISetup::paintSlider (int i) { Font *f = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]; - fb_pixel_t fg_col[] = { COL_MENUCONTENT_TEXT, COL_MENUHEAD_TEXT }; + fb_pixel_t fg_col[] = { COL_MENUCONTENTINACTIVE_TEXT, COL_MENUCONTENT_TEXT }; if (i < PSI_RESET) { @@ -284,7 +284,7 @@ void CPSISetup::paintSlider (int i) else { int fh = f->getHeight(); - f->RenderString (psi_list[i].x + 2 + fh + fh/8, psi_list[i].yLoc, dx - 2 - fh, g_Locale->getText(psi_list[i].loc), fg_col[psi_list[i].selected]); + f->RenderString (psi_list[i].x + 2 + fh + fh/8, psi_list[i].yLoc, dx - 2 - fh, g_Locale->getText(psi_list[i].loc), COL_MENUCONTENT_TEXT); frameBuffer->paintIcon (NEUTRINO_ICON_BUTTON_RED, psi_list[i].x + 2, psi_list[i].yLoc - fh + fh/4, 0, (6 * fh)/8); } needsBlit = true; diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp index bcd8c0b47..f4bd5c668 100644 --- a/src/gui/videosettings.cpp +++ b/src/gui/videosettings.cpp @@ -566,14 +566,25 @@ int CVideoSettings::showVideoSetup() } #if HAVE_ARM_HARDWARE - videosetup->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_VIDEOMENU_PSI)); + videosetup->addItem(GenericMenuSeparatorLine); + + CMenuForwarder *mf; CMenuOptionNumberChooser *mc; + CPSISetup *psiSetup = CPSISetup::getInstance(); +#if 0 mc = new CMenuOptionNumberChooser(LOCALE_VIDEOMENU_PSI_STEP, (int *)&g_settings.psi_step, true, 1, 100, NULL); mc->setHint("", LOCALE_MENU_HINT_VIDEO_PSI_STEP); videosetup->addItem(mc); + mf = new CMenuForwarder(LOCALE_VIDEOMENU_PSI, true, NULL, psiSetup, NULL); + mf->setHint("", LOCALE_MENU_HINT_VIDEO_PSI); + videosetup->addItem(mf); + + videosetup->addItem(GenericMenuSeparator); +#endif + mc = new CMenuOptionNumberChooser(LOCALE_VIDEOMENU_PSI_CONTRAST, (int *)&g_settings.psi_contrast, true, 0, 255, psiSetup); mc->setHint("", LOCALE_MENU_HINT_VIDEO_CONTRAST); videosetup->addItem(mc); diff --git a/src/system/locals.h b/src/system/locals.h index 85e848d42..aaae876f5 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -1742,6 +1742,7 @@ typedef enum LOCALE_MENU_HINT_VIDEO_MODES, LOCALE_MENU_HINT_VIDEO_MODES_AUTO, LOCALE_MENU_HINT_VIDEO_PIP, + LOCALE_MENU_HINT_VIDEO_PSI, LOCALE_MENU_HINT_VIDEO_PSI_STEP, LOCALE_MENU_HINT_VIDEO_SATURATION, LOCALE_MENU_HINT_VIDEO_SCART_MODE, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 2034e02a2..8181c7783 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -1742,6 +1742,7 @@ const char * locale_real_names[] = "menu.hint_video_modes", "menu.hint_video_modes_auto", "menu.hint_video_pip", + "menu.hint_video_psi", "menu.hint_video_psi_step", "menu.hint_video_saturation", "menu.hint_video_scart_mode",