diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index caf0de1b8..a892afce9 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -799,9 +799,11 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors) CColorChooser* chHeadcolor = new CColorChooser(LOCALE_COLORMENU_BACKGROUND, &t.menu_Head_red, &t.menu_Head_green, &t.menu_Head_blue, &t.menu_Head_alpha, colorSetupNotifier); chHeadcolor->setGradient(CColorChooser::gradient_head_body); + CColorChooser* chHeadTextcolor = new CColorChooser(LOCALE_COLORMENU_TEXTCOLOR, &t.menu_Head_Text_red, &t.menu_Head_Text_green, &t.menu_Head_Text_blue, NULL, colorSetupNotifier); chHeadTextcolor->setGradient(CColorChooser::gradient_head_text); + CColorChooser* chContentcolor = new CColorChooser(LOCALE_COLORMENU_BACKGROUND, &t.menu_Content_red, &t.menu_Content_green, &t.menu_Content_blue, &t.menu_Content_alpha, colorSetupNotifier); CColorChooser* chContentTextcolor = new CColorChooser(LOCALE_COLORMENU_TEXTCOLOR, &t.menu_Content_Text_red, &t.menu_Content_Text_green, &t.menu_Content_Text_blue, @@ -857,7 +859,22 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors) oj->setHint("", LOCALE_MENU_HINT_COLOR_GRADIENT_DIRECTION); menu_colors->addItem(oj); + menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_COLORMENUSETUP_MENUSUBTITLE_BAR)); + + // sub head color gradient + oj = new CMenuOptionChooser(LOCALE_COLOR_GRADIENT, &g_settings.theme.menu_SubHead_gradient, OPTIONS_COL_GRADIENT_OPTIONS, OPTIONS_COL_GRADIENT_OPTIONS_COUNT, true ); + oj->OnAfterChangeOption.connect(slot_repaint); + oj->setHint("", LOCALE_MENU_HINT_COLOR_GRADIENT); + menu_colors->addItem(oj); + + // sub head color gradient direction + oj = new CMenuOptionChooser(LOCALE_COLOR_GRADIENT_MODE_DIRECTION, &g_settings.theme.menu_SubHead_gradient_direction, OPTIONS_COL_GRADIENT_DIRECTION_OPTIONS, OPTIONS_COL_GRADIENT_DIRECTION_OPTIONS_COUNT, true ); + oj->OnAfterChangeOption.connect(slot_repaint); + oj->setHint("", LOCALE_MENU_HINT_COLOR_GRADIENT_DIRECTION); + menu_colors->addItem(oj); + menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_COLORMENUSETUP_MENUCONTENT)); + mf = new CMenuDForwarder(LOCALE_COLORMENU_BACKGROUND, true, NULL, chContentcolor ); mf->setHint("", LOCALE_MENU_HINT_CONTENT_BACK); menu_colors->addItem(mf); diff --git a/src/system/locals.h b/src/system/locals.h index ec545d7dd..19bb02b51 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -413,6 +413,7 @@ typedef enum LOCALE_COLORMENUSETUP_MENUCONTENT_SELECTED, LOCALE_COLORMENUSETUP_MENUFOOT, LOCALE_COLORMENUSETUP_MENUHEAD, + LOCALE_COLORMENUSETUP_MENUSUBTITLE_BAR, LOCALE_COLORSETUP_SAVE, LOCALE_COLORSTATUSBAR_TEXT, LOCALE_COLORTHEMEMENU_HEAD, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index ab1b02c61..7c91307c6 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -413,6 +413,7 @@ const char * locale_real_names[] = "colormenusetup.menucontent_selected", "colormenusetup.menufoot", "colormenusetup.menuhead", + "colormenusetup.menusubtitle_bar", "colorsetup.save", "colorstatusbar.text", "colorthememenu.head",