diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 8c9200c7d..c324feb66 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -383,6 +383,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 @@ -1376,6 +1377,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 9d8e3a0d6..7b6b5a9e9 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -383,6 +383,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 @@ -1376,6 +1377,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 bb53d3073..250856233 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; @@ -2217,12 +2218,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 bf41850bc..23db88cba 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_1 //NI diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index a037fb01d..d611caa9d 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -830,6 +830,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)); @@ -977,6 +980,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 30173a2c6..778881191 100644 --- a/src/gui/themes.cpp +++ b/src/gui/themes.cpp @@ -400,6 +400,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); @@ -540,6 +546,12 @@ void CThemes::getTheme(CConfigFile &configfile) t.colored_events_channellist = configfile.getInt32("colored_events_channellist", 1); t.colored_events_infobar = configfile.getInt32("colored_events_infobar", 1); + // 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", 0); t.clock_Digit_red = configfile.getInt32("clock_Digit_red", 62); diff --git a/src/system/locals.h b/src/system/locals.h index a537415b4..7ef45df26 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -410,6 +410,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, @@ -1403,6 +1404,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 e98181c0e..1f7a2178a 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -410,6 +410,7 @@ const char * locale_real_names[] = "colorchooser.green", "colorchooser.red", "colormenu.background", + "colormenu.channellist_description_text", "colormenu.clock_textcolor", "colormenu.fade", "colormenu.font", @@ -1403,6 +1404,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 0a92cbd7b..4ae819fe0 100644 --- a/src/system/setting_helpers.cpp +++ b/src/system/setting_helpers.cpp @@ -400,6 +400,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 8dbc969cf..461358fbc 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;