[Digikam-devel] branches/extragear/kde3/graphics/digikam/imageplugins/distortionfx

[Andi Clemens]

SVN commit 854094 by aclemens:

digiKam from KDE3 branch: Distortion Effects plugin is now ported to Editor Tool API.
CCMAIL: digikam-devel at kde.org

 M  +1 -1      Makefile.am  
 A             distortionfxtool.cpp   imageeffect_distortionfx.cpp#854063 [License: GPL (v2+)]
 A             distortionfxtool.h   imageeffect_distortionfx.h#854063 [License: GPL (v2+)]
 D             imageeffect_distortionfx.cpp  
 D             imageeffect_distortionfx.h  
 M  +13 -11    imageplugin_distortionfx.cpp  


--- branches/extragear/kde3/graphics/digikam/imageplugins/distortionfx/Makefile.am #854093:854094
@@ -18,7 +18,7 @@
 	       $(all_includes) 
 
 digikamimageplugin_distortionfx_la_SOURCES = imageplugin_distortionfx.cpp \
-	                                         imageeffect_distortionfx.cpp distortionfx.cpp
+	                                         distortionfxtool.cpp distortionfx.cpp
 
 digikamimageplugin_distortionfx_la_LIBADD = $(LIB_KPARTS) \
 	                                        $(top_builddir)/digikam/digikam/libdigikam.la
--- branches/extragear/kde3/graphics/digikam/imageplugins/distortionfx/imageplugin_distortionfx.cpp #854093:854094
@@ -8,7 +8,7 @@
  *
  * Copyright (C) 2005-2007 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
@@ -16,13 +16,13 @@
  * Public License as published by the Free Software Foundation;
  * either version 2, or (at your option)
  * any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
- * ============================================================ */ 
+ *
+ * ============================================================ */
 
 // KDE includes.
 
@@ -35,22 +35,24 @@
 // Local includes.
 
 #include "ddebug.h"
-#include "imageeffect_distortionfx.h"
+#include "distortionfxtool.h"
 #include "imageplugin_distortionfx.h"
 #include "imageplugin_distortionfx.moc"
 
+using namespace DigikamDistortionFXImagesPlugin;
+
 K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_distortionfx,
                            KGenericFactory<ImagePlugin_DistortionFX>("digikamimageplugin_distortionfx"));
 
 ImagePlugin_DistortionFX::ImagePlugin_DistortionFX(QObject *parent, const char*, const QStringList &)
                         : Digikam::ImagePlugin(parent, "ImagePlugin_DistortionFX")
 {
-    m_distortionfxAction = new KAction(i18n("Distortion Effects..."), "distortionfx", 0, 
+    m_distortionfxAction = new KAction(i18n("Distortion Effects..."), "distortionfx", 0,
                                this, SLOT(slotDistortionFX()),
                                actionCollection(), "imageplugin_distortionfx");
-                
-    setXMLFile( "digikamimageplugin_distortionfx_ui.rc" );    
-        
+
+    setXMLFile( "digikamimageplugin_distortionfx_ui.rc" );
+
     DDebug() << "ImagePlugin_DistortionFX plugin loaded" << endl;
 }
 
@@ -65,7 +67,7 @@
 
 void ImagePlugin_DistortionFX::slotDistortionFX()
 {
-    DigikamDistortionFXImagesPlugin::ImageEffect_DistortionFX dlg(parentWidget());
-    dlg.exec();
+    DistortionFXTool *distortionfx = new DistortionFXTool(parentWidget());
+    loadTool(distortionfx);
 }