SVN commit 781136 by langkamp: implemented windshield effect M +5 -1 part/dockers/KPrPageEffectDocker.cpp M +5 -1 part/pageeffects/KPrPageEffect.h M +1 -1 plugins/pageeffects/TODO M +2 -0 plugins/pageeffects/clockwipe/CMakeLists.txt M +3 -3 plugins/pageeffects/clockwipe/KPrClockWipeSubpathHelper.cpp M +2 -0 plugins/pageeffects/clockwipe/Plugin.cpp A plugins/pageeffects/clockwipe/windshieldwipe (directory) A plugins/pageeffects/clockwipe/windshieldwipe/KPrWindShieldWipeEffectFactory.cpp [License: LGPL (v2+)] A plugins/pageeffects/clockwipe/windshieldwipe/KPrWindShieldWipeEffectFactory.h [License: LGPL (v2+)] A plugins/pageeffects/clockwipe/windshieldwipe/KPrWindShieldWipeStrategy.cpp [License: LGPL (v2+)] A plugins/pageeffects/clockwipe/windshieldwipe/KPrWindShieldWipeStrategy.h [License: LGPL (v2+)] --- trunk/koffice/kpresenter/part/dockers/KPrPageEffectDocker.cpp #781135:781136 @@ -179,7 +179,11 @@ I18N_NOOP( "OppositeVertical Reverse" ), I18N_NOOP( "OppositeHorizontal Reverse" ), I18N_NOOP( "Parallel Diagonal Top Left Reverse" ), - I18N_NOOP( "Parallel Diagonal Bottom Left Reverse" ) + I18N_NOOP( "Parallel Diagonal Bottom Left Reverse" ), + I18N_NOOP( "Right" ), + I18N_NOOP( "Up" ), + I18N_NOOP( "Right Reverse" ), + I18N_NOOP( "Up Reverse" ), }; KPrPageEffectDocker::KPrPageEffectDocker( QWidget* parent, Qt::WindowFlags flags ) --- trunk/koffice/kpresenter/part/pageeffects/KPrPageEffect.h #781135:781136 @@ -184,7 +184,11 @@ OppositeVerticalReverse, OppositeHorizontalReverse, ParallelDiagonalTopLeftReverse, - ParallelDiagonalBottomLeftReverse + ParallelDiagonalBottomLeftReverse, + Right, + Up, + RightReverse, + UpReverse, }; /** --- trunk/koffice/kpresenter/plugins/pageeffects/TODO #781135:781136 @@ -104,7 +104,7 @@ "saloonDoorWipe" "top" (251) [default], "left" (252), "bottom" (253), "right" (254) done Sven Langkamp "windshieldWipe" "right" (261) [default], "up" (262), "vertical" (263), "horizontal" (264) - Sven Langkamp + done Sven Langkamp Matrix Wipes - media is revealed in squares following a pattern --------------------------------------------------------------- --- trunk/koffice/kpresenter/plugins/pageeffects/clockwipe/CMakeLists.txt #781135:781136 @@ -18,6 +18,8 @@ doublesweepwipe/KPrDoubleSweepWipeStrategy.cpp saloondoorwipe/KPrSaloonDoorWipeEffectFactory.cpp saloondoorwipe/KPrSaloonDoorWipeStrategy.cpp + windshieldwipe/KPrWindShieldWipeEffectFactory.cpp + windshieldwipe/KPrWindShieldWipeStrategy.cpp ) kde4_add_plugin(kpr_pageeffect_clockwipe ${kpr_pageeffect_clockwipe_SRCS}) --- trunk/koffice/kpresenter/plugins/pageeffects/clockwipe/KPrClockWipeSubpathHelper.cpp #781135:781136 @@ -73,9 +73,9 @@ while(cornerAngle < endAngle) { - int cornerX = cos(cornerAngle) < 0 ? -width/2 : width/2; - int cornerY = sin(cornerAngle) < 0 ? -height/2 : height/2; - clipPath->lineTo(QPoint( center.x() + cornerX, center.y() - cornerY)); + int cornerX = cos(cornerAngle) < 0 ? 0 : width; + int cornerY = sin(cornerAngle) < 0 ? height : 0; + clipPath->lineTo(QPoint( boundingRect.x() + cornerX, boundingRect.y() + cornerY)); quadrantAngle = static_cast(cornerAngle / (0.5*M_PI))*(0.5*M_PI); cornerAngleInQuadrant = cornerAngle - quadrantAngle; --- trunk/koffice/kpresenter/plugins/pageeffects/clockwipe/Plugin.cpp #781135:781136 @@ -28,6 +28,7 @@ #include "doublefanwipe/KPrDoubleFanWipeEffectFactory.h" #include "doublesweepwipe/KPrDoubleSweepWipeEffectFactory.h" #include "saloondoorwipe/KPrSaloonDoorWipeEffectFactory.h" +#include "windshieldwipe/KPrWindShieldWipeEffectFactory.h" K_EXPORT_COMPONENT_FACTORY( kpr_pageeffect_clockwipe, KGenericFactory( "KPrPageEffect" ) ) @@ -42,6 +43,7 @@ KPrPageEffectRegistry::instance()->add(new KPrDoubleFanWipeEffectFactory()); KPrPageEffectRegistry::instance()->add(new KPrDoubleSweepWipeEffectFactory()); KPrPageEffectRegistry::instance()->add(new KPrSaloonDoorWipeEffectFactory()); + KPrPageEffectRegistry::instance()->add(new KPrWindShieldWipeEffectFactory()); }