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

[Gilles Caulier]

SVN commit 854038 by cgilles:

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



 M  +1 -2      Makefile.am  
 D             imageeffect_superimpose.cpp  
 D             imageeffect_superimpose.h  
 M  +7 -6      imageplugin_superimpose.cpp  
 M  +2 -2      imageplugin_superimpose.h  
 A             superimposetool.cpp   imageeffect_superimpose.cpp#853945 [License: GPL (v2+)]
 A             superimposetool.h   imageeffect_superimpose.h#853945 [License: GPL (v2+)]


--- branches/extragear/kde3/graphics/digikam/imageplugins/superimpose/Makefile.am #854037:854038
@@ -19,7 +19,7 @@
 	       $(all_includes) 
 
 digikamimageplugin_superimpose_la_SOURCES = superimposewidget.cpp superimpose.cpp dirselectwidget.cpp \
-	                                        imageplugin_superimpose.cpp imageeffect_superimpose.cpp 
+	                                        imageplugin_superimpose.cpp superimposetool.cpp 
 	                                        
 
 digikamimageplugin_superimpose_la_LIBADD = $(LIB_KPARTS) \
@@ -33,4 +33,3 @@
 
 rcdir = $(kde_datadir)/digikam
 rc_DATA = digikamimageplugin_superimpose_ui.rc
-
--- branches/extragear/kde3/graphics/digikam/imageplugins/superimpose/imageplugin_superimpose.cpp #854037:854038
@@ -34,10 +34,12 @@
 // Local includes.
 
 #include "ddebug.h"
-#include "imageeffect_superimpose.h"
+#include "superimposetool.h"
 #include "imageplugin_superimpose.h"
 #include "imageplugin_superimpose.moc"
 
+using namespace DigikamSuperImposeImagesPlugin;
+
 K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_superimpose,
                            KGenericFactory<ImagePlugin_SuperImpose>("digikamimageplugin_superimpose"));
 
@@ -48,8 +50,8 @@
                               this, SLOT(slotSuperImpose()),
                               actionCollection(), "imageplugin_superimpose");
 
-    setXMLFile("digikamimageplugin_superimpose_ui.rc");        
-                                    
+    setXMLFile("digikamimageplugin_superimpose_ui.rc");
+
     DDebug() << "ImagePlugin_SuperImpose plugin loaded" << endl;
 }
 
@@ -64,7 +66,6 @@
 
 void ImagePlugin_SuperImpose::slotSuperImpose()
 {
-    DigikamSuperImposeImagesPlugin::ImageEffect_SuperImpose dlg(parentWidget());
-    dlg.exec();
+    SuperImposeTool *tool = new SuperImposeTool(this);
+    loadTool(tool);
 }
-
--- branches/extragear/kde3/graphics/digikam/imageplugins/superimpose/imageplugin_superimpose.h #854037:854038
@@ -36,7 +36,7 @@
 class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_SuperImpose : public Digikam::ImagePlugin
 {
     Q_OBJECT
-    
+
 public:
 
     ImagePlugin_SuperImpose(QObject *parent, const char* name,
@@ -53,5 +53,5 @@
 
     KAction *m_superimposeAction;
 };
-    
+
 #endif /* IMAGEPLUGIN_SUPERIMPOSE_H */