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

Mac: Avoid Alt+<character> shortcuts

Browse Source 
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>
This commit is contained in:
Eike Ziller
2012-05-22 16:08:40 +02:00
parent d8429000f0
commit 48a23cc28b
8 changed files with 126 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/bazaar/bazaarplugin.cpp
View File

@@ -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);