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

[Andi Clemens]

SVN commit 854108 by aclemens:

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

 M  +1 -1      Makefile.am  
 D             imageeffect_raindrop.cpp  
 D             imageeffect_raindrop.h  
 M  +13 -11    imageplugin_raindrop.cpp  
 A             raindroptool.cpp   imageeffect_raindrop.cpp#854063 [License: GPL (v2+)]
 A             raindroptool.h   imageeffect_raindrop.h#854063 [License: GPL (v2+)]


--- branches/extragear/kde3/graphics/digikam/imageplugins/raindrop/Makefile.am #854107:854108
@@ -18,7 +18,7 @@
 	       $(all_includes) 
 
 digikamimageplugin_raindrop_la_SOURCES = imageplugin_raindrop.cpp \
-	                                     imageeffect_raindrop.cpp raindrop.cpp 
+	                                     raindroptool.cpp raindrop.cpp 
 
 digikamimageplugin_raindrop_la_LIBADD = $(LIB_KPARTS) \
 	                                    $(top_builddir)/digikam/digikam/libdigikam.la
--- branches/extragear/kde3/graphics/digikam/imageplugins/raindrop/imageplugin_raindrop.cpp #854107:854108
@@ -5,20 +5,20 @@
  *
  * Date        : 2004-09-30
  * Description : a plugin to add rain drop over an image
- * 
+ *
  * Copyright (C) 2004-2007 by Gilles Caulier <caulier dot gilles at gmail dot com>
- * 
+ *
  * This program is free software; you can redistribute it
  * and/or modify it under the terms of the GNU General
  * Public License as published by the Free Software Foundation;
  * either version 2, or (at your option)
  * any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * ============================================================ */
 
 // KDE includes.
@@ -32,22 +32,24 @@
 // Local includes.
 
 #include "ddebug.h"
-#include "imageeffect_raindrop.h"
+#include "raindroptool.h"
 #include "imageplugin_raindrop.h"
 #include "imageplugin_raindrop.moc"
 
+using namespace DigikamRainDropImagesPlugin;
+
 K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_raindrop,
                            KGenericFactory<ImagePlugin_RainDrop>("digikamimageplugin_raindrop"));
 
 ImagePlugin_RainDrop::ImagePlugin_RainDrop(QObject *parent, const char*, const QStringList &)
                     : Digikam::ImagePlugin(parent, "ImagePlugin_RainDrop")
 {
-    m_raindropAction = new KAction(i18n("Raindrops..."), "raindrop", 0, 
+    m_raindropAction = new KAction(i18n("Raindrops..."), "raindrop", 0,
                            this, SLOT(slotRainDrop()),
                            actionCollection(), "imageplugin_raindrop");
-                
-    setXMLFile( "digikamimageplugin_raindrop_ui.rc" );    
-        
+
+    setXMLFile( "digikamimageplugin_raindrop_ui.rc" );
+
     DDebug() << "ImagePlugin_RainDrop plugin loaded" << endl;
 }
 
@@ -62,6 +64,6 @@
 
 void ImagePlugin_RainDrop::slotRainDrop()
 {
-    DigikamRainDropImagesPlugin::ImageEffect_RainDrop dlg(parentWidget());
-    dlg.exec();
+    RainDropTool *raindrop = new RainDropTool(parentWidget());
+    loadTool(raindrop);
 }