Ticket #4031: ProgGuideIcons.patch

libs/libmythtv/guidegrid.cpp

@@ -1146 +1153 @@
 
     ChannelInfo *chinfo = &(m_channelInfos[m_currentStartChannel]);
 
+    bool showChannelIcon = gContext->GetNumSetting("EPGShowChannelIcon", 0);
+
     for (unsigned int y = 0; y < (unsigned int)DISPLAY_CHANS; y++)
     {
         unsigned int chanNumber = y + m_currentStartChannel;
@@ -1158 +1167 @@
         if ((y == (unsigned int)2 && scrolltype != 1) || 
             ((signed int)y == m_currentRow && scrolltype == 1))
         {
-            if (!chinfo->iconpath.isEmpty() && chinfo->iconpath != "none")
+            if (showChannelIcon && !chinfo->iconpath.isEmpty() && chinfo->iconpath != "none")
             {
                 int iconsize = 0;
                 if (itype)
@@ -1186 +1195 @@
 
         if (type)
         {
-            if (!chinfo->iconpath.isEmpty() && chinfo->iconpath != "none")
+            if (showChannelIcon && !chinfo->iconpath.isEmpty() && chinfo->iconpath != "none")
             {
                 int iconsize = 0;
                 iconsize = type->GetSize();

programs/mythfrontend/globalsettings.cpp

@@ -2847 +2847 @@
 static HostCheckBox *EPGShowChannelIcon()
 {
     HostCheckBox *gc = new HostCheckBox("EPGShowChannelIcon");
-    gc->setLabel(QObject::tr("Display the channel icon"));
+    gc->setLabel(QObject::tr("Display the channel icons"));
+    gc->setHelpText(QObject::tr("Display the icons/logos for the channels "
+                    "in the guide.  See section 9.5 of the "
+                    "Installation Guide for how to grab icons."));
     gc->setValue(true);
     return gc;
 }