Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
System
Dolphin
Commits
15baa936
Commit
15baa936
authored
Sep 25, 2020
by
Martin Tobias Holmedahl Sandsmark
Committed by
Elvis Angelaccio
Nov 01, 2020
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
make sure we use valid icons
parent
891ebf57
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
3 deletions
+24
-3
src/kitemviews/kfileitemlistview.cpp
src/kitemviews/kfileitemlistview.cpp
+11
-1
src/kitemviews/kfileitemmodel.cpp
src/kitemviews/kfileitemmodel.cpp
+9
-1
src/kitemviews/kfileitemmodelrolesupdater.cpp
src/kitemviews/kfileitemmodelrolesupdater.cpp
+4
-1
No files found.
src/kitemviews/kfileitemlistview.cpp
View file @
15baa936
...
...
@@ -17,6 +17,8 @@
#include <QGraphicsView>
#include <QPainter>
#include <QTimer>
#include <QIcon>
#include <QMimeDatabase>
// #define KFILEITEMLISTVIEW_DEBUG
...
...
@@ -168,6 +170,9 @@ QPixmap KFileItemListView::createDragPixmap(const KItemSet& indexes) const
QPixmap
pixmap
=
model
()
->
data
(
index
).
value
(
"iconPixmap"
).
value
<
QPixmap
>
();
if
(
pixmap
.
isNull
())
{
QIcon
icon
=
QIcon
::
fromTheme
(
model
()
->
data
(
index
).
value
(
"iconName"
).
toString
());
if
(
icon
.
isNull
())
{
icon
=
QIcon
::
fromTheme
(
"unknown"
);
}
if
(
!
icon
.
isNull
())
{
pixmap
=
icon
.
pixmap
(
size
,
size
);
}
else
{
...
...
@@ -210,7 +215,12 @@ void KFileItemListView::initializeItemListWidget(KItemListWidget* item)
KFileItemModel
*
fileItemModel
=
static_cast
<
KFileItemModel
*>
(
model
());
const
KFileItem
fileItem
=
fileItemModel
->
fileItem
(
item
->
index
());
data
.
insert
(
"iconName"
,
fileItem
.
iconName
());
QString
iconName
=
fileItem
.
iconName
();
if
(
!
QIcon
::
hasThemeIcon
(
iconName
))
{
QMimeDatabase
mimeDb
;
iconName
=
mimeDb
.
mimeTypeForName
(
fileItem
.
mimetype
()).
genericIconName
();
}
data
.
insert
(
"iconName"
,
iconName
);
item
->
setData
(
data
,
{
"iconName"
});
}
}
...
...
src/kitemviews/kfileitemmodel.cpp
View file @
15baa936
...
...
@@ -19,9 +19,11 @@
#include <QElapsedTimer>
#include <QMimeData>
#include <QMimeDatabase>
#include <QTimer>
#include <QWidget>
#include <QMutex>
#include <QIcon>
Q_GLOBAL_STATIC_WITH_ARGS
(
QMutex
,
s_collatorMutex
,
(
QMutex
::
Recursive
))
...
...
@@ -1657,7 +1659,13 @@ QHash<QByteArray, QVariant> KFileItemModel::retrieveData(const KFileItem& item,
}
if
(
item
.
isMimeTypeKnown
())
{
data
.
insert
(
sharedValue
(
"iconName"
),
item
.
iconName
());
QString
iconName
=
item
.
iconName
();
if
(
!
QIcon
::
hasThemeIcon
(
iconName
))
{
QMimeType
mimeType
=
QMimeDatabase
().
mimeTypeForName
(
item
.
mimetype
());
iconName
=
mimeType
.
genericIconName
();
}
data
.
insert
(
sharedValue
(
"iconName"
),
iconName
);
if
(
m_requestRole
[
TypeRole
])
{
data
.
insert
(
sharedValue
(
"type"
),
item
.
mimeComment
());
...
...
src/kitemviews/kfileitemmodelrolesupdater.cpp
View file @
15baa936
...
...
@@ -27,6 +27,7 @@
#endif
#include <QApplication>
#include <QIcon>
#include <QPainter>
#include <QElapsedTimer>
#include <QTimer>
...
...
@@ -1044,7 +1045,9 @@ bool KFileItemModelRolesUpdater::applyResolvedRoles(int index, ResolveHint hint)
data
=
rolesData
(
item
);
}
data
.
insert
(
"iconName"
,
item
.
iconName
());
if
(
QIcon
::
hasThemeIcon
(
item
.
iconName
()))
{
data
.
insert
(
"iconName"
,
item
.
iconName
());
}
if
(
m_clearPreviews
)
{
data
.
insert
(
"iconPixmap"
,
QPixmap
());
...
...
Méven Car
@meven
mentioned in merge request
!112 (merged)
·
Nov 15, 2020
mentioned in merge request
!112 (merged)
mentioned in merge request !112
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment