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

Vcs: fix missing icons in SubmitFileModel

Browse Source 
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:
Hugues Delorme
2015-03-09 17:10:25 +01:00
parent b1a71f7b96
commit 20a0b97e82
9 changed files with 43 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/plugins/vcsbase/submitfilemodel.cpp
View File

@@ -45,8 +45,11 @@ namespace VcsBase {
enum { fileColumn = 1 };
static QList<QStandardItem *> createFileRow(const QString &fileName, const QString &status,
CheckMode checked, const QVariant &v)
static QList<QStandardItem *> createFileRow(const QString &repositoryRoot,
const QString &fileName,
const QString &status,
CheckMode checked,
const QVariant &v)
{
auto statusItem = new QStandardItem(status);
Qt::ItemFlags flags = Qt::ItemIsSelectable | Qt::ItemIsEnabled;
@@ -58,7 +61,11 @@ static QList<QStandardItem *> createFileRow(const QString &fileName, const QStri
statusItem->setData(v);
auto fileItem = new QStandardItem(fileName);
fileItem->setFlags(Qt::ItemIsSelectable|Qt::ItemIsEnabled);
fileItem->setIcon(Core::FileIconProvider::icon(fileName));
// For some reason, Windows (at least) requires a valid (existing) file path to the icon, so
// the repository root is needed here.
// Note: for "overlaid" icons in Core::FileIconProvider a valid file path is not required
const QFileInfo fi(repositoryRoot + QLatin1Char('/') + fileName);
fileItem->setIcon(Core::FileIconProvider::icon(fi));
QList<QStandardItem *> row;
row << statusItem << fileItem;
return row;
@@ -86,10 +93,20 @@ SubmitFileModel::SubmitFileModel(QObject *parent) :
setHorizontalHeaderLabels(headerLabels);
}
const QString &SubmitFileModel::repositoryRoot() const
{
return m_repositoryRoot;
}
void SubmitFileModel::setRepositoryRoot(const QString &repoRoot)
{
m_repositoryRoot = repoRoot;
}
QList<QStandardItem *> SubmitFileModel::addFile(const QString &fileName, const QString &status, CheckMode checkMode,
const QVariant &v)
{
const QList<QStandardItem *> row = createFileRow(fileName, status, checkMode, v);
const QList<QStandardItem *> row = createFileRow(m_repositoryRoot, fileName, status, checkMode, v);
appendRow(row);
return row;
}