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

[Gilles Caulier]

SVN commit 852728 by cgilles:

digikam from KDE3 branch : Perspective image plugin is no ported to Editor Tool API
CCMAIL: digikam-devel at kde.org


 M  +2 -2      Makefile.am  
 D             imageeffect_perspective.cpp  
 D             imageeffect_perspective.h  
 M  +13 -12    imageplugin_perspective.cpp  
 M  +8 -8      imageplugin_perspective.h  
 A             perspectivetool.cpp   imageeffect_perspective.cpp#852686 [License: GPL (v2+)]
 A             perspectivetool.h   imageeffect_perspective.h#852686 [License: GPL (v2+)]


--- branches/extragear/kde3/graphics/digikam/imageplugins/perspective/Makefile.am #852727:852728
@@ -18,8 +18,8 @@
 	       $(all_includes)  
 
 digikamimageplugin_perspective_la_SOURCES = imageplugin_perspective.cpp \
-	                                        imageeffect_perspective.cpp \
-					                        perspectivewidget.cpp triangle.cpp matrix.cpp
+	                                        perspectivetool.cpp \
+					        perspectivewidget.cpp triangle.cpp matrix.cpp
 
 digikamimageplugin_perspective_la_LIBADD = $(LIB_KPARTS) \
 	                                       $(top_builddir)/digikam/digikam/libdigikam.la 
--- branches/extragear/kde3/graphics/digikam/imageplugins/perspective/imageplugin_perspective.cpp #852727:852728
@@ -5,20 +5,20 @@
  *
  * Date        : 2005-02-17
  * Description : a plugin to change image perspective .
- * 
- * 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.
@@ -32,10 +32,12 @@
 // Local includes.
 
 #include "ddebug.h"
-#include "imageeffect_perspective.h"
+#include "perspectivetool.h"
 #include "imageplugin_perspective.h"
 #include "imageplugin_perspective.moc"
 
+using namespace DigikamPerspectiveImagesPlugin;
+
 K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_perspective,
                            KGenericFactory<ImagePlugin_Perspective>("digikamimageplugin_perspective"));
 
@@ -45,9 +47,9 @@
     m_perspectiveAction = new KAction(i18n("Perspective Adjustment..."), "perspective", 0, 
                               this, SLOT(slotPerspective()),
                               actionCollection(), "imageplugin_perspective");
-    
-    setXMLFile("digikamimageplugin_perspective_ui.rc");      
-                                    
+
+    setXMLFile("digikamimageplugin_perspective_ui.rc");
+
     DDebug() << "ImagePlugin_Perspective plugin loaded" << endl;
 }
 
@@ -62,7 +64,6 @@
 
 void ImagePlugin_Perspective::slotPerspective()
 {
-    DigikamPerspectiveImagesPlugin::ImageEffect_Perspective dlg(parentWidget());
-    dlg.exec();
+    PerspectiveTool *tool = new PerspectiveTool(this);
+    loadTool(tool);
 }
-
--- branches/extragear/kde3/graphics/digikam/imageplugins/perspective/imageplugin_perspective.h #852727:852728
@@ -5,20 +5,20 @@
  *
  * Date        : 2005-02-17
  * Description : a plugin to change image perspective .
- * 
- * 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_PERSPECTIVE_H
@@ -34,11 +34,11 @@
 class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_Perspective : public Digikam::ImagePlugin
 {
     Q_OBJECT
-    
+
 public:
 
     ImagePlugin_Perspective(QObject *parent, const char* name,
-                         const QStringList &args);
+                            const QStringList &args);
     ~ImagePlugin_Perspective();
 
     void setEnabledActions(bool enable);
@@ -51,5 +51,5 @@
 
     KAction *m_perspectiveAction;
 };
-    
+
 #endif /* IMAGEPLUGIN_PERSPECTIVE_H */