Adapting certain files to the changed font handling of info clock

This commit is contained in:
M. Liebmann
2013-11-26 14:16:11 +01:00
parent 1bfb6d2cd3
commit 90985f11d2
4 changed files with 5 additions and 5 deletions

View File

@@ -2123,7 +2123,7 @@ void CChannelList::paintHead()
headerClock->setClockIntervall(10);
}
headerClock->setClockFont(g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]);
headerClock->setClockFont(SNeutrinoSettings::FONT_TYPE_MENU_TITLE);
headerClock->setCorner(RADIUS_LARGE, CORNER_TOP_RIGHT);
headerClock->setYPos(y);
headerClock->setHeight(theight);

View File

@@ -51,7 +51,7 @@ CInfoClock* CInfoClock::getInstance()
void CInfoClock::initVarInfoClock()
{
cl_font = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE];
setClockFont(SNeutrinoSettings::FONT_TYPE_MENU_TITLE);
Init();
}

View File

@@ -260,7 +260,7 @@ void CInfoViewer::paintTime (bool show_dot)
clock->doPaintBg(false);
}
clock->setDimensionsAll(clock_x, clock_y, clock_w, clock_h);
clock->setClockFont(g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]);
clock->setClockFont(SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME);
clock->setClockFormat(show_dot ? "%H:%M" : "%H.%M");
clock->paint(CC_SAVE_SCREEN_NO);

View File

@@ -614,7 +614,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
else if (actionKey == "running_clock"){
if (clock_r == NULL){
clock_r = new CComponentsFrmClock(100, 50, 0, 50, "%H.%M:%S");
clock_r->setClockFont(g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]);
clock_r->setClockFont(SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME);
clock_r->setClockIntervall(1);
// clock_r->doPaintBg(false);
}
@@ -635,7 +635,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
else if (actionKey == "clock"){
if (clock == NULL){
clock = new CComponentsFrmClock(100, 50, 0, 50, "%H:%M", false);
clock->setClockFont(g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]);
clock->setClockFont(SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME);
}
if (!clock->isPainted())