Merge remote-tracking branch 'tuxbox/master'

Origin commit data
------------------
Commit: 8b47699447
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-11 (Sat, 11 Feb 2017)
This commit is contained in:
Stefan Seyfried
2017-02-11 11:18:45 +01:00
32 changed files with 217 additions and 174 deletions

View File

@@ -30,7 +30,7 @@
#include "cc_frm_clock.h"
#include <time.h>
#include <sigc++/bind.h>
#include <unistd.h>
#include <errno.h>
#include <ctype.h>
@@ -101,9 +101,6 @@ CComponentsFrmClock::CComponentsFrmClock( const int& x_pos,
//init slot for running clock
cl_sl_show = sigc::mem_fun0(*this, &CComponentsFrmClock::ShowTime);
//init slot to ensure paint segments after painted background
sl_repaint = sigc::bind<0>(sigc::mem_fun1(*this, &CComponentsFrmClock::forceItemsPaint), true);
//run clock already if required
if (activ)
startClock();
@@ -301,11 +298,6 @@ void CComponentsFrmClock::initCCLockItems()
x_lbl += v_cc_items[i-1]->getWidth();
v_cc_items[i]->setPos(x_lbl, y_lbl);
}
if(!OnAfterPaintBg.empty())
OnAfterPaintBg.clear();
//init slot to handle repaint of segments if background was repainted
OnAfterPaintBg.connect(sl_repaint);
}