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

[Valerio Fuoglio]

SVN commit 605642 by vfuoglio:

Used new KPAboutData

CCMAIL: kde-imaging at kde.org

 M  +1 -1      Makefile.am  
 M  +13 -13    frmprintwizard.cpp  
 M  +4 -1      frmprintwizard.h  


--- trunk/extragear/libs/kipi-plugins/printwizard/Makefile.am #605641:605642
@@ -10,7 +10,7 @@
 #LIBKIPI_LIBS = $(top_builddir)/libkipi/libkipi/libkipi.la
 kipiplugin_printwizard_la_LIBADD = $(LIB_KDEPRINT) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
 
-kipiplugin_printwizard_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+kipiplugin_printwizard_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
 
 kde_services_DATA = kipiplugin_printwizard.desktop
 
--- trunk/extragear/libs/kipi-plugins/printwizard/frmprintwizard.cpp #605641:605642
@@ -58,6 +58,7 @@
 
 // Local includes
 
+#include "kpaboutdata.h"
 #include "pluginsversion.h"
 #include "utils.h"
 #include "cropframe.h"
@@ -94,21 +95,18 @@
   // ---------------------------------------------------------------
 
   // About data and help button.
-    
-  KAboutData* about = new KAboutData("kipiplugins",
-                                     I18N_NOOP("Print Wizard"), 
-                                     kipiplugins_version,
-                                     I18N_NOOP("A KIPI plugin to print images"),
-                                     KAboutData::License_GPL,
-                                     "(c) 2003-2004, Todd Shoemaker", 
-                                     0,
-                                     "http://extragear.kde.org/apps/kipi");
-    
-  about->addAuthor("Todd Shoemaker", I18N_NOOP("Author"),
-                   "todd at theshoemakers.net");
 
+  m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Print Wizard"),
+                                         NULL,
+                                         KAboutData::License_GPL,
+                                         I18N_NOOP("A KIPI plugin to print images"),
+                                         "(c) 2003-2004, Todd Shoemaker");
+
+  m_about->addAuthor("Todd Shoemaker", I18N_NOOP("Author"),
+                     "todd at theshoemakers.net");
+
   m_helpButton = helpButton();
-  KHelpMenu* helpMenu = new KHelpMenu(this, about, false);
+  KHelpMenu* helpMenu = new KHelpMenu(this, m_about, false);
   helpMenu->menu()->removeItemAt(0);
   helpMenu->menu()->insertItem(i18n("Print Wizard Handbook"), this, SLOT(slotHelp()), 0, -1, 0);
   m_helpButton->setPopup( helpMenu->menu() );
@@ -166,6 +164,8 @@
     if (m_photos.at(i))
       delete m_photos.at(i);
   m_photos.clear();
+
+  delete m_about;
 }
 
 void FrmPrintWizard::slotHelp()
--- trunk/extragear/libs/kipi-plugins/printwizard/frmprintwizard.h #605641:605642
@@ -28,6 +28,7 @@
 
 // Local includes.
 
+#include "kpaboutdata.h"
 #include "tphoto.h"
 #include "frmprintwizardbase.h"
 
@@ -63,9 +64,11 @@
   QStringList  m_gimpFiles;
 
   QPushButton *m_helpButton;
-  
+
   bool         m_cancelPrinting;
 
+  KIPIPlugins::KPAboutData *m_about;
+
   void updateCropFrame(TPhoto *, int);
   void setBtnCropEnabled();
   void removeGimpFiles();