Commit 0c9c17aa authored by Eike Ziller's avatar Eike Ziller

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

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

Change-Id: I1008efd0bfa95a5b3134edae9e324b106273a708
Reviewed-by: Orgad Shaneh's avatarOrgad Shaneh <orgads@gmail.com>
parent 55b2bb16
...@@ -179,12 +179,12 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error) ...@@ -179,12 +179,12 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error)
// Add Contents, Index, and Context menu items // Add Contents, Index, and Context menu items
action = new QAction(QIcon::fromTheme(QLatin1String("help-contents")), action = new QAction(QIcon::fromTheme(QLatin1String("help-contents")),
tr(Constants::SB_CONTENTS), this); 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); ActionManager::actionContainer(Core::Constants::M_HELP)->addAction(cmd, Core::Constants::G_HELP_HELP);
connect(action, SIGNAL(triggered()), this, SLOT(activateContents())); connect(action, SIGNAL(triggered()), this, SLOT(activateContents()));
action = new QAction(tr(Constants::SB_INDEX), this); 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); ActionManager::actionContainer(Core::Constants::M_HELP)->addAction(cmd, Core::Constants::G_HELP_HELP);
connect(action, SIGNAL(triggered()), this, SLOT(activateIndex())); connect(action, SIGNAL(triggered()), this, SLOT(activateIndex()));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment