mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 00:41:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

gui/osd_setup.cpp: add option to switch one/two color gradient mode

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 56070ca390
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-05-07 (Thu, 07 May 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2015-05-07 16:40:29 +03:00
parent 1e735c19df
commit 3764627637
4 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/locale/english.locale
View File

@@ -276,6 +276,7 @@ clock_size_height Display height
clock_switch_off Clock off clock_switch_off Clock off
clock_switch_on Clock on clock_switch_on Clock on
color.gradient Color gradient color.gradient Color gradient
color.gradient_c2c Color to color gradient
colorchooser.alpha alpha colorchooser.alpha alpha
colorchooser.blue blue colorchooser.blue blue
colorchooser.green green 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_size Set the size of the info clock
menu.hint_clock_textcolor Configure digit colors menu.hint_clock_textcolor Configure digit colors
menu.hint_color_gradient Switches color gradients for various menu items on/off 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 Use different color for current or next event
menu.hint_colored_events_textcolor Change color for colored events in channellist and infobar menu.hint_colored_events_textcolor Change color for colored events in channellist and infobar
menu.hint_colors Configure GUI colors menu.hint_colors Configure GUI colors

8
src/gui/osd_setup.cpp
View File

@@ -676,6 +676,13 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors)
menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_COLORMENUSETUP_MENUHEAD)); 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 = new CMenuDForwarder(LOCALE_COLORMENU_BACKGROUND, true, NULL, chHeadcolor );
mf->setHint("", LOCALE_MENU_HINT_HEAD_BACK); mf->setHint("", LOCALE_MENU_HINT_HEAD_BACK);
menu_colors->addItem(mf); menu_colors->addItem(mf);
@@ -685,7 +692,6 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors)
menu_colors->addItem(mf); menu_colors->addItem(mf);
// head color gradient // 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 = 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->OnAfterChangeOption.connect(slot_repaint);
oj->setHint("", LOCALE_MENU_HINT_COLOR_GRADIENT); oj->setHint("", LOCALE_MENU_HINT_COLOR_GRADIENT);

2
src/system/locals.h
View File

@@ -303,6 +303,7 @@ typedef enum
LOCALE_CLOCK_SWITCH_OFF, LOCALE_CLOCK_SWITCH_OFF,
LOCALE_CLOCK_SWITCH_ON, LOCALE_CLOCK_SWITCH_ON,
LOCALE_COLOR_GRADIENT, LOCALE_COLOR_GRADIENT,
LOCALE_COLOR_GRADIENT_C2C,
LOCALE_COLORCHOOSER_ALPHA, LOCALE_COLORCHOOSER_ALPHA,
LOCALE_COLORCHOOSER_BLUE, LOCALE_COLORCHOOSER_BLUE,
LOCALE_COLORCHOOSER_GREEN, LOCALE_COLORCHOOSER_GREEN,
@@ -972,6 +973,7 @@ typedef enum
LOCALE_MENU_HINT_CLOCK_SIZE, LOCALE_MENU_HINT_CLOCK_SIZE,
LOCALE_MENU_HINT_CLOCK_TEXTCOLOR, LOCALE_MENU_HINT_CLOCK_TEXTCOLOR,
LOCALE_MENU_HINT_COLOR_GRADIENT, LOCALE_MENU_HINT_COLOR_GRADIENT,
LOCALE_MENU_HINT_COLOR_GRADIENT_C2C,
LOCALE_MENU_HINT_COLORED_EVENTS, LOCALE_MENU_HINT_COLORED_EVENTS,
LOCALE_MENU_HINT_COLORED_EVENTS_TEXTCOLOR, LOCALE_MENU_HINT_COLORED_EVENTS_TEXTCOLOR,
LOCALE_MENU_HINT_COLORS, LOCALE_MENU_HINT_COLORS,

2
src/system/locals_intern.h
View File

@@ -303,6 +303,7 @@ const char * locale_real_names[] =
"clock_switch_off", "clock_switch_off",
"clock_switch_on", "clock_switch_on",
"color.gradient", "color.gradient",
"color.gradient_c2c",
"colorchooser.alpha", "colorchooser.alpha",
"colorchooser.blue", "colorchooser.blue",
"colorchooser.green", "colorchooser.green",
@@ -972,6 +973,7 @@ const char * locale_real_names[] =
"menu.hint_clock_size", "menu.hint_clock_size",
"menu.hint_clock_textcolor", "menu.hint_clock_textcolor",
"menu.hint_color_gradient", "menu.hint_color_gradient",
"menu.hint_color_gradient_c2c",
"menu.hint_colored_events", "menu.hint_colored_events",
"menu.hint_colored_events_textcolor", "menu.hint_colored_events_textcolor",
"menu.hint_colors", "menu.hint_colors",