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

vcsbase: allow custom init of client log editors

Browse Source 
VCSBaseClient provides similar initialization of log editors
as for diff editors

Change-Id: Ic4cae50de70ebf7235e216a6f86b9bbc507483b8
Merge-request: 351
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/2331
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
This commit is contained in:
cerf
2011-07-28 10:22:11 +00:00
committed by Tobias Hunger
parent c9fda1286a
commit c8178a5f5d
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/vcsbase/vcsbaseclient.cpp
View File

@@ -310,8 +310,6 @@ void VCSBaseClient::log(const QString &workingDir, const QStringList &files,
bool enableAnnotationContextMenu)
{
const QString vcsCmdString = vcsCommandString(LogCommand);
QStringList args;
args << vcsCmdString << logArguments(files, extraOptions);
const QString kind = vcsEditorKind(LogCommand);
const QString id = VCSBase::VCSBaseEditorWidget::getTitleId(workingDir, files);
const QString title = vcsEditorTitle(vcsCmdString, id);
@@ -321,6 +319,13 @@ void VCSBaseClient::log(const QString &workingDir, const QStringList &files,
vcsCmdString.toLatin1().constData(), id);
editor->setFileLogAnnotateEnabled(enableAnnotationContextMenu);
VCSBaseEditorParameterWidget *paramWidget = createLogEditor(workingDir, files, extraOptions);
if (paramWidget != 0)
editor->setConfigurationWidget(paramWidget);
QStringList args;
const QStringList paramArgs = paramWidget != 0 ? paramWidget->arguments() : QStringList();
args << vcsCmdString << logArguments(files, extraOptions + paramArgs);
QSharedPointer<VCSJob> job(new VCSJob(workingDir, args, editor));
enqueueJob(job);
}
@@ -481,6 +486,15 @@ VCSBaseEditorParameterWidget *VCSBaseClient::createDiffEditor(const QString &wor
return 0;
}
VCSBaseEditorParameterWidget *VCSBaseClient::createLogEditor(const QString &workingDir,
const QStringList &files,
const QStringList &extraOptions)
{
Q_UNUSED(workingDir);
Q_UNUSED(files);
Q_UNUSED(extraOptions);
return 0;
}
QString VCSBaseClient::vcsEditorTitle(const QString &vcsCmd, const QString &sourceId) const
{