mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 07:23:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

OSD Menu: Add progressbar color

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>

- themes/Makefile.am unchanged, build was broken
- whitespace errors fixed
- unnecessary comments removed
- bump lua api version, was missed
This commit is contained in:
FlatTV
2016-12-26 14:58:51 +01:00
committed by Thilo Graf
parent 2162aa6970
commit 1652faecff
13 changed files with 82 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/locale/deutsch.locale
View File

@@ -328,6 +328,8 @@ colormenu.font_ttx Teletext Schriftart
colormenu.menucolors Farben
colormenu.osd_preset Monitor Auswahl
colormenu.osd_resolution OSD-Auflösung
colormenu.progressbar_active Farbe des aktiven Teil
colormenu.progressbar_passive Hintergrundfarbe
colormenu.shadow_color Schattenfarbe
colormenu.textcolor Textfarbe
colormenu.themeselect Theme auswählen
@@ -1280,9 +1282,11 @@ menu.hint_power_leds Konfiguriert das Verhalten der LEDs an der Power-Taste
menu.hint_pref_lang Wählen Sie ihre bevorzugte Tonspur und EPG-Sprache,\ndie Einstellung 'none' deaktiviert diese Option
menu.hint_pref_subs Wählen Sie ihre bevorzugte Untertitel-Sprache,\ndie Einstellung 'none' deaktiviert diese Option
menu.hint_progressbar Wählen Sie die Optionen für die Fortschrittsbalken-Anzeige
menu.hint_progressbar_active Ändern Sie die Farbe für den aktiven Teil der Fortschrittsbalken-Anzeige
menu.hint_progressbar_color Erscheinungsbild der Fortschrittsbalken auswählen
menu.hint_progressbar_gradient Fügt dem Fortschrittsbalken einen vertikalen Helligkeitsverlauf hinzu.
menu.hint_progressbar_infobar_position Wählt die Optionen des Fortschrittsbalkens in der Infobar
menu.hint_progressbar_passive Ändern Sie die Farbe für den Hintergrund der Fortschrittsbalken-Anzeige
menu.hint_progressbar_preview Mit der OK-Taste können Sie den Stand des Fortschrittsbalkens ändern
menu.hint_progressbar_timescale_green Hier können Sie den grünen Farbanteil bunter Fortschrittsbalken anpassen
menu.hint_progressbar_timescale_invert Wählen Sie den Farbverlauf

4
data/locale/english.locale
View File

@@ -328,6 +328,8 @@ colormenu.font_ttx Select Teletext font
colormenu.menucolors Colors
colormenu.osd_preset TV preset
colormenu.osd_resolution OSD resolution
colormenu.progressbar_active Active part color
colormenu.progressbar_passive Background
colormenu.shadow_color Shadow Color
colormenu.textcolor Text color
colormenu.themeselect Select theme
@@ -1280,9 +1282,11 @@ menu.hint_power_leds Configure power-button LEDs behavior
menu.hint_pref_lang Select preferred audio and EPG language\nselect 'none' to disable
menu.hint_pref_subs Select preferred subtitle language\nselect 'none' to disable
menu.hint_progressbar Select the options for the progressbar
menu.hint_progressbar_active Change color of active progress bar part
menu.hint_progressbar_color Change appearance of progress bars
menu.hint_progressbar_gradient Add a vertical brightness gradient to progress bars
menu.hint_progressbar_infobar_position Selects the options of progressbar in the infobar
menu.hint_progressbar_passive Change color of passive progress bar part
menu.hint_progressbar_preview Use OK to change the current progressbar state
menu.hint_progressbar_timescale_green Choose the green portion of colored progressbars
menu.hint_progressbar_timescale_invert Select your preferred color gradient

2
src/gui/channellist.cpp
View File

@@ -2062,7 +2062,7 @@ void CChannelList::paintItem(int pos, const bool firstpaint)
pb.setType(CProgressBar::PB_TIMESCALE);
pb.setDesign(g_settings.theme.progressbar_design_channellist);
pb.setCornerType(0);
pb.setStatusColors(COL_MENUCONTENT_PLUS_3, COL_MENUCONTENT_PLUS_1);
pb.setStatusColors(COL_PROGRESSBAR_ACTIVE_PLUS_0, COL_PROGRESSBAR_PASSIVE_PLUS_0);
int pb_frame = FRAME_WIDTH_NONE;
if (g_settings.theme.progressbar_design_channellist == CProgressBar::PB_MONO && !g_settings.theme.progressbar_gradient)
{

6
src/gui/color.h
View File

@@ -37,6 +37,7 @@
#define COL_MAXFREE 254-8*16 - 1
#define COL_NEUTRINO_TEXT 254-8*16 // 32 values?
#define COL_PROGRESSBAR 254-8*12
#define COL_MENUFOOT 254-8*11
#define COL_INFOBAR_CASYSTEM 254-8*10
#define COL_COLORED_EVENTS_CHANNELLIST 254-8*9
@@ -75,6 +76,7 @@
#define COL_MENUCONTENTINACTIVE_PLUS_0 (COL_MENUCONTENTINACTIVE + 0)
#define COL_MENUFOOT_PLUS_0 (COL_MENUFOOT + 0)
#define COL_BACKGROUND_PLUS_0 (COL_BACKGROUND + 0)
#define COL_PROGRESSBAR_PASSIVE_PLUS_0 (COL_PROGRESSBAR + 0)
#else
#define COL_SHADOW_PLUS_0 (CFrameBuffer::getInstance()->realcolor[(COL_SHADOW + 0)])
#define COL_INFOBAR_PLUS_0 (CFrameBuffer::getInstance()->realcolor[(COL_INFOBAR + 0)])
@@ -99,6 +101,7 @@
#define COL_MENUCONTENTINACTIVE_PLUS_0 (CFrameBuffer::getInstance()->realcolor[(COL_MENUCONTENTINACTIVE + 0)])
#define COL_MENUFOOT_PLUS_0 (CFrameBuffer::getInstance()->realcolor[(COL_MENUFOOT + 0)])
#define COL_BACKGROUND_PLUS_0 (CFrameBuffer::getInstance()->realcolor[(COL_BACKGROUND + 0)])
#define COL_PROGRESSBAR_PASSIVE_PLUS_0 (CFrameBuffer::getInstance()->realcolor[(COL_PROGRESSBAR + 0)])
// text colors
#define COL_COLORED_EVENTS_TEXT (CFrameBuffer::getInstance()->realcolor[(COL_NEUTRINO_TEXT + 0)])
@@ -117,6 +120,7 @@
#define COL_MENUCONTENTSELECTED_TEXT_PLUS_2 (CFrameBuffer::getInstance()->realcolor[(COL_NEUTRINO_TEXT + 13)])
#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)])
#endif
// some wrappers to get more readability
@@ -130,10 +134,12 @@
#define COL_SCROLLBAR_PASSIVE COL_MENUCONTENT_PLUS_2
#define COL_SCROLLBAR_PASSIVE_PLUS_0 COL_SCROLLBAR_PASSIVE
/*
#define COL_PROGRESSBAR_ACTIVE COL_MENUCONTENT_PLUS_7
#define COL_PROGRESSBAR_ACTIVE_PLUS_0 COL_PROGRESSBAR_ACTIVE
#define COL_PROGRESSBAR_PASSIVE COL_MENUCONTENT_PLUS_1
#define COL_PROGRESSBAR_PASSIVE_PLUS_0 COL_PROGRESSBAR_PASSIVE
*/
int convertSetupColor2RGB(unsigned char r, unsigned char g, unsigned char b);
int convertSetupAlpha2Alpha(unsigned char alpha);

8
src/gui/infoviewer.cpp
View File

@@ -1659,8 +1659,8 @@ void CInfoViewer::showSNR ()
sigbox = new CSignalBox(BoxStartX + sigbox_offset, y_numbox+ChanHeight/2, ChanWidth - 2*sigbox_offset, ChanHeight/2, NULL, true, NULL, "S", "Q");
sigbox->setItemName("SIGBOX");
sigbox->setTextColor(COL_INFOBAR_TEXT);
sigbox->setActiveColor(COL_INFOBAR_PLUS_7);
sigbox->setPassiveColor(COL_INFOBAR_PLUS_3);
sigbox->setActiveColor(COL_PROGRESSBAR_ACTIVE_PLUS_0);
sigbox->setPassiveColor(COL_PROGRESSBAR_PASSIVE_PLUS_0);
sigbox->setColorBody(numbox->getColorBody());
sigbox->doPaintBg(false);
sigbox->enableTboxSaveScreen(numbox->getColBodyGradientMode());
@@ -1749,8 +1749,8 @@ void CInfoViewer::display_Info(const char *current, const char *next,
pb_p = pb_w;
timescale->setDimensionsAll(pb_startx, pb_starty, pb_w, pb_h);
timescale->setActiveColor(COL_INFOBAR_PLUS_7);
timescale->setPassiveColor(g_settings.infobar_progressbar ? COL_INFOBAR_PLUS_1 : COL_INFOBAR_PLUS_0);
timescale->setActiveColor(COL_PROGRESSBAR_ACTIVE_PLUS_0);
timescale->setPassiveColor(g_settings.infobar_progressbar ? COL_PROGRESSBAR_PASSIVE_PLUS_0 : COL_INFOBAR_PLUS_0);
timescale->enableShadow(!g_settings.infobar_progressbar ? CC_SHADOW_ON : CC_SHADOW_OFF, OFFSET_SHADOW/2);
timescale->setValues(pb_p, pb_w);
}else{

2
src/gui/lua/lua_api_version.h
View File

@@ -4,4 +4,4 @@
* to luainstance.h changes
*/
#define LUA_API_VERSION_MAJOR 1
#define LUA_API_VERSION_MINOR 78
#define LUA_API_VERSION_MINOR 79

4
src/gui/lua/luainstance.cpp
View File

@@ -183,8 +183,8 @@ static void set_lua_variables(lua_State *L)
{ "SCROLLBAR", MAGIC_COLOR | (COL_SCROLLBAR) },
{ "SCROLLBAR_ACTIVE", MAGIC_COLOR | (COL_SCROLLBAR_ACTIVE) },
{ "SCROLLBAR_PASSIVE", MAGIC_COLOR | (COL_SCROLLBAR_PASSIVE) },
{ "PROGRESSBAR_ACTIVE", MAGIC_COLOR | (COL_PROGRESSBAR_ACTIVE) },
{ "PROGRESSBAR_PASSIVE", MAGIC_COLOR | (COL_PROGRESSBAR_PASSIVE) },
{ "PROGRESSBAR_ACTIVE", MAGIC_COLOR | (COL_PROGRESSBAR_ACTIVE_PLUS_0) },
{ "PROGRESSBAR_PASSIVE", MAGIC_COLOR | (COL_PROGRESSBAR_PASSIVE_PLUS_0) },
{ "BACKGROUND", MAGIC_COLOR | (COL_BACKGROUND) },
{ "DARK_RED", MAGIC_COLOR | (COL_DARK_RED0) },
{ "DARK_GREEN", MAGIC_COLOR | (COL_DARK_GREEN0) },

19
src/gui/osd_setup.cpp
View File

@@ -791,6 +791,12 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors)
CColorChooser* chShadowColor = new CColorChooser(LOCALE_COLORMENU_SHADOW_COLOR, &t.shadow_red, &t.shadow_green, &t.shadow_blue,
&t.shadow_alpha, colorSetupNotifier);
// progress bar colors
CColorChooser* chProgressbar_passive = new CColorChooser(LOCALE_COLORMENU_PROGRESSBAR_PASSIVE, &t.progressbar_passive_red, &t.progressbar_passive_green, &t.progressbar_passive_blue,
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);
menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_COLORMENUSETUP_MENUHEAD));
CMenuOptionChooser *oj;
@@ -962,6 +968,19 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors)
mf = new CMenuDForwarder(LOCALE_COLORMENU_SHADOW_COLOR, true, NULL, chShadowColor );
mf->setHint("", LOCALE_MENU_HINT_COLORS_SHADOW);
menu_colors->addItem(mf);
// progressbar
menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_MISCSETTINGS_PROGRESSBAR));
// progressbar passive
mf = new CMenuDForwarder(LOCALE_COLORMENU_PROGRESSBAR_PASSIVE, true, NULL, chProgressbar_passive );
mf->setHint("", LOCALE_MENU_HINT_PROGRESSBAR_PASSIVE);
menu_colors->addItem(mf);
// progressbar aktive
mf = new CMenuDForwarder(LOCALE_COLORMENU_PROGRESSBAR_ACTIVE, true, NULL, chProgressbar_active );
mf->setHint("", LOCALE_MENU_HINT_PROGRESSBAR_ACTIVE);
menu_colors->addItem(mf);
}
/* for font size setup */

16
src/gui/themes.cpp
View File

@@ -334,6 +334,14 @@ void CThemes::setTheme(CConfigFile &configfile)
configfile.setInt32( "shadow_red", t.shadow_red );
configfile.setInt32( "shadow_green", t.shadow_green );
configfile.setInt32( "shadow_blue", t.shadow_blue );
// progressbar
configfile.setInt32( "progressbar_active_red", t.progressbar_active_red );
configfile.setInt32( "progressbar_active_green", t.progressbar_active_green );
configfile.setInt32( "progressbar_active_blue", t.progressbar_active_blue );
configfile.setInt32( "progressbar_passive_red", t.progressbar_passive_red );
configfile.setInt32( "progressbar_passive_green", t.progressbar_passive_green );
configfile.setInt32( "progressbar_passive_blue", t.progressbar_passive_blue );
}
void CThemes::getTheme(CConfigFile &configfile)
@@ -438,6 +446,14 @@ void CThemes::getTheme(CConfigFile &configfile)
t.shadow_red = configfile.getInt32( "shadow_red", 8 );
t.shadow_green = configfile.getInt32( "shadow_green", 8);
t.shadow_blue = configfile.getInt32( "shadow_blue", 8 );
// progressbar
t.progressbar_active_red = configfile.getInt32( "progressbar_active_red", 98 );
t.progressbar_active_green = configfile.getInt32( "progressbar_active_green", 98 );
t.progressbar_active_blue = configfile.getInt32( "progressbar_active_blue", 98 );
t.progressbar_passive_red = configfile.getInt32( "progressbar_passive_red", 60 );
t.progressbar_passive_green = configfile.getInt32( "progressbar_passive_green", 60 );
t.progressbar_passive_blue = configfile.getInt32( "progressbar_passive_blue", 60 );
}
void CThemes::move_userDir()

4
src/system/locals.h
View File

@@ -355,6 +355,8 @@ typedef enum
LOCALE_COLORMENU_MENUCOLORS,
LOCALE_COLORMENU_OSD_PRESET,
LOCALE_COLORMENU_OSD_RESOLUTION,
LOCALE_COLORMENU_PROGRESSBAR_ACTIVE,
LOCALE_COLORMENU_PROGRESSBAR_PASSIVE,
LOCALE_COLORMENU_SHADOW_COLOR,
LOCALE_COLORMENU_TEXTCOLOR,
LOCALE_COLORMENU_THEMESELECT,
@@ -1307,9 +1309,11 @@ typedef enum
LOCALE_MENU_HINT_PREF_LANG,
LOCALE_MENU_HINT_PREF_SUBS,
LOCALE_MENU_HINT_PROGRESSBAR,
LOCALE_MENU_HINT_PROGRESSBAR_ACTIVE,
LOCALE_MENU_HINT_PROGRESSBAR_COLOR,
LOCALE_MENU_HINT_PROGRESSBAR_GRADIENT,
LOCALE_MENU_HINT_PROGRESSBAR_INFOBAR_POSITION,
LOCALE_MENU_HINT_PROGRESSBAR_PASSIVE,
LOCALE_MENU_HINT_PROGRESSBAR_PREVIEW,
LOCALE_MENU_HINT_PROGRESSBAR_TIMESCALE_GREEN,
LOCALE_MENU_HINT_PROGRESSBAR_TIMESCALE_INVERT,

4
src/system/locals_intern.h
View File

@@ -355,6 +355,8 @@ const char * locale_real_names[] =
"colormenu.menucolors",
"colormenu.osd_preset",
"colormenu.osd_resolution",
"colormenu.progressbar_active",
"colormenu.progressbar_passive",
"colormenu.shadow_color",
"colormenu.textcolor",
"colormenu.themeselect",
@@ -1307,9 +1309,11 @@ const char * locale_real_names[] =
"menu.hint_pref_lang",
"menu.hint_pref_subs",
"menu.hint_progressbar",
"menu.hint_progressbar_active",
"menu.hint_progressbar_color",
"menu.hint_progressbar_gradient",
"menu.hint_progressbar_infobar_position",
"menu.hint_progressbar_passive",
"menu.hint_progressbar_preview",
"menu.hint_progressbar_timescale_green",
"menu.hint_progressbar_timescale_invert",

10
src/system/setting_helpers.cpp
View File

@@ -198,6 +198,11 @@ void CColorSetupNotifier::setPalette()
convertSetupColor2RGB(t.colored_events_red, t.colored_events_green, t.colored_events_blue),
8, convertSetupAlpha2Alpha(t.infobar_alpha) );
frameBuffer->paletteGenFade(COL_PROGRESSBAR,
convertSetupColor2RGB(t.progressbar_passive_red, t.progressbar_passive_green, t.progressbar_passive_blue),
convertSetupColor2RGB(t.progressbar_active_red, t.progressbar_active_green, t.progressbar_active_blue),
8, convertSetupAlpha2Alpha(t.menu_Content_alpha));
// ##### TEXT COLORS #####
// COL_COLORED_EVENTS_TEXT
frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 0,
@@ -279,6 +284,11 @@ void CColorSetupNotifier::setPalette()
convertSetupColor2RGB(t.clock_Digit_red, t.clock_Digit_green, t.clock_Digit_blue),
convertSetupAlpha2Alpha(t.clock_Digit_alpha));
// COL_PROGRESSBAR_ACTIVE
frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 16,
convertSetupColor2RGB(t.progressbar_active_red, t.progressbar_active_green, t.progressbar_active_blue),
convertSetupAlpha2Alpha(t.menu_Content_alpha));
frameBuffer->paletteSet();
}

7
src/system/settings.h
View File

@@ -162,6 +162,13 @@ struct SNeutrinoTheme
unsigned char shadow_red;
unsigned char shadow_green;
unsigned char shadow_blue;
unsigned char progressbar_active_red;
unsigned char progressbar_active_green;
unsigned char progressbar_active_blue;
unsigned char progressbar_passive_red;
unsigned char progressbar_passive_green;
unsigned char progressbar_passive_blue;
};
struct timer_remotebox_item