From 71260c3167c5faf35ad07bee01aedc1c0b7381c8 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 23 May 2012 14:02:36 +0200 Subject: [PATCH] Mac: Avoid more Opt+ shortcuts. Change-Id: I1f2ae70ed8b184be6d1467642924289af1b535a9 Reviewed-by: Bradley T. Hughes Reviewed-by: Eike Ziller --- src/plugins/bookmarks/bookmarkmanager.cpp | 3 ++- src/plugins/coreplugin/editormanager/openeditorsview.cpp | 3 ++- src/plugins/fakevim/fakevimplugin.cpp | 4 ++-- src/plugins/macros/macrosplugin.cpp | 2 +- src/plugins/projectexplorer/foldernavigationwidget.cpp | 3 ++- src/plugins/projectexplorer/projecttreewidget.cpp | 3 ++- src/plugins/texteditor/texteditoractionhandler.cpp | 4 ++-- 7 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/plugins/bookmarks/bookmarkmanager.cpp b/src/plugins/bookmarks/bookmarkmanager.cpp index 5a4f974a4f1..39006f1fe64 100644 --- a/src/plugins/bookmarks/bookmarkmanager.cpp +++ b/src/plugins/bookmarks/bookmarkmanager.cpp @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include @@ -784,7 +785,7 @@ Id BookmarkViewFactory::id() const QKeySequence BookmarkViewFactory::activationSequence() const { - return QKeySequence(Qt::ALT + Qt::Key_M); + return QKeySequence(Core::UseMacShortcuts ? tr("Alt+Meta+M") : tr("Alt+M")); } Core::NavigationView BookmarkViewFactory::createWidget() diff --git a/src/plugins/coreplugin/editormanager/openeditorsview.cpp b/src/plugins/coreplugin/editormanager/openeditorsview.cpp index 3b03f0c60a1..ad8e5060a15 100644 --- a/src/plugins/coreplugin/editormanager/openeditorsview.cpp +++ b/src/plugins/coreplugin/editormanager/openeditorsview.cpp @@ -41,6 +41,7 @@ #include #include #include +#include #include #include @@ -240,7 +241,7 @@ Core::Id OpenEditorsViewFactory::id() const QKeySequence OpenEditorsViewFactory::activationSequence() const { - return QKeySequence(Qt::ALT + Qt::Key_O); + return QKeySequence(Core::UseMacShortcuts ? tr("Meta+O") : tr("Alt+O")); } OpenEditorsViewFactory::OpenEditorsViewFactory() diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp index fbb1c559112..3eaa09d10a1 100644 --- a/src/plugins/fakevim/fakevimplugin.cpp +++ b/src/plugins/fakevim/fakevimplugin.cpp @@ -970,7 +970,7 @@ bool FakeVimPluginPrivate::initialize() Core::Command *cmd = 0; cmd = actionManager->registerAction(theFakeVimSetting(ConfigUseFakeVim), Constants::INSTALL_HANDLER, globalcontext, true); - cmd->setDefaultKeySequence(QKeySequence(tr("Alt+V,Alt+V"))); + cmd->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+V,Meta+V") : tr("Alt+V,Alt+V"))); ActionContainer *advancedMenu = actionManager->actionContainer(Core::Constants::M_EDIT_ADVANCED); @@ -982,7 +982,7 @@ bool FakeVimPluginPrivate::initialize() act->setData(i); QString id = QString("FakeVim.UserAction%1").arg(i); cmd = actionManager->registerAction(act, Core::Id(id), globalcontext); - cmd->setDefaultKeySequence(QKeySequence(tr("Alt+V,%1").arg(i))); + cmd->setDefaultKeySequence(QKeySequence((Core::UseMacShortcuts ? tr("Meta+V,%1") : tr("Alt+V,%1")).arg(i))); connect(act, SIGNAL(triggered()), SLOT(userActionTriggered())); } diff --git a/src/plugins/macros/macrosplugin.cpp b/src/plugins/macros/macrosplugin.cpp index 374bbb16b90..85d9ffa9ac8 100644 --- a/src/plugins/macros/macrosplugin.cpp +++ b/src/plugins/macros/macrosplugin.cpp @@ -101,7 +101,7 @@ bool MacrosPlugin::initialize(const QStringList &arguments, QString *errorMessag QAction *executeLastMacro = new QAction(tr("Play Last Macro"), this); command = am->registerAction(executeLastMacro, Constants::EXECUTE_LAST_MACRO, textContext); - command->setDefaultKeySequence(QKeySequence(tr("Alt+R"))); + command->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+R") : tr("Alt+R"))); mmacrotools->addAction(command); connect(executeLastMacro, SIGNAL(triggered()), m_macroManager, SLOT(executeLastMacro())); diff --git a/src/plugins/projectexplorer/foldernavigationwidget.cpp b/src/plugins/projectexplorer/foldernavigationwidget.cpp index 8f5dc948992..6d8dce069e7 100644 --- a/src/plugins/projectexplorer/foldernavigationwidget.cpp +++ b/src/plugins/projectexplorer/foldernavigationwidget.cpp @@ -36,6 +36,7 @@ #include +#include #include #include #include @@ -408,7 +409,7 @@ Core::Id FolderNavigationWidgetFactory::id() const QKeySequence FolderNavigationWidgetFactory::activationSequence() const { - return QKeySequence(Qt::ALT + Qt::Key_Y); + return QKeySequence(Core::UseMacShortcuts ? tr("Meta+Y") : tr("Alt+Y")); } Core::NavigationView FolderNavigationWidgetFactory::createWidget() diff --git a/src/plugins/projectexplorer/projecttreewidget.cpp b/src/plugins/projectexplorer/projecttreewidget.cpp index 6d34939e0a0..d0043c22617 100644 --- a/src/plugins/projectexplorer/projecttreewidget.cpp +++ b/src/plugins/projectexplorer/projecttreewidget.cpp @@ -39,6 +39,7 @@ #include "projectexplorerconstants.h" #include "projectmodels.h" +#include #include #include #include @@ -412,7 +413,7 @@ Core::Id ProjectTreeWidgetFactory::id() const QKeySequence ProjectTreeWidgetFactory::activationSequence() const { - return QKeySequence(Qt::ALT + Qt::Key_X); + return QKeySequence(Core::UseMacShortcuts ? tr("Meta+X") : tr("Alt+X")); } Core::NavigationView ProjectTreeWidgetFactory::createWidget() diff --git a/src/plugins/texteditor/texteditoractionhandler.cpp b/src/plugins/texteditor/texteditoractionhandler.cpp index 269d67d32ac..e8aab45cb1e 100644 --- a/src/plugins/texteditor/texteditoractionhandler.cpp +++ b/src/plugins/texteditor/texteditoractionhandler.cpp @@ -358,13 +358,13 @@ void TextEditorActionHandler::createActions() m_upperCaseSelectionAction = new QAction(tr("Uppercase Selection"), this); m_modifyingActions << m_upperCaseSelectionAction; command = am->registerAction(m_upperCaseSelectionAction, Constants::UPPERCASE_SELECTION, m_contextId, true); - command->setDefaultKeySequence(QKeySequence(tr("Alt+Shift+U"))); + command->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+Shift+U") : tr("Alt+Shift+U"))); connect(m_upperCaseSelectionAction, SIGNAL(triggered()), this, SLOT(uppercaseSelection())); m_lowerCaseSelectionAction = new QAction(tr("Lowercase Selection"), this); m_modifyingActions << m_lowerCaseSelectionAction; command = am->registerAction(m_lowerCaseSelectionAction, Constants::LOWERCASE_SELECTION, m_contextId, true); - command->setDefaultKeySequence(QKeySequence(tr("Alt+U"))); + command->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+U") : tr("Alt+U"))); connect(m_lowerCaseSelectionAction, SIGNAL(triggered()), this, SLOT(lowercaseSelection())); m_circularPasteAction = new QAction(tr("Paste from Clipboard History"), this);