[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-02-25 19:28:09
Message-ID: 1203967689.855095.8300.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 779281 by langkamp:

implemented center fan wipes for fanwipe and doublefanwipe

 M  +7 -1      part/dockers/KPrPageEffectDocker.cpp  
 M  +7 -1      part/pageeffects/KPrPageEffect.h  
 M  +1 -0      plugins/pageeffects/TODO  
 M  +3 -0      plugins/pageeffects/clockwipe/CMakeLists.txt  
 A             plugins/pageeffects/clockwipe/KPrCenterFanWipeStrategy.cpp   [License: \
LGPL (v2+)]  A             plugins/pageeffects/clockwipe/KPrCenterFanWipeStrategy.h   \
[License: LGPL (v2+)]  M  +4 -0      plugins/pageeffects/clockwipe/Plugin.cpp  
 A             plugins/pageeffects/clockwipe/doublefanwipe (directory)  
 A             plugins/pageeffects/clockwipe/doublefanwipe/KPrDoubleFanWipeEffectFactory.cpp \
[License: LGPL (v2+)]  A             \
plugins/pageeffects/clockwipe/doublefanwipe/KPrDoubleFanWipeEffectFactory.h   \
[License: LGPL (v2+)]  A             plugins/pageeffects/clockwipe/fanwipe \
(directory)    A             \
plugins/pageeffects/clockwipe/fanwipe/KPrFanWipeEffectFactory.cpp   [License: LGPL \
(v2+)]  A             plugins/pageeffects/clockwipe/fanwipe/KPrFanWipeEffectFactory.h \
[License: LGPL (v2+)]  M  +3 -3      \
plugins/pageeffects/clockwipe/singlesweepwipe/KPrSingleSweepWipeStrategy.h  


--- trunk/koffice/kpresenter/part/dockers/KPrPageEffectDocker.cpp #779280:779281
@@ -83,7 +83,13 @@
     I18N_NOOP( "Counterclockwise Top Left" ),
     I18N_NOOP( "Clockwise Bottom Left" ),
     I18N_NOOP( "Counterclockwise Bottom Right" ),
-    I18N_NOOP( "Clockwise Top Right" )
+    I18N_NOOP( "Clockwise Top Right" ),
+    I18N_NOOP( "Center Right" ),
+    I18N_NOOP( "Center Top" ),
+    I18N_NOOP( "Center Left" ),
+    I18N_NOOP( "Center Bottom" ),
+    I18N_NOOP( "Fan Out Vertical" ),
+    I18N_NOOP( "Fan Out Horizontal" )
 };
 
 KPrPageEffectDocker::KPrPageEffectDocker( QWidget* parent, Qt::WindowFlags flags )
--- trunk/koffice/kpresenter/part/pageeffects/KPrPageEffect.h #779280:779281
@@ -88,7 +88,13 @@
         CounterClockwiseTopLeft,
         ClockwiseBottomLeft,
         CounterClockwiseBottomRight,
-        ClockwiseTopRight
+        ClockwiseTopRight,
+        CenterRight,
+        CenterTop,
+        CenterLeft,
+        CenterBottom,
+        FanOutVertical,
+        FanOutHorizontal
     };
 
     /**
--- trunk/koffice/kpresenter/plugins/pageeffects/TODO #779280:779281
@@ -90,6 +90,7 @@
 "fanWipe"  "centerTop" (211) [default], "centerRight" (212), "top" (231), "right" \
(232), "bottom" (233), "left" (234)  Sven Langkamp
 "doubleFanWipe"  "fanOutVertical" (213) [default], "fanOutHorizontal" (214), \
"fanInVertical" (235), "fanInHorizontal" (236) +  Sven Langkamp
 "doubleSweepWipe"  "parallelVertical" (225) [default], "parallelDiagonal" (226), \
"oppositeVertical" (227), "oppositeHorizontal" (228), "parallelDiagonalTopLeft" \
(245), "parallelDiagonalBottomLeft" (246)  "saloonDoorWipe"  "top" (251) [default], \
"left" (252), "bottom" (253), "right" (254)  "windshieldWipe"  "right" (261) \
                [default], "up" (262), "vertical" (263), "horizontal" (264)
--- trunk/koffice/kpresenter/plugins/pageeffects/clockwipe/CMakeLists.txt \
#779280:779281 @@ -3,11 +3,14 @@
 set(kpr_pageeffect_clockwipe_SRCS
     Plugin.cpp
     KPrClockWipeStrategy.cpp
+    KPrCenterFanWipeStrategy.cpp
 
     clockwipe/KPrClockWipeEffectFactory.cpp
     pinwheelwipe/KPrPinWheelWipeEffectFactory.cpp
     singlesweepwipe/KPrSingleSweepWipeEffectFactory.cpp
     singlesweepwipe/KPrSingleSweepWipeStrategy.cpp
+    fanwipe/KPrFanWipeEffectFactory.cpp
+    doublefanwipe/KPrDoubleFanWipeEffectFactory.cpp
     )
 
 kde4_add_plugin(kpr_pageeffect_clockwipe ${kpr_pageeffect_clockwipe_SRCS})
--- trunk/koffice/kpresenter/plugins/pageeffects/clockwipe/Plugin.cpp #779280:779281
@@ -24,6 +24,8 @@
 #include "clockwipe/KPrClockWipeEffectFactory.h"
 #include "pinwheelwipe/KPrPinWheelWipeEffectFactory.h"
 #include "singlesweepwipe/KPrSingleSweepWipeEffectFactory.h"
+#include "fanwipe/KPrFanWipeEffectFactory.h"
+#include "doublefanwipe/KPrDoubleFanWipeEffectFactory.h"
 
 K_EXPORT_COMPONENT_FACTORY( kpr_pageeffect_clockwipe, KGenericFactory<Plugin>( \
"KPrPageEffect" ) )  
@@ -33,6 +35,8 @@
     KPrPageEffectRegistry::instance()->add(new KPrClockWipeEffectFactory());
     KPrPageEffectRegistry::instance()->add(new KPrPinWheelWipeEffectFactory());
     KPrPageEffectRegistry::instance()->add(new KPrSingleSweepWipeEffectFactory());
+    KPrPageEffectRegistry::instance()->add(new KPrFanWipeEffectFactory());
+    KPrPageEffectRegistry::instance()->add(new KPrDoubleFanWipeEffectFactory());
 }
 
 #include "Plugin.moc"
--- trunk/koffice/kpresenter/plugins/pageeffects/clockwipe/singlesweepwipe/KPrSingleSweepWipeStrategy.h \
#779280:779281 @@ -17,8 +17,8 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#ifndef KPRCLOCKWIPESTRATEGY_H
-#define KPRCLOCKWIPESTRATEGY_H
+#ifndef KPRSINGLESWEEPWIPESTRATEGY_H
+#define KPRSINGLESWEEPWIPESTRATEGY_H
 
 #include <KPrPageEffectStrategy.h>
 
@@ -39,4 +39,4 @@
     double m_rotationY;
 };
 
-#endif // KPRCLOCKWIPESTRATEGY_H
+#endif // KPRSINGLESWEEPWIPESTRATEGY_H


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