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

Get rid of lots of ifdef Q_OS_MAC for shortcuts.

Browse Source 
Using a central enum now.

Change-Id: I20d88c9a3f8c62cf33e4b89a3442269f71918b06
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Eike Ziller
2012-05-23 13:25:51 +02:00
committed by hjk
parent 1a81c33e2f
commit 1781617f8e
22 changed files with 114 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/plugins/git/gitplugin.cpp
View File

@@ -328,33 +328,20 @@ 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.second->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+G,Meta+B") : tr("Alt+G,Alt+B")));
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.second->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+G,Meta+D") : tr("Alt+G,Alt+D")));
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
parameterActionCommand.second->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+G,Meta+L") : tr("Alt+G,Alt+L")));
// ------
gitContainer->addAction(createSeparator(actionManager, globalcontext, Core::Id("Git.Sep.File"), this));
@@ -363,11 +350,7 @@ 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.second->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+G,Meta+A") : tr("Alt+G,Alt+A")));
parameterActionCommand
= createFileAction(actionManager, gitContainer,
@@ -385,12 +368,7 @@ 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
parameterActionCommand.second->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+G,Meta+U") : tr("Alt+G,Alt+U")));
// ------------
gitContainer->addAction(createSeparator(actionManager, globalcontext, Core::Id("Git.Sep.Project"), this));
@@ -401,22 +379,14 @@ 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.second->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+G,Meta+Shift+D") : tr("Alt+G,Alt+Shift+D")));
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.second->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+G,Meta+K") : tr("Alt+G,Alt+K")));
parameterActionCommand
= createProjectAction(actionManager, gitContainer,
@@ -560,11 +530,7 @@ 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
actionCommand.second->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+G,Meta+C") : tr("Alt+G,Alt+C")));
createRepositoryAction(actionManager, gitContainer,
tr("Amend Last Commit..."), Core::Id("Git.AmendCommit"),