Merge branch 'master' into pu/msgbox

Conflicts:
	src/gui/moviebrowser/mb.cpp
This commit is contained in:
2016-11-10 10:27:22 +01:00
22 changed files with 707 additions and 319 deletions

View File

@@ -1371,8 +1371,8 @@ void CTimerList::paintItem(int pos)
void CTimerList::paintHead()
{
CComponentsHeaderLocalized header(x, y, width, theight, LOCALE_TIMERLIST_NAME, NEUTRINO_ICON_TIMER, CComponentsHeader::CC_BTN_EXIT, NULL, CC_SHADOW_ON);
header.enableClock(true, "%d.%m.%Y %H:%M");
CComponentsHeaderLocalized header(x, y, width, theight, LOCALE_TIMERLIST_NAME, NEUTRINO_ICON_TIMER, CComponentsHeader::CC_BTN_MENU | CComponentsHeader::CC_BTN_EXIT, NULL, CC_SHADOW_ON);
header.enableClock(true, "%d.%m.%Y %H:%M");
header.paint(CC_SAVE_SCREEN_NO);
}