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

Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/themes.cpp
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: fd5029560e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-08-15 00:19:32 +02:00
parent a3eefb15ea fb9eaf294f
commit ceb8fea637
22 changed files with 59 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/osd_setup.cpp
View File

@@ -758,6 +758,8 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors)
&t.menu_Content_inactive_alpha, colorSetupNotifier);
CColorChooser* chContentInactiveTextcolor = new CColorChooser(LOCALE_COLORMENU_TEXTCOLOR, &t.menu_Content_inactive_Text_red, &t.menu_Content_inactive_Text_green, &t.menu_Content_inactive_Text_blue,
NULL, colorSetupNotifier);
CColorChooser* chFootcolor = new CColorChooser(LOCALE_COLORMENU_BACKGROUND, &t.menu_Foot_red, &t.menu_Foot_green, &t.menu_Foot_blue,
&t.menu_Foot_alpha, colorSetupNotifier);
menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_COLORMENUSETUP_MENUHEAD));
@@ -817,6 +819,12 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors)
mf->setHint("", LOCALE_MENU_HINT_SELECTED_TEXT);
menu_colors->addItem(mf);
// footer
menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_COLORMENUSETUP_MENUFOOT));
mf = new CMenuDForwarder(LOCALE_COLORMENU_BACKGROUND, true, NULL, chFootcolor );
mf->setHint("", LOCALE_MENU_HINT_HEAD_BACK);
menu_colors->addItem(mf);
// hintbox color gradient
menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_COLORTHEMEMENU_MENU_HINTS));
oj = new CMenuOptionChooser(LOCALE_COLOR_GRADIENT, &t.menu_Hint_gradient, OPTIONS_COL_GRADIENT_OPTIONS, OPTIONS_COL_GRADIENT_OPTIONS_COUNT, true);