Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Origin commit data
------------------
Branch: ni/coolstream
Commit: d39dc75c6d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-12-29 15:15:34 +01:00
51 changed files with 509 additions and 177 deletions

View File

@@ -1741,8 +1741,8 @@ void CInfoViewer::showSNR ()
int sigbox_offset = ChanWidth *10/100;
sigbox = new CSignalBox(BoxStartX + sigbox_offset, y_numbox+ChanHeight/2, ChanWidth - 2*sigbox_offset, ChanHeight/2, NULL, true, NULL, "S", "Q");
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());
@@ -1832,8 +1832,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);