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>

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

src/plugins/cpaster/cpasterplugin.cpp

@@ -174,7 +174,11 @@ bool CodepasterPlugin::initialize(const QStringList &arguments, QString *errorMe
 
     m_postEditorAction = new QAction(tr("Paste Snippet..."), this);
     command = actionManager->registerAction(m_postEditorAction, "CodePaster.Post", globalcontext);
+#ifdef Q_OS_MAC
+    command->setDefaultKeySequence(QKeySequence(tr("Meta+C,Meta+P")));
+#else
     command->setDefaultKeySequence(QKeySequence(tr("Alt+C,Alt+P")));
+#endif
     connect(m_postEditorAction, SIGNAL(triggered()), this, SLOT(postEditor()));
     cpContainer->addAction(command);
 
@@ -185,7 +189,11 @@ bool CodepasterPlugin::initialize(const QStringList &arguments, QString *errorMe
 
     m_fetchAction = new QAction(tr("Fetch Snippet..."), this);
     command = actionManager->registerAction(m_fetchAction, "CodePaster.Fetch", globalcontext);
+#ifdef Q_OS_MAC
+    command->setDefaultKeySequence(QKeySequence(tr("Meta+C,Meta+F")));
+#else
     command->setDefaultKeySequence(QKeySequence(tr("Alt+C,Alt+F")));
+#endif
     connect(m_fetchAction, SIGNAL(triggered()), this, SLOT(fetch()));
     cpContainer->addAction(command);
 

src/plugins/cvs/cvsplugin.cpp

@@ -285,7 +285,11 @@ bool CvsPlugin::initialize(const QStringList &arguments, QString *errorMessage)
     command = ami->registerAction(m_diffCurrentAction,
         CMD_ID_DIFF_CURRENT, globalcontext);
     command->setAttribute(Command::CA_UpdateText);
+#ifdef Q_OS_MAC
+    command->setDefaultKeySequence(QKeySequence(tr("Meta+C,Meta+D")));
+#else
     command->setDefaultKeySequence(QKeySequence(tr("Alt+C,Alt+D")));
+#endif
     connect(m_diffCurrentAction, SIGNAL(triggered()), this, SLOT(diffCurrentFile()));
     cvsMenu->addAction(command);
     m_commandLocator->appendCommand(command);
@@ -314,7 +318,11 @@ bool CvsPlugin::initialize(const QStringList &arguments, QString *errorMessage)
     command = ami->registerAction(m_addAction, CMD_ID_ADD,
         globalcontext);
     command->setAttribute(Command::CA_UpdateText);
+#ifdef Q_OS_MAC
+    command->setDefaultKeySequence(QKeySequence(tr("Meta+C,Meta+A")));
+#else
     command->setDefaultKeySequence(QKeySequence(tr("Alt+C,Alt+A")));
+#endif
     connect(m_addAction, SIGNAL(triggered()), this, SLOT(addCurrentFile()));
     cvsMenu->addAction(command);
     m_commandLocator->appendCommand(command);
@@ -323,7 +331,11 @@ bool CvsPlugin::initialize(const QStringList &arguments, QString *errorMessage)
     command = ami->registerAction(m_commitCurrentAction,
         CMD_ID_COMMIT_CURRENT, globalcontext);
     command->setAttribute(Command::CA_UpdateText);
+#ifdef Q_OS_MAC
+    command->setDefaultKeySequence(QKeySequence(tr("Meta+C,Meta+C")));
+#else
     command->setDefaultKeySequence(QKeySequence(tr("Alt+C,Alt+C")));
+#endif
     connect(m_commitCurrentAction, SIGNAL(triggered()), this, SLOT(startCommitCurrentFile()));
     cvsMenu->addAction(command);
     m_commandLocator->appendCommand(command);

src/plugins/designer/formeditorw.cpp

@@ -499,7 +499,7 @@ void FormEditorW::setupActions()
 
     //tool actions
     m_toolActionIds.push_back(Core::Id("FormEditor.LayoutHorizontally"));
-    const QString horizLayoutShortcut = osMac ? tr("Meta+H") : tr("Ctrl+H");
+    const QString horizLayoutShortcut = osMac ? tr("Meta+Shift+H") : tr("Ctrl+H");
     addToolAction(m_fwm->actionHorizontalLayout(), am, m_contexts,
                   m_toolActionIds.back(), mformtools, horizLayoutShortcut);
 
@@ -521,7 +521,7 @@ void FormEditorW::setupActions()
                   m_toolActionIds.back(),  mformtools);
 
     m_toolActionIds.push_back(Core::Id("FormEditor.LayoutGrid"));
-    const QString gridShortcut = osMac ? tr("Meta+G") : tr("Ctrl+G");
+    const QString gridShortcut = osMac ? tr("Meta+Shift+G") : tr("Ctrl+G");
     addToolAction(m_fwm->actionGridLayout(), am, m_contexts,
                   m_toolActionIds.back(),  mformtools, gridShortcut);
 

src/plugins/git/gitplugin.cpp

@@ -328,20 +328,32 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
                                tr("Blame Current File"), tr("Blame for \"%1\""),
                                Core::Id("Git.Blame"),
                                globalcontext, true, SLOT(blameFile()));
+#ifdef Q_OS_MAC
+    parameterActionCommand.second->setDefaultKeySequence(QKeySequence(tr("Meta+G,Meta+B")));
+#else
     parameterActionCommand.second->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+B")));
+#endif
 
     parameterActionCommand
             = createFileAction(actionManager, gitContainer,
                                tr("Diff Current File"), tr("Diff of \"%1\""),
                                Core::Id("Git.Diff"), globalcontext, true,
                                SLOT(diffCurrentFile()));
+#ifdef Q_OS_MAC
+    parameterActionCommand.second->setDefaultKeySequence(QKeySequence(tr("Meta+G,Meta+D")));
+#else
     parameterActionCommand.second->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+D")));
+#endif
 
     parameterActionCommand
             = createFileAction(actionManager, gitContainer,
                                tr("Log Current File"), tr("Log of \"%1\""),
                                Core::Id("Git.Log"), globalcontext, true, SLOT(logFile()));
+#ifdef Q_OS_MAC
+    parameterActionCommand.second->setDefaultKeySequence(QKeySequence(tr("Meta+G,Meta+L")));
+#else
     parameterActionCommand.second->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+L")));
+#endif
 
 
     // ------
@@ -351,7 +363,11 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
             = createFileAction(actionManager, gitContainer,
                                tr("Stage File for Commit"), tr("Stage \"%1\" for Commit"),
                                Core::Id("Git.Stage"), globalcontext, true, SLOT(stageFile()));
+#ifdef Q_OS_MAC
+    parameterActionCommand.second->setDefaultKeySequence(QKeySequence(tr("Meta+G,Meta+A")));
+#else
     parameterActionCommand.second->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+A")));
+#endif
 
     parameterActionCommand
             = createFileAction(actionManager, gitContainer,
@@ -369,7 +385,11 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
                                tr("Undo Uncommitted Changes"), tr("Undo Uncommitted Changes for \"%1\""),
                                Core::Id("Git.Undo"), globalcontext,
                                true, SLOT(undoFileChanges()));
+#ifdef Q_OS_MAC
+    parameterActionCommand.second->setDefaultKeySequence(QKeySequence(tr("Meta+G,Meta+U")));
+#else
     parameterActionCommand.second->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+U")));
+#endif
 
 
     // ------------
@@ -381,14 +401,22 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
                                   Core::Id("Git.DiffProject"),
                                   globalcontext, true,
                                   SLOT(diffCurrentProject()));
+#ifdef Q_OS_MAC
+    parameterActionCommand.second->setDefaultKeySequence(QKeySequence(tr("Meta+G,Meta+Shift+D")));
+#else
     parameterActionCommand.second->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+Shift+D")));
+#endif
 
     parameterActionCommand
             = createProjectAction(actionManager, gitContainer,
                                   tr("Log Project"), tr("Log Project \"%1\""),
                                   Core::Id("Git.LogProject"), globalcontext, true,
                                   SLOT(logProject()));
+#ifdef Q_OS_MAC
+    parameterActionCommand.second->setDefaultKeySequence(QKeySequence(tr("Meta+G,Meta+K")));
+#else
     parameterActionCommand.second->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+K")));
+#endif
 
     parameterActionCommand
                 = createProjectAction(actionManager, gitContainer,
@@ -532,7 +560,11 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
     actionCommand = createRepositoryAction(actionManager, gitContainer,
                                            tr("Commit..."), Core::Id("Git.Commit"),
                                            globalcontext, true, SLOT(startCommit()));
+#ifdef Q_OS_MAC
+    actionCommand.second->setDefaultKeySequence(QKeySequence(tr("Meta+G,Meta+C")));
+#else
     actionCommand.second->setDefaultKeySequence(QKeySequence(tr("Alt+G,Alt+C")));
+#endif
 
     createRepositoryAction(actionManager, gitContainer,
                            tr("Amend Last Commit..."), Core::Id("Git.AmendCommit"),

src/plugins/mercurial/mercurialplugin.cpp

@@ -233,7 +233,11 @@ void MercurialPlugin::createFileActions(const Core::Context &context)
     diffFile = new ParameterAction(tr("Diff Current File"), tr("Diff \"%1\""), ParameterAction::EnabledWithParameter, this);
     command = actionManager->registerAction(diffFile, Core::Id(Constants::DIFF), context);
     command->setAttribute(Core::Command::CA_UpdateText);
+#ifdef Q_OS_MAC
+    command->setDefaultKeySequence(QKeySequence(tr("Meta+H,Meta+D")));
+#else
     command->setDefaultKeySequence(QKeySequence(tr("Alt+H,Alt+D")));
+#endif
     connect(diffFile, SIGNAL(triggered()), this, SLOT(diffCurrentFile()));
     mercurialContainer->addAction(command);
     m_commandLocator->appendCommand(command);
@@ -241,7 +245,11 @@ void MercurialPlugin::createFileActions(const Core::Context &context)
     logFile = new ParameterAction(tr("Log Current File"), tr("Log \"%1\""), ParameterAction::EnabledWithParameter, this);
     command = actionManager->registerAction(logFile, Core::Id(Constants::LOG), context);
     command->setAttribute(Core::Command::CA_UpdateText);
+#ifdef Q_OS_MAC
+    command->setDefaultKeySequence(QKeySequence(tr("Meta+H,Meta+L")));
+#else
     command->setDefaultKeySequence(QKeySequence(tr("Alt+H,Alt+L")));
+#endif
     connect(logFile, SIGNAL(triggered()), this, SLOT(logCurrentFile()));
     mercurialContainer->addAction(command);
     m_commandLocator->appendCommand(command);
@@ -249,7 +257,11 @@ void MercurialPlugin::createFileActions(const Core::Context &context)
     statusFile = new ParameterAction(tr("Status Current File"), tr("Status \"%1\""), ParameterAction::EnabledWithParameter, this);
     command = actionManager->registerAction(statusFile, Core::Id(Constants::STATUS), context);
     command->setAttribute(Core::Command::CA_UpdateText);
+#ifdef Q_OS_MAC
+    command->setDefaultKeySequence(QKeySequence(tr("Meta+H,Meta+S")));
+#else
     command->setDefaultKeySequence(QKeySequence(tr("Alt+H,Alt+S")));
+#endif
     connect(statusFile, SIGNAL(triggered()), this, SLOT(statusCurrentFile()));
     mercurialContainer->addAction(command);
     m_commandLocator->appendCommand(command);
@@ -439,7 +451,11 @@ void MercurialPlugin::createRepositoryActions(const Core::Context &context)
     action = new QAction(tr("Commit..."), this);
     m_repositoryActionList.append(action);
     command = actionManager->registerAction(action, Core::Id(Constants::COMMIT), context);
+#ifdef Q_OS_MAC
+    command->setDefaultKeySequence(QKeySequence(tr("Meta+H,Meta+C")));
+#else
     command->setDefaultKeySequence(QKeySequence(tr("Alt+H,Alt+C")));
+#endif
     connect(action, SIGNAL(triggered()), this, SLOT(commit()));
     mercurialContainer->addAction(command);
     m_commandLocator->appendCommand(command);

src/plugins/perforce/perforceplugin.cpp

@@ -294,7 +294,11 @@ bool PerforcePlugin::initialize(const QStringList & /* arguments */, QString *er
     m_filelogCurrentAction = new Utils::ParameterAction(tr("Filelog Current File"), tr("Filelog \"%1\""), Utils::ParameterAction::EnabledWithParameter, this);
     command = am->registerAction(m_filelogCurrentAction, CMD_ID_FILELOG_CURRENT, globalcontext);
     command->setAttribute(Core::Command::CA_UpdateText);
+#ifdef Q_OS_MAC
+    command->setDefaultKeySequence(QKeySequence(tr("Meta+P,Meta+F")));
+#else
     command->setDefaultKeySequence(QKeySequence(tr("Alt+P,Alt+F")));
+#endif
     command->setDescription(tr("Filelog Current File"));
     connect(m_filelogCurrentAction, SIGNAL(triggered()), this, SLOT(filelogCurrentFile()));
     mperforce->addAction(command);
@@ -305,7 +309,11 @@ bool PerforcePlugin::initialize(const QStringList & /* arguments */, QString *er
     m_editAction = new Utils::ParameterAction(tr("Edit"), tr("Edit \"%1\""), Utils::ParameterAction::EnabledWithParameter, this);
     command = am->registerAction(m_editAction, CMD_ID_EDIT, globalcontext);
     command->setAttribute(Core::Command::CA_UpdateText);
+#ifdef Q_OS_MAC
+    command->setDefaultKeySequence(QKeySequence(tr("Meta+P,Meta+E")));
+#else
     command->setDefaultKeySequence(QKeySequence(tr("Alt+P,Alt+E")));
+#endif
     command->setDescription(tr("Edit File"));
     connect(m_editAction, SIGNAL(triggered()), this, SLOT(openCurrentFile()));
     mperforce->addAction(command);
@@ -314,7 +322,11 @@ bool PerforcePlugin::initialize(const QStringList & /* arguments */, QString *er
     m_addAction = new Utils::ParameterAction(tr("Add"), tr("Add \"%1\""), Utils::ParameterAction::EnabledWithParameter, this);
     command = am->registerAction(m_addAction, CMD_ID_ADD, globalcontext);
     command->setAttribute(Core::Command::CA_UpdateText);
+#ifdef Q_OS_MAC
+    command->setDefaultKeySequence(QKeySequence(tr("Meta+P,Meta+A")));
+#else
     command->setDefaultKeySequence(QKeySequence(tr("Alt+P,Alt+A")));
+#endif
     command->setDescription(tr("Add File"));
     connect(m_addAction, SIGNAL(triggered()), this, SLOT(addCurrentFile()));
     mperforce->addAction(command);
@@ -331,7 +343,11 @@ bool PerforcePlugin::initialize(const QStringList & /* arguments */, QString *er
     m_revertFileAction = new Utils::ParameterAction(tr("Revert"), tr("Revert \"%1\""), Utils::ParameterAction::EnabledWithParameter, this);
     command = am->registerAction(m_revertFileAction, CMD_ID_REVERT, globalcontext);
     command->setAttribute(Core::Command::CA_UpdateText);
+#ifdef Q_OS_MAC
+    command->setDefaultKeySequence(QKeySequence(tr("Meta+P,Meta+R")));
+#else
     command->setDefaultKeySequence(QKeySequence(tr("Alt+P,Alt+R")));
+#endif
     command->setDescription(tr("Revert File"));
     connect(m_revertFileAction, SIGNAL(triggered()), this, SLOT(revertCurrentFile()));
     mperforce->addAction(command);
@@ -343,7 +359,11 @@ bool PerforcePlugin::initialize(const QStringList & /* arguments */, QString *er
     m_diffProjectAction = new Utils::ParameterAction(diffProjectDefaultText, tr("Diff Project \"%1\""), Utils::ParameterAction::AlwaysEnabled, this);
     command = am->registerAction(m_diffProjectAction, CMD_ID_DIFF_PROJECT, globalcontext);
     command->setAttribute(Core::Command::CA_UpdateText);
+#ifdef Q_OS_MAC
+    command->setDefaultKeySequence(QKeySequence(tr("Meta+P,Meta+D")));
+#else
     command->setDefaultKeySequence(QKeySequence(tr("Alt+P,Alt+D")));
+#endif
     command->setDescription(diffProjectDefaultText);
     connect(m_diffProjectAction, SIGNAL(triggered()), this, SLOT(diffCurrentProject()));
     mperforce->addAction(command);
@@ -359,7 +379,11 @@ bool PerforcePlugin::initialize(const QStringList & /* arguments */, QString *er
     m_submitProjectAction = new Utils::ParameterAction(tr("Submit Project"), tr("Submit Project \"%1\""), Utils::ParameterAction::EnabledWithParameter, this);
     command = am->registerAction(m_submitProjectAction, CMD_ID_SUBMIT, globalcontext);
     command->setAttribute(Core::Command::CA_UpdateText);
+#ifdef Q_OS_MAC
+    command->setDefaultKeySequence(QKeySequence(tr("Meta+P,Meta+S")));
+#else
     command->setDefaultKeySequence(QKeySequence(tr("Alt+P,Alt+S")));
+#endif
     connect(m_submitProjectAction, SIGNAL(triggered()), this, SLOT(startSubmitProject()));
     mperforce->addAction(command);
     m_commandLocator->appendCommand(command);
@@ -397,7 +421,11 @@ bool PerforcePlugin::initialize(const QStringList & /* arguments */, QString *er
 
     m_openedAction = new QAction(tr("Opened"), this);
     command = am->registerAction(m_openedAction, CMD_ID_OPENED, globalcontext);
+#ifdef Q_OS_MAC
+    command->setDefaultKeySequence(QKeySequence(tr("Meta+P,Meta+O")));
+#else
     command->setDefaultKeySequence(QKeySequence(tr("Alt+P,Alt+O")));
+#endif
     connect(m_openedAction, SIGNAL(triggered()), this, SLOT(printOpenedFileList()));
     mperforce->addAction(command);
     m_commandLocator->appendCommand(command);

src/plugins/subversion/subversionplugin.cpp

@@ -309,7 +309,11 @@ bool SubversionPlugin::initialize(const QStringList & /*arguments */, QString *e
     command = ami->registerAction(m_diffCurrentAction,
         CMD_ID_DIFF_CURRENT, globalcontext);
     command->setAttribute(Core::Command::CA_UpdateText);
+#ifdef Q_OS_MAC
+    command->setDefaultKeySequence(QKeySequence(tr("Meta+S,Meta+D")));
+#else
     command->setDefaultKeySequence(QKeySequence(tr("Alt+S,Alt+D")));
+#endif
     connect(m_diffCurrentAction, SIGNAL(triggered()), this, SLOT(diffCurrentFile()));
     subversionMenu->addAction(command);
     m_commandLocator->appendCommand(command);
@@ -338,7 +342,11 @@ bool SubversionPlugin::initialize(const QStringList & /*arguments */, QString *e
     command = ami->registerAction(m_addAction, CMD_ID_ADD,
         globalcontext);
     command->setAttribute(Core::Command::CA_UpdateText);
+#ifdef Q_OS_MAC
+    command->setDefaultKeySequence(QKeySequence(tr("Meta+S,Meta+A")));
+#else
     command->setDefaultKeySequence(QKeySequence(tr("Alt+S,Alt+A")));
+#endif
     connect(m_addAction, SIGNAL(triggered()), this, SLOT(addCurrentFile()));
     subversionMenu->addAction(command);
     m_commandLocator->appendCommand(command);
@@ -347,7 +355,11 @@ bool SubversionPlugin::initialize(const QStringList & /*arguments */, QString *e
     command = ami->registerAction(m_commitCurrentAction,
         CMD_ID_COMMIT_CURRENT, globalcontext);
     command->setAttribute(Core::Command::CA_UpdateText);
+#ifdef Q_OS_MAC
+    command->setDefaultKeySequence(QKeySequence(tr("Meta+S,Meta+C")));
+#else
     command->setDefaultKeySequence(QKeySequence(tr("Alt+S,Alt+C")));
+#endif
     connect(m_commitCurrentAction, SIGNAL(triggered()), this, SLOT(startCommitCurrentFile()));
     subversionMenu->addAction(command);
     m_commandLocator->appendCommand(command);