forked from qt-creator/qt-creator
Merge branch 'master' of ssh://codereview.qt-project.org/qt-creator/qt-creator
This commit is contained in:
@@ -33,7 +33,10 @@
|
|||||||
#include "submitfilemodel.h"
|
#include "submitfilemodel.h"
|
||||||
#include "vcsbaseconstants.h"
|
#include "vcsbaseconstants.h"
|
||||||
|
|
||||||
|
#include <coreplugin/fileiconprovider.h>
|
||||||
|
|
||||||
#include <QtGui/QStandardItem>
|
#include <QtGui/QStandardItem>
|
||||||
|
#include <QtCore/QFileInfo>
|
||||||
#include <QtCore/QDebug>
|
#include <QtCore/QDebug>
|
||||||
|
|
||||||
namespace VCSBase {
|
namespace VCSBase {
|
||||||
@@ -52,6 +55,7 @@ static QList<QStandardItem *> createFileRow(const QString &fileName, const QStri
|
|||||||
statusItem->setData(v);
|
statusItem->setData(v);
|
||||||
QStandardItem *fileItem = new QStandardItem(fileName);
|
QStandardItem *fileItem = new QStandardItem(fileName);
|
||||||
fileItem->setFlags(Qt::ItemIsSelectable|Qt::ItemIsEnabled);
|
fileItem->setFlags(Qt::ItemIsSelectable|Qt::ItemIsEnabled);
|
||||||
|
fileItem->setIcon(Core::FileIconProvider::instance()->icon(QFileInfo(fileName)));
|
||||||
QList<QStandardItem *> row;
|
QList<QStandardItem *> row;
|
||||||
row << statusItem << fileItem;
|
row << statusItem << fileItem;
|
||||||
return row;
|
return row;
|
||||||
@@ -154,4 +158,5 @@ unsigned SubmitFileModel::filter(const QStringList &filter, int column)
|
|||||||
qDebug() << Q_FUNC_INFO << " deleted " << rc << " items using " << filter << " , remaining " << rowCount();
|
qDebug() << Q_FUNC_INFO << " deleted " << rc << " items using " << filter << " , remaining " << rowCount();
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user