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

Git - Get changes actions dialog back to where it was

Browse Source 
This dialog was before, in QtCreator 2.7, used only for show. It was in
main git menu, and available always. Although a lot of new options were
added to the dialog, I think it is good to get it back to where it was
before, so that 2.7 users can find it easier.

Also, I prefer this location for it, since it is easier to access here.

Change-Id: I510ab0efb081194e70f6297125012034103e13e1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Petar Perisin
2013-06-04 22:38:09 +02:00
committed by Tobias Hunger
parent 6e2c3c4257
commit 7fffe3cef6
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -441,10 +441,6 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
tr("Interactive Rebase..."), Core::Id("Git.InteractiveRebase"), tr("Interactive Rebase..."), Core::Id("Git.InteractiveRebase"),
globalcontext, true, SLOT(startRebase())); globalcontext, true, SLOT(startRebase()));
createRepositoryAction(localRepositoryMenu,
tr("Change-related Actions..."), Core::Id("Git.ChangeRelatedActions"),
globalcontext, true, SLOT(startChangeRelatedAction()));
m_submoduleUpdateAction = m_submoduleUpdateAction =
createRepositoryAction(localRepositoryMenu, createRepositoryAction(localRepositoryMenu,
tr("Update Submodules"), Core::Id("Git.SubmoduleUpdate"), tr("Update Submodules"), Core::Id("Git.SubmoduleUpdate"),
@@ -650,6 +646,11 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
// -------------- // --------------
gitContainer->addSeparator(globalcontext); gitContainer->addSeparator(globalcontext);
QAction *changesAction = new QAction(tr("Actions on Commits..."), this);
Core::Command *changesCommand = Core::ActionManager::registerAction(changesAction, "Git.ChangeActions", globalcontext);
connect(changesAction, SIGNAL(triggered()), this, SLOT(startChangeRelatedAction()));
gitContainer->addAction(changesCommand);
QAction *repositoryAction = new QAction(tr("Create Repository..."), this); QAction *repositoryAction = new QAction(tr("Create Repository..."), this);
Core::Command *createRepositoryCommand = Core::ActionManager::registerAction(repositoryAction, "Git.CreateRepository", globalcontext); Core::Command *createRepositoryCommand = Core::ActionManager::registerAction(repositoryAction, "Git.CreateRepository", globalcontext);
connect(repositoryAction, SIGNAL(triggered()), this, SLOT(createRepository())); connect(repositoryAction, SIGNAL(triggered()), this, SLOT(createRepository()));