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

[Gilles Caulier]

SVN commit 854831 by cgilles:

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


 M  +1 -1      Makefile.am  
 A             charcoaltool.cpp   imageeffect_charcoal.cpp#854290 [License: GPL (v2+)]
 A             charcoaltool.h   imageeffect_charcoal.h#854290 [License: GPL (v2+)]
 D             imageeffect_charcoal.cpp  
 D             imageeffect_charcoal.h  
 M  +5 -3      imageplugin_charcoal.cpp  


--- branches/extragear/kde3/graphics/digikam/imageplugins/charcoal/Makefile.am #854830:854831
@@ -18,7 +18,7 @@
 	       $(all_includes) 
 
 digikamimageplugin_charcoal_la_SOURCES = imageplugin_charcoal.cpp \
-	                                     imageeffect_charcoal.cpp charcoal.cpp 
+	                                     charcoaltool.cpp charcoal.cpp 
 
 digikamimageplugin_charcoal_la_LIBADD = $(LIB_KPARTS) \
 	                                    $(top_builddir)/digikam/digikam/libdigikam.la
--- branches/extragear/kde3/graphics/digikam/imageplugins/charcoal/imageplugin_charcoal.cpp #854830:854831
@@ -34,10 +34,12 @@
 // Local includes.
 
 #include "ddebug.h"
-#include "imageeffect_charcoal.h"
+#include "charcoaltool.h"
 #include "imageplugin_charcoal.h"
 #include "imageplugin_charcoal.moc"
 
+using namespace DigikamCharcoalImagesPlugin;
+
 K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_charcoal,
                            KGenericFactory<ImagePlugin_Charcoal>("digikamimageplugin_charcoal"));
 
@@ -65,6 +67,6 @@
 
 void ImagePlugin_Charcoal::slotCharcoal()
 {
-    DigikamCharcoalImagesPlugin::ImageEffect_Charcoal dlg(kapp->activeWindow());
-    dlg.exec();
+    CharcoalTool *tool = new CharcoalTool(this);
+    loadTool(tool);
 }