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

[Andi Clemens]

SVN commit 855173 by aclemens:

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

 M  +1 -1      CMakeLists.txt  
 D             imageeffect_perspective.cpp  
 D             imageeffect_perspective.h  
 M  +10 -8     imageplugin_perspective.cpp  
 A             perspectivetool.cpp   imageeffect_perspective.cpp#855121 [License: GPL (v2+)]
 A             perspectivetool.h   imageeffect_perspective.h#855121 [License: GPL (v2+)]


--- trunk/extragear/graphics/digikam/imageplugins/perspective/CMakeLists.txt #855172:855173
@@ -1,6 +1,6 @@
 
 SET(digikamimageplugin_perspective_PART_SRCS imageplugin_perspective.cpp
-                                             imageeffect_perspective.cpp
+                                             perspectivetool.cpp
                                              perspectivewidget.cpp 
                                              triangle.cpp 
                                              matrix.cpp 
--- trunk/extragear/graphics/digikam/imageplugins/perspective/imageplugin_perspective.cpp #855172:855173
@@ -23,21 +23,23 @@
 
 // KDE includes.
 
-#include <klocale.h>
-#include <kgenericfactory.h>
-#include <klibloader.h>
 #include <kaction.h>
 #include <kactioncollection.h>
+#include <kapplication.h>
 #include <kcursor.h>
-#include <kapplication.h>
+#include <kgenericfactory.h>
+#include <klibloader.h>
+#include <klocale.h>
 
 // Local includes.
 
 #include "ddebug.h"
-#include "imageeffect_perspective.h"
+#include "perspectivetool.h"
 #include "imageplugin_perspective.h"
 #include "imageplugin_perspective.moc"
 
+using namespace DigikamPerspectiveImagesPlugin;
+
 K_PLUGIN_FACTORY( PerspectiveFactory, registerPlugin<ImagePlugin_Perspective>(); )
 K_EXPORT_PLUGIN ( PerspectiveFactory("digikamimageplugin_perspective") )
 
@@ -47,7 +49,7 @@
     m_perspectiveAction  = new KAction(KIcon("perspective"), i18n("Perspective Adjustment..."), this);
     actionCollection()->addAction("imageplugin_perspective", m_perspectiveAction );
 
-    connect(m_perspectiveAction, SIGNAL(triggered(bool)), 
+    connect(m_perspectiveAction, SIGNAL(triggered(bool)),
             this, SLOT(slotPerspective()));
 
     setXMLFile("digikamimageplugin_perspective_ui.rc");
@@ -66,6 +68,6 @@
 
 void ImagePlugin_Perspective::slotPerspective()
 {
-    DigikamPerspectiveImagesPlugin::ImageEffect_Perspective dlg(kapp->activeWindow());
-    dlg.exec();
+    PerspectiveTool *tool = new PerspectiveTool(kapp->activeWindow());
+    loadTool(tool);
 }