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

remove NI-tags from progressbar color code

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 75fc656e49
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-04-11 (Wed, 11 Apr 2018)

Origin message was:
------------------
- remove NI-tags from progressbar color code

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2018-04-11 23:58:15 +02:00
parent c71c6ce0ac
commit 9800bec147
9 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/locale/english.locale
View File

@@ -1489,7 +1489,7 @@ menu.hint_progressbar_active Change color of active progress bar part
menu.hint_progressbar_color Change appearance of progress bars menu.hint_progressbar_color Change appearance of progress bars
menu.hint_progressbar_gradient Add a vertical brightness gradient to 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_infobar_position Selects the options of progressbar in the infobar
menu.hint_progressbar_passive Change color of passive progress bar part 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_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_green Choose the green portion of colored progressbars
menu.hint_progressbar_timescale_invert Select your preferred color gradient menu.hint_progressbar_timescale_invert Select your preferred color gradient

2
src/gui/channellist.cpp
View File

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

10
src/gui/color.h
View File

@@ -37,7 +37,7 @@
#define COL_MAXFREE 254-8*16 - 1 #define COL_MAXFREE 254-8*16 - 1
#define COL_NEUTRINO_TEXT 254-8*16 // 32 values? #define COL_NEUTRINO_TEXT 254-8*16 // 32 values?
#define COL_PROGRESSBAR 254-8*12 //NI #define COL_PROGRESSBAR 254-8*12
#define COL_MENUFOOT 254-8*11 #define COL_MENUFOOT 254-8*11
#define COL_INFOBAR_CASYSTEM 254-8*10 #define COL_INFOBAR_CASYSTEM 254-8*10
#define COL_COLORED_EVENTS_CHANNELLIST 254-8*9 #define COL_COLORED_EVENTS_CHANNELLIST 254-8*9
@@ -76,7 +76,7 @@
#define COL_MENUCONTENTINACTIVE_PLUS_0 (COL_MENUCONTENTINACTIVE + 0) #define COL_MENUCONTENTINACTIVE_PLUS_0 (COL_MENUCONTENTINACTIVE + 0)
#define COL_MENUFOOT_PLUS_0 (COL_MENUFOOT + 0) #define COL_MENUFOOT_PLUS_0 (COL_MENUFOOT + 0)
#define COL_BACKGROUND_PLUS_0 (COL_BACKGROUND + 0) #define COL_BACKGROUND_PLUS_0 (COL_BACKGROUND + 0)
#define COL_PROGRESSBAR_PASSIVE_PLUS_0 (COL_PROGRESSBAR + 0) //NI #define COL_PROGRESSBAR_PASSIVE_PLUS_0 (COL_PROGRESSBAR + 0)
#else #else
#define COL_SHADOW_PLUS_0 (CFrameBuffer::getInstance()->realcolor[(COL_SHADOW + 0)]) #define COL_SHADOW_PLUS_0 (CFrameBuffer::getInstance()->realcolor[(COL_SHADOW + 0)])
#define COL_INFOBAR_PLUS_0 (CFrameBuffer::getInstance()->realcolor[(COL_INFOBAR + 0)]) #define COL_INFOBAR_PLUS_0 (CFrameBuffer::getInstance()->realcolor[(COL_INFOBAR + 0)])
@@ -101,7 +101,7 @@
#define COL_MENUCONTENTINACTIVE_PLUS_0 (CFrameBuffer::getInstance()->realcolor[(COL_MENUCONTENTINACTIVE + 0)]) #define COL_MENUCONTENTINACTIVE_PLUS_0 (CFrameBuffer::getInstance()->realcolor[(COL_MENUCONTENTINACTIVE + 0)])
#define COL_MENUFOOT_PLUS_0 (CFrameBuffer::getInstance()->realcolor[(COL_MENUFOOT + 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_BACKGROUND_PLUS_0 (CFrameBuffer::getInstance()->realcolor[(COL_BACKGROUND + 0)])
#define COL_PROGRESSBAR_PASSIVE_PLUS_0 (CFrameBuffer::getInstance()->realcolor[(COL_PROGRESSBAR + 0)]) //NI #define COL_PROGRESSBAR_PASSIVE_PLUS_0 (CFrameBuffer::getInstance()->realcolor[(COL_PROGRESSBAR + 0)])
// text colors // text colors
#define COL_COLORED_EVENTS_TEXT (CFrameBuffer::getInstance()->realcolor[(COL_NEUTRINO_TEXT + 0)]) #define COL_COLORED_EVENTS_TEXT (CFrameBuffer::getInstance()->realcolor[(COL_NEUTRINO_TEXT + 0)])
@@ -120,7 +120,7 @@
#define COL_MENUCONTENTSELECTED_TEXT_PLUS_2 (CFrameBuffer::getInstance()->realcolor[(COL_NEUTRINO_TEXT + 13)]) #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_MENUCONTENTINACTIVE_TEXT (CFrameBuffer::getInstance()->realcolor[(COL_NEUTRINO_TEXT + 14)])
#define COL_INFOCLOCK_TEXT (CFrameBuffer::getInstance()->realcolor[(COL_NEUTRINO_TEXT + 15)]) #define COL_INFOCLOCK_TEXT (CFrameBuffer::getInstance()->realcolor[(COL_NEUTRINO_TEXT + 15)])
#define COL_PROGRESSBAR_ACTIVE_PLUS_0 (CFrameBuffer::getInstance()->realcolor[(COL_NEUTRINO_TEXT + 16)]) //NI #define COL_PROGRESSBAR_ACTIVE_PLUS_0 (CFrameBuffer::getInstance()->realcolor[(COL_NEUTRINO_TEXT + 16)])
#endif #endif
// some wrappers to get more readability // some wrappers to get more readability
@@ -134,7 +134,7 @@
#define COL_SCROLLBAR_PASSIVE COL_MENUCONTENT_PLUS_2 #define COL_SCROLLBAR_PASSIVE COL_MENUCONTENT_PLUS_2
#define COL_SCROLLBAR_PASSIVE_PLUS_0 COL_SCROLLBAR_PASSIVE #define COL_SCROLLBAR_PASSIVE_PLUS_0 COL_SCROLLBAR_PASSIVE
/* //NI /*
#define COL_PROGRESSBAR_ACTIVE COL_MENUCONTENT_PLUS_7 #define COL_PROGRESSBAR_ACTIVE COL_MENUCONTENT_PLUS_7
#define COL_PROGRESSBAR_ACTIVE_PLUS_0 COL_PROGRESSBAR_ACTIVE #define COL_PROGRESSBAR_ACTIVE_PLUS_0 COL_PROGRESSBAR_ACTIVE
#define COL_PROGRESSBAR_PASSIVE COL_MENUCONTENT_PLUS_1 #define COL_PROGRESSBAR_PASSIVE COL_MENUCONTENT_PLUS_1

8
src/gui/infoviewer.cpp
View File

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

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

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

9
src/gui/osd_setup.cpp
View File

@@ -818,10 +818,9 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors)
NULL, colorSetupNotifier); NULL, colorSetupNotifier);
CColorChooser* chShadowColor = new CColorChooser(LOCALE_COLORMENU_SHADOW_COLOR, &t.shadow_red, &t.shadow_green, &t.shadow_blue, CColorChooser* chShadowColor = new CColorChooser(LOCALE_COLORMENU_SHADOW_COLOR, &t.shadow_red, &t.shadow_green, &t.shadow_blue,
&t.shadow_alpha, colorSetupNotifier); &t.shadow_alpha, colorSetupNotifier);
//NI // progress bar colors
CColorChooser* chProgressbar_passive = new CColorChooser(LOCALE_COLORMENU_PROGRESSBAR_PASSIVE, &t.progressbar_passive_red, &t.progressbar_passive_green, &t.progressbar_passive_blue, CColorChooser* chProgressbar_passive = new CColorChooser(LOCALE_COLORMENU_PROGRESSBAR_PASSIVE, &t.progressbar_passive_red, &t.progressbar_passive_green, &t.progressbar_passive_blue,
NULL, colorSetupNotifier); NULL, colorSetupNotifier);
//NI
CColorChooser* chProgressbar_active = new CColorChooser(LOCALE_COLORMENU_PROGRESSBAR_ACTIVE, &t.progressbar_active_red, &t.progressbar_active_green, &t.progressbar_active_blue, CColorChooser* chProgressbar_active = new CColorChooser(LOCALE_COLORMENU_PROGRESSBAR_ACTIVE, &t.progressbar_active_red, &t.progressbar_active_green, &t.progressbar_active_blue,
NULL, colorSetupNotifier); NULL, colorSetupNotifier);
@@ -997,15 +996,15 @@ void COsdSetup::showOsdMenueColorSetup(CMenuWidget *menu_colors)
mf->setHint("", LOCALE_MENU_HINT_COLORS_SHADOW); mf->setHint("", LOCALE_MENU_HINT_COLORS_SHADOW);
menu_colors->addItem(mf); menu_colors->addItem(mf);
//NI progressbar // progressbar
menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_MISCSETTINGS_PROGRESSBAR)); menu_colors->addItem( new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_MISCSETTINGS_PROGRESSBAR));
//NI - progressbar passive // progressbar passive
mf = new CMenuDForwarder(LOCALE_COLORMENU_PROGRESSBAR_PASSIVE, true, NULL, chProgressbar_passive ); mf = new CMenuDForwarder(LOCALE_COLORMENU_PROGRESSBAR_PASSIVE, true, NULL, chProgressbar_passive );
mf->setHint("", LOCALE_MENU_HINT_PROGRESSBAR_PASSIVE); mf->setHint("", LOCALE_MENU_HINT_PROGRESSBAR_PASSIVE);
menu_colors->addItem(mf); menu_colors->addItem(mf);
//NI - progressbar aktive // progressbar active
mf = new CMenuDForwarder(LOCALE_COLORMENU_PROGRESSBAR_ACTIVE, true, NULL, chProgressbar_active ); mf = new CMenuDForwarder(LOCALE_COLORMENU_PROGRESSBAR_ACTIVE, true, NULL, chProgressbar_active );
mf->setHint("", LOCALE_MENU_HINT_PROGRESSBAR_ACTIVE); mf->setHint("", LOCALE_MENU_HINT_PROGRESSBAR_ACTIVE);
menu_colors->addItem(mf); menu_colors->addItem(mf);

4
src/gui/themes.cpp
View File

@@ -335,7 +335,7 @@ void CThemes::setTheme(CConfigFile &configfile)
configfile.setInt32( "shadow_green", t.shadow_green ); configfile.setInt32( "shadow_green", t.shadow_green );
configfile.setInt32( "shadow_blue", t.shadow_blue ); configfile.setInt32( "shadow_blue", t.shadow_blue );
//NI // progressbar
configfile.setInt32( "progressbar_active_red", t.progressbar_active_red ); configfile.setInt32( "progressbar_active_red", t.progressbar_active_red );
configfile.setInt32( "progressbar_active_green", t.progressbar_active_green ); configfile.setInt32( "progressbar_active_green", t.progressbar_active_green );
configfile.setInt32( "progressbar_active_blue", t.progressbar_active_blue ); configfile.setInt32( "progressbar_active_blue", t.progressbar_active_blue );
@@ -447,7 +447,7 @@ void CThemes::getTheme(CConfigFile &configfile)
t.shadow_green = configfile.getInt32( "shadow_green", 0 ); t.shadow_green = configfile.getInt32( "shadow_green", 0 );
t.shadow_blue = configfile.getInt32( "shadow_blue", 0 ); t.shadow_blue = configfile.getInt32( "shadow_blue", 0 );
//NI // progressbar
t.progressbar_active_red = configfile.getInt32( "progressbar_active_red", 62 ); t.progressbar_active_red = configfile.getInt32( "progressbar_active_red", 62 );
t.progressbar_active_green = configfile.getInt32( "progressbar_active_green", 62 ); t.progressbar_active_green = configfile.getInt32( "progressbar_active_green", 62 );
t.progressbar_active_blue = configfile.getInt32( "progressbar_active_blue", 62 ); t.progressbar_active_blue = configfile.getInt32( "progressbar_active_blue", 62 );

4
src/system/setting_helpers.cpp
View File

@@ -313,7 +313,7 @@ void CColorSetupNotifier::setPalette()
convertSetupColor2RGB(int(t.menu_Content_red*0.6), int(t.menu_Content_green*0.6), int(t.menu_Content_blue*0.6)), convertSetupColor2RGB(int(t.menu_Content_red*0.6), int(t.menu_Content_green*0.6), int(t.menu_Content_blue*0.6)),
convertSetupColor2RGB(t.colored_events_red, t.colored_events_green, t.colored_events_blue), convertSetupColor2RGB(t.colored_events_red, t.colored_events_green, t.colored_events_blue),
8, convertSetupAlpha2Alpha(t.infobar_alpha) ); 8, convertSetupAlpha2Alpha(t.infobar_alpha) );
//NI
frameBuffer->paletteGenFade(COL_PROGRESSBAR, frameBuffer->paletteGenFade(COL_PROGRESSBAR,
convertSetupColor2RGB(t.progressbar_passive_red, t.progressbar_passive_green, t.progressbar_passive_blue), 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), convertSetupColor2RGB(t.progressbar_active_red, t.progressbar_active_green, t.progressbar_active_blue),
@@ -399,7 +399,7 @@ void CColorSetupNotifier::setPalette()
frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 15, frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 15,
convertSetupColor2RGB(t.clock_Digit_red, t.clock_Digit_green, t.clock_Digit_blue), convertSetupColor2RGB(t.clock_Digit_red, t.clock_Digit_green, t.clock_Digit_blue),
convertSetupAlpha2Alpha(t.clock_Digit_alpha)); convertSetupAlpha2Alpha(t.clock_Digit_alpha));
//NI
// COL_PROGRESSBAR_ACTIVE // COL_PROGRESSBAR_ACTIVE
frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 16, frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 16,
convertSetupColor2RGB(t.progressbar_active_red, t.progressbar_active_green, t.progressbar_active_blue), convertSetupColor2RGB(t.progressbar_active_red, t.progressbar_active_green, t.progressbar_active_blue),

1
src/system/settings.h
View File

@@ -163,7 +163,6 @@ struct SNeutrinoTheme
unsigned char shadow_green; unsigned char shadow_green;
unsigned char shadow_blue; unsigned char shadow_blue;
//NI
unsigned char progressbar_active_red; unsigned char progressbar_active_red;
unsigned char progressbar_active_green; unsigned char progressbar_active_green;
unsigned char progressbar_active_blue; unsigned char progressbar_active_blue;