diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 300bd5c12..af7298c67 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -363,6 +363,7 @@ colorchooser.blue blau colorchooser.green grün colorchooser.red rot colormenu.background Hintergrundfarbe +colormenu.channellist_description_text Textfarbe für Sendungsbeschreibungen colormenu.clock_textcolor Ziffernfarbe colormenu.fade Ein-/Ausblenden colormenu.font Verwendete Schriftart @@ -370,7 +371,7 @@ colormenu.font_ttx Videotext Schriftart colormenu.menucolors Themes colormenu.osd_preset Bildschirmauswahl colormenu.osd_resolution OSD-Auflösung -colormenu.progressbar_active Farbe des aktiven Teil +colormenu.progressbar_active Farbe des aktiven Teils colormenu.progressbar_passive Hintergrundfarbe colormenu.shadow_color Schattenfarbe colormenu.textcolor Textfarbe @@ -1292,6 +1293,7 @@ menu.hint_clock_mode Schalten Sie die Uhr ein oder aus 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_channellist_description_text Ändern Sie die Farbe für die Sendungsbeschreibungen in der Kanalliste menu.hint_color_gradient Schaltet Farbverläufe für verschiedene Menüelemente ein/aus menu.hint_color_gradient_direction Richtung des Farbverlaufs festlegen menu.hint_color_gradient_separator_enable Farbverlauf für Menü-Trennlinien aktivieren/deaktivieren diff --git a/data/locale/english.locale b/data/locale/english.locale index fa3d77d35..6a3cb4e1c 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -363,6 +363,7 @@ colorchooser.blue blue colorchooser.green green colorchooser.red red colormenu.background Background +colormenu.channellist_description_text Text color for event description colormenu.clock_textcolor Digit color colormenu.fade Fade GUI colormenu.font Select GUI font @@ -372,7 +373,7 @@ colormenu.osd_preset Screen selection colormenu.osd_resolution OSD resolution colormenu.progressbar_active Active part color colormenu.progressbar_passive Background -colormenu.shadow_color Shadow Color +colormenu.shadow_color Shadow color colormenu.textcolor Text color colormenu.themeselect Select theme colormenu.timing Timeouts, display behavior @@ -1292,6 +1293,7 @@ menu.hint_clock_mode Switch clock on or off 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_channellist_description_text Change color for event descriptions in channellist menu.hint_color_gradient Switches color gradients for various menu items on/off menu.hint_color_gradient_direction Define direction of color gradient. menu.hint_color_gradient_separator_enable Disable/enable color gradient for menu separator lines diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index 70bf2aad4..761d418c7 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -1969,11 +1969,12 @@ void CChannelList::paintItem(int pos, const bool firstpaint) int i_radius = RADIUS_NONE; fb_pixel_t color; - fb_pixel_t ecolor; // we need one more color for DISPLAY_MODE_NEXT fb_pixel_t bgcolor; getItemColors(color, bgcolor, i_selected, i_marked); - ecolor = color; + + fb_pixel_t ecolor = color; // we need one more color for DISPLAY_MODE_NEXT + fb_pixel_t dcolor = COL_CHANNELLIST_DESCRIPTION_TEXT; // description color if (i_selected || i_marked) i_radius = RADIUS_LARGE; @@ -2216,12 +2217,12 @@ void CChannelList::paintItem(int pos, const bool firstpaint) if (g_settings.channellist_epgtext_align_right) { // align right - g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_DESCR]->RenderString(x + width - SCROLLBAR_WIDTH - offset_right - ch_desc_len, ypos + fheight - descr_offset, ch_desc_len, p_event->description, ecolor); + g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_DESCR]->RenderString(x + width - SCROLLBAR_WIDTH - offset_right - ch_desc_len, ypos + fheight - descr_offset, ch_desc_len, p_event->description, dcolor); } else { // align left - g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_DESCR]->RenderString(x + OFFSET_INNER_MID + numwidth + OFFSET_INNER_MID + prg_offset + OFFSET_INNER_MID + ch_name_len, ypos + fheight - descr_offset, ch_desc_len, p_event->description, ecolor); + g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_DESCR]->RenderString(x + OFFSET_INNER_MID + numwidth + OFFSET_INNER_MID + prg_offset + OFFSET_INNER_MID + ch_name_len, ypos + fheight - descr_offset, ch_desc_len, p_event->description, dcolor); } } else diff --git a/src/gui/color.h b/src/gui/color.h index 2f8ee2b68..2370b99a7 100644 --- a/src/gui/color.h +++ b/src/gui/color.h @@ -95,6 +95,8 @@ #define COL_MENUCONTENTINACTIVE_TEXT (CFrameBuffer::getInstance()->realcolor[(COL_NEUTRINO_TEXT + 14)]) #define COL_INFOCLOCK_TEXT (CFrameBuffer::getInstance()->realcolor[(COL_NEUTRINO_TEXT + 15)]) #define COL_PROGRESSBAR_ACTIVE_PLUS_0 (CFrameBuffer::getInstance()->realcolor[(COL_NEUTRINO_TEXT + 16)]) +// channellist text colors +#define COL_CHANNELLIST_DESCRIPTION_TEXT (CFrameBuffer::getInstance()->realcolor[(COL_NEUTRINO_TEXT + 22)]) // some wrappers to get more readability #define COL_FRAME COL_MENUCONTENT_PLUS_6 diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index 5d1181a4e..898339823 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -827,6 +827,9 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors) NULL, colorSetupNotifier); CColorChooser* chProgressbar_active = new CColorChooser(LOCALE_COLORMENU_PROGRESSBAR_ACTIVE, &t.progressbar_active_red, &t.progressbar_active_green, &t.progressbar_active_blue, NULL, colorSetupNotifier); + // channellist colors + CColorChooser* chChannellistDescTextcolor = new CColorChooser(LOCALE_COLORMENU_TEXTCOLOR, &t.channellist_Description_Text_red, &t.channellist_Description_Text_green, &t.channellist_Description_Text_blue, + NULL, colorSetupNotifier); menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_COLORMENUSETUP_MENUHEAD)); @@ -974,6 +977,12 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors) mf->setHint("", LOCALE_MENU_HINT_INFOBAR_CASYS_COLOR); menu_colors->addItem(mf); + // channellist + menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_MAINMENU_CHANNELS)); + mf = new CMenuDForwarder(LOCALE_COLORMENU_CHANNELLIST_DESCRIPTION_TEXT, true, NULL, chChannellistDescTextcolor ); + mf->setHint("", LOCALE_MENU_HINT_COLOR_CHANNELLIST_DESCRIPTION_TEXT); + menu_colors->addItem(mf); + // colored events CColorChooser* chColored_Events = new CColorChooser(LOCALE_COLORMENU_TEXTCOLOR, &t.colored_events_red, &t.colored_events_green, &t.colored_events_blue, NULL, colorSetupNotifier); diff --git a/src/gui/themes.cpp b/src/gui/themes.cpp index f09197ed2..ae28bb6b6 100644 --- a/src/gui/themes.cpp +++ b/src/gui/themes.cpp @@ -381,6 +381,12 @@ void CThemes::setTheme(CConfigFile &configfile) configfile.setInt32( "colored_events_channellist", t.colored_events_channellist ); configfile.setInt32( "colored_events_infobar", t.colored_events_infobar ); + // channellist + configfile.setInt32("channellist_Description_Text_alpha", t.channellist_Description_Text_alpha); + configfile.setInt32("channellist_Description_Text_red", t.channellist_Description_Text_red); + configfile.setInt32("channellist_Description_Text_green", t.channellist_Description_Text_green); + configfile.setInt32("channellist_Description_Text_blue", t.channellist_Description_Text_blue); + // osd clock configfile.setInt32( "clock_Digit_alpha", t.clock_Digit_alpha ); configfile.setInt32( "clock_Digit_red", t.clock_Digit_red ); @@ -524,6 +530,12 @@ void CThemes::getTheme(CConfigFile &configfile) t.colored_events_channellist = configfile.getInt32( "colored_events_channellist", 0 ); t.colored_events_infobar = configfile.getInt32("colored_events_infobar", 0); /* no bling bling */ + // channellist + t.channellist_Description_Text_alpha = configfile.getInt32("channellist_Description_Text_alpha", 0); + t.channellist_Description_Text_red = configfile.getInt32("channellist_Description_Text_red", 98); + t.channellist_Description_Text_green = configfile.getInt32("channellist_Description_Text_green", 98); + t.channellist_Description_Text_blue = configfile.getInt32("channellist_Description_Text_blue", 98); + // clock 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 ); diff --git a/src/system/locals.h b/src/system/locals.h index b56fcf7fc..58f2917c6 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -390,6 +390,7 @@ typedef enum LOCALE_COLORCHOOSER_GREEN, LOCALE_COLORCHOOSER_RED, LOCALE_COLORMENU_BACKGROUND, + LOCALE_COLORMENU_CHANNELLIST_DESCRIPTION_TEXT, LOCALE_COLORMENU_CLOCK_TEXTCOLOR, LOCALE_COLORMENU_FADE, LOCALE_COLORMENU_FONT, @@ -1319,6 +1320,7 @@ typedef enum LOCALE_MENU_HINT_CLOCK_SECONDS, LOCALE_MENU_HINT_CLOCK_SIZE, LOCALE_MENU_HINT_CLOCK_TEXTCOLOR, + LOCALE_MENU_HINT_COLOR_CHANNELLIST_DESCRIPTION_TEXT, LOCALE_MENU_HINT_COLOR_GRADIENT, LOCALE_MENU_HINT_COLOR_GRADIENT_DIRECTION, LOCALE_MENU_HINT_COLOR_GRADIENT_SEPARATOR_ENABLE, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index fe2d1d14e..c3b77a7d5 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -390,6 +390,7 @@ const char * locale_real_names[] = "colorchooser.green", "colorchooser.red", "colormenu.background", + "colormenu.channellist_description_text", "colormenu.clock_textcolor", "colormenu.fade", "colormenu.font", @@ -1319,6 +1320,7 @@ const char * locale_real_names[] = "menu.hint_clock_seconds", "menu.hint_clock_size", "menu.hint_clock_textcolor", + "menu.hint_color_channellist_description_text", "menu.hint_color_gradient", "menu.hint_color_gradient_direction", "menu.hint_color_gradient_separator_enable", diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp index 511283dcb..6f9516c1b 100644 --- a/src/system/setting_helpers.cpp +++ b/src/system/setting_helpers.cpp @@ -362,6 +362,11 @@ void CColorSetupNotifier::setPalette() convertSetupColor2RGB(t.progressbar_active_red, t.progressbar_active_green, t.progressbar_active_blue), convertSetupAlpha2Alpha(t.menu_Content_alpha)); + // COL_CHANNELLIST_DESCRIPTION_TEXT + frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 22, + convertSetupColor2RGB(t.channellist_Description_Text_red, t.channellist_Description_Text_green, t.channellist_Description_Text_blue), + convertSetupAlpha2Alpha(t.channellist_Description_Text_alpha)); + frameBuffer->paletteSet(); } diff --git a/src/system/settings.h b/src/system/settings.h index f6152dfd3..979ec35a5 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -151,6 +151,12 @@ struct SNeutrinoTheme int colored_events_channellist; int colored_events_infobar; + // channellist + unsigned char channellist_Description_Text_alpha; + unsigned char channellist_Description_Text_red; + unsigned char channellist_Description_Text_green; + unsigned char channellist_Description_Text_blue; + // clock unsigned char clock_Digit_alpha; unsigned char clock_Digit_red;