X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=67db86f74566137a9d8b2489515f57181eba117c;hp=56f8f1ad850ea4ab057cd256d624a198e9847156;hb=084d95e60b0fb587b1950a3e4f8ec5e4f017446c;hpb=44797cbb82853f2f5a9013cf31dd489bb52f5ae5

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 56f8f1ad..67db86f7 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
@@ -64,6 +67,9 @@
 #ifdef HAVE_PHONON
 #  include "phononnotificationbackend.h"
 #endif
+#ifdef HAVE_KDE
+#  include "knotificationbackend.h"
+#endif
 #include "systraynotificationbackend.h"
 #include "taskbarnotificationbackend.h"
 
@@ -83,6 +89,7 @@
 MainWin::MainWin(QWidget *parent)
 #ifdef HAVE_KDE
   : KMainWindow(parent),
+  _kHelpMenu(new KHelpMenu(this)),
 #else
   : QMainWindow(parent),
 #endif
@@ -106,14 +113,19 @@ MainWin::MainWin(QWidget *parent)
 
   installEventFilter(new JumpKeyHandler(this));
 
-  QtUi::registerNotificationBackend(new TaskbarNotificationBackend(this));
-  QtUi::registerNotificationBackend(new SystrayNotificationBackend(this));
-#ifdef HAVE_PHONON
-  QtUi::registerNotificationBackend(new PhononNotificationBackend(this));
-#endif
-#ifdef HAVE_DBUS
-  QtUi::registerNotificationBackend(new DesktopNotificationBackend(this));
-#endif
+#ifndef HAVE_KDE
+    QtUi::registerNotificationBackend(new TaskbarNotificationBackend(this));
+    QtUi::registerNotificationBackend(new SystrayNotificationBackend(this));
+#  ifdef HAVE_PHONON
+    QtUi::registerNotificationBackend(new PhononNotificationBackend(this));
+#  endif
+#  ifdef HAVE_DBUS
+    QtUi::registerNotificationBackend(new DesktopNotificationBackend(this));
+#  endif
+
+#else /* HAVE_KDE */
+    QtUi::registerNotificationBackend(new KNotificationBackend(this));
+#endif /* HAVE_KDE */
 
   QtUiApplication* app = qobject_cast<QtUiApplication*> qApp;
   connect(app, SIGNAL(saveStateToSession(const QString&)), SLOT(saveStateToSession(const QString&)));
@@ -199,7 +211,7 @@ void MainWin::setupActions() {
   // View
   coll->addAction("ManageBufferViews", new Action(SmallIcon("view-tree"), tr("&Manage Buffer Views..."), coll,
                                              this, SLOT(on_actionManageViews_triggered())));
-  Action *lockAct = coll->addAction("LockDockPositions", new Action(tr("&Lock Dock Positions"), coll));
+  QAction *lockAct = coll->addAction("LockDockPositions", new Action(tr("&Lock Dock Positions"), coll));
   lockAct->setCheckable(true);
   connect(lockAct, SIGNAL(toggled(bool)), SLOT(on_actionLockDockPositions_toggled(bool)));
 
@@ -213,9 +225,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())));
@@ -249,11 +261,18 @@ void MainWin::setupMenus() {
   _viewMenu->addAction(coll->action("LockDockPositions"));
 
   _settingsMenu = menuBar()->addMenu(tr("&Settings"));
+#ifdef HAVE_KDE
+  _settingsMenu->addAction(KStandardAction::configureNotifications(this, SLOT(showNotificationsDlg()), this));
+#endif
   _settingsMenu->addAction(coll->action("ConfigureQuassel"));
 
   _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"));
@@ -322,6 +341,11 @@ BufferView *MainWin::allBuffersView() const {
   return 0;
 }
 
+void MainWin::showNotificationsDlg() {
+  SettingsPageDlg dlg(new NotificationsSettingsPage(this), this);
+  dlg.exec();
+}
+
 void MainWin::on_actionEditNetworks_triggered() {
   SettingsPageDlg dlg(new NetworksSettingsPage(this), this);
   dlg.exec();