From 812fd1b7a5aeb67d4139255a6df8230c420ea57e Mon Sep 17 00:00:00 2001 From: louis Date: Sun, 26 May 2013 11:38:05 +0200 Subject: whitespace cleanup --- timeline.c | 144 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 72 insertions(+), 72 deletions(-) (limited to 'timeline.c') diff --git a/timeline.c b/timeline.c index 0bcde25..b4baa9e 100644 --- a/timeline.c +++ b/timeline.c @@ -1,7 +1,7 @@ #include "timeline.h" cTimeLine::cTimeLine(cMyTime *myTime) { - this->myTime = myTime; + this->myTime = myTime; if (tvguideConfig.displayMode == eVertical) { dateViewer = new cStyledPixmap(osdManager.requestPixmap(3, cRect(0, tvguideConfig.statusHeaderHeight, @@ -36,18 +36,18 @@ cTimeLine::cTimeLine(cMyTime *myTime) { } cTimeLine::~cTimeLine(void) { - delete dateViewer; - osdManager.releasePixmap(timeline); + delete dateViewer; + osdManager.releasePixmap(timeline); if (clock) delete clock; } void cTimeLine::drawDateViewer() { - cString weekDay = myTime->GetWeekday(); - cString date = myTime->GetDate(); - dateViewer->setColor(theme.Color(clrHeader), theme.Color(clrHeaderBlending)); - dateViewer->drawBackground(); - dateViewer->drawBorder(); + cString weekDay = myTime->GetWeekday(); + cString date = myTime->GetDate(); + dateViewer->setColor(theme.Color(clrHeader), theme.Color(clrHeaderBlending)); + dateViewer->drawBackground(); + dateViewer->drawBorder(); if (tvguideConfig.displayMode == eVertical) { int textHeight = tvguideConfig.FontTimeLineWeekday->Height(); @@ -64,10 +64,10 @@ void cTimeLine::drawDateViewer() { } void cTimeLine::drawTimeline() { - timeline->SetTile(true); - timeline->Fill(theme.Color(clrBackground)); + timeline->SetTile(true); + timeline->Fill(theme.Color(clrBackground)); tColor colorFont; - + int imgWidth, imgHeight; if (tvguideConfig.displayMode == eVertical) { imgWidth = tvguideConfig.timeLineWidth-4; @@ -77,40 +77,40 @@ void cTimeLine::drawTimeline() { imgHeight = tvguideConfig.timeLineHeight-4; } const cImage *img1 = createBackgroundImage(imgWidth, imgHeight, theme.Color(clrTimeline1), theme.Color(clrTimeline1Blending)); - const cImage *img2 = createBackgroundImage(imgWidth, imgHeight, theme.Color(clrTimeline2), theme.Color(clrTimeline2Blending)); - const cImage *img = NULL; - - int textWidth, posX, posY; - char timetext[10]; - - for (int i=0; i<48; i++) { - if (i%2==0) { - img = img1; - colorFont = theme.Color(clrTimeline2); - if (tvguideConfig.timeFormat == e12Hours) { - if (i == 0) - sprintf(timetext, "12:00 PM"); - else if (i/2 < 13) - sprintf(timetext, "%d:00 AM", i/2); - else - sprintf(timetext, "%d:00 PM", i/2-12); - } else { - sprintf(timetext, "%d:00", i/2); - } - } else { - img = img2; - colorFont = theme.Color(clrTimeline1); - if (tvguideConfig.timeFormat == e12Hours) { - if (i == 1) - sprintf(timetext, "12:30 PM"); - else if (i/2 < 13) - sprintf(timetext, "%d:30 AM", i/2); - else - sprintf(timetext, "%d:30 PM", i/2-12); - } else { - sprintf(timetext, "%d:30", i/2); - } - } + const cImage *img2 = createBackgroundImage(imgWidth, imgHeight, theme.Color(clrTimeline2), theme.Color(clrTimeline2Blending)); + const cImage *img = NULL; + + int textWidth, posX, posY; + char timetext[10]; + + for (int i=0; i<48; i++) { + if (i%2==0) { + img = img1; + colorFont = theme.Color(clrTimeline2); + if (tvguideConfig.timeFormat == e12Hours) { + if (i == 0) + sprintf(timetext, "12:00 PM"); + else if (i/2 < 13) + sprintf(timetext, "%d:00 AM", i/2); + else + sprintf(timetext, "%d:00 PM", i/2-12); + } else { + sprintf(timetext, "%d:00", i/2); + } + } else { + img = img2; + colorFont = theme.Color(clrTimeline1); + if (tvguideConfig.timeFormat == e12Hours) { + if (i == 1) + sprintf(timetext, "12:30 PM"); + else if (i/2 < 13) + sprintf(timetext, "%d:30 AM", i/2); + else + sprintf(timetext, "%d:30 PM", i/2-12); + } else { + sprintf(timetext, "%d:30", i/2); + } + } if (tvguideConfig.displayMode == eVertical) { posY = i*tvguideConfig.minutePixel*30; timeline->DrawImage(cPoint(2, posY), *img); @@ -121,30 +121,30 @@ void cTimeLine::drawTimeline() { timeline->DrawImage(cPoint(posX, 2), *img); timeline->DrawText(cPoint(posX + 2, (dateViewer->Height() - tvguideConfig.FontTimeLineTimeHorizontal->Height())/2), timetext, colorFont, clrTransparent, tvguideConfig.FontTimeLineTimeHorizontal); } - } - setTimeline(); - delete img1; - delete img2; + } + setTimeline(); + delete img1; + delete img2; } cImage *cTimeLine::createBackgroundImage(int width, int height, tColor clrBgr, tColor clrBlend) { - cImage *image = NULL; + cImage *image = NULL; if (tvguideConfig.useBlending == 1) { image = new cImage(cSize(width, height)); image->Fill(clrBgr); - int stepY = 0.5*height / 64; - int alpha = 0x00; - tColor clr; - for (int i = 0; i<64; i++) { - clr = AlphaBlend(clrBgr, clrBlend, alpha); - for (int y = i*stepY; y < (i+1)*stepY; y++) { - for (int x=0; xSetPixel(cPoint(x,y), clr); - } - } - alpha += 0x04; - } - } else if (tvguideConfig.useBlending == 2) { + int stepY = 0.5*height / 64; + int alpha = 0x00; + tColor clr; + for (int i = 0; i<64; i++) { + clr = AlphaBlend(clrBgr, clrBlend, alpha); + for (int y = i*stepY; y < (i+1)*stepY; y++) { + for (int x=0; xSetPixel(cPoint(x,y), clr); + } + } + alpha += 0x04; + } + } else if (tvguideConfig.useBlending == 2) { cImageLoader imgLoader; if (imgLoader.DrawBackground(clrBgr, clrBlend, width, height)) { image = new cImage(imgLoader.GetImage()); @@ -153,11 +153,11 @@ cImage *cTimeLine::createBackgroundImage(int width, int height, tColor clrBgr, t image = new cImage(cSize(width, height)); image->Fill(clrBgr); } - return image; + return image; } void cTimeLine::setTimeline() { - int offset = myTime->GetTimelineOffset(); + int offset = myTime->GetTimelineOffset(); int xNew, yNew; if (tvguideConfig.displayMode == eVertical) { xNew = 0; @@ -170,11 +170,11 @@ void cTimeLine::setTimeline() { } void cTimeLine::drawClock() { - cString currentTime = myTime->GetCurrentTime(); - int textHeight = tvguideConfig.FontTimeLineTime->Height(); - int clockWidth = tvguideConfig.FontTimeLineTime->Width(*currentTime); - clock->setColor(theme.Color(clrHeader), theme.Color(clrHeaderBlending)); - clock->drawBackground(); - clock->drawBorder(); - clock->DrawText(cPoint((tvguideConfig.timeLineWidth-clockWidth)/2, (tvguideConfig.footerHeight-textHeight)/2), *currentTime, theme.Color(clrFontHeader), clrTransparent, tvguideConfig.FontTimeLineTime); + cString currentTime = myTime->GetCurrentTime(); + int textHeight = tvguideConfig.FontTimeLineTime->Height(); + int clockWidth = tvguideConfig.FontTimeLineTime->Width(*currentTime); + clock->setColor(theme.Color(clrHeader), theme.Color(clrHeaderBlending)); + clock->drawBackground(); + clock->drawBorder(); + clock->DrawText(cPoint((tvguideConfig.timeLineWidth-clockWidth)/2, (tvguideConfig.footerHeight-textHeight)/2), *currentTime, theme.Color(clrFontHeader), clrTransparent, tvguideConfig.FontTimeLineTime); } \ No newline at end of file -- cgit v1.2.3