[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/kpresenter
From:       Sven Langkamp <sven.langkamp () gmail ! com>
Date:       2008-03-01 17:47:34
Message-ID: 1204393654.157333.27613.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 780943 by langkamp:

implemented doublesweepwipe and saloondoorwipe

 M  +13 -1     part/dockers/KPrPageEffectDocker.cpp  
 M  +13 -1     part/pageeffects/KPrPageEffect.h  
 M  +3 -1      plugins/pageeffects/TODO  
 M  +5 -0      plugins/pageeffects/clockwipe/CMakeLists.txt  
 A             plugins/pageeffects/clockwipe/KPrSweepWipeStrategy.cpp   [License: \
LGPL (v2+)]  A             plugins/pageeffects/clockwipe/KPrSweepWipeStrategy.h   \
[License: LGPL (v2+)]  M  +6 -0      plugins/pageeffects/clockwipe/Plugin.cpp  
 A             plugins/pageeffects/clockwipe/doublesweepwipe (directory)  
 A             plugins/pageeffects/clockwipe/doublesweepwipe/KPrDoubleSweepWipeEffectFactory.cpp \
[License: LGPL (v2+)]  A             \
plugins/pageeffects/clockwipe/doublesweepwipe/KPrDoubleSweepWipeEffectFactory.h   \
[License: LGPL (v2+)]  A             \
plugins/pageeffects/clockwipe/doublesweepwipe/KPrDoubleSweepWipeStrategy.cpp   \
[License: LGPL (v2+)]  A             \
plugins/pageeffects/clockwipe/doublesweepwipe/KPrDoubleSweepWipeStrategy.h   \
[License: LGPL (v2+)]  A             plugins/pageeffects/clockwipe/saloondoorwipe \
(directory)    A             \
plugins/pageeffects/clockwipe/saloondoorwipe/KPrSaloonDoorWipeEffectFactory.cpp   \
[License: LGPL (v2+)]  A             \
plugins/pageeffects/clockwipe/saloondoorwipe/KPrSaloonDoorWipeEffectFactory.h   \
[License: LGPL (v2+)]  A             \
plugins/pageeffects/clockwipe/saloondoorwipe/KPrSaloonDoorWipeStrategy.cpp   \
[License: LGPL (v2+)]  A             \
plugins/pageeffects/clockwipe/saloondoorwipe/KPrSaloonDoorWipeStrategy.h   [License: \
LGPL (v2+)]


--- trunk/koffice/kpresenter/part/dockers/KPrPageEffectDocker.cpp #780942:780943
@@ -167,7 +167,19 @@
     I18N_NOOP( "Fan In Vertical" ),
     I18N_NOOP( "Fan In Horizontal" ),
     I18N_NOOP( "Fan In Vertical Reverse" ),
-    I18N_NOOP( "Fan In Horizontal Reverse" )
+    I18N_NOOP( "Fan In Horizontal Reverse" ),
+    I18N_NOOP( "Parallel Vertical In" ),
+    I18N_NOOP( "Parallel Diagonal" ),
+    I18N_NOOP( "Opposite Vertical" ),
+    I18N_NOOP( "Opposite Horizontal" ),
+    I18N_NOOP( "Parallel Diagonal Top Left" ),
+    I18N_NOOP( "Parallel Diagonal Bottom Left" ),
+    I18N_NOOP( "Parallel Vertical Reverse" ),
+    I18N_NOOP( "Parallel Diagonal Reverse" ),
+    I18N_NOOP( "OppositeVertical Reverse" ),
+    I18N_NOOP( "OppositeHorizontal Reverse" ),
+    I18N_NOOP( "Parallel Diagonal Top Left Reverse" ),
+    I18N_NOOP( "Parallel Diagonal Bottom Left Reverse" )
 };
 
 KPrPageEffectDocker::KPrPageEffectDocker( QWidget* parent, Qt::WindowFlags flags )
--- trunk/koffice/kpresenter/part/pageeffects/KPrPageEffect.h #780942:780943
@@ -172,7 +172,19 @@
         FanInVertical,
         FanInHorizontal,
         FanInVerticalReverse,
-        FanInHorizontalReverse
+        FanInHorizontalReverse,
+        ParallelVertical,
+        ParallelDiagonal,
+        OppositeVertical,
+        OppositeHorizontal,
+        ParallelDiagonalTopLeft,
+        ParallelDiagonalBottomLeft,
+        ParallelVerticalReverse,
+        ParallelDiagonalReverse,
+        OppositeVerticalReverse,
+        OppositeHorizontalReverse,
+        ParallelDiagonalTopLeftReverse,
+        ParallelDiagonalBottomLeftReverse
     };
 
     /**
--- trunk/koffice/kpresenter/plugins/pageeffects/TODO #780942:780943
@@ -100,9 +100,11 @@
 "doubleFanWipe"  "fanOutVertical" (213) [default], "fanOutHorizontal" (214), \
"fanInVertical" (235), "fanInHorizontal" (236)  done Sven Langkamp
 "doubleSweepWipe"  "parallelVertical" (225) [default], "parallelDiagonal" (226), \
"oppositeVertical" (227), "oppositeHorizontal" (228), "parallelDiagonalTopLeft" \
                (245), "parallelDiagonalBottomLeft" (246)
-  Sven Langkamp
+  done Sven Langkamp
 "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
 
 Matrix Wipes - media is revealed in squares following a pattern
 ---------------------------------------------------------------
--- trunk/koffice/kpresenter/plugins/pageeffects/clockwipe/CMakeLists.txt \
#780942:780943 @@ -6,6 +6,7 @@
     KPrCenterFanWipeStrategy.cpp
     KPrSideFanWipeStrategy.cpp
     KPrClockWipeSubpathHelper.cpp
+    KPrSweepWipeStrategy.cpp
 
     clockwipe/KPrClockWipeEffectFactory.cpp
     pinwheelwipe/KPrPinWheelWipeEffectFactory.cpp
@@ -13,6 +14,10 @@
     singlesweepwipe/KPrSingleSweepWipeStrategy.cpp
     fanwipe/KPrFanWipeEffectFactory.cpp
     doublefanwipe/KPrDoubleFanWipeEffectFactory.cpp
+    doublesweepwipe/KPrDoubleSweepWipeEffectFactory.cpp
+    doublesweepwipe/KPrDoubleSweepWipeStrategy.cpp
+    saloondoorwipe/KPrSaloonDoorWipeEffectFactory.cpp
+    saloondoorwipe/KPrSaloonDoorWipeStrategy.cpp
     )
 
 kde4_add_plugin(kpr_pageeffect_clockwipe ${kpr_pageeffect_clockwipe_SRCS})
--- trunk/koffice/kpresenter/plugins/pageeffects/clockwipe/Plugin.cpp #780942:780943
@@ -26,7 +26,10 @@
 #include "singlesweepwipe/KPrSingleSweepWipeEffectFactory.h"
 #include "fanwipe/KPrFanWipeEffectFactory.h"
 #include "doublefanwipe/KPrDoubleFanWipeEffectFactory.h"
+#include "doublesweepwipe/KPrDoubleSweepWipeEffectFactory.h"
+#include "saloondoorwipe/KPrSaloonDoorWipeEffectFactory.h"
 
+
 K_EXPORT_COMPONENT_FACTORY( kpr_pageeffect_clockwipe, KGenericFactory<Plugin>( \
"KPrPageEffect" ) )  
 Plugin::Plugin(QObject *parent, const QStringList &)
@@ -37,6 +40,9 @@
     KPrPageEffectRegistry::instance()->add(new KPrSingleSweepWipeEffectFactory());
     KPrPageEffectRegistry::instance()->add(new KPrFanWipeEffectFactory());
     KPrPageEffectRegistry::instance()->add(new KPrDoubleFanWipeEffectFactory());
+    KPrPageEffectRegistry::instance()->add(new KPrDoubleSweepWipeEffectFactory());
+    KPrPageEffectRegistry::instance()->add(new KPrSaloonDoorWipeEffectFactory());
+
 }
 
 #include "Plugin.moc"


[prev in list] [next in list] [prev in thread] [next in thread]