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

system/settings: move theme colors to dedicated struct

Browse Source 
Conflicts:
	src/driver/pictureviewer/pictureviewer.cpp
	src/gui/epgview.cpp
	src/gui/osd_setup.cpp
	src/gui/pluginlist.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: b21cb152b5
Author: martii <m4rtii@gmx.de>
Date: 2014-01-06 (Mon, 06 Jan 2014)



------------------
This commit was generated by Migit
This commit is contained in:
martii
2014-01-06 11:48:59 +01:00
committed by [CST] Focus
parent e06663874d
commit bca9371e65
17 changed files with 402 additions and 485 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
src/system/setting_helpers.cpp
View File

@@ -128,134 +128,135 @@ bool CTouchFileNotifier::changeNotify(const neutrino_locale_t, void * data)
void CColorSetupNotifier::setPalette()
{
CFrameBuffer *frameBuffer = CFrameBuffer::getInstance();
SNeutrinoTheme &t = g_settings.theme;
//setting colors-..
frameBuffer->paletteGenFade(COL_MENUHEAD,
convertSetupColor2RGB(g_settings.menu_Head_red, g_settings.menu_Head_green, g_settings.menu_Head_blue),
convertSetupColor2RGB(g_settings.menu_Head_Text_red, g_settings.menu_Head_Text_green, g_settings.menu_Head_Text_blue),
8, convertSetupAlpha2Alpha( g_settings.menu_Head_alpha ) );
convertSetupColor2RGB(t.menu_Head_red, t.menu_Head_green, t.menu_Head_blue),
convertSetupColor2RGB(t.menu_Head_Text_red, t.menu_Head_Text_green, t.menu_Head_Text_blue),
8, convertSetupAlpha2Alpha( t.menu_Head_alpha ) );
frameBuffer->paletteGenFade(COL_MENUCONTENT,
convertSetupColor2RGB(g_settings.menu_Content_red, g_settings.menu_Content_green, g_settings.menu_Content_blue),
convertSetupColor2RGB(g_settings.menu_Content_Text_red, g_settings.menu_Content_Text_green, g_settings.menu_Content_Text_blue),
8, convertSetupAlpha2Alpha(g_settings.menu_Content_alpha) );
convertSetupColor2RGB(t.menu_Content_red, t.menu_Content_green, t.menu_Content_blue),
convertSetupColor2RGB(t.menu_Content_Text_red, t.menu_Content_Text_green, t.menu_Content_Text_blue),
8, convertSetupAlpha2Alpha(t.menu_Content_alpha) );
frameBuffer->paletteGenFade(COL_MENUCONTENTDARK,
convertSetupColor2RGB(int(g_settings.menu_Content_red*0.6), int(g_settings.menu_Content_green*0.6), int(g_settings.menu_Content_blue*0.6)),
convertSetupColor2RGB(g_settings.menu_Content_Text_red, g_settings.menu_Content_Text_green, g_settings.menu_Content_Text_blue),
8, convertSetupAlpha2Alpha(g_settings.menu_Content_alpha) );
convertSetupColor2RGB(int(t.menu_Content_red*0.6), int(t.menu_Content_green*0.6), int(t.menu_Content_blue*0.6)),
convertSetupColor2RGB(t.menu_Content_Text_red, t.menu_Content_Text_green, t.menu_Content_Text_blue),
8, convertSetupAlpha2Alpha(t.menu_Content_alpha) );
frameBuffer->paletteGenFade(COL_MENUCONTENTSELECTED,
convertSetupColor2RGB(g_settings.menu_Content_Selected_red, g_settings.menu_Content_Selected_green, g_settings.menu_Content_Selected_blue),
convertSetupColor2RGB(g_settings.menu_Content_Selected_Text_red, g_settings.menu_Content_Selected_Text_green, g_settings.menu_Content_Selected_Text_blue),
8, convertSetupAlpha2Alpha(g_settings.menu_Content_Selected_alpha) );
convertSetupColor2RGB(t.menu_Content_Selected_red, t.menu_Content_Selected_green, t.menu_Content_Selected_blue),
convertSetupColor2RGB(t.menu_Content_Selected_Text_red, t.menu_Content_Selected_Text_green, t.menu_Content_Selected_Text_blue),
8, convertSetupAlpha2Alpha(t.menu_Content_Selected_alpha) );
frameBuffer->paletteGenFade(COL_MENUCONTENTINACTIVE,
convertSetupColor2RGB(g_settings.menu_Content_inactive_red, g_settings.menu_Content_inactive_green, g_settings.menu_Content_inactive_blue),
convertSetupColor2RGB(g_settings.menu_Content_inactive_Text_red, g_settings.menu_Content_inactive_Text_green, g_settings.menu_Content_inactive_Text_blue),
8, convertSetupAlpha2Alpha(g_settings.menu_Content_inactive_alpha) );
convertSetupColor2RGB(t.menu_Content_inactive_red, t.menu_Content_inactive_green, t.menu_Content_inactive_blue),
convertSetupColor2RGB(t.menu_Content_inactive_Text_red, t.menu_Content_inactive_Text_green, t.menu_Content_inactive_Text_blue),
8, convertSetupAlpha2Alpha(t.menu_Content_inactive_alpha) );
frameBuffer->paletteGenFade(COL_INFOBAR,
convertSetupColor2RGB(g_settings.infobar_red, g_settings.infobar_green, g_settings.infobar_blue),
convertSetupColor2RGB(g_settings.infobar_Text_red, g_settings.infobar_Text_green, g_settings.infobar_Text_blue),
8, convertSetupAlpha2Alpha(g_settings.infobar_alpha) );
convertSetupColor2RGB(t.infobar_red, t.infobar_green, t.infobar_blue),
convertSetupColor2RGB(t.infobar_Text_red, t.infobar_Text_green, t.infobar_Text_blue),
8, convertSetupAlpha2Alpha(t.infobar_alpha) );
frameBuffer->paletteGenFade(COL_INFOBAR_SHADOW,
convertSetupColor2RGB(int(g_settings.infobar_red*0.4), int(g_settings.infobar_green*0.4), int(g_settings.infobar_blue*0.4)),
convertSetupColor2RGB(g_settings.infobar_Text_red, g_settings.infobar_Text_green, g_settings.infobar_Text_blue),
8, convertSetupAlpha2Alpha(g_settings.infobar_alpha) );
convertSetupColor2RGB(int(t.infobar_red*0.4), int(t.infobar_green*0.4), int(t.infobar_blue*0.4)),
convertSetupColor2RGB(t.infobar_Text_red, t.infobar_Text_green, t.infobar_Text_blue),
8, convertSetupAlpha2Alpha(t.infobar_alpha) );
frameBuffer->paletteGenFade(COL_COLORED_EVENTS_INFOBAR,
convertSetupColor2RGB(g_settings.infobar_red, g_settings.infobar_green, g_settings.infobar_blue),
convertSetupColor2RGB(g_settings.colored_events_red, g_settings.colored_events_green, g_settings.colored_events_blue),
8, convertSetupAlpha2Alpha(g_settings.infobar_alpha) );
convertSetupColor2RGB(t.infobar_red, t.infobar_green, t.infobar_blue),
convertSetupColor2RGB(t.colored_events_red, t.colored_events_green, t.colored_events_blue),
8, convertSetupAlpha2Alpha(t.infobar_alpha) );
frameBuffer->paletteGenFade(COL_COLORED_EVENTS_CHANNELLIST,
convertSetupColor2RGB(int(g_settings.menu_Content_red*0.6), int(g_settings.menu_Content_green*0.6), int(g_settings.menu_Content_blue*0.6)),
convertSetupColor2RGB(g_settings.colored_events_red, g_settings.colored_events_green, g_settings.colored_events_blue),
8, convertSetupAlpha2Alpha(g_settings.infobar_alpha) );
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) );
// ##### TEXT COLORS #####
// COL_COLORED_EVENTS_TEXT
frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 0,
convertSetupColor2RGB(g_settings.colored_events_red, g_settings.colored_events_green, g_settings.colored_events_blue),
convertSetupAlpha2Alpha(g_settings.menu_Content_alpha));
convertSetupColor2RGB(t.colored_events_red, t.colored_events_green, t.colored_events_blue),
convertSetupAlpha2Alpha(t.menu_Content_alpha));
// COL_INFOBAR_TEXT
frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 1,
convertSetupColor2RGB(g_settings.infobar_Text_red, g_settings.infobar_Text_green, g_settings.infobar_Text_blue),
convertSetupAlpha2Alpha(g_settings.infobar_alpha));
convertSetupColor2RGB(t.infobar_Text_red, t.infobar_Text_green, t.infobar_Text_blue),
convertSetupAlpha2Alpha(t.infobar_alpha));
// COL_INFOBAR_SHADOW_TEXT
frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 2,
convertSetupColor2RGB(int(g_settings.infobar_Text_red*0.6), int(g_settings.infobar_Text_green*0.6), int(g_settings.infobar_Text_blue*0.6)),
convertSetupAlpha2Alpha(g_settings.infobar_alpha));
convertSetupColor2RGB(int(t.infobar_Text_red*0.6), int(t.infobar_Text_green*0.6), int(t.infobar_Text_blue*0.6)),
convertSetupAlpha2Alpha(t.infobar_alpha));
// COL_MENUHEAD_TEXT
frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 3,
convertSetupColor2RGB(g_settings.menu_Head_Text_red, g_settings.menu_Head_Text_green, g_settings.menu_Head_Text_blue),
convertSetupAlpha2Alpha(g_settings.menu_Head_alpha));
convertSetupColor2RGB(t.menu_Head_Text_red, t.menu_Head_Text_green, t.menu_Head_Text_blue),
convertSetupAlpha2Alpha(t.menu_Head_alpha));
// COL_MENUCONTENT_TEXT
frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 4,
convertSetupColor2RGB(g_settings.menu_Content_Text_red, g_settings.menu_Content_Text_green, g_settings.menu_Content_Text_blue),
convertSetupAlpha2Alpha(g_settings.menu_Content_alpha));
convertSetupColor2RGB(t.menu_Content_Text_red, t.menu_Content_Text_green, t.menu_Content_Text_blue),
convertSetupAlpha2Alpha(t.menu_Content_alpha));
// COL_MENUCONTENT_TEXT_PLUS_1
frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 5,
changeBrightnessRGBRel(convertSetupColor2RGB(g_settings.menu_Content_Text_red, g_settings.menu_Content_Text_green, g_settings.menu_Content_Text_blue), -16),
convertSetupAlpha2Alpha(g_settings.menu_Content_alpha));
changeBrightnessRGBRel(convertSetupColor2RGB(t.menu_Content_Text_red, t.menu_Content_Text_green, t.menu_Content_Text_blue), -16),
convertSetupAlpha2Alpha(t.menu_Content_alpha));
// COL_MENUCONTENT_TEXT_PLUS_2
frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 6,
changeBrightnessRGBRel(convertSetupColor2RGB(g_settings.menu_Content_Text_red, g_settings.menu_Content_Text_green, g_settings.menu_Content_Text_blue), -32),
convertSetupAlpha2Alpha(g_settings.menu_Content_alpha));
changeBrightnessRGBRel(convertSetupColor2RGB(t.menu_Content_Text_red, t.menu_Content_Text_green, t.menu_Content_Text_blue), -32),
convertSetupAlpha2Alpha(t.menu_Content_alpha));
// COL_MENUCONTENT_TEXT_PLUS_3
frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 7,
changeBrightnessRGBRel(convertSetupColor2RGB(g_settings.menu_Content_Text_red, g_settings.menu_Content_Text_green, g_settings.menu_Content_Text_blue), -48),
convertSetupAlpha2Alpha(g_settings.menu_Content_alpha));
changeBrightnessRGBRel(convertSetupColor2RGB(t.menu_Content_Text_red, t.menu_Content_Text_green, t.menu_Content_Text_blue), -48),
convertSetupAlpha2Alpha(t.menu_Content_alpha));
// COL_MENUCONTENTDARK_TEXT
frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 8,
convertSetupColor2RGB(g_settings.menu_Content_Text_red, g_settings.menu_Content_Text_green, g_settings.menu_Content_Text_blue),
convertSetupAlpha2Alpha(g_settings.menu_Content_alpha));
convertSetupColor2RGB(t.menu_Content_Text_red, t.menu_Content_Text_green, t.menu_Content_Text_blue),
convertSetupAlpha2Alpha(t.menu_Content_alpha));
// COL_MENUCONTENTDARK_TEXT_PLUS_1
frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 9,
changeBrightnessRGBRel(convertSetupColor2RGB(g_settings.menu_Content_Text_red, g_settings.menu_Content_Text_green, g_settings.menu_Content_Text_blue), -52),
convertSetupAlpha2Alpha(g_settings.menu_Content_alpha));
changeBrightnessRGBRel(convertSetupColor2RGB(t.menu_Content_Text_red, t.menu_Content_Text_green, t.menu_Content_Text_blue), -52),
convertSetupAlpha2Alpha(t.menu_Content_alpha));
// COL_MENUCONTENTDARK_TEXT_PLUS_2
frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 10,
changeBrightnessRGBRel(convertSetupColor2RGB(g_settings.menu_Content_Text_red, g_settings.menu_Content_Text_green, g_settings.menu_Content_Text_blue), -60),
convertSetupAlpha2Alpha(g_settings.menu_Content_alpha));
changeBrightnessRGBRel(convertSetupColor2RGB(t.menu_Content_Text_red, t.menu_Content_Text_green, t.menu_Content_Text_blue), -60),
convertSetupAlpha2Alpha(t.menu_Content_alpha));
// COL_MENUCONTENTSELECTED_TEXT
frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 11,
convertSetupColor2RGB(g_settings.menu_Content_Selected_Text_red, g_settings.menu_Content_Selected_Text_green, g_settings.menu_Content_Selected_Text_blue),
convertSetupAlpha2Alpha(g_settings.menu_Content_Selected_alpha));
convertSetupColor2RGB(t.menu_Content_Selected_Text_red, t.menu_Content_Selected_Text_green, t.menu_Content_Selected_Text_blue),
convertSetupAlpha2Alpha(t.menu_Content_Selected_alpha));
// COL_MENUCONTENTSELECTED_TEXT_PLUS_1
frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 12,
changeBrightnessRGBRel(convertSetupColor2RGB(g_settings.menu_Content_Selected_Text_red, g_settings.menu_Content_Selected_Text_green, g_settings.menu_Content_Selected_Text_blue), -16),
convertSetupAlpha2Alpha(g_settings.menu_Content_Selected_alpha));
changeBrightnessRGBRel(convertSetupColor2RGB(t.menu_Content_Selected_Text_red, t.menu_Content_Selected_Text_green, t.menu_Content_Selected_Text_blue), -16),
convertSetupAlpha2Alpha(t.menu_Content_Selected_alpha));
// COL_MENUCONTENTSELECTED_TEXT_PLUS_2
frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 13,
changeBrightnessRGBRel(convertSetupColor2RGB(g_settings.menu_Content_Selected_Text_red, g_settings.menu_Content_Selected_Text_green, g_settings.menu_Content_Selected_Text_blue), -32),
convertSetupAlpha2Alpha(g_settings.menu_Content_Selected_alpha));
changeBrightnessRGBRel(convertSetupColor2RGB(t.menu_Content_Selected_Text_red, t.menu_Content_Selected_Text_green, t.menu_Content_Selected_Text_blue), -32),
convertSetupAlpha2Alpha(t.menu_Content_Selected_alpha));
// COL_MENUCONTENTINACTIVE_TEXT
frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 14,
convertSetupColor2RGB(g_settings.menu_Content_inactive_Text_red, g_settings.menu_Content_inactive_Text_green, g_settings.menu_Content_inactive_Text_blue),
convertSetupAlpha2Alpha(g_settings.menu_Content_inactive_alpha));
convertSetupColor2RGB(t.menu_Content_inactive_Text_red, t.menu_Content_inactive_Text_green, t.menu_Content_inactive_Text_blue),
convertSetupAlpha2Alpha(t.menu_Content_inactive_alpha));
// COL_INFOCLOCK_TEXT
frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 15,
convertSetupColor2RGB(g_settings.clock_Digit_red, g_settings.clock_Digit_green, g_settings.clock_Digit_blue),
convertSetupAlpha2Alpha(g_settings.clock_Digit_alpha));
convertSetupColor2RGB(t.clock_Digit_red, t.clock_Digit_green, t.clock_Digit_blue),
convertSetupAlpha2Alpha(t.clock_Digit_alpha));
frameBuffer->paletteSet();
}