Refactor and fix icon locations #27

Merged

philm merged 1 commit from unknown repository into master

2018-04-22 11:18:42 +00:00

philm commented

2018-04-21 14:41:30 +00:00

(Migrated from gitlab2.manjaro.org)

Created by: jonathonf

This refactors out the duplicated desktop launchers, replacing them with a template which is used by the Makefile to generate a launcher for each application.

It also fixes the default icon installation location to remove the implicit dependency on hicolor-icon-theme and place them in the default icon search path.

Packagers could use e.g. imagemagick to rescale the 1024x1024 icon and install smaller icons into the appropriate hicolor icon locations.

*Created by: jonathonf* This refactors out the duplicated desktop launchers, replacing them with a template which is used by the Makefile to generate a launcher for each application. It also fixes the default icon installation location to remove the implicit dependency on `hicolor-icon-theme` and place them in the default icon search path. Packagers could use e.g. imagemagick to rescale the 1024x1024 icon and install smaller icons into the appropriate hicolor icon locations.

philm commented

2018-04-22 04:38:19 +00:00

(Migrated from gitlab2.manjaro.org)

Created by: eli-schwartz

Note that "hicolor-icon-theme" just creates some directories, but the underlying DE machinery which handles desktop files should handle icon detection just fine regardless, while hardcoding the path means said machinery will be unable to implement the Icon Theme Specification as described in: https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#key-icon

If you're not going to install it as part of the hicolor theme, you should use /usr/share/pixmaps/ at least, which still allows non-hardcoded paths and uses pixmaps only as a fallback if there is no themed version (which I guess there will not be by default).

*Created by: eli-schwartz* Note that "hicolor-icon-theme" just creates some directories, but the underlying DE machinery which handles desktop files should handle icon detection just fine regardless, while hardcoding the path means said machinery will be unable to implement the Icon Theme Specification as described in: https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#key-icon If you're not going to install it as part of the hicolor theme, you should use `/usr/share/pixmaps/` at least, which still allows non-hardcoded paths and uses pixmaps only as a fallback if there is no themed version (which I guess there will not be by default).

philm commented

2018-04-22 05:44:07 +00:00

(Migrated from gitlab2.manjaro.org)

Created by: philmmanjaro

@eli-schwartz: not needed. I had the problem not having any icon at all. With @jonathonf solution, which we also used in the past it works. When an icon set has the needed icons, their icons now get used, otherwise our shipped icons kick in.

*Created by: philmmanjaro* @eli-schwartz: not needed. I had the problem not having any icon at all. With @jonathonf solution, which we also used in the past it works. When an icon set has the needed icons, their icons now get used, otherwise our shipped icons kick in.

philm commented

2018-04-22 10:57:10 +00:00

(Migrated from gitlab2.manjaro.org)

Created by: jonathonf

I'd normally put icons in /usr/share/pixmaps but I may have misread https://specifications.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html#directory_layout and thought that $XDG_DATA_DIRS/icons (which includes /usr/share/icons) was the "correct" place. I don't think it makes any practical difference, so /usr/share/pixmaps sounds like the better place to put a single icon size.

Edit: opened https://github.com/manjaro/ms-office-online-launcher/pull/5.

*Created by: jonathonf* I'd normally put icons in `/usr/share/pixmaps` but I may have misread https://specifications.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html#directory_layout and thought that `$XDG_DATA_DIRS/icons` (which includes `/usr/share/icons`) was the "correct" place. I don't think it makes any practical difference, so `/usr/share/pixmaps` sounds like the better place to put a single icon size. Edit: opened https://github.com/manjaro/ms-office-online-launcher/pull/5.

Commenting is not possible because the repository is archived.

No reviewers