Change tvguideConfig to Config

1 files changed, 15 insertions, 15 deletions

diff --git a/recmenuitem.c b/recmenuitem.c
index 3a0a5ab..33a6b6c 100644
--- a/recmenuitem.c
+++ b/recmenuitem.c
@@ -36,7 +36,7 @@ void cRecMenuItem::SetPixmaps(void) {
 }
 
 void cRecMenuItem::setBackground(void) {
-    if (tvguideConfig.style == eStyleGraphical) {
+    if (config.style == eStyleGraphical) {
         if (defaultBackground) {
             drawBackgroundGraphical(bgButton, active);
         }
@@ -52,7 +52,7 @@ void cRecMenuItem::setBackground(void) {
             colorBlending = theme.Color(clrGrid1Blending);
             colorText = theme.Color(clrFont);
         }
-        colorTextBack = (tvguideConfig.style == eStyleFlat)?color:clrTransparent;
+        colorTextBack = (config.style == eStyleFlat)?color:clrTransparent;
         if (defaultBackground) {
             drawBackground();
             drawBorder();
@@ -177,7 +177,7 @@ void cRecMenuItemButtonYesNo::Show(void) {
 }
 
 void cRecMenuItemButtonYesNo::setBackground() {
-    if (tvguideConfig.style == eStyleGraphical) {
+    if (config.style == eStyleGraphical) {
         drawBackgroundGraphical(bgButton, yesActive&&active);
         colorTextBack = clrTransparent;
         colorTextNoBack = clrTransparent;
@@ -213,8 +213,8 @@ void cRecMenuItemButtonYesNo::setBackground() {
                                 theme.Color(clrGrid1Blending));
             colorTextNo = theme.Color(clrFont);
         }
-        colorTextBack = (tvguideConfig.style == eStyleFlat)?color:clrTransparent;
-        colorTextNoBack = (tvguideConfig.style == eStyleFlat)?colorNoBack:clrTransparent;
+        colorTextBack = (config.style == eStyleFlat)?color:clrTransparent;
+        colorTextNoBack = (config.style == eStyleFlat)?colorNoBack:clrTransparent;
         drawBackground();
         drawBorder();
         pixmapNo->drawBackground();
@@ -641,8 +641,8 @@ cRecMenuItemSelectDirectory::cRecMenuItemSelectDirectory(cString text,
     height = 3 * font->Height() / 2;
     pixmapVal = NULL;
     folders.push_back(tr("root video folder"));
-    if (isSearchTimer && tvguideConfig.instRecFixedFolder.size() > 0)
-        folders.push_back(tvguideConfig.instRecFixedFolder);
+    if (isSearchTimer && config.instRecFixedFolder.size() > 0)
+        folders.push_back(config.instRecFixedFolder);
     ReadRecordingDirectories(&folders, NULL, "");
     numValues = folders.size();
     this->currentVal = GetInitial();
@@ -1615,9 +1615,9 @@ void cRecMenuItemTimer::Draw(void) {
         channelName = channel->Name();
     }
     int logoX = DrawIcons();
-    int logoWidth = height * tvguideConfig.logoWidthRatio / tvguideConfig.logoHeightRatio;
+    int logoWidth = height * config.logoWidthRatio / config.logoHeightRatio;
     cImageLoader imgLoader;
-    if (!tvguideConfig.hideChannelLogos) {
+    if (!config.hideChannelLogos) {
         if (imgLoader.LoadLogo(channel, logoWidth, height)) {
             cImage logo = imgLoader.GetImage();
             pixmapIcons->DrawImage(cPoint(logoX, 0), logo);
@@ -1865,9 +1865,9 @@ void cRecMenuItemEvent::Draw(void) {
     cString channelName = "";
     if (channel)
         channelName = channel->Name();
-    int logoWidth = height * tvguideConfig.logoWidthRatio / tvguideConfig.logoHeightRatio;
+    int logoWidth = height * config.logoWidthRatio / config.logoHeightRatio;
     cImageLoader imgLoader;
-    if (!tvguideConfig.hideChannelLogos) {
+    if (!config.hideChannelLogos) {
         if (imgLoader.LoadLogo(channel, logoWidth, height)) {
             cImage logo = imgLoader.GetImage();
             pixmapText->DrawImage(cPoint(logoX, (height - logo.Height()) / 2), logo);
@@ -2018,7 +2018,7 @@ void cRecMenuItemChannelChooser::DrawValue(void) {
         cString textVal = cString::sprintf("%d - %s", channel->Number(), channel->Name());
         int textX = width - font->Width(*textVal) - 10;
         pixmapChannel->DrawText(cPoint(textX, textY), *textVal, colorText, clrTransparent, font);
-        int logoWidth = height * tvguideConfig.logoWidthRatio / tvguideConfig.logoHeightRatio;
+        int logoWidth = height * config.logoWidthRatio / config.logoHeightRatio;
         int logoX = textX - logoWidth - 10;
         cImageLoader imgLoader;
         if (imgLoader.LoadLogo(channel, logoWidth, height - 10)) {
@@ -2416,10 +2416,10 @@ void cRecMenuItemTimelineHeader::DrawCurrentTimer(void) {
     const cChannel *channel = timer->Channel();
     int x = 0;
     if (channel) {
-        int logoWidth = infoHeight * tvguideConfig.logoWidthRatio / tvguideConfig.logoHeightRatio;
+        int logoWidth = infoHeight * config.logoWidthRatio / config.logoHeightRatio;
         bool logoDrawn = false;
         cImageLoader imgLoader;
-        if (!tvguideConfig.hideChannelLogos) {
+        if (!config.hideChannelLogos) {
             if (imgLoader.LoadLogo(channel, logoWidth, infoHeight)) {
                 cImage logo = imgLoader.GetImage();
                 pixmapTimerInfo->DrawImage(cPoint(0, 0), logo);
@@ -2427,7 +2427,7 @@ void cRecMenuItemTimelineHeader::DrawCurrentTimer(void) {
                 logoDrawn = true;
             }
         }
-        if (tvguideConfig.hideChannelLogos || !logoDrawn) {
+        if (config.hideChannelLogos || !logoDrawn) {
             int channelNameWidth = fontSmall->Width(channel->Name());
             pixmapTimerInfo->DrawText(cPoint(10, (infoHeight - fontSmall->Height())/2), channel->Name(), colorText, clrTransparent, fontSmall);
             x += channelNameWidth + 20;