diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2012-05-22 16:08:40 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2012-05-22 16:48:20 +0200 |
| commit | 48a23cc28b04126124cda74670d03d4286afa40d (patch) | |
| tree | 5d83da71ad3b81ba43f6b4918fbff330076dd774 /src/plugins/bazaar/bazaarplugin.cpp | |
| parent | d8429000f014ed04964948a454a5d6e285646686 (diff) | |
| download | qt-creator-48a23cc28b04126124cda74670d03d4286afa40d.tar.gz | |
Mac: Avoid Alt+<character> shortcuts
Because these tend to add special characters into the editor instead of
triggering the shortcut. Use Ctrl (aka Qt's Meta) instead.
Change-Id: I5866772baf4550e6d048e4d7252b2899a6d28296
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Diffstat (limited to 'src/plugins/bazaar/bazaarplugin.cpp')
| -rw-r--r-- | src/plugins/bazaar/bazaarplugin.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp index 9683152a35..1185720304 100644 --- a/src/plugins/bazaar/bazaarplugin.cpp +++ b/src/plugins/bazaar/bazaarplugin.cpp @@ -245,7 +245,11 @@ 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); +#ifdef Q_OS_MAC + command->setDefaultKeySequence(QKeySequence(tr("Meta+Z,Meta+D"))); +#else command->setDefaultKeySequence(QKeySequence(tr("ALT+Z,Alt+D"))); +#endif connect(m_diffFile, SIGNAL(triggered()), this, SLOT(diffCurrentFile())); m_bazaarContainer->addAction(command); m_commandLocator->appendCommand(command); @@ -253,7 +257,11 @@ 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); +#ifdef Q_OS_MAC + command->setDefaultKeySequence(QKeySequence(tr("Meta+Z,Meta+L"))); +#else command->setDefaultKeySequence(QKeySequence(tr("ALT+Z,Alt+L"))); +#endif connect(m_logFile, SIGNAL(triggered()), this, SLOT(logCurrentFile())); m_bazaarContainer->addAction(command); m_commandLocator->appendCommand(command); @@ -261,7 +269,11 @@ 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); +#ifdef Q_OS_MAC + command->setDefaultKeySequence(QKeySequence(tr("Meta+Z,Meta+S"))); +#else command->setDefaultKeySequence(QKeySequence(tr("ALT+Z,Alt+S"))); +#endif connect(m_statusFile, SIGNAL(triggered()), this, SLOT(statusCurrentFile())); m_bazaarContainer->addAction(command); m_commandLocator->appendCommand(command); @@ -441,7 +453,11 @@ 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); +#ifdef Q_OS_MAC + command->setDefaultKeySequence(QKeySequence(tr("Meta+Z,Meta+C"))); +#else command->setDefaultKeySequence(QKeySequence(tr("ALT+Z,Alt+C"))); +#endif connect(action, SIGNAL(triggered()), this, SLOT(commit())); m_bazaarContainer->addAction(command); m_commandLocator->appendCommand(command); |