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

Mercurial: Replace Alt+H with Alt+G for accelerators

Browse Source 
Alt+H triggers the Help menu.

Task-number: QTCREATORBUG-12531
Change-Id: I357db8f01fa28209a818e8c9a9587f213e0d0ca5
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2014-11-04 23:56:15 +02:00
committed by Orgad Shaneh
parent 1fef3c41b9
commit e569ab8f2b
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
doc/src/howto/creator-keyboard-shortcuts.qdoc
View File

@@ -612,7 +612,7 @@
\li Alt+Z, Alt+C \li Alt+Z, Alt+C
\li Alt+C, Alt+C \li Alt+C, Alt+C
\li Alt+G, Alt+C \li Alt+G, Alt+C
\li Alt+H, Alt+C \li Alt+G, Alt+C
\li Alt+P, Alt+S \li Alt+P, Alt+S
\li Alt+S, Alt+C \li Alt+S, Alt+C
\row \row
@@ -620,7 +620,7 @@
\li Alt+Z, Alt+D \li Alt+Z, Alt+D
\li Alt+C, Alt+D \li Alt+C, Alt+D
\li Alt+G, Alt+D \li Alt+G, Alt+D
\li Alt+H, Alt+D \li Alt+G, Alt+D
\li \li
\li Alt+S, Alt+D \li Alt+S, Alt+D
\row \row
@@ -644,7 +644,7 @@
\li Alt+Z, Alt+L \li Alt+Z, Alt+L
\li \li
\li Alt+G, Alt+L \li Alt+G, Alt+L
\li Alt+H, Alt+L \li Alt+G, Alt+L
\li Alt+P, Alt+F \li Alt+P, Alt+F
\li \li
\row \row
@@ -660,7 +660,7 @@
\li Alt+Z, Alt+S \li Alt+Z, Alt+S
\li \li
\li \li
\li Alt+H, Alt+S \li Alt+G, Alt+S
\li \li
\li \li
\row \row

8
src/plugins/mercurial/mercurialplugin.cpp
View File

@@ -223,7 +223,7 @@ void MercurialPlugin::createFileActions(const Core::Context &context)
diffFile = new ParameterAction(tr("Diff Current File"), tr("Diff \"%1\""), ParameterAction::EnabledWithParameter, this); diffFile = new ParameterAction(tr("Diff Current File"), tr("Diff \"%1\""), ParameterAction::EnabledWithParameter, this);
command = Core::ActionManager::registerAction(diffFile, Core::Id(Constants::DIFF), context); command = Core::ActionManager::registerAction(diffFile, Core::Id(Constants::DIFF), context);
command->setAttribute(Core::Command::CA_UpdateText); command->setAttribute(Core::Command::CA_UpdateText);
command->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+H,Meta+D") : tr("Alt+H,Alt+D"))); command->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+H,Meta+D") : tr("Alt+G,Alt+D")));
connect(diffFile, SIGNAL(triggered()), this, SLOT(diffCurrentFile())); connect(diffFile, SIGNAL(triggered()), this, SLOT(diffCurrentFile()));
mercurialContainer->addAction(command); mercurialContainer->addAction(command);
m_commandLocator->appendCommand(command); m_commandLocator->appendCommand(command);
@@ -231,7 +231,7 @@ void MercurialPlugin::createFileActions(const Core::Context &context)
logFile = new ParameterAction(tr("Log Current File"), tr("Log \"%1\""), ParameterAction::EnabledWithParameter, this); logFile = new ParameterAction(tr("Log Current File"), tr("Log \"%1\""), ParameterAction::EnabledWithParameter, this);
command = Core::ActionManager::registerAction(logFile, Core::Id(Constants::LOG), context); command = Core::ActionManager::registerAction(logFile, Core::Id(Constants::LOG), context);
command->setAttribute(Core::Command::CA_UpdateText); command->setAttribute(Core::Command::CA_UpdateText);
command->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+H,Meta+L") : tr("Alt+H,Alt+L"))); command->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+H,Meta+L") : tr("Alt+G,Alt+L")));
connect(logFile, SIGNAL(triggered()), this, SLOT(logCurrentFile())); connect(logFile, SIGNAL(triggered()), this, SLOT(logCurrentFile()));
mercurialContainer->addAction(command); mercurialContainer->addAction(command);
m_commandLocator->appendCommand(command); m_commandLocator->appendCommand(command);
@@ -239,7 +239,7 @@ void MercurialPlugin::createFileActions(const Core::Context &context)
statusFile = new ParameterAction(tr("Status Current File"), tr("Status \"%1\""), ParameterAction::EnabledWithParameter, this); statusFile = new ParameterAction(tr("Status Current File"), tr("Status \"%1\""), ParameterAction::EnabledWithParameter, this);
command = Core::ActionManager::registerAction(statusFile, Core::Id(Constants::STATUS), context); command = Core::ActionManager::registerAction(statusFile, Core::Id(Constants::STATUS), context);
command->setAttribute(Core::Command::CA_UpdateText); command->setAttribute(Core::Command::CA_UpdateText);
command->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+H,Meta+S") : tr("Alt+H,Alt+S"))); command->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+H,Meta+S") : tr("Alt+G,Alt+S")));
connect(statusFile, SIGNAL(triggered()), this, SLOT(statusCurrentFile())); connect(statusFile, SIGNAL(triggered()), this, SLOT(statusCurrentFile()));
mercurialContainer->addAction(command); mercurialContainer->addAction(command);
m_commandLocator->appendCommand(command); m_commandLocator->appendCommand(command);
@@ -432,7 +432,7 @@ void MercurialPlugin::createRepositoryActions(const Core::Context &context)
action = new QAction(tr("Commit..."), this); action = new QAction(tr("Commit..."), this);
m_repositoryActionList.append(action); m_repositoryActionList.append(action);
command = Core::ActionManager::registerAction(action, Core::Id(Constants::COMMIT), context); command = Core::ActionManager::registerAction(action, Core::Id(Constants::COMMIT), context);
command->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+H,Meta+C") : tr("Alt+H,Alt+C"))); command->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+H,Meta+C") : tr("Alt+G,Alt+C")));
connect(action, SIGNAL(triggered()), this, SLOT(commit())); connect(action, SIGNAL(triggered()), this, SLOT(commit()));
mercurialContainer->addAction(command); mercurialContainer->addAction(command);
m_commandLocator->appendCommand(command); m_commandLocator->appendCommand(command);