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

[Gilles Caulier]

SVN commit 854757 by cgilles:

digikam from KDE3 branch : Oil Paint image plugin is now ported to Editor Tool API
CCMAIL: digikam-devel at kde.org


 M  +1 -1      Makefile.am  
 D             imageeffect_oilpaint.cpp  
 D             imageeffect_oilpaint.h  
 M  +6 -5      imageplugin_oilpaint.cpp  
 A             oilpainttool.cpp   imageeffect_oilpaint.cpp#854290 [License: GPL (v2+)]
 A             oilpainttool.h   imageeffect_oilpaint.h#854290 [License: GPL (v2+)]


--- branches/extragear/kde3/graphics/digikam/imageplugins/oilpaint/Makefile.am #854756:854757
@@ -18,7 +18,7 @@
 	       $(all_includes) 
 
 digikamimageplugin_oilpaint_la_SOURCES = imageplugin_oilpaint.cpp \
-	                                     imageeffect_oilpaint.cpp oilpaint.cpp 
+	                                     oilpainttool.cpp oilpaint.cpp 
 
 digikamimageplugin_oilpaint_la_LIBADD = $(LIB_KPARTS) \
 	                                    $(top_builddir)/digikam/digikam/libdigikam.la 
--- branches/extragear/kde3/graphics/digikam/imageplugins/oilpaint/imageplugin_oilpaint.cpp #854756:854757
@@ -33,15 +33,16 @@
 // Local includes.
 
 #include "ddebug.h"
-#include "imageeffect_oilpaint.h"
+#include "oilpainttool.h"
 #include "imageplugin_oilpaint.h"
 #include "imageplugin_oilpaint.moc"
 
+using namespace DigikamOilPaintImagesPlugin;
+
 K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_oilpaint,
                            KGenericFactory<ImagePlugin_OilPaint>("digikamimageplugin_oilpaint"));
 
-ImagePlugin_OilPaint::ImagePlugin_OilPaint(QObject *parent, const char*,
-                                           const QStringList &)
+ImagePlugin_OilPaint::ImagePlugin_OilPaint(QObject *parent, const char*, const QStringList&)
                     : Digikam::ImagePlugin(parent, "ImagePlugin_OilPaint")
 {
     m_oilpaintAction = new KAction(i18n("Oil Paint..."), "oilpaint", 0, 
@@ -64,6 +65,6 @@
 
 void ImagePlugin_OilPaint::slotOilPaint()
 {
-    DigikamOilPaintImagesPlugin::ImageEffect_OilPaint dlg(kapp->activeWindow());
-    dlg.exec();
+    OilPaintTool *tool = new OilPaintTool(this);
+    loadTool(tool);
 }