mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-03 10:51:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/msgbox

Browse Source 
Conflicts:
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Commit: 3efaac5725
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-10 (Thu, 10 Nov 2016)
This commit is contained in:
Thilo Graf
2016-11-10 10:27:22 +01:00
parent 9e6adb848d 99b7d20f99
commit d34322b568
22 changed files with 707 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/timerlist.cpp
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);
}