mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-18 10:51:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

videosettings/psisetup; re-add (deactivated) small psi menu

Browse Source 
Origin commit data
------------------
Commit: 6b496f5e14
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-07-27 (Mon, 27 Jul 2020)

Origin message was:
------------------
- videosettings/psisetup; re-add (deactivated) small psi menu
This commit is contained in:
vanhofen
2020-07-27 23:16:44 +02:00
parent 9c3c366571
commit bb4564e909
6 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/psisetup.cpp
View File

@@ -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;

13
src/gui/videosettings.cpp
View File

@@ -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);

1
src/system/locals.h
View File

@@ -1887,6 +1887,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,

1
src/system/locals_intern.h
View File

@@ -1887,6 +1887,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",