FAQ dialog added

2 files changed, 29 insertions, 7 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index dabb8e9..cb9b992 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -18,12 +18,19 @@
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
+/*
+Enhanced Version of the file for platform independent KDE tools.
+Copyright (c) 2004 Ulf Schenk
+
+$Id$
+*/
+
 #include "kabcore.h"
 
 #include <stdaddressbook.h>
 #include <klocale.h>
 
 #ifndef KAB_EMBEDDED
@@ -415,23 +422,24 @@ void KABCore::createAboutData()
 #else
                         "PDA-Edition\n"
                         "for: Zaurus 5500 / 7x0 / 8x0\n"
 #endif
 
                         "(c) 2004 Ulf Schenk\n"
+                        "(c) 2004 Lutz Rogowski\n"
                         "(c) 1997-2003, The KDE PIM Team\n"
-  "Tobias Koenig Current maintainer tokoe@kde.org\n"
+  "Tobias Koenig Current maintainer\ntokoe@kde.org\n"
   "Don Sanders Original author\n"
-  "Cornelius Schumacher Co-maintainer  schumacher@kde.org\n"
-  "Mike Pilone GUI and framework redesign mpilone@slac.com\n"
+  "Cornelius Schumacher Co-maintainer\nschumacher@kde.org\n"
+  "Mike Pilone GUI and framework redesign\nmpilone@slac.com\n"
   "Greg Stern DCOP interface\n"
   "Mark Westcot Contact pinning\n"
   "Michel Boyer de la Giroday LDAP Lookup\n" "michel@klaralvdalens-datakonsult.se\n"
-  "Steffen Hansen LDAP Lookup hansen@kde.org\n"
+  "Steffen Hansen LDAP Lookup\nhansen@kde.org\n"
 #ifdef _WIN32_
- "(c) 2004 Lutz Rogowski Import from OL rogowski@kde.org\n"
+ "(c) 2004 Lutz Rogowski Import from OL\nrogowski@kde.org\n"
 #endif
  );
 }
 
 void KABCore::setContactSelected( const QString &uid )
 {
@@ -1731,15 +1739,19 @@ void KABCore::initActions()
                                     SLOT( removeVoice() ), actionCollection(),
                                    "remove_voice" );
   mActionImportOL = new KAction( i18n( "Import from OL..." ), 0, this,
                                     SLOT( importFromOL() ), actionCollection(),
                                    "import_OL" );
 #ifdef KAB_EMBEDDED
- mActionLicence = new KAction( i18n( "Licence" ), "licence", 0,
+ mActionLicence = new KAction( i18n( "Licence" ), 0,
                  this, SLOT( showLicence() ), actionCollection(),
                  "licence_about_data" );
+ mActionFaq = new KAction( i18n( "Faq" ), 0,
+                 this, SLOT( faq() ), actionCollection(),
+                 "faq_about_data" );
+
   mActionAboutKAddressbook = new KAction( i18n( "&About KAddressBook" ), "kaddressbook2", 0,
                  this, SLOT( createAboutData() ), actionCollection(),
                  "kaddressbook_about_data" );
 #endif //KAB_EMBEDDED
 
   clipboardDataChanged();
@@ -1862,14 +1874,15 @@ void KABCore::addActionsManually()
     mActionDetails->plug( tb );
   settingsMenu->insertSeparator();
 
   mActionWhoAmI->plug( settingsMenu );
   mActionCategories->plug( settingsMenu );
 
-  mActionAboutKAddressbook->plug( helpMenu );
   mActionLicence->plug( helpMenu );
+  mActionFaq->plug( helpMenu );
+  mActionAboutKAddressbook->plug( helpMenu );
 
   if (KGlobal::getDesktopSize() > KGlobal::Small ) {
 
       mActionSave->plug( tb );
       mViewManager->getFilterAction()->plug ( tb);
       if (KGlobal::getDesktopSize() == KGlobal::Desktop ) {
@@ -2065,11 +2078,17 @@ void KABCore::requestForDetails(const QString& sourceChannel, const QString& ses
       mActionDetails->setChecked(true);
     }
   }
 }
 
 
+void  KABCore::faq()
+{
+  KApplication::showFile( "KA/Pi FAQ", "kdepim/kaddressbook/kapiFAQ.txt" );
+}
+
+
 
 
 #ifndef KAB_EMBEDDED
 #include "kabcore.moc"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index 040b6aa..39d043f 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -140,12 +140,14 @@ class KABCore : public QWidget
 #ifdef KAB_EMBEDDED
     void createAboutData();
 #endif //KAB_EMBEDDED
 
     void statusMessage(QString, int time = 0 );
     void showLicence();
+    void faq();
+
     /**
       Is called whenever a contact is selected in the view.
      */
     void setContactSelected( const QString &uid );
 
     /**
@@ -419,12 +421,13 @@ class KABCore : public QWidget
     KToggleAction *mActionJumpBar;
     KToggleAction *mActionDetails;
     KAction *mActionWhoAmI;
     KAction *mActionCategories;
     KAction *mActionAboutKAddressbook;
     KAction *mActionLicence;
+    KAction *mActionFaq;
 
     KAction *mActionDeleteView;
 
     QPopupMenu *viewMenu;
     QPopupMenu *filterMenu;
     QPopupMenu *settingsMenu;