diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index f909059aa..1d56d08ae 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -926,7 +926,6 @@ menu.hint_cec_mode CEC-Modus menu.hint_cec_standby CEC-Standby menu.hint_cec_view_on CEC view ON menu.hint_channellist_additional Definiert, ob zusätzliche Informationen im Hauptfenster angezeigt werden sollen -menu.hint_channellist_colored Definiert, ob die aktuelle oder nächste Sendung in einer anderen Farbe dargestellt werden soll menu.hint_channellist_epg_align Legen Sie fest, wie der Text für das EPG in der Liste rechts vom Programmnamen ausgerichtet wird menu.hint_channellist_extended Bei aktivierter Funktion wird vor dem Sendernamen ein Balken eingeblendet, der den Sendungsfortschritt anzeigt menu.hint_channellist_fonts Ändern Sie die Schriftgrößen in der Kanalliste @@ -946,6 +945,8 @@ menu.hint_clock_seconds Legen Sie fest, ob die Sekunden angezeigt werden sollen menu.hint_clock_size Stellen Sie die Größe der Uhr ein menu.hint_clock_textcolor Konfigurieren Sie die Farbe der Ziffern menu.hint_color_gradient Schaltet Farbverläufe für verschiedene Menüelemente ein/aus +menu.hint_colored_events Definiert, ob die aktuelle oder nächste Sendung in einer anderen Farbe dargestellt werden soll +menu.hint_colored_events_textcolor Ändern Sie die Farbe für farbige Events in der Kanalliste und der Infobar menu.hint_colors Konfigurieren Sie die Menü-Farben menu.hint_content_back Ändern Sie die Hintergrundfarbe für den Fensterinhalt menu.hint_content_textcolor Ändern Sie die Textfarbe für den Fensterinhalt @@ -966,7 +967,6 @@ menu.hint_epg_save_mode Speichert die EPG-Daten nur für Sender, die in die Favo menu.hint_epg_save_standby Speichert die EPG-Daten auch, wenn in den Standby-Modus geschalten wird menu.hint_epg_scan Zu scannende Bouquets wählen. Aktuelles Bouquet beim Umschalten, markierte Bouquets oder alle Favoriten menu.hint_epg_scan_mode Aktivieren Sie den Hintergrundscan der EPG-Daten, wenn ein freier Tuner vorhanden ist -menu.hint_event_textcolor Ändern Sie die Farbe für farbige Events in der Kanalliste und der Infobar menu.hint_eventlist_additional Definiert, ob zusätzliche Informationen im Hauptfenster angezeigt werden sollen menu.hint_eventlist_fonts Ändern Sie die Schriftgröße in der Event-Liste menu.hint_eventlist_setup Wählen Sie die Anzeigeoptionen für die Event-Liste @@ -1002,7 +1002,6 @@ menu.hint_inet_radio Internetradio menu.hint_info Informationen über das Image, CPU, Arbeitsspeicher und Stream und mehr menu.hint_infobar_back Ändern Sie die Hintergrundfarbe für die Infobar menu.hint_infobar_casys ein: zeigt alle Aktiven farbig, Mini: einzelnes Symbol ob gespeert, Diskret: alle Aktiven CA-Systeme -menu.hint_infobar_colored_event Verwenden Sie unterschiedliche Farben für die aktuelle oder nächste Sendung in der Infobar menu.hint_infobar_dd Zeigt ein Dolby Digital Icon bei Verfügbarkeit menu.hint_infobar_filesys Zeigen den vom Flash- und einer HDD verwendeten Speicherplatz menu.hint_infobar_fonts Ändern Sie die Schriftgrößen in der Infobar @@ -1384,11 +1383,13 @@ messagebox.no Nein messagebox.ok OK messagebox.yes Ja miscsettings.channellist Kanalliste -miscsettings.channellist_colored_events Sendung farbig miscsettings.channellist_epgtext_align Event-Text ausrichten +miscsettings.colored_events Sendung hervorheben miscsettings.colored_events_0 keine miscsettings.colored_events_1 aktuelle miscsettings.colored_events_2 nächste +miscsettings.colored_events_channellist In der Kanalliste +miscsettings.colored_events_infobar In der Infobar miscsettings.energy Energieverbrauch miscsettings.epg_cache EPG-Cache (Tage) miscsettings.epg_cache_hint1 EPG-Daten im Voraus zwischenspeichern? @@ -1423,7 +1424,6 @@ miscsettings.infobar Infobar miscsettings.infobar_casystem_display CA-System Anzeige miscsettings.infobar_casystem_mini Mini miscsettings.infobar_casystem_mode Diskret -miscsettings.infobar_colored_events Sendung farbig miscsettings.infobar_disp_0 Kein Logo miscsettings.infobar_disp_1 Logo in der Nummernbox miscsettings.infobar_disp_2 Logo/Kanalnummer diff --git a/data/locale/english.locale b/data/locale/english.locale index 40800bf9d..06aea2d90 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -926,7 +926,6 @@ menu.hint_cec_mode CEC mode menu.hint_cec_standby CEC standby menu.hint_cec_view_on CEC view ON menu.hint_channellist_additional Show additional informations\nin main box -menu.hint_channellist_colored Use different color for current or next event menu.hint_channellist_epg_align EPG event align menu.hint_channellist_extended Show current event progress bar menu.hint_channellist_fonts Change channel list font sizes @@ -946,6 +945,8 @@ menu.hint_clock_seconds Show time format with seconds menu.hint_clock_size Set the size of the info clock menu.hint_clock_textcolor Configure digit colors menu.hint_color_gradient Switches color gradients for various menu items on/off +menu.hint_colored_events Use different color for current or next event +menu.hint_colored_events_textcolor Change color for colored events in channellist and infobar menu.hint_colors Configure GUI colors menu.hint_content_back Change GUI window background color menu.hint_content_textcolor Change GUI window text color @@ -966,7 +967,6 @@ menu.hint_epg_save_mode Cache EPG only for channels present in favorite bouquets menu.hint_epg_save_standby Save EPG on soft standby mode menu.hint_epg_scan Select bouquets to scan epg, current on zap,\nall or selected favorites menu.hint_epg_scan_mode Enable background epg scan using free tuner -menu.hint_event_textcolor Change event color for colored-event options\nin channel list and infobar menu.hint_eventlist_additional Show additional informations\nin main box menu.hint_eventlist_fonts Change event list font sizes menu.hint_eventlist_setup Configure event list GUI options @@ -1002,7 +1002,6 @@ menu.hint_inet_radio Internet radio menu.hint_info Information about image, box cpu and storage,\nstream information menu.hint_infobar_back Change infobar background color menu.hint_infobar_casys On: display all with colored active, mini: single\nlocked icon, descreet: all active ca-sys -menu.hint_infobar_colored_event Use different color for current or next event menu.hint_infobar_dd Show DD icon menu.hint_infobar_filesys Show flash and HDD used space levels menu.hint_infobar_fonts Change infobar font sizes @@ -1384,11 +1383,13 @@ messagebox.no No messagebox.ok Ok messagebox.yes Yes miscsettings.channellist Channellist -miscsettings.channellist_colored_events Program colored miscsettings.channellist_epgtext_align Programtext Align +miscsettings.colored_events Program colored miscsettings.colored_events_0 none miscsettings.colored_events_1 current miscsettings.colored_events_2 next +miscsettings.colored_events_channellist In channellist +miscsettings.colored_events_infobar In infobar miscsettings.energy Energy miscsettings.epg_cache EPG-Cache (Days) miscsettings.epg_cache_hint1 How long will EPG-Data in the future cached? @@ -1423,7 +1424,6 @@ miscsettings.infobar Infobar miscsettings.infobar_casystem_display CA-System Display miscsettings.infobar_casystem_mini mini miscsettings.infobar_casystem_mode discreet -miscsettings.infobar_colored_events Program colored miscsettings.infobar_disp_0 without Logo miscsettings.infobar_disp_1 Logo in number box miscsettings.infobar_disp_2 Logo+channel number diff --git a/data/locale/nederlands.locale b/data/locale/nederlands.locale index 7685f5222..9900e0e75 100644 --- a/data/locale/nederlands.locale +++ b/data/locale/nederlands.locale @@ -911,7 +911,6 @@ menu.hint_cec_mode CEC mode menu.hint_cec_standby CEC stand-by menu.hint_cec_view_on CEC view ingeschakeld menu.hint_channellist_additional Extra informatie weergeven in hoofdvenster -menu.hint_channellist_colored Gebruik andere kleur voor huidige of volgende programma menu.hint_channellist_epg_align EPG evenement uitlijnen menu.hint_channellist_extended Programma voortgang balk weergeven menu.hint_channellist_fonts Verander lettertype grote kanalenlijst @@ -929,6 +928,8 @@ menu.hint_clock_seconds Toon tijdsformaat met secondes menu.hint_clock_size Stel grootte van de info klok in menu.hint_clock_textcolor Configureer digit kleuren menu.hint_color_gradient Schakel kleur verloop van menu items aan/uit +menu.hint_colored_events Gebruik andere kleur voor huidige of volgende programma +menu.hint_colored_events_textcolor Wijzig programma kleur voor gekleurde programma opties in kanalenlijst en infobalk. menu.hint_colors Configureer GUI-kleuren menu.hint_content_back Wijzig venster achtergrond kleur menu.hint_content_textcolor Wijzig venster tekst kleur @@ -946,7 +947,6 @@ menu.hint_epg_save Cached EPG informatie opslaan op opslagmedium \nen laad de in menu.hint_epg_save_standby EPG opslaan in soft standby modus. menu.hint_epg_scan Selecteer te scannen EPG-bouquetten, tijdens zap,\nalle of geselecteerde favorieten menu.hint_epg_scan_mode Achtergrond EPG-scan door vrije tuner inschakelen -menu.hint_event_textcolor Wijzig programma kleur voor gekleurde \nprogramma opties in kanalenlijst en infobalk. menu.hint_eventlist_additional Toon additionale infos\nin mainbox menu.hint_eventlist_fonts Wijzig lettertype grote in programma lijst menu.hint_eventlist_setup Configureer eventlijst GUI opties @@ -982,7 +982,6 @@ menu.hint_inet_radio Internet radio menu.hint_info Informatie over firmware, ontvanger CPU,\nopslag en stream informatie menu.hint_infobar_back Wijzig achtergrond kleur van de infobalk menu.hint_infobar_casys Aan: display all with colored active, mini: single\nlocked icon, descreet: all active ca-sys -menu.hint_infobar_colored_event Gebruik andere kleur voor huidige programma en komende programma menu.hint_infobar_dd Dolbydigital icoon weergeven menu.hint_infobar_filesys Gebruikte schijfruimte van Flashgeheugen en HDD weergeven menu.hint_infobar_fonts Wijzig lettertype grote van de infobalk @@ -1354,11 +1353,13 @@ messagebox.no Nee messagebox.ok Ok messagebox.yes Ja miscsettings.channellist Kanalenlijst -miscsettings.channellist_colored_events Gekleurde programma's miscsettings.channellist_epgtext_align Uitlijning programma tekst +miscsettings.colored_events Gekleurde programma's miscsettings.colored_events_0 Geen miscsettings.colored_events_1 Huidige miscsettings.colored_events_2 Straks +miscsettings.colored_events_channellist In Kanalenlijst +miscsettings.colored_events_infobar In Informatiebalk miscsettings.energy Energie miscsettings.epg_cache EPG-Cache (Dagen) miscsettings.epg_cache_hint1 Hoe ver in de toekomst wordt EPG informatie bewaard. @@ -1390,7 +1391,6 @@ miscsettings.infobar Infobalk miscsettings.infobar_casystem_display CA-System weergeven miscsettings.infobar_casystem_mini mini miscsettings.infobar_casystem_mode discreet -miscsettings.infobar_colored_events Gekleurde programma's miscsettings.infobar_disp_0 Zonder Logo miscsettings.infobar_disp_1 Logo in nummerbox miscsettings.infobar_disp_2 Logo + kanaalnummer diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index 0754fd1e5..e895c5620 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -1514,12 +1514,8 @@ void CChannelList::paintDetails(int index) CChannelEvent *p_event = NULL; //colored_events init - bool colored_event_C = false; - bool colored_event_N = false; - if (g_settings.colored_events_channellist == 1) - colored_event_C = true; - if (g_settings.colored_events_channellist == 2) - colored_event_N = true; + bool colored_event_C = (g_settings.theme.colored_events_channellist == 1); + bool colored_event_N = (g_settings.theme.colored_events_channellist == 2); frameBuffer->paintBoxRel(x+1, y + height + 1, full_width-2, info_height - 2, COL_MENUCONTENTDARK_PLUS_0, RADIUS_LARGE);//round frameBuffer->paintBoxFrame(x, y + height, full_width, info_height, 2, COL_MENUCONTENT_PLUS_6, RADIUS_LARGE); @@ -2285,7 +2281,7 @@ void CChannelList::paint_events(int index) if (e->eventID) { bool first = (i == 1); - if ((first && g_settings.colored_events_channellist == 1 /* current */) || (!first && g_settings.colored_events_channellist == 2 /* next */)) + if ((first && g_settings.theme.colored_events_channellist == 1 /* current */) || (!first && g_settings.theme.colored_events_channellist == 2 /* next */)) color = COL_COLORED_EVENTS_TEXT; struct tm *tmStartZeit = localtime(&e->startTime); strftime(startTime, sizeof(startTime), "%H:%M", tmStartZeit ); diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index df3d87be8..e2813a6c2 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -1647,12 +1647,8 @@ void CInfoViewer::display_Info(const char *current, const char *next, static int oldCurrTimeX = currTimeX; // remember the last pos. of remaining time, in case we change from 20/100min to 21/99min //colored_events init - bool colored_event_C = false; - bool colored_event_N = false; - if (g_settings.colored_events_infobar == 1) - colored_event_C = true; - if (g_settings.colored_events_infobar == 2) - colored_event_N = true; + bool colored_event_C = (g_settings.theme.colored_events_infobar == 1); + bool colored_event_N = (g_settings.theme.colored_events_infobar == 2); if (current != NULL && update_current) { diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index 3f3a4ecd6..db86c5618 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -752,10 +752,21 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors) 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)); + menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_MISCSETTINGS_COLORED_EVENTS)); + mf = new CMenuDForwarder(LOCALE_COLORMENU_TEXTCOLOR, true, NULL, chColored_Events ); - mf->setHint("", LOCALE_MENU_HINT_EVENT_TEXTCOLOR); + mf->setHint("", LOCALE_MENU_HINT_COLORED_EVENTS_TEXTCOLOR); menu_colors->addItem(mf); + + // colored events channellist + oj = new CMenuOptionChooser(LOCALE_MISCSETTINGS_COLORED_EVENTS_CHANNELLIST, &t.colored_events_channellist, OPTIONS_COLORED_EVENTS_OPTIONS, OPTIONS_COLORED_EVENTS_OPTION_COUNT, true); + oj->setHint("", LOCALE_MENU_HINT_COLORED_EVENTS); + menu_colors->addItem(oj); + + // colored events infobar + oj = new CMenuOptionChooser(LOCALE_MISCSETTINGS_COLORED_EVENTS_INFOBAR, &t.colored_events_infobar, OPTIONS_COLORED_EVENTS_OPTIONS, OPTIONS_COLORED_EVENTS_OPTION_COUNT, true); + oj->setHint("", LOCALE_MENU_HINT_COLORED_EVENTS); + menu_colors->addItem(oj); } /* for font size setup */ @@ -1005,11 +1016,6 @@ void COsdSetup::showOsdInfobarSetup(CMenuWidget *menu_infobar) mc->setHint("", LOCALE_MENU_HINT_INFOBAR_ON_EPG); menu_infobar->addItem(mc); - // colored event - mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_COLORED_EVENTS, &g_settings.colored_events_infobar, OPTIONS_COLORED_EVENTS_OPTIONS, OPTIONS_COLORED_EVENTS_OPTION_COUNT, true); - mc->setHint("", LOCALE_MENU_HINT_INFOBAR_COLORED_EVENT); - menu_infobar->addItem(mc); - // radiotext mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_RADIOTEXT, &g_settings.radiotext_enable, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this); mc->setHint("", LOCALE_MENU_HINT_INFOBAR_RADIOTEXT); @@ -1050,11 +1056,6 @@ void COsdSetup::showOsdChanlistSetup(CMenuWidget *menu_chanlist) menu_chanlist->addItem(mc); channellistNotifier->addItem(mc); - // colored event - mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_CHANNELLIST_COLORED_EVENTS, &g_settings.colored_events_channellist, OPTIONS_COLORED_EVENTS_OPTIONS, OPTIONS_COLORED_EVENTS_OPTION_COUNT, true); - mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_COLORED); - menu_chanlist->addItem(mc); - //show channel logo mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_SHOW_CHANNELLOGO, &g_settings.channellist_show_channellogo, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_SHOW_CHANNELLOGO); diff --git a/src/gui/themes.cpp b/src/gui/themes.cpp index e4b69a4b5..09b54c180 100644 --- a/src/gui/themes.cpp +++ b/src/gui/themes.cpp @@ -285,6 +285,9 @@ void CThemes::setTheme(CConfigFile &configfile) configfile.setInt32( "colored_events_red", t.colored_events_red ); configfile.setInt32( "colored_events_green", t.colored_events_green ); configfile.setInt32( "colored_events_blue", t.colored_events_blue ); + configfile.getInt32( "colored_events_channellist", t.colored_events_channellist ); + configfile.getInt32( "colored_events_infobar", t.colored_events_infobar ); + configfile.setInt32( "clock_Digit_alpha", t.clock_Digit_alpha ); configfile.setInt32( "clock_Digit_red", t.clock_Digit_red ); configfile.setInt32( "clock_Digit_green", t.clock_Digit_green ); @@ -342,6 +345,8 @@ void CThemes::getTheme(CConfigFile &configfile) t.colored_events_red = configfile.getInt32( "colored_events_red", 95 ); t.colored_events_green = configfile.getInt32( "colored_events_green", 70 ); t.colored_events_blue = configfile.getInt32( "colored_events_blue", 0 ); + t.colored_events_channellist = configfile.getInt32( "colored_events_channellist", 0 ); + t.colored_events_infobar = configfile.getInt32( "colored_events_infobar", 2 ); t.clock_Digit_alpha = configfile.getInt32( "clock_Digit_alpha", t.menu_Content_Text_alpha ); t.clock_Digit_red = configfile.getInt32( "clock_Digit_red", t.menu_Content_Text_red ); t.clock_Digit_green = configfile.getInt32( "clock_Digit_green", t.menu_Content_Text_green ); diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 00886a63d..93bdc6104 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -552,9 +552,6 @@ int CNeutrinoApp::loadSetup(const char * fname) for (int i = 0; i < SNeutrinoSettings::P_SETTINGS_MAX; i++)//settings.h, settings.cpp g_settings.personalize[i] = configfile.getInt32( personalize_settings[i].personalize_settings_name, personalize_settings[i].personalize_default_val ); - 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.contrast_fonts = configfile.getInt32("contrast_fonts", 0); //network @@ -1077,9 +1074,6 @@ void CNeutrinoApp::saveSetup(const char * fname) for (int i = 0; i < SNeutrinoSettings::P_SETTINGS_MAX; i++) //settings.h, settings.cpp configfile.setInt32(personalize_settings[i].personalize_settings_name, g_settings.personalize[i]); - configfile.setInt32( "colored_events_channellist", g_settings.colored_events_channellist ); - configfile.setInt32( "colored_events_infobar", g_settings.colored_events_infobar ); - configfile.setInt32( "contrast_fonts", g_settings.contrast_fonts ); //network for(int i=0 ; i < NETWORK_NFS_NR_OF_ENTRIES ; i++) { diff --git a/src/system/locals.h b/src/system/locals.h index e7e05560e..67764653a 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -953,7 +953,6 @@ typedef enum LOCALE_MENU_HINT_CEC_STANDBY, LOCALE_MENU_HINT_CEC_VIEW_ON, LOCALE_MENU_HINT_CHANNELLIST_ADDITIONAL, - LOCALE_MENU_HINT_CHANNELLIST_COLORED, LOCALE_MENU_HINT_CHANNELLIST_EPG_ALIGN, LOCALE_MENU_HINT_CHANNELLIST_EXTENDED, LOCALE_MENU_HINT_CHANNELLIST_FONTS, @@ -973,6 +972,8 @@ typedef enum LOCALE_MENU_HINT_CLOCK_SIZE, LOCALE_MENU_HINT_CLOCK_TEXTCOLOR, LOCALE_MENU_HINT_COLOR_GRADIENT, + LOCALE_MENU_HINT_COLORED_EVENTS, + LOCALE_MENU_HINT_COLORED_EVENTS_TEXTCOLOR, LOCALE_MENU_HINT_COLORS, LOCALE_MENU_HINT_CONTENT_BACK, LOCALE_MENU_HINT_CONTENT_TEXTCOLOR, @@ -993,7 +994,6 @@ typedef enum LOCALE_MENU_HINT_EPG_SAVE_STANDBY, LOCALE_MENU_HINT_EPG_SCAN, LOCALE_MENU_HINT_EPG_SCAN_MODE, - LOCALE_MENU_HINT_EVENT_TEXTCOLOR, LOCALE_MENU_HINT_EVENTLIST_ADDITIONAL, LOCALE_MENU_HINT_EVENTLIST_FONTS, LOCALE_MENU_HINT_EVENTLIST_SETUP, @@ -1029,7 +1029,6 @@ typedef enum LOCALE_MENU_HINT_INFO, LOCALE_MENU_HINT_INFOBAR_BACK, LOCALE_MENU_HINT_INFOBAR_CASYS, - LOCALE_MENU_HINT_INFOBAR_COLORED_EVENT, LOCALE_MENU_HINT_INFOBAR_DD, LOCALE_MENU_HINT_INFOBAR_FILESYS, LOCALE_MENU_HINT_INFOBAR_FONTS, @@ -1411,11 +1410,13 @@ typedef enum LOCALE_MESSAGEBOX_OK, LOCALE_MESSAGEBOX_YES, LOCALE_MISCSETTINGS_CHANNELLIST, - LOCALE_MISCSETTINGS_CHANNELLIST_COLORED_EVENTS, LOCALE_MISCSETTINGS_CHANNELLIST_EPGTEXT_ALIGN, + LOCALE_MISCSETTINGS_COLORED_EVENTS, LOCALE_MISCSETTINGS_COLORED_EVENTS_0, LOCALE_MISCSETTINGS_COLORED_EVENTS_1, LOCALE_MISCSETTINGS_COLORED_EVENTS_2, + LOCALE_MISCSETTINGS_COLORED_EVENTS_CHANNELLIST, + LOCALE_MISCSETTINGS_COLORED_EVENTS_INFOBAR, LOCALE_MISCSETTINGS_ENERGY, LOCALE_MISCSETTINGS_EPG_CACHE, LOCALE_MISCSETTINGS_EPG_CACHE_HINT1, @@ -1450,7 +1451,6 @@ typedef enum LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_DISPLAY, LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_MINI, LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_MODE, - LOCALE_MISCSETTINGS_INFOBAR_COLORED_EVENTS, LOCALE_MISCSETTINGS_INFOBAR_DISP_0, LOCALE_MISCSETTINGS_INFOBAR_DISP_1, LOCALE_MISCSETTINGS_INFOBAR_DISP_2, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 695c00ca9..433604eee 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -953,7 +953,6 @@ const char * locale_real_names[] = "menu.hint_cec_standby", "menu.hint_cec_view_on", "menu.hint_channellist_additional", - "menu.hint_channellist_colored", "menu.hint_channellist_epg_align", "menu.hint_channellist_extended", "menu.hint_channellist_fonts", @@ -973,6 +972,8 @@ const char * locale_real_names[] = "menu.hint_clock_size", "menu.hint_clock_textcolor", "menu.hint_color_gradient", + "menu.hint_colored_events", + "menu.hint_colored_events_textcolor", "menu.hint_colors", "menu.hint_content_back", "menu.hint_content_textcolor", @@ -993,7 +994,6 @@ const char * locale_real_names[] = "menu.hint_epg_save_standby", "menu.hint_epg_scan", "menu.hint_epg_scan_mode", - "menu.hint_event_textcolor", "menu.hint_eventlist_additional", "menu.hint_eventlist_fonts", "menu.hint_eventlist_setup", @@ -1029,7 +1029,6 @@ const char * locale_real_names[] = "menu.hint_info", "menu.hint_infobar_back", "menu.hint_infobar_casys", - "menu.hint_infobar_colored_event", "menu.hint_infobar_dd", "menu.hint_infobar_filesys", "menu.hint_infobar_fonts", @@ -1411,11 +1410,13 @@ const char * locale_real_names[] = "messagebox.ok", "messagebox.yes", "miscsettings.channellist", - "miscsettings.channellist_colored_events", "miscsettings.channellist_epgtext_align", + "miscsettings.colored_events", "miscsettings.colored_events_0", "miscsettings.colored_events_1", "miscsettings.colored_events_2", + "miscsettings.colored_events_channellist", + "miscsettings.colored_events_infobar", "miscsettings.energy", "miscsettings.epg_cache", "miscsettings.epg_cache_hint1", @@ -1450,7 +1451,6 @@ const char * locale_real_names[] = "miscsettings.infobar_casystem_display", "miscsettings.infobar_casystem_mini", "miscsettings.infobar_casystem_mode", - "miscsettings.infobar_colored_events", "miscsettings.infobar_disp_0", "miscsettings.infobar_disp_1", "miscsettings.infobar_disp_2", diff --git a/src/system/settings.h b/src/system/settings.h index 82c13a731..bbacbfe8d 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -112,6 +112,9 @@ struct SNeutrinoTheme unsigned char colored_events_green; unsigned char colored_events_blue; + int colored_events_channellist; + int colored_events_infobar; + unsigned char clock_Digit_alpha; unsigned char clock_Digit_red; unsigned char clock_Digit_green; @@ -370,11 +373,7 @@ struct SNeutrinoSettings SNeutrinoTheme theme; - int colored_events_channellist; - int colored_events_infobar; int contrast_fonts; - int infobar_gradient_top; - int infobar_gradient_bottom; //network #define NETWORK_NFS_NR_OF_ENTRIES 8