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

[Gilles Caulier]

SVN commit 852677 by cgilles:

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


 M  +1 -2      Makefile.am  
 D             imageeffect_whitebalance.cpp  
 D             imageeffect_whitebalance.h  
 M  +13 -11    imageplugin_whitebalance.cpp  
 M  +8 -8      imageplugin_whitebalance.h  
 A             whitebalancetool.cpp   imageeffect_whitebalance.cpp#852648 [License: GPL (v2+)]
 A             whitebalancetool.h   imageeffect_whitebalance.h#852648 [License: GPL (v2+)]


--- branches/extragear/kde3/graphics/digikam/imageplugins/whitebalance/Makefile.am #852676:852677
@@ -18,7 +18,7 @@
 	       $(all_includes) 
 
 digikamimageplugin_whitebalance_la_SOURCES = imageplugin_whitebalance.cpp \
-	                                         imageeffect_whitebalance.cpp 
+	                                         whitebalancetool.cpp 
 
 digikamimageplugin_whitebalance_la_LIBADD = $(LIB_KPARTS) \
 	                                        $(top_builddir)/digikam/digikam/libdigikam.la  
@@ -31,4 +31,3 @@
 
 rcdir = $(kde_datadir)/digikam
 rc_DATA = digikamimageplugin_whitebalance_ui.rc
-
--- branches/extragear/kde3/graphics/digikam/imageplugins/whitebalance/imageplugin_whitebalance.cpp #852676:852677
@@ -6,20 +6,20 @@
  * Date        : 2005-03-11
  * Description : a digiKam image editor plugin to correct 
  *               image white balance 
- * 
- * Copyright (C) 2005-2007 by Gilles Caulier <caulier dot gilles at gmail dot com>
- * 
+ *
+ * Copyright (C) 2005-2008 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.
@@ -33,10 +33,12 @@
 // Local includes.
 
 #include "ddebug.h"
-#include "imageeffect_whitebalance.h"
+#include "whitebalancetool.h"
 #include "imageplugin_whitebalance.h"
 #include "imageplugin_whitebalance.moc"
 
+using namespace DigikamWhiteBalanceImagesPlugin;
+
 K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_whitebalance,
                            KGenericFactory<ImagePlugin_WhiteBalance>("digikamimageplugin_whitebalance"));
 
@@ -47,9 +49,9 @@
                                CTRL+SHIFT+Key_W, 
                                this, SLOT(slotWhiteBalance()),
                                actionCollection(), "imageplugin_whitebalance");
-    
-    setXMLFile("digikamimageplugin_whitebalance_ui.rc");         
-                                    
+
+    setXMLFile("digikamimageplugin_whitebalance_ui.rc");
+
     DDebug() << "ImagePlugin_WhiteBalance plugin loaded" << endl;
 }
 
@@ -64,6 +66,6 @@
 
 void ImagePlugin_WhiteBalance::slotWhiteBalance()
 {
-    DigikamWhiteBalanceImagesPlugin::ImageEffect_WhiteBalance dlg(parentWidget());
-    dlg.exec();
+    WhiteBalanceTool *wb = new WhiteBalanceTool(this);
+    loadTool(wb);
 }
--- branches/extragear/kde3/graphics/digikam/imageplugins/whitebalance/imageplugin_whitebalance.h #852676:852677
@@ -6,20 +6,20 @@
  * Date        : 2005-03-11
  * Description : a digiKam image editor plugin to correct 
  *               image white balance 
- * 
- * Copyright (C) 2005-2007 by Gilles Caulier <caulier dot gilles at gmail dot com>
- * 
+ *
+ * Copyright (C) 2005-2008 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.
- * 
+ *
  * ============================================================ */
 
 #ifndef IMAGEPLUGIN_WHITEBALANCE_H
@@ -35,7 +35,7 @@
 class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_WhiteBalance : public Digikam::ImagePlugin
 {
     Q_OBJECT
-    
+
 public:
 
     ImagePlugin_WhiteBalance(QObject *parent, const char* name,
@@ -43,7 +43,7 @@
     ~ImagePlugin_WhiteBalance();
 
     void setEnabledActions(bool enable);
-   
+
 private slots:
 
     void slotWhiteBalance();
@@ -52,5 +52,5 @@
 
     KAction *m_whitebalanceAction;
 };
-    
+
 #endif /* IMAGEPLUGIN_WHITEBALANCE_H */