diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2012-12-05 11:49:50 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-12-06 17:14:51 +0100 |
| commit | e85533ffe42b04d772358d1fb403e0bea4312616 (patch) | |
| tree | bd8df623cc64385aecd86b82328f019eb61d10bd /src/plugins/locator/locatorwidget.cpp | |
| parent | 82a8e9bb86815ba3ad3665082ac6e55d41721187 (diff) | |
Locator: Fix icon for files/directories ending with "[+:][0-9]*"
They didn't have an icon at all on Mac/Win. On Linux, directories
had the default file icon, and files that matched a registered
mimetype (like .c++) didn't get the mimetype icon.
Change-Id: I57875a2743e6499fd4aabba70b95907b5ab8ac01
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Diffstat (limited to 'src/plugins/locator/locatorwidget.cpp')
| -rw-r--r-- | src/plugins/locator/locatorwidget.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/plugins/locator/locatorwidget.cpp b/src/plugins/locator/locatorwidget.cpp index 343b1e7cd8..dc03c2a517 100644 --- a/src/plugins/locator/locatorwidget.cpp +++ b/src/plugins/locator/locatorwidget.cpp @@ -187,11 +187,9 @@ QVariant LocatorModel::data(const QModelIndex &index, int role) const + QLatin1String("\n\n") + mEntries.at(index.row()).extraInfo); } else if (role == Qt::DecorationRole && index.column() == 0) { FilterEntry &entry = mEntries[index.row()]; - if (entry.resolveFileIcon && entry.displayIcon.isNull()) { - entry.resolveFileIcon = false; - QString path = entry.internalData.toString(); - Core::EditorManager::splitLineNumber(&path); - entry.displayIcon = Core::FileIconProvider::instance()->icon(QFileInfo(path)); + if (!entry.fileIconResolved && !entry.fileName.isEmpty() && entry.displayIcon.isNull()) { + entry.fileIconResolved = true; + entry.displayIcon = Core::FileIconProvider::instance()->icon(QFileInfo(entry.fileName)); } return entry.displayIcon; } else if (role == Qt::ForegroundRole && index.column() == 1) { |