forked from qt-creator/qt-creator
Vcs: fix missing icons in SubmitFileModel
In SubmitFileModel, filetype icons are missing for not "overlaid" icons in Core::FileIconProvider. This is fixed by ensuring valid file paths are passed to QFileInfo. VcsBase::SubmitFileModel has now a "repositoryRoot" property so it can constructs absolute file paths. VcsBaseSubmitEditor::setFileModel() now relies on SubmitFileModel::repositoryRoot() instead of passing this info as annex parameter. Change-Id: Ie045c3a7b247a5b5d48d10aaaf67cb3fdcf9fa7e Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
@@ -64,6 +64,7 @@ void CommitEditor::setFields(const QFileInfo &repositoryRoot, const QString &bra
|
||||
mercurialWidget->setFields(repositoryRoot.absoluteFilePath(), branch, userName, email);
|
||||
|
||||
fileModel = new SubmitFileModel(this);
|
||||
fileModel->setRepositoryRoot(repositoryRoot.absoluteFilePath());
|
||||
|
||||
QStringList shouldTrack;
|
||||
|
||||
@@ -74,8 +75,7 @@ void CommitEditor::setFields(const QFileInfo &repositoryRoot, const QString &bra
|
||||
fileModel->addFile(item.file, item.flags, Unchecked);
|
||||
}
|
||||
|
||||
VcsBaseSubmitEditor::filterUntrackedFilesOfProject(repositoryRoot.absoluteFilePath(),
|
||||
&shouldTrack);
|
||||
VcsBaseSubmitEditor::filterUntrackedFilesOfProject(fileModel->repositoryRoot(), &shouldTrack);
|
||||
|
||||
foreach (const QString &track, shouldTrack) {
|
||||
foreach (const VcsBaseClient::StatusItem &item, repoStatus) {
|
||||
@@ -84,7 +84,7 @@ void CommitEditor::setFields(const QFileInfo &repositoryRoot, const QString &bra
|
||||
}
|
||||
}
|
||||
|
||||
setFileModel(fileModel, repositoryRoot.absoluteFilePath());
|
||||
setFileModel(fileModel);
|
||||
}
|
||||
|
||||
QString CommitEditor::committerInfo()
|
||||
|
||||
Reference in New Issue
Block a user