Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Conflicts:
	src/gui/components/cc_detailsline.cpp


Origin commit data
------------------
Commit: 16fbaaa096
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-12 (Mon, 12 Sep 2016)
This commit is contained in:
vanhofen
2016-09-12 12:13:43 +02:00
8 changed files with 32 additions and 26 deletions

View File

@@ -150,6 +150,8 @@ int CThemes::Show()
std::string file_name = "";
CMenuWidget themes (LOCALE_COLORMENU_MENUCOLORS, NEUTRINO_ICON_SETTINGS, width);
sigc::slot0<void> slot_repaint = sigc::mem_fun(themes, &CMenuWidget::hide); //we want to clean screen before repaint after changed Option
themes.OnBeforePaint.connect(slot_repaint);
themes.addIntroItems(LOCALE_COLORTHEMEMENU_HEAD2);