Adding SVG support for icons with automatic cache handling

See issue #3547 and #4803
This commit is contained in:
Hombre
2018-12-13 00:04:30 +01:00
parent 7ab3893b2b
commit 81407cd663
20 changed files with 196 additions and 289 deletions

View File

@@ -8,16 +8,9 @@ file(GLOB FONTS "fonts/*")
set(PROFILESDIR "profiles")
set(THEMEDIR "themes")
# Images, mostly icons, which are generated using the generatePngIcons script:
set(IMAGES_THEMED
"images/themed/png/1"
"images/themed/png/2"
)
# Other images which are generated manually:
file(GLOB IMAGES_NONTHEMED LIST_DIRECTORIES false "images/non-themed/png/*")
file(GLOB IMAGES_NONTHEMED_1 LIST_DIRECTORIES false "images/non-themed/png/1/*")
file(GLOB IMAGES_NONTHEMED_2 LIST_DIRECTORIES false "images/non-themed/png/2/*")
file(GLOB SVG_THEMED LIST_DIRECTORIES false "images/themed/svg/*")
if(WIN32)
set(OPTIONSFILE "options/options.win")
@@ -54,16 +47,10 @@ endif()
install(DIRECTORY ${PROFILESDIR} DESTINATION "${DATADIR}" FILES_MATCHING PATTERN "*.pp3")
install(DIRECTORY ${THEMEDIR} DESTINATION "${DATADIR}")
foreach(theme ${IMAGES_THEMED})
install(DIRECTORY ${theme} DESTINATION "${DATADIR}/images")
endforeach()
#install(DIRECTORY ${IMAGES_NONTHEMED} DESTINATION "${DATADIR}/images" FILES_MATCHING PATTERN "*.png")
#install(DIRECTORY ${IMAGES_NONTHEMED} DESTINATION "${DATADIR}/images/")
install(FILES ${IMAGES_NONTHEMED} DESTINATION "${DATADIR}/images")
install(FILES ${IMAGES_NONTHEMED_1} DESTINATION "${DATADIR}/images/1")
install(FILES ${IMAGES_NONTHEMED_2} DESTINATION "${DATADIR}/images/2")
install(FILES ${IMAGES_NONTHEMED} DESTINATION "${DATADIR}/images")
install(FILES ${SVG_THEMED} DESTINATION "${DATADIR}/images")
if(APPLE)
# CMake escapes first item quote character. Do not remove 'DUMMY_VARIABLE='