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

Git - added dummy locator actions

Browse Source 
for Merge, Rebase, Show, Cherry Pick, Revert and Checkout.

Task-number: QTCREATORBUG-9405
Change-Id: I9a10d93382248ca86fe566bf1dccf4d390601aaf
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Petar Perisin
2013-05-29 22:01:10 +02:00
committed by Tobias Hunger
parent 8762dd2ea9
commit 2b903b46d3
1 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -233,7 +233,8 @@ ActionCommandPair
{
QAction *action = new QAction(text, this);
Core::Command *command = Core::ActionManager::registerAction(action, id, context);
ac->addAction(command);
if (ac)
ac->addAction(command);
m_repositoryActions.push_back(action);
if (addToLocator)
m_commandLocator->appendCommand(command);
@@ -439,7 +440,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
globalcontext, false, SLOT(resetRepository()));
createRepositoryAction(localRepositoryMenu,
tr("Interactive Rebase..."), Core::Id("Git.Rebase"),
tr("Interactive Rebase..."), Core::Id("Git.InteractiveRebase"),
globalcontext, true, SLOT(startRebase()));
createRepositoryAction(localRepositoryMenu,
@@ -591,6 +592,29 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
// --------------
/* Actions only in locator */
createRepositoryAction(0, tr("Show..."), Core::Id("Git.Show"),
globalcontext, true, SLOT(startChangeRelatedAction()));
createRepositoryAction(0, tr("Revert..."), Core::Id("Git.Revert"),
globalcontext, true, SLOT(startChangeRelatedAction()));
createRepositoryAction(0, tr("Cherry Pick..."), Core::Id("Git.CherryPick"),
globalcontext, true, SLOT(startChangeRelatedAction()));
createRepositoryAction(0, tr("Checkout..."), Core::Id("Git.Checkout"),
globalcontext, true, SLOT(startChangeRelatedAction()));
createRepositoryAction(0, tr("Rebase..."), Core::Id("Git.Rebase"),
globalcontext, true, SLOT(branchList()));
createRepositoryAction(0, tr("Merge..."), Core::Id("Git.Merge"),
globalcontext, true, SLOT(branchList()));
/* \Actions only in locator */
// --------------
/* "Git Tools" menu */
Core::ActionContainer *gitToolsMenu = Core::ActionManager::createMenu(Core::Id("Git.GitToolsMenu"));
gitToolsMenu->menu()->setTitle(tr("Git &Tools"));