flameshot.pro: Install icons into $prefix/share/icons/hicolor/ instead of $prefix/share/pixmaps (#309)
* flameshot.pro: Install SVG icon into $prefix/share/icons/hicolor/scalable/apps instead of $prefix/share/pixmaps While #293 somehow solves the icon problem, it is not the best solution. According to Freedesktop.org Icon Theme Specification (https://specifications.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html): Directory Layout [...] By default, apps should look in $HOME/.icons (for backwards compatibility), in $XDG_DATA_DIRS/icons and in /usr/share/pixmaps (in that order). [...] In order to have a place for third party applications to install their icons there should always exist a theme called "hicolor". While using /pixmaps/ directory ensures the least priority in search icons, the directory name itself "pixmaps" does not suite our actual situation (provided that "flameshot.svg" is a scalable icon, not a *pixmap*). I suggest that we place this icon into the "hicolor" theme (aka fallback theme) in /icons/ directory under "scalable/apps/" subdirectory. Proposed changes: 1. Install flameshot.svg under $prefix/share/icons/hicolor/scalable/apps/ instad of $prefix/share/pixmaps/ . 2. Rename qmake "icon" target into "appsvgicon" target so that the name "icon" may still be used in the future for other tasks. 3. The embedded rpm spec file is updated accordingly. Signed-off-by: Boyuan Yang <073plan@gmail.com> * img/app/flameshot.png: Use 128x128 size instead of 100x100 Converted using inkscape: inkscape -z -e flameshot.png -w 128 -h 128 flameshot.svg * img: Add hicolor subdir for installation under /usr/share/icons/hicolor/* * flameshot.pro: Use wildcard to install hicolor icon dir The embedded rpm spec file is updated too.
This commit is contained in:
@@ -249,8 +249,8 @@ unix:!macx {
|
||||
dbus.path = $${PREFIX}/share/dbus-1/interfaces/
|
||||
dbus.files = dbus/org.dharkael.Flameshot.xml
|
||||
|
||||
icon.path = $${PREFIX}/share/pixmaps/
|
||||
icon.files = img/app/flameshot.svg
|
||||
icon.path = $${PREFIX}/share/icons/hicolor/
|
||||
icon.files = img/hicolor/*
|
||||
|
||||
completion.path = $${PREFIX}/share/bash-completion/completions/
|
||||
completion.files = docs/bash-completion/flameshot
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 5.4 KiB |
BIN
img/hicolor/128x128/apps/flameshot.png
Normal file
BIN
img/hicolor/128x128/apps/flameshot.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.4 KiB |
BIN
img/hicolor/48x48/apps/flameshot.png
Normal file
BIN
img/hicolor/48x48/apps/flameshot.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.0 KiB |
6
img/hicolor/scalable/apps/flameshot.svg
Normal file
6
img/hicolor/scalable/apps/flameshot.svg
Normal file
@@ -0,0 +1,6 @@
|
||||
<svg viewBox="0 0 64 64">
|
||||
<path d="M 32,0 C 49.7,0 64,14.3 64,32 64,49.7 49.7,64 32,64 14.3,64 0,49.7 0,32 0,14.3 14.3,0 32,0 Z" fill="#80a"/>
|
||||
<path d="M 34.301727,27.763661 C 52.85578,24.182344 53.568489,16.090526 53.568489,16.090526 c 0,0 -1.461162,25.077774 -15.020696,26.404551 -17.183092,1.681337 -19.750268,9.787479 -19.750268,9.787479 0,0 4.595184,-22.413228 15.504202,-24.518895 z" fill="#f06"/>
|
||||
<path d="M 23.106366,26.657235 C 38.827819,19.99904 37.387899,9.1374656 37.387899,9.1374656 c 0,0 8.679892,22.1582594 -4.332402,27.3240804 -14.536075,5.770754 -13.88928,15.62802 -13.88928,15.62802 0,0 -5.293267,-21.521885 3.940149,-25.432331 z" fill="#f60"/>
|
||||
<path d="m 13.844924,32.547713 c 8.832834,-11.647275 6.84612,-19.816349 6.84612,-19.816349 0,0 11.316725,14.190349 3.61602,22.979377 -8.602482,9.818252 -4.856061,16.648887 -4.856061,16.648887 0,0 -10.6722595,-13.131467 -5.606079,-19.811915 z" fill="#fc0"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 943 B |
@@ -54,7 +54,7 @@ make %{?_smp_mflags}
|
||||
%{_datadir}/flameshot/translations/Internationalization_*.qm
|
||||
%{_datadir}/applications/%{name}.desktop
|
||||
%{_datadir}/bash-completion/completions/%{name}
|
||||
%{_datadir}/pixmaps/%{name}.svg
|
||||
%{_datadir}/icons/hicolor
|
||||
|
||||
%changelog
|
||||
* Tue Jan 09 2018 Zetao Yang <yangzetao2015@outlook.com> - 0.5.0-1
|
||||
|
||||
Reference in New Issue
Block a user