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

[Andi Clemens]

SVN commit 855327 by aclemens:

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

 M  +1 -1      EDITORTOOLPORT  
 M  +1 -1      border/CMakeLists.txt  
 A             border/bordertool.cpp   border/imageeffect_border.cpp#855233 [License: GPL (v2+)]
 A             border/bordertool.h   border/imageeffect_border.h#855233 [License: GPL (v2+)]
 D             border/imageeffect_border.cpp  
 D             border/imageeffect_border.h  
 M  +6 -4      border/imageplugin_border.cpp  


--- trunk/extragear/graphics/digikam/imageplugins/EDITORTOOLPORT #855326:855327
@@ -26,7 +26,7 @@
   \---antivignetting        ImageGuideDlg       A               DONE
   \---autocorrection        ImageGuideDlg       A               DONE
   \---distortion            ImageGuideDlg       A               DONE
-border                      ImageGuideDlg       A
+border                      ImageGuideDlg       DONE            DONE
 distortionfx                ImageGuideDlg       A
 freerotation                ImageGuideDlg                       DONE
 inpainting                  ImageGuideDlg       A               DONE
--- trunk/extragear/graphics/digikam/imageplugins/border/CMakeLists.txt #855326:855327
@@ -2,7 +2,7 @@
 ADD_SUBDIRECTORY( patterns )
 
 SET(digikamimageplugin_border_PART_SRCS imageplugin_border.cpp
-                                        imageeffect_border.cpp 
+                                        bordertool.cpp 
                                         border.cpp 
    )
 
--- trunk/extragear/graphics/digikam/imageplugins/border/imageplugin_border.cpp #855326:855327
@@ -35,10 +35,12 @@
 // Local includes.
 
 #include "ddebug.h"
-#include "imageeffect_border.h"
+#include "bordertool.h"
 #include "imageplugin_border.h"
 #include "imageplugin_border.moc"
 
+using namespace DigikamBorderImagesPlugin;
+
 K_PLUGIN_FACTORY( BorderFactory, registerPlugin<ImagePlugin_Border>(); )
 K_EXPORT_PLUGIN ( BorderFactory("digikamimageplugin_border") )
 
@@ -48,7 +50,7 @@
     m_borderAction  = new KAction(KIcon("bordertool"), i18n("Add Border..."), this);
     actionCollection()->addAction("imageplugin_border", m_borderAction );
 
-    connect(m_borderAction, SIGNAL(triggered(bool)), 
+    connect(m_borderAction, SIGNAL(triggered(bool)),
             this, SLOT(slotBorder()));
 
     setXMLFile("digikamimageplugin_border_ui.rc");
@@ -67,6 +69,6 @@
 
 void ImagePlugin_Border::slotBorder()
 {
-    DigikamBorderImagesPlugin::ImageEffect_Border dlg(kapp->activeWindow());
-    dlg.exec();
+    BorderTool *tool = new BorderTool(kapp->activeWindow());
+    loadTool(tool);
 }