mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 00:11:14 +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
This commit is contained in:
martii
2014-01-06 11:48:59 +01:00
committed by [CST] Focus
parent 431657e35d
commit b21cb152b5
17 changed files with 402 additions and 485 deletions
Download Patch File Download Diff File Expand all files Collapse all files

388
src/gui/themes.cpp
View File

@@ -188,103 +188,9 @@ int CThemes::Show()
void CThemes::rememberOldTheme(bool remember)
{
if ( remember ) {
oldThemeValues[0] = g_settings.menu_Head_alpha;
oldThemeValues[1] = g_settings.menu_Head_red;
oldThemeValues[2] = g_settings.menu_Head_green;
oldThemeValues[3] = g_settings.menu_Head_blue;
oldThemeValues[4] = g_settings.menu_Head_Text_alpha;
oldThemeValues[5] = g_settings.menu_Head_Text_red;
oldThemeValues[6] = g_settings.menu_Head_Text_green;
oldThemeValues[7] = g_settings.menu_Head_Text_blue;
oldThemeValues[8] = g_settings.menu_Content_alpha;
oldThemeValues[9] = g_settings.menu_Content_red;
oldThemeValues[10] = g_settings.menu_Content_green;
oldThemeValues[11] = g_settings.menu_Content_blue;
oldThemeValues[12] = g_settings.menu_Content_Text_alpha;
oldThemeValues[13] = g_settings.menu_Content_Text_red;
oldThemeValues[14] = g_settings.menu_Content_Text_green;
oldThemeValues[15] = g_settings.menu_Content_Text_blue;
oldThemeValues[16] = g_settings.menu_Content_Selected_alpha;
oldThemeValues[17] = g_settings.menu_Content_Selected_red;
oldThemeValues[18] = g_settings.menu_Content_Selected_green;
oldThemeValues[19] = g_settings.menu_Content_Selected_blue;
oldThemeValues[20] = g_settings.menu_Content_Selected_Text_alpha;
oldThemeValues[21] = g_settings.menu_Content_Selected_Text_red;
oldThemeValues[22] = g_settings.menu_Content_Selected_Text_green;
oldThemeValues[23] = g_settings.menu_Content_Selected_Text_blue;
oldThemeValues[24] = g_settings.menu_Content_inactive_alpha;
oldThemeValues[25] = g_settings.menu_Content_inactive_red;
oldThemeValues[26] = g_settings.menu_Content_inactive_green;
oldThemeValues[27] = g_settings.menu_Content_inactive_blue;
oldThemeValues[28] = g_settings.menu_Content_inactive_Text_alpha;
oldThemeValues[29] = g_settings.menu_Content_inactive_Text_red;
oldThemeValues[30] = g_settings.menu_Content_inactive_Text_green;
oldThemeValues[31] = g_settings.menu_Content_inactive_Text_blue;
oldThemeValues[32] = g_settings.infobar_alpha;
oldThemeValues[33] = g_settings.infobar_red;
oldThemeValues[34] = g_settings.infobar_green;
oldThemeValues[35] = g_settings.infobar_blue;
oldThemeValues[36] = g_settings.infobar_Text_alpha;
oldThemeValues[37] = g_settings.infobar_Text_red;
oldThemeValues[38] = g_settings.infobar_Text_green;
oldThemeValues[39] = g_settings.infobar_Text_blue;
oldThemeValues[40] = g_settings.colored_events_alpha;
oldThemeValues[41] = g_settings.colored_events_red;
oldThemeValues[42] = g_settings.colored_events_green;
oldThemeValues[43] = g_settings.colored_events_blue;
oldThemeValues[44] = g_settings.clock_Digit_alpha;
oldThemeValues[45] = g_settings.clock_Digit_red;
oldThemeValues[46] = g_settings.clock_Digit_green;
oldThemeValues[47] = g_settings.clock_Digit_blue;
memcpy(&oldTheme, &g_settings.theme, sizeof(SNeutrinoTheme));
} else {
g_settings.menu_Head_alpha = oldThemeValues[0];
g_settings.menu_Head_red = oldThemeValues[1];
g_settings.menu_Head_green = oldThemeValues[2];
g_settings.menu_Head_blue = oldThemeValues[3];
g_settings.menu_Head_Text_alpha = oldThemeValues[4];
g_settings.menu_Head_Text_red = oldThemeValues[5];
g_settings.menu_Head_Text_green = oldThemeValues[6];
g_settings.menu_Head_Text_blue = oldThemeValues[7];
g_settings.menu_Content_alpha = oldThemeValues[8];
g_settings.menu_Content_red = oldThemeValues[9];
g_settings.menu_Content_green = oldThemeValues[10];
g_settings.menu_Content_blue = oldThemeValues[11];
g_settings.menu_Content_Text_alpha = oldThemeValues[12];
g_settings.menu_Content_Text_red = oldThemeValues[13];
g_settings.menu_Content_Text_green = oldThemeValues[14];
g_settings.menu_Content_Text_blue = oldThemeValues[15];
g_settings.menu_Content_Selected_alpha = oldThemeValues[16];
g_settings.menu_Content_Selected_red = oldThemeValues[17];
g_settings.menu_Content_Selected_green = oldThemeValues[18];
g_settings.menu_Content_Selected_blue = oldThemeValues[19];
g_settings.menu_Content_Selected_Text_alpha = oldThemeValues[20];
g_settings.menu_Content_Selected_Text_red = oldThemeValues[21];
g_settings.menu_Content_Selected_Text_green = oldThemeValues[22];
g_settings.menu_Content_Selected_Text_blue = oldThemeValues[23];
g_settings.menu_Content_inactive_alpha = oldThemeValues[24];
g_settings.menu_Content_inactive_red = oldThemeValues[25];
g_settings.menu_Content_inactive_green = oldThemeValues[26];
g_settings.menu_Content_inactive_blue = oldThemeValues[27];
g_settings.menu_Content_inactive_Text_alpha = oldThemeValues[28];
g_settings.menu_Content_inactive_Text_red = oldThemeValues[29];
g_settings.menu_Content_inactive_Text_green = oldThemeValues[30];
g_settings.menu_Content_inactive_Text_blue = oldThemeValues[31];
g_settings.infobar_alpha = oldThemeValues[32];
g_settings.infobar_red = oldThemeValues[33];
g_settings.infobar_green = oldThemeValues[34];
g_settings.infobar_blue = oldThemeValues[35];
g_settings.infobar_Text_alpha = oldThemeValues[36];
g_settings.infobar_Text_red = oldThemeValues[37];
g_settings.infobar_Text_green = oldThemeValues[38];
g_settings.infobar_Text_blue = oldThemeValues[39];
g_settings.colored_events_alpha = oldThemeValues[40];
g_settings.colored_events_red = oldThemeValues[41];
g_settings.colored_events_green = oldThemeValues[42];
g_settings.colored_events_blue = oldThemeValues[43];
g_settings.clock_Digit_alpha = oldThemeValues[44];
g_settings.clock_Digit_red = oldThemeValues[45];
g_settings.clock_Digit_green = oldThemeValues[46];
g_settings.clock_Digit_blue = oldThemeValues[47];
memcpy(&g_settings.theme, &oldTheme, sizeof(SNeutrinoTheme));
notifier = new CColorSetupNotifier;
notifier->changeNotify(NONEXISTANT_LOCALE, NULL);
@@ -297,54 +203,54 @@ void CThemes::readFile(char* themename)
{
if(themefile.loadConfig(themename))
{
g_settings.menu_Head_alpha = themefile.getInt32( "menu_Head_alpha", 0x00 );
g_settings.menu_Head_red = themefile.getInt32( "menu_Head_red", 0x00 );
g_settings.menu_Head_green = themefile.getInt32( "menu_Head_green", 0x0A );
g_settings.menu_Head_blue = themefile.getInt32( "menu_Head_blue", 0x19 );
g_settings.menu_Head_Text_alpha = themefile.getInt32( "menu_Head_Text_alpha", 0x00 );
g_settings.menu_Head_Text_red = themefile.getInt32( "menu_Head_Text_red", 0x5f );
g_settings.menu_Head_Text_green = themefile.getInt32( "menu_Head_Text_green", 0x46 );
g_settings.menu_Head_Text_blue = themefile.getInt32( "menu_Head_Text_blue", 0x00 );
g_settings.menu_Content_alpha = themefile.getInt32( "menu_Content_alpha", 0x14 );
g_settings.menu_Content_red = themefile.getInt32( "menu_Content_red", 0x00 );
g_settings.menu_Content_green = themefile.getInt32( "menu_Content_green", 0x0f );
g_settings.menu_Content_blue = themefile.getInt32( "menu_Content_blue", 0x23 );
g_settings.menu_Content_Text_alpha = themefile.getInt32( "menu_Content_Text_alpha", 0x00 );
g_settings.menu_Content_Text_red = themefile.getInt32( "menu_Content_Text_red", 0x64 );
g_settings.menu_Content_Text_green = themefile.getInt32( "menu_Content_Text_green", 0x64 );
g_settings.menu_Content_Text_blue = themefile.getInt32( "menu_Content_Text_blue", 0x64 );
g_settings.menu_Content_Selected_alpha = themefile.getInt32( "menu_Content_Selected_alpha", 0x14 );
g_settings.menu_Content_Selected_red = themefile.getInt32( "menu_Content_Selected_red", 0x19 );
g_settings.menu_Content_Selected_green = themefile.getInt32( "menu_Content_Selected_green", 0x37 );
g_settings.menu_Content_Selected_blue = themefile.getInt32( "menu_Content_Selected_blue", 0x64 );
g_settings.menu_Content_Selected_Text_alpha = themefile.getInt32( "menu_Content_Selected_Text_alpha", 0x00 );
g_settings.menu_Content_Selected_Text_red = themefile.getInt32( "menu_Content_Selected_Text_red", 0x00 );
g_settings.menu_Content_Selected_Text_green = themefile.getInt32( "menu_Content_Selected_Text_green", 0x00 );
g_settings.menu_Content_Selected_Text_blue = themefile.getInt32( "menu_Content_Selected_Text_blue", 0x00 );
g_settings.menu_Content_inactive_alpha = themefile.getInt32( "menu_Content_inactive_alpha", 0x14 );
g_settings.menu_Content_inactive_red = themefile.getInt32( "menu_Content_inactive_red", 0x00 );
g_settings.menu_Content_inactive_green = themefile.getInt32( "menu_Content_inactive_green", 0x0f );
g_settings.menu_Content_inactive_blue = themefile.getInt32( "menu_Content_inactive_blue", 0x23 );
g_settings.menu_Content_inactive_Text_alpha = themefile.getInt32( "menu_Content_inactive_Text_alpha", 0x00 );
g_settings.menu_Content_inactive_Text_red = themefile.getInt32( "menu_Content_inactive_Text_red", 55 );
g_settings.menu_Content_inactive_Text_green = themefile.getInt32( "menu_Content_inactive_Text_green", 70 );
g_settings.menu_Content_inactive_Text_blue = themefile.getInt32( "menu_Content_inactive_Text_blue", 85 );
g_settings.infobar_alpha = themefile.getInt32( "infobar_alpha", 0x14 );
g_settings.infobar_red = themefile.getInt32( "infobar_red", 0x00 );
g_settings.infobar_green = themefile.getInt32( "infobar_green", 0x0e );
g_settings.infobar_blue = themefile.getInt32( "infobar_blue", 0x23 );
g_settings.infobar_Text_alpha = themefile.getInt32( "infobar_Text_alpha", 0x00 );
g_settings.infobar_Text_red = themefile.getInt32( "infobar_Text_red", 0x64 );
g_settings.infobar_Text_green = themefile.getInt32( "infobar_Text_green", 0x64 );
g_settings.infobar_Text_blue = themefile.getInt32( "infobar_Text_blue", 0x64 );
g_settings.colored_events_alpha = themefile.getInt32( "colored_events_alpha", 0x00 );
g_settings.colored_events_red = themefile.getInt32( "colored_events_red", 95 );
g_settings.colored_events_green = themefile.getInt32( "colored_events_green", 70 );
g_settings.colored_events_blue = themefile.getInt32( "colored_events_blue", 0 );
g_settings.clock_Digit_alpha = themefile.getInt32( "clock_Digit_alpha", g_settings.menu_Content_Text_alpha );
g_settings.clock_Digit_red = themefile.getInt32( "clock_Digit_red", g_settings.menu_Content_Text_red );
g_settings.clock_Digit_green = themefile.getInt32( "clock_Digit_green", g_settings.menu_Content_Text_green );
g_settings.clock_Digit_blue = themefile.getInt32( "clock_Digit_blue", g_settings.menu_Content_Text_blue );
g_settings.theme.menu_Head_alpha = themefile.getInt32( "menu_Head_alpha", 0x00 );
g_settings.theme.menu_Head_red = themefile.getInt32( "menu_Head_red", 0x00 );
g_settings.theme.menu_Head_green = themefile.getInt32( "menu_Head_green", 0x0A );
g_settings.theme.menu_Head_blue = themefile.getInt32( "menu_Head_blue", 0x19 );
g_settings.theme.menu_Head_Text_alpha = themefile.getInt32( "menu_Head_Text_alpha", 0x00 );
g_settings.theme.menu_Head_Text_red = themefile.getInt32( "menu_Head_Text_red", 0x5f );
g_settings.theme.menu_Head_Text_green = themefile.getInt32( "menu_Head_Text_green", 0x46 );
g_settings.theme.menu_Head_Text_blue = themefile.getInt32( "menu_Head_Text_blue", 0x00 );
g_settings.theme.menu_Content_alpha = themefile.getInt32( "menu_Content_alpha", 0x14 );
g_settings.theme.menu_Content_red = themefile.getInt32( "menu_Content_red", 0x00 );
g_settings.theme.menu_Content_green = themefile.getInt32( "menu_Content_green", 0x0f );
g_settings.theme.menu_Content_blue = themefile.getInt32( "menu_Content_blue", 0x23 );
g_settings.theme.menu_Content_Text_alpha = themefile.getInt32( "menu_Content_Text_alpha", 0x00 );
g_settings.theme.menu_Content_Text_red = themefile.getInt32( "menu_Content_Text_red", 0x64 );
g_settings.theme.menu_Content_Text_green = themefile.getInt32( "menu_Content_Text_green", 0x64 );
g_settings.theme.menu_Content_Text_blue = themefile.getInt32( "menu_Content_Text_blue", 0x64 );
g_settings.theme.menu_Content_Selected_alpha = themefile.getInt32( "menu_Content_Selected_alpha", 0x14 );
g_settings.theme.menu_Content_Selected_red = themefile.getInt32( "menu_Content_Selected_red", 0x19 );
g_settings.theme.menu_Content_Selected_green = themefile.getInt32( "menu_Content_Selected_green", 0x37 );
g_settings.theme.menu_Content_Selected_blue = themefile.getInt32( "menu_Content_Selected_blue", 0x64 );
g_settings.theme.menu_Content_Selected_Text_alpha = themefile.getInt32( "menu_Content_Selected_Text_alpha", 0x00 );
g_settings.theme.menu_Content_Selected_Text_red = themefile.getInt32( "menu_Content_Selected_Text_red", 0x00 );
g_settings.theme.menu_Content_Selected_Text_green = themefile.getInt32( "menu_Content_Selected_Text_green", 0x00 );
g_settings.theme.menu_Content_Selected_Text_blue = themefile.getInt32( "menu_Content_Selected_Text_blue", 0x00 );
g_settings.theme.menu_Content_inactive_alpha = themefile.getInt32( "menu_Content_inactive_alpha", 0x14 );
g_settings.theme.menu_Content_inactive_red = themefile.getInt32( "menu_Content_inactive_red", 0x00 );
g_settings.theme.menu_Content_inactive_green = themefile.getInt32( "menu_Content_inactive_green", 0x0f );
g_settings.theme.menu_Content_inactive_blue = themefile.getInt32( "menu_Content_inactive_blue", 0x23 );
g_settings.theme.menu_Content_inactive_Text_alpha = themefile.getInt32( "menu_Content_inactive_Text_alpha", 0x00 );
g_settings.theme.menu_Content_inactive_Text_red = themefile.getInt32( "menu_Content_inactive_Text_red", 55 );
g_settings.theme.menu_Content_inactive_Text_green = themefile.getInt32( "menu_Content_inactive_Text_green", 70 );
g_settings.theme.menu_Content_inactive_Text_blue = themefile.getInt32( "menu_Content_inactive_Text_blue", 85 );
g_settings.theme.infobar_alpha = themefile.getInt32( "infobar_alpha", 0x14 );
g_settings.theme.infobar_red = themefile.getInt32( "infobar_red", 0x00 );
g_settings.theme.infobar_green = themefile.getInt32( "infobar_green", 0x0e );
g_settings.theme.infobar_blue = themefile.getInt32( "infobar_blue", 0x23 );
g_settings.theme.infobar_Text_alpha = themefile.getInt32( "infobar_Text_alpha", 0x00 );
g_settings.theme.infobar_Text_red = themefile.getInt32( "infobar_Text_red", 0x64 );
g_settings.theme.infobar_Text_green = themefile.getInt32( "infobar_Text_green", 0x64 );
g_settings.theme.infobar_Text_blue = themefile.getInt32( "infobar_Text_blue", 0x64 );
g_settings.theme.colored_events_alpha = themefile.getInt32( "colored_events_alpha", 0x00 );
g_settings.theme.colored_events_red = themefile.getInt32( "colored_events_red", 95 );
g_settings.theme.colored_events_green = themefile.getInt32( "colored_events_green", 70 );
g_settings.theme.colored_events_blue = themefile.getInt32( "colored_events_blue", 0 );
g_settings.theme.clock_Digit_alpha = themefile.getInt32( "clock_Digit_alpha", g_settings.theme.menu_Content_Text_alpha );
g_settings.theme.clock_Digit_red = themefile.getInt32( "clock_Digit_red", g_settings.theme.menu_Content_Text_red );
g_settings.theme.clock_Digit_green = themefile.getInt32( "clock_Digit_green", g_settings.theme.menu_Content_Text_green );
g_settings.theme.clock_Digit_blue = themefile.getInt32( "clock_Digit_blue", g_settings.theme.menu_Content_Text_blue );
notifier = new CColorSetupNotifier;
notifier->changeNotify(NONEXISTANT_LOCALE, NULL);
@@ -357,54 +263,54 @@ void CThemes::readFile(char* themename)
void CThemes::saveFile(char * themename)
{
themefile.setInt32( "menu_Head_alpha", g_settings.menu_Head_alpha );
themefile.setInt32( "menu_Head_red", g_settings.menu_Head_red );
themefile.setInt32( "menu_Head_green", g_settings.menu_Head_green );
themefile.setInt32( "menu_Head_blue", g_settings.menu_Head_blue );
themefile.setInt32( "menu_Head_Text_alpha", g_settings.menu_Head_Text_alpha );
themefile.setInt32( "menu_Head_Text_red", g_settings.menu_Head_Text_red );
themefile.setInt32( "menu_Head_Text_green", g_settings.menu_Head_Text_green );
themefile.setInt32( "menu_Head_Text_blue", g_settings.menu_Head_Text_blue );
themefile.setInt32( "menu_Content_alpha", g_settings.menu_Content_alpha );
themefile.setInt32( "menu_Content_red", g_settings.menu_Content_red );
themefile.setInt32( "menu_Content_green", g_settings.menu_Content_green );
themefile.setInt32( "menu_Content_blue", g_settings.menu_Content_blue );
themefile.setInt32( "menu_Content_Text_alpha", g_settings.menu_Content_Text_alpha );
themefile.setInt32( "menu_Content_Text_red", g_settings.menu_Content_Text_red );
themefile.setInt32( "menu_Content_Text_green", g_settings.menu_Content_Text_green );
themefile.setInt32( "menu_Content_Text_blue", g_settings.menu_Content_Text_blue );
themefile.setInt32( "menu_Content_Selected_alpha", g_settings.menu_Content_Selected_alpha );
themefile.setInt32( "menu_Content_Selected_red", g_settings.menu_Content_Selected_red );
themefile.setInt32( "menu_Content_Selected_green", g_settings.menu_Content_Selected_green );
themefile.setInt32( "menu_Content_Selected_blue", g_settings.menu_Content_Selected_blue );
themefile.setInt32( "menu_Content_Selected_Text_alpha", g_settings.menu_Content_Selected_Text_alpha );
themefile.setInt32( "menu_Content_Selected_Text_red", g_settings.menu_Content_Selected_Text_red );
themefile.setInt32( "menu_Content_Selected_Text_green", g_settings.menu_Content_Selected_Text_green );
themefile.setInt32( "menu_Content_Selected_Text_blue", g_settings.menu_Content_Selected_Text_blue );
themefile.setInt32( "menu_Content_inactive_alpha", g_settings.menu_Content_inactive_alpha );
themefile.setInt32( "menu_Content_inactive_red", g_settings.menu_Content_inactive_red );
themefile.setInt32( "menu_Content_inactive_green", g_settings.menu_Content_inactive_green );
themefile.setInt32( "menu_Content_inactive_blue", g_settings.menu_Content_inactive_blue );
themefile.setInt32( "menu_Content_inactive_Text_alpha", g_settings.menu_Content_inactive_Text_alpha );
themefile.setInt32( "menu_Content_inactive_Text_red", g_settings.menu_Content_inactive_Text_red );
themefile.setInt32( "menu_Content_inactive_Text_green", g_settings.menu_Content_inactive_Text_green );
themefile.setInt32( "menu_Content_inactive_Text_blue", g_settings.menu_Content_inactive_Text_blue );
themefile.setInt32( "infobar_alpha", g_settings.infobar_alpha );
themefile.setInt32( "infobar_red", g_settings.infobar_red );
themefile.setInt32( "infobar_green", g_settings.infobar_green );
themefile.setInt32( "infobar_blue", g_settings.infobar_blue );
themefile.setInt32( "infobar_Text_alpha", g_settings.infobar_Text_alpha );
themefile.setInt32( "infobar_Text_red", g_settings.infobar_Text_red );
themefile.setInt32( "infobar_Text_green", g_settings.infobar_Text_green );
themefile.setInt32( "infobar_Text_blue", g_settings.infobar_Text_blue );
themefile.setInt32( "colored_events_alpha", g_settings.colored_events_alpha );
themefile.setInt32( "colored_events_red", g_settings.colored_events_red );
themefile.setInt32( "colored_events_green", g_settings.colored_events_green );
themefile.setInt32( "colored_events_blue", g_settings.colored_events_blue );
themefile.setInt32( "clock_Digit_alpha", g_settings.clock_Digit_alpha );
themefile.setInt32( "clock_Digit_red", g_settings.clock_Digit_red );
themefile.setInt32( "clock_Digit_green", g_settings.clock_Digit_green );
themefile.setInt32( "clock_Digit_blue", g_settings.clock_Digit_blue );
themefile.setInt32( "menu_Head_alpha", g_settings.theme.menu_Head_alpha );
themefile.setInt32( "menu_Head_red", g_settings.theme.menu_Head_red );
themefile.setInt32( "menu_Head_green", g_settings.theme.menu_Head_green );
themefile.setInt32( "menu_Head_blue", g_settings.theme.menu_Head_blue );
themefile.setInt32( "menu_Head_Text_alpha", g_settings.theme.menu_Head_Text_alpha );
themefile.setInt32( "menu_Head_Text_red", g_settings.theme.menu_Head_Text_red );
themefile.setInt32( "menu_Head_Text_green", g_settings.theme.menu_Head_Text_green );
themefile.setInt32( "menu_Head_Text_blue", g_settings.theme.menu_Head_Text_blue );
themefile.setInt32( "menu_Content_alpha", g_settings.theme.menu_Content_alpha );
themefile.setInt32( "menu_Content_red", g_settings.theme.menu_Content_red );
themefile.setInt32( "menu_Content_green", g_settings.theme.menu_Content_green );
themefile.setInt32( "menu_Content_blue", g_settings.theme.menu_Content_blue );
themefile.setInt32( "menu_Content_Text_alpha", g_settings.theme.menu_Content_Text_alpha );
themefile.setInt32( "menu_Content_Text_red", g_settings.theme.menu_Content_Text_red );
themefile.setInt32( "menu_Content_Text_green", g_settings.theme.menu_Content_Text_green );
themefile.setInt32( "menu_Content_Text_blue", g_settings.theme.menu_Content_Text_blue );
themefile.setInt32( "menu_Content_Selected_alpha", g_settings.theme.menu_Content_Selected_alpha );
themefile.setInt32( "menu_Content_Selected_red", g_settings.theme.menu_Content_Selected_red );
themefile.setInt32( "menu_Content_Selected_green", g_settings.theme.menu_Content_Selected_green );
themefile.setInt32( "menu_Content_Selected_blue", g_settings.theme.menu_Content_Selected_blue );
themefile.setInt32( "menu_Content_Selected_Text_alpha", g_settings.theme.menu_Content_Selected_Text_alpha );
themefile.setInt32( "menu_Content_Selected_Text_red", g_settings.theme.menu_Content_Selected_Text_red );
themefile.setInt32( "menu_Content_Selected_Text_green", g_settings.theme.menu_Content_Selected_Text_green );
themefile.setInt32( "menu_Content_Selected_Text_blue", g_settings.theme.menu_Content_Selected_Text_blue );
themefile.setInt32( "menu_Content_inactive_alpha", g_settings.theme.menu_Content_inactive_alpha );
themefile.setInt32( "menu_Content_inactive_red", g_settings.theme.menu_Content_inactive_red );
themefile.setInt32( "menu_Content_inactive_green", g_settings.theme.menu_Content_inactive_green );
themefile.setInt32( "menu_Content_inactive_blue", g_settings.theme.menu_Content_inactive_blue );
themefile.setInt32( "menu_Content_inactive_Text_alpha", g_settings.theme.menu_Content_inactive_Text_alpha );
themefile.setInt32( "menu_Content_inactive_Text_red", g_settings.theme.menu_Content_inactive_Text_red );
themefile.setInt32( "menu_Content_inactive_Text_green", g_settings.theme.menu_Content_inactive_Text_green );
themefile.setInt32( "menu_Content_inactive_Text_blue", g_settings.theme.menu_Content_inactive_Text_blue );
themefile.setInt32( "infobar_alpha", g_settings.theme.infobar_alpha );
themefile.setInt32( "infobar_red", g_settings.theme.infobar_red );
themefile.setInt32( "infobar_green", g_settings.theme.infobar_green );
themefile.setInt32( "infobar_blue", g_settings.theme.infobar_blue );
themefile.setInt32( "infobar_Text_alpha", g_settings.theme.infobar_Text_alpha );
themefile.setInt32( "infobar_Text_red", g_settings.theme.infobar_Text_red );
themefile.setInt32( "infobar_Text_green", g_settings.theme.infobar_Text_green );
themefile.setInt32( "infobar_Text_blue", g_settings.theme.infobar_Text_blue );
themefile.setInt32( "colored_events_alpha", g_settings.theme.colored_events_alpha );
themefile.setInt32( "colored_events_red", g_settings.theme.colored_events_red );
themefile.setInt32( "colored_events_green", g_settings.theme.colored_events_green );
themefile.setInt32( "colored_events_blue", g_settings.theme.colored_events_blue );
themefile.setInt32( "clock_Digit_alpha", g_settings.theme.clock_Digit_alpha );
themefile.setInt32( "clock_Digit_red", g_settings.theme.clock_Digit_red );
themefile.setInt32( "clock_Digit_green", g_settings.theme.clock_Digit_green );
themefile.setInt32( "clock_Digit_blue", g_settings.theme.clock_Digit_blue );
if (!themefile.saveConfig(themename))
printf("[neutrino theme] %s write error\n", themename);
@@ -415,63 +321,65 @@ void CThemes::saveFile(char * themename)
// setup default Colors
void CThemes::setupDefaultColors()
{
g_settings.menu_Head_alpha = 0x00;
g_settings.menu_Head_red = 0x00;
g_settings.menu_Head_green = 0x0A;
g_settings.menu_Head_blue = 0x19;
SNeutrinoTheme &t = g_settings.theme;
g_settings.menu_Head_Text_alpha = 0x00;
g_settings.menu_Head_Text_red = 0x5f;
g_settings.menu_Head_Text_green = 0x46;
g_settings.menu_Head_Text_blue = 0x00;
t.menu_Head_alpha = 0x00;
t.menu_Head_red = 0x00;
t.menu_Head_green = 0x0A;
t.menu_Head_blue = 0x19;
g_settings.menu_Content_alpha = 0x14;
g_settings.menu_Content_red = 0x00;
g_settings.menu_Content_green = 0x0f;
g_settings.menu_Content_blue = 0x23;
t.menu_Head_Text_alpha = 0x00;
t.menu_Head_Text_red = 0x5f;
t.menu_Head_Text_green = 0x46;
t.menu_Head_Text_blue = 0x00;
g_settings.menu_Content_Text_alpha = 0x00;
g_settings.menu_Content_Text_red = 0x64;
g_settings.menu_Content_Text_green = 0x64;
g_settings.menu_Content_Text_blue = 0x64;
t.menu_Content_alpha = 0x14;
t.menu_Content_red = 0x00;
t.menu_Content_green = 0x0f;
t.menu_Content_blue = 0x23;
g_settings.menu_Content_Selected_alpha = 0x14;
g_settings.menu_Content_Selected_red = 0x19;
g_settings.menu_Content_Selected_green = 0x37;
g_settings.menu_Content_Selected_blue = 0x64;
t.menu_Content_Text_alpha = 0x00;
t.menu_Content_Text_red = 0x64;
t.menu_Content_Text_green = 0x64;
t.menu_Content_Text_blue = 0x64;
g_settings.menu_Content_Selected_Text_alpha = 0x00;
g_settings.menu_Content_Selected_Text_red = 0x00;
g_settings.menu_Content_Selected_Text_green = 0x00;
g_settings.menu_Content_Selected_Text_blue = 0x00;
t.menu_Content_Selected_alpha = 0x14;
t.menu_Content_Selected_red = 0x19;
t.menu_Content_Selected_green = 0x37;
t.menu_Content_Selected_blue = 0x64;
g_settings.menu_Content_inactive_alpha = 0x14;
g_settings.menu_Content_inactive_red = 0x00;
g_settings.menu_Content_inactive_green = 0x0f;
g_settings.menu_Content_inactive_blue = 0x23;
t.menu_Content_Selected_Text_alpha = 0x00;
t.menu_Content_Selected_Text_red = 0x00;
t.menu_Content_Selected_Text_green = 0x00;
t.menu_Content_Selected_Text_blue = 0x00;
g_settings.menu_Content_inactive_Text_alpha = 0x00;
g_settings.menu_Content_inactive_Text_red = 55;
g_settings.menu_Content_inactive_Text_green = 70;
g_settings.menu_Content_inactive_Text_blue = 85;
t.menu_Content_inactive_alpha = 0x14;
t.menu_Content_inactive_red = 0x00;
t.menu_Content_inactive_green = 0x0f;
t.menu_Content_inactive_blue = 0x23;
g_settings.infobar_alpha = 0x14;
g_settings.infobar_red = 0x00;
g_settings.infobar_green = 0x0e;
g_settings.infobar_blue = 0x23;
t.menu_Content_inactive_Text_alpha = 0x00;
t.menu_Content_inactive_Text_red = 55;
t.menu_Content_inactive_Text_green = 70;
t.menu_Content_inactive_Text_blue = 85;
g_settings.infobar_Text_alpha = 0x00;
g_settings.infobar_Text_red = 0x64;
g_settings.infobar_Text_green = 0x64;
g_settings.infobar_Text_blue = 0x64;
t.infobar_alpha = 0x14;
t.infobar_red = 0x00;
t.infobar_green = 0x0e;
t.infobar_blue = 0x23;
g_settings.colored_events_alpha = 0x00;
g_settings.colored_events_red = 95;
g_settings.colored_events_green = 70;
g_settings.colored_events_blue = 0;
t.infobar_Text_alpha = 0x00;
t.infobar_Text_red = 0x64;
t.infobar_Text_green = 0x64;
t.infobar_Text_blue = 0x64;
g_settings.clock_Digit_alpha = 0x00;
g_settings.clock_Digit_red = 0x64;
g_settings.clock_Digit_green = 0x64;
g_settings.clock_Digit_blue = 0x64;
t.colored_events_alpha = 0x00;
t.colored_events_red = 95;
t.colored_events_green = 70;
t.colored_events_blue = 0;
t.clock_Digit_alpha = 0x00;
t.clock_Digit_red = 0x64;
t.clock_Digit_green = 0x64;
t.clock_Digit_blue = 0x64;
}