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

Origin commit data
------------------
Commit: d39dc75c6d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)
This commit is contained in:
vanhofen
2016-12-29 15:15:34 +01:00
51 changed files with 509 additions and 177 deletions

View File

@@ -201,6 +201,11 @@ void CColorSetupNotifier::setPalette()
convertSetupColor2RGB(int(t.menu_Content_red*0.6), int(t.menu_Content_green*0.6), int(t.menu_Content_blue*0.6)),
convertSetupColor2RGB(t.colored_events_red, t.colored_events_green, t.colored_events_blue),
8, convertSetupAlpha2Alpha(t.infobar_alpha) );
//NI
frameBuffer->paletteGenFade(COL_PROGRESSBAR,
convertSetupColor2RGB(t.progressbar_passive_red, t.progressbar_passive_green, t.progressbar_passive_blue),
convertSetupColor2RGB(t.progressbar_active_red, t.progressbar_active_green, t.progressbar_active_blue),
8, convertSetupAlpha2Alpha(t.menu_Content_alpha));
// ##### TEXT COLORS #####
// COL_COLORED_EVENTS_TEXT
@@ -282,6 +287,11 @@ void CColorSetupNotifier::setPalette()
frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 15,
convertSetupColor2RGB(t.clock_Digit_red, t.clock_Digit_green, t.clock_Digit_blue),
convertSetupAlpha2Alpha(t.clock_Digit_alpha));
//NI
// COL_PROGRESSBAR_ACTIVE
frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 16,
convertSetupColor2RGB(t.progressbar_active_red, t.progressbar_active_green, t.progressbar_active_blue),
convertSetupAlpha2Alpha(t.menu_Content_alpha));
frameBuffer->paletteSet();
}