From kde-commits  Tue Feb 26 18:04:28 2008
From: Marijn Kruisselbrink <m.kruisselbrink () student ! tue ! nl>
Date: Tue, 26 Feb 2008 18:04:28 +0000
To: kde-commits
Subject: koffice/kpresenter
Message-Id: <1204049068.624317.12319.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=120404912310697

SVN commit 779639 by mkruisselbrink:

add box snakes wipes


 M  +14 -2     part/dockers/KPrPageEffectDocker.cpp  
 M  +13 -1     part/pageeffects/KPrPageEffect.h  
 M  +4 -1      plugins/pageeffects/matrixwipe/CMakeLists.txt  
 M  +2 -0      plugins/pageeffects/matrixwipe/Plugin.cpp  
 A             plugins/pageeffects/matrixwipe/boxsnakes (directory)  
 A             plugins/pageeffects/matrixwipe/boxsnakes/KPrBoxSnakesWipeEffectFactory.cpp   [License: LGPL (v2+)]
 A             plugins/pageeffects/matrixwipe/boxsnakes/KPrBoxSnakesWipeEffectFactory.h   [License: LGPL (v2+)]
 A             plugins/pageeffects/matrixwipe/boxsnakes/KPrBoxSnakesWipeStrategy.cpp   [License: LGPL (v2+)]
 A             plugins/pageeffects/matrixwipe/boxsnakes/KPrBoxSnakesWipeStrategy.h   [License: LGPL (v2+)]


--- trunk/koffice/kpresenter/part/dockers/KPrPageEffectDocker.cpp #779638:779639
@@ -140,8 +140,20 @@
     I18N_NOOP( "Horizontal Top Right Opposite Out" ),
     I18N_NOOP( "Diagonal Bottom Left Opposite In" ),
     I18N_NOOP( "Diagonal Bottom Left Opposite Out" ),
-    I18N_NOOP( "Diagonal Top Left Opposite in" ),
-    I18N_NOOP( "Diagonal Top Left Opposite Out" )
+    I18N_NOOP( "Diagonal Top Left Opposite In" ),
+    I18N_NOOP( "Diagonal Top Left Opposite Out" ),
+    I18N_NOOP( "Two Box Top In" ),
+    I18N_NOOP( "Two Box Bottom In" ),
+    I18N_NOOP( "Two Box Left In" ),
+    I18N_NOOP( "Two Box Right In" ),
+    I18N_NOOP( "Four Box Vertical In" ),
+    I18N_NOOP( "Four Box Horizontal In" ),
+    I18N_NOOP( "Two Box Top Out" ),
+    I18N_NOOP( "Two Box Bottom Out" ),
+    I18N_NOOP( "Two Box Left Out" ),
+    I18N_NOOP( "Two Box Right Out" ),
+    I18N_NOOP( "Four Box Vertical Out" ),
+    I18N_NOOP( "Four Box Horizontal Out" )
 };
 
 KPrPageEffectDocker::KPrPageEffectDocker( QWidget* parent, Qt::WindowFlags flags )
--- trunk/koffice/kpresenter/part/pageeffects/KPrPageEffect.h #779638:779639
@@ -146,7 +146,19 @@
         DiagonalBottomLeftOppositeIn,
         DiagonalBottomLeftOppositeOut,
         DiagonalTopLeftOppositeIn,
-        DiagonalTopLeftOppositeOut
+        DiagonalTopLeftOppositeOut,
+        TwoBoxTopIn,
+        TwoBoxBottomIn,
+        TwoBoxLeftIn,
+        TwoBoxRightIn,
+        FourBoxVerticalIn,
+        FourBoxHorizontalIn,
+        TwoBoxTopOut,
+        TwoBoxBottomOut,
+        TwoBoxLeftOut,
+        TwoBoxRightOut,
+        FourBoxVerticalOut,
+        FourBoxHorizontalOut
     };
 
     /**
--- trunk/koffice/kpresenter/plugins/pageeffects/matrixwipe/CMakeLists.txt #779638:779639
@@ -23,12 +23,15 @@
     parallelsnakes/KPrParallelSnakesWipeVerticalStrategy.cpp
     parallelsnakes/KPrParallelSnakesWipeDiagonalStrategy.cpp
 
+    boxsnakes/KPrBoxSnakesWipeEffectFactory.cpp
+    boxsnakes/KPrBoxSnakesWipeStrategy.cpp
+
     waterfallwipe/KPrWaterfallWipeEffectFactory.cpp
     waterfallwipe/KPrWaterfallWipeTopLeftStrategy.cpp
     waterfallwipe/KPrWaterfallWipeTopRightStrategy.cpp
     waterfallwipe/KPrWaterfallWipeBottomLeftStrategy.cpp
     waterfallwipe/KPrWaterfallWipeBottomRightStrategy.cpp
-    )
+)
 
 kde4_add_plugin(kpr_pageeffect_matrixwipe ${kpr_pageeffect_matrixwipe_SRCS})
 
--- trunk/koffice/kpresenter/plugins/pageeffects/matrixwipe/Plugin.cpp #779638:779639
@@ -24,6 +24,7 @@
 #include "snakewipe/KPrSnakeWipeEffectFactory.h"
 #include "spiralwipe/KPrSpiralWipeEffectFactory.h"
 #include "parallelsnakes/KPrParallelSnakesWipeEffectFactory.h"
+#include "boxsnakes/KPrBoxSnakesWipeEffectFactory.h"
 #include "waterfallwipe/KPrWaterfallWipeEffectFactory.h"
 
 K_EXPORT_COMPONENT_FACTORY( kpr_pageeffect_matrixwipe, KGenericFactory<Plugin>( "KPrPageEffect" ) )
@@ -34,6 +35,7 @@
     KPrPageEffectRegistry::instance()->add(new KPrSnakeWipeEffectFactory());
     KPrPageEffectRegistry::instance()->add(new KPrSpiralWipeEffectFactory());
     KPrPageEffectRegistry::instance()->add(new KPrParallelSnakesWipeEffectFactory());
+    KPrPageEffectRegistry::instance()->add(new KPrBoxSnakesWipeEffectFactory());
     KPrPageEffectRegistry::instance()->add(new KPrWaterfallWipeEffectFactory());
 }