diff --git a/data/locale/english.locale b/data/locale/english.locale index 6f6dcd567..caf7c43f8 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -276,6 +276,7 @@ clock_size_height Display height clock_switch_off Clock off clock_switch_on Clock on color.gradient Color gradient +color.gradient_c2c Color to color gradient colorchooser.alpha alpha colorchooser.blue blue colorchooser.green green @@ -945,6 +946,7 @@ 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_color_gradient_c2c Switches smooth gradient between 2 colors and one-color gradient 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 diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index cecf7275e..7134d5c67 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -676,6 +676,13 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors) menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_COLORMENUSETUP_MENUHEAD)); + CMenuOptionChooser *oj; + oj = new CMenuOptionChooser(LOCALE_COLOR_GRADIENT_C2C, &g_settings.theme.gradient_c2c, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true ); + oj->OnAfterChangeOption.connect(slot_repaint); + oj->setHint("", LOCALE_MENU_HINT_COLOR_GRADIENT_C2C); + menu_colors->addItem(oj); + menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE)); + mf = new CMenuDForwarder(LOCALE_COLORMENU_BACKGROUND, true, NULL, chHeadcolor ); mf->setHint("", LOCALE_MENU_HINT_HEAD_BACK); menu_colors->addItem(mf); @@ -685,7 +692,6 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors) menu_colors->addItem(mf); // head color gradient - CMenuOptionChooser *oj; oj = new CMenuOptionChooser(LOCALE_COLOR_GRADIENT, &g_settings.theme.menu_Head_gradient, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true ); oj->OnAfterChangeOption.connect(slot_repaint); oj->setHint("", LOCALE_MENU_HINT_COLOR_GRADIENT); diff --git a/src/system/locals.h b/src/system/locals.h index bc08bbe5b..565e32c65 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -303,6 +303,7 @@ typedef enum LOCALE_CLOCK_SWITCH_OFF, LOCALE_CLOCK_SWITCH_ON, LOCALE_COLOR_GRADIENT, + LOCALE_COLOR_GRADIENT_C2C, LOCALE_COLORCHOOSER_ALPHA, LOCALE_COLORCHOOSER_BLUE, LOCALE_COLORCHOOSER_GREEN, @@ -972,6 +973,7 @@ typedef enum LOCALE_MENU_HINT_CLOCK_SIZE, LOCALE_MENU_HINT_CLOCK_TEXTCOLOR, LOCALE_MENU_HINT_COLOR_GRADIENT, + LOCALE_MENU_HINT_COLOR_GRADIENT_C2C, LOCALE_MENU_HINT_COLORED_EVENTS, LOCALE_MENU_HINT_COLORED_EVENTS_TEXTCOLOR, LOCALE_MENU_HINT_COLORS, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 04745e306..3a153598a 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -303,6 +303,7 @@ const char * locale_real_names[] = "clock_switch_off", "clock_switch_on", "color.gradient", + "color.gradient_c2c", "colorchooser.alpha", "colorchooser.blue", "colorchooser.green", @@ -972,6 +973,7 @@ const char * locale_real_names[] = "menu.hint_clock_size", "menu.hint_clock_textcolor", "menu.hint_color_gradient", + "menu.hint_color_gradient_c2c", "menu.hint_colored_events", "menu.hint_colored_events_textcolor", "menu.hint_colors",