From 38b2ffce04ff7d0b3557b56eb38e548c83fce510 Mon Sep 17 00:00:00 2001
From: kh1 <qt-info@nokia.com>
Date: Mon, 21 Jun 2010 13:23:43 +0200
Subject: [PATCH] Fix missing help plugin shortcuts.
Reviewed-by: ck
---
src/plugins/help/helpplugin.cpp | 36 ++++++++++++++++++---------------
src/plugins/help/helpplugin.h | 1 +
2 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index a6746dbbd02..138d2ffa764 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -384,14 +384,13 @@ void HelpPlugin::setupUi()
connect(searchWidget, SIGNAL(linkActivated(QUrl)), m_centralWidget,
SLOT(setSourceFromSearch(QUrl)));
- // TODO: enable and find a proper keysequence as this is ambiguous
- // shortcut = new QShortcut(m_splitter);
- // shortcut->setWhatsThis(tr("Activate Search in Help mode"));
- // cmd = am->registerShortcut(shortcut, QLatin1String("Help.SearchShortcut"),
- // modecontext);
- // cmd->setDefaultKeySequence(QKeySequence(Qt::CTRL + Qt::Key_S));
- // connect(shortcut, SIGNAL(activated()), this, SLOT(activateSearch()));
- // shortcutMap.insert("Search", cmd);
+ shortcut = new QShortcut(m_splitter);
+ shortcut->setWhatsThis(tr("Activate Search in Help mode"));
+ cmd = am->registerShortcut(shortcut, QLatin1String("Help.SearchShortcut"),
+ modecontext);
+ cmd->setDefaultKeySequence(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_Slash));
+ connect(shortcut, SIGNAL(activated()), this, SLOT(activateSearch()));
+ shortcutMap.insert(SB_SEARCH, cmd);
BookmarkManager *manager = &LocalHelpManager::bookmarkManager();
BookmarkWidget *bookmarkWidget = new BookmarkWidget(manager, 0, false);
@@ -400,14 +399,13 @@ void HelpPlugin::setupUi()
connect(bookmarkWidget, SIGNAL(linkActivated(QUrl)), m_centralWidget,
SLOT(setSource(QUrl)));
- // TODO: enable and find a proper keysequence as this is ambiguous
- // shortcut = new QShortcut(m_splitter);
- // shortcut->setWhatsThis(tr("Activate Bookmarks in Help mode"));
- // cmd = am->registerShortcut(shortcut, QLatin1String("Help.BookmarkShortcut"),
- // modecontext);
- // cmd->setDefaultKeySequence(QKeySequence(Qt::CTRL + Qt::Key_B));
- // connect(shortcut, SIGNAL(activated()), this, SLOT(activateBookmarks()));
- // shortcutMap.insert("Bookmarks", cmd);
+ shortcut = new QShortcut(m_splitter);
+ shortcut->setWhatsThis(tr("Activate Bookmarks in Help mode"));
+ cmd = am->registerShortcut(shortcut, QLatin1String("Help.BookmarkShortcut"),
+ modecontext);
+ cmd->setDefaultKeySequence(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_B));
+ connect(shortcut, SIGNAL(activated()), this, SLOT(activateBookmarks()));
+ shortcutMap.insert(SB_BOOKMARKS, cmd);
QWidget *openPagesWidget = OpenPagesManager::instance().openPagesWidget();
openPagesWidget->setWindowTitle(tr("Open Pages"));
@@ -739,6 +737,12 @@ void HelpPlugin::activateOpenPages()
m_sideBar->activateItem(m_openPagesItem);
}
+void HelpPlugin::activateBookmarks()
+{
+ activateHelpMode();
+ m_sideBar->activateItem(m_bookmarkItem);
+}
+
QToolBar *HelpPlugin::createToolBar()
{
QToolBar *toolWidget = new QToolBar;
diff --git a/src/plugins/help/helpplugin.h b/src/plugins/help/helpplugin.h
index 9ad6644eb08..a5099db7f7d 100644
--- a/src/plugins/help/helpplugin.h
+++ b/src/plugins/help/helpplugin.h
@@ -80,6 +80,7 @@ private slots:
void activateContents();
void activateSearch();
void activateOpenPages();
+ void activateBookmarks();
void addBookmark();
void updateFilterComboBox();
--
GitLab