[Kde-imaging] kdeextragear-libs-1/libkexif

[Gilles Caulier]

CVS commit by cgilles: 

Added KHelpMenu on LibKExif Dialog.
- Bug report access (Renchi, we need to create a new group in Kde bug report).
- Handbook access (Basic LibKExif handbook implementation. Must be updated).
CCMAIL: digikam-devel at lists.sourceforge.net, kde-imaging at kde.org


  M +38 -14    kexif.cpp   1.9
  M +12 -6     kexif.h   1.5


--- kdeextragear-libs-1/libkexif/kexif.cpp  #1.8:1.9
@@ -44,4 +44,9 @@
 #include <kmessagebox.h>
 #include <kdebug.h>
+#include <kaboutdata.h>
+#include <khelpmenu.h>
+#include <kiconloader.h>
+#include <kpopupmenu.h>
+#include <kapplication.h>
 
 // Local includes.
@@ -56,8 +61,35 @@
 
 KExif::KExif(QWidget *parent, const char *name)
-     : KDialogBase( Plain, i18n("Exif Information"), Help|User1|Close,
-                    Close, parent, name, true, true, i18n("&About") )
+     : KDialogBase( Plain, i18n("Exif Information"), Help|Close,
+                    Close, parent, name, true, true )
 {
-    setHelp("", "libkexif");
+    // About data and help button.
+    
+    KAboutData* about = new KAboutData("libkexif",
+                                       I18N_NOOP("KExif Library"), 
+                                       "1.0.0-cvs",
+                                       I18N_NOOP("An Exif viewer and library for KDE"),
+                                       KAboutData::License_GPL,
+                                       "(c) 2003-2004, Digikam team", 
+                                       0,
+                                       "http://digikam.sourceforge.net");
+    
+    about->addAuthor("Renchi Raju", I18N_NOOP("Main developper"),
+                     "renchi at pooh.tam.uiuc.edu");
+
+    about->addAuthor("Gilles Caulier", I18N_NOOP("developper"),
+                     "caulier dot gilles at free.fr");
+    
+    about->addAuthor("Ralf Hoelzer", I18N_NOOP("developper"),
+                     "kde at ralfhoelzer.com");
+
+    mhelpButton = actionButton( Help );
+    KHelpMenu* helpMenu = new KHelpMenu(this, about, false);
+    helpMenu->menu()->removeItemAt(0);
+    helpMenu->menu()->insertItem(i18n("LibKExif handbook"), this, SLOT(slotHelp()), 0, -1, 0);
+    mhelpButton->setPopup( helpMenu->menu() );
+
+    // ------------------------------------------------------
+
     QGridLayout* layout = new QGridLayout(plainPage());
     layout->setSpacing(6);
@@ -90,7 +122,4 @@ KExif::KExif(QWidget *parent, const char
     // ------------------------------------------------------
     
-    connect(this, SIGNAL(user1Clicked()),
-            this, SLOT(slotAboutClicked()));
-            
     mExifData = 0;
     resize(500, 500);
@@ -103,13 +132,8 @@ KExif::~KExif()
 }
 
-void KExif::slotAboutClicked()
+void KExif::slotHelp()
 {
-    KMessageBox::about(this, i18n("An Exif viewer and library for KDE\n\n"
-                                  "Author: Renchi Raju, Gilles Caulier and Ralf Hoelzer\n\n"
-                                  "Emails:\n"
-                                  "renchi at pooh.tam.uiuc.edu\n"
-                                  "caulier dot gilles at free.fr\n"
-                                  "kde at ralfhoelzer.com"),
-                                  i18n("About KExif"));
+    KApplication::kApplication()->invokeHelp("",
+                                             "libkexif");    
 }
 

--- kdeextragear-libs-1/libkexif/kexif.h  #1.4:1.5
@@ -34,4 +34,5 @@ class QTabWidget;
 class QTextEdit;
 class QGroupBox;
+class QPushButton;
 
 class KExifData;
@@ -53,6 +54,11 @@ private:
 
     KExifData  *mExifData;
+ 
+    QPushButton *mhelpButton;
+    
     QTabWidget *mTabWidget;
+    
     QTextEdit  *mTextEdit;
+    
     QGroupBox  *mMainBox;
 
@@ -68,5 +74,5 @@ private slots:
     void slotTabPageChanged(QWidget*);
     void slotShowItemDescription(const QString& desc);
-    void slotAboutClicked();
+    void slotHelp();
 };