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

Help: Add shortcut to "Go to Help Mode" button tool tip

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

15
src/plugins/help/helpwidget.cpp
View File

@@ -66,8 +66,9 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget
{ {
Utils::StyledBar *toolBar = new Utils::StyledBar(); Utils::StyledBar *toolBar = new Utils::StyledBar();
QAction *switchToHelp = new QAction(tr("Go to Help Mode"), toolBar); m_switchToHelp = new QAction(tr("Go to Help Mode"), toolBar);
connect(switchToHelp, SIGNAL(triggered()), this, SLOT(helpModeButtonClicked())); connect(m_switchToHelp, SIGNAL(triggered()), this, SLOT(helpModeButtonClicked()));
updateHelpModeButtonToolTip();
QAction *back = new QAction(QIcon(QLatin1String(":/help/images/previous.png")), QAction *back = new QAction(QIcon(QLatin1String(":/help/images/previous.png")),
tr("Back"), toolBar); tr("Back"), toolBar);
@@ -84,7 +85,7 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget
layout->setSpacing(0); layout->setSpacing(0);
layout->setMargin(0); layout->setMargin(0);
layout->addWidget(toolButton(switchToHelp)); layout->addWidget(toolButton(m_switchToHelp));
layout->addWidget(toolButton(back)); layout->addWidget(toolButton(back));
layout->addWidget(toolButton(forward)); layout->addWidget(toolButton(forward));
layout->addStretch(); layout->addStretch();
@@ -124,6 +125,7 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget
cmd = Core::ActionManager::registerAction(m_openHelpMode, cmd = Core::ActionManager::registerAction(m_openHelpMode,
Help::Constants::CONTEXT_HELP, Help::Constants::CONTEXT_HELP,
context); context);
connect(cmd, SIGNAL(keySequenceChanged()), this, SLOT(updateHelpModeButtonToolTip()));
connect(m_openHelpMode, SIGNAL(triggered()), this, SLOT(helpModeButtonClicked())); connect(m_openHelpMode, SIGNAL(triggered()), this, SLOT(helpModeButtonClicked()));
Core::ActionContainer *advancedMenu = Core::ActionManager::actionContainer(Core::Constants::M_EDIT_ADVANCED); Core::ActionContainer *advancedMenu = Core::ActionManager::actionContainer(Core::Constants::M_EDIT_ADVANCED);
@@ -214,5 +216,12 @@ void HelpWidget::helpModeButtonClicked()
close(); 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 } // Internal
} // Help } // Help

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

@@ -72,8 +72,10 @@ private slots:
void updateForwardMenu(); void updateForwardMenu();
void updateWindowTitle(); void updateWindowTitle();
void helpModeButtonClicked(); void helpModeButtonClicked();
void updateHelpModeButtonToolTip();
private: private:
QAction *m_switchToHelp;
QMenu *m_backMenu; QMenu *m_backMenu;
QMenu *m_forwardMenu; QMenu *m_forwardMenu;
QAction *m_openHelpMode; QAction *m_openHelpMode;