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

[Gilles Caulier]

SVN commit 854116 by cgilles:

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


 M  +2 -3      Makefile.am  
 D             imageeffect_inserttext.cpp  
 D             imageeffect_inserttext.h  
 M  +10 -8     imageplugin_inserttext.cpp  
 M  +6 -6      imageplugin_inserttext.h  
 A             inserttexttool.cpp   imageeffect_inserttext.cpp#854103 [License: GPL (v2+)]
 A             inserttexttool.h   imageeffect_inserttext.h#854103 [License: GPL (v2+)]


--- branches/extragear/kde3/graphics/digikam/imageplugins/inserttext/Makefile.am #854115:854116
@@ -17,9 +17,8 @@
 	       $(LIBKDCRAW_CFLAGS) \
 	       $(all_includes)   
 
-digikamimageplugin_inserttext_la_SOURCES = imageplugin_inserttext.cpp \
-	                                       imageeffect_inserttext.cpp \
-	                                       inserttextwidget.cpp fontchooserwidget.cpp 
+digikamimageplugin_inserttext_la_SOURCES = imageplugin_inserttext.cpp inserttextwidget.cpp \
+	                                       inserttexttool.cpp fontchooserwidget.cpp 
 
 digikamimageplugin_inserttext_la_LIBADD = $(LIB_KPARTS) \
 	                                      $(top_builddir)/digikam/digikam/libdigikam.la 
--- branches/extragear/kde3/graphics/digikam/imageplugins/inserttext/imageplugin_inserttext.cpp #854115:854116
@@ -5,20 +5,20 @@
  *
  * Date        : 2005-02-14
  * Description : a plugin to insert a text over an image.
- * 
+ *
  * 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_inserttext.h"
+#include "inserttexttool.h"
 #include "imageplugin_inserttext.h"
 #include "imageplugin_inserttext.moc"
 
+using namespace DigikamInsertTextImagesPlugin;
+
 K_EXPORT_COMPONENT_FACTORY(digikamimageplugin_inserttext,
                            KGenericFactory<ImagePlugin_InsertText>("digikamimageplugin_inserttext"));
 
@@ -48,7 +50,7 @@
                          actionCollection(), "imageplugin_inserttext");
 
     setXMLFile("digikamimageplugin_inserttext_ui.rc");
-    
+
     DDebug() << "ImagePlugin_InsertText plugin loaded" << endl;
 }
 
@@ -63,6 +65,6 @@
 
 void ImagePlugin_InsertText::slotInsertText()
 {
-    DigikamInsertTextImagesPlugin::ImageEffect_InsertText dlg(parentWidget());
-    dlg.exec();
+    InsertTextTool *tool = new InsertTextTool(this);
+    loadTool(tool);
 }
--- branches/extragear/kde3/graphics/digikam/imageplugins/inserttext/imageplugin_inserttext.h #854115:854116
@@ -5,20 +5,20 @@
  *
  * Date        : 2005-02-14
  * Description : a plugin to insert a text over an image.
- * 
+ *
  * 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_INSERTTEXT_H
@@ -34,7 +34,7 @@
 class DIGIKAMIMAGEPLUGINS_EXPORT ImagePlugin_InsertText : public Digikam::ImagePlugin
 {
     Q_OBJECT
-    
+
 public:
 
     ImagePlugin_InsertText(QObject *parent, const char* name,
@@ -51,5 +51,5 @@
 
     KAction *m_insertTextAction;
 };
-    
+
 #endif /* IMAGEPLUGIN_INSERTTEXT_H */