diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index 1e4de2fa7..7393cda59 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -2327,7 +2327,7 @@ void CChannelList::paintHead() if (header->getContextBtnObject()) if (!header->getContextBtnObject()->empty()) header->removeContextButtons(); - header->enableClock(true, "%H:%M", "%H %M", true); + header->enableClock(); if (header->getClockObject()) header->getClockObject()->setCorner(RADIUS_LARGE, CORNER_TOP_RIGHT); diff --git a/src/gui/epgplus.cpp b/src/gui/epgplus.cpp index 5cd4884a8..eb6c1fcd7 100644 --- a/src/gui/epgplus.cpp +++ b/src/gui/epgplus.cpp @@ -113,7 +113,7 @@ void EpgPlus::Header::paint(const char *Name) { this->head = new CComponentsHeader(); this->head->setContextButton(CComponentsHeader::CC_BTN_HELP | CComponentsHeader::CC_BTN_EXIT); - this->head->enableClock(true, "%H:%M", "%H %M", true); + this->head->enableClock(); this->head->enableShadow(CC_SHADOW_RIGHT | CC_SHADOW_CORNER_TOP_RIGHT | CC_SHADOW_CORNER_BOTTOM_RIGHT, -1, true); } diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp index bdd1d3fe3..3421479c1 100644 --- a/src/gui/epgview.cpp +++ b/src/gui/epgview.cpp @@ -899,7 +899,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start header = new CComponentsHeader(); header->setColorBody(COL_MENUHEAD_PLUS_0); header->enableColBodyGradient(g_settings.theme.menu_Head_gradient, COL_MENUCONTENT_PLUS_0, g_settings.theme.menu_Head_gradient_direction); - header->enableClock(true, "%H:%M", "%H %M", true); + header->enableClock(); header->getClockObject()->enableForceSegmentPaint(); } diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp index dca742677..63d194f2e 100644 --- a/src/gui/eventlist.cpp +++ b/src/gui/eventlist.cpp @@ -891,7 +891,7 @@ void CEventList::paintHead(t_channel_id _channel_id, std::string _channelname, s if (header == NULL){ header = new CComponentsHeader(); header->getTextObject()->enableTboxSaveScreen(g_settings.theme.menu_Head_gradient);//enable screen save for title text if color gradient is in use - header->enableClock(true, "%H:%M", "%H %M", true); + header->enableClock(); header->enableColBodyGradient(g_settings.theme.menu_Head_gradient, COL_MENUCONTENT_PLUS_0, g_settings.theme.menu_Head_gradient_direction); header->setDimensionsAll(x, y, full_width, header_height); header->enableShadow(CC_SHADOW_RIGHT | CC_SHADOW_CORNER_TOP_RIGHT | CC_SHADOW_CORNER_BOTTOM_RIGHT, -1, true); diff --git a/src/gui/moviebrowser/mb.cpp b/src/gui/moviebrowser/mb.cpp index eea58d681..4fa4da948 100644 --- a/src/gui/moviebrowser/mb.cpp +++ b/src/gui/moviebrowser/mb.cpp @@ -1988,7 +1988,7 @@ void CMovieBrowser::refreshTitle(void) if (timeset) { - m_header->enableClock(true, "%H:%M", "%H %M", true); + m_header->enableClock(); if (m_header->getClockObject()) m_header->getClockObject()->setCorner(RADIUS_LARGE, CORNER_TOP_RIGHT); } @@ -3755,7 +3755,7 @@ bool CMovieBrowser::showMenu(bool calledExternally) delete nfs; if (m_header->getClockObject()) - m_header->enableClock(true, "%H:%M", "%H %M", true); + m_header->enableClock(); return(true); } diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp index 4272e05e5..c1e9b6f14 100644 --- a/src/gui/timerlist.cpp +++ b/src/gui/timerlist.cpp @@ -1447,7 +1447,7 @@ void CTimerList::paintHead() if (header == NULL) { header = new CComponentsHeader(x, y, width, header_height, 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 ", NULL, false); + header->enableClock(true, "%d.%m.%Y - %H:%M", "%d.%m.%Y - %H %M", true); } if (!header->isPainted()) header->paint(CC_SAVE_SCREEN_NO);