Fix hicolor theme application icon names
Fixed-size icons were not available as org.freecad.FreeCAD and XDGData/org.freecad.FreeCAD.svg was a duplicate of Gui/Icons/freecad.svg.
This commit is contained in:
@@ -1314,11 +1314,11 @@ else(WIN32)
|
||||
# Icons/freecad-doc.png
|
||||
# DESTINATION ${CMAKE_INSTALL_DATADIR}
|
||||
#)
|
||||
INSTALL(FILES Icons/freecad-icon-16.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/16x16/apps RENAME freecad.png)
|
||||
INSTALL(FILES Icons/freecad-icon-32.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/32x32/apps RENAME freecad.png)
|
||||
INSTALL(FILES Icons/freecad-icon-48.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/48x48/apps RENAME freecad.png)
|
||||
INSTALL(FILES Icons/freecad-icon-64.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/64x64/apps RENAME freecad.png)
|
||||
INSTALL(FILES Icons/freecad.svg DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps)
|
||||
INSTALL(FILES Icons/freecad-icon-16.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/16x16/apps RENAME org.freecad.FreeCAD.png)
|
||||
INSTALL(FILES Icons/freecad-icon-32.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/32x32/apps RENAME org.freecad.FreeCAD.png)
|
||||
INSTALL(FILES Icons/freecad-icon-48.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/48x48/apps RENAME org.freecad.FreeCAD.png)
|
||||
INSTALL(FILES Icons/freecad-icon-64.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/64x64/apps RENAME org.freecad.FreeCAD.png)
|
||||
INSTALL(FILES Icons/freecad.svg DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps RENAME org.freecad.FreeCAD.svg)
|
||||
INSTALL(FILES Icons/freecad.xpm DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pixmaps)
|
||||
INSTALL(FILES Icons/freecad-doc.svg DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/mimetypes RENAME application-x-extension-fcstd.svg)
|
||||
endif(WIN32)
|
||||
|
||||
@@ -7,9 +7,9 @@ Installation:
|
||||
and must have execution rights
|
||||
"$ sudo chmod +x /usr/bin/freecad-thumbnailer"
|
||||
|
||||
- If a FreeCAD project file doesn't include a thumbnail the file freecad.png is used.
|
||||
- If a FreeCAD project file doesn't include a thumbnail the file org.freecad.FreeCAD.png is used.
|
||||
Thus, the file src/Gui/Icons/freecad-icon-48.png must be installed.
|
||||
"$ sudo cp freecad-icon-48.png /usr/share/icons/hicolor/48x48/apps/freecad.png"
|
||||
"$ sudo cp freecad-icon-48.png /usr/share/icons/hicolor/48x48/apps/org.freecad.FreeCAD.png"
|
||||
|
||||
- The application/x-extension-fcstd MIME type should be registered
|
||||
Check that a corresponding /usr/share/mime/packages/freecad.xml file exists
|
||||
@@ -54,7 +54,7 @@ try:
|
||||
image = zfile.read(image)
|
||||
else:
|
||||
# apps should have at least 48x48 icons
|
||||
freecad = open("/usr/share/icons/hicolor/48x48/apps/freecad.png", "rb")
|
||||
freecad = open("/usr/share/icons/hicolor/48x48/apps/org.freecad.FreeCAD.png", "rb")
|
||||
image = freecad.read()
|
||||
|
||||
# Write icon to output_file
|
||||
|
||||
@@ -29,11 +29,6 @@ install(
|
||||
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications
|
||||
)
|
||||
|
||||
install(
|
||||
FILES org.freecad.FreeCAD.svg
|
||||
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps
|
||||
)
|
||||
|
||||
install(
|
||||
FILES org.freecad.FreeCAD.xml
|
||||
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/mime/packages
|
||||
|
||||
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 11 KiB |
Reference in New Issue
Block a user