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

[Valerio Fuoglio]

SVN commit 606313 by vfuoglio:

Used new KPAboutData

CCMAIL: kde-imaging at kde.org

 M  +1 -1      Makefile.am  
 M  +19 -21    imgallerydialog.cpp  
 M  +6 -0      imgallerydialog.h  


--- trunk/extragear/libs/kipi-plugins/imagesgallery/Makefile.am #606312:606313
@@ -13,7 +13,7 @@
 kipiplugin_imagesgallery_la_LIBADD = $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
 
 # LD flags for the plugin
-kipiplugin_imagesgallery_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+kipiplugin_imagesgallery_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_imagesgallery.desktop
--- trunk/extragear/libs/kipi-plugins/imagesgallery/imgallerydialog.cpp #606312:606313
@@ -69,7 +69,6 @@
 #include <ksqueezedtextlabel.h>
 #include <kio/previewjob.h>
 #include <klistview.h>
-#include <kaboutdata.h>
 #include <khelpmenu.h>
 #include <kpopupmenu.h>
 
@@ -79,6 +78,7 @@
 
 // Local include files
 
+#include "kpaboutdata.h"
 #include "pluginsversion.h"
 #include "imgallerydialog.h"
 #include "imgallerydialog.moc"
@@ -101,33 +101,30 @@
 
     // About data and help button.
 
-    KAboutData* about = new KAboutData("kipiplugins",
-                                       I18N_NOOP("Image Gallery"),
-                                       kipiplugins_version,
-                                       I18N_NOOP("A Kipi plugin for HTML album export.\n"
-                                                 "Based on KimgalleryPlugin implementation."),
-                                       KAboutData::License_GPL,
-                                       "(c) 2003-2004, Gilles Caulier",
-                                       0,
-                                       "http://extragear.kde.org/apps/kipi");
+    m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Image Gallery"),
+                                           NULL,
+                                           KAboutData::License_GPL,
+                                           I18N_NOOP("A Kipi plugin for HTML album export.\n"
+                                                     "Based on KimgalleryPlugin implementation."),
+                                           "(c) 2003-2004, Gilles Caulier");
 
-    about->addAuthor("Gilles Caulier", I18N_NOOP("Author and maintainer"),
-                     "caulier dot gilles at free.fr");
+    m_about->addAuthor("Gilles Caulier", I18N_NOOP("Author and maintainer"),
+                       "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("Gregory Kokanosky", I18N_NOOP("Image navigation mode patches"),
+                       "gregory dot kokanosky at free.fr>");
 
-    about->addAuthor("Achim Bohnet", I18N_NOOP("HTML implementation patches"),
-                     "ach at mpe.mpg.de");
+    m_about->addAuthor("Achim Bohnet", I18N_NOOP("HTML implementation patches"),
+                       "ach at mpe.mpg.de");
 
-    about->addAuthor("Lukáš Tinkl", I18N_NOOP("Original HTML generator implementation"),
-                     "lukas at kde.org");
+    m_about->addAuthor("Lukáš Tinkl", I18N_NOOP("Original HTML generator implementation"),
+                       "lukas at kde.org");
 
-    about->addAuthor("Andreas Schlapbach", I18N_NOOP("Original HTML generator implementation"),
-                     "schlpbch at iam.unibe.ch");
+    m_about->addAuthor("Andreas Schlapbach", I18N_NOOP("Original HTML generator implementation"),
+                       "schlpbch at iam.unibe.ch");
 
     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("Image Gallery Handbook"), this, SLOT(slotHelp()), 0, -1, 0);
     m_helpButton->setPopup( helpMenu->menu() );
@@ -138,6 +135,7 @@
 
 KIGPDialog::~KIGPDialog()
 {
+    delete m_about;
 }
 
 void KIGPDialog::slotHelp()
--- trunk/extragear/libs/kipi-plugins/imagesgallery/imgallerydialog.h #606312:606313
@@ -47,6 +47,10 @@
 
 #include <libkipi/interface.h>
 
+// Local includes
+
+#include "kpaboutdata.h"
+
 class QProgressDialog;
 class QCheckBox;
 class QString;
@@ -244,6 +248,8 @@
   QValueList<KIPI::ImageCollection>  m_selectedAlbums;
   KIPI::ImageCollectionSelector     *m_imageCollectionSelector;
   
+  KIPIPlugins::KPAboutData  *m_about;
+  
  private:
  
   void setupSelection(void);