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

[Andi Clemens]

SVN commit 854033 by aclemens:

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

 M  +1 -1      Makefile.am  
 A             colorfxtool.cpp   imageeffect_colorfx.cpp#854010 [License: GPL (v2+)]
 A             colorfxtool.h   imageeffect_colorfx.h#854010 [License: GPL (v2+)]
 D             imageeffect_colorfx.cpp  
 D             imageeffect_colorfx.h  
 M  +13 -11    imageplugin_colorfx.cpp  


--- branches/extragear/kde3/graphics/digikam/imageplugins/colorfx/Makefile.am #854032:854033
@@ -18,7 +18,7 @@
 	       $(all_includes) 
 
 digikamimageplugin_colorfx_la_SOURCES = imageplugin_colorfx.cpp \
-	                                    imageeffect_colorfx.cpp 
+	                                    colorfxtool.cpp 
 
 digikamimageplugin_colorfx_la_LIBADD = $(LIB_KPARTS) \
 	                                   $(top_builddir)/digikam/digikam/libdigikam.la 
--- branches/extragear/kde3/graphics/digikam/imageplugins/colorfx/imageplugin_colorfx.cpp #854032:854033
@@ -4,23 +4,23 @@
  * http://www.digikam.org
  *
  * Date        : 2004-02-14
- * Description : a digiKam image plugin for to apply a color 
+ * Description : a digiKam image plugin for to apply a color
  *               effect to an image.
  *
  * Copyright (C) 2004-2005 by Renchi Raju <renchi at pooh.tam.uiuc.edu>
  * Copyright (C) 2006-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.
@@ -34,22 +34,24 @@
 // Local includes.
 
 #include "ddebug.h"
-#include "imageeffect_colorfx.h"
+#include "colorfxtool.h"
 #include "imageplugin_colorfx.h"
 #include "imageplugin_colorfx.moc"
 
+using namespace DigikamColorFXImagesPlugin;
+
 K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_colorfx,
                            KGenericFactory<ImagePlugin_ColorFX>("digikamimageplugin_colorfx"));
 
 ImagePlugin_ColorFX::ImagePlugin_ColorFX(QObject *parent, const char*, const QStringList &)
                    : Digikam::ImagePlugin(parent, "ImagePlugin_ColorFX")
 {
-    m_solarizeAction = new KAction(i18n("Color Effects..."), "colorfx", 0, 
+    m_solarizeAction = new KAction(i18n("Color Effects..."), "colorfx", 0,
                            this, SLOT(slotColorFX()),
                            actionCollection(), "imageplugin_colorfx");
-                
-    setXMLFile( "digikamimageplugin_colorfx_ui.rc" );    
-        
+
+    setXMLFile( "digikamimageplugin_colorfx_ui.rc" );
+
     DDebug() << "ImagePlugin_ColorFX plugin loaded" << endl;
 }
 
@@ -64,7 +66,7 @@
 
 void ImagePlugin_ColorFX::slotColorFX()
 {
-    DigikamColorFXImagesPlugin::ImageEffect_ColorFX dlg(parentWidget());
-    dlg.exec();
+    ColorFXTool *colorfx = new ColorFXTool(parentWidget());
+    loadTool(colorfx);
 }