Skip to content

Commit 19df7fb

Browse files
committed
Revert "Add a setting to enable/disable the UI effects."
This is breaking the string freeze, with no prior permission, and also the feature freeze. It can wait for fixes/0.25 which will exist in just over a week. In the mean time, if people want to hack up their own copies, that is their perogative. This reverts commit cbf999d.
1 parent 797211c commit 19df7fb

File tree

4 files changed

+6
-28
lines changed

4 files changed

+6
-28
lines changed

mythtv/libs/libmythui/mythpainter.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
// libmythbase headers
88
#include "mythlogging.h"
9-
#include "mythcorecontext.h"
109

1110
// libmythui headers
1211
#include "mythfontproperties.h"
@@ -35,11 +34,6 @@ MythPainter::~MythPainter(void)
3534
m_allocatedImages.takeLast()->SetParent(NULL);
3635
}
3736

38-
bool MythPainter::EffectsEnabled(void )
39-
{
40-
return (gCoreContext->GetNumSetting("GUIEffectsEnabled", 1) == 1);
41-
}
42-
4337
void MythPainter::SetClipRect(const QRect &)
4438
{
4539
}

mythtv/libs/libmythui/mythpainter.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ class MUI_PUBLIC MythPainter
3333

3434
virtual QString GetName(void) = 0;
3535
virtual bool SupportsAnimation(void) = 0;
36-
bool EffectsEnabled(void);
3736
virtual bool SupportsAlpha(void) = 0;
3837
virtual bool SupportsClipping(void) = 0;
3938
virtual void FreeResources(void) { }

mythtv/libs/libmythui/mythuitype.cpp

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -279,15 +279,12 @@ MythUIType *MythUIType::GetChildAt(const QPoint &p, bool recursive,
279279

280280
void MythUIType::ActivateAnimations(MythUIAnimation::Trigger trigger)
281281
{
282-
if (GetMythMainWindow()->GetCurrentPainter()->EffectsEnabled())
283-
{
284-
foreach (MythUIAnimation* animation, m_animations)
285-
if (animation->GetTrigger() == trigger)
286-
animation->Activate();
282+
foreach (MythUIAnimation* animation, m_animations)
283+
if (animation->GetTrigger() == trigger)
284+
animation->Activate();
287285

288-
foreach (MythUIType* uiType, m_ChildrenList)
289-
uiType->ActivateAnimations(trigger);
290-
}
286+
foreach (MythUIType* uiType, m_ChildrenList)
287+
uiType->ActivateAnimations(trigger);
291288
}
292289

293290
bool MythUIType::NeedsRedraw(void) const
@@ -1409,4 +1406,4 @@ void MythUIType::ConnectDependants(bool recurse)
14091406
(*it)->ConnectDependants(recurse);
14101407
}
14111408
}
1412-
}
1409+
}

mythtv/programs/mythfrontend/globalsettings.cpp

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2303,17 +2303,6 @@ static HostComboBox *ThemePainter()
23032303
return gc;
23042304
}
23052305

2306-
static HostCheckBox *GUIEffectsEnabled()
2307-
{
2308-
HostCheckBox *gc = new HostCheckBox("GUIEffectsEnabled");
2309-
gc->setLabel(QObject::tr("Enable GUI Effects"));
2310-
gc->setValue(true);
2311-
gc->setHelpText(QObject::tr("This selects whether to use any effects "
2312-
"defined by the theme (Note: not all the paint engines "
2313-
"allow animations to be used)."));
2314-
return gc;
2315-
}
2316-
23172306
static HostComboBox *ChannelFormat()
23182307
{
23192308
HostComboBox *gc = new HostComboBox("ChannelFormat");
@@ -3698,7 +3687,6 @@ AppearanceSettings::AppearanceSettings()
36983687
screen->setLabel(QObject::tr("Theme") + " / " + QObject::tr("Screen Settings"));
36993688

37003689
screen->addChild(ThemePainter());
3701-
screen->addChild(GUIEffectsEnabled());
37023690
screen->addChild(MenuTheme());
37033691

37043692
if (MythDisplay::GetNumberXineramaScreens() > 1)

0 commit comments

Comments
 (0)