Change tvguideConfig to Config

1 files changed, 11 insertions, 11 deletions

diff --git a/epggrid.c b/epggrid.c
index 467b5fd..9dc0df8 100644
--- a/epggrid.c
+++ b/epggrid.c
@@ -33,7 +33,7 @@ void cEpgGrid::SetViewportHeight() {
 }
 
 void cEpgGrid::PositionPixmap() {
-    if (tvguideConfig.displayMode == eVertical) {
+    if (config.displayMode == eVertical) {
         int x0 = column->getX();
         int y0 = geoManager.statusHeaderHeight + geoManager.channelHeaderHeight + geoManager.channelGroupsHeight;
         if ( column->Start() < StartTime() ) {
@@ -45,7 +45,7 @@ void cEpgGrid::PositionPixmap() {
         } else {
             pixmap->SetViewPort(cRect(x0, y0, geoManager.colWidth, viewportHeight));
         }
-    } else if (tvguideConfig.displayMode == eHorizontal) {
+    } else if (config.displayMode == eHorizontal) {
         int x0 = geoManager.channelHeaderWidth + geoManager.channelGroupsWidth;
         int y0 = column->getY();
         if ( column->Start() < StartTime() ) {
@@ -63,7 +63,7 @@ void cEpgGrid::PositionPixmap() {
 
 void cEpgGrid::SetTimer() {
     hasTimer = false;
-    if (tvguideConfig.useRemoteTimers && pRemoteTimers) {
+    if (config.useRemoteTimers && pRemoteTimers) {
         RemoteTimers_Event_v1_0 rt;
         rt.event = event;
         if (pRemoteTimers->Service("RemoteTimers::GetTimerByEvent-v1.0", &rt))
@@ -91,12 +91,12 @@ void cEpgGrid::SetSwitchTimer() {
 }
 
 void cEpgGrid::setText() {
-    if (tvguideConfig.displayMode == eVertical) {
+    if (config.displayMode == eVertical) {
         cString strText;
         strText = cString::sprintf("%s - %s:\n%s", *(event->GetTimeString()), *(event->GetEndTimeString()), event->Title());
         text->Set(*(strText), fontManager.FontGrid, geoManager.colWidth-2*borderWidth);
         extText->Set(event->ShortText(), fontManager.FontGridSmall, geoManager.colWidth-2*borderWidth);
-    } else if (tvguideConfig.displayMode == eHorizontal) {
+    } else if (config.displayMode == eHorizontal) {
         timeString = cString::sprintf("%s - %s", *(event->GetTimeString()), *(event->GetEndTimeString()));
     }
 }
@@ -104,13 +104,13 @@ void cEpgGrid::setText() {
 void cEpgGrid::drawText() {
     tColor colorText = (active)?theme.Color(clrFontActive):theme.Color(clrFont);
     tColor colorTextBack;
-    if (tvguideConfig.style == eStyleFlat)
+    if (config.style == eStyleFlat)
         colorTextBack = color;
-    else if (tvguideConfig.style == eStyleGraphical)
+    else if (config.style == eStyleGraphical)
         colorTextBack = (active)?theme.Color(clrGridActiveFontBack):theme.Color(clrGridFontBack);
     else
         colorTextBack = clrTransparent;
-    if (tvguideConfig.displayMode == eVertical) {
+    if (config.displayMode == eVertical) {
         if (Height()/geoManager.minutePixel < 6)
             return;
         int textHeight = fontManager.FontGrid->Height();
@@ -126,7 +126,7 @@ void cEpgGrid::drawText() {
                 pixmap->DrawText(cPoint(borderWidth, borderWidth + offset + i*textHeight), extText->GetLine(i), colorText, colorTextBack, fontManager.FontGridSmall);
             }
         }
-    } else if (tvguideConfig.displayMode == eHorizontal) {
+    } else if (config.displayMode == eHorizontal) {
         if (Width()/geoManager.minutePixel < 10) {
             int titleY = (geoManager.rowHeight - fontManager.FontGridHorizontal->Height())/2;
             pixmap->DrawText(cPoint(borderWidth - 2, titleY), "...", colorText, colorTextBack, fontManager.FontGridHorizontal);
@@ -134,7 +134,7 @@ void cEpgGrid::drawText() {
         }
         cString strTitle = CutText(event->Title(), viewportHeight, fontManager.FontGridHorizontal).c_str();
         int titleY = 0;
-        if (tvguideConfig.showTimeInGrid) {
+        if (config.showTimeInGrid) {
             pixmap->DrawText(cPoint(borderWidth, borderWidth), *timeString, colorText, colorTextBack, fontManager.FontGridHorizontalSmall);
             titleY = fontManager.FontGridHorizontalSmall->Height() + (geoManager.rowHeight - fontManager.FontGridHorizontalSmall->Height() - fontManager.FontGridHorizontal->Height())/2;
         } else {
@@ -170,7 +170,7 @@ void cEpgGrid::drawText() {
 
 void cEpgGrid::drawIcon(cString iconText, tColor color) {
 
-    const cFont *font = (tvguideConfig.displayMode == eVertical)
+    const cFont *font = (config.displayMode == eVertical)
                         ?fontManager.FontGrid
                         :fontManager.FontGridHorizontalSmall;
     int textWidth = font->Width(*iconText)+2*borderWidth;