mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 17:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Origin commit data
------------------
Commit: e0cd8f75d8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-09 (Wed, 09 Aug 2017)
This commit is contained in:
vanhofen
2017-08-09 10:37:47 +02:00
parent d339f73231 ad105085c2
commit b327436c94
22 changed files with 233 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/osd_setup.cpp
View File

@@ -698,6 +698,7 @@ int COsdSetup::showOsdSetup()
COsdHelpers::getInstance()->isVideoSystem1080(videoSystem) &&
(g_settings.video_Mode != VIDEO_STD_AUTO));
CMenuOptionChooser * osd_res = new CMenuOptionChooser(LOCALE_COLORMENU_OSD_RESOLUTION, &g_settings.osd_resolution, kext, resCount, enable, this);
osd_res->OnAfterChangeOption.connect(sigc::mem_fun(frameBuffer->getInstance(), &CFrameBuffer::clearIconCache));
osd_res->setHint("", LOCALE_MENU_HINT_OSD_RESOLUTION);
osd_menu->addItem(osd_res);
#endif
@@ -831,6 +832,8 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors)
&t.menu_Foot_alpha, colorSetupNotifier);
CColorChooser* chFootTextcolor = new CColorChooser(LOCALE_COLORMENU_TEXTCOLOR, &t.menu_Foot_Text_red, &t.menu_Foot_Text_green, &t.menu_Foot_Text_blue,
NULL, colorSetupNotifier);
CColorChooser* chShadowColor = new CColorChooser(LOCALE_COLORMENU_SHADOW_COLOR, &t.shadow_red, &t.shadow_green, &t.shadow_blue,
&t.menu_Head_alpha, colorSetupNotifier);
//NI
CColorChooser* chProgressbar_passive = new CColorChooser(LOCALE_COLORMENU_PROGRESSBAR_PASSIVE, &t.progressbar_passive_red, &t.progressbar_passive_green, &t.progressbar_passive_blue,
NULL, colorSetupNotifier);
@@ -1003,6 +1006,13 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors)
oj->setHint("", LOCALE_MENU_HINT_COLORED_EVENTS);
menu_colors->addItem(oj);
// shadow
menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE));
mf = new CMenuDForwarder(LOCALE_COLORMENU_SHADOW_COLOR, true, NULL, chShadowColor );
mf->setHint("", LOCALE_MENU_HINT_COLORS_SHADOW);
menu_colors->addItem(mf);
//NI progressbar
menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_MISCSETTINGS_PROGRESSBAR));