feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Help: Resolve shortcut conflict between index and C++ type hierarchy

Browse Source 
By making the global Help menu items (index & contents) independent from
the help view shortcuts again.

Change-Id: I1008efd0bfa95a5b3134edae9e324b106273a708
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Eike Ziller
2014-10-20 09:53:31 +02:00
parent 55b2bb16dc
commit 0c9c17aa25
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/help/helpplugin.cpp
View File

@@ -179,12 +179,12 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error)
// Add Contents, Index, and Context menu items
action = new QAction(QIcon::fromTheme(QLatin1String("help-contents")),
tr(Constants::SB_CONTENTS), this);
cmd = ActionManager::registerAction(action, Constants::HELP_CONTENTS, globalcontext);
cmd = ActionManager::registerAction(action, "Help.ContentsMenu", globalcontext);
ActionManager::actionContainer(Core::Constants::M_HELP)->addAction(cmd, Core::Constants::G_HELP_HELP);
connect(action, SIGNAL(triggered()), this, SLOT(activateContents()));
action = new QAction(tr(Constants::SB_INDEX), this);
cmd = ActionManager::registerAction(action, "Help.Index", globalcontext);
cmd = ActionManager::registerAction(action, "Help.IndexMenu", globalcontext);
ActionManager::actionContainer(Core::Constants::M_HELP)->addAction(cmd, Core::Constants::G_HELP_HELP);
connect(action, SIGNAL(triggered()), this, SLOT(activateIndex()));