From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Thu, 25 Dec 2008 01:26:04 +0000 (+0100)
Subject: Add "About KDE" to help menu
X-Git-Tag: 0.4.0~326
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=1f105f4fb3b59c249f4d65b37c1b1dc4b9068eb8;ds=sidebyside

Add "About KDE" to help menu
---

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 56f8f1ad..4ebb0035 100644
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -20,6 +20,9 @@
 #include "mainwin.h"
 
 #ifdef HAVE_KDE
+#  include <KAction>
+#  include <KActionCollection>
+#  include <KHelpMenu>
 #  include <KMenuBar>
 #  include <KStatusBar>
 #endif
@@ -83,6 +86,7 @@
 MainWin::MainWin(QWidget *parent)
 #ifdef HAVE_KDE
   : KMainWindow(parent),
+  _kHelpMenu(new KHelpMenu(this)),
 #else
   : QMainWindow(parent),
 #endif
@@ -213,9 +217,9 @@ void MainWin::setupActions() {
                                                   this, SLOT(showSettingsDlg()), tr("F7")));
 
   // Help
-  coll->addAction("AboutQuassel", new Action(SmallIcon("quassel"), tr("&About Quassel..."), coll,
+  coll->addAction("AboutQuassel", new Action(SmallIcon("quassel"), tr("&About Quassel"), coll,
                                               this, SLOT(showAboutDlg())));
-  coll->addAction("AboutQt", new Action(QIcon(":/pics/qt-logo.png"), tr("About &Qt..."), coll,
+  coll->addAction("AboutQt", new Action(QIcon(":/pics/qt-logo.png"), tr("About &Qt"), coll,
                                          qApp, SLOT(aboutQt())));
   coll->addAction("DebugNetworkModel", new Action(SmallIcon("tools-report-bug"), tr("Debug &NetworkModel"), coll,
                                        this, SLOT(on_actionDebugNetworkModel_triggered())));
@@ -253,7 +257,11 @@ void MainWin::setupMenus() {
 
   _helpMenu = menuBar()->addMenu(tr("&Help"));
   _helpMenu->addAction(coll->action("AboutQuassel"));
+#ifndef HAVE_KDE
   _helpMenu->addAction(coll->action("AboutQt"));
+#else
+  _helpMenu->addAction(KStandardAction::aboutKDE(_kHelpMenu, SLOT(aboutKDE()), this));
+#endif
   _helpMenu->addSeparator();
   _helpDebugMenu = _helpMenu->addMenu(SmallIcon("tools-report-bug"), tr("Debug"));
   _helpDebugMenu->addAction(coll->action("DebugNetworkModel"));
diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h
index 660cc286..d5302be4 100644
--- a/src/qtui/mainwin.h
+++ b/src/qtui/mainwin.h
@@ -45,6 +45,8 @@ class SystemTrayIcon;
 class QMenu;
 class QLabel;
 
+class KHelpMenu;
+
 //!\brief The main window of Quassel's QtUi.
 class MainWin
 #ifdef HAVE_KDE
@@ -115,6 +117,9 @@ class MainWin
     void disconnectFromCore();
 
   private:
+#ifdef HAVE_KDE
+    KHelpMenu *_kHelpMenu;
+#endif
 
     QMenu *systrayMenu;
     QLabel *coreLagLabel;