SVN commit 779368 by mkruisselbrink: add spiral wipe effects M +17 -1 part/dockers/KPrPageEffectDocker.cpp M +17 -1 part/pageeffects/KPrPageEffect.h M +3 -0 plugins/pageeffects/matrixwipe/CMakeLists.txt M +2 -0 plugins/pageeffects/matrixwipe/Plugin.cpp A plugins/pageeffects/matrixwipe/spiralwipe (directory) A plugins/pageeffects/matrixwipe/spiralwipe/KPrSpiralWipeEffectFactory.cpp [License: LGPL (v2+)] A plugins/pageeffects/matrixwipe/spiralwipe/KPrSpiralWipeEffectFactory.h [License: LGPL (v2+)] A plugins/pageeffects/matrixwipe/spiralwipe/KPrSpiralWipeStrategy.cpp [License: LGPL (v2+)] A plugins/pageeffects/matrixwipe/spiralwipe/KPrSpiralWipeStrategy.h [License: LGPL (v2+)] --- trunk/koffice/kpresenter/part/dockers/KPrPageEffectDocker.cpp #779367:779368 @@ -105,7 +105,23 @@ I18N_NOOP( "Bottom Left Vertical" ), I18N_NOOP( "Bottom Left Horizontal" ), I18N_NOOP( "Bottom Right Vertical" ), - I18N_NOOP( "Bottom Right Horizontal" ) + I18N_NOOP( "Bottom Right Horizontal" ), + I18N_NOOP( "Clockwise Top Left In" ), + I18N_NOOP( "Clockwise Top Left Out" ), + I18N_NOOP( "Clockwise Top Right In" ), + I18N_NOOP( "Clockwise Top Right Out" ), + I18N_NOOP( "Clockwise Bottom Left In" ), + I18N_NOOP( "Clockwise Bottom Left Out" ), + I18N_NOOP( "Clockwise Bottom Right In" ), + I18N_NOOP( "Clockwise Bottom Right Out" ), + I18N_NOOP( "Counterclockwise Top Left In" ), + I18N_NOOP( "Counterclockwise Top Left Out" ), + I18N_NOOP( "Counterclockwise Top Right In" ), + I18N_NOOP( "Counterclockwise Top Right Out" ), + I18N_NOOP( "Counterclockwise Bottom Left In" ), + I18N_NOOP( "Counterclockwise Bottom Left Out" ), + I18N_NOOP( "Counterclockwise Bottom Right In" ), + I18N_NOOP( "Counterclockwise Bottom Right Out" ) }; KPrPageEffectDocker::KPrPageEffectDocker( QWidget* parent, Qt::WindowFlags flags ) --- trunk/koffice/kpresenter/part/pageeffects/KPrPageEffect.h #779367:779368 @@ -110,7 +110,23 @@ BottomLeftVertical, BottomLeftHorizontal, BottomRightVertical, - BottomRightHorizontal + BottomRightHorizontal, + ClockwiseTopLeftIn, + ClockwiseTopLeftOut, + ClockwiseTopRightIn, + ClockwiseTopRightOut, + ClockwiseBottomLeftIn, + ClockwiseBottomLeftOut, + ClockwiseBottomRightIn, + ClockwiseBottomRightOut, + CounterClockwiseTopLeftIn, + CounterClockwiseTopLeftOut, + CounterClockwiseTopRightIn, + CounterClockwiseTopRightOut, + CounterClockwiseBottomLeftIn, + CounterClockwiseBottomLeftOut, + CounterClockwiseBottomRightIn, + CounterClockwiseBottomRightOut }; /** --- trunk/koffice/kpresenter/plugins/pageeffects/matrixwipe/CMakeLists.txt #779367:779368 @@ -15,6 +15,9 @@ snakewipe/KPrSnakeWipeBottomRightDiagonalStrategy.cpp snakewipe/KPrSnakeWipeBottomLeftDiagonalStrategy.cpp + spiralwipe/KPrSpiralWipeEffectFactory.cpp + spiralwipe/KPrSpiralWipeStrategy.cpp + waterfallwipe/KPrWaterfallWipeEffectFactory.cpp waterfallwipe/KPrWaterfallWipeTopLeftStrategy.cpp waterfallwipe/KPrWaterfallWipeTopRightStrategy.cpp --- trunk/koffice/kpresenter/plugins/pageeffects/matrixwipe/Plugin.cpp #779367:779368 @@ -22,6 +22,7 @@ #include #include "snakewipe/KPrSnakeWipeEffectFactory.h" +#include "spiralwipe/KPrSpiralWipeEffectFactory.h" #include "waterfallwipe/KPrWaterfallWipeEffectFactory.h" K_EXPORT_COMPONENT_FACTORY( kpr_pageeffect_matrixwipe, KGenericFactory( "KPrPageEffect" ) ) @@ -30,6 +31,7 @@ : QObject(parent) { KPrPageEffectRegistry::instance()->add(new KPrSnakeWipeEffectFactory()); + KPrPageEffectRegistry::instance()->add(new KPrSpiralWipeEffectFactory()); KPrPageEffectRegistry::instance()->add(new KPrWaterfallWipeEffectFactory()); }