[Digikam-devel] extragear/graphics/digikam/imageplugins

[Andi Clemens]

SVN commit 855332 by aclemens:

digiKam from trunk: DistortionFX plugin is now ported to Editor Tool API.
CCMAIL: digikam-devel at kde.org

 M  +1 -1      EDITORTOOLPORT  
 M  +1 -1      distortionfx/CMakeLists.txt  
 A             distortionfx/distortionfxtool.cpp   distortionfx/imageeffect_distortionfx.cpp#855233 [License: GPL (v2+)]
 A             distortionfx/distortionfxtool.h   distortionfx/imageeffect_distortionfx.h#855233 [License: GPL (v2+)]
 D             distortionfx/imageeffect_distortionfx.cpp  
 D             distortionfx/imageeffect_distortionfx.h  
 M  +8 -6      distortionfx/imageplugin_distortionfx.cpp  


--- trunk/extragear/graphics/digikam/imageplugins/EDITORTOOLPORT #855331:855332
@@ -27,7 +27,7 @@
   \---autocorrection        ImageGuideDlg       A               DONE
   \---distortion            ImageGuideDlg       A               DONE
 border                      ImageGuideDlg       DONE            DONE
-distortionfx                ImageGuideDlg       A
+distortionfx                ImageGuideDlg       DONE            DONE
 freerotation                ImageGuideDlg                       DONE
 inpainting                  ImageGuideDlg       A               DONE
 raindrop                    ImageGuideDlg       A
--- trunk/extragear/graphics/digikam/imageplugins/distortionfx/CMakeLists.txt #855331:855332
@@ -1,6 +1,6 @@
 
 SET(digikamimageplugin_distortionfx_PART_SRCS imageplugin_distortionfx.cpp
-                                              imageeffect_distortionfx.cpp
+                                              distortionfxtool.cpp
                                               distortionfx.cpp
    )
 
--- trunk/extragear/graphics/digikam/imageplugins/distortionfx/imageplugin_distortionfx.cpp #855331:855332
@@ -8,7 +8,7 @@
  *
  * Copyright (C) 2005-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
  *
- * Original Distortion algorithms copyrighted 2004-2005 by 
+ * Original Distortion algorithms copyrighted 2004-2005 by
  * Pieter Z. Voloshyn <pieter dot voloshyn at gmail dot com>.
  *
  * This program is free software; you can redistribute it
@@ -22,7 +22,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * ============================================================ */ 
+ * ============================================================ */
 
 // KDE includes.
 
@@ -37,10 +37,12 @@
 // Local includes.
 
 #include "ddebug.h"
-#include "imageeffect_distortionfx.h"
+#include "distortionfxtool.h"
 #include "imageplugin_distortionfx.h"
 #include "imageplugin_distortionfx.moc"
 
+using namespace DigikamDistortionFXImagesPlugin;
+
 K_PLUGIN_FACTORY( DistortionFXFactory, registerPlugin<ImagePlugin_DistortionFX>(); )
 K_EXPORT_PLUGIN ( DistortionFXFactory("digikamimageplugin_distortionfx") )
 
@@ -50,7 +52,7 @@
     m_distortionfxAction  = new KAction(KIcon("distortionfx"), i18n("Distortion Effects..."), this);
     actionCollection()->addAction("imageplugin_distortionfx", m_distortionfxAction );
 
-    connect(m_distortionfxAction, SIGNAL(triggered(bool) ), 
+    connect(m_distortionfxAction, SIGNAL(triggered(bool) ),
             this, SLOT(slotDistortionFX()));
 
     setXMLFile( "digikamimageplugin_distortionfx_ui.rc" );
@@ -69,6 +71,6 @@
 
 void ImagePlugin_DistortionFX::slotDistortionFX()
 {
-    DigikamDistortionFXImagesPlugin::ImageEffect_DistortionFX dlg(kapp->activeWindow());
-    dlg.exec();
+    DistortionFXTool *tool = new DistortionFXTool(kapp->activeWindow());
+    loadTool(tool);
 }