Merge branch 'check/next-cc'

Compiles on most platforms, starts. Not really tested.


Origin commit data
------------------
Branch: ni/coolstream
Commit: b93a372b54
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-10 (Sun, 10 Nov 2013)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2013-11-10 16:55:53 +01:00
114 changed files with 7292 additions and 1585 deletions

View File

@@ -57,9 +57,6 @@
#include <gui/widget/buttons.h>
#include <gui/widget/icons.h>
#include <gui/widget/messagebox.h>
#include <gui/components/cc_item_progressbar.h>
#include <gui/components/cc.h>
#include <gui/components/cc_frm.h>
#include <system/settings.h>
#include <gui/customcolor.h>
@@ -2137,8 +2134,8 @@ void CChannelList::paintHead()
headerClock->setCorner(RADIUS_LARGE, CORNER_TOP_RIGHT);
headerClock->setYPos(y);
headerClock->setHeight(theight);
headerClock->setTextColor(COL_MENUHEAD_TEXT);
headerClock->setColorBody(COL_MENUHEAD_PLUS_0);
headerClock->setTextColor(header.getTextObject()->getTextColor());
headerClock->setColorBody(header.getColorBody());
headerClock->refresh();
headerClockWidth = headerClock->getWidth();
headerClock->setXPos(x + full_width - headerClockWidth - 10);