From 0766d679806e1ed098f562672e88ef324c3cd680 Mon Sep 17 00:00:00 2001 From: kamel5 Date: Thu, 11 Jul 2019 11:28:11 +0200 Subject: Change tvguideConfig to Config --- timeline.c | 58 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) (limited to 'timeline.c') diff --git a/timeline.c b/timeline.c index fd016bc..ad6b619 100644 --- a/timeline.c +++ b/timeline.c @@ -3,7 +3,7 @@ cTimeLine::cTimeLine(cMyTime *myTime) { this->myTime = myTime; - if (tvguideConfig.displayMode == eVertical) { + if (config.displayMode == eVertical) { dateViewer = new cStyledPixmap(osdManager.requestPixmap(1, cRect(0, geoManager.statusHeaderHeight + geoManager.clockHeight, geoManager.dateVieverWidth, @@ -20,7 +20,7 @@ cTimeLine::cTimeLine(cMyTime *myTime) { geoManager.statusHeaderHeight + geoManager.channelGroupsHeight + geoManager.channelHeaderHeight, geoManager.osdWidth, geoManager.timeLineGridHeight)); - } else if (tvguideConfig.displayMode == eHorizontal) { + } else if (config.displayMode == eHorizontal) { dateViewer = new cStyledPixmap(osdManager.requestPixmap(1, cRect(geoManager.clockWidth, geoManager.statusHeaderHeight, geoManager.dateVieverWidth, @@ -36,12 +36,12 @@ cTimeLine::cTimeLine(cMyTime *myTime) { timeBase = osdManager.requestPixmap(3, cRect(geoManager.channelGroupsWidth + geoManager.channelHeaderWidth, geoManager.statusHeaderHeight, geoManager.timeLineGridWidth, - geoManager.timeLineHeight + tvguideConfig.channelRows * geoManager.rowHeight)); + geoManager.timeLineHeight + config.channelRows * geoManager.rowHeight)); } timeBase->Fill(clrTransparent); int clockY; int clockX; - if (tvguideConfig.displayMode == eVertical) { + if (config.displayMode == eVertical) { clockY = geoManager.statusHeaderHeight; clockX = 0; } @@ -65,7 +65,7 @@ cTimeLine::~cTimeLine(void) { void cTimeLine::drawDateViewer() { cString weekDay = myTime->GetWeekday(); cString date = myTime->GetDate(); - if (tvguideConfig.style != eStyleGraphical) { + if (config.style != eStyleGraphical) { dateViewer->setColor(theme.Color(clrHeader), theme.Color(clrHeaderBlending)); dateViewer->drawBackground(); dateViewer->drawBorder(); @@ -78,9 +78,9 @@ void cTimeLine::drawDateViewer() { dateViewer->Fill(clrTransparent); } tColor colorFont = theme.Color(clrButtonYellow); - tColor colorFontBack = (tvguideConfig.style == eStyleFlat) ? theme.Color(clrHeader) : clrTransparent; + tColor colorFontBack = (config.style == eStyleFlat) ? theme.Color(clrHeader) : clrTransparent; - if (tvguideConfig.displayMode == eVertical) { + if (config.displayMode == eVertical) { int textHeightWeekday = fontManager.FontTimeLineWeekday->Height(); int textHeightDate = fontManager.FontTimeLineDate->Height(); int weekdayWidth = fontManager.FontTimeLineWeekday->Width(*weekDay); @@ -88,7 +88,7 @@ void cTimeLine::drawDateViewer() { int y = ((geoManager.dateVieverHeight - textHeightWeekday - textHeightDate) / 2); dateViewer->DrawText(cPoint((geoManager.timeLineWidth - weekdayWidth) / 2, y), *weekDay, colorFont, colorFontBack, fontManager.FontTimeLineWeekday); dateViewer->DrawText(cPoint((geoManager.timeLineWidth - dateWidth) / 2, y + textHeightWeekday), *date, colorFont, colorFontBack, fontManager.FontTimeLineDate); - } else if (tvguideConfig.displayMode == eHorizontal) { + } else if (config.displayMode == eHorizontal) { cString strDate = cString::sprintf("%s %s", *weekDay, *date); int x = ((dateViewer->Width() - fontManager.FontTimeLineDateHorizontal->Width(*strDate)) / 2); int y = ((dateViewer->Height() - fontManager.FontTimeLineDateHorizontal->Height()) / 2); @@ -105,7 +105,7 @@ void cTimeLine::drawTimeline() { int imgHeight = geoManager.timeLineGridHeight; const cImage *img1 = NULL; const cImage *img2 = NULL; - if (tvguideConfig.style == eStyleGraphical) { + if (config.style == eStyleGraphical) { img1 = imgCache.GetOsdElement(oeTimeline1); img2 = imgCache.GetOsdElement(oeTimeline2); } else { @@ -122,8 +122,8 @@ void cTimeLine::drawTimeline() { if (i%2==0) { img = img1; colorFont = theme.Color(clrTimeline2); - colorBackground = (tvguideConfig.style == eStyleFlat)?theme.Color(clrTimeline1):clrTransparent; - if (tvguideConfig.timeFormat == e12Hours) { + colorBackground = (config.style == eStyleFlat)?theme.Color(clrTimeline1):clrTransparent; + if (config.timeFormat == e12Hours) { if (i == 0) sprintf(timetext, "12:00 PM"); else if (i/2 < 13) @@ -136,8 +136,8 @@ void cTimeLine::drawTimeline() { } else { img = img2; colorFont = theme.Color(clrTimeline1); - colorBackground = (tvguideConfig.style == eStyleFlat)?theme.Color(clrTimeline2):clrTransparent; - if (tvguideConfig.timeFormat == e12Hours) { + colorBackground = (config.style == eStyleFlat)?theme.Color(clrTimeline2):clrTransparent; + if (config.timeFormat == e12Hours) { if (i == 1) sprintf(timetext, "12:30 PM"); else if (i/2 < 13) @@ -148,25 +148,25 @@ void cTimeLine::drawTimeline() { sprintf(timetext, "%d:30", i/2); } } - if (tvguideConfig.displayMode == eVertical) { + if (config.displayMode == eVertical) { posY = i*geoManager.minutePixel*30; timeline->DrawImage(cPoint(0, posY), *img); - if (tvguideConfig.style != eStyleGraphical) { + if (config.style != eStyleGraphical) { decorateTile(0, posY, imgWidth+2, imgHeight); } textWidth = fontManager.FontTimeLineTime->Width(timetext); timeline->DrawText(cPoint((geoManager.timeLineWidth-textWidth)/2, posY + 5), timetext, colorFont, colorBackground, fontManager.FontTimeLineTime); - } else if (tvguideConfig.displayMode == eHorizontal) { + } else if (config.displayMode == eHorizontal) { posX = i*geoManager.minutePixel*30; timeline->DrawImage(cPoint(posX, 0), *img); - if (tvguideConfig.style != eStyleGraphical) { + if (config.style != eStyleGraphical) { decorateTile(posX, 0, imgWidth, imgHeight+2); } timeline->DrawText(cPoint(posX + 15, (dateViewer->Height() - fontManager.FontTimeLineTimeHorizontal->Height())/2), timetext, colorFont, colorBackground, fontManager.FontTimeLineTimeHorizontal); } } setTimeline(); - if (tvguideConfig.style != eStyleGraphical) { + if (config.style != eStyleGraphical) { delete img1; delete img2; } @@ -183,7 +183,7 @@ void cTimeLine::decorateTile(int posX, int posY, int tileWidth, int tileHeight) timeline->DrawRectangle(cRect(2+posX,posY+tileHeight-3,tileWidth-4,1), theme.Color(clrBorder)); //bottom timeline->DrawRectangle(cRect(posX+tileWidth-3,posY+2,1,tileHeight-4), theme.Color(clrBorder)); //right - if (tvguideConfig.roundedCorners) { + if (config.roundedCorners) { int borderRadius = 12; drawRoundedCorners(posX, posY, tileWidth, tileHeight, borderRadius); } @@ -211,7 +211,7 @@ void cTimeLine::drawCurrentTimeBase(void) { if (!nowVisible) return; int deltaTime = (myTime->GetNow() - myTime->GetStart()) / 60 * geoManager.minutePixel; - if (tvguideConfig.displayMode == eVertical) { + if (config.displayMode == eVertical) { timeBase->DrawRectangle(cRect(0, deltaTime - 2, timeBase->ViewPort().Width(), 4), theme.Color(clrTimeBase)); } else { timeBase->DrawRectangle(cRect(deltaTime-2, 0, 4, timeBase->ViewPort().Height()), theme.Color(clrTimeBase)); @@ -221,7 +221,7 @@ void cTimeLine::drawCurrentTimeBase(void) { cImage *cTimeLine::createBackgroundImage(int width, int height, tColor clrBgr, tColor clrBlend) { cImage *image = NULL; - if (tvguideConfig.style == eStyleBlendingDefault) { + if (config.style == eStyleBlendingDefault) { image = new cImage(cSize(width, height)); image->Fill(clrBgr); int stepY = 0.5*height / 64; @@ -236,7 +236,7 @@ cImage *cTimeLine::createBackgroundImage(int width, int height, tColor clrBgr, t } alpha += 0x04; } - } else if (tvguideConfig.style == eStyleBlendingMagick) { + } else if (config.style == eStyleBlendingMagick) { cImageLoader imgLoader; if (imgLoader.DrawBackground(clrBgr, clrBlend, width, height)) { image = new cImage(imgLoader.GetImage()); @@ -251,27 +251,27 @@ cImage *cTimeLine::createBackgroundImage(int width, int height, tColor clrBgr, t void cTimeLine::setTimeline() { int offset = myTime->GetTimelineOffset(); int xNew, yNew; - if (tvguideConfig.displayMode == eVertical) { + if (config.displayMode == eVertical) { xNew = 0; yNew = -offset*geoManager.minutePixel; - } else if (tvguideConfig.displayMode == eHorizontal) { + } else if (config.displayMode == eHorizontal) { xNew = -offset*geoManager.minutePixel; yNew = 0; } timeline->SetDrawPortPoint(cPoint(xNew, yNew)); - if (tvguideConfig.displayTimeBase) + if (config.displayTimeBase) drawCurrentTimeBase(); } void cTimeLine::drawClock() { - if (tvguideConfig.displayMode == eVertical) + if (config.displayMode == eVertical) clock->Fill(clrTransparent); cString currentTime = myTime->GetCurrentTime(); - const cFont *font = (tvguideConfig.displayMode == eVertical)?fontManager.FontTimeLineTime:fontManager.FontTimeLineTimeHorizontal; + const cFont *font = (config.displayMode == eVertical)?fontManager.FontTimeLineTime:fontManager.FontTimeLineTimeHorizontal; int textHeight = font->Height(); int clockTextWidth = font->Width(*currentTime); - tColor colorFontBack = (tvguideConfig.style == eStyleFlat)?theme.Color(clrHeader):clrTransparent; - if (tvguideConfig.style == eStyleGraphical) { + tColor colorFontBack = (config.style == eStyleFlat)?theme.Color(clrHeader):clrTransparent; + if (config.style == eStyleGraphical) { clock->drawBackgroundGraphical(bgClock); } else { clock->setColor(theme.Color(clrHeader), theme.Color(clrHeaderBlending)); -- cgit v1.2.3