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

Help: activateContext -> showContextHelp

Browse Source 
Change-Id: I8f3864b2ee07b47accd4a8a426bfc18010ce1ac0
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
This commit is contained in:
Eike Ziller
2014-07-01 09:50:10 +02:00
parent f15208bc3a
commit f97784a98c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -238,7 +238,7 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error)
cmd = ActionManager::registerAction(action, Help::Constants::CONTEXT_HELP, globalcontext); cmd = ActionManager::registerAction(action, Help::Constants::CONTEXT_HELP, 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);
cmd->setDefaultKeySequence(QKeySequence(Qt::Key_F1)); cmd->setDefaultKeySequence(QKeySequence(Qt::Key_F1));
connect(action, SIGNAL(triggered()), this, SLOT(activateContext())); connect(action, SIGNAL(triggered()), this, SLOT(showContextHelp()));
action = new QAction(tr("Technical Support"), this); action = new QAction(tr("Technical Support"), this);
cmd = ActionManager::registerAction(action, "Help.TechSupport", globalcontext); cmd = ActionManager::registerAction(action, "Help.TechSupport", globalcontext);
@@ -762,7 +762,7 @@ static QUrl findBestLink(const QMap<QString, QUrl> &links, QString *highlightId)
return source; return source;
} }
void HelpPlugin::activateContext() void HelpPlugin::showContextHelp()
{ {
if (ModeManager::currentMode() == m_mode) if (ModeManager::currentMode() == m_mode)
return; return;

2
src/plugins/help/helpplugin.h
View File

@@ -89,7 +89,7 @@ private slots:
void modeChanged(Core::IMode *mode, Core::IMode *old); void modeChanged(Core::IMode *mode, Core::IMode *old);
void activateContext(); void showContextHelp();
void activateIndex(); void activateIndex();
void activateContents(); void activateContents();
void activateSearch(); void activateSearch();