Added help button in the Katapult configuration dialog. This relates to bug 1842.

diff --git a/katapult/katapult/katapultconfigdlg.cpp b/katapult/katapult/katapultconfigdlg.cpp
index 369971c..2ca0fb7 100644
--- a/katapult/katapult/katapultconfigdlg.cpp
+++ b/katapult/katapult/katapultconfigdlg.cpp
@@ -41,7 +41,7 @@
 #include "confdisplay.h"
 
 KatapultConfigDlg::KatapultConfigDlg(KatapultSettings *settings)
- : KDialogBase(TreeList, "Configure", Ok|Cancel, Ok)
+ : KDialogBase(TreeList, "Configure", Ok|Cancel|Help, Ok)
 {
 	this->settings = settings;
 	setTreeListAutoResize(TRUE);

Added Help submenu to Katapult systray icon. This resolves bug 1842.

diff --git a/katapult/katapult/katapult.cpp b/katapult/katapult/katapult.cpp
index 6a14011..7e79597 100644
--- a/katapult/katapult/katapult.cpp
+++ b/katapult/katapult/katapult.cpp
@@ -27,6 +27,7 @@
 #include <tdeparts/componentfactory.h>
 #include <kpassivepopup.h>
 #include <tdepopupmenu.h>
+#include <khelpmenu.h>
 #include <tdelocale.h>
 #include <tdeaboutapplication.h>
 #include <dcopclient.h>
@@ -60,6 +61,8 @@
 	_query = "";
 	
 	settings = new KatapultSettings();
+  helpmenu = new KHelpMenu(this,TQString(),false);
+  connect(helpmenu, TQT_SIGNAL(showAboutApplication()),this, TQT_SLOT(showAboutDialog()));
 
 	hideTimer = new TQTimer(this);
 	connect(hideTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(hideLauncher()));
@@ -139,9 +142,8 @@
 	KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(showShortcutsDialog()), actions)->plug((TQWidget *) contextMenu());
 	KStdAction::preferences(settings, TQT_SLOT(configure()), actions)->plug((TQWidget *) contextMenu());
 	
-	contextMenu()->insertSeparator();
-	KStdAction::aboutApp(TQT_TQOBJECT(this), TQT_SLOT(showAboutDialog()), actions)->plug((TQWidget *) contextMenu());
-	contextMenu()->insertSeparator();
+	contextMenu()->insertItem(SmallIconSet("help"), KStdGuiItem::help().text(), helpmenu->menu());
+  contextMenu()->insertSeparator();
 	
 	KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actions)->plug((TQWidget *) contextMenu());
 	
diff --git a/katapult/katapult/katapult.h b/katapult/katapult/katapult.h
index c1f8b61..94ae078 100644
--- a/katapult/katapult/katapult.h
+++ b/katapult/katapult/katapult.h
@@ -43,6 +43,7 @@
 #include "katapultaction.h"
 #include "katapultiface.h"
 
+class KHelpMenu;
 class KatapultSettings;
 
 class Katapult : public KSystemTray, virtual public KatapultIface
@@ -84,6 +85,7 @@
 	TDEGlobalAccel *globalAccel;
 	TDEActionCollection *actions;
 	KatapultSettings *settings;
+  KHelpMenu *helpmenu;
 	Match bestMatch;
 	const KatapultAction *action;
 	TQString _query;