[Kde-imaging] extragear/libs/kipi-plugins/htmlexport

[Valerio Fuoglio]

SVN commit 606312 by vfuoglio:

Used new KPAboutData

CCMAIL: kde-imaging at kde.org

 M  +1 -1      Makefile.am  
 M  +13 -15    wizard.cpp  
 M  +5 -0      wizard.h  


--- trunk/extragear/libs/kipi-plugins/htmlexport/Makefile.am #606311:606312
@@ -21,7 +21,7 @@
 	htmlexportconfig.kcfg
 
 kipiplugin_htmlexport_la_LIBADD = -lexslt -lxml2 $(LIBXSLT_LIBS) $(LIBKIPI_LIBS) $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
-kipiplugin_htmlexport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+kipiplugin_htmlexport_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
 
 
 # Install the desktop file needed to detect the plugin
--- trunk/extragear/libs/kipi-plugins/htmlexport/wizard.cpp #606311:606312
@@ -38,7 +38,6 @@
 #include <kurlrequester.h>
 #include <kwizard.h>
 #include <kapplication.h>
-#include <kaboutdata.h>
 #include <khelpmenu.h>
 #include <kpopupmenu.h>
 
@@ -46,6 +45,7 @@
 #include <libkipi/imagecollectionselector.h>
 
 // Local
+#include "kpaboutdata.h"
 #include "pluginsversion.h"
 #include "galleryinfo.h"
 #include "imagesettingspage.h"
@@ -96,20 +96,17 @@
 	d->mInfo=info;
 
     // About data and help button.
-        
-    KAboutData* about = new KAboutData("kipiplugins",
-                                        I18N_NOOP("HTML Export"), 
-                                        kipiplugins_version,
-                                        I18N_NOOP("A KIPI plugin to export image collections to HTML pages"),
-                                        KAboutData::License_GPL,
-                                        "(c) 2006, Aurelien Gateau", 
-                                        0,
-                                        "http://extragear.kde.org/apps/kipi");
-        
-    about->addAuthor("Aurelien Gateau", I18N_NOOP("Author and Maintainer"),
-                    "aurelien.gateau at free.fr");
-    
-    KHelpMenu* helpMenu = new KHelpMenu(this, about, false);
+
+    m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("HTML Export"),
+                                           NULL,
+                                           KAboutData::License_GPL,
+                                           I18N_NOOP("A KIPI plugin to export image collections to HTML pages"),
+                                           "(c) 2006, Aurelien Gateau");
+
+    m_about->addAuthor("Aurelien Gateau", I18N_NOOP("Author and Maintainer"),
+                       "aurelien.gateau at free.fr");
+
+    KHelpMenu* helpMenu = new KHelpMenu(this, m_about, false);
     helpMenu->menu()->removeItemAt(0);
     helpMenu->menu()->insertItem(i18n("HTML Export Handbook"), this, SLOT(slotHelp()), 0, -1, 0);
     helpButton()->setPopup( helpMenu->menu() );
@@ -145,6 +142,7 @@
 
 Wizard::~Wizard() {
 	delete d;
+        delete m_about;
 }
 
 void Wizard::slotHelp() {
--- trunk/extragear/libs/kipi-plugins/htmlexport/wizard.h #606311:606312
@@ -24,6 +24,9 @@
 // KDE
 #include <kwizard.h>
 
+//Local includes
+#include "kpaboutdata.h"
+
 namespace KIPI {
 class Interface;
 }
@@ -49,6 +52,8 @@
 private:
 	struct Private;
 	Private* d;
+
+        KIPIPlugins::KPAboutData    *m_about; 
 };