Merge lp://staging/~3v1n0/appmenu-qt5/icons-user-cache-on-snap into lp://staging/appmenu-qt5

Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: 48
Merged at revision: 46
Proposed branch: lp://staging/~3v1n0/appmenu-qt5/icons-user-cache-on-snap
Merge into: lp://staging/appmenu-qt5
Prerequisite: lp://staging/~3v1n0/appmenu-qt5/x11-usertime-on-activate
Diff against target: 138 lines (+50/-13)
4 files modified
src/appmenuplatformmenubar.cpp (+14/-3)
src/appmenuplatformsystemtrayicon.cpp (+1/-1)
src/iconcache.cpp (+34/-7)
src/iconcache.h (+1/-2)
To merge this branch: bzr merge lp://staging/~3v1n0/appmenu-qt5/icons-user-cache-on-snap
Reviewer Review Type Date Requested Status
Lukáš Tinkl (community) Approve
Review via email:

Commit message

IconCache: get the proper theme path based on the fact we're using a themed icon or not

If an app uses QIcon::fromTheme then we only have the icon name of it,
and thus we need to return a valid icon theme path. Now, it's not possible
to return the whole list of dirs, so we just fallback to the home icons
older, so that users might in case add icons there.

In $SNAP world, when using desktop-launcher ~/.local/share/icons also
contains all the themes in from /usr/share/icons and potentially more
(depending on the wrapper used for launching) so, we can be quite flexible
with it.

Also when running in a snap, save icons in $XDG_CACHE_HOME or in the user
cache, but still in an indicator readable location

Description of the change

To post a comment you must log in.
48. By Marco Trevisan (Treviño)

IconCache: try to get $XDG_DATA_HOME as base icon folders

Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

LGTM, works fine

review: Approve
49. By Marco Trevisan (Treviño)

Merging with lp:~3v1n0/appmenu-qt5/avoid-x11-calls-in-other-envs

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.


People subscribed via source and target branches