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

[Valerio Fuoglio]

SVN commit 606276 by vfuoglio:

Used new KPAboutData

CCMAIL: kde-imaging at kde.org

 M  +1 -1      Makefile.am  
 M  +12 -14    acquireimagedialog.cpp  
 M  +6 -0      acquireimagedialog.h  


--- trunk/extragear/libs/kipi-plugins/acquireimages/Makefile.am #606275:606276
@@ -11,7 +11,7 @@
 kipiplugin_acquireimages_la_LIBADD = $(LIB_TIFF) $(LIB_X11) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
 
 # LD flags for the plugin
-kipiplugin_acquireimages_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+kipiplugin_acquireimages_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_acquireimages.desktop
--- trunk/extragear/libs/kipi-plugins/acquireimages/acquireimagedialog.cpp #606275:606276
@@ -116,23 +116,20 @@
     slotImageFormatChanged(m_imagesFormat->currentText());
     page_setupImageOptions->setFocus();
     resize( 600, 400 );
-    
+
     // About data and help button.
-    
-    KAboutData* about = new KAboutData("kipiplugins",
-                                       I18N_NOOP("Acquire images"), 
-                                       kipiplugins_version,
-                                       I18N_NOOP("A Kipi plugin to acquire images"),
-                                       KAboutData::License_GPL,
-                                       "(c) 2003-2004, Gilles Caulier", 
-                                       0,
-                                       "http://extragear.kde.org/apps/kipi");
-    
-    about->addAuthor("Gilles Caulier", I18N_NOOP("Author and maintainer"),
-                     "caulier dot gilles at free.fr");
 
+    m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Acquire images"),
+                                           NULL,
+                                           KAboutData::License_GPL,
+                                           I18N_NOOP("A Kipi plugin to acquire images"),
+                                           "(c) 2003-2004, Gilles Caulier");
+
+    m_about->addAuthor("Gilles Caulier", I18N_NOOP("Author and maintainer"),
+                       "caulier dot gilles at free.fr");
+
     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("Acquire Images Handbook"), this, SLOT(slotHelp()), 0, -1, 0);
     m_helpButton->setPopup( helpMenu->menu() );
@@ -143,6 +140,7 @@
 
 AcquireImageDialog::~AcquireImageDialog()
 {
+    delete m_about;
 }
 
 
--- trunk/extragear/libs/kipi-plugins/acquireimages/acquireimagedialog.h #606275:606276
@@ -42,6 +42,10 @@
 #include <libkipi/interface.h>
 #include <libkipi/uploadwidget.h>
 
+// Local includes
+
+#include "kpaboutdata.h"
+
 class QPushButton;
 class QLineEdit;
 class QLabel;
@@ -89,6 +93,8 @@
 
    KIPI::UploadWidget* m_uploadPath;
 
+   KIPIPlugins::KPAboutData *m_about; 
+
    KIntNumInput       *m_imageCompression;
 
    QComboBox          *m_imagesFormat;