Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Plasma
Plasma Workspace
Commits
eea6810b
Commit
eea6810b
authored
Jun 11, 2020
by
Alexander Lohnau
💬
Browse files
Merge branch 'Plasma/5.19'
parents
eb736685
ba44b69a
Changes
2
Hide whitespace changes
Inline
Side-by-side
applets/kicker/plugin/appentry.cpp
View file @
eea6810b
...
...
@@ -28,6 +28,7 @@
#include
<QProcess>
#include
<QQmlPropertyMap>
#include
<QStandardPaths>
#include
<QFileInfo>
#if HAVE_X11
#include
<QX11Info>
#endif
...
...
@@ -91,7 +92,11 @@ bool AppEntry::isValid() const
QIcon
AppEntry
::
icon
()
const
{
if
(
m_icon
.
isNull
())
{
m_icon
=
QIcon
::
fromTheme
(
m_service
->
icon
(),
QIcon
::
fromTheme
(
QStringLiteral
(
"unknown"
)));
if
(
QFileInfo
::
exists
(
m_service
->
icon
()))
{
m_icon
=
QIcon
(
m_service
->
icon
());
}
else
{
m_icon
=
QIcon
::
fromTheme
(
m_service
->
icon
(),
QIcon
::
fromTheme
(
QStringLiteral
(
"unknown"
)));
}
}
return
m_icon
;
}
...
...
applets/kicker/plugin/recentusagemodel.cpp
View file @
eea6810b
...
...
@@ -221,7 +221,7 @@ QVariant RecentUsageModel::appData(const QString &resource, int role) const
return
AppEntry
::
nameFromService
(
service
,
AppEntry
::
NameOnly
);
}
}
else
if
(
role
==
Qt
::
DecorationRole
)
{
return
QIcon
::
fromTheme
(
service
->
icon
(),
QIcon
::
fromTheme
(
QStringLiteral
(
"unknown"
))
);
return
service
->
icon
(
);
}
else
if
(
role
==
Kicker
::
DescriptionRole
)
{
return
service
->
comment
();
}
else
if
(
role
==
Kicker
::
GroupRole
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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