diff options
| author | cerf <delorme.hugues@gmail.com> | 2011-03-21 11:35:10 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@nokia.com> | 2011-03-21 11:39:30 +0100 |
| commit | 1ceb461b1cc44a4b3a6d2de57cadf2ebb8530493 (patch) | |
| tree | dcbc3927e08e50e4492565211f5b1151f35bc4c8 /src/plugins/bazaar | |
| parent | 5bbf0c5faaa08ee506e8e821ce3707041c36e41b (diff) | |
| download | qt-creator-1ceb461b1cc44a4b3a6d2de57cadf2ebb8530493.tar.gz | |
Bazaar: fix conflicting keyboard shortcuts
Bazaar commands can now be triggered with ALT+Z as combination prefix
instead of the already used ALT+B
Merge-request: 278
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Diffstat (limited to 'src/plugins/bazaar')
| -rw-r--r-- | src/plugins/bazaar/bazaarplugin.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp index c9c2a5a726..beceb17c70 100644 --- a/src/plugins/bazaar/bazaarplugin.cpp +++ b/src/plugins/bazaar/bazaarplugin.cpp @@ -248,7 +248,7 @@ void BazaarPlugin::createFileActions(const Core::Context &context) m_diffFile = new Utils::ParameterAction(tr("Diff Current File"), tr("Diff \"%1\""), Utils::ParameterAction::EnabledWithParameter, this); command = m_actionManager->registerAction(m_diffFile, Core::Id(Constants::DIFF), context); command->setAttribute(Core::Command::CA_UpdateText); - command->setDefaultKeySequence(QKeySequence(tr("Alt+B,Alt+D"))); + command->setDefaultKeySequence(QKeySequence(tr("ALT+Z,Alt+D"))); connect(m_diffFile, SIGNAL(triggered()), this, SLOT(diffCurrentFile())); m_bazaarContainer->addAction(command); m_commandLocator->appendCommand(command); @@ -256,7 +256,7 @@ void BazaarPlugin::createFileActions(const Core::Context &context) m_logFile = new Utils::ParameterAction(tr("Log Current File"), tr("Log \"%1\""), Utils::ParameterAction::EnabledWithParameter, this); command = m_actionManager->registerAction(m_logFile, Core::Id(Constants::LOG), context); command->setAttribute(Core::Command::CA_UpdateText); - command->setDefaultKeySequence(QKeySequence(tr("Alt+B,Alt+L"))); + command->setDefaultKeySequence(QKeySequence(tr("ALT+Z,Alt+L"))); connect(m_logFile, SIGNAL(triggered()), this, SLOT(logCurrentFile())); m_bazaarContainer->addAction(command); m_commandLocator->appendCommand(command); @@ -264,7 +264,7 @@ void BazaarPlugin::createFileActions(const Core::Context &context) m_statusFile = new Utils::ParameterAction(tr("Status Current File"), tr("Status \"%1\""), Utils::ParameterAction::EnabledWithParameter, this); command = m_actionManager->registerAction(m_statusFile, Core::Id(Constants::STATUS), context); command->setAttribute(Core::Command::CA_UpdateText); - command->setDefaultKeySequence(QKeySequence(tr("Alt+B,Alt+S"))); + command->setDefaultKeySequence(QKeySequence(tr("ALT+Z,Alt+S"))); connect(m_statusFile, SIGNAL(triggered()), this, SLOT(statusCurrentFile())); m_bazaarContainer->addAction(command); m_commandLocator->appendCommand(command); @@ -441,7 +441,7 @@ void BazaarPlugin::createRepositoryActions(const Core::Context &context) action = new QAction(tr("Commit..."), this); m_repositoryActionList.append(action); command = m_actionManager->registerAction(action, Core::Id(Constants::COMMIT), context); - command->setDefaultKeySequence(QKeySequence(tr("Alt+B,Alt+C"))); + command->setDefaultKeySequence(QKeySequence(tr("ALT+Z,Alt+C"))); connect(action, SIGNAL(triggered()), this, SLOT(commit())); m_bazaarContainer->addAction(command); m_commandLocator->appendCommand(command); |