Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Remove the EPG category colours setting and allow this to be decided …

…through the theme instead.
  • Loading branch information...
commit 142682ba414d3b16b2f7f837115bf44c66839b1d 1 parent 360f661
@stuartm stuartm authored
View
6 mythtv/libs/libmythui/mythuiguidegrid.cpp
@@ -52,7 +52,7 @@ MythUIGuideGrid::MythUIGuideGrid(MythUIType *parent, const QString &name)
m_rowCount = 0;
m_progPastCol = 0;
- m_drawCategoryColors = GetMythDB()->GetNumSetting("EPGShowCategoryColors", 1);
+ m_drawCategoryColors = true;
m_drawCategoryText = true;
m_categoryAlpha = 255;
@@ -164,6 +164,10 @@ bool MythUIGuideGrid::ParseElement(
{
m_drawCategoryText = parseBool(element);
}
+ else if (element.tagName() == "showcategorycolors")
+ {
+ m_drawCategoryColors = parseBool(element);
+ }
else if (element.tagName() == "cutdown")
{
m_cutdown = parseBool(element);
View
12 mythtv/programs/mythfrontend/globalsettings.cpp
@@ -2291,17 +2291,6 @@ static GlobalCheckBox *LiveTVPriority()
return bc;
}
-// EPG settings
-static HostCheckBox *EPGShowCategoryColors()
-{
- HostCheckBox *gc = new HostCheckBox("EPGShowCategoryColors");
- gc->setLabel(QObject::tr("Display genre colors"));
- gc->setHelpText(QObject::tr("Colorize program guide using "
- "genre colors (not available for all grabbers)."));
- gc->setValue(true);
- return gc;
-}
-
static HostCheckBox *ChannelGroupRememberLast()
{
HostCheckBox *gc = new HostCheckBox("ChannelGroupRememberLast");
@@ -3605,7 +3594,6 @@ EPGSettings::EPGSettings()
{
VerticalConfigurationGroup* epg = new VerticalConfigurationGroup(false);
epg->setLabel(QObject::tr("Program Guide") + " 1/1");
- epg->addChild(EPGShowCategoryColors());
epg->addChild(WatchTVGuide());
epg->addChild(DefaultTVChannel());
epg->addChild(EPGRecThreshold());
Please sign in to comment.
Something went wrong with that request. Please try again.