Merge branch 'cst-next' into nmp-cst-next

Conflicts: src/zapit/src/getservices.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: c657e2d892
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-29 (Fri, 29 Jan 2016)



------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2016-01-29 15:41:18 +01:00
11 changed files with 42 additions and 26 deletions

View File

@@ -1481,7 +1481,6 @@ void CMenuWidget::paintHint(int pos)
info_box->enableShadow();
info_box->setPicture(item->hintIcon ? item->hintIcon : "");
info_box->enableColBodyGradient(g_settings.theme.menu_Hint_gradient, COL_INFOBAR_SHADOW_PLUS_1, g_settings.theme.menu_Hint_gradient_direction);// COL_INFOBAR_SHADOW_PLUS_1 is default footer color
info_box->enableGradientBgCleanUp();
//paint result
if (details_line)