summaryrefslogtreecommitdiff
path: root/src/settings.cpp
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2009-07-25 02:23:28 +0200
committerAndrea Diamantini <adjam7@gmail.com>2009-07-25 02:23:28 +0200
commitcc7b1c6a9b6e2c3eb4ddb71e87479b96faf6c352 (patch)
tree349083bbbadbd51820af9c2c809622cdc5912375 /src/settings.cpp
parent"Fixed" string (diff)
parentAdd a page in the configuration panel for shortcuts settings (diff)
downloadrekonq-cc7b1c6a9b6e2c3eb4ddb71e87479b96faf6c352.tar.xz
Merge commit 'megabigbug/Shortcuts'
Diffstat (limited to 'src/settings.cpp')
-rw-r--r--src/settings.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/settings.cpp b/src/settings.cpp
index dda00a0e..47339ce4 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -50,6 +50,7 @@
#include <KPageWidgetItem>
#include <KFontDialog>
#include <KUrl>
+#include <KShortcutsEditor>
// Qt Includes
#include <QtCore/QPointer>
@@ -108,6 +109,10 @@ Private::Private(SettingsDialog *parent)
kWarning() << webkitIconPath;
KIcon webkitIcon = KIcon(QIcon(webkitIconPath));
pageItem->setIcon(webkitIcon);
+
+ widget = new KShortcutsEditor(Application::instance()->mainWindow()->actionCollection(),parent);
+ pageItem = parent->addPage(widget , i18n("Shortcuts"));
+ pageItem->setIcon(KIcon("configure-shortcuts"));
}