Merged with dev, resolved conflicts, fixes to icon refs

rtdata/CMakeLists.txt

@@ -1,4 +1,3 @@
-
 file(GLOB LANGUAGEFILES "languages/*")
 file(GLOB SOUNDFILES "sounds/*")
 file(GLOB INPUTICCFILES "iccprofiles/input/*")
@@ -7,11 +6,17 @@ file(GLOB DCPFILES "dcpprofiles/*")
 file(GLOB FONTS "fonts/*")
 
 set(PROFILESDIR "profiles")
-set(IMAGESDIR "images")
-
-# THEMEDIR includes subfolders for image resources for some themes; doing the normal glob won't work.
 set(THEMEDIR "themes")
 
+# Images, mostly icons, which are generated using the generatePngIcons script:
+set(IMAGES_THEMED
+    "images/themed/png/dark"
+    "images/themed/png/light"
+    )
+
+# Other images which are generated manually:
+file(GLOB IMAGES_NONTHEMED "images/non-themed/png/*")
+
 if(WIN32)
     set(OPTIONSFILE "options/options.win")
 elseif(APPLE)
@@ -25,17 +30,15 @@ if(WIN32)
 endif()
 
 if(UNIX)
-    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/icons/rawtherapee.desktop.in" "${CMAKE_CURRENT_BINARY_DIR}/rawtherapee.desktop")
+    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/rawtherapee.desktop.in" "${CMAKE_CURRENT_BINARY_DIR}/rawtherapee.desktop")
     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/rawtherapee.desktop" DESTINATION ${DESKTOPDIR})
-    install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi16-app-rawtherapee.png" DESTINATION "${ICONSDIR}/hicolor/16x16/apps" RENAME rawtherapee.png)
-    install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi24-app-rawtherapee.png" DESTINATION "${ICONSDIR}/hicolor/24x24/apps" RENAME rawtherapee.png)
-    install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi32-app-rawtherapee.png" DESTINATION "${ICONSDIR}/hicolor/32x32/apps" RENAME rawtherapee.png)
-    install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi48-app-rawtherapee.png" DESTINATION "${ICONSDIR}/hicolor/48x48/apps" RENAME rawtherapee.png)
-    install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi128-app-rawtherapee.png" DESTINATION "${ICONSDIR}/hicolor/128x128/apps" RENAME rawtherapee.png)
-    install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi256-app-rawtherapee.png" DESTINATION "${ICONSDIR}/hicolor/256x256/apps" RENAME rawtherapee.png)
+    install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/images/non-themed/png/rawtherapee-logo-16.png" DESTINATION "${ICONSDIR}/hicolor/16x16/apps" RENAME rawtherapee.png)
+    install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/images/non-themed/png/rawtherapee-logo-24.png" DESTINATION "${ICONSDIR}/hicolor/24x24/apps" RENAME rawtherapee.png)
+    install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/images/non-themed/png/rawtherapee-logo-48.png" DESTINATION "${ICONSDIR}/hicolor/48x48/apps" RENAME rawtherapee.png)
+    install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/images/non-themed/png/rawtherapee-logo-128.png" DESTINATION "${ICONSDIR}/hicolor/128x128/apps" RENAME rawtherapee.png)
+    install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/images/non-themed/png/rawtherapee-logo-256.png" DESTINATION "${ICONSDIR}/hicolor/256x256/apps" RENAME rawtherapee.png)
 endif()
 
-install(FILES ${IMAGEFILES} DESTINATION "${DATADIR}/images")
 install(FILES ${LANGUAGEFILES} DESTINATION "${DATADIR}/languages")
 install(FILES ${SOUNDFILES} DESTINATION "${DATADIR}/sounds")
 install(FILES ${INPUTICCFILES} DESTINATION "${DATADIR}/iccprofiles/input")
@@ -48,8 +51,14 @@ endif()
 
 install(DIRECTORY ${PROFILESDIR} DESTINATION "${DATADIR}" FILES_MATCHING PATTERN "*.pp3")
 install(DIRECTORY ${THEMEDIR} DESTINATION "${DATADIR}")
-install(DIRECTORY ${IMAGESDIR} DESTINATION "${DATADIR}" FILES_MATCHING PATTERN "index.theme")
-install(DIRECTORY ${IMAGESDIR} DESTINATION "${DATADIR}" FILES_MATCHING PATTERN "*.png")
+
+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")
 
 if(APPLE)
     # CMake escapes first item quote character. Do not remove 'DUMMY_VARIABLE='