diff --git a/src/plugins/help/helpwidget.cpp b/src/plugins/help/helpwidget.cpp index aac98239fbc..791ce0c3356 100644 --- a/src/plugins/help/helpwidget.cpp +++ b/src/plugins/help/helpwidget.cpp @@ -66,8 +66,9 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget { Utils::StyledBar *toolBar = new Utils::StyledBar(); - QAction *switchToHelp = new QAction(tr("Go to Help Mode"), toolBar); - connect(switchToHelp, SIGNAL(triggered()), this, SLOT(helpModeButtonClicked())); + m_switchToHelp = new QAction(tr("Go to Help Mode"), toolBar); + connect(m_switchToHelp, SIGNAL(triggered()), this, SLOT(helpModeButtonClicked())); + updateHelpModeButtonToolTip(); QAction *back = new QAction(QIcon(QLatin1String(":/help/images/previous.png")), tr("Back"), toolBar); @@ -84,7 +85,7 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget layout->setSpacing(0); layout->setMargin(0); - layout->addWidget(toolButton(switchToHelp)); + layout->addWidget(toolButton(m_switchToHelp)); layout->addWidget(toolButton(back)); layout->addWidget(toolButton(forward)); layout->addStretch(); @@ -124,6 +125,7 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget cmd = Core::ActionManager::registerAction(m_openHelpMode, Help::Constants::CONTEXT_HELP, context); + connect(cmd, SIGNAL(keySequenceChanged()), this, SLOT(updateHelpModeButtonToolTip())); connect(m_openHelpMode, SIGNAL(triggered()), this, SLOT(helpModeButtonClicked())); Core::ActionContainer *advancedMenu = Core::ActionManager::actionContainer(Core::Constants::M_EDIT_ADVANCED); @@ -214,5 +216,12 @@ void HelpWidget::helpModeButtonClicked() close(); } +void HelpWidget::updateHelpModeButtonToolTip() +{ + Core::Command *cmd = Core::ActionManager::command(Constants::CONTEXT_HELP); + QTC_ASSERT(cmd, return); + m_switchToHelp->setToolTip(cmd->stringWithAppendedShortcut(m_switchToHelp->text())); +} + } // Internal } // Help diff --git a/src/plugins/help/helpwidget.h b/src/plugins/help/helpwidget.h index f89bd01eef7..3796be59dc1 100644 --- a/src/plugins/help/helpwidget.h +++ b/src/plugins/help/helpwidget.h @@ -72,8 +72,10 @@ private slots: void updateForwardMenu(); void updateWindowTitle(); void helpModeButtonClicked(); + void updateHelpModeButtonToolTip(); private: + QAction *m_switchToHelp; QMenu *m_backMenu; QMenu *m_forwardMenu; QAction *m_openHelpMode;