yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[kwin] Add enabledByDefault boolean value to the BuiltInEffects

Browse source 
For each effect the value from the desktop file is added. This will
allow to query all effects which need to be loaded without looking for
the service files.
This commit is contained in:
Martin Gräßlin 2014-03-21 12:09:13 +01:00
parent 659b760355
commit 40bb6faa30
2 changed files with 59 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

99
effects/effect_builtins.cpp
View file

@ -81,6 +81,7 @@ public:
bool supported(BuiltInEffect effect) const;
bool checkEnabledByDefault(const QByteArray &name) const;
bool checkEnabledByDefault(BuiltInEffect effect) const;
bool enabledByDefault(BuiltInEffect effect) const;
QList<QByteArray> availableEffectNames() const;
QList<BuiltInEffect> availableEffects() const;
BuiltInEffect builtInForName(const QByteArray &name) const;
@ -93,52 +94,54 @@ private:
QMap<BuiltInEffect, CreateInstanceFunction> m_createHash;
QMap<BuiltInEffect, SupportedFunction> m_supportedHash;
QMap<BuiltInEffect, SupportedFunction> m_checkEnabledHash;
QMap<BuiltInEffect, bool> m_enabledByDefault;
};
EffectLoader::EffectLoader()
{
#define EFFECT(name, className) \
#define EFFECT(name, className, enabled) \
m_effects.insert(QByteArrayLiteral(#name).toLower(), BuiltInEffect::name);\
m_createHash.insert(BuiltInEffect::name, &createHelper< className >);
EFFECT(Blur, BlurEffect)
EFFECT(Contrast, ContrastEffect)
EFFECT(CoverSwitch, CoverSwitchEffect)
EFFECT(Cube, CubeEffect)
EFFECT(CubeSlide, CubeSlideEffect)
EFFECT(Dashboard, DashboardEffect)
EFFECT(DesktopGrid, DesktopGridEffect)
EFFECT(DimInactive, DimInactiveEffect)
EFFECT(DimScreen, DimScreenEffect)
EFFECT(FallApart, FallApartEffect)
EFFECT(FlipSwitch, FlipSwitchEffect)
EFFECT(Glide, GlideEffect)
EFFECT(HighlightWindow, HighlightWindowEffect)
EFFECT(Invert, InvertEffect)
EFFECT(Kscreen, KscreenEffect)
EFFECT(Logout, LogoutEffect)
EFFECT(LookingGlass, LookingGlassEffect)
EFFECT(MagicLamp, MagicLampEffect)
EFFECT(Magnifier, MagnifierEffect)
EFFECT(MinimizeAnimation, MinimizeAnimationEffect)
EFFECT(MouseClick, MouseClickEffect)
EFFECT(MouseMark, MouseMarkEffect)
EFFECT(PresentWindows, PresentWindowsEffect)
EFFECT(Resize, ResizeEffect)
EFFECT(ScreenEdge, ScreenEdgeEffect)
EFFECT(ScreenShot, ScreenShotEffect)
EFFECT(Sheet, SheetEffect)
EFFECT(ShowFps, ShowFpsEffect)
EFFECT(ShowPaint, ShowPaintEffect)
EFFECT(Slide, SlideEffect)
EFFECT(SlideBack, SlideBackEffect)
EFFECT(SlidingPopups, SlidingPopupsEffect)
EFFECT(SnapHelper, SnapHelperEffect)
EFFECT(StartupFeedback, StartupFeedbackEffect)
EFFECT(ThumbnailAside, ThumbnailAsideEffect)
EFFECT(TrackMouse, TrackMouseEffect)
EFFECT(WindowGeometry, WindowGeometry)
EFFECT(WobblyWindows, WobblyWindowsEffect)
EFFECT(Zoom, ZoomEffect)
m_createHash.insert(BuiltInEffect::name, &createHelper< className >); \
m_enabledByDefault.insert(BuiltInEffect::name, enabled);
EFFECT(Blur, BlurEffect, true)
EFFECT(Contrast, ContrastEffect, true)
EFFECT(CoverSwitch, CoverSwitchEffect, false)
EFFECT(Cube, CubeEffect, false)
EFFECT(CubeSlide, CubeSlideEffect, false)
EFFECT(Dashboard, DashboardEffect, true)
EFFECT(DesktopGrid, DesktopGridEffect, true)
EFFECT(DimInactive, DimInactiveEffect, false)
EFFECT(DimScreen, DimScreenEffect, false)
EFFECT(FallApart, FallApartEffect, false)
EFFECT(FlipSwitch, FlipSwitchEffect, false)
EFFECT(Glide, GlideEffect, false)
EFFECT(HighlightWindow, HighlightWindowEffect, true)
EFFECT(Invert, InvertEffect, false)
EFFECT(Kscreen, KscreenEffect, true)
EFFECT(Logout, LogoutEffect, true)
EFFECT(LookingGlass, LookingGlassEffect, false)
EFFECT(MagicLamp, MagicLampEffect, false)
EFFECT(Magnifier, MagnifierEffect, false)
EFFECT(MinimizeAnimation, MinimizeAnimationEffect, true)
EFFECT(MouseClick, MouseClickEffect, false)
EFFECT(MouseMark, MouseMarkEffect, false)
EFFECT(PresentWindows, PresentWindowsEffect, true)
EFFECT(Resize, ResizeEffect, false)
EFFECT(ScreenEdge, ScreenEdgeEffect, true)
EFFECT(ScreenShot, ScreenShotEffect, true)
EFFECT(Sheet, SheetEffect, false)
EFFECT(ShowFps, ShowFpsEffect, false)
EFFECT(ShowPaint, ShowPaintEffect, false)
EFFECT(Slide, SlideEffect, true)
EFFECT(SlideBack, SlideBackEffect, false)
EFFECT(SlidingPopups, SlidingPopupsEffect, true)
EFFECT(SnapHelper, SnapHelperEffect, false)
EFFECT(StartupFeedback, StartupFeedbackEffect, true)
EFFECT(ThumbnailAside, ThumbnailAsideEffect, false)
EFFECT(TrackMouse, TrackMouseEffect, false)
EFFECT(WindowGeometry, WindowGeometry, false)
EFFECT(WobblyWindows, WobblyWindowsEffect, false)
EFFECT(Zoom, ZoomEffect, true)
#undef EFFECT
@ -221,6 +224,15 @@ bool EffectLoader::checkEnabledByDefault(BuiltInEffect effect) const
return true;
}
bool EffectLoader::enabledByDefault(BuiltInEffect effect) const
{
auto it = m_enabledByDefault.constFind(effect);
if (it != m_enabledByDefault.constEnd()) {
return it.value();
}
return false;
}
QList< QByteArray > EffectLoader::availableEffectNames() const
{
return m_effects.keys();
@ -285,6 +297,11 @@ bool checkEnabledByDefault(BuiltInEffect effect)
return s_effectLoader->checkEnabledByDefault(effect);
}
bool enabledByDefault(BuiltInEffect effect)
{
return s_effectLoader->enabledByDefault(effect);
}
QList< QByteArray > availableEffectNames()
{
return s_effectLoader->availableEffectNames();

1
effects/effect_builtins.h
View file

@ -85,6 +85,7 @@ KWINEFFECTS_EXPORT bool supported(const QByteArray &name);
KWINEFFECTS_EXPORT bool supported(BuiltInEffect effect);
KWINEFFECTS_EXPORT bool checkEnabledByDefault(const QByteArray &name);
KWINEFFECTS_EXPORT bool checkEnabledByDefault(BuiltInEffect effect);
KWINEFFECTS_EXPORT bool enabledByDefault(BuiltInEffect effect);
KWINEFFECTS_EXPORT QByteArray nameForEffect(BuiltInEffect effect);
KWINEFFECTS_EXPORT BuiltInEffect builtInForName(const QByteArray &name);
KWINEFFECTS_EXPORT QList<QByteArray> availableEffectNames();