diff --git a/src/driver/pictureviewer/pictureviewer.cpp b/src/driver/pictureviewer/pictureviewer.cpp index 74badde23..c93b6e281 100644 --- a/src/driver/pictureviewer/pictureviewer.cpp +++ b/src/driver/pictureviewer/pictureviewer.cpp @@ -669,7 +669,7 @@ fb_pixel_t * CPictureViewer::int_getImage(const std::string & name, int *width, if (bpp == 4) ret = (fb_pixel_t *) CFrameBuffer::getInstance()->convertRGBA2FB(buffer, x, y); else - ret = (fb_pixel_t *) CFrameBuffer::getInstance()->convertRGB2FB(buffer, x, y, convertSetupAlpha2Alpha(g_settings.infobar_alpha)); + ret = (fb_pixel_t *) CFrameBuffer::getInstance()->convertRGB2FB(buffer, x, y, convertSetupAlpha2Alpha(g_settings.theme.infobar_alpha)); *width = x; *height = y; }else diff --git a/src/gui/bouquetlist.cpp b/src/gui/bouquetlist.cpp index 16230337e..4ea60c328 100644 --- a/src/gui/bouquetlist.cpp +++ b/src/gui/bouquetlist.cpp @@ -397,7 +397,7 @@ int CBouquetList::show(bool bShowChannelList) while ((i= i/10)!=0) lmaxpos++; - COSDFader fader(g_settings.menu_Content_alpha); + COSDFader fader(g_settings.theme.menu_Content_alpha); fader.StartFadeIn(); paintHead(); diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index 392ebf206..0c5687612 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -654,7 +654,7 @@ int CChannelList::show() calcSize(); displayNext = false; - COSDFader fader(g_settings.menu_Content_alpha); + COSDFader fader(g_settings.theme.menu_Content_alpha); fader.StartFadeIn(); paintHead(); diff --git a/src/gui/components/cc_base.cpp b/src/gui/components/cc_base.cpp index 423b4a3fc..94810c992 100644 --- a/src/gui/components/cc_base.cpp +++ b/src/gui/components/cc_base.cpp @@ -35,7 +35,7 @@ using namespace std; //abstract basic class CComponents -CComponents::CComponents() : COSDFader(g_settings.menu_Content_alpha) +CComponents::CComponents() : COSDFader(g_settings.theme.menu_Content_alpha) { x = saved_screen.x = 0; y = saved_screen.y = 0; diff --git a/src/gui/dboxinfo.cpp b/src/gui/dboxinfo.cpp index cc3887ac0..2154686c3 100644 --- a/src/gui/dboxinfo.cpp +++ b/src/gui/dboxinfo.cpp @@ -88,7 +88,7 @@ int CDBoxInfoWidget::exec(CMenuTarget* parent, const std::string &) { parent->hide(); } - COSDFader fader(g_settings.menu_Content_alpha); + COSDFader fader(g_settings.theme.menu_Content_alpha); fader.StartFadeIn(); paint(); diff --git a/src/gui/epgplus.cpp b/src/gui/epgplus.cpp index 349946b63..c03fcf67e 100644 --- a/src/gui/epgplus.cpp +++ b/src/gui/epgplus.cpp @@ -775,7 +775,7 @@ int EpgPlus::exec (CChannelList * pchannelList, int selectedChannelIndex, CBouqu int res = menu_return::RETURN_REPAINT; - COSDFader fader(g_settings.menu_Content_alpha); + COSDFader fader(g_settings.theme.menu_Content_alpha); do { this->refreshFooterButtons = false; time_t currentTime = time (NULL); diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp index 090ad9ee2..76dc1ce00 100644 --- a/src/gui/epgview.cpp +++ b/src/gui/epgview.cpp @@ -620,7 +620,8 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start has_follow_screenings = true; } - COSDFader fader(g_settings.menu_Content_alpha); + + COSDFader fader(g_settings.theme.menu_Content_alpha); fader.StartFadeIn(); //show the epg diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp index be10e90a0..516a88f7e 100644 --- a/src/gui/eventlist.cpp +++ b/src/gui/eventlist.cpp @@ -303,7 +303,7 @@ int CNeutrinoEventList::exec(const t_channel_id channel_id, const std::string& c sort_mode=0; - COSDFader fader(g_settings.menu_Content_alpha); + COSDFader fader(g_settings.theme.menu_Content_alpha); fader.StartFadeIn(); if(!followlist.empty()){ insert_iterator >ii(evtlist,evtlist.begin()); diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index f70c94412..ef8fc4198 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -88,7 +88,7 @@ static bool sortByDateTime (const CChannelEvent& a, const CChannelEvent& b) extern bool timeset; CInfoViewer::CInfoViewer () - : fader(g_settings.infobar_alpha) + : fader(g_settings.theme.infobar_alpha) { sigscale = NULL; snrscale = NULL; diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index f8d99fdce..eafbae879 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -633,21 +633,23 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors) mf->setHint("", LOCALE_MENU_HINT_THEME); menu_colors->addItem(mf); - CColorChooser* chHeadcolor = new CColorChooser(LOCALE_COLORMENU_BACKGROUND, &g_settings.menu_Head_red, &g_settings.menu_Head_green, &g_settings.menu_Head_blue, - &g_settings.menu_Head_alpha, colorSetupNotifier); - CColorChooser* chHeadTextcolor = new CColorChooser(LOCALE_COLORMENU_TEXTCOLOR, &g_settings.menu_Head_Text_red, &g_settings.menu_Head_Text_green, &g_settings.menu_Head_Text_blue, + SNeutrinoTheme &t = g_settings.theme; + + CColorChooser* chHeadcolor = new CColorChooser(LOCALE_COLORMENU_BACKGROUND, &t.menu_Head_red, &t.menu_Head_green, &t.menu_Head_blue, + &t.menu_Head_alpha, colorSetupNotifier); + CColorChooser* chHeadTextcolor = new CColorChooser(LOCALE_COLORMENU_TEXTCOLOR, &t.menu_Head_Text_red, &t.menu_Head_Text_green, &t.menu_Head_Text_blue, NULL, colorSetupNotifier); - CColorChooser* chContentcolor = new CColorChooser(LOCALE_COLORMENU_BACKGROUND, &g_settings.menu_Content_red, &g_settings.menu_Content_green, &g_settings.menu_Content_blue, - &g_settings.menu_Content_alpha, colorSetupNotifier); - CColorChooser* chContentTextcolor = new CColorChooser(LOCALE_COLORMENU_TEXTCOLOR, &g_settings.menu_Content_Text_red, &g_settings.menu_Content_Text_green, &g_settings.menu_Content_Text_blue, + CColorChooser* chContentcolor = new CColorChooser(LOCALE_COLORMENU_BACKGROUND, &t.menu_Content_red, &t.menu_Content_green, &t.menu_Content_blue, + &t.menu_Content_alpha, colorSetupNotifier); + CColorChooser* chContentTextcolor = new CColorChooser(LOCALE_COLORMENU_TEXTCOLOR, &t.menu_Content_Text_red, &t.menu_Content_Text_green, &t.menu_Content_Text_blue, NULL, colorSetupNotifier); - CColorChooser* chContentSelectedcolor = new CColorChooser(LOCALE_COLORMENU_BACKGROUND, &g_settings.menu_Content_Selected_red, &g_settings.menu_Content_Selected_green, &g_settings.menu_Content_Selected_blue, - &g_settings.menu_Content_Selected_alpha, colorSetupNotifier); - CColorChooser* chContentSelectedTextcolor = new CColorChooser(LOCALE_COLORMENU_TEXTCOLOR, &g_settings.menu_Content_Selected_Text_red, &g_settings.menu_Content_Selected_Text_green, &g_settings.menu_Content_Selected_Text_blue, + CColorChooser* chContentSelectedcolor = new CColorChooser(LOCALE_COLORMENU_BACKGROUND, &t.menu_Content_Selected_red, &t.menu_Content_Selected_green, &t.menu_Content_Selected_blue, + &t.menu_Content_Selected_alpha, colorSetupNotifier); + CColorChooser* chContentSelectedTextcolor = new CColorChooser(LOCALE_COLORMENU_TEXTCOLOR, &t.menu_Content_Selected_Text_red, &t.menu_Content_Selected_Text_green, &t.menu_Content_Selected_Text_blue, NULL, colorSetupNotifier); - CColorChooser* chContentInactivecolor = new CColorChooser(LOCALE_COLORMENU_BACKGROUND, &g_settings.menu_Content_inactive_red, &g_settings.menu_Content_inactive_green, &g_settings.menu_Content_inactive_blue, - &g_settings.menu_Content_inactive_alpha, colorSetupNotifier); - CColorChooser* chContentInactiveTextcolor = new CColorChooser(LOCALE_COLORMENU_TEXTCOLOR, &g_settings.menu_Content_inactive_Text_red, &g_settings.menu_Content_inactive_Text_green, &g_settings.menu_Content_inactive_Text_blue, + CColorChooser* chContentInactivecolor = new CColorChooser(LOCALE_COLORMENU_BACKGROUND, &t.menu_Content_inactive_red, &t.menu_Content_inactive_green, &t.menu_Content_inactive_blue, + &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); menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_COLORMENUSETUP_MENUHEAD)); @@ -687,10 +689,10 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors) mf->setHint("", LOCALE_MENU_HINT_SELECTED_TEXT); menu_colors->addItem(mf); - CColorChooser* chInfobarcolor = new CColorChooser(LOCALE_COLORMENU_BACKGROUND, &g_settings.infobar_red, - &g_settings.infobar_green, &g_settings.infobar_blue, &g_settings.infobar_alpha, colorSetupNotifier); - CColorChooser* chInfobarTextcolor = new CColorChooser(LOCALE_COLORMENU_TEXTCOLOR, &g_settings.infobar_Text_red, - &g_settings.infobar_Text_green, &g_settings.infobar_Text_blue, NULL, colorSetupNotifier); + CColorChooser* chInfobarcolor = new CColorChooser(LOCALE_COLORMENU_BACKGROUND, &t.infobar_red, + &t.infobar_green, &t.infobar_blue, &t.infobar_alpha, colorSetupNotifier); + CColorChooser* chInfobarTextcolor = new CColorChooser(LOCALE_COLORMENU_TEXTCOLOR, &t.infobar_Text_red, + &t.infobar_Text_green, &t.infobar_Text_blue, NULL, colorSetupNotifier); menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_COLORSTATUSBAR_TEXT)); mf = new CMenuDForwarder(LOCALE_COLORMENU_BACKGROUND, true, NULL, chInfobarcolor ); @@ -701,8 +703,8 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors) mf->setHint("", LOCALE_MENU_HINT_INFOBAR_TEXTCOLOR); menu_colors->addItem(mf); - CColorChooser* chColored_Events = new CColorChooser(LOCALE_COLORMENU_TEXTCOLOR, &g_settings.colored_events_red, - &g_settings.colored_events_green, &g_settings.colored_events_blue, NULL, colorSetupNotifier); + CColorChooser* chColored_Events = new CColorChooser(LOCALE_COLORMENU_TEXTCOLOR, &t.colored_events_red, + &t.colored_events_green, &t.colored_events_blue, NULL, colorSetupNotifier); menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_MISCSETTINGS_INFOBAR_COLORED_EVENTS)); mf = new CMenuDForwarder(LOCALE_COLORMENU_TEXTCOLOR, true, NULL, chColored_Events ); @@ -1083,7 +1085,7 @@ void COsdSetup::showOsdInfoclockSetup(CMenuWidget *menu_infoclock) menu_infoclock->addItem(mc); // digit color - CColorChooser* cc = new CColorChooser(LOCALE_COLORMENU_CLOCK_TEXTCOLOR, &g_settings.clock_Digit_red, &g_settings.clock_Digit_green, &g_settings.clock_Digit_blue, + CColorChooser* cc = new CColorChooser(LOCALE_COLORMENU_CLOCK_TEXTCOLOR, &g_settings.theme.clock_Digit_red, &g_settings.theme.clock_Digit_green, &g_settings.theme.clock_Digit_blue, NULL, colorSetupNotifier); CMenuDForwarder* mf = new CMenuDForwarder(LOCALE_COLORMENU_CLOCK_TEXTCOLOR, !g_settings.infoClockBackground, NULL, cc); mf->setHint("", LOCALE_MENU_HINT_CLOCK_TEXTCOLOR); diff --git a/src/gui/themes.cpp b/src/gui/themes.cpp index 9570284c5..fe394a418 100644 --- a/src/gui/themes.cpp +++ b/src/gui/themes.cpp @@ -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; } diff --git a/src/gui/themes.h b/src/gui/themes.h index 78f09cff0..6c1ce46bf 100644 --- a/src/gui/themes.h +++ b/src/gui/themes.h @@ -35,7 +35,7 @@ class CThemes : public CMenuTarget, CChangeObserver CColorSetupNotifier *notifier; int width; - int oldThemeValues[48]; + SNeutrinoTheme oldTheme; bool hasThemeChanged; diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp index 2af0aee57..98659d997 100644 --- a/src/gui/timerlist.cpp +++ b/src/gui/timerlist.cpp @@ -485,7 +485,7 @@ int CTimerList::show() bool loop=true; bool update=true; - COSDFader fader(g_settings.menu_Content_alpha); + COSDFader fader(g_settings.theme.menu_Content_alpha); fader.StartFadeIn(); while (loop) diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index 5a308d0ba..48b9db0f0 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -670,7 +670,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &) if (parent) parent->hide(); - COSDFader fader(g_settings.menu_Content_alpha); + COSDFader fader(g_settings.theme.menu_Content_alpha); if(fade) fader.StartFadeIn(); diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 04ced73d5..9d1e43f63 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -511,59 +511,59 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.widget_fade = configfile.getBool("widget_fade" , false ); //colors (neutrino defaultcolors) - g_settings.clock_Digit_alpha = configfile.getInt32( "clock_Digit_alpha", 0x00 ); - g_settings.clock_Digit_red = configfile.getInt32( "clock_Digit_red", 0x64 ); - g_settings.clock_Digit_green = configfile.getInt32( "clock_Digit_green", 0x64 ); - g_settings.clock_Digit_blue = configfile.getInt32( "clock_Digit_blue", 0x64 ); + g_settings.theme.clock_Digit_alpha = configfile.getInt32( "clock_Digit_alpha", 0x00 ); + g_settings.theme.clock_Digit_red = configfile.getInt32( "clock_Digit_red", 0x64 ); + g_settings.theme.clock_Digit_green = configfile.getInt32( "clock_Digit_green", 0x64 ); + g_settings.theme.clock_Digit_blue = configfile.getInt32( "clock_Digit_blue", 0x64 ); - g_settings.menu_Head_alpha = configfile.getInt32( "menu_Head_alpha", 0x00 ); - g_settings.menu_Head_red = configfile.getInt32( "menu_Head_red", 0x00 ); - g_settings.menu_Head_green = configfile.getInt32( "menu_Head_green", 0x0A ); - g_settings.menu_Head_blue = configfile.getInt32( "menu_Head_blue", 0x19 ); + g_settings.theme.menu_Head_alpha = configfile.getInt32( "menu_Head_alpha", 0x00 ); + g_settings.theme.menu_Head_red = configfile.getInt32( "menu_Head_red", 0x00 ); + g_settings.theme.menu_Head_green = configfile.getInt32( "menu_Head_green", 0x0A ); + g_settings.theme.menu_Head_blue = configfile.getInt32( "menu_Head_blue", 0x19 ); - g_settings.menu_Head_Text_alpha = configfile.getInt32( "menu_Head_Text_alpha", 0x00 ); - g_settings.menu_Head_Text_red = configfile.getInt32( "menu_Head_Text_red", 0x5f ); - g_settings.menu_Head_Text_green = configfile.getInt32( "menu_Head_Text_green", 0x46 ); - g_settings.menu_Head_Text_blue = configfile.getInt32( "menu_Head_Text_blue", 0x00 ); + g_settings.theme.menu_Head_Text_alpha = configfile.getInt32( "menu_Head_Text_alpha", 0x00 ); + g_settings.theme.menu_Head_Text_red = configfile.getInt32( "menu_Head_Text_red", 0x5f ); + g_settings.theme.menu_Head_Text_green = configfile.getInt32( "menu_Head_Text_green", 0x46 ); + g_settings.theme.menu_Head_Text_blue = configfile.getInt32( "menu_Head_Text_blue", 0x00 ); - g_settings.menu_Content_alpha = configfile.getInt32( "menu_Content_alpha", 0x14 ); - g_settings.menu_Content_red = configfile.getInt32( "menu_Content_red", 0x00 ); - g_settings.menu_Content_green = configfile.getInt32( "menu_Content_green", 0x0f ); - g_settings.menu_Content_blue = configfile.getInt32( "menu_Content_blue", 0x23 ); - g_settings.menu_Content_Text_alpha = configfile.getInt32( "menu_Content_Text_alpha", 0x00 ); - g_settings.menu_Content_Text_red = configfile.getInt32( "menu_Content_Text_red", 0x64 ); - g_settings.menu_Content_Text_green = configfile.getInt32( "menu_Content_Text_green", 0x64 ); - g_settings.menu_Content_Text_blue = configfile.getInt32( "menu_Content_Text_blue", 0x64 ); + g_settings.theme.menu_Content_alpha = configfile.getInt32( "menu_Content_alpha", 0x14 ); + g_settings.theme.menu_Content_red = configfile.getInt32( "menu_Content_red", 0x00 ); + g_settings.theme.menu_Content_green = configfile.getInt32( "menu_Content_green", 0x0f ); + g_settings.theme.menu_Content_blue = configfile.getInt32( "menu_Content_blue", 0x23 ); + g_settings.theme.menu_Content_Text_alpha = configfile.getInt32( "menu_Content_Text_alpha", 0x00 ); + g_settings.theme.menu_Content_Text_red = configfile.getInt32( "menu_Content_Text_red", 0x64 ); + g_settings.theme.menu_Content_Text_green = configfile.getInt32( "menu_Content_Text_green", 0x64 ); + g_settings.theme.menu_Content_Text_blue = configfile.getInt32( "menu_Content_Text_blue", 0x64 ); - g_settings.menu_Content_Selected_alpha = configfile.getInt32( "menu_Content_Selected_alpha", 0x14 ); - g_settings.menu_Content_Selected_red = configfile.getInt32( "menu_Content_Selected_red", 0x19 ); - g_settings.menu_Content_Selected_green = configfile.getInt32( "menu_Content_Selected_green", 0x37 ); - g_settings.menu_Content_Selected_blue = configfile.getInt32( "menu_Content_Selected_blue", 0x64 ); + g_settings.theme.menu_Content_Selected_alpha = configfile.getInt32( "menu_Content_Selected_alpha", 0x14 ); + g_settings.theme.menu_Content_Selected_red = configfile.getInt32( "menu_Content_Selected_red", 0x19 ); + g_settings.theme.menu_Content_Selected_green = configfile.getInt32( "menu_Content_Selected_green", 0x37 ); + g_settings.theme.menu_Content_Selected_blue = configfile.getInt32( "menu_Content_Selected_blue", 0x64 ); - g_settings.menu_Content_Selected_Text_alpha = configfile.getInt32( "menu_Content_Selected_Text_alpha", 0x00 ); - g_settings.menu_Content_Selected_Text_red = configfile.getInt32( "menu_Content_Selected_Text_red", 0x00 ); - g_settings.menu_Content_Selected_Text_green = configfile.getInt32( "menu_Content_Selected_Text_green", 0x00 ); - g_settings.menu_Content_Selected_Text_blue = configfile.getInt32( "menu_Content_Selected_Text_blue", 0x00 ); + g_settings.theme.menu_Content_Selected_Text_alpha = configfile.getInt32( "menu_Content_Selected_Text_alpha", 0x00 ); + g_settings.theme.menu_Content_Selected_Text_red = configfile.getInt32( "menu_Content_Selected_Text_red", 0x00 ); + g_settings.theme.menu_Content_Selected_Text_green = configfile.getInt32( "menu_Content_Selected_Text_green", 0x00 ); + g_settings.theme.menu_Content_Selected_Text_blue = configfile.getInt32( "menu_Content_Selected_Text_blue", 0x00 ); - g_settings.menu_Content_inactive_alpha = configfile.getInt32( "menu_Content_inactive_alpha", 0x14 ); - g_settings.menu_Content_inactive_red = configfile.getInt32( "menu_Content_inactive_red", 0x00 ); - g_settings.menu_Content_inactive_green = configfile.getInt32( "menu_Content_inactive_green", 0x0f ); - g_settings.menu_Content_inactive_blue = configfile.getInt32( "menu_Content_inactive_blue", 0x23 ); + g_settings.theme.menu_Content_inactive_alpha = configfile.getInt32( "menu_Content_inactive_alpha", 0x14 ); + g_settings.theme.menu_Content_inactive_red = configfile.getInt32( "menu_Content_inactive_red", 0x00 ); + g_settings.theme.menu_Content_inactive_green = configfile.getInt32( "menu_Content_inactive_green", 0x0f ); + g_settings.theme.menu_Content_inactive_blue = configfile.getInt32( "menu_Content_inactive_blue", 0x23 ); - g_settings.menu_Content_inactive_Text_alpha = configfile.getInt32( "menu_Content_inactive_Text_alpha", 0x00 ); - g_settings.menu_Content_inactive_Text_red = configfile.getInt32( "menu_Content_inactive_Text_red", 55 ); - g_settings.menu_Content_inactive_Text_green = configfile.getInt32( "menu_Content_inactive_Text_green", 70 ); - g_settings.menu_Content_inactive_Text_blue = configfile.getInt32( "menu_Content_inactive_Text_blue", 85 ); + g_settings.theme.menu_Content_inactive_Text_alpha = configfile.getInt32( "menu_Content_inactive_Text_alpha", 0x00 ); + g_settings.theme.menu_Content_inactive_Text_red = configfile.getInt32( "menu_Content_inactive_Text_red", 55 ); + g_settings.theme.menu_Content_inactive_Text_green = configfile.getInt32( "menu_Content_inactive_Text_green", 70 ); + g_settings.theme.menu_Content_inactive_Text_blue = configfile.getInt32( "menu_Content_inactive_Text_blue", 85 ); - g_settings.infobar_alpha = configfile.getInt32( "infobar_alpha", 0x14 ); - g_settings.infobar_red = configfile.getInt32( "infobar_red", 0x00 ); - g_settings.infobar_green = configfile.getInt32( "infobar_green", 0x0e ); - g_settings.infobar_blue = configfile.getInt32( "infobar_blue", 0x23 ); + g_settings.theme.infobar_alpha = configfile.getInt32( "infobar_alpha", 0x14 ); + g_settings.theme.infobar_red = configfile.getInt32( "infobar_red", 0x00 ); + g_settings.theme.infobar_green = configfile.getInt32( "infobar_green", 0x0e ); + g_settings.theme.infobar_blue = configfile.getInt32( "infobar_blue", 0x23 ); - g_settings.infobar_Text_alpha = configfile.getInt32( "infobar_Text_alpha", 0x00 ); - g_settings.infobar_Text_red = configfile.getInt32( "infobar_Text_red", 0x64 ); - g_settings.infobar_Text_green = configfile.getInt32( "infobar_Text_green", 0x64 ); - g_settings.infobar_Text_blue = configfile.getInt32( "infobar_Text_blue", 0x64 ); + g_settings.theme.infobar_Text_alpha = configfile.getInt32( "infobar_Text_alpha", 0x00 ); + g_settings.theme.infobar_Text_red = configfile.getInt32( "infobar_Text_red", 0x64 ); + g_settings.theme.infobar_Text_green = configfile.getInt32( "infobar_Text_green", 0x64 ); + g_settings.theme.infobar_Text_blue = configfile.getInt32( "infobar_Text_blue", 0x64 ); //personalize g_settings.personalize_pincode = configfile.getString( "personalize_pincode", "0000" ); @@ -572,10 +572,10 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.colored_events_channellist = configfile.getInt32( "colored_events_channellist" , 0 ); g_settings.colored_events_infobar = configfile.getInt32( "colored_events_infobar" , 2 ); // next - g_settings.colored_events_alpha = configfile.getInt32( "colored_events_alpha", 0x00 ); - g_settings.colored_events_red = configfile.getInt32( "colored_events_red", 95 ); - g_settings.colored_events_green = configfile.getInt32( "colored_events_green", 70 ); - g_settings.colored_events_blue = configfile.getInt32( "colored_events_blue", 0 ); + g_settings.theme.colored_events_alpha = configfile.getInt32( "colored_events_alpha", 0x00 ); + g_settings.theme.colored_events_red = configfile.getInt32( "colored_events_red", 95 ); + g_settings.theme.colored_events_green = configfile.getInt32( "colored_events_green", 70 ); + g_settings.theme.colored_events_blue = configfile.getInt32( "colored_events_blue", 0 ); g_settings.contrast_fonts = configfile.getInt32("contrast_fonts", 0); @@ -1062,60 +1062,60 @@ void CNeutrinoApp::saveSetup(const char * fname) configfile.setBool("widget_fade" , g_settings.widget_fade ); //colors - configfile.setInt32( "clock_Digit_alpha", g_settings.clock_Digit_alpha ); - configfile.setInt32( "clock_Digit_red", g_settings.clock_Digit_red ); - configfile.setInt32( "clock_Digit_green", g_settings.clock_Digit_green ); - configfile.setInt32( "clock_Digit_blue", g_settings.clock_Digit_blue ); + configfile.setInt32( "clock_Digit_alpha", g_settings.theme.clock_Digit_alpha ); + configfile.setInt32( "clock_Digit_red", g_settings.theme.clock_Digit_red ); + configfile.setInt32( "clock_Digit_green", g_settings.theme.clock_Digit_green ); + configfile.setInt32( "clock_Digit_blue", g_settings.theme.clock_Digit_blue ); - configfile.setInt32( "menu_Head_alpha", g_settings.menu_Head_alpha ); - configfile.setInt32( "menu_Head_red", g_settings.menu_Head_red ); - configfile.setInt32( "menu_Head_green", g_settings.menu_Head_green ); - configfile.setInt32( "menu_Head_blue", g_settings.menu_Head_blue ); + configfile.setInt32( "menu_Head_alpha", g_settings.theme.menu_Head_alpha ); + configfile.setInt32( "menu_Head_red", g_settings.theme.menu_Head_red ); + configfile.setInt32( "menu_Head_green", g_settings.theme.menu_Head_green ); + configfile.setInt32( "menu_Head_blue", g_settings.theme.menu_Head_blue ); - configfile.setInt32( "menu_Head_Text_alpha", g_settings.menu_Head_Text_alpha ); - configfile.setInt32( "menu_Head_Text_red", g_settings.menu_Head_Text_red ); - configfile.setInt32( "menu_Head_Text_green", g_settings.menu_Head_Text_green ); - configfile.setInt32( "menu_Head_Text_blue", g_settings.menu_Head_Text_blue ); + configfile.setInt32( "menu_Head_Text_alpha", g_settings.theme.menu_Head_Text_alpha ); + configfile.setInt32( "menu_Head_Text_red", g_settings.theme.menu_Head_Text_red ); + configfile.setInt32( "menu_Head_Text_green", g_settings.theme.menu_Head_Text_green ); + configfile.setInt32( "menu_Head_Text_blue", g_settings.theme.menu_Head_Text_blue ); - configfile.setInt32( "menu_Content_alpha", g_settings.menu_Content_alpha ); - configfile.setInt32( "menu_Content_red", g_settings.menu_Content_red ); - configfile.setInt32( "menu_Content_green", g_settings.menu_Content_green ); - configfile.setInt32( "menu_Content_blue", g_settings.menu_Content_blue ); + configfile.setInt32( "menu_Content_alpha", g_settings.theme.menu_Content_alpha ); + configfile.setInt32( "menu_Content_red", g_settings.theme.menu_Content_red ); + configfile.setInt32( "menu_Content_green", g_settings.theme.menu_Content_green ); + configfile.setInt32( "menu_Content_blue", g_settings.theme.menu_Content_blue ); - configfile.setInt32( "menu_Content_Text_alpha", g_settings.menu_Content_Text_alpha ); - configfile.setInt32( "menu_Content_Text_red", g_settings.menu_Content_Text_red ); - configfile.setInt32( "menu_Content_Text_green", g_settings.menu_Content_Text_green ); - configfile.setInt32( "menu_Content_Text_blue", g_settings.menu_Content_Text_blue ); + configfile.setInt32( "menu_Content_Text_alpha", g_settings.theme.menu_Content_Text_alpha ); + configfile.setInt32( "menu_Content_Text_red", g_settings.theme.menu_Content_Text_red ); + configfile.setInt32( "menu_Content_Text_green", g_settings.theme.menu_Content_Text_green ); + configfile.setInt32( "menu_Content_Text_blue", g_settings.theme.menu_Content_Text_blue ); - configfile.setInt32( "menu_Content_Selected_alpha", g_settings.menu_Content_Selected_alpha ); - configfile.setInt32( "menu_Content_Selected_red", g_settings.menu_Content_Selected_red ); - configfile.setInt32( "menu_Content_Selected_green", g_settings.menu_Content_Selected_green ); - configfile.setInt32( "menu_Content_Selected_blue", g_settings.menu_Content_Selected_blue ); + configfile.setInt32( "menu_Content_Selected_alpha", g_settings.theme.menu_Content_Selected_alpha ); + configfile.setInt32( "menu_Content_Selected_red", g_settings.theme.menu_Content_Selected_red ); + configfile.setInt32( "menu_Content_Selected_green", g_settings.theme.menu_Content_Selected_green ); + configfile.setInt32( "menu_Content_Selected_blue", g_settings.theme.menu_Content_Selected_blue ); - configfile.setInt32( "menu_Content_Selected_Text_alpha", g_settings.menu_Content_Selected_Text_alpha ); - configfile.setInt32( "menu_Content_Selected_Text_red", g_settings.menu_Content_Selected_Text_red ); - configfile.setInt32( "menu_Content_Selected_Text_green", g_settings.menu_Content_Selected_Text_green ); - configfile.setInt32( "menu_Content_Selected_Text_blue", g_settings.menu_Content_Selected_Text_blue ); + configfile.setInt32( "menu_Content_Selected_Text_alpha", g_settings.theme.menu_Content_Selected_Text_alpha ); + configfile.setInt32( "menu_Content_Selected_Text_red", g_settings.theme.menu_Content_Selected_Text_red ); + configfile.setInt32( "menu_Content_Selected_Text_green", g_settings.theme.menu_Content_Selected_Text_green ); + configfile.setInt32( "menu_Content_Selected_Text_blue", g_settings.theme.menu_Content_Selected_Text_blue ); - configfile.setInt32( "menu_Content_inactive_alpha", g_settings.menu_Content_inactive_alpha ); - configfile.setInt32( "menu_Content_inactive_red", g_settings.menu_Content_inactive_red ); - configfile.setInt32( "menu_Content_inactive_green", g_settings.menu_Content_inactive_green ); - configfile.setInt32( "menu_Content_inactive_blue", g_settings.menu_Content_inactive_blue ); + configfile.setInt32( "menu_Content_inactive_alpha", g_settings.theme.menu_Content_inactive_alpha ); + configfile.setInt32( "menu_Content_inactive_red", g_settings.theme.menu_Content_inactive_red ); + configfile.setInt32( "menu_Content_inactive_green", g_settings.theme.menu_Content_inactive_green ); + configfile.setInt32( "menu_Content_inactive_blue", g_settings.theme.menu_Content_inactive_blue ); - configfile.setInt32( "menu_Content_inactive_Text_alpha", g_settings.menu_Content_inactive_Text_alpha ); - configfile.setInt32( "menu_Content_inactive_Text_red", g_settings.menu_Content_inactive_Text_red ); - configfile.setInt32( "menu_Content_inactive_Text_green", g_settings.menu_Content_inactive_Text_green ); - configfile.setInt32( "menu_Content_inactive_Text_blue", g_settings.menu_Content_inactive_Text_blue ); + configfile.setInt32( "menu_Content_inactive_Text_alpha", g_settings.theme.menu_Content_inactive_Text_alpha ); + configfile.setInt32( "menu_Content_inactive_Text_red", g_settings.theme.menu_Content_inactive_Text_red ); + configfile.setInt32( "menu_Content_inactive_Text_green", g_settings.theme.menu_Content_inactive_Text_green ); + configfile.setInt32( "menu_Content_inactive_Text_blue", g_settings.theme.menu_Content_inactive_Text_blue ); - configfile.setInt32( "infobar_alpha", g_settings.infobar_alpha ); - configfile.setInt32( "infobar_red", g_settings.infobar_red ); - configfile.setInt32( "infobar_green", g_settings.infobar_green ); - configfile.setInt32( "infobar_blue", g_settings.infobar_blue ); + configfile.setInt32( "infobar_alpha", g_settings.theme.infobar_alpha ); + configfile.setInt32( "infobar_red", g_settings.theme.infobar_red ); + configfile.setInt32( "infobar_green", g_settings.theme.infobar_green ); + configfile.setInt32( "infobar_blue", g_settings.theme.infobar_blue ); - configfile.setInt32( "infobar_Text_alpha", g_settings.infobar_Text_alpha ); - configfile.setInt32( "infobar_Text_red", g_settings.infobar_Text_red ); - configfile.setInt32( "infobar_Text_green", g_settings.infobar_Text_green ); - configfile.setInt32( "infobar_Text_blue", g_settings.infobar_Text_blue ); + configfile.setInt32( "infobar_Text_alpha", g_settings.theme.infobar_Text_alpha ); + configfile.setInt32( "infobar_Text_red", g_settings.theme.infobar_Text_red ); + configfile.setInt32( "infobar_Text_green", g_settings.theme.infobar_Text_green ); + configfile.setInt32( "infobar_Text_blue", g_settings.theme.infobar_Text_blue ); //personalize configfile.setString("personalize_pincode", g_settings.personalize_pincode); @@ -1124,10 +1124,10 @@ void CNeutrinoApp::saveSetup(const char * fname) configfile.setInt32( "colored_events_channellist", g_settings.colored_events_channellist ); configfile.setInt32( "colored_events_infobar", g_settings.colored_events_infobar ); - configfile.setInt32( "colored_events_alpha", g_settings.colored_events_alpha ); - configfile.setInt32( "colored_events_red", g_settings.colored_events_red ); - configfile.setInt32( "colored_events_green", g_settings.colored_events_green ); - configfile.setInt32( "colored_events_blue", g_settings.colored_events_blue ); + configfile.setInt32( "colored_events_alpha", g_settings.theme.colored_events_alpha ); + configfile.setInt32( "colored_events_red", g_settings.theme.colored_events_red ); + configfile.setInt32( "colored_events_green", g_settings.theme.colored_events_green ); + configfile.setInt32( "colored_events_blue", g_settings.theme.colored_events_blue ); configfile.setInt32( "contrast_fonts", g_settings.contrast_fonts ); //network diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp index 0640a2d4d..9c8a3a0e2 100644 --- a/src/system/setting_helpers.cpp +++ b/src/system/setting_helpers.cpp @@ -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(); } diff --git a/src/system/settings.h b/src/system/settings.h index 732062209..92d32cb43 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -47,6 +47,69 @@ #define VIDEOMENU_VIDEOMODE_OPTION_COUNT 12 #endif +struct SNeutrinoTheme +{ + unsigned char menu_Head_alpha; + unsigned char menu_Head_red; + unsigned char menu_Head_green; + unsigned char menu_Head_blue; + + unsigned char menu_Head_Text_alpha; + unsigned char menu_Head_Text_red; + unsigned char menu_Head_Text_green; + unsigned char menu_Head_Text_blue; + + unsigned char menu_Content_alpha; + unsigned char menu_Content_red; + unsigned char menu_Content_green; + unsigned char menu_Content_blue; + + unsigned char menu_Content_Text_alpha; + unsigned char menu_Content_Text_red; + unsigned char menu_Content_Text_green; + unsigned char menu_Content_Text_blue; + + unsigned char menu_Content_Selected_alpha; + unsigned char menu_Content_Selected_red; + unsigned char menu_Content_Selected_green; + unsigned char menu_Content_Selected_blue; + + unsigned char menu_Content_Selected_Text_alpha; + unsigned char menu_Content_Selected_Text_red; + unsigned char menu_Content_Selected_Text_green; + unsigned char menu_Content_Selected_Text_blue; + + unsigned char menu_Content_inactive_alpha; + unsigned char menu_Content_inactive_red; + unsigned char menu_Content_inactive_green; + unsigned char menu_Content_inactive_blue; + + unsigned char menu_Content_inactive_Text_alpha; + unsigned char menu_Content_inactive_Text_red; + unsigned char menu_Content_inactive_Text_green; + unsigned char menu_Content_inactive_Text_blue; + + unsigned char infobar_alpha; + unsigned char infobar_red; + unsigned char infobar_green; + unsigned char infobar_blue; + + unsigned char infobar_Text_alpha; + unsigned char infobar_Text_red; + unsigned char infobar_Text_green; + unsigned char infobar_Text_blue; + + unsigned char colored_events_alpha; + unsigned char colored_events_red; + unsigned char colored_events_green; + unsigned char colored_events_blue; + + unsigned char clock_Digit_alpha; + unsigned char clock_Digit_red; + unsigned char clock_Digit_green; + unsigned char clock_Digit_blue; +}; + struct SNeutrinoSettings { //video @@ -284,66 +347,8 @@ struct SNeutrinoSettings //widget settings int widget_fade; - //colors - unsigned char clock_Digit_alpha; - unsigned char clock_Digit_red; - unsigned char clock_Digit_green; - unsigned char clock_Digit_blue; + SNeutrinoTheme theme; - unsigned char menu_Head_alpha; - unsigned char menu_Head_red; - unsigned char menu_Head_green; - unsigned char menu_Head_blue; - - unsigned char menu_Head_Text_alpha; - unsigned char menu_Head_Text_red; - unsigned char menu_Head_Text_green; - unsigned char menu_Head_Text_blue; - - unsigned char menu_Content_alpha; - unsigned char menu_Content_red; - unsigned char menu_Content_green; - unsigned char menu_Content_blue; - - unsigned char menu_Content_Text_alpha; - unsigned char menu_Content_Text_red; - unsigned char menu_Content_Text_green; - unsigned char menu_Content_Text_blue; - - unsigned char menu_Content_Selected_alpha; - unsigned char menu_Content_Selected_red; - unsigned char menu_Content_Selected_green; - unsigned char menu_Content_Selected_blue; - - unsigned char menu_Content_Selected_Text_alpha; - unsigned char menu_Content_Selected_Text_red; - unsigned char menu_Content_Selected_Text_green; - unsigned char menu_Content_Selected_Text_blue; - - unsigned char menu_Content_inactive_alpha; - unsigned char menu_Content_inactive_red; - unsigned char menu_Content_inactive_green; - unsigned char menu_Content_inactive_blue; - - unsigned char menu_Content_inactive_Text_alpha; - unsigned char menu_Content_inactive_Text_red; - unsigned char menu_Content_inactive_Text_green; - unsigned char menu_Content_inactive_Text_blue; - - unsigned char infobar_alpha; - unsigned char infobar_red; - unsigned char infobar_green; - unsigned char infobar_blue; - - unsigned char infobar_Text_alpha; - unsigned char infobar_Text_red; - unsigned char infobar_Text_green; - unsigned char infobar_Text_blue; - - unsigned char colored_events_alpha; - unsigned char colored_events_red; - unsigned char colored_events_green; - unsigned char colored_events_blue; int colored_events_channellist; int colored_events_infobar; int contrast_fonts;