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

[Andi Clemens]

SVN commit 855208 by aclemens:

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

 M  +1 -1      CMakeLists.txt  
 D             imageeffect_superimpose.cpp  
 D             imageeffect_superimpose.h  
 M  +7 -5      imageplugin_superimpose.cpp  
 A             superimposetool.cpp   imageeffect_superimpose.cpp#855121 [License: GPL (v2+)]
 A             superimposetool.h   imageeffect_superimpose.h#855121 [License: GPL (v2+)]


--- trunk/extragear/graphics/digikam/imageplugins/superimpose/CMakeLists.txt #855207:855208
@@ -3,7 +3,7 @@
                                              superimpose.cpp 
                                              dirselectwidget.cpp
                                              imageplugin_superimpose.cpp
-                                             imageeffect_superimpose.cpp 
+                                             superimposetool.cpp 
    )
 
 
--- trunk/extragear/graphics/digikam/imageplugins/superimpose/imageplugin_superimpose.cpp #855207:855208
@@ -4,7 +4,7 @@
  * http://www.digikam.org
  *
  * Date        : 2005-01-04
- * Description : a Digikam image editor plugin for superimpose a 
+ * Description : a Digikam image editor plugin for superimpose a
  *               template to an image.
  *
  * Copyright (C) 2005-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
@@ -36,10 +36,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_PLUGIN_FACTORY( SuperImposeFactory, registerPlugin<ImagePlugin_SuperImpose>(); )
 K_EXPORT_PLUGIN ( SuperImposeFactory("digikamimageplugin_superimpose") )
 
@@ -49,7 +51,7 @@
     m_superimposeAction  = new KAction(KIcon("superimpose"), i18n("Template Superimpose..."), this);
     actionCollection()->addAction("imageplugin_superimpose", m_superimposeAction );
 
-    connect(m_superimposeAction, SIGNAL(triggered(bool)), 
+    connect(m_superimposeAction, SIGNAL(triggered(bool)),
             this, SLOT(slotSuperImpose()));
 
     setXMLFile("digikamimageplugin_superimpose_ui.rc");
@@ -68,6 +70,6 @@
 
 void ImagePlugin_SuperImpose::slotSuperImpose()
 {
-    DigikamSuperImposeImagesPlugin::ImageEffect_SuperImpose dlg(kapp->activeWindow());
-    dlg.exec();
+    SuperImposeTool *tool = new SuperImposeTool(kapp->activeWindow());
+    loadTool(tool);
 }