From ec1ec18260eaaeac59236880339f4e1efb354fe9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Sat, 18 Dec 2010 10:25:41 +0100 Subject: [PATCH] Bring back some configuration interfaces --- effects/configs_builtins.cpp | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/effects/configs_builtins.cpp b/effects/configs_builtins.cpp index f5aa69f3a3..ad5f4a6311 100644 --- a/effects/configs_builtins.cpp +++ b/effects/configs_builtins.cpp @@ -29,31 +29,31 @@ along with this program. If not, see . #include "magiclamp/magiclamp_config.h" #include "translucency/translucency_config.h" #include "presentwindows/presentwindows_config.h" +#include "resize/resize_config.h" #include "thumbnailaside/thumbnailaside_config.h" +#include "zoom/zoom_config.h" #ifndef KWIN_HAVE_OPENGLES -#include "resize/resize_config.h" #include "shadow/shadow_config.h" #include "showfps/showfps_config.h" -#include "zoom/zoom_config.h" #endif #ifdef KWIN_HAVE_OPENGL_COMPOSITING +#include "coverswitch/coverswitch_config.h" #include "cube/cube_config.h" #include "cube/cubeslide_config.h" -#ifndef KWIN_HAVE_OPENGLES -#include "blur/blur_config.h" -#include "coverswitch/coverswitch_config.h" #include "flipswitch/flipswitch_config.h" #include "glide/glide_config.h" +#include "mousemark/mousemark_config.h" +#include "trackmouse/trackmouse_config.h" +#include "wobblywindows/wobblywindows_config.h" +#ifndef KWIN_HAVE_OPENGLES +#include "blur/blur_config.h" #include "invert/invert_config.h" #include "lookingglass/lookingglass_config.h" -#include "mousemark/mousemark_config.h" #include "magnifier/magnifier_config.h" #include "sharpen/sharpen_config.h" #include "snow/snow_config.h" -#include "trackmouse/trackmouse_config.h" -#include "wobblywindows/wobblywindows_config.h" #endif KWIN_HAVE_OPENGLES #endif @@ -70,32 +70,32 @@ KWIN_EFFECT_CONFIG_MULTIPLE( builtins, KWIN_EFFECT_CONFIG_SINGLE( desktopgrid, DesktopGridEffectConfig ) KWIN_EFFECT_CONFIG_SINGLE( diminactive, DimInactiveEffectConfig ) KWIN_EFFECT_CONFIG_SINGLE( magiclamp, MagicLampEffectConfig ) - KWIN_EFFECT_CONFIG_SINGLE( translucency, TranslucencyEffectConfig ) KWIN_EFFECT_CONFIG_SINGLE( presentwindows, PresentWindowsEffectConfig ) + KWIN_EFFECT_CONFIG_SINGLE( resize, ResizeEffectConfig ) + KWIN_EFFECT_CONFIG_SINGLE( translucency, TranslucencyEffectConfig ) KWIN_EFFECT_CONFIG_SINGLE( thumbnailaside, ThumbnailAsideEffectConfig ) + KWIN_EFFECT_CONFIG_SINGLE( zoom, ZoomEffectConfig ) #ifndef KWIN_HAVE_OPENGLES KWIN_EFFECT_CONFIG_SINGLE( shadow, ShadowEffectConfig ) KWIN_EFFECT_CONFIG_SINGLE( showfps, ShowFpsEffectConfig ) - KWIN_EFFECT_CONFIG_SINGLE( resize, ResizeEffectConfig ) - KWIN_EFFECT_CONFIG_SINGLE( zoom, ZoomEffectConfig ) #endif #ifdef KWIN_HAVE_OPENGL_COMPOSITING + KWIN_EFFECT_CONFIG_SINGLE( coverswitch, CoverSwitchEffectConfig ) KWIN_EFFECT_CONFIG_SINGLE( cube, CubeEffectConfig ) KWIN_EFFECT_CONFIG_SINGLE( cubeslide, CubeSlideEffectConfig ) -#ifndef KWIN_HAVE_OPENGLES - KWIN_EFFECT_CONFIG_SINGLE( blur, BlurEffectConfig ) - KWIN_EFFECT_CONFIG_SINGLE( coverswitch, CoverSwitchEffectConfig ) KWIN_EFFECT_CONFIG_SINGLE( flipswitch, FlipSwitchEffectConfig ) KWIN_EFFECT_CONFIG_SINGLE( glide, GlideEffectConfig ) + KWIN_EFFECT_CONFIG_SINGLE( mousemark, MouseMarkEffectConfig ) + KWIN_EFFECT_CONFIG_SINGLE( trackmouse, TrackMouseEffectConfig ) + KWIN_EFFECT_CONFIG_SINGLE( wobblywindows, WobblyWindowsEffectConfig ) +#ifndef KWIN_HAVE_OPENGLES + KWIN_EFFECT_CONFIG_SINGLE( blur, BlurEffectConfig ) KWIN_EFFECT_CONFIG_SINGLE( invert, InvertEffectConfig ) KWIN_EFFECT_CONFIG_SINGLE( lookingglass, LookingGlassEffectConfig ) - KWIN_EFFECT_CONFIG_SINGLE( mousemark, MouseMarkEffectConfig ) KWIN_EFFECT_CONFIG_SINGLE( magnifier, MagnifierEffectConfig ) KWIN_EFFECT_CONFIG_SINGLE( sharpen, SharpenEffectConfig ) KWIN_EFFECT_CONFIG_SINGLE( snow, SnowEffectConfig ) - KWIN_EFFECT_CONFIG_SINGLE( trackmouse, TrackMouseEffectConfig ) - KWIN_EFFECT_CONFIG_SINGLE( wobblywindows, WobblyWindowsEffectConfig ) #endif KWIN_HAVE_OPENGLES #endif )