- extend colored events to channellist

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1779 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
striper
2011-10-28 16:39:12 +00:00
parent 027b5a06a1
commit 80c84efb7c
9 changed files with 48 additions and 24 deletions

View File

@@ -756,7 +756,11 @@ typedef enum
LOCALE_MISCSETTINGS_BOOTINFO,
LOCALE_MISCSETTINGS_BOOTMENU,
LOCALE_MISCSETTINGS_CHANNELLIST,
LOCALE_MISCSETTINGS_CHANNELLIST_COLORED_EVENTS,
LOCALE_MISCSETTINGS_CHANNELLIST_EPGTEXT_ALIGN,
LOCALE_MISCSETTINGS_COLORED_EVENTS_0,
LOCALE_MISCSETTINGS_COLORED_EVENTS_1,
LOCALE_MISCSETTINGS_COLORED_EVENTS_2,
LOCALE_MISCSETTINGS_DRIVER_BOOT,
LOCALE_MISCSETTINGS_ENERGY,
LOCALE_MISCSETTINGS_EPG_CACHE,
@@ -783,9 +787,6 @@ typedef enum
LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_MINI,
LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_MODE,
LOCALE_MISCSETTINGS_INFOBAR_COLORED_EVENTS,
LOCALE_MISCSETTINGS_INFOBAR_COLORED_EVENTS_0,
LOCALE_MISCSETTINGS_INFOBAR_COLORED_EVENTS_1,
LOCALE_MISCSETTINGS_INFOBAR_COLORED_EVENTS_2,
LOCALE_MISCSETTINGS_INFOBAR_DISP_0,
LOCALE_MISCSETTINGS_INFOBAR_DISP_1,
LOCALE_MISCSETTINGS_INFOBAR_DISP_2,

View File

@@ -756,7 +756,11 @@ const char * locale_real_names[] =
"miscsettings.bootinfo",
"miscsettings.bootmenu",
"miscsettings.channellist",
"miscsettings.channellist_colored_events",
"miscsettings.channellist_epgtext_align",
"miscsettings.colored_events_0",
"miscsettings.colored_events_1",
"miscsettings.colored_events_2",
"miscsettings.driver_boot",
"miscsettings.energy",
"miscsettings.epg_cache",
@@ -783,9 +787,6 @@ const char * locale_real_names[] =
"miscsettings.infobar_casystem_mini",
"miscsettings.infobar_casystem_mode",
"miscsettings.infobar_colored_events",
"miscsettings.infobar_colored_events_0",
"miscsettings.infobar_colored_events_1",
"miscsettings.infobar_colored_events_2",
"miscsettings.infobar_disp_0",
"miscsettings.infobar_disp_1",
"miscsettings.infobar_disp_2",

View File

@@ -494,6 +494,11 @@ bool CColorSetupNotifier::changeNotify(const neutrino_locale_t, void *)
convertSetupColor2RGB(g_settings.colored_events_red, g_settings.colored_events_green, g_settings.colored_events_blue),
8, convertSetupAlpha2Alpha(g_settings.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) );
frameBuffer->paletteSet();
return false;
}

View File

@@ -208,7 +208,8 @@ struct SNeutrinoSettings
unsigned char colored_events_red;
unsigned char colored_events_green;
unsigned char colored_events_blue;
int colored_events;
int colored_events_channellist;
int colored_events_infobar;
//network
#define NETWORK_NFS_NR_OF_ENTRIES 8