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

[Valerio Fuoglio]

SVN commit 605639 by vfuoglio:

Used new KPAboutData

CCMAIL: kde-imaging at kde.org

 M  +1 -1      Makefile.am  
 M  +20 -21    cdarchivingdialog.cpp  
 M  +3 -0      cdarchivingdialog.h  


--- trunk/extragear/libs/kipi-plugins/cdarchiving/Makefile.am #605638:605639
@@ -14,7 +14,7 @@
 kipiplugin_cdarchiving_la_LIBADD = $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
 
 # LD flags for the plugin
-kipiplugin_cdarchiving_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+kipiplugin_cdarchiving_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
 
 # Install the desktop file needed to detect the plugin
 kde_services_DATA = kipiplugin_cdarchiving.desktop
--- trunk/extragear/libs/kipi-plugins/cdarchiving/cdarchivingdialog.cpp #605638:605639
@@ -74,6 +74,7 @@
 
 // Local include files
 
+#include "kpaboutdata.h"
 #include "pluginsversion.h"
 #include "cdarchivingdialog.h"
 #include "cdarchivingdialog.moc"
@@ -97,31 +98,28 @@
     
     // About data and help button.
     
-    KAboutData* about = new KAboutData("kipiplugins",
-                                       I18N_NOOP("CD/DVD Archiving"), 
-                                       kipiplugins_version,
-                                       I18N_NOOP("An Album CD/DVD Archiving Kipi plugin.\n"
-                                                 "This plugin use K3b CD/DVD burning software available at\n"
-                                                 "http://www.k3b.org"),
-                                       KAboutData::License_GPL,
-                                       "(c) 2003-2005, Gilles Caulier", 
-                                       0,
-                                       "http://extragear.kde.org/apps/kipi");
-    
-    about->addAuthor("Gilles Caulier", I18N_NOOP("Author"),
-                     "caulier dot gilles at free.fr");
+    m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("CD/DVD Archiving"),
+                                           NULL,
+                                           KAboutData::License_GPL,
+                                           I18N_NOOP("An Album CD/DVD Archiving Kipi plugin.\n"
+                                                     "This plugin use K3b CD/DVD burning software available at\n"
+                                                     "http://www.k3b.org"),
+                                           "(c) 2003-2005, Gilles Caulier");
 
-    about->addAuthor("Angelo Naselli", I18N_NOOP("Contributor"),
-                     "anaselli at linux.it");
+    m_about->addAuthor("Gilles Caulier", I18N_NOOP("Author"),
+                       "caulier dot gilles at free.fr");
 
-    about->addAuthor("Gregory Kokanosky", I18N_NOOP("Image navigation mode patches"),
-                     "gregory dot kokanosky at free.fr");
+    m_about->addAuthor("Angelo Naselli", I18N_NOOP("Contributor"),
+                       "anaselli at linux.it");
 
-    about->addAuthor("Owen Hirst", I18N_NOOP("Bugfix"),
-                     "n8rider at sbcglobal.net");
-                         
+    m_about->addAuthor("Gregory Kokanosky", I18N_NOOP("Image navigation mode patches"),
+                       "gregory dot kokanosky at free.fr");
+
+    m_about->addAuthor("Owen Hirst", I18N_NOOP("Bugfix"),
+                       "n8rider at sbcglobal.net");
+
     m_helpButton = actionButton( Help );
-    KHelpMenu* helpMenu = new KHelpMenu(this, about, false);
+    KHelpMenu* helpMenu = new KHelpMenu(this, m_about, false);
     helpMenu->menu()->removeItemAt(0);
     helpMenu->menu()->insertItem(i18n("CD/DVD Archiving Handbook"), this, SLOT(slotHelp()), 0, -1, 0);
     m_helpButton->setPopup( helpMenu->menu() );
@@ -129,6 +127,7 @@
 
 CDArchivingDialog::~CDArchivingDialog()
 {
+    delete m_about;
 }
 
 void CDArchivingDialog::slotHelp()
--- trunk/extragear/libs/kipi-plugins/cdarchiving/cdarchivingdialog.h #605638:605639
@@ -40,6 +40,7 @@
 // Include files for KIPI
 
 #include <libkipi/interface.h>
+#include "kpaboutdata.h"
 
 class QString;
 class QCheckBox;
@@ -229,6 +230,8 @@
     QValueList<KIPI::ImageCollection>  m_selectedAlbums;
     KIPI::ImageCollectionSelector     *m_imageCollectionSelector;
 
+    KIPIPlugins::KPAboutData *m_about;
+
 private:
  
     void setupSelection(void);