From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Thu, 25 Dec 2008 20:45:57 +0000 (+0100)
Subject: Add shortcuts edit dialog for KDEified Quassel
X-Git-Tag: 0.4.0~320
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=13eefb3ca78e1e144fb31a52faaf56d9e7c3a691

Add shortcuts edit dialog for KDEified Quassel
---

diff --git a/src/qtui/chatviewsearchbar.cpp b/src/qtui/chatviewsearchbar.cpp
index 0ea119ec..a7e6ceda 100644
--- a/src/qtui/chatviewsearchbar.cpp
+++ b/src/qtui/chatviewsearchbar.cpp
@@ -42,7 +42,8 @@ ChatViewSearchBar::ChatViewSearchBar(QWidget *parent)
   QAction *toggleSearchBar = coll->action("ToggleSearchBar");
   connect(toggleSearchBar, SIGNAL(toggled(bool)), SLOT(setVisible(bool)));
 
-  Action *hideSearchBar = coll->add<Action>("HideSearchBar", toggleSearchBar, SLOT(setChecked(bool))); // always false
+  Action *hideSearchBar = coll->add<Action>("HideSearchBar", toggleSearchBar, SLOT(setChecked(bool)));
+  hideSearchBar->setShortcutConfigurable(false);
   hideSearchBar->setShortcut(Qt::Key_Escape);
 
   connect(ui.hideButton, SIGNAL(clicked()), toggleSearchBar, SLOT(toggle()));
diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 67db86f7..9d9bb815 100644
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -24,6 +24,7 @@
 #  include <KActionCollection>
 #  include <KHelpMenu>
 #  include <KMenuBar>
+#  include <KShortcutsDialog>
 #  include <KStatusBar>
 #endif
 
@@ -209,7 +210,7 @@ void MainWin::setupActions() {
                                       qApp, SLOT(quit()), tr("Ctrl+Q")));
 
   // View
-  coll->addAction("ManageBufferViews", new Action(SmallIcon("view-tree"), tr("&Manage Buffer Views..."), coll,
+  coll->addAction("ManageBufferViews", new Action(tr("&Manage Buffer Views..."), coll,
                                              this, SLOT(on_actionManageViews_triggered())));
   QAction *lockAct = coll->addAction("LockDockPositions", new Action(tr("&Lock Dock Positions"), coll));
   lockAct->setCheckable(true);
@@ -262,6 +263,7 @@ void MainWin::setupMenus() {
 
   _settingsMenu = menuBar()->addMenu(tr("&Settings"));
 #ifdef HAVE_KDE
+  _settingsMenu->addAction(KStandardAction::keyBindings(this, SLOT(showShortcutsDlg()), this));
   _settingsMenu->addAction(KStandardAction::configureNotifications(this, SLOT(showNotificationsDlg()), this));
 #endif
   _settingsMenu->addAction(coll->action("ConfigureQuassel"));
@@ -641,6 +643,12 @@ void MainWin::showAboutDlg() {
   AboutDlg(this).exec();
 }
 
+#ifdef HAVE_KDE
+void MainWin::showShortcutsDlg() {
+  KShortcutsDialog::configure(QtUi::actionCollection("General"), KShortcutsEditor::LetterShortcutsDisallowed);
+}
+#endif
+
 void MainWin::closeEvent(QCloseEvent *event) {
   QtUiSettings s;
   if(s.value("UseSystemTrayIcon").toBool() && s.value("MinimizeOnClose").toBool()) {
diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h
index 96a42544..1495b3de 100644
--- a/src/qtui/mainwin.h
+++ b/src/qtui/mainwin.h
@@ -96,6 +96,9 @@ class MainWin
     void showCoreInfoDlg();
     void showSettingsDlg();
     void showNotificationsDlg();
+#ifdef HAVE_KDE
+    void showShortcutsDlg();
+#endif
     void on_actionEditNetworks_triggered();
     void on_actionManageViews_triggered();
     void on_actionLockDockPositions_toggled(bool lock);