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

VCS: Rework disabling of ambiguous actions

Browse Source 
Task-number: QTCREATORBUG-13364
Change-Id: Ib9dc98964983f1a2808a89d90969089a09d2b55e
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2014-11-16 12:05:34 +02:00
committed by Orgad Shaneh
parent 17c92cdeef
commit a4b4728267
19 changed files with 234 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/vcsbase/vcsbaseplugin.cpp
View File

@@ -529,6 +529,7 @@ public:
QPointer<VcsBaseSubmitEditor> m_submitEditor;
Core::IVersionControl *m_versionControl;
Core::Context m_context;
VcsBasePluginState m_state;
int m_actionState;
@@ -558,9 +559,10 @@ VcsBasePlugin::~VcsBasePlugin()
delete d;
}
void VcsBasePlugin::initializeVcs(Core::IVersionControl *vc)
void VcsBasePlugin::initializeVcs(Core::IVersionControl *vc, const Core::Context &context)
{
d->m_versionControl = vc;
d->m_context = context;
addAutoReleasedObject(vc);
Internal::VcsPlugin *plugin = Internal::VcsPlugin::instance();
@@ -609,6 +611,7 @@ void VcsBasePlugin::slotStateChanged(const VcsBase::Internal::State &newInternal
if (!d->m_state.equals(newInternalState)) {
d->m_state.setState(newInternalState);
updateActions(VcsEnabled);
Core::ICore::addAdditionalContext(d->m_context);
}
} else {
// Some other VCS plugin or state changed: Reset us to empty state.
@@ -619,6 +622,7 @@ void VcsBasePlugin::slotStateChanged(const VcsBase::Internal::State &newInternal
d->m_state = emptyState;
updateActions(newActionState);
}
Core::ICore::removeAdditionalContext(d->m_context);
}
}