diff --git a/rtdata/CMakeLists.txt b/rtdata/CMakeLists.txt index f8efa1523..526f58ba3 100644 --- a/rtdata/CMakeLists.txt +++ b/rtdata/CMakeLists.txt @@ -10,12 +10,14 @@ set(THEMEDIR "themes") # Images, mostly icons, which are generated using the generatePngIcons script: set(IMAGES_THEMED - "images/themed/png/dark" - "images/themed/png/light" + "images/themed/png/1" + "images/themed/png/2" ) # Other images which are generated manually: -file(GLOB IMAGES_NONTHEMED "images/non-themed/png/*") +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/*") if(WIN32) set(OPTIONSFILE "options/options.win") @@ -58,7 +60,10 @@ 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} DESTINATION "${DATADIR}/images") + +install(FILES ${IMAGES_NONTHEMED_1} DESTINATION "${DATADIR}/images/1") +install(FILES ${IMAGES_NONTHEMED_2} DESTINATION "${DATADIR}/images/2") if(APPLE) # CMake escapes first item quote character. Do not remove 'DUMMY_VARIABLE=' diff --git a/rtdata/images/non-themed/png/splash.png b/rtdata/images/non-themed/png/1/splash.png similarity index 100% rename from rtdata/images/non-themed/png/splash.png rename to rtdata/images/non-themed/png/1/splash.png diff --git a/rtdata/images/non-themed/png/2/splash.png b/rtdata/images/non-themed/png/2/splash.png new file mode 100644 index 000000000..c6e866a81 Binary files /dev/null and b/rtdata/images/non-themed/png/2/splash.png differ diff --git a/rtdata/images/themed/png/dark/add-small.png b/rtdata/images/themed/png/1/dark/add-small.png similarity index 100% rename from rtdata/images/themed/png/dark/add-small.png rename to rtdata/images/themed/png/1/dark/add-small.png diff --git a/rtdata/images/themed/png/dark/add.png b/rtdata/images/themed/png/1/dark/add.png similarity index 100% rename from rtdata/images/themed/png/dark/add.png rename to rtdata/images/themed/png/1/dark/add.png diff --git a/rtdata/images/themed/png/dark/aperture.png b/rtdata/images/themed/png/1/dark/aperture.png similarity index 100% rename from rtdata/images/themed/png/dark/aperture.png rename to rtdata/images/themed/png/1/dark/aperture.png diff --git a/rtdata/images/themed/png/dark/arrow-down-small.png b/rtdata/images/themed/png/1/dark/arrow-down-small.png similarity index 100% rename from rtdata/images/themed/png/dark/arrow-down-small.png rename to rtdata/images/themed/png/1/dark/arrow-down-small.png diff --git a/rtdata/images/themed/png/dark/arrow-left-small.png b/rtdata/images/themed/png/1/dark/arrow-left-small.png similarity index 100% rename from rtdata/images/themed/png/dark/arrow-left-small.png rename to rtdata/images/themed/png/1/dark/arrow-left-small.png diff --git a/rtdata/images/themed/png/dark/arrow-right-small.png b/rtdata/images/themed/png/1/dark/arrow-right-small.png similarity index 100% rename from rtdata/images/themed/png/dark/arrow-right-small.png rename to rtdata/images/themed/png/1/dark/arrow-right-small.png diff --git a/rtdata/images/themed/png/dark/arrow-up-small.png b/rtdata/images/themed/png/1/dark/arrow-up-small.png similarity index 100% rename from rtdata/images/themed/png/dark/arrow-up-small.png rename to rtdata/images/themed/png/1/dark/arrow-up-small.png diff --git a/rtdata/images/themed/png/dark/arrow-updown.png b/rtdata/images/themed/png/1/dark/arrow-updown.png similarity index 100% rename from rtdata/images/themed/png/dark/arrow-updown.png rename to rtdata/images/themed/png/1/dark/arrow-updown.png diff --git a/rtdata/images/themed/png/dark/arrow2-left.png b/rtdata/images/themed/png/1/dark/arrow2-left.png similarity index 100% rename from rtdata/images/themed/png/dark/arrow2-left.png rename to rtdata/images/themed/png/1/dark/arrow2-left.png diff --git a/rtdata/images/themed/png/dark/arrow2-right.png b/rtdata/images/themed/png/1/dark/arrow2-right.png similarity index 100% rename from rtdata/images/themed/png/dark/arrow2-right.png rename to rtdata/images/themed/png/1/dark/arrow2-right.png diff --git a/rtdata/images/themed/png/dark/atom.png b/rtdata/images/themed/png/1/dark/atom.png similarity index 100% rename from rtdata/images/themed/png/dark/atom.png rename to rtdata/images/themed/png/1/dark/atom.png diff --git a/rtdata/images/themed/png/dark/bayer.png b/rtdata/images/themed/png/1/dark/bayer.png similarity index 100% rename from rtdata/images/themed/png/dark/bayer.png rename to rtdata/images/themed/png/1/dark/bayer.png diff --git a/rtdata/images/themed/png/dark/beforeafter.png b/rtdata/images/themed/png/1/dark/beforeafter.png similarity index 100% rename from rtdata/images/themed/png/dark/beforeafter.png rename to rtdata/images/themed/png/1/dark/beforeafter.png diff --git a/rtdata/images/themed/png/dark/cancel-small.png b/rtdata/images/themed/png/1/dark/cancel-small.png similarity index 100% rename from rtdata/images/themed/png/dark/cancel-small.png rename to rtdata/images/themed/png/1/dark/cancel-small.png diff --git a/rtdata/images/themed/png/dark/cancel.png b/rtdata/images/themed/png/1/dark/cancel.png similarity index 100% rename from rtdata/images/themed/png/dark/cancel.png rename to rtdata/images/themed/png/1/dark/cancel.png diff --git a/rtdata/images/themed/png/dark/circle-black-small.png b/rtdata/images/themed/png/1/dark/circle-black-small.png similarity index 100% rename from rtdata/images/themed/png/dark/circle-black-small.png rename to rtdata/images/themed/png/1/dark/circle-black-small.png diff --git a/rtdata/images/themed/png/dark/circle-blue-green-small.png b/rtdata/images/themed/png/1/dark/circle-blue-green-small.png similarity index 100% rename from rtdata/images/themed/png/dark/circle-blue-green-small.png rename to rtdata/images/themed/png/1/dark/circle-blue-green-small.png diff --git a/rtdata/images/themed/png/dark/circle-blue-red-small.png b/rtdata/images/themed/png/1/dark/circle-blue-red-small.png similarity index 100% rename from rtdata/images/themed/png/dark/circle-blue-red-small.png rename to rtdata/images/themed/png/1/dark/circle-blue-red-small.png diff --git a/rtdata/images/themed/png/dark/circle-blue-small.png b/rtdata/images/themed/png/1/dark/circle-blue-small.png similarity index 100% rename from rtdata/images/themed/png/dark/circle-blue-small.png rename to rtdata/images/themed/png/1/dark/circle-blue-small.png diff --git a/rtdata/images/themed/png/dark/circle-blue-yellow-small.png b/rtdata/images/themed/png/1/dark/circle-blue-yellow-small.png similarity index 100% rename from rtdata/images/themed/png/dark/circle-blue-yellow-small.png rename to rtdata/images/themed/png/1/dark/circle-blue-yellow-small.png diff --git a/rtdata/images/themed/png/dark/circle-cyan-red-small.png b/rtdata/images/themed/png/1/dark/circle-cyan-red-small.png similarity index 100% rename from rtdata/images/themed/png/dark/circle-cyan-red-small.png rename to rtdata/images/themed/png/1/dark/circle-cyan-red-small.png diff --git a/rtdata/images/themed/png/dark/circle-cyan-small.png b/rtdata/images/themed/png/1/dark/circle-cyan-small.png similarity index 100% rename from rtdata/images/themed/png/dark/circle-cyan-small.png rename to rtdata/images/themed/png/1/dark/circle-cyan-small.png diff --git a/rtdata/images/themed/png/dark/circle-darkgray-small.png b/rtdata/images/themed/png/1/dark/circle-darkgray-small.png similarity index 100% rename from rtdata/images/themed/png/dark/circle-darkgray-small.png rename to rtdata/images/themed/png/1/dark/circle-darkgray-small.png diff --git a/rtdata/images/themed/png/dark/circle-empty-blue-small.png b/rtdata/images/themed/png/1/dark/circle-empty-blue-small.png similarity index 100% rename from rtdata/images/themed/png/dark/circle-empty-blue-small.png rename to rtdata/images/themed/png/1/dark/circle-empty-blue-small.png diff --git a/rtdata/images/themed/png/dark/circle-empty-darkgray-small.png b/rtdata/images/themed/png/1/dark/circle-empty-darkgray-small.png similarity index 100% rename from rtdata/images/themed/png/dark/circle-empty-darkgray-small.png rename to rtdata/images/themed/png/1/dark/circle-empty-darkgray-small.png diff --git a/rtdata/images/themed/png/dark/circle-empty-gray-small.png b/rtdata/images/themed/png/1/dark/circle-empty-gray-small.png similarity index 100% rename from rtdata/images/themed/png/dark/circle-empty-gray-small.png rename to rtdata/images/themed/png/1/dark/circle-empty-gray-small.png diff --git a/rtdata/images/themed/png/dark/circle-empty-green-small.png b/rtdata/images/themed/png/1/dark/circle-empty-green-small.png similarity index 100% rename from rtdata/images/themed/png/dark/circle-empty-green-small.png rename to rtdata/images/themed/png/1/dark/circle-empty-green-small.png diff --git a/rtdata/images/themed/png/dark/circle-empty-purple-small.png b/rtdata/images/themed/png/1/dark/circle-empty-purple-small.png similarity index 100% rename from rtdata/images/themed/png/dark/circle-empty-purple-small.png rename to rtdata/images/themed/png/1/dark/circle-empty-purple-small.png diff --git a/rtdata/images/themed/png/dark/circle-empty-red-small.png b/rtdata/images/themed/png/1/dark/circle-empty-red-small.png similarity index 100% rename from rtdata/images/themed/png/dark/circle-empty-red-small.png rename to rtdata/images/themed/png/1/dark/circle-empty-red-small.png diff --git a/rtdata/images/themed/png/dark/circle-empty-yellow-small.png b/rtdata/images/themed/png/1/dark/circle-empty-yellow-small.png similarity index 100% rename from rtdata/images/themed/png/dark/circle-empty-yellow-small.png rename to rtdata/images/themed/png/1/dark/circle-empty-yellow-small.png diff --git a/rtdata/images/themed/png/dark/circle-gray-blue-small.png b/rtdata/images/themed/png/1/dark/circle-gray-blue-small.png similarity index 100% rename from rtdata/images/themed/png/dark/circle-gray-blue-small.png rename to rtdata/images/themed/png/1/dark/circle-gray-blue-small.png diff --git a/rtdata/images/themed/png/dark/circle-gray-green-small.png b/rtdata/images/themed/png/1/dark/circle-gray-green-small.png similarity index 100% rename from rtdata/images/themed/png/dark/circle-gray-green-small.png rename to rtdata/images/themed/png/1/dark/circle-gray-green-small.png diff --git a/rtdata/images/themed/png/dark/circle-gray-red-small.png b/rtdata/images/themed/png/1/dark/circle-gray-red-small.png similarity index 100% rename from rtdata/images/themed/png/dark/circle-gray-red-small.png rename to rtdata/images/themed/png/1/dark/circle-gray-red-small.png diff --git a/rtdata/images/themed/png/dark/circle-gray-small.png b/rtdata/images/themed/png/1/dark/circle-gray-small.png similarity index 100% rename from rtdata/images/themed/png/dark/circle-gray-small.png rename to rtdata/images/themed/png/1/dark/circle-gray-small.png diff --git a/rtdata/images/themed/png/dark/circle-green-blue-small.png b/rtdata/images/themed/png/1/dark/circle-green-blue-small.png similarity index 100% rename from rtdata/images/themed/png/dark/circle-green-blue-small.png rename to rtdata/images/themed/png/1/dark/circle-green-blue-small.png diff --git a/rtdata/images/themed/png/dark/circle-green-red-small.png b/rtdata/images/themed/png/1/dark/circle-green-red-small.png similarity index 100% rename from rtdata/images/themed/png/dark/circle-green-red-small.png rename to rtdata/images/themed/png/1/dark/circle-green-red-small.png diff --git a/rtdata/images/themed/png/dark/circle-green-small.png b/rtdata/images/themed/png/1/dark/circle-green-small.png similarity index 100% rename from rtdata/images/themed/png/dark/circle-green-small.png rename to rtdata/images/themed/png/1/dark/circle-green-small.png diff --git a/rtdata/images/themed/png/dark/circle-magenta-small.png b/rtdata/images/themed/png/1/dark/circle-magenta-small.png similarity index 100% rename from rtdata/images/themed/png/dark/circle-magenta-small.png rename to rtdata/images/themed/png/1/dark/circle-magenta-small.png diff --git a/rtdata/images/themed/png/dark/circle-orange-small.png b/rtdata/images/themed/png/1/dark/circle-orange-small.png similarity index 100% rename from rtdata/images/themed/png/dark/circle-orange-small.png rename to rtdata/images/themed/png/1/dark/circle-orange-small.png diff --git a/rtdata/images/themed/png/dark/circle-purple-small.png b/rtdata/images/themed/png/1/dark/circle-purple-small.png similarity index 100% rename from rtdata/images/themed/png/dark/circle-purple-small.png rename to rtdata/images/themed/png/1/dark/circle-purple-small.png diff --git a/rtdata/images/themed/png/dark/circle-red-blue-small.png b/rtdata/images/themed/png/1/dark/circle-red-blue-small.png similarity index 100% rename from rtdata/images/themed/png/dark/circle-red-blue-small.png rename to rtdata/images/themed/png/1/dark/circle-red-blue-small.png diff --git a/rtdata/images/themed/png/dark/circle-red-cyan-small.png b/rtdata/images/themed/png/1/dark/circle-red-cyan-small.png similarity index 100% rename from rtdata/images/themed/png/dark/circle-red-cyan-small.png rename to rtdata/images/themed/png/1/dark/circle-red-cyan-small.png diff --git a/rtdata/images/themed/png/dark/circle-red-green-small.png b/rtdata/images/themed/png/1/dark/circle-red-green-small.png similarity index 100% rename from rtdata/images/themed/png/dark/circle-red-green-small.png rename to rtdata/images/themed/png/1/dark/circle-red-green-small.png diff --git a/rtdata/images/themed/png/dark/circle-red-small.png b/rtdata/images/themed/png/1/dark/circle-red-small.png similarity index 100% rename from rtdata/images/themed/png/dark/circle-red-small.png rename to rtdata/images/themed/png/1/dark/circle-red-small.png diff --git a/rtdata/images/themed/png/dark/circle-white-small.png b/rtdata/images/themed/png/1/dark/circle-white-small.png similarity index 100% rename from rtdata/images/themed/png/dark/circle-white-small.png rename to rtdata/images/themed/png/1/dark/circle-white-small.png diff --git a/rtdata/images/themed/png/dark/circle-yellow-blue-small.png b/rtdata/images/themed/png/1/dark/circle-yellow-blue-small.png similarity index 100% rename from rtdata/images/themed/png/dark/circle-yellow-blue-small.png rename to rtdata/images/themed/png/1/dark/circle-yellow-blue-small.png diff --git a/rtdata/images/themed/png/dark/circle-yellow-small.png b/rtdata/images/themed/png/1/dark/circle-yellow-small.png similarity index 100% rename from rtdata/images/themed/png/dark/circle-yellow-small.png rename to rtdata/images/themed/png/1/dark/circle-yellow-small.png diff --git a/rtdata/images/themed/png/dark/color-circles.png b/rtdata/images/themed/png/1/dark/color-circles.png similarity index 100% rename from rtdata/images/themed/png/dark/color-circles.png rename to rtdata/images/themed/png/1/dark/color-circles.png diff --git a/rtdata/images/themed/png/dark/color-picker-add-hicontrast.png b/rtdata/images/themed/png/1/dark/color-picker-add-hicontrast.png similarity index 100% rename from rtdata/images/themed/png/dark/color-picker-add-hicontrast.png rename to rtdata/images/themed/png/1/dark/color-picker-add-hicontrast.png diff --git a/rtdata/images/themed/png/dark/color-picker-add.png b/rtdata/images/themed/png/1/dark/color-picker-add.png similarity index 100% rename from rtdata/images/themed/png/dark/color-picker-add.png rename to rtdata/images/themed/png/1/dark/color-picker-add.png diff --git a/rtdata/images/themed/png/dark/color-picker-bars.png b/rtdata/images/themed/png/1/dark/color-picker-bars.png similarity index 100% rename from rtdata/images/themed/png/dark/color-picker-bars.png rename to rtdata/images/themed/png/1/dark/color-picker-bars.png diff --git a/rtdata/images/themed/png/dark/color-picker-hicontrast.png b/rtdata/images/themed/png/1/dark/color-picker-hicontrast.png similarity index 100% rename from rtdata/images/themed/png/dark/color-picker-hicontrast.png rename to rtdata/images/themed/png/1/dark/color-picker-hicontrast.png diff --git a/rtdata/images/themed/png/dark/color-picker-hide.png b/rtdata/images/themed/png/1/dark/color-picker-hide.png similarity index 100% rename from rtdata/images/themed/png/dark/color-picker-hide.png rename to rtdata/images/themed/png/1/dark/color-picker-hide.png diff --git a/rtdata/images/themed/png/dark/color-picker.png b/rtdata/images/themed/png/1/dark/color-picker.png similarity index 100% rename from rtdata/images/themed/png/dark/color-picker.png rename to rtdata/images/themed/png/1/dark/color-picker.png diff --git a/rtdata/images/themed/png/dark/contrastmask-off.png b/rtdata/images/themed/png/1/dark/contrastmask-off.png similarity index 100% rename from rtdata/images/themed/png/dark/contrastmask-off.png rename to rtdata/images/themed/png/1/dark/contrastmask-off.png diff --git a/rtdata/images/themed/png/dark/contrastmask-on.png b/rtdata/images/themed/png/1/dark/contrastmask-on.png similarity index 100% rename from rtdata/images/themed/png/dark/contrastmask-on.png rename to rtdata/images/themed/png/1/dark/contrastmask-on.png diff --git a/rtdata/images/themed/png/dark/copy.png b/rtdata/images/themed/png/1/dark/copy.png similarity index 100% rename from rtdata/images/themed/png/dark/copy.png rename to rtdata/images/themed/png/1/dark/copy.png diff --git a/rtdata/images/themed/png/dark/crop-auto-small.png b/rtdata/images/themed/png/1/dark/crop-auto-small.png similarity index 100% rename from rtdata/images/themed/png/dark/crop-auto-small.png rename to rtdata/images/themed/png/1/dark/crop-auto-small.png diff --git a/rtdata/images/themed/png/dark/crop-auto.png b/rtdata/images/themed/png/1/dark/crop-auto.png similarity index 100% rename from rtdata/images/themed/png/dark/crop-auto.png rename to rtdata/images/themed/png/1/dark/crop-auto.png diff --git a/rtdata/images/themed/png/dark/crop-point-hicontrast.png b/rtdata/images/themed/png/1/dark/crop-point-hicontrast.png similarity index 100% rename from rtdata/images/themed/png/dark/crop-point-hicontrast.png rename to rtdata/images/themed/png/1/dark/crop-point-hicontrast.png diff --git a/rtdata/images/themed/png/dark/crop-small.png b/rtdata/images/themed/png/1/dark/crop-small.png similarity index 100% rename from rtdata/images/themed/png/dark/crop-small.png rename to rtdata/images/themed/png/1/dark/crop-small.png diff --git a/rtdata/images/themed/png/dark/crop.png b/rtdata/images/themed/png/1/dark/crop.png similarity index 100% rename from rtdata/images/themed/png/dark/crop.png rename to rtdata/images/themed/png/1/dark/crop.png diff --git a/rtdata/images/themed/png/dark/crossed-arrows-in.png b/rtdata/images/themed/png/1/dark/crossed-arrows-in.png similarity index 100% rename from rtdata/images/themed/png/dark/crossed-arrows-in.png rename to rtdata/images/themed/png/1/dark/crossed-arrows-in.png diff --git a/rtdata/images/themed/png/dark/crossed-arrows-out.png b/rtdata/images/themed/png/1/dark/crossed-arrows-out.png similarity index 100% rename from rtdata/images/themed/png/dark/crossed-arrows-out.png rename to rtdata/images/themed/png/1/dark/crossed-arrows-out.png diff --git a/rtdata/images/themed/png/dark/crosshair-adjust.png b/rtdata/images/themed/png/1/dark/crosshair-adjust.png similarity index 100% rename from rtdata/images/themed/png/dark/crosshair-adjust.png rename to rtdata/images/themed/png/1/dark/crosshair-adjust.png diff --git a/rtdata/images/themed/png/dark/crosshair-hicontrast.png b/rtdata/images/themed/png/1/dark/crosshair-hicontrast.png similarity index 100% rename from rtdata/images/themed/png/dark/crosshair-hicontrast.png rename to rtdata/images/themed/png/1/dark/crosshair-hicontrast.png diff --git a/rtdata/images/themed/png/dark/crosshair-node-curve.png b/rtdata/images/themed/png/1/dark/crosshair-node-curve.png similarity index 100% rename from rtdata/images/themed/png/dark/crosshair-node-curve.png rename to rtdata/images/themed/png/1/dark/crosshair-node-curve.png diff --git a/rtdata/images/themed/png/dark/crosshair-small.png b/rtdata/images/themed/png/1/dark/crosshair-small.png similarity index 100% rename from rtdata/images/themed/png/dark/crosshair-small.png rename to rtdata/images/themed/png/1/dark/crosshair-small.png diff --git a/rtdata/images/themed/png/dark/curve-controlpoints-small.png b/rtdata/images/themed/png/1/dark/curve-controlpoints-small.png similarity index 100% rename from rtdata/images/themed/png/dark/curve-controlpoints-small.png rename to rtdata/images/themed/png/1/dark/curve-controlpoints-small.png diff --git a/rtdata/images/themed/png/dark/curve-controlpoints.png b/rtdata/images/themed/png/1/dark/curve-controlpoints.png similarity index 100% rename from rtdata/images/themed/png/dark/curve-controlpoints.png rename to rtdata/images/themed/png/1/dark/curve-controlpoints.png diff --git a/rtdata/images/themed/png/dark/curve-flat-small.png b/rtdata/images/themed/png/1/dark/curve-flat-small.png similarity index 100% rename from rtdata/images/themed/png/dark/curve-flat-small.png rename to rtdata/images/themed/png/1/dark/curve-flat-small.png diff --git a/rtdata/images/themed/png/dark/curve-flat.png b/rtdata/images/themed/png/1/dark/curve-flat.png similarity index 100% rename from rtdata/images/themed/png/dark/curve-flat.png rename to rtdata/images/themed/png/1/dark/curve-flat.png diff --git a/rtdata/images/themed/png/dark/curve-linear-small.png b/rtdata/images/themed/png/1/dark/curve-linear-small.png similarity index 100% rename from rtdata/images/themed/png/dark/curve-linear-small.png rename to rtdata/images/themed/png/1/dark/curve-linear-small.png diff --git a/rtdata/images/themed/png/dark/curve-linear.png b/rtdata/images/themed/png/1/dark/curve-linear.png similarity index 100% rename from rtdata/images/themed/png/dark/curve-linear.png rename to rtdata/images/themed/png/1/dark/curve-linear.png diff --git a/rtdata/images/themed/png/dark/curve-nurbs-small.png b/rtdata/images/themed/png/1/dark/curve-nurbs-small.png similarity index 100% rename from rtdata/images/themed/png/dark/curve-nurbs-small.png rename to rtdata/images/themed/png/1/dark/curve-nurbs-small.png diff --git a/rtdata/images/themed/png/dark/curve-nurbs.png b/rtdata/images/themed/png/1/dark/curve-nurbs.png similarity index 100% rename from rtdata/images/themed/png/dark/curve-nurbs.png rename to rtdata/images/themed/png/1/dark/curve-nurbs.png diff --git a/rtdata/images/themed/png/dark/curve-parametric-small.png b/rtdata/images/themed/png/1/dark/curve-parametric-small.png similarity index 100% rename from rtdata/images/themed/png/dark/curve-parametric-small.png rename to rtdata/images/themed/png/1/dark/curve-parametric-small.png diff --git a/rtdata/images/themed/png/dark/curve-parametric.png b/rtdata/images/themed/png/1/dark/curve-parametric.png similarity index 100% rename from rtdata/images/themed/png/dark/curve-parametric.png rename to rtdata/images/themed/png/1/dark/curve-parametric.png diff --git a/rtdata/images/themed/png/dark/curve-spline-small.png b/rtdata/images/themed/png/1/dark/curve-spline-small.png similarity index 100% rename from rtdata/images/themed/png/dark/curve-spline-small.png rename to rtdata/images/themed/png/1/dark/curve-spline-small.png diff --git a/rtdata/images/themed/png/dark/curve-spline.png b/rtdata/images/themed/png/1/dark/curve-spline.png similarity index 100% rename from rtdata/images/themed/png/dark/curve-spline.png rename to rtdata/images/themed/png/1/dark/curve-spline.png diff --git a/rtdata/images/themed/png/dark/detail.png b/rtdata/images/themed/png/1/dark/detail.png similarity index 100% rename from rtdata/images/themed/png/dark/detail.png rename to rtdata/images/themed/png/1/dark/detail.png diff --git a/rtdata/images/themed/png/dark/device-floppy.png b/rtdata/images/themed/png/1/dark/device-floppy.png similarity index 100% rename from rtdata/images/themed/png/dark/device-floppy.png rename to rtdata/images/themed/png/1/dark/device-floppy.png diff --git a/rtdata/images/themed/png/dark/device-hdd.png b/rtdata/images/themed/png/1/dark/device-hdd.png similarity index 100% rename from rtdata/images/themed/png/dark/device-hdd.png rename to rtdata/images/themed/png/1/dark/device-hdd.png diff --git a/rtdata/images/themed/png/dark/device-network.png b/rtdata/images/themed/png/1/dark/device-network.png similarity index 100% rename from rtdata/images/themed/png/dark/device-network.png rename to rtdata/images/themed/png/1/dark/device-network.png diff --git a/rtdata/images/themed/png/dark/device-optical.png b/rtdata/images/themed/png/1/dark/device-optical.png similarity index 100% rename from rtdata/images/themed/png/dark/device-optical.png rename to rtdata/images/themed/png/1/dark/device-optical.png diff --git a/rtdata/images/themed/png/dark/device-usb.png b/rtdata/images/themed/png/1/dark/device-usb.png similarity index 100% rename from rtdata/images/themed/png/dark/device-usb.png rename to rtdata/images/themed/png/1/dark/device-usb.png diff --git a/rtdata/images/themed/png/dark/distortion-auto-small.png b/rtdata/images/themed/png/1/dark/distortion-auto-small.png similarity index 100% rename from rtdata/images/themed/png/dark/distortion-auto-small.png rename to rtdata/images/themed/png/1/dark/distortion-auto-small.png diff --git a/rtdata/images/themed/png/dark/distortion-auto.png b/rtdata/images/themed/png/1/dark/distortion-auto.png similarity index 100% rename from rtdata/images/themed/png/dark/distortion-auto.png rename to rtdata/images/themed/png/1/dark/distortion-auto.png diff --git a/rtdata/images/themed/png/dark/distortion-barrel-small.png b/rtdata/images/themed/png/1/dark/distortion-barrel-small.png similarity index 100% rename from rtdata/images/themed/png/dark/distortion-barrel-small.png rename to rtdata/images/themed/png/1/dark/distortion-barrel-small.png diff --git a/rtdata/images/themed/png/dark/distortion-barrel.png b/rtdata/images/themed/png/1/dark/distortion-barrel.png similarity index 100% rename from rtdata/images/themed/png/dark/distortion-barrel.png rename to rtdata/images/themed/png/1/dark/distortion-barrel.png diff --git a/rtdata/images/themed/png/dark/distortion-pincushion-small.png b/rtdata/images/themed/png/1/dark/distortion-pincushion-small.png similarity index 100% rename from rtdata/images/themed/png/dark/distortion-pincushion-small.png rename to rtdata/images/themed/png/1/dark/distortion-pincushion-small.png diff --git a/rtdata/images/themed/png/dark/distortion-pincushion.png b/rtdata/images/themed/png/1/dark/distortion-pincushion.png similarity index 100% rename from rtdata/images/themed/png/dark/distortion-pincushion.png rename to rtdata/images/themed/png/1/dark/distortion-pincushion.png diff --git a/rtdata/images/themed/png/dark/edit-point.png b/rtdata/images/themed/png/1/dark/edit-point.png similarity index 100% rename from rtdata/images/themed/png/dark/edit-point.png rename to rtdata/images/themed/png/1/dark/edit-point.png diff --git a/rtdata/images/themed/png/dark/equilizer-narrow.png b/rtdata/images/themed/png/1/dark/equilizer-narrow.png similarity index 100% rename from rtdata/images/themed/png/dark/equilizer-narrow.png rename to rtdata/images/themed/png/1/dark/equilizer-narrow.png diff --git a/rtdata/images/themed/png/dark/equilizer-wide.png b/rtdata/images/themed/png/1/dark/equilizer-wide.png similarity index 100% rename from rtdata/images/themed/png/dark/equilizer-wide.png rename to rtdata/images/themed/png/1/dark/equilizer-wide.png diff --git a/rtdata/images/themed/png/dark/expander-closed-small.png b/rtdata/images/themed/png/1/dark/expander-closed-small.png similarity index 100% rename from rtdata/images/themed/png/dark/expander-closed-small.png rename to rtdata/images/themed/png/1/dark/expander-closed-small.png diff --git a/rtdata/images/themed/png/dark/expander-open-small.png b/rtdata/images/themed/png/1/dark/expander-open-small.png similarity index 100% rename from rtdata/images/themed/png/dark/expander-open-small.png rename to rtdata/images/themed/png/1/dark/expander-open-small.png diff --git a/rtdata/images/themed/png/dark/exposure.png b/rtdata/images/themed/png/1/dark/exposure.png similarity index 100% rename from rtdata/images/themed/png/dark/exposure.png rename to rtdata/images/themed/png/1/dark/exposure.png diff --git a/rtdata/images/themed/png/dark/filetype-hdr.png b/rtdata/images/themed/png/1/dark/filetype-hdr.png similarity index 100% rename from rtdata/images/themed/png/dark/filetype-hdr.png rename to rtdata/images/themed/png/1/dark/filetype-hdr.png diff --git a/rtdata/images/themed/png/dark/filetype-ps.png b/rtdata/images/themed/png/1/dark/filetype-ps.png similarity index 100% rename from rtdata/images/themed/png/dark/filetype-ps.png rename to rtdata/images/themed/png/1/dark/filetype-ps.png diff --git a/rtdata/images/themed/png/dark/filter-clear.png b/rtdata/images/themed/png/1/dark/filter-clear.png similarity index 100% rename from rtdata/images/themed/png/dark/filter-clear.png rename to rtdata/images/themed/png/1/dark/filter-clear.png diff --git a/rtdata/images/themed/png/dark/filter-original.png b/rtdata/images/themed/png/1/dark/filter-original.png similarity index 100% rename from rtdata/images/themed/png/dark/filter-original.png rename to rtdata/images/themed/png/1/dark/filter-original.png diff --git a/rtdata/images/themed/png/dark/filter-original2.png b/rtdata/images/themed/png/1/dark/filter-original2.png similarity index 100% rename from rtdata/images/themed/png/dark/filter-original2.png rename to rtdata/images/themed/png/1/dark/filter-original2.png diff --git a/rtdata/images/themed/png/dark/filter.png b/rtdata/images/themed/png/1/dark/filter.png similarity index 100% rename from rtdata/images/themed/png/dark/filter.png rename to rtdata/images/themed/png/1/dark/filter.png diff --git a/rtdata/images/themed/png/dark/flip-horizontal.png b/rtdata/images/themed/png/1/dark/flip-horizontal.png similarity index 100% rename from rtdata/images/themed/png/dark/flip-horizontal.png rename to rtdata/images/themed/png/1/dark/flip-horizontal.png diff --git a/rtdata/images/themed/png/dark/flip-vertical.png b/rtdata/images/themed/png/1/dark/flip-vertical.png similarity index 100% rename from rtdata/images/themed/png/dark/flip-vertical.png rename to rtdata/images/themed/png/1/dark/flip-vertical.png diff --git a/rtdata/images/themed/png/dark/focusscreen-off.png b/rtdata/images/themed/png/1/dark/focusscreen-off.png similarity index 100% rename from rtdata/images/themed/png/dark/focusscreen-off.png rename to rtdata/images/themed/png/1/dark/focusscreen-off.png diff --git a/rtdata/images/themed/png/dark/focusscreen-on.png b/rtdata/images/themed/png/1/dark/focusscreen-on.png similarity index 100% rename from rtdata/images/themed/png/dark/focusscreen-on.png rename to rtdata/images/themed/png/1/dark/focusscreen-on.png diff --git a/rtdata/images/themed/png/dark/folder-closed-home-small.png b/rtdata/images/themed/png/1/dark/folder-closed-home-small.png similarity index 100% rename from rtdata/images/themed/png/dark/folder-closed-home-small.png rename to rtdata/images/themed/png/1/dark/folder-closed-home-small.png diff --git a/rtdata/images/themed/png/dark/folder-closed-home.png b/rtdata/images/themed/png/1/dark/folder-closed-home.png similarity index 100% rename from rtdata/images/themed/png/dark/folder-closed-home.png rename to rtdata/images/themed/png/1/dark/folder-closed-home.png diff --git a/rtdata/images/themed/png/dark/folder-closed-recent-small.png b/rtdata/images/themed/png/1/dark/folder-closed-recent-small.png similarity index 100% rename from rtdata/images/themed/png/dark/folder-closed-recent-small.png rename to rtdata/images/themed/png/1/dark/folder-closed-recent-small.png diff --git a/rtdata/images/themed/png/dark/folder-closed-recent.png b/rtdata/images/themed/png/1/dark/folder-closed-recent.png similarity index 100% rename from rtdata/images/themed/png/dark/folder-closed-recent.png rename to rtdata/images/themed/png/1/dark/folder-closed-recent.png diff --git a/rtdata/images/themed/png/dark/folder-closed-small.png b/rtdata/images/themed/png/1/dark/folder-closed-small.png similarity index 100% rename from rtdata/images/themed/png/dark/folder-closed-small.png rename to rtdata/images/themed/png/1/dark/folder-closed-small.png diff --git a/rtdata/images/themed/png/dark/folder-closed.png b/rtdata/images/themed/png/1/dark/folder-closed.png similarity index 100% rename from rtdata/images/themed/png/dark/folder-closed.png rename to rtdata/images/themed/png/1/dark/folder-closed.png diff --git a/rtdata/images/themed/png/dark/folder-open-recent-small.png b/rtdata/images/themed/png/1/dark/folder-open-recent-small.png similarity index 100% rename from rtdata/images/themed/png/dark/folder-open-recent-small.png rename to rtdata/images/themed/png/1/dark/folder-open-recent-small.png diff --git a/rtdata/images/themed/png/dark/folder-open-recent.png b/rtdata/images/themed/png/1/dark/folder-open-recent.png similarity index 100% rename from rtdata/images/themed/png/dark/folder-open-recent.png rename to rtdata/images/themed/png/1/dark/folder-open-recent.png diff --git a/rtdata/images/themed/png/dark/folder-open-small.png b/rtdata/images/themed/png/1/dark/folder-open-small.png similarity index 100% rename from rtdata/images/themed/png/dark/folder-open-small.png rename to rtdata/images/themed/png/1/dark/folder-open-small.png diff --git a/rtdata/images/themed/png/dark/folder-open.png b/rtdata/images/themed/png/1/dark/folder-open.png similarity index 100% rename from rtdata/images/themed/png/dark/folder-open.png rename to rtdata/images/themed/png/1/dark/folder-open.png diff --git a/rtdata/images/themed/png/dark/fullscreen-enter.png b/rtdata/images/themed/png/1/dark/fullscreen-enter.png similarity index 100% rename from rtdata/images/themed/png/dark/fullscreen-enter.png rename to rtdata/images/themed/png/1/dark/fullscreen-enter.png diff --git a/rtdata/images/themed/png/dark/fullscreen-leave.png b/rtdata/images/themed/png/1/dark/fullscreen-leave.png similarity index 100% rename from rtdata/images/themed/png/dark/fullscreen-leave.png rename to rtdata/images/themed/png/1/dark/fullscreen-leave.png diff --git a/rtdata/images/themed/png/dark/gamut-hist.png b/rtdata/images/themed/png/1/dark/gamut-hist.png similarity index 100% rename from rtdata/images/themed/png/dark/gamut-hist.png rename to rtdata/images/themed/png/1/dark/gamut-hist.png diff --git a/rtdata/images/themed/png/dark/gamut-plus.png b/rtdata/images/themed/png/1/dark/gamut-plus.png similarity index 100% rename from rtdata/images/themed/png/dark/gamut-plus.png rename to rtdata/images/themed/png/1/dark/gamut-plus.png diff --git a/rtdata/images/themed/png/dark/gamut-softproof.png b/rtdata/images/themed/png/1/dark/gamut-softproof.png similarity index 100% rename from rtdata/images/themed/png/dark/gamut-softproof.png rename to rtdata/images/themed/png/1/dark/gamut-softproof.png diff --git a/rtdata/images/themed/png/dark/gamut-warning.png b/rtdata/images/themed/png/1/dark/gamut-warning.png similarity index 100% rename from rtdata/images/themed/png/dark/gamut-warning.png rename to rtdata/images/themed/png/1/dark/gamut-warning.png diff --git a/rtdata/images/themed/png/dark/gamut_srgb_prophoto_xy.png b/rtdata/images/themed/png/1/dark/gamut_srgb_prophoto_xy.png similarity index 100% rename from rtdata/images/themed/png/dark/gamut_srgb_prophoto_xy.png rename to rtdata/images/themed/png/1/dark/gamut_srgb_prophoto_xy.png diff --git a/rtdata/images/themed/png/dark/gears-pause.png b/rtdata/images/themed/png/1/dark/gears-pause.png similarity index 100% rename from rtdata/images/themed/png/dark/gears-pause.png rename to rtdata/images/themed/png/1/dark/gears-pause.png diff --git a/rtdata/images/themed/png/dark/gears-play.png b/rtdata/images/themed/png/1/dark/gears-play.png similarity index 100% rename from rtdata/images/themed/png/dark/gears-play.png rename to rtdata/images/themed/png/1/dark/gears-play.png diff --git a/rtdata/images/themed/png/dark/gears-small.png b/rtdata/images/themed/png/1/dark/gears-small.png similarity index 100% rename from rtdata/images/themed/png/dark/gears-small.png rename to rtdata/images/themed/png/1/dark/gears-small.png diff --git a/rtdata/images/themed/png/dark/gears.png b/rtdata/images/themed/png/1/dark/gears.png similarity index 100% rename from rtdata/images/themed/png/dark/gears.png rename to rtdata/images/themed/png/1/dark/gears.png diff --git a/rtdata/images/themed/png/dark/goto-end-small.png b/rtdata/images/themed/png/1/dark/goto-end-small.png similarity index 100% rename from rtdata/images/themed/png/dark/goto-end-small.png rename to rtdata/images/themed/png/1/dark/goto-end-small.png diff --git a/rtdata/images/themed/png/dark/goto-start-small.png b/rtdata/images/themed/png/1/dark/goto-start-small.png similarity index 100% rename from rtdata/images/themed/png/dark/goto-start-small.png rename to rtdata/images/themed/png/1/dark/goto-start-small.png diff --git a/rtdata/images/themed/png/dark/hand-closed-hicontrast.png b/rtdata/images/themed/png/1/dark/hand-closed-hicontrast.png similarity index 100% rename from rtdata/images/themed/png/dark/hand-closed-hicontrast.png rename to rtdata/images/themed/png/1/dark/hand-closed-hicontrast.png diff --git a/rtdata/images/themed/png/dark/hand-open-hicontrast.png b/rtdata/images/themed/png/1/dark/hand-open-hicontrast.png similarity index 100% rename from rtdata/images/themed/png/dark/hand-open-hicontrast.png rename to rtdata/images/themed/png/1/dark/hand-open-hicontrast.png diff --git a/rtdata/images/themed/png/dark/hand-open.png b/rtdata/images/themed/png/1/dark/hand-open.png similarity index 100% rename from rtdata/images/themed/png/dark/hand-open.png rename to rtdata/images/themed/png/1/dark/hand-open.png diff --git a/rtdata/images/themed/png/dark/histogram-bar-off-small.png b/rtdata/images/themed/png/1/dark/histogram-bar-off-small.png similarity index 100% rename from rtdata/images/themed/png/dark/histogram-bar-off-small.png rename to rtdata/images/themed/png/1/dark/histogram-bar-off-small.png diff --git a/rtdata/images/themed/png/dark/histogram-bar-on-small.png b/rtdata/images/themed/png/1/dark/histogram-bar-on-small.png similarity index 100% rename from rtdata/images/themed/png/dark/histogram-bar-on-small.png rename to rtdata/images/themed/png/1/dark/histogram-bar-on-small.png diff --git a/rtdata/images/themed/png/dark/histogram-bayer-off-small.png b/rtdata/images/themed/png/1/dark/histogram-bayer-off-small.png similarity index 100% rename from rtdata/images/themed/png/dark/histogram-bayer-off-small.png rename to rtdata/images/themed/png/1/dark/histogram-bayer-off-small.png diff --git a/rtdata/images/themed/png/dark/histogram-bayer-on-small.png b/rtdata/images/themed/png/1/dark/histogram-bayer-on-small.png similarity index 100% rename from rtdata/images/themed/png/dark/histogram-bayer-on-small.png rename to rtdata/images/themed/png/1/dark/histogram-bayer-on-small.png diff --git a/rtdata/images/themed/png/dark/histogram-blue-off-small.png b/rtdata/images/themed/png/1/dark/histogram-blue-off-small.png similarity index 100% rename from rtdata/images/themed/png/dark/histogram-blue-off-small.png rename to rtdata/images/themed/png/1/dark/histogram-blue-off-small.png diff --git a/rtdata/images/themed/png/dark/histogram-blue-on-small.png b/rtdata/images/themed/png/1/dark/histogram-blue-on-small.png similarity index 100% rename from rtdata/images/themed/png/dark/histogram-blue-on-small.png rename to rtdata/images/themed/png/1/dark/histogram-blue-on-small.png diff --git a/rtdata/images/themed/png/dark/histogram-gold-off-small.png b/rtdata/images/themed/png/1/dark/histogram-gold-off-small.png similarity index 100% rename from rtdata/images/themed/png/dark/histogram-gold-off-small.png rename to rtdata/images/themed/png/1/dark/histogram-gold-off-small.png diff --git a/rtdata/images/themed/png/dark/histogram-gold-on-small.png b/rtdata/images/themed/png/1/dark/histogram-gold-on-small.png similarity index 100% rename from rtdata/images/themed/png/dark/histogram-gold-on-small.png rename to rtdata/images/themed/png/1/dark/histogram-gold-on-small.png diff --git a/rtdata/images/themed/png/dark/histogram-green-off-small.png b/rtdata/images/themed/png/1/dark/histogram-green-off-small.png similarity index 100% rename from rtdata/images/themed/png/dark/histogram-green-off-small.png rename to rtdata/images/themed/png/1/dark/histogram-green-off-small.png diff --git a/rtdata/images/themed/png/dark/histogram-green-on-small.png b/rtdata/images/themed/png/1/dark/histogram-green-on-small.png similarity index 100% rename from rtdata/images/themed/png/dark/histogram-green-on-small.png rename to rtdata/images/themed/png/1/dark/histogram-green-on-small.png diff --git a/rtdata/images/themed/png/dark/histogram-mode-linear-small.png b/rtdata/images/themed/png/1/dark/histogram-mode-linear-small.png similarity index 100% rename from rtdata/images/themed/png/dark/histogram-mode-linear-small.png rename to rtdata/images/themed/png/1/dark/histogram-mode-linear-small.png diff --git a/rtdata/images/themed/png/dark/histogram-mode-logx-small.png b/rtdata/images/themed/png/1/dark/histogram-mode-logx-small.png similarity index 100% rename from rtdata/images/themed/png/dark/histogram-mode-logx-small.png rename to rtdata/images/themed/png/1/dark/histogram-mode-logx-small.png diff --git a/rtdata/images/themed/png/dark/histogram-mode-logxy-small.png b/rtdata/images/themed/png/1/dark/histogram-mode-logxy-small.png similarity index 100% rename from rtdata/images/themed/png/dark/histogram-mode-logxy-small.png rename to rtdata/images/themed/png/1/dark/histogram-mode-logxy-small.png diff --git a/rtdata/images/themed/png/dark/histogram-red-off-small.png b/rtdata/images/themed/png/1/dark/histogram-red-off-small.png similarity index 100% rename from rtdata/images/themed/png/dark/histogram-red-off-small.png rename to rtdata/images/themed/png/1/dark/histogram-red-off-small.png diff --git a/rtdata/images/themed/png/dark/histogram-red-on-small.png b/rtdata/images/themed/png/1/dark/histogram-red-on-small.png similarity index 100% rename from rtdata/images/themed/png/dark/histogram-red-on-small.png rename to rtdata/images/themed/png/1/dark/histogram-red-on-small.png diff --git a/rtdata/images/themed/png/dark/histogram-silver-off-small.png b/rtdata/images/themed/png/1/dark/histogram-silver-off-small.png similarity index 100% rename from rtdata/images/themed/png/dark/histogram-silver-off-small.png rename to rtdata/images/themed/png/1/dark/histogram-silver-off-small.png diff --git a/rtdata/images/themed/png/dark/histogram-silver-on-small.png b/rtdata/images/themed/png/1/dark/histogram-silver-on-small.png similarity index 100% rename from rtdata/images/themed/png/dark/histogram-silver-on-small.png rename to rtdata/images/themed/png/1/dark/histogram-silver-on-small.png diff --git a/rtdata/images/themed/png/dark/info.png b/rtdata/images/themed/png/1/dark/info.png similarity index 100% rename from rtdata/images/themed/png/dark/info.png rename to rtdata/images/themed/png/1/dark/info.png diff --git a/rtdata/images/themed/png/dark/intent-absolute.png b/rtdata/images/themed/png/1/dark/intent-absolute.png similarity index 100% rename from rtdata/images/themed/png/dark/intent-absolute.png rename to rtdata/images/themed/png/1/dark/intent-absolute.png diff --git a/rtdata/images/themed/png/dark/intent-perceptual.png b/rtdata/images/themed/png/1/dark/intent-perceptual.png similarity index 100% rename from rtdata/images/themed/png/dark/intent-perceptual.png rename to rtdata/images/themed/png/1/dark/intent-perceptual.png diff --git a/rtdata/images/themed/png/dark/intent-relative.png b/rtdata/images/themed/png/1/dark/intent-relative.png similarity index 100% rename from rtdata/images/themed/png/dark/intent-relative.png rename to rtdata/images/themed/png/1/dark/intent-relative.png diff --git a/rtdata/images/themed/png/dark/intent-saturation.png b/rtdata/images/themed/png/1/dark/intent-saturation.png similarity index 100% rename from rtdata/images/themed/png/dark/intent-saturation.png rename to rtdata/images/themed/png/1/dark/intent-saturation.png diff --git a/rtdata/images/themed/png/dark/magnifier-1to1-small.png b/rtdata/images/themed/png/1/dark/magnifier-1to1-small.png similarity index 100% rename from rtdata/images/themed/png/dark/magnifier-1to1-small.png rename to rtdata/images/themed/png/1/dark/magnifier-1to1-small.png diff --git a/rtdata/images/themed/png/dark/magnifier-1to1.png b/rtdata/images/themed/png/1/dark/magnifier-1to1.png similarity index 100% rename from rtdata/images/themed/png/dark/magnifier-1to1.png rename to rtdata/images/themed/png/1/dark/magnifier-1to1.png diff --git a/rtdata/images/themed/png/dark/magnifier-crop.png b/rtdata/images/themed/png/1/dark/magnifier-crop.png similarity index 100% rename from rtdata/images/themed/png/dark/magnifier-crop.png rename to rtdata/images/themed/png/1/dark/magnifier-crop.png diff --git a/rtdata/images/themed/png/dark/magnifier-fit.png b/rtdata/images/themed/png/1/dark/magnifier-fit.png similarity index 100% rename from rtdata/images/themed/png/dark/magnifier-fit.png rename to rtdata/images/themed/png/1/dark/magnifier-fit.png diff --git a/rtdata/images/themed/png/dark/magnifier-minus-small.png b/rtdata/images/themed/png/1/dark/magnifier-minus-small.png similarity index 100% rename from rtdata/images/themed/png/dark/magnifier-minus-small.png rename to rtdata/images/themed/png/1/dark/magnifier-minus-small.png diff --git a/rtdata/images/themed/png/dark/magnifier-minus.png b/rtdata/images/themed/png/1/dark/magnifier-minus.png similarity index 100% rename from rtdata/images/themed/png/dark/magnifier-minus.png rename to rtdata/images/themed/png/1/dark/magnifier-minus.png diff --git a/rtdata/images/themed/png/dark/magnifier-plus-small.png b/rtdata/images/themed/png/1/dark/magnifier-plus-small.png similarity index 100% rename from rtdata/images/themed/png/dark/magnifier-plus-small.png rename to rtdata/images/themed/png/1/dark/magnifier-plus-small.png diff --git a/rtdata/images/themed/png/dark/magnifier-plus.png b/rtdata/images/themed/png/1/dark/magnifier-plus.png similarity index 100% rename from rtdata/images/themed/png/dark/magnifier-plus.png rename to rtdata/images/themed/png/1/dark/magnifier-plus.png diff --git a/rtdata/images/themed/png/dark/magnifier.png b/rtdata/images/themed/png/1/dark/magnifier.png similarity index 100% rename from rtdata/images/themed/png/dark/magnifier.png rename to rtdata/images/themed/png/1/dark/magnifier.png diff --git a/rtdata/images/themed/png/dark/metadata.png b/rtdata/images/themed/png/1/dark/metadata.png similarity index 100% rename from rtdata/images/themed/png/dark/metadata.png rename to rtdata/images/themed/png/1/dark/metadata.png diff --git a/rtdata/images/themed/png/dark/node-move-nw-se-hicontrast.png b/rtdata/images/themed/png/1/dark/node-move-nw-se-hicontrast.png similarity index 100% rename from rtdata/images/themed/png/dark/node-move-nw-se-hicontrast.png rename to rtdata/images/themed/png/1/dark/node-move-nw-se-hicontrast.png diff --git a/rtdata/images/themed/png/dark/node-move-sw-ne-hicontrast.png b/rtdata/images/themed/png/1/dark/node-move-sw-ne-hicontrast.png similarity index 100% rename from rtdata/images/themed/png/dark/node-move-sw-ne-hicontrast.png rename to rtdata/images/themed/png/1/dark/node-move-sw-ne-hicontrast.png diff --git a/rtdata/images/themed/png/dark/node-move-x-hicontrast.png b/rtdata/images/themed/png/1/dark/node-move-x-hicontrast.png similarity index 100% rename from rtdata/images/themed/png/dark/node-move-x-hicontrast.png rename to rtdata/images/themed/png/1/dark/node-move-x-hicontrast.png diff --git a/rtdata/images/themed/png/dark/node-move-xy-hicontrast.png b/rtdata/images/themed/png/1/dark/node-move-xy-hicontrast.png similarity index 100% rename from rtdata/images/themed/png/dark/node-move-xy-hicontrast.png rename to rtdata/images/themed/png/1/dark/node-move-xy-hicontrast.png diff --git a/rtdata/images/themed/png/dark/node-move-y-hicontrast.png b/rtdata/images/themed/png/1/dark/node-move-y-hicontrast.png similarity index 100% rename from rtdata/images/themed/png/dark/node-move-y-hicontrast.png rename to rtdata/images/themed/png/1/dark/node-move-y-hicontrast.png diff --git a/rtdata/images/themed/png/dark/one-to-one-small.png b/rtdata/images/themed/png/1/dark/one-to-one-small.png similarity index 100% rename from rtdata/images/themed/png/dark/one-to-one-small.png rename to rtdata/images/themed/png/1/dark/one-to-one-small.png diff --git a/rtdata/images/themed/png/dark/ornament1.png b/rtdata/images/themed/png/1/dark/ornament1.png similarity index 100% rename from rtdata/images/themed/png/dark/ornament1.png rename to rtdata/images/themed/png/1/dark/ornament1.png diff --git a/rtdata/images/themed/png/dark/padlock-locked-small.png b/rtdata/images/themed/png/1/dark/padlock-locked-small.png similarity index 100% rename from rtdata/images/themed/png/dark/padlock-locked-small.png rename to rtdata/images/themed/png/1/dark/padlock-locked-small.png diff --git a/rtdata/images/themed/png/dark/padlock-unlocked-small.png b/rtdata/images/themed/png/1/dark/padlock-unlocked-small.png similarity index 100% rename from rtdata/images/themed/png/dark/padlock-unlocked-small.png rename to rtdata/images/themed/png/1/dark/padlock-unlocked-small.png diff --git a/rtdata/images/themed/png/dark/palette-brush.png b/rtdata/images/themed/png/1/dark/palette-brush.png similarity index 100% rename from rtdata/images/themed/png/dark/palette-brush.png rename to rtdata/images/themed/png/1/dark/palette-brush.png diff --git a/rtdata/images/themed/png/dark/panel-to-bottom.png b/rtdata/images/themed/png/1/dark/panel-to-bottom.png similarity index 100% rename from rtdata/images/themed/png/dark/panel-to-bottom.png rename to rtdata/images/themed/png/1/dark/panel-to-bottom.png diff --git a/rtdata/images/themed/png/dark/panel-to-left.png b/rtdata/images/themed/png/1/dark/panel-to-left.png similarity index 100% rename from rtdata/images/themed/png/dark/panel-to-left.png rename to rtdata/images/themed/png/1/dark/panel-to-left.png diff --git a/rtdata/images/themed/png/dark/panel-to-right.png b/rtdata/images/themed/png/1/dark/panel-to-right.png similarity index 100% rename from rtdata/images/themed/png/dark/panel-to-right.png rename to rtdata/images/themed/png/1/dark/panel-to-right.png diff --git a/rtdata/images/themed/png/dark/panel-to-top.png b/rtdata/images/themed/png/1/dark/panel-to-top.png similarity index 100% rename from rtdata/images/themed/png/dark/panel-to-top.png rename to rtdata/images/themed/png/1/dark/panel-to-top.png diff --git a/rtdata/images/themed/png/dark/paste.png b/rtdata/images/themed/png/1/dark/paste.png similarity index 100% rename from rtdata/images/themed/png/dark/paste.png rename to rtdata/images/themed/png/1/dark/paste.png diff --git a/rtdata/images/themed/png/dark/perspective-horizontal-left-small.png b/rtdata/images/themed/png/1/dark/perspective-horizontal-left-small.png similarity index 100% rename from rtdata/images/themed/png/dark/perspective-horizontal-left-small.png rename to rtdata/images/themed/png/1/dark/perspective-horizontal-left-small.png diff --git a/rtdata/images/themed/png/dark/perspective-horizontal-left.png b/rtdata/images/themed/png/1/dark/perspective-horizontal-left.png similarity index 100% rename from rtdata/images/themed/png/dark/perspective-horizontal-left.png rename to rtdata/images/themed/png/1/dark/perspective-horizontal-left.png diff --git a/rtdata/images/themed/png/dark/perspective-horizontal-right-small.png b/rtdata/images/themed/png/1/dark/perspective-horizontal-right-small.png similarity index 100% rename from rtdata/images/themed/png/dark/perspective-horizontal-right-small.png rename to rtdata/images/themed/png/1/dark/perspective-horizontal-right-small.png diff --git a/rtdata/images/themed/png/dark/perspective-horizontal-right.png b/rtdata/images/themed/png/1/dark/perspective-horizontal-right.png similarity index 100% rename from rtdata/images/themed/png/dark/perspective-horizontal-right.png rename to rtdata/images/themed/png/1/dark/perspective-horizontal-right.png diff --git a/rtdata/images/themed/png/dark/perspective-vertical-bottom-small.png b/rtdata/images/themed/png/1/dark/perspective-vertical-bottom-small.png similarity index 100% rename from rtdata/images/themed/png/dark/perspective-vertical-bottom-small.png rename to rtdata/images/themed/png/1/dark/perspective-vertical-bottom-small.png diff --git a/rtdata/images/themed/png/dark/perspective-vertical-bottom.png b/rtdata/images/themed/png/1/dark/perspective-vertical-bottom.png similarity index 100% rename from rtdata/images/themed/png/dark/perspective-vertical-bottom.png rename to rtdata/images/themed/png/1/dark/perspective-vertical-bottom.png diff --git a/rtdata/images/themed/png/dark/perspective-vertical-top-small.png b/rtdata/images/themed/png/1/dark/perspective-vertical-top-small.png similarity index 100% rename from rtdata/images/themed/png/dark/perspective-vertical-top-small.png rename to rtdata/images/themed/png/1/dark/perspective-vertical-top-small.png diff --git a/rtdata/images/themed/png/dark/perspective-vertical-top.png b/rtdata/images/themed/png/1/dark/perspective-vertical-top.png similarity index 100% rename from rtdata/images/themed/png/dark/perspective-vertical-top.png rename to rtdata/images/themed/png/1/dark/perspective-vertical-top.png diff --git a/rtdata/images/themed/png/dark/power-inconsistent-small.png b/rtdata/images/themed/png/1/dark/power-inconsistent-small.png similarity index 100% rename from rtdata/images/themed/png/dark/power-inconsistent-small.png rename to rtdata/images/themed/png/1/dark/power-inconsistent-small.png diff --git a/rtdata/images/themed/png/dark/power-off-small.png b/rtdata/images/themed/png/1/dark/power-off-small.png similarity index 100% rename from rtdata/images/themed/png/dark/power-off-small.png rename to rtdata/images/themed/png/1/dark/power-off-small.png diff --git a/rtdata/images/themed/png/dark/power-on-small.png b/rtdata/images/themed/png/1/dark/power-on-small.png similarity index 100% rename from rtdata/images/themed/png/dark/power-on-small.png rename to rtdata/images/themed/png/1/dark/power-on-small.png diff --git a/rtdata/images/themed/png/dark/preferences.png b/rtdata/images/themed/png/1/dark/preferences.png similarity index 100% rename from rtdata/images/themed/png/dark/preferences.png rename to rtdata/images/themed/png/1/dark/preferences.png diff --git a/rtdata/images/themed/png/dark/profile-filled.png b/rtdata/images/themed/png/1/dark/profile-filled.png similarity index 100% rename from rtdata/images/themed/png/dark/profile-filled.png rename to rtdata/images/themed/png/1/dark/profile-filled.png diff --git a/rtdata/images/themed/png/dark/profile-partial.png b/rtdata/images/themed/png/1/dark/profile-partial.png similarity index 100% rename from rtdata/images/themed/png/dark/profile-partial.png rename to rtdata/images/themed/png/1/dark/profile-partial.png diff --git a/rtdata/images/themed/png/dark/redo-all.png b/rtdata/images/themed/png/1/dark/redo-all.png similarity index 100% rename from rtdata/images/themed/png/dark/redo-all.png rename to rtdata/images/themed/png/1/dark/redo-all.png diff --git a/rtdata/images/themed/png/dark/redo-small.png b/rtdata/images/themed/png/1/dark/redo-small.png similarity index 100% rename from rtdata/images/themed/png/dark/redo-small.png rename to rtdata/images/themed/png/1/dark/redo-small.png diff --git a/rtdata/images/themed/png/dark/redo.png b/rtdata/images/themed/png/1/dark/redo.png similarity index 100% rename from rtdata/images/themed/png/dark/redo.png rename to rtdata/images/themed/png/1/dark/redo.png diff --git a/rtdata/images/themed/png/dark/refresh-red-small.png b/rtdata/images/themed/png/1/dark/refresh-red-small.png similarity index 100% rename from rtdata/images/themed/png/dark/refresh-red-small.png rename to rtdata/images/themed/png/1/dark/refresh-red-small.png diff --git a/rtdata/images/themed/png/dark/refresh-small.png b/rtdata/images/themed/png/1/dark/refresh-small.png similarity index 100% rename from rtdata/images/themed/png/dark/refresh-small.png rename to rtdata/images/themed/png/1/dark/refresh-small.png diff --git a/rtdata/images/themed/png/dark/refresh.png b/rtdata/images/themed/png/1/dark/refresh.png similarity index 100% rename from rtdata/images/themed/png/dark/refresh.png rename to rtdata/images/themed/png/1/dark/refresh.png diff --git a/rtdata/images/themed/png/dark/remove-small.png b/rtdata/images/themed/png/1/dark/remove-small.png similarity index 100% rename from rtdata/images/themed/png/dark/remove-small.png rename to rtdata/images/themed/png/1/dark/remove-small.png diff --git a/rtdata/images/themed/png/dark/remove.png b/rtdata/images/themed/png/1/dark/remove.png similarity index 100% rename from rtdata/images/themed/png/dark/remove.png rename to rtdata/images/themed/png/1/dark/remove.png diff --git a/rtdata/images/themed/png/dark/rotate-aroundnode-hicontrast.png b/rtdata/images/themed/png/1/dark/rotate-aroundnode-hicontrast.png similarity index 100% rename from rtdata/images/themed/png/dark/rotate-aroundnode-hicontrast.png rename to rtdata/images/themed/png/1/dark/rotate-aroundnode-hicontrast.png diff --git a/rtdata/images/themed/png/dark/rotate-aroundnode.png b/rtdata/images/themed/png/1/dark/rotate-aroundnode.png similarity index 100% rename from rtdata/images/themed/png/dark/rotate-aroundnode.png rename to rtdata/images/themed/png/1/dark/rotate-aroundnode.png diff --git a/rtdata/images/themed/png/dark/rotate-left-90.png b/rtdata/images/themed/png/1/dark/rotate-left-90.png similarity index 100% rename from rtdata/images/themed/png/dark/rotate-left-90.png rename to rtdata/images/themed/png/1/dark/rotate-left-90.png diff --git a/rtdata/images/themed/png/dark/rotate-left-small.png b/rtdata/images/themed/png/1/dark/rotate-left-small.png similarity index 100% rename from rtdata/images/themed/png/dark/rotate-left-small.png rename to rtdata/images/themed/png/1/dark/rotate-left-small.png diff --git a/rtdata/images/themed/png/dark/rotate-left.png b/rtdata/images/themed/png/1/dark/rotate-left.png similarity index 100% rename from rtdata/images/themed/png/dark/rotate-left.png rename to rtdata/images/themed/png/1/dark/rotate-left.png diff --git a/rtdata/images/themed/png/dark/rotate-right-90.png b/rtdata/images/themed/png/1/dark/rotate-right-90.png similarity index 100% rename from rtdata/images/themed/png/dark/rotate-right-90.png rename to rtdata/images/themed/png/1/dark/rotate-right-90.png diff --git a/rtdata/images/themed/png/dark/rotate-right-small.png b/rtdata/images/themed/png/1/dark/rotate-right-small.png similarity index 100% rename from rtdata/images/themed/png/dark/rotate-right-small.png rename to rtdata/images/themed/png/1/dark/rotate-right-small.png diff --git a/rtdata/images/themed/png/dark/rotate-right.png b/rtdata/images/themed/png/1/dark/rotate-right.png similarity index 100% rename from rtdata/images/themed/png/dark/rotate-right.png rename to rtdata/images/themed/png/1/dark/rotate-right.png diff --git a/rtdata/images/themed/png/dark/rotate-straighten-small.png b/rtdata/images/themed/png/1/dark/rotate-straighten-small.png similarity index 100% rename from rtdata/images/themed/png/dark/rotate-straighten-small.png rename to rtdata/images/themed/png/1/dark/rotate-straighten-small.png diff --git a/rtdata/images/themed/png/dark/rotate-straighten.png b/rtdata/images/themed/png/1/dark/rotate-straighten.png similarity index 100% rename from rtdata/images/themed/png/dark/rotate-straighten.png rename to rtdata/images/themed/png/1/dark/rotate-straighten.png diff --git a/rtdata/images/themed/png/dark/save-small.png b/rtdata/images/themed/png/1/dark/save-small.png similarity index 100% rename from rtdata/images/themed/png/dark/save-small.png rename to rtdata/images/themed/png/1/dark/save-small.png diff --git a/rtdata/images/themed/png/dark/save.png b/rtdata/images/themed/png/1/dark/save.png similarity index 100% rename from rtdata/images/themed/png/dark/save.png rename to rtdata/images/themed/png/1/dark/save.png diff --git a/rtdata/images/themed/png/dark/saved-no-small.png b/rtdata/images/themed/png/1/dark/saved-no-small.png similarity index 100% rename from rtdata/images/themed/png/dark/saved-no-small.png rename to rtdata/images/themed/png/1/dark/saved-no-small.png diff --git a/rtdata/images/themed/png/dark/saved-yes-small.png b/rtdata/images/themed/png/1/dark/saved-yes-small.png similarity index 100% rename from rtdata/images/themed/png/dark/saved-yes-small.png rename to rtdata/images/themed/png/1/dark/saved-yes-small.png diff --git a/rtdata/images/themed/png/dark/square-toggle-black-off-narrow.png b/rtdata/images/themed/png/1/dark/square-toggle-black-off-narrow.png similarity index 100% rename from rtdata/images/themed/png/dark/square-toggle-black-off-narrow.png rename to rtdata/images/themed/png/1/dark/square-toggle-black-off-narrow.png diff --git a/rtdata/images/themed/png/dark/square-toggle-black-on-narrow.png b/rtdata/images/themed/png/1/dark/square-toggle-black-on-narrow.png similarity index 100% rename from rtdata/images/themed/png/dark/square-toggle-black-on-narrow.png rename to rtdata/images/themed/png/1/dark/square-toggle-black-on-narrow.png diff --git a/rtdata/images/themed/png/dark/square-toggle-blue-off-narrow.png b/rtdata/images/themed/png/1/dark/square-toggle-blue-off-narrow.png similarity index 100% rename from rtdata/images/themed/png/dark/square-toggle-blue-off-narrow.png rename to rtdata/images/themed/png/1/dark/square-toggle-blue-off-narrow.png diff --git a/rtdata/images/themed/png/dark/square-toggle-blue-on-narrow.png b/rtdata/images/themed/png/1/dark/square-toggle-blue-on-narrow.png similarity index 100% rename from rtdata/images/themed/png/dark/square-toggle-blue-on-narrow.png rename to rtdata/images/themed/png/1/dark/square-toggle-blue-on-narrow.png diff --git a/rtdata/images/themed/png/dark/square-toggle-gray-off-narrow.png b/rtdata/images/themed/png/1/dark/square-toggle-gray-off-narrow.png similarity index 100% rename from rtdata/images/themed/png/dark/square-toggle-gray-off-narrow.png rename to rtdata/images/themed/png/1/dark/square-toggle-gray-off-narrow.png diff --git a/rtdata/images/themed/png/dark/square-toggle-gray-on-narrow.png b/rtdata/images/themed/png/1/dark/square-toggle-gray-on-narrow.png similarity index 100% rename from rtdata/images/themed/png/dark/square-toggle-gray-on-narrow.png rename to rtdata/images/themed/png/1/dark/square-toggle-gray-on-narrow.png diff --git a/rtdata/images/themed/png/dark/square-toggle-green-off-narrow.png b/rtdata/images/themed/png/1/dark/square-toggle-green-off-narrow.png similarity index 100% rename from rtdata/images/themed/png/dark/square-toggle-green-off-narrow.png rename to rtdata/images/themed/png/1/dark/square-toggle-green-off-narrow.png diff --git a/rtdata/images/themed/png/dark/square-toggle-green-on-narrow.png b/rtdata/images/themed/png/1/dark/square-toggle-green-on-narrow.png similarity index 100% rename from rtdata/images/themed/png/dark/square-toggle-green-on-narrow.png rename to rtdata/images/themed/png/1/dark/square-toggle-green-on-narrow.png diff --git a/rtdata/images/themed/png/dark/square-toggle-luminosity-off-narrow.png b/rtdata/images/themed/png/1/dark/square-toggle-luminosity-off-narrow.png similarity index 100% rename from rtdata/images/themed/png/dark/square-toggle-luminosity-off-narrow.png rename to rtdata/images/themed/png/1/dark/square-toggle-luminosity-off-narrow.png diff --git a/rtdata/images/themed/png/dark/square-toggle-luminosity-on-narrow.png b/rtdata/images/themed/png/1/dark/square-toggle-luminosity-on-narrow.png similarity index 100% rename from rtdata/images/themed/png/dark/square-toggle-luminosity-on-narrow.png rename to rtdata/images/themed/png/1/dark/square-toggle-luminosity-on-narrow.png diff --git a/rtdata/images/themed/png/dark/square-toggle-red-off-narrow.png b/rtdata/images/themed/png/1/dark/square-toggle-red-off-narrow.png similarity index 100% rename from rtdata/images/themed/png/dark/square-toggle-red-off-narrow.png rename to rtdata/images/themed/png/1/dark/square-toggle-red-off-narrow.png diff --git a/rtdata/images/themed/png/dark/square-toggle-red-on-narrow.png b/rtdata/images/themed/png/1/dark/square-toggle-red-on-narrow.png similarity index 100% rename from rtdata/images/themed/png/dark/square-toggle-red-on-narrow.png rename to rtdata/images/themed/png/1/dark/square-toggle-red-on-narrow.png diff --git a/rtdata/images/themed/png/dark/square-toggle-theme-off-narrow.png b/rtdata/images/themed/png/1/dark/square-toggle-theme-off-narrow.png similarity index 100% rename from rtdata/images/themed/png/dark/square-toggle-theme-off-narrow.png rename to rtdata/images/themed/png/1/dark/square-toggle-theme-off-narrow.png diff --git a/rtdata/images/themed/png/dark/square-toggle-theme-on-narrow.png b/rtdata/images/themed/png/1/dark/square-toggle-theme-on-narrow.png similarity index 100% rename from rtdata/images/themed/png/dark/square-toggle-theme-on-narrow.png rename to rtdata/images/themed/png/1/dark/square-toggle-theme-on-narrow.png diff --git a/rtdata/images/themed/png/dark/square-toggle-white-off-narrow.png b/rtdata/images/themed/png/1/dark/square-toggle-white-off-narrow.png similarity index 100% rename from rtdata/images/themed/png/dark/square-toggle-white-off-narrow.png rename to rtdata/images/themed/png/1/dark/square-toggle-white-off-narrow.png diff --git a/rtdata/images/themed/png/dark/square-toggle-white-on-narrow.png b/rtdata/images/themed/png/1/dark/square-toggle-white-on-narrow.png similarity index 100% rename from rtdata/images/themed/png/dark/square-toggle-white-on-narrow.png rename to rtdata/images/themed/png/1/dark/square-toggle-white-on-narrow.png diff --git a/rtdata/images/themed/png/dark/star-gold-hollow-narrow.png b/rtdata/images/themed/png/1/dark/star-gold-hollow-narrow.png similarity index 100% rename from rtdata/images/themed/png/dark/star-gold-hollow-narrow.png rename to rtdata/images/themed/png/1/dark/star-gold-hollow-narrow.png diff --git a/rtdata/images/themed/png/dark/star-gold-hollow-small.png b/rtdata/images/themed/png/1/dark/star-gold-hollow-small.png similarity index 100% rename from rtdata/images/themed/png/dark/star-gold-hollow-small.png rename to rtdata/images/themed/png/1/dark/star-gold-hollow-small.png diff --git a/rtdata/images/themed/png/dark/star-gold-narrow.png b/rtdata/images/themed/png/1/dark/star-gold-narrow.png similarity index 100% rename from rtdata/images/themed/png/dark/star-gold-narrow.png rename to rtdata/images/themed/png/1/dark/star-gold-narrow.png diff --git a/rtdata/images/themed/png/dark/star-gold-small.png b/rtdata/images/themed/png/1/dark/star-gold-small.png similarity index 100% rename from rtdata/images/themed/png/dark/star-gold-small.png rename to rtdata/images/themed/png/1/dark/star-gold-small.png diff --git a/rtdata/images/themed/png/dark/star-hollow-narrow.png b/rtdata/images/themed/png/1/dark/star-hollow-narrow.png similarity index 100% rename from rtdata/images/themed/png/dark/star-hollow-narrow.png rename to rtdata/images/themed/png/1/dark/star-hollow-narrow.png diff --git a/rtdata/images/themed/png/dark/star-hollow-small.png b/rtdata/images/themed/png/1/dark/star-hollow-small.png similarity index 100% rename from rtdata/images/themed/png/dark/star-hollow-small.png rename to rtdata/images/themed/png/1/dark/star-hollow-small.png diff --git a/rtdata/images/themed/png/dark/star-narrow.png b/rtdata/images/themed/png/1/dark/star-narrow.png similarity index 100% rename from rtdata/images/themed/png/dark/star-narrow.png rename to rtdata/images/themed/png/1/dark/star-narrow.png diff --git a/rtdata/images/themed/png/dark/star-small.png b/rtdata/images/themed/png/1/dark/star-small.png similarity index 100% rename from rtdata/images/themed/png/dark/star-small.png rename to rtdata/images/themed/png/1/dark/star-small.png diff --git a/rtdata/images/themed/png/dark/template-16.png b/rtdata/images/themed/png/1/dark/template-16.png similarity index 100% rename from rtdata/images/themed/png/dark/template-16.png rename to rtdata/images/themed/png/1/dark/template-16.png diff --git a/rtdata/images/themed/png/dark/template-24.png b/rtdata/images/themed/png/1/dark/template-24.png similarity index 100% rename from rtdata/images/themed/png/dark/template-24.png rename to rtdata/images/themed/png/1/dark/template-24.png diff --git a/rtdata/images/themed/png/dark/template-narrow.png b/rtdata/images/themed/png/1/dark/template-narrow.png similarity index 100% rename from rtdata/images/themed/png/dark/template-narrow.png rename to rtdata/images/themed/png/1/dark/template-narrow.png diff --git a/rtdata/images/themed/png/dark/tick-green-hollow-small.png b/rtdata/images/themed/png/1/dark/tick-green-hollow-small.png similarity index 100% rename from rtdata/images/themed/png/dark/tick-green-hollow-small.png rename to rtdata/images/themed/png/1/dark/tick-green-hollow-small.png diff --git a/rtdata/images/themed/png/dark/tick-green-hollow.png b/rtdata/images/themed/png/1/dark/tick-green-hollow.png similarity index 100% rename from rtdata/images/themed/png/dark/tick-green-hollow.png rename to rtdata/images/themed/png/1/dark/tick-green-hollow.png diff --git a/rtdata/images/themed/png/dark/tick-green-small.png b/rtdata/images/themed/png/1/dark/tick-green-small.png similarity index 100% rename from rtdata/images/themed/png/dark/tick-green-small.png rename to rtdata/images/themed/png/1/dark/tick-green-small.png diff --git a/rtdata/images/themed/png/dark/tick-green.png b/rtdata/images/themed/png/1/dark/tick-green.png similarity index 100% rename from rtdata/images/themed/png/dark/tick-green.png rename to rtdata/images/themed/png/1/dark/tick-green.png diff --git a/rtdata/images/themed/png/dark/tick-hollow-small.png b/rtdata/images/themed/png/1/dark/tick-hollow-small.png similarity index 100% rename from rtdata/images/themed/png/dark/tick-hollow-small.png rename to rtdata/images/themed/png/1/dark/tick-hollow-small.png diff --git a/rtdata/images/themed/png/dark/tick-small.png b/rtdata/images/themed/png/1/dark/tick-small.png similarity index 100% rename from rtdata/images/themed/png/dark/tick-small.png rename to rtdata/images/themed/png/1/dark/tick-small.png diff --git a/rtdata/images/themed/png/dark/tick.png b/rtdata/images/themed/png/1/dark/tick.png similarity index 100% rename from rtdata/images/themed/png/dark/tick.png rename to rtdata/images/themed/png/1/dark/tick.png diff --git a/rtdata/images/themed/png/dark/transform.png b/rtdata/images/themed/png/1/dark/transform.png similarity index 100% rename from rtdata/images/themed/png/dark/transform.png rename to rtdata/images/themed/png/1/dark/transform.png diff --git a/rtdata/images/themed/png/dark/trash-delete.png b/rtdata/images/themed/png/1/dark/trash-delete.png similarity index 100% rename from rtdata/images/themed/png/dark/trash-delete.png rename to rtdata/images/themed/png/1/dark/trash-delete.png diff --git a/rtdata/images/themed/png/dark/trash-empty-show.png b/rtdata/images/themed/png/1/dark/trash-empty-show.png similarity index 100% rename from rtdata/images/themed/png/dark/trash-empty-show.png rename to rtdata/images/themed/png/1/dark/trash-empty-show.png diff --git a/rtdata/images/themed/png/dark/trash-empty.png b/rtdata/images/themed/png/1/dark/trash-empty.png similarity index 100% rename from rtdata/images/themed/png/dark/trash-empty.png rename to rtdata/images/themed/png/1/dark/trash-empty.png diff --git a/rtdata/images/themed/png/dark/trash-full-show.png b/rtdata/images/themed/png/1/dark/trash-full-show.png similarity index 100% rename from rtdata/images/themed/png/dark/trash-full-show.png rename to rtdata/images/themed/png/1/dark/trash-full-show.png diff --git a/rtdata/images/themed/png/dark/trash-full.png b/rtdata/images/themed/png/1/dark/trash-full.png similarity index 100% rename from rtdata/images/themed/png/dark/trash-full.png rename to rtdata/images/themed/png/1/dark/trash-full.png diff --git a/rtdata/images/themed/png/dark/trash-hide-deleted.png b/rtdata/images/themed/png/1/dark/trash-hide-deleted.png similarity index 100% rename from rtdata/images/themed/png/dark/trash-hide-deleted.png rename to rtdata/images/themed/png/1/dark/trash-hide-deleted.png diff --git a/rtdata/images/themed/png/dark/trash-remove-small.png b/rtdata/images/themed/png/1/dark/trash-remove-small.png similarity index 100% rename from rtdata/images/themed/png/dark/trash-remove-small.png rename to rtdata/images/themed/png/1/dark/trash-remove-small.png diff --git a/rtdata/images/themed/png/dark/trash-remove.png b/rtdata/images/themed/png/1/dark/trash-remove.png similarity index 100% rename from rtdata/images/themed/png/dark/trash-remove.png rename to rtdata/images/themed/png/1/dark/trash-remove.png diff --git a/rtdata/images/themed/png/dark/trash-small.png b/rtdata/images/themed/png/1/dark/trash-small.png similarity index 100% rename from rtdata/images/themed/png/dark/trash-small.png rename to rtdata/images/themed/png/1/dark/trash-small.png diff --git a/rtdata/images/themed/png/dark/undo-all.png b/rtdata/images/themed/png/1/dark/undo-all.png similarity index 100% rename from rtdata/images/themed/png/dark/undo-all.png rename to rtdata/images/themed/png/1/dark/undo-all.png diff --git a/rtdata/images/themed/png/dark/undo-small.png b/rtdata/images/themed/png/1/dark/undo-small.png similarity index 100% rename from rtdata/images/themed/png/dark/undo-small.png rename to rtdata/images/themed/png/1/dark/undo-small.png diff --git a/rtdata/images/themed/png/dark/undo.png b/rtdata/images/themed/png/1/dark/undo.png similarity index 100% rename from rtdata/images/themed/png/dark/undo.png rename to rtdata/images/themed/png/1/dark/undo.png diff --git a/rtdata/images/themed/png/dark/warning-highlights.png b/rtdata/images/themed/png/1/dark/warning-highlights.png similarity index 100% rename from rtdata/images/themed/png/dark/warning-highlights.png rename to rtdata/images/themed/png/1/dark/warning-highlights.png diff --git a/rtdata/images/themed/png/dark/warning-shadows.png b/rtdata/images/themed/png/1/dark/warning-shadows.png similarity index 100% rename from rtdata/images/themed/png/dark/warning-shadows.png rename to rtdata/images/themed/png/1/dark/warning-shadows.png diff --git a/rtdata/images/themed/png/dark/wavelets.png b/rtdata/images/themed/png/1/dark/wavelets.png similarity index 100% rename from rtdata/images/themed/png/dark/wavelets.png rename to rtdata/images/themed/png/1/dark/wavelets.png diff --git a/rtdata/images/themed/png/dark/wb-auto-small.png b/rtdata/images/themed/png/1/dark/wb-auto-small.png similarity index 100% rename from rtdata/images/themed/png/dark/wb-auto-small.png rename to rtdata/images/themed/png/1/dark/wb-auto-small.png diff --git a/rtdata/images/themed/png/dark/wb-auto.png b/rtdata/images/themed/png/1/dark/wb-auto.png similarity index 100% rename from rtdata/images/themed/png/dark/wb-auto.png rename to rtdata/images/themed/png/1/dark/wb-auto.png diff --git a/rtdata/images/themed/png/dark/wb-camera-small.png b/rtdata/images/themed/png/1/dark/wb-camera-small.png similarity index 100% rename from rtdata/images/themed/png/dark/wb-camera-small.png rename to rtdata/images/themed/png/1/dark/wb-camera-small.png diff --git a/rtdata/images/themed/png/dark/wb-camera.png b/rtdata/images/themed/png/1/dark/wb-camera.png similarity index 100% rename from rtdata/images/themed/png/dark/wb-camera.png rename to rtdata/images/themed/png/1/dark/wb-camera.png diff --git a/rtdata/images/themed/png/dark/wb-cloudy-small.png b/rtdata/images/themed/png/1/dark/wb-cloudy-small.png similarity index 100% rename from rtdata/images/themed/png/dark/wb-cloudy-small.png rename to rtdata/images/themed/png/1/dark/wb-cloudy-small.png diff --git a/rtdata/images/themed/png/dark/wb-cloudy.png b/rtdata/images/themed/png/1/dark/wb-cloudy.png similarity index 100% rename from rtdata/images/themed/png/dark/wb-cloudy.png rename to rtdata/images/themed/png/1/dark/wb-cloudy.png diff --git a/rtdata/images/themed/png/dark/wb-custom-small.png b/rtdata/images/themed/png/1/dark/wb-custom-small.png similarity index 100% rename from rtdata/images/themed/png/dark/wb-custom-small.png rename to rtdata/images/themed/png/1/dark/wb-custom-small.png diff --git a/rtdata/images/themed/png/dark/wb-custom.png b/rtdata/images/themed/png/1/dark/wb-custom.png similarity index 100% rename from rtdata/images/themed/png/dark/wb-custom.png rename to rtdata/images/themed/png/1/dark/wb-custom.png diff --git a/rtdata/images/themed/png/dark/wb-flash-small.png b/rtdata/images/themed/png/1/dark/wb-flash-small.png similarity index 100% rename from rtdata/images/themed/png/dark/wb-flash-small.png rename to rtdata/images/themed/png/1/dark/wb-flash-small.png diff --git a/rtdata/images/themed/png/dark/wb-flash.png b/rtdata/images/themed/png/1/dark/wb-flash.png similarity index 100% rename from rtdata/images/themed/png/dark/wb-flash.png rename to rtdata/images/themed/png/1/dark/wb-flash.png diff --git a/rtdata/images/themed/png/dark/wb-fluorescent-small.png b/rtdata/images/themed/png/1/dark/wb-fluorescent-small.png similarity index 100% rename from rtdata/images/themed/png/dark/wb-fluorescent-small.png rename to rtdata/images/themed/png/1/dark/wb-fluorescent-small.png diff --git a/rtdata/images/themed/png/dark/wb-fluorescent.png b/rtdata/images/themed/png/1/dark/wb-fluorescent.png similarity index 100% rename from rtdata/images/themed/png/dark/wb-fluorescent.png rename to rtdata/images/themed/png/1/dark/wb-fluorescent.png diff --git a/rtdata/images/themed/png/dark/wb-lamp-small.png b/rtdata/images/themed/png/1/dark/wb-lamp-small.png similarity index 100% rename from rtdata/images/themed/png/dark/wb-lamp-small.png rename to rtdata/images/themed/png/1/dark/wb-lamp-small.png diff --git a/rtdata/images/themed/png/dark/wb-lamp.png b/rtdata/images/themed/png/1/dark/wb-lamp.png similarity index 100% rename from rtdata/images/themed/png/dark/wb-lamp.png rename to rtdata/images/themed/png/1/dark/wb-lamp.png diff --git a/rtdata/images/themed/png/dark/wb-led-small.png b/rtdata/images/themed/png/1/dark/wb-led-small.png similarity index 100% rename from rtdata/images/themed/png/dark/wb-led-small.png rename to rtdata/images/themed/png/1/dark/wb-led-small.png diff --git a/rtdata/images/themed/png/dark/wb-led.png b/rtdata/images/themed/png/1/dark/wb-led.png similarity index 100% rename from rtdata/images/themed/png/dark/wb-led.png rename to rtdata/images/themed/png/1/dark/wb-led.png diff --git a/rtdata/images/themed/png/dark/wb-shade-small.png b/rtdata/images/themed/png/1/dark/wb-shade-small.png similarity index 100% rename from rtdata/images/themed/png/dark/wb-shade-small.png rename to rtdata/images/themed/png/1/dark/wb-shade-small.png diff --git a/rtdata/images/themed/png/dark/wb-shade.png b/rtdata/images/themed/png/1/dark/wb-shade.png similarity index 100% rename from rtdata/images/themed/png/dark/wb-shade.png rename to rtdata/images/themed/png/1/dark/wb-shade.png diff --git a/rtdata/images/themed/png/dark/wb-sun-small.png b/rtdata/images/themed/png/1/dark/wb-sun-small.png similarity index 100% rename from rtdata/images/themed/png/dark/wb-sun-small.png rename to rtdata/images/themed/png/1/dark/wb-sun-small.png diff --git a/rtdata/images/themed/png/dark/wb-sun.png b/rtdata/images/themed/png/1/dark/wb-sun.png similarity index 100% rename from rtdata/images/themed/png/dark/wb-sun.png rename to rtdata/images/themed/png/1/dark/wb-sun.png diff --git a/rtdata/images/themed/png/dark/wb-tungsten-small.png b/rtdata/images/themed/png/1/dark/wb-tungsten-small.png similarity index 100% rename from rtdata/images/themed/png/dark/wb-tungsten-small.png rename to rtdata/images/themed/png/1/dark/wb-tungsten-small.png diff --git a/rtdata/images/themed/png/dark/wb-tungsten.png b/rtdata/images/themed/png/1/dark/wb-tungsten.png similarity index 100% rename from rtdata/images/themed/png/dark/wb-tungsten.png rename to rtdata/images/themed/png/1/dark/wb-tungsten.png diff --git a/rtdata/images/themed/png/dark/wb-water-small.png b/rtdata/images/themed/png/1/dark/wb-water-small.png similarity index 100% rename from rtdata/images/themed/png/dark/wb-water-small.png rename to rtdata/images/themed/png/1/dark/wb-water-small.png diff --git a/rtdata/images/themed/png/dark/wb-water.png b/rtdata/images/themed/png/1/dark/wb-water.png similarity index 100% rename from rtdata/images/themed/png/dark/wb-water.png rename to rtdata/images/themed/png/1/dark/wb-water.png diff --git a/rtdata/images/themed/png/dark/window-add.png b/rtdata/images/themed/png/1/dark/window-add.png similarity index 100% rename from rtdata/images/themed/png/dark/window-add.png rename to rtdata/images/themed/png/1/dark/window-add.png diff --git a/rtdata/images/themed/png/light/add-small.png b/rtdata/images/themed/png/1/light/add-small.png similarity index 100% rename from rtdata/images/themed/png/light/add-small.png rename to rtdata/images/themed/png/1/light/add-small.png diff --git a/rtdata/images/themed/png/light/add.png b/rtdata/images/themed/png/1/light/add.png similarity index 100% rename from rtdata/images/themed/png/light/add.png rename to rtdata/images/themed/png/1/light/add.png diff --git a/rtdata/images/themed/png/light/aperture.png b/rtdata/images/themed/png/1/light/aperture.png similarity index 100% rename from rtdata/images/themed/png/light/aperture.png rename to rtdata/images/themed/png/1/light/aperture.png diff --git a/rtdata/images/themed/png/light/arrow-down-small.png b/rtdata/images/themed/png/1/light/arrow-down-small.png similarity index 100% rename from rtdata/images/themed/png/light/arrow-down-small.png rename to rtdata/images/themed/png/1/light/arrow-down-small.png diff --git a/rtdata/images/themed/png/light/arrow-left-small.png b/rtdata/images/themed/png/1/light/arrow-left-small.png similarity index 100% rename from rtdata/images/themed/png/light/arrow-left-small.png rename to rtdata/images/themed/png/1/light/arrow-left-small.png diff --git a/rtdata/images/themed/png/light/arrow-right-small.png b/rtdata/images/themed/png/1/light/arrow-right-small.png similarity index 100% rename from rtdata/images/themed/png/light/arrow-right-small.png rename to rtdata/images/themed/png/1/light/arrow-right-small.png diff --git a/rtdata/images/themed/png/light/arrow-up-small.png b/rtdata/images/themed/png/1/light/arrow-up-small.png similarity index 100% rename from rtdata/images/themed/png/light/arrow-up-small.png rename to rtdata/images/themed/png/1/light/arrow-up-small.png diff --git a/rtdata/images/themed/png/light/arrow-updown.png b/rtdata/images/themed/png/1/light/arrow-updown.png similarity index 100% rename from rtdata/images/themed/png/light/arrow-updown.png rename to rtdata/images/themed/png/1/light/arrow-updown.png diff --git a/rtdata/images/themed/png/light/arrow2-left.png b/rtdata/images/themed/png/1/light/arrow2-left.png similarity index 100% rename from rtdata/images/themed/png/light/arrow2-left.png rename to rtdata/images/themed/png/1/light/arrow2-left.png diff --git a/rtdata/images/themed/png/light/arrow2-right.png b/rtdata/images/themed/png/1/light/arrow2-right.png similarity index 100% rename from rtdata/images/themed/png/light/arrow2-right.png rename to rtdata/images/themed/png/1/light/arrow2-right.png diff --git a/rtdata/images/themed/png/light/atom.png b/rtdata/images/themed/png/1/light/atom.png similarity index 100% rename from rtdata/images/themed/png/light/atom.png rename to rtdata/images/themed/png/1/light/atom.png diff --git a/rtdata/images/themed/png/light/bayer.png b/rtdata/images/themed/png/1/light/bayer.png similarity index 100% rename from rtdata/images/themed/png/light/bayer.png rename to rtdata/images/themed/png/1/light/bayer.png diff --git a/rtdata/images/themed/png/light/beforeafter.png b/rtdata/images/themed/png/1/light/beforeafter.png similarity index 100% rename from rtdata/images/themed/png/light/beforeafter.png rename to rtdata/images/themed/png/1/light/beforeafter.png diff --git a/rtdata/images/themed/png/light/cancel-small.png b/rtdata/images/themed/png/1/light/cancel-small.png similarity index 100% rename from rtdata/images/themed/png/light/cancel-small.png rename to rtdata/images/themed/png/1/light/cancel-small.png diff --git a/rtdata/images/themed/png/light/cancel.png b/rtdata/images/themed/png/1/light/cancel.png similarity index 100% rename from rtdata/images/themed/png/light/cancel.png rename to rtdata/images/themed/png/1/light/cancel.png diff --git a/rtdata/images/themed/png/light/circle-black-small.png b/rtdata/images/themed/png/1/light/circle-black-small.png similarity index 100% rename from rtdata/images/themed/png/light/circle-black-small.png rename to rtdata/images/themed/png/1/light/circle-black-small.png diff --git a/rtdata/images/themed/png/light/circle-blue-green-small.png b/rtdata/images/themed/png/1/light/circle-blue-green-small.png similarity index 100% rename from rtdata/images/themed/png/light/circle-blue-green-small.png rename to rtdata/images/themed/png/1/light/circle-blue-green-small.png diff --git a/rtdata/images/themed/png/light/circle-blue-red-small.png b/rtdata/images/themed/png/1/light/circle-blue-red-small.png similarity index 100% rename from rtdata/images/themed/png/light/circle-blue-red-small.png rename to rtdata/images/themed/png/1/light/circle-blue-red-small.png diff --git a/rtdata/images/themed/png/light/circle-blue-small.png b/rtdata/images/themed/png/1/light/circle-blue-small.png similarity index 100% rename from rtdata/images/themed/png/light/circle-blue-small.png rename to rtdata/images/themed/png/1/light/circle-blue-small.png diff --git a/rtdata/images/themed/png/light/circle-blue-yellow-small.png b/rtdata/images/themed/png/1/light/circle-blue-yellow-small.png similarity index 100% rename from rtdata/images/themed/png/light/circle-blue-yellow-small.png rename to rtdata/images/themed/png/1/light/circle-blue-yellow-small.png diff --git a/rtdata/images/themed/png/light/circle-cyan-red-small.png b/rtdata/images/themed/png/1/light/circle-cyan-red-small.png similarity index 100% rename from rtdata/images/themed/png/light/circle-cyan-red-small.png rename to rtdata/images/themed/png/1/light/circle-cyan-red-small.png diff --git a/rtdata/images/themed/png/light/circle-cyan-small.png b/rtdata/images/themed/png/1/light/circle-cyan-small.png similarity index 100% rename from rtdata/images/themed/png/light/circle-cyan-small.png rename to rtdata/images/themed/png/1/light/circle-cyan-small.png diff --git a/rtdata/images/themed/png/light/circle-darkgray-small.png b/rtdata/images/themed/png/1/light/circle-darkgray-small.png similarity index 100% rename from rtdata/images/themed/png/light/circle-darkgray-small.png rename to rtdata/images/themed/png/1/light/circle-darkgray-small.png diff --git a/rtdata/images/themed/png/light/circle-empty-blue-small.png b/rtdata/images/themed/png/1/light/circle-empty-blue-small.png similarity index 100% rename from rtdata/images/themed/png/light/circle-empty-blue-small.png rename to rtdata/images/themed/png/1/light/circle-empty-blue-small.png diff --git a/rtdata/images/themed/png/light/circle-empty-darkgray-small.png b/rtdata/images/themed/png/1/light/circle-empty-darkgray-small.png similarity index 100% rename from rtdata/images/themed/png/light/circle-empty-darkgray-small.png rename to rtdata/images/themed/png/1/light/circle-empty-darkgray-small.png diff --git a/rtdata/images/themed/png/light/circle-empty-gray-small.png b/rtdata/images/themed/png/1/light/circle-empty-gray-small.png similarity index 100% rename from rtdata/images/themed/png/light/circle-empty-gray-small.png rename to rtdata/images/themed/png/1/light/circle-empty-gray-small.png diff --git a/rtdata/images/themed/png/light/circle-empty-green-small.png b/rtdata/images/themed/png/1/light/circle-empty-green-small.png similarity index 100% rename from rtdata/images/themed/png/light/circle-empty-green-small.png rename to rtdata/images/themed/png/1/light/circle-empty-green-small.png diff --git a/rtdata/images/themed/png/light/circle-empty-purple-small.png b/rtdata/images/themed/png/1/light/circle-empty-purple-small.png similarity index 100% rename from rtdata/images/themed/png/light/circle-empty-purple-small.png rename to rtdata/images/themed/png/1/light/circle-empty-purple-small.png diff --git a/rtdata/images/themed/png/light/circle-empty-red-small.png b/rtdata/images/themed/png/1/light/circle-empty-red-small.png similarity index 100% rename from rtdata/images/themed/png/light/circle-empty-red-small.png rename to rtdata/images/themed/png/1/light/circle-empty-red-small.png diff --git a/rtdata/images/themed/png/light/circle-empty-yellow-small.png b/rtdata/images/themed/png/1/light/circle-empty-yellow-small.png similarity index 100% rename from rtdata/images/themed/png/light/circle-empty-yellow-small.png rename to rtdata/images/themed/png/1/light/circle-empty-yellow-small.png diff --git a/rtdata/images/themed/png/light/circle-gray-blue-small.png b/rtdata/images/themed/png/1/light/circle-gray-blue-small.png similarity index 100% rename from rtdata/images/themed/png/light/circle-gray-blue-small.png rename to rtdata/images/themed/png/1/light/circle-gray-blue-small.png diff --git a/rtdata/images/themed/png/light/circle-gray-green-small.png b/rtdata/images/themed/png/1/light/circle-gray-green-small.png similarity index 100% rename from rtdata/images/themed/png/light/circle-gray-green-small.png rename to rtdata/images/themed/png/1/light/circle-gray-green-small.png diff --git a/rtdata/images/themed/png/light/circle-gray-red-small.png b/rtdata/images/themed/png/1/light/circle-gray-red-small.png similarity index 100% rename from rtdata/images/themed/png/light/circle-gray-red-small.png rename to rtdata/images/themed/png/1/light/circle-gray-red-small.png diff --git a/rtdata/images/themed/png/light/circle-gray-small.png b/rtdata/images/themed/png/1/light/circle-gray-small.png similarity index 100% rename from rtdata/images/themed/png/light/circle-gray-small.png rename to rtdata/images/themed/png/1/light/circle-gray-small.png diff --git a/rtdata/images/themed/png/light/circle-green-blue-small.png b/rtdata/images/themed/png/1/light/circle-green-blue-small.png similarity index 100% rename from rtdata/images/themed/png/light/circle-green-blue-small.png rename to rtdata/images/themed/png/1/light/circle-green-blue-small.png diff --git a/rtdata/images/themed/png/light/circle-green-red-small.png b/rtdata/images/themed/png/1/light/circle-green-red-small.png similarity index 100% rename from rtdata/images/themed/png/light/circle-green-red-small.png rename to rtdata/images/themed/png/1/light/circle-green-red-small.png diff --git a/rtdata/images/themed/png/light/circle-green-small.png b/rtdata/images/themed/png/1/light/circle-green-small.png similarity index 100% rename from rtdata/images/themed/png/light/circle-green-small.png rename to rtdata/images/themed/png/1/light/circle-green-small.png diff --git a/rtdata/images/themed/png/light/circle-magenta-small.png b/rtdata/images/themed/png/1/light/circle-magenta-small.png similarity index 100% rename from rtdata/images/themed/png/light/circle-magenta-small.png rename to rtdata/images/themed/png/1/light/circle-magenta-small.png diff --git a/rtdata/images/themed/png/light/circle-orange-small.png b/rtdata/images/themed/png/1/light/circle-orange-small.png similarity index 100% rename from rtdata/images/themed/png/light/circle-orange-small.png rename to rtdata/images/themed/png/1/light/circle-orange-small.png diff --git a/rtdata/images/themed/png/light/circle-purple-small.png b/rtdata/images/themed/png/1/light/circle-purple-small.png similarity index 100% rename from rtdata/images/themed/png/light/circle-purple-small.png rename to rtdata/images/themed/png/1/light/circle-purple-small.png diff --git a/rtdata/images/themed/png/light/circle-red-blue-small.png b/rtdata/images/themed/png/1/light/circle-red-blue-small.png similarity index 100% rename from rtdata/images/themed/png/light/circle-red-blue-small.png rename to rtdata/images/themed/png/1/light/circle-red-blue-small.png diff --git a/rtdata/images/themed/png/light/circle-red-cyan-small.png b/rtdata/images/themed/png/1/light/circle-red-cyan-small.png similarity index 100% rename from rtdata/images/themed/png/light/circle-red-cyan-small.png rename to rtdata/images/themed/png/1/light/circle-red-cyan-small.png diff --git a/rtdata/images/themed/png/light/circle-red-green-small.png b/rtdata/images/themed/png/1/light/circle-red-green-small.png similarity index 100% rename from rtdata/images/themed/png/light/circle-red-green-small.png rename to rtdata/images/themed/png/1/light/circle-red-green-small.png diff --git a/rtdata/images/themed/png/light/circle-red-small.png b/rtdata/images/themed/png/1/light/circle-red-small.png similarity index 100% rename from rtdata/images/themed/png/light/circle-red-small.png rename to rtdata/images/themed/png/1/light/circle-red-small.png diff --git a/rtdata/images/themed/png/light/circle-white-small.png b/rtdata/images/themed/png/1/light/circle-white-small.png similarity index 100% rename from rtdata/images/themed/png/light/circle-white-small.png rename to rtdata/images/themed/png/1/light/circle-white-small.png diff --git a/rtdata/images/themed/png/light/circle-yellow-blue-small.png b/rtdata/images/themed/png/1/light/circle-yellow-blue-small.png similarity index 100% rename from rtdata/images/themed/png/light/circle-yellow-blue-small.png rename to rtdata/images/themed/png/1/light/circle-yellow-blue-small.png diff --git a/rtdata/images/themed/png/light/circle-yellow-small.png b/rtdata/images/themed/png/1/light/circle-yellow-small.png similarity index 100% rename from rtdata/images/themed/png/light/circle-yellow-small.png rename to rtdata/images/themed/png/1/light/circle-yellow-small.png diff --git a/rtdata/images/themed/png/light/color-circles.png b/rtdata/images/themed/png/1/light/color-circles.png similarity index 100% rename from rtdata/images/themed/png/light/color-circles.png rename to rtdata/images/themed/png/1/light/color-circles.png diff --git a/rtdata/images/themed/png/light/color-picker-add-hicontrast.png b/rtdata/images/themed/png/1/light/color-picker-add-hicontrast.png similarity index 100% rename from rtdata/images/themed/png/light/color-picker-add-hicontrast.png rename to rtdata/images/themed/png/1/light/color-picker-add-hicontrast.png diff --git a/rtdata/images/themed/png/light/color-picker-add.png b/rtdata/images/themed/png/1/light/color-picker-add.png similarity index 100% rename from rtdata/images/themed/png/light/color-picker-add.png rename to rtdata/images/themed/png/1/light/color-picker-add.png diff --git a/rtdata/images/themed/png/light/color-picker-bars.png b/rtdata/images/themed/png/1/light/color-picker-bars.png similarity index 100% rename from rtdata/images/themed/png/light/color-picker-bars.png rename to rtdata/images/themed/png/1/light/color-picker-bars.png diff --git a/rtdata/images/themed/png/light/color-picker-hicontrast.png b/rtdata/images/themed/png/1/light/color-picker-hicontrast.png similarity index 100% rename from rtdata/images/themed/png/light/color-picker-hicontrast.png rename to rtdata/images/themed/png/1/light/color-picker-hicontrast.png diff --git a/rtdata/images/themed/png/light/color-picker-hide.png b/rtdata/images/themed/png/1/light/color-picker-hide.png similarity index 100% rename from rtdata/images/themed/png/light/color-picker-hide.png rename to rtdata/images/themed/png/1/light/color-picker-hide.png diff --git a/rtdata/images/themed/png/light/color-picker.png b/rtdata/images/themed/png/1/light/color-picker.png similarity index 100% rename from rtdata/images/themed/png/light/color-picker.png rename to rtdata/images/themed/png/1/light/color-picker.png diff --git a/rtdata/images/themed/png/light/contrastmask-off.png b/rtdata/images/themed/png/1/light/contrastmask-off.png similarity index 100% rename from rtdata/images/themed/png/light/contrastmask-off.png rename to rtdata/images/themed/png/1/light/contrastmask-off.png diff --git a/rtdata/images/themed/png/light/contrastmask-on.png b/rtdata/images/themed/png/1/light/contrastmask-on.png similarity index 100% rename from rtdata/images/themed/png/light/contrastmask-on.png rename to rtdata/images/themed/png/1/light/contrastmask-on.png diff --git a/rtdata/images/themed/png/light/copy.png b/rtdata/images/themed/png/1/light/copy.png similarity index 100% rename from rtdata/images/themed/png/light/copy.png rename to rtdata/images/themed/png/1/light/copy.png diff --git a/rtdata/images/themed/png/light/crop-auto-small.png b/rtdata/images/themed/png/1/light/crop-auto-small.png similarity index 100% rename from rtdata/images/themed/png/light/crop-auto-small.png rename to rtdata/images/themed/png/1/light/crop-auto-small.png diff --git a/rtdata/images/themed/png/light/crop-auto.png b/rtdata/images/themed/png/1/light/crop-auto.png similarity index 100% rename from rtdata/images/themed/png/light/crop-auto.png rename to rtdata/images/themed/png/1/light/crop-auto.png diff --git a/rtdata/images/themed/png/light/crop-point-hicontrast.png b/rtdata/images/themed/png/1/light/crop-point-hicontrast.png similarity index 100% rename from rtdata/images/themed/png/light/crop-point-hicontrast.png rename to rtdata/images/themed/png/1/light/crop-point-hicontrast.png diff --git a/rtdata/images/themed/png/light/crop-small.png b/rtdata/images/themed/png/1/light/crop-small.png similarity index 100% rename from rtdata/images/themed/png/light/crop-small.png rename to rtdata/images/themed/png/1/light/crop-small.png diff --git a/rtdata/images/themed/png/light/crop.png b/rtdata/images/themed/png/1/light/crop.png similarity index 100% rename from rtdata/images/themed/png/light/crop.png rename to rtdata/images/themed/png/1/light/crop.png diff --git a/rtdata/images/themed/png/light/crossed-arrows-in.png b/rtdata/images/themed/png/1/light/crossed-arrows-in.png similarity index 100% rename from rtdata/images/themed/png/light/crossed-arrows-in.png rename to rtdata/images/themed/png/1/light/crossed-arrows-in.png diff --git a/rtdata/images/themed/png/light/crossed-arrows-out.png b/rtdata/images/themed/png/1/light/crossed-arrows-out.png similarity index 100% rename from rtdata/images/themed/png/light/crossed-arrows-out.png rename to rtdata/images/themed/png/1/light/crossed-arrows-out.png diff --git a/rtdata/images/themed/png/light/crosshair-adjust.png b/rtdata/images/themed/png/1/light/crosshair-adjust.png similarity index 100% rename from rtdata/images/themed/png/light/crosshair-adjust.png rename to rtdata/images/themed/png/1/light/crosshair-adjust.png diff --git a/rtdata/images/themed/png/light/crosshair-hicontrast.png b/rtdata/images/themed/png/1/light/crosshair-hicontrast.png similarity index 100% rename from rtdata/images/themed/png/light/crosshair-hicontrast.png rename to rtdata/images/themed/png/1/light/crosshair-hicontrast.png diff --git a/rtdata/images/themed/png/light/crosshair-node-curve.png b/rtdata/images/themed/png/1/light/crosshair-node-curve.png similarity index 100% rename from rtdata/images/themed/png/light/crosshair-node-curve.png rename to rtdata/images/themed/png/1/light/crosshair-node-curve.png diff --git a/rtdata/images/themed/png/light/crosshair-small.png b/rtdata/images/themed/png/1/light/crosshair-small.png similarity index 100% rename from rtdata/images/themed/png/light/crosshair-small.png rename to rtdata/images/themed/png/1/light/crosshair-small.png diff --git a/rtdata/images/themed/png/light/curve-controlpoints-small.png b/rtdata/images/themed/png/1/light/curve-controlpoints-small.png similarity index 100% rename from rtdata/images/themed/png/light/curve-controlpoints-small.png rename to rtdata/images/themed/png/1/light/curve-controlpoints-small.png diff --git a/rtdata/images/themed/png/light/curve-controlpoints.png b/rtdata/images/themed/png/1/light/curve-controlpoints.png similarity index 100% rename from rtdata/images/themed/png/light/curve-controlpoints.png rename to rtdata/images/themed/png/1/light/curve-controlpoints.png diff --git a/rtdata/images/themed/png/light/curve-flat-small.png b/rtdata/images/themed/png/1/light/curve-flat-small.png similarity index 100% rename from rtdata/images/themed/png/light/curve-flat-small.png rename to rtdata/images/themed/png/1/light/curve-flat-small.png diff --git a/rtdata/images/themed/png/light/curve-flat.png b/rtdata/images/themed/png/1/light/curve-flat.png similarity index 100% rename from rtdata/images/themed/png/light/curve-flat.png rename to rtdata/images/themed/png/1/light/curve-flat.png diff --git a/rtdata/images/themed/png/light/curve-linear-small.png b/rtdata/images/themed/png/1/light/curve-linear-small.png similarity index 100% rename from rtdata/images/themed/png/light/curve-linear-small.png rename to rtdata/images/themed/png/1/light/curve-linear-small.png diff --git a/rtdata/images/themed/png/light/curve-linear.png b/rtdata/images/themed/png/1/light/curve-linear.png similarity index 100% rename from rtdata/images/themed/png/light/curve-linear.png rename to rtdata/images/themed/png/1/light/curve-linear.png diff --git a/rtdata/images/themed/png/light/curve-nurbs-small.png b/rtdata/images/themed/png/1/light/curve-nurbs-small.png similarity index 100% rename from rtdata/images/themed/png/light/curve-nurbs-small.png rename to rtdata/images/themed/png/1/light/curve-nurbs-small.png diff --git a/rtdata/images/themed/png/light/curve-nurbs.png b/rtdata/images/themed/png/1/light/curve-nurbs.png similarity index 100% rename from rtdata/images/themed/png/light/curve-nurbs.png rename to rtdata/images/themed/png/1/light/curve-nurbs.png diff --git a/rtdata/images/themed/png/light/curve-parametric-small.png b/rtdata/images/themed/png/1/light/curve-parametric-small.png similarity index 100% rename from rtdata/images/themed/png/light/curve-parametric-small.png rename to rtdata/images/themed/png/1/light/curve-parametric-small.png diff --git a/rtdata/images/themed/png/light/curve-parametric.png b/rtdata/images/themed/png/1/light/curve-parametric.png similarity index 100% rename from rtdata/images/themed/png/light/curve-parametric.png rename to rtdata/images/themed/png/1/light/curve-parametric.png diff --git a/rtdata/images/themed/png/light/curve-spline-small.png b/rtdata/images/themed/png/1/light/curve-spline-small.png similarity index 100% rename from rtdata/images/themed/png/light/curve-spline-small.png rename to rtdata/images/themed/png/1/light/curve-spline-small.png diff --git a/rtdata/images/themed/png/light/curve-spline.png b/rtdata/images/themed/png/1/light/curve-spline.png similarity index 100% rename from rtdata/images/themed/png/light/curve-spline.png rename to rtdata/images/themed/png/1/light/curve-spline.png diff --git a/rtdata/images/themed/png/light/detail.png b/rtdata/images/themed/png/1/light/detail.png similarity index 100% rename from rtdata/images/themed/png/light/detail.png rename to rtdata/images/themed/png/1/light/detail.png diff --git a/rtdata/images/themed/png/light/device-floppy.png b/rtdata/images/themed/png/1/light/device-floppy.png similarity index 100% rename from rtdata/images/themed/png/light/device-floppy.png rename to rtdata/images/themed/png/1/light/device-floppy.png diff --git a/rtdata/images/themed/png/light/device-hdd.png b/rtdata/images/themed/png/1/light/device-hdd.png similarity index 100% rename from rtdata/images/themed/png/light/device-hdd.png rename to rtdata/images/themed/png/1/light/device-hdd.png diff --git a/rtdata/images/themed/png/light/device-network.png b/rtdata/images/themed/png/1/light/device-network.png similarity index 100% rename from rtdata/images/themed/png/light/device-network.png rename to rtdata/images/themed/png/1/light/device-network.png diff --git a/rtdata/images/themed/png/light/device-optical.png b/rtdata/images/themed/png/1/light/device-optical.png similarity index 100% rename from rtdata/images/themed/png/light/device-optical.png rename to rtdata/images/themed/png/1/light/device-optical.png diff --git a/rtdata/images/themed/png/light/device-usb.png b/rtdata/images/themed/png/1/light/device-usb.png similarity index 100% rename from rtdata/images/themed/png/light/device-usb.png rename to rtdata/images/themed/png/1/light/device-usb.png diff --git a/rtdata/images/themed/png/light/distortion-auto-small.png b/rtdata/images/themed/png/1/light/distortion-auto-small.png similarity index 100% rename from rtdata/images/themed/png/light/distortion-auto-small.png rename to rtdata/images/themed/png/1/light/distortion-auto-small.png diff --git a/rtdata/images/themed/png/light/distortion-auto.png b/rtdata/images/themed/png/1/light/distortion-auto.png similarity index 100% rename from rtdata/images/themed/png/light/distortion-auto.png rename to rtdata/images/themed/png/1/light/distortion-auto.png diff --git a/rtdata/images/themed/png/light/distortion-barrel-small.png b/rtdata/images/themed/png/1/light/distortion-barrel-small.png similarity index 100% rename from rtdata/images/themed/png/light/distortion-barrel-small.png rename to rtdata/images/themed/png/1/light/distortion-barrel-small.png diff --git a/rtdata/images/themed/png/light/distortion-barrel.png b/rtdata/images/themed/png/1/light/distortion-barrel.png similarity index 100% rename from rtdata/images/themed/png/light/distortion-barrel.png rename to rtdata/images/themed/png/1/light/distortion-barrel.png diff --git a/rtdata/images/themed/png/light/distortion-pincushion-small.png b/rtdata/images/themed/png/1/light/distortion-pincushion-small.png similarity index 100% rename from rtdata/images/themed/png/light/distortion-pincushion-small.png rename to rtdata/images/themed/png/1/light/distortion-pincushion-small.png diff --git a/rtdata/images/themed/png/light/distortion-pincushion.png b/rtdata/images/themed/png/1/light/distortion-pincushion.png similarity index 100% rename from rtdata/images/themed/png/light/distortion-pincushion.png rename to rtdata/images/themed/png/1/light/distortion-pincushion.png diff --git a/rtdata/images/themed/png/light/edit-point.png b/rtdata/images/themed/png/1/light/edit-point.png similarity index 100% rename from rtdata/images/themed/png/light/edit-point.png rename to rtdata/images/themed/png/1/light/edit-point.png diff --git a/rtdata/images/themed/png/light/equilizer-narrow.png b/rtdata/images/themed/png/1/light/equilizer-narrow.png similarity index 100% rename from rtdata/images/themed/png/light/equilizer-narrow.png rename to rtdata/images/themed/png/1/light/equilizer-narrow.png diff --git a/rtdata/images/themed/png/light/equilizer-wide.png b/rtdata/images/themed/png/1/light/equilizer-wide.png similarity index 100% rename from rtdata/images/themed/png/light/equilizer-wide.png rename to rtdata/images/themed/png/1/light/equilizer-wide.png diff --git a/rtdata/images/themed/png/light/expander-closed-small.png b/rtdata/images/themed/png/1/light/expander-closed-small.png similarity index 100% rename from rtdata/images/themed/png/light/expander-closed-small.png rename to rtdata/images/themed/png/1/light/expander-closed-small.png diff --git a/rtdata/images/themed/png/light/expander-open-small.png b/rtdata/images/themed/png/1/light/expander-open-small.png similarity index 100% rename from rtdata/images/themed/png/light/expander-open-small.png rename to rtdata/images/themed/png/1/light/expander-open-small.png diff --git a/rtdata/images/themed/png/light/exposure.png b/rtdata/images/themed/png/1/light/exposure.png similarity index 100% rename from rtdata/images/themed/png/light/exposure.png rename to rtdata/images/themed/png/1/light/exposure.png diff --git a/rtdata/images/themed/png/light/filetype-hdr.png b/rtdata/images/themed/png/1/light/filetype-hdr.png similarity index 100% rename from rtdata/images/themed/png/light/filetype-hdr.png rename to rtdata/images/themed/png/1/light/filetype-hdr.png diff --git a/rtdata/images/themed/png/light/filetype-ps.png b/rtdata/images/themed/png/1/light/filetype-ps.png similarity index 100% rename from rtdata/images/themed/png/light/filetype-ps.png rename to rtdata/images/themed/png/1/light/filetype-ps.png diff --git a/rtdata/images/themed/png/light/filter-clear.png b/rtdata/images/themed/png/1/light/filter-clear.png similarity index 100% rename from rtdata/images/themed/png/light/filter-clear.png rename to rtdata/images/themed/png/1/light/filter-clear.png diff --git a/rtdata/images/themed/png/light/filter-original.png b/rtdata/images/themed/png/1/light/filter-original.png similarity index 100% rename from rtdata/images/themed/png/light/filter-original.png rename to rtdata/images/themed/png/1/light/filter-original.png diff --git a/rtdata/images/themed/png/light/filter-original2.png b/rtdata/images/themed/png/1/light/filter-original2.png similarity index 100% rename from rtdata/images/themed/png/light/filter-original2.png rename to rtdata/images/themed/png/1/light/filter-original2.png diff --git a/rtdata/images/themed/png/light/filter.png b/rtdata/images/themed/png/1/light/filter.png similarity index 100% rename from rtdata/images/themed/png/light/filter.png rename to rtdata/images/themed/png/1/light/filter.png diff --git a/rtdata/images/themed/png/light/flip-horizontal.png b/rtdata/images/themed/png/1/light/flip-horizontal.png similarity index 100% rename from rtdata/images/themed/png/light/flip-horizontal.png rename to rtdata/images/themed/png/1/light/flip-horizontal.png diff --git a/rtdata/images/themed/png/light/flip-vertical.png b/rtdata/images/themed/png/1/light/flip-vertical.png similarity index 100% rename from rtdata/images/themed/png/light/flip-vertical.png rename to rtdata/images/themed/png/1/light/flip-vertical.png diff --git a/rtdata/images/themed/png/light/focusscreen-off.png b/rtdata/images/themed/png/1/light/focusscreen-off.png similarity index 100% rename from rtdata/images/themed/png/light/focusscreen-off.png rename to rtdata/images/themed/png/1/light/focusscreen-off.png diff --git a/rtdata/images/themed/png/light/focusscreen-on.png b/rtdata/images/themed/png/1/light/focusscreen-on.png similarity index 100% rename from rtdata/images/themed/png/light/focusscreen-on.png rename to rtdata/images/themed/png/1/light/focusscreen-on.png diff --git a/rtdata/images/themed/png/light/folder-closed-home-small.png b/rtdata/images/themed/png/1/light/folder-closed-home-small.png similarity index 100% rename from rtdata/images/themed/png/light/folder-closed-home-small.png rename to rtdata/images/themed/png/1/light/folder-closed-home-small.png diff --git a/rtdata/images/themed/png/light/folder-closed-home.png b/rtdata/images/themed/png/1/light/folder-closed-home.png similarity index 100% rename from rtdata/images/themed/png/light/folder-closed-home.png rename to rtdata/images/themed/png/1/light/folder-closed-home.png diff --git a/rtdata/images/themed/png/light/folder-closed-recent-small.png b/rtdata/images/themed/png/1/light/folder-closed-recent-small.png similarity index 100% rename from rtdata/images/themed/png/light/folder-closed-recent-small.png rename to rtdata/images/themed/png/1/light/folder-closed-recent-small.png diff --git a/rtdata/images/themed/png/light/folder-closed-recent.png b/rtdata/images/themed/png/1/light/folder-closed-recent.png similarity index 100% rename from rtdata/images/themed/png/light/folder-closed-recent.png rename to rtdata/images/themed/png/1/light/folder-closed-recent.png diff --git a/rtdata/images/themed/png/light/folder-closed-small.png b/rtdata/images/themed/png/1/light/folder-closed-small.png similarity index 100% rename from rtdata/images/themed/png/light/folder-closed-small.png rename to rtdata/images/themed/png/1/light/folder-closed-small.png diff --git a/rtdata/images/themed/png/light/folder-closed.png b/rtdata/images/themed/png/1/light/folder-closed.png similarity index 100% rename from rtdata/images/themed/png/light/folder-closed.png rename to rtdata/images/themed/png/1/light/folder-closed.png diff --git a/rtdata/images/themed/png/light/folder-open-recent-small.png b/rtdata/images/themed/png/1/light/folder-open-recent-small.png similarity index 100% rename from rtdata/images/themed/png/light/folder-open-recent-small.png rename to rtdata/images/themed/png/1/light/folder-open-recent-small.png diff --git a/rtdata/images/themed/png/light/folder-open-recent.png b/rtdata/images/themed/png/1/light/folder-open-recent.png similarity index 100% rename from rtdata/images/themed/png/light/folder-open-recent.png rename to rtdata/images/themed/png/1/light/folder-open-recent.png diff --git a/rtdata/images/themed/png/light/folder-open-small.png b/rtdata/images/themed/png/1/light/folder-open-small.png similarity index 100% rename from rtdata/images/themed/png/light/folder-open-small.png rename to rtdata/images/themed/png/1/light/folder-open-small.png diff --git a/rtdata/images/themed/png/light/folder-open.png b/rtdata/images/themed/png/1/light/folder-open.png similarity index 100% rename from rtdata/images/themed/png/light/folder-open.png rename to rtdata/images/themed/png/1/light/folder-open.png diff --git a/rtdata/images/themed/png/light/fullscreen-enter.png b/rtdata/images/themed/png/1/light/fullscreen-enter.png similarity index 100% rename from rtdata/images/themed/png/light/fullscreen-enter.png rename to rtdata/images/themed/png/1/light/fullscreen-enter.png diff --git a/rtdata/images/themed/png/light/fullscreen-leave.png b/rtdata/images/themed/png/1/light/fullscreen-leave.png similarity index 100% rename from rtdata/images/themed/png/light/fullscreen-leave.png rename to rtdata/images/themed/png/1/light/fullscreen-leave.png diff --git a/rtdata/images/themed/png/light/gamut-hist.png b/rtdata/images/themed/png/1/light/gamut-hist.png similarity index 100% rename from rtdata/images/themed/png/light/gamut-hist.png rename to rtdata/images/themed/png/1/light/gamut-hist.png diff --git a/rtdata/images/themed/png/light/gamut-plus.png b/rtdata/images/themed/png/1/light/gamut-plus.png similarity index 100% rename from rtdata/images/themed/png/light/gamut-plus.png rename to rtdata/images/themed/png/1/light/gamut-plus.png diff --git a/rtdata/images/themed/png/light/gamut-softproof.png b/rtdata/images/themed/png/1/light/gamut-softproof.png similarity index 100% rename from rtdata/images/themed/png/light/gamut-softproof.png rename to rtdata/images/themed/png/1/light/gamut-softproof.png diff --git a/rtdata/images/themed/png/light/gamut-warning.png b/rtdata/images/themed/png/1/light/gamut-warning.png similarity index 100% rename from rtdata/images/themed/png/light/gamut-warning.png rename to rtdata/images/themed/png/1/light/gamut-warning.png diff --git a/rtdata/images/themed/png/light/gamut_srgb_prophoto_xy.png b/rtdata/images/themed/png/1/light/gamut_srgb_prophoto_xy.png similarity index 100% rename from rtdata/images/themed/png/light/gamut_srgb_prophoto_xy.png rename to rtdata/images/themed/png/1/light/gamut_srgb_prophoto_xy.png diff --git a/rtdata/images/themed/png/light/gears-pause.png b/rtdata/images/themed/png/1/light/gears-pause.png similarity index 100% rename from rtdata/images/themed/png/light/gears-pause.png rename to rtdata/images/themed/png/1/light/gears-pause.png diff --git a/rtdata/images/themed/png/light/gears-play.png b/rtdata/images/themed/png/1/light/gears-play.png similarity index 100% rename from rtdata/images/themed/png/light/gears-play.png rename to rtdata/images/themed/png/1/light/gears-play.png diff --git a/rtdata/images/themed/png/light/gears-small.png b/rtdata/images/themed/png/1/light/gears-small.png similarity index 100% rename from rtdata/images/themed/png/light/gears-small.png rename to rtdata/images/themed/png/1/light/gears-small.png diff --git a/rtdata/images/themed/png/light/gears.png b/rtdata/images/themed/png/1/light/gears.png similarity index 100% rename from rtdata/images/themed/png/light/gears.png rename to rtdata/images/themed/png/1/light/gears.png diff --git a/rtdata/images/themed/png/light/goto-end-small.png b/rtdata/images/themed/png/1/light/goto-end-small.png similarity index 100% rename from rtdata/images/themed/png/light/goto-end-small.png rename to rtdata/images/themed/png/1/light/goto-end-small.png diff --git a/rtdata/images/themed/png/light/goto-start-small.png b/rtdata/images/themed/png/1/light/goto-start-small.png similarity index 100% rename from rtdata/images/themed/png/light/goto-start-small.png rename to rtdata/images/themed/png/1/light/goto-start-small.png diff --git a/rtdata/images/themed/png/light/hand-closed-hicontrast.png b/rtdata/images/themed/png/1/light/hand-closed-hicontrast.png similarity index 100% rename from rtdata/images/themed/png/light/hand-closed-hicontrast.png rename to rtdata/images/themed/png/1/light/hand-closed-hicontrast.png diff --git a/rtdata/images/themed/png/light/hand-open-hicontrast.png b/rtdata/images/themed/png/1/light/hand-open-hicontrast.png similarity index 100% rename from rtdata/images/themed/png/light/hand-open-hicontrast.png rename to rtdata/images/themed/png/1/light/hand-open-hicontrast.png diff --git a/rtdata/images/themed/png/light/hand-open.png b/rtdata/images/themed/png/1/light/hand-open.png similarity index 100% rename from rtdata/images/themed/png/light/hand-open.png rename to rtdata/images/themed/png/1/light/hand-open.png diff --git a/rtdata/images/themed/png/light/histogram-bar-off-small.png b/rtdata/images/themed/png/1/light/histogram-bar-off-small.png similarity index 100% rename from rtdata/images/themed/png/light/histogram-bar-off-small.png rename to rtdata/images/themed/png/1/light/histogram-bar-off-small.png diff --git a/rtdata/images/themed/png/light/histogram-bar-on-small.png b/rtdata/images/themed/png/1/light/histogram-bar-on-small.png similarity index 100% rename from rtdata/images/themed/png/light/histogram-bar-on-small.png rename to rtdata/images/themed/png/1/light/histogram-bar-on-small.png diff --git a/rtdata/images/themed/png/light/histogram-bayer-off-small.png b/rtdata/images/themed/png/1/light/histogram-bayer-off-small.png similarity index 100% rename from rtdata/images/themed/png/light/histogram-bayer-off-small.png rename to rtdata/images/themed/png/1/light/histogram-bayer-off-small.png diff --git a/rtdata/images/themed/png/light/histogram-bayer-on-small.png b/rtdata/images/themed/png/1/light/histogram-bayer-on-small.png similarity index 100% rename from rtdata/images/themed/png/light/histogram-bayer-on-small.png rename to rtdata/images/themed/png/1/light/histogram-bayer-on-small.png diff --git a/rtdata/images/themed/png/light/histogram-blue-off-small.png b/rtdata/images/themed/png/1/light/histogram-blue-off-small.png similarity index 100% rename from rtdata/images/themed/png/light/histogram-blue-off-small.png rename to rtdata/images/themed/png/1/light/histogram-blue-off-small.png diff --git a/rtdata/images/themed/png/light/histogram-blue-on-small.png b/rtdata/images/themed/png/1/light/histogram-blue-on-small.png similarity index 100% rename from rtdata/images/themed/png/light/histogram-blue-on-small.png rename to rtdata/images/themed/png/1/light/histogram-blue-on-small.png diff --git a/rtdata/images/themed/png/light/histogram-gold-off-small.png b/rtdata/images/themed/png/1/light/histogram-gold-off-small.png similarity index 100% rename from rtdata/images/themed/png/light/histogram-gold-off-small.png rename to rtdata/images/themed/png/1/light/histogram-gold-off-small.png diff --git a/rtdata/images/themed/png/light/histogram-gold-on-small.png b/rtdata/images/themed/png/1/light/histogram-gold-on-small.png similarity index 100% rename from rtdata/images/themed/png/light/histogram-gold-on-small.png rename to rtdata/images/themed/png/1/light/histogram-gold-on-small.png diff --git a/rtdata/images/themed/png/light/histogram-green-off-small.png b/rtdata/images/themed/png/1/light/histogram-green-off-small.png similarity index 100% rename from rtdata/images/themed/png/light/histogram-green-off-small.png rename to rtdata/images/themed/png/1/light/histogram-green-off-small.png diff --git a/rtdata/images/themed/png/light/histogram-green-on-small.png b/rtdata/images/themed/png/1/light/histogram-green-on-small.png similarity index 100% rename from rtdata/images/themed/png/light/histogram-green-on-small.png rename to rtdata/images/themed/png/1/light/histogram-green-on-small.png diff --git a/rtdata/images/themed/png/light/histogram-mode-linear-small.png b/rtdata/images/themed/png/1/light/histogram-mode-linear-small.png similarity index 100% rename from rtdata/images/themed/png/light/histogram-mode-linear-small.png rename to rtdata/images/themed/png/1/light/histogram-mode-linear-small.png diff --git a/rtdata/images/themed/png/light/histogram-mode-logx-small.png b/rtdata/images/themed/png/1/light/histogram-mode-logx-small.png similarity index 100% rename from rtdata/images/themed/png/light/histogram-mode-logx-small.png rename to rtdata/images/themed/png/1/light/histogram-mode-logx-small.png diff --git a/rtdata/images/themed/png/light/histogram-mode-logxy-small.png b/rtdata/images/themed/png/1/light/histogram-mode-logxy-small.png similarity index 100% rename from rtdata/images/themed/png/light/histogram-mode-logxy-small.png rename to rtdata/images/themed/png/1/light/histogram-mode-logxy-small.png diff --git a/rtdata/images/themed/png/light/histogram-red-off-small.png b/rtdata/images/themed/png/1/light/histogram-red-off-small.png similarity index 100% rename from rtdata/images/themed/png/light/histogram-red-off-small.png rename to rtdata/images/themed/png/1/light/histogram-red-off-small.png diff --git a/rtdata/images/themed/png/light/histogram-red-on-small.png b/rtdata/images/themed/png/1/light/histogram-red-on-small.png similarity index 100% rename from rtdata/images/themed/png/light/histogram-red-on-small.png rename to rtdata/images/themed/png/1/light/histogram-red-on-small.png diff --git a/rtdata/images/themed/png/light/histogram-silver-off-small.png b/rtdata/images/themed/png/1/light/histogram-silver-off-small.png similarity index 100% rename from rtdata/images/themed/png/light/histogram-silver-off-small.png rename to rtdata/images/themed/png/1/light/histogram-silver-off-small.png diff --git a/rtdata/images/themed/png/light/histogram-silver-on-small.png b/rtdata/images/themed/png/1/light/histogram-silver-on-small.png similarity index 100% rename from rtdata/images/themed/png/light/histogram-silver-on-small.png rename to rtdata/images/themed/png/1/light/histogram-silver-on-small.png diff --git a/rtdata/images/themed/png/light/info.png b/rtdata/images/themed/png/1/light/info.png similarity index 100% rename from rtdata/images/themed/png/light/info.png rename to rtdata/images/themed/png/1/light/info.png diff --git a/rtdata/images/themed/png/light/intent-absolute.png b/rtdata/images/themed/png/1/light/intent-absolute.png similarity index 100% rename from rtdata/images/themed/png/light/intent-absolute.png rename to rtdata/images/themed/png/1/light/intent-absolute.png diff --git a/rtdata/images/themed/png/light/intent-perceptual.png b/rtdata/images/themed/png/1/light/intent-perceptual.png similarity index 100% rename from rtdata/images/themed/png/light/intent-perceptual.png rename to rtdata/images/themed/png/1/light/intent-perceptual.png diff --git a/rtdata/images/themed/png/light/intent-relative.png b/rtdata/images/themed/png/1/light/intent-relative.png similarity index 100% rename from rtdata/images/themed/png/light/intent-relative.png rename to rtdata/images/themed/png/1/light/intent-relative.png diff --git a/rtdata/images/themed/png/light/intent-saturation.png b/rtdata/images/themed/png/1/light/intent-saturation.png similarity index 100% rename from rtdata/images/themed/png/light/intent-saturation.png rename to rtdata/images/themed/png/1/light/intent-saturation.png diff --git a/rtdata/images/themed/png/light/magnifier-1to1-small.png b/rtdata/images/themed/png/1/light/magnifier-1to1-small.png similarity index 100% rename from rtdata/images/themed/png/light/magnifier-1to1-small.png rename to rtdata/images/themed/png/1/light/magnifier-1to1-small.png diff --git a/rtdata/images/themed/png/light/magnifier-1to1.png b/rtdata/images/themed/png/1/light/magnifier-1to1.png similarity index 100% rename from rtdata/images/themed/png/light/magnifier-1to1.png rename to rtdata/images/themed/png/1/light/magnifier-1to1.png diff --git a/rtdata/images/themed/png/light/magnifier-crop.png b/rtdata/images/themed/png/1/light/magnifier-crop.png similarity index 100% rename from rtdata/images/themed/png/light/magnifier-crop.png rename to rtdata/images/themed/png/1/light/magnifier-crop.png diff --git a/rtdata/images/themed/png/light/magnifier-fit.png b/rtdata/images/themed/png/1/light/magnifier-fit.png similarity index 100% rename from rtdata/images/themed/png/light/magnifier-fit.png rename to rtdata/images/themed/png/1/light/magnifier-fit.png diff --git a/rtdata/images/themed/png/light/magnifier-minus-small.png b/rtdata/images/themed/png/1/light/magnifier-minus-small.png similarity index 100% rename from rtdata/images/themed/png/light/magnifier-minus-small.png rename to rtdata/images/themed/png/1/light/magnifier-minus-small.png diff --git a/rtdata/images/themed/png/light/magnifier-minus.png b/rtdata/images/themed/png/1/light/magnifier-minus.png similarity index 100% rename from rtdata/images/themed/png/light/magnifier-minus.png rename to rtdata/images/themed/png/1/light/magnifier-minus.png diff --git a/rtdata/images/themed/png/light/magnifier-plus-small.png b/rtdata/images/themed/png/1/light/magnifier-plus-small.png similarity index 100% rename from rtdata/images/themed/png/light/magnifier-plus-small.png rename to rtdata/images/themed/png/1/light/magnifier-plus-small.png diff --git a/rtdata/images/themed/png/light/magnifier-plus.png b/rtdata/images/themed/png/1/light/magnifier-plus.png similarity index 100% rename from rtdata/images/themed/png/light/magnifier-plus.png rename to rtdata/images/themed/png/1/light/magnifier-plus.png diff --git a/rtdata/images/themed/png/light/magnifier.png b/rtdata/images/themed/png/1/light/magnifier.png similarity index 100% rename from rtdata/images/themed/png/light/magnifier.png rename to rtdata/images/themed/png/1/light/magnifier.png diff --git a/rtdata/images/themed/png/light/metadata.png b/rtdata/images/themed/png/1/light/metadata.png similarity index 100% rename from rtdata/images/themed/png/light/metadata.png rename to rtdata/images/themed/png/1/light/metadata.png diff --git a/rtdata/images/themed/png/light/node-move-nw-se-hicontrast.png b/rtdata/images/themed/png/1/light/node-move-nw-se-hicontrast.png similarity index 100% rename from rtdata/images/themed/png/light/node-move-nw-se-hicontrast.png rename to rtdata/images/themed/png/1/light/node-move-nw-se-hicontrast.png diff --git a/rtdata/images/themed/png/light/node-move-sw-ne-hicontrast.png b/rtdata/images/themed/png/1/light/node-move-sw-ne-hicontrast.png similarity index 100% rename from rtdata/images/themed/png/light/node-move-sw-ne-hicontrast.png rename to rtdata/images/themed/png/1/light/node-move-sw-ne-hicontrast.png diff --git a/rtdata/images/themed/png/light/node-move-x-hicontrast.png b/rtdata/images/themed/png/1/light/node-move-x-hicontrast.png similarity index 100% rename from rtdata/images/themed/png/light/node-move-x-hicontrast.png rename to rtdata/images/themed/png/1/light/node-move-x-hicontrast.png diff --git a/rtdata/images/themed/png/light/node-move-xy-hicontrast.png b/rtdata/images/themed/png/1/light/node-move-xy-hicontrast.png similarity index 100% rename from rtdata/images/themed/png/light/node-move-xy-hicontrast.png rename to rtdata/images/themed/png/1/light/node-move-xy-hicontrast.png diff --git a/rtdata/images/themed/png/light/node-move-y-hicontrast.png b/rtdata/images/themed/png/1/light/node-move-y-hicontrast.png similarity index 100% rename from rtdata/images/themed/png/light/node-move-y-hicontrast.png rename to rtdata/images/themed/png/1/light/node-move-y-hicontrast.png diff --git a/rtdata/images/themed/png/light/one-to-one-small.png b/rtdata/images/themed/png/1/light/one-to-one-small.png similarity index 100% rename from rtdata/images/themed/png/light/one-to-one-small.png rename to rtdata/images/themed/png/1/light/one-to-one-small.png diff --git a/rtdata/images/themed/png/light/ornament1.png b/rtdata/images/themed/png/1/light/ornament1.png similarity index 100% rename from rtdata/images/themed/png/light/ornament1.png rename to rtdata/images/themed/png/1/light/ornament1.png diff --git a/rtdata/images/themed/png/light/padlock-locked-small.png b/rtdata/images/themed/png/1/light/padlock-locked-small.png similarity index 100% rename from rtdata/images/themed/png/light/padlock-locked-small.png rename to rtdata/images/themed/png/1/light/padlock-locked-small.png diff --git a/rtdata/images/themed/png/light/padlock-unlocked-small.png b/rtdata/images/themed/png/1/light/padlock-unlocked-small.png similarity index 100% rename from rtdata/images/themed/png/light/padlock-unlocked-small.png rename to rtdata/images/themed/png/1/light/padlock-unlocked-small.png diff --git a/rtdata/images/themed/png/light/palette-brush.png b/rtdata/images/themed/png/1/light/palette-brush.png similarity index 100% rename from rtdata/images/themed/png/light/palette-brush.png rename to rtdata/images/themed/png/1/light/palette-brush.png diff --git a/rtdata/images/themed/png/light/panel-to-bottom.png b/rtdata/images/themed/png/1/light/panel-to-bottom.png similarity index 100% rename from rtdata/images/themed/png/light/panel-to-bottom.png rename to rtdata/images/themed/png/1/light/panel-to-bottom.png diff --git a/rtdata/images/themed/png/light/panel-to-left.png b/rtdata/images/themed/png/1/light/panel-to-left.png similarity index 100% rename from rtdata/images/themed/png/light/panel-to-left.png rename to rtdata/images/themed/png/1/light/panel-to-left.png diff --git a/rtdata/images/themed/png/light/panel-to-right.png b/rtdata/images/themed/png/1/light/panel-to-right.png similarity index 100% rename from rtdata/images/themed/png/light/panel-to-right.png rename to rtdata/images/themed/png/1/light/panel-to-right.png diff --git a/rtdata/images/themed/png/light/panel-to-top.png b/rtdata/images/themed/png/1/light/panel-to-top.png similarity index 100% rename from rtdata/images/themed/png/light/panel-to-top.png rename to rtdata/images/themed/png/1/light/panel-to-top.png diff --git a/rtdata/images/themed/png/light/paste.png b/rtdata/images/themed/png/1/light/paste.png similarity index 100% rename from rtdata/images/themed/png/light/paste.png rename to rtdata/images/themed/png/1/light/paste.png diff --git a/rtdata/images/themed/png/light/perspective-horizontal-left-small.png b/rtdata/images/themed/png/1/light/perspective-horizontal-left-small.png similarity index 100% rename from rtdata/images/themed/png/light/perspective-horizontal-left-small.png rename to rtdata/images/themed/png/1/light/perspective-horizontal-left-small.png diff --git a/rtdata/images/themed/png/light/perspective-horizontal-left.png b/rtdata/images/themed/png/1/light/perspective-horizontal-left.png similarity index 100% rename from rtdata/images/themed/png/light/perspective-horizontal-left.png rename to rtdata/images/themed/png/1/light/perspective-horizontal-left.png diff --git a/rtdata/images/themed/png/light/perspective-horizontal-right-small.png b/rtdata/images/themed/png/1/light/perspective-horizontal-right-small.png similarity index 100% rename from rtdata/images/themed/png/light/perspective-horizontal-right-small.png rename to rtdata/images/themed/png/1/light/perspective-horizontal-right-small.png diff --git a/rtdata/images/themed/png/light/perspective-horizontal-right.png b/rtdata/images/themed/png/1/light/perspective-horizontal-right.png similarity index 100% rename from rtdata/images/themed/png/light/perspective-horizontal-right.png rename to rtdata/images/themed/png/1/light/perspective-horizontal-right.png diff --git a/rtdata/images/themed/png/light/perspective-vertical-bottom-small.png b/rtdata/images/themed/png/1/light/perspective-vertical-bottom-small.png similarity index 100% rename from rtdata/images/themed/png/light/perspective-vertical-bottom-small.png rename to rtdata/images/themed/png/1/light/perspective-vertical-bottom-small.png diff --git a/rtdata/images/themed/png/light/perspective-vertical-bottom.png b/rtdata/images/themed/png/1/light/perspective-vertical-bottom.png similarity index 100% rename from rtdata/images/themed/png/light/perspective-vertical-bottom.png rename to rtdata/images/themed/png/1/light/perspective-vertical-bottom.png diff --git a/rtdata/images/themed/png/light/perspective-vertical-top-small.png b/rtdata/images/themed/png/1/light/perspective-vertical-top-small.png similarity index 100% rename from rtdata/images/themed/png/light/perspective-vertical-top-small.png rename to rtdata/images/themed/png/1/light/perspective-vertical-top-small.png diff --git a/rtdata/images/themed/png/light/perspective-vertical-top.png b/rtdata/images/themed/png/1/light/perspective-vertical-top.png similarity index 100% rename from rtdata/images/themed/png/light/perspective-vertical-top.png rename to rtdata/images/themed/png/1/light/perspective-vertical-top.png diff --git a/rtdata/images/themed/png/light/power-inconsistent-small.png b/rtdata/images/themed/png/1/light/power-inconsistent-small.png similarity index 100% rename from rtdata/images/themed/png/light/power-inconsistent-small.png rename to rtdata/images/themed/png/1/light/power-inconsistent-small.png diff --git a/rtdata/images/themed/png/light/power-off-small.png b/rtdata/images/themed/png/1/light/power-off-small.png similarity index 100% rename from rtdata/images/themed/png/light/power-off-small.png rename to rtdata/images/themed/png/1/light/power-off-small.png diff --git a/rtdata/images/themed/png/light/power-on-small.png b/rtdata/images/themed/png/1/light/power-on-small.png similarity index 100% rename from rtdata/images/themed/png/light/power-on-small.png rename to rtdata/images/themed/png/1/light/power-on-small.png diff --git a/rtdata/images/themed/png/light/preferences.png b/rtdata/images/themed/png/1/light/preferences.png similarity index 100% rename from rtdata/images/themed/png/light/preferences.png rename to rtdata/images/themed/png/1/light/preferences.png diff --git a/rtdata/images/themed/png/light/profile-filled.png b/rtdata/images/themed/png/1/light/profile-filled.png similarity index 100% rename from rtdata/images/themed/png/light/profile-filled.png rename to rtdata/images/themed/png/1/light/profile-filled.png diff --git a/rtdata/images/themed/png/light/profile-partial.png b/rtdata/images/themed/png/1/light/profile-partial.png similarity index 100% rename from rtdata/images/themed/png/light/profile-partial.png rename to rtdata/images/themed/png/1/light/profile-partial.png diff --git a/rtdata/images/themed/png/light/redo-all.png b/rtdata/images/themed/png/1/light/redo-all.png similarity index 100% rename from rtdata/images/themed/png/light/redo-all.png rename to rtdata/images/themed/png/1/light/redo-all.png diff --git a/rtdata/images/themed/png/light/redo-small.png b/rtdata/images/themed/png/1/light/redo-small.png similarity index 100% rename from rtdata/images/themed/png/light/redo-small.png rename to rtdata/images/themed/png/1/light/redo-small.png diff --git a/rtdata/images/themed/png/light/redo.png b/rtdata/images/themed/png/1/light/redo.png similarity index 100% rename from rtdata/images/themed/png/light/redo.png rename to rtdata/images/themed/png/1/light/redo.png diff --git a/rtdata/images/themed/png/light/refresh-red-small.png b/rtdata/images/themed/png/1/light/refresh-red-small.png similarity index 100% rename from rtdata/images/themed/png/light/refresh-red-small.png rename to rtdata/images/themed/png/1/light/refresh-red-small.png diff --git a/rtdata/images/themed/png/light/refresh-small.png b/rtdata/images/themed/png/1/light/refresh-small.png similarity index 100% rename from rtdata/images/themed/png/light/refresh-small.png rename to rtdata/images/themed/png/1/light/refresh-small.png diff --git a/rtdata/images/themed/png/light/refresh.png b/rtdata/images/themed/png/1/light/refresh.png similarity index 100% rename from rtdata/images/themed/png/light/refresh.png rename to rtdata/images/themed/png/1/light/refresh.png diff --git a/rtdata/images/themed/png/light/remove-small.png b/rtdata/images/themed/png/1/light/remove-small.png similarity index 100% rename from rtdata/images/themed/png/light/remove-small.png rename to rtdata/images/themed/png/1/light/remove-small.png diff --git a/rtdata/images/themed/png/light/remove.png b/rtdata/images/themed/png/1/light/remove.png similarity index 100% rename from rtdata/images/themed/png/light/remove.png rename to rtdata/images/themed/png/1/light/remove.png diff --git a/rtdata/images/themed/png/light/rotate-aroundnode-hicontrast.png b/rtdata/images/themed/png/1/light/rotate-aroundnode-hicontrast.png similarity index 100% rename from rtdata/images/themed/png/light/rotate-aroundnode-hicontrast.png rename to rtdata/images/themed/png/1/light/rotate-aroundnode-hicontrast.png diff --git a/rtdata/images/themed/png/light/rotate-aroundnode.png b/rtdata/images/themed/png/1/light/rotate-aroundnode.png similarity index 100% rename from rtdata/images/themed/png/light/rotate-aroundnode.png rename to rtdata/images/themed/png/1/light/rotate-aroundnode.png diff --git a/rtdata/images/themed/png/light/rotate-left-90.png b/rtdata/images/themed/png/1/light/rotate-left-90.png similarity index 100% rename from rtdata/images/themed/png/light/rotate-left-90.png rename to rtdata/images/themed/png/1/light/rotate-left-90.png diff --git a/rtdata/images/themed/png/light/rotate-left-small.png b/rtdata/images/themed/png/1/light/rotate-left-small.png similarity index 100% rename from rtdata/images/themed/png/light/rotate-left-small.png rename to rtdata/images/themed/png/1/light/rotate-left-small.png diff --git a/rtdata/images/themed/png/light/rotate-left.png b/rtdata/images/themed/png/1/light/rotate-left.png similarity index 100% rename from rtdata/images/themed/png/light/rotate-left.png rename to rtdata/images/themed/png/1/light/rotate-left.png diff --git a/rtdata/images/themed/png/light/rotate-right-90.png b/rtdata/images/themed/png/1/light/rotate-right-90.png similarity index 100% rename from rtdata/images/themed/png/light/rotate-right-90.png rename to rtdata/images/themed/png/1/light/rotate-right-90.png diff --git a/rtdata/images/themed/png/light/rotate-right-small.png b/rtdata/images/themed/png/1/light/rotate-right-small.png similarity index 100% rename from rtdata/images/themed/png/light/rotate-right-small.png rename to rtdata/images/themed/png/1/light/rotate-right-small.png diff --git a/rtdata/images/themed/png/light/rotate-right.png b/rtdata/images/themed/png/1/light/rotate-right.png similarity index 100% rename from rtdata/images/themed/png/light/rotate-right.png rename to rtdata/images/themed/png/1/light/rotate-right.png diff --git a/rtdata/images/themed/png/light/rotate-straighten-small.png b/rtdata/images/themed/png/1/light/rotate-straighten-small.png similarity index 100% rename from rtdata/images/themed/png/light/rotate-straighten-small.png rename to rtdata/images/themed/png/1/light/rotate-straighten-small.png diff --git a/rtdata/images/themed/png/light/rotate-straighten.png b/rtdata/images/themed/png/1/light/rotate-straighten.png similarity index 100% rename from rtdata/images/themed/png/light/rotate-straighten.png rename to rtdata/images/themed/png/1/light/rotate-straighten.png diff --git a/rtdata/images/themed/png/light/save-small.png b/rtdata/images/themed/png/1/light/save-small.png similarity index 100% rename from rtdata/images/themed/png/light/save-small.png rename to rtdata/images/themed/png/1/light/save-small.png diff --git a/rtdata/images/themed/png/light/save.png b/rtdata/images/themed/png/1/light/save.png similarity index 100% rename from rtdata/images/themed/png/light/save.png rename to rtdata/images/themed/png/1/light/save.png diff --git a/rtdata/images/themed/png/light/saved-no-small.png b/rtdata/images/themed/png/1/light/saved-no-small.png similarity index 100% rename from rtdata/images/themed/png/light/saved-no-small.png rename to rtdata/images/themed/png/1/light/saved-no-small.png diff --git a/rtdata/images/themed/png/light/saved-yes-small.png b/rtdata/images/themed/png/1/light/saved-yes-small.png similarity index 100% rename from rtdata/images/themed/png/light/saved-yes-small.png rename to rtdata/images/themed/png/1/light/saved-yes-small.png diff --git a/rtdata/images/themed/png/light/square-toggle-black-off-narrow.png b/rtdata/images/themed/png/1/light/square-toggle-black-off-narrow.png similarity index 100% rename from rtdata/images/themed/png/light/square-toggle-black-off-narrow.png rename to rtdata/images/themed/png/1/light/square-toggle-black-off-narrow.png diff --git a/rtdata/images/themed/png/light/square-toggle-black-on-narrow.png b/rtdata/images/themed/png/1/light/square-toggle-black-on-narrow.png similarity index 100% rename from rtdata/images/themed/png/light/square-toggle-black-on-narrow.png rename to rtdata/images/themed/png/1/light/square-toggle-black-on-narrow.png diff --git a/rtdata/images/themed/png/light/square-toggle-blue-off-narrow.png b/rtdata/images/themed/png/1/light/square-toggle-blue-off-narrow.png similarity index 100% rename from rtdata/images/themed/png/light/square-toggle-blue-off-narrow.png rename to rtdata/images/themed/png/1/light/square-toggle-blue-off-narrow.png diff --git a/rtdata/images/themed/png/light/square-toggle-blue-on-narrow.png b/rtdata/images/themed/png/1/light/square-toggle-blue-on-narrow.png similarity index 100% rename from rtdata/images/themed/png/light/square-toggle-blue-on-narrow.png rename to rtdata/images/themed/png/1/light/square-toggle-blue-on-narrow.png diff --git a/rtdata/images/themed/png/light/square-toggle-gray-off-narrow.png b/rtdata/images/themed/png/1/light/square-toggle-gray-off-narrow.png similarity index 100% rename from rtdata/images/themed/png/light/square-toggle-gray-off-narrow.png rename to rtdata/images/themed/png/1/light/square-toggle-gray-off-narrow.png diff --git a/rtdata/images/themed/png/light/square-toggle-gray-on-narrow.png b/rtdata/images/themed/png/1/light/square-toggle-gray-on-narrow.png similarity index 100% rename from rtdata/images/themed/png/light/square-toggle-gray-on-narrow.png rename to rtdata/images/themed/png/1/light/square-toggle-gray-on-narrow.png diff --git a/rtdata/images/themed/png/light/square-toggle-green-off-narrow.png b/rtdata/images/themed/png/1/light/square-toggle-green-off-narrow.png similarity index 100% rename from rtdata/images/themed/png/light/square-toggle-green-off-narrow.png rename to rtdata/images/themed/png/1/light/square-toggle-green-off-narrow.png diff --git a/rtdata/images/themed/png/light/square-toggle-green-on-narrow.png b/rtdata/images/themed/png/1/light/square-toggle-green-on-narrow.png similarity index 100% rename from rtdata/images/themed/png/light/square-toggle-green-on-narrow.png rename to rtdata/images/themed/png/1/light/square-toggle-green-on-narrow.png diff --git a/rtdata/images/themed/png/light/square-toggle-luminosity-off-narrow.png b/rtdata/images/themed/png/1/light/square-toggle-luminosity-off-narrow.png similarity index 100% rename from rtdata/images/themed/png/light/square-toggle-luminosity-off-narrow.png rename to rtdata/images/themed/png/1/light/square-toggle-luminosity-off-narrow.png diff --git a/rtdata/images/themed/png/light/square-toggle-luminosity-on-narrow.png b/rtdata/images/themed/png/1/light/square-toggle-luminosity-on-narrow.png similarity index 100% rename from rtdata/images/themed/png/light/square-toggle-luminosity-on-narrow.png rename to rtdata/images/themed/png/1/light/square-toggle-luminosity-on-narrow.png diff --git a/rtdata/images/themed/png/light/square-toggle-red-off-narrow.png b/rtdata/images/themed/png/1/light/square-toggle-red-off-narrow.png similarity index 100% rename from rtdata/images/themed/png/light/square-toggle-red-off-narrow.png rename to rtdata/images/themed/png/1/light/square-toggle-red-off-narrow.png diff --git a/rtdata/images/themed/png/light/square-toggle-red-on-narrow.png b/rtdata/images/themed/png/1/light/square-toggle-red-on-narrow.png similarity index 100% rename from rtdata/images/themed/png/light/square-toggle-red-on-narrow.png rename to rtdata/images/themed/png/1/light/square-toggle-red-on-narrow.png diff --git a/rtdata/images/themed/png/light/square-toggle-theme-off-narrow.png b/rtdata/images/themed/png/1/light/square-toggle-theme-off-narrow.png similarity index 100% rename from rtdata/images/themed/png/light/square-toggle-theme-off-narrow.png rename to rtdata/images/themed/png/1/light/square-toggle-theme-off-narrow.png diff --git a/rtdata/images/themed/png/light/square-toggle-theme-on-narrow.png b/rtdata/images/themed/png/1/light/square-toggle-theme-on-narrow.png similarity index 100% rename from rtdata/images/themed/png/light/square-toggle-theme-on-narrow.png rename to rtdata/images/themed/png/1/light/square-toggle-theme-on-narrow.png diff --git a/rtdata/images/themed/png/light/square-toggle-white-off-narrow.png b/rtdata/images/themed/png/1/light/square-toggle-white-off-narrow.png similarity index 100% rename from rtdata/images/themed/png/light/square-toggle-white-off-narrow.png rename to rtdata/images/themed/png/1/light/square-toggle-white-off-narrow.png diff --git a/rtdata/images/themed/png/light/square-toggle-white-on-narrow.png b/rtdata/images/themed/png/1/light/square-toggle-white-on-narrow.png similarity index 100% rename from rtdata/images/themed/png/light/square-toggle-white-on-narrow.png rename to rtdata/images/themed/png/1/light/square-toggle-white-on-narrow.png diff --git a/rtdata/images/themed/png/light/star-gold-hollow-narrow.png b/rtdata/images/themed/png/1/light/star-gold-hollow-narrow.png similarity index 100% rename from rtdata/images/themed/png/light/star-gold-hollow-narrow.png rename to rtdata/images/themed/png/1/light/star-gold-hollow-narrow.png diff --git a/rtdata/images/themed/png/light/star-gold-hollow-small.png b/rtdata/images/themed/png/1/light/star-gold-hollow-small.png similarity index 100% rename from rtdata/images/themed/png/light/star-gold-hollow-small.png rename to rtdata/images/themed/png/1/light/star-gold-hollow-small.png diff --git a/rtdata/images/themed/png/light/star-gold-narrow.png b/rtdata/images/themed/png/1/light/star-gold-narrow.png similarity index 100% rename from rtdata/images/themed/png/light/star-gold-narrow.png rename to rtdata/images/themed/png/1/light/star-gold-narrow.png diff --git a/rtdata/images/themed/png/light/star-gold-small.png b/rtdata/images/themed/png/1/light/star-gold-small.png similarity index 100% rename from rtdata/images/themed/png/light/star-gold-small.png rename to rtdata/images/themed/png/1/light/star-gold-small.png diff --git a/rtdata/images/themed/png/light/star-hollow-narrow.png b/rtdata/images/themed/png/1/light/star-hollow-narrow.png similarity index 100% rename from rtdata/images/themed/png/light/star-hollow-narrow.png rename to rtdata/images/themed/png/1/light/star-hollow-narrow.png diff --git a/rtdata/images/themed/png/light/star-hollow-small.png b/rtdata/images/themed/png/1/light/star-hollow-small.png similarity index 100% rename from rtdata/images/themed/png/light/star-hollow-small.png rename to rtdata/images/themed/png/1/light/star-hollow-small.png diff --git a/rtdata/images/themed/png/light/star-narrow.png b/rtdata/images/themed/png/1/light/star-narrow.png similarity index 100% rename from rtdata/images/themed/png/light/star-narrow.png rename to rtdata/images/themed/png/1/light/star-narrow.png diff --git a/rtdata/images/themed/png/light/star-small.png b/rtdata/images/themed/png/1/light/star-small.png similarity index 100% rename from rtdata/images/themed/png/light/star-small.png rename to rtdata/images/themed/png/1/light/star-small.png diff --git a/rtdata/images/themed/png/light/template-16.png b/rtdata/images/themed/png/1/light/template-16.png similarity index 100% rename from rtdata/images/themed/png/light/template-16.png rename to rtdata/images/themed/png/1/light/template-16.png diff --git a/rtdata/images/themed/png/light/template-24.png b/rtdata/images/themed/png/1/light/template-24.png similarity index 100% rename from rtdata/images/themed/png/light/template-24.png rename to rtdata/images/themed/png/1/light/template-24.png diff --git a/rtdata/images/themed/png/light/template-narrow.png b/rtdata/images/themed/png/1/light/template-narrow.png similarity index 100% rename from rtdata/images/themed/png/light/template-narrow.png rename to rtdata/images/themed/png/1/light/template-narrow.png diff --git a/rtdata/images/themed/png/light/tick-green-hollow-small.png b/rtdata/images/themed/png/1/light/tick-green-hollow-small.png similarity index 100% rename from rtdata/images/themed/png/light/tick-green-hollow-small.png rename to rtdata/images/themed/png/1/light/tick-green-hollow-small.png diff --git a/rtdata/images/themed/png/light/tick-green-hollow.png b/rtdata/images/themed/png/1/light/tick-green-hollow.png similarity index 100% rename from rtdata/images/themed/png/light/tick-green-hollow.png rename to rtdata/images/themed/png/1/light/tick-green-hollow.png diff --git a/rtdata/images/themed/png/light/tick-green-small.png b/rtdata/images/themed/png/1/light/tick-green-small.png similarity index 100% rename from rtdata/images/themed/png/light/tick-green-small.png rename to rtdata/images/themed/png/1/light/tick-green-small.png diff --git a/rtdata/images/themed/png/light/tick-green.png b/rtdata/images/themed/png/1/light/tick-green.png similarity index 100% rename from rtdata/images/themed/png/light/tick-green.png rename to rtdata/images/themed/png/1/light/tick-green.png diff --git a/rtdata/images/themed/png/light/tick-hollow-small.png b/rtdata/images/themed/png/1/light/tick-hollow-small.png similarity index 100% rename from rtdata/images/themed/png/light/tick-hollow-small.png rename to rtdata/images/themed/png/1/light/tick-hollow-small.png diff --git a/rtdata/images/themed/png/light/tick-small.png b/rtdata/images/themed/png/1/light/tick-small.png similarity index 100% rename from rtdata/images/themed/png/light/tick-small.png rename to rtdata/images/themed/png/1/light/tick-small.png diff --git a/rtdata/images/themed/png/light/tick.png b/rtdata/images/themed/png/1/light/tick.png similarity index 100% rename from rtdata/images/themed/png/light/tick.png rename to rtdata/images/themed/png/1/light/tick.png diff --git a/rtdata/images/themed/png/light/transform.png b/rtdata/images/themed/png/1/light/transform.png similarity index 100% rename from rtdata/images/themed/png/light/transform.png rename to rtdata/images/themed/png/1/light/transform.png diff --git a/rtdata/images/themed/png/light/trash-delete.png b/rtdata/images/themed/png/1/light/trash-delete.png similarity index 100% rename from rtdata/images/themed/png/light/trash-delete.png rename to rtdata/images/themed/png/1/light/trash-delete.png diff --git a/rtdata/images/themed/png/light/trash-empty-show.png b/rtdata/images/themed/png/1/light/trash-empty-show.png similarity index 100% rename from rtdata/images/themed/png/light/trash-empty-show.png rename to rtdata/images/themed/png/1/light/trash-empty-show.png diff --git a/rtdata/images/themed/png/light/trash-empty.png b/rtdata/images/themed/png/1/light/trash-empty.png similarity index 100% rename from rtdata/images/themed/png/light/trash-empty.png rename to rtdata/images/themed/png/1/light/trash-empty.png diff --git a/rtdata/images/themed/png/light/trash-full-show.png b/rtdata/images/themed/png/1/light/trash-full-show.png similarity index 100% rename from rtdata/images/themed/png/light/trash-full-show.png rename to rtdata/images/themed/png/1/light/trash-full-show.png diff --git a/rtdata/images/themed/png/light/trash-full.png b/rtdata/images/themed/png/1/light/trash-full.png similarity index 100% rename from rtdata/images/themed/png/light/trash-full.png rename to rtdata/images/themed/png/1/light/trash-full.png diff --git a/rtdata/images/themed/png/light/trash-hide-deleted.png b/rtdata/images/themed/png/1/light/trash-hide-deleted.png similarity index 100% rename from rtdata/images/themed/png/light/trash-hide-deleted.png rename to rtdata/images/themed/png/1/light/trash-hide-deleted.png diff --git a/rtdata/images/themed/png/light/trash-remove-small.png b/rtdata/images/themed/png/1/light/trash-remove-small.png similarity index 100% rename from rtdata/images/themed/png/light/trash-remove-small.png rename to rtdata/images/themed/png/1/light/trash-remove-small.png diff --git a/rtdata/images/themed/png/light/trash-remove.png b/rtdata/images/themed/png/1/light/trash-remove.png similarity index 100% rename from rtdata/images/themed/png/light/trash-remove.png rename to rtdata/images/themed/png/1/light/trash-remove.png diff --git a/rtdata/images/themed/png/light/trash-small.png b/rtdata/images/themed/png/1/light/trash-small.png similarity index 100% rename from rtdata/images/themed/png/light/trash-small.png rename to rtdata/images/themed/png/1/light/trash-small.png diff --git a/rtdata/images/themed/png/light/undo-all.png b/rtdata/images/themed/png/1/light/undo-all.png similarity index 100% rename from rtdata/images/themed/png/light/undo-all.png rename to rtdata/images/themed/png/1/light/undo-all.png diff --git a/rtdata/images/themed/png/light/undo-small.png b/rtdata/images/themed/png/1/light/undo-small.png similarity index 100% rename from rtdata/images/themed/png/light/undo-small.png rename to rtdata/images/themed/png/1/light/undo-small.png diff --git a/rtdata/images/themed/png/light/undo.png b/rtdata/images/themed/png/1/light/undo.png similarity index 100% rename from rtdata/images/themed/png/light/undo.png rename to rtdata/images/themed/png/1/light/undo.png diff --git a/rtdata/images/themed/png/light/warning-highlights.png b/rtdata/images/themed/png/1/light/warning-highlights.png similarity index 100% rename from rtdata/images/themed/png/light/warning-highlights.png rename to rtdata/images/themed/png/1/light/warning-highlights.png diff --git a/rtdata/images/themed/png/light/warning-shadows.png b/rtdata/images/themed/png/1/light/warning-shadows.png similarity index 100% rename from rtdata/images/themed/png/light/warning-shadows.png rename to rtdata/images/themed/png/1/light/warning-shadows.png diff --git a/rtdata/images/themed/png/light/wavelets.png b/rtdata/images/themed/png/1/light/wavelets.png similarity index 100% rename from rtdata/images/themed/png/light/wavelets.png rename to rtdata/images/themed/png/1/light/wavelets.png diff --git a/rtdata/images/themed/png/light/wb-auto-small.png b/rtdata/images/themed/png/1/light/wb-auto-small.png similarity index 100% rename from rtdata/images/themed/png/light/wb-auto-small.png rename to rtdata/images/themed/png/1/light/wb-auto-small.png diff --git a/rtdata/images/themed/png/light/wb-auto.png b/rtdata/images/themed/png/1/light/wb-auto.png similarity index 100% rename from rtdata/images/themed/png/light/wb-auto.png rename to rtdata/images/themed/png/1/light/wb-auto.png diff --git a/rtdata/images/themed/png/light/wb-camera-small.png b/rtdata/images/themed/png/1/light/wb-camera-small.png similarity index 100% rename from rtdata/images/themed/png/light/wb-camera-small.png rename to rtdata/images/themed/png/1/light/wb-camera-small.png diff --git a/rtdata/images/themed/png/light/wb-camera.png b/rtdata/images/themed/png/1/light/wb-camera.png similarity index 100% rename from rtdata/images/themed/png/light/wb-camera.png rename to rtdata/images/themed/png/1/light/wb-camera.png diff --git a/rtdata/images/themed/png/light/wb-cloudy-small.png b/rtdata/images/themed/png/1/light/wb-cloudy-small.png similarity index 100% rename from rtdata/images/themed/png/light/wb-cloudy-small.png rename to rtdata/images/themed/png/1/light/wb-cloudy-small.png diff --git a/rtdata/images/themed/png/light/wb-cloudy.png b/rtdata/images/themed/png/1/light/wb-cloudy.png similarity index 100% rename from rtdata/images/themed/png/light/wb-cloudy.png rename to rtdata/images/themed/png/1/light/wb-cloudy.png diff --git a/rtdata/images/themed/png/light/wb-custom-small.png b/rtdata/images/themed/png/1/light/wb-custom-small.png similarity index 100% rename from rtdata/images/themed/png/light/wb-custom-small.png rename to rtdata/images/themed/png/1/light/wb-custom-small.png diff --git a/rtdata/images/themed/png/light/wb-custom.png b/rtdata/images/themed/png/1/light/wb-custom.png similarity index 100% rename from rtdata/images/themed/png/light/wb-custom.png rename to rtdata/images/themed/png/1/light/wb-custom.png diff --git a/rtdata/images/themed/png/light/wb-flash-small.png b/rtdata/images/themed/png/1/light/wb-flash-small.png similarity index 100% rename from rtdata/images/themed/png/light/wb-flash-small.png rename to rtdata/images/themed/png/1/light/wb-flash-small.png diff --git a/rtdata/images/themed/png/light/wb-flash.png b/rtdata/images/themed/png/1/light/wb-flash.png similarity index 100% rename from rtdata/images/themed/png/light/wb-flash.png rename to rtdata/images/themed/png/1/light/wb-flash.png diff --git a/rtdata/images/themed/png/light/wb-fluorescent-small.png b/rtdata/images/themed/png/1/light/wb-fluorescent-small.png similarity index 100% rename from rtdata/images/themed/png/light/wb-fluorescent-small.png rename to rtdata/images/themed/png/1/light/wb-fluorescent-small.png diff --git a/rtdata/images/themed/png/light/wb-fluorescent.png b/rtdata/images/themed/png/1/light/wb-fluorescent.png similarity index 100% rename from rtdata/images/themed/png/light/wb-fluorescent.png rename to rtdata/images/themed/png/1/light/wb-fluorescent.png diff --git a/rtdata/images/themed/png/light/wb-lamp-small.png b/rtdata/images/themed/png/1/light/wb-lamp-small.png similarity index 100% rename from rtdata/images/themed/png/light/wb-lamp-small.png rename to rtdata/images/themed/png/1/light/wb-lamp-small.png diff --git a/rtdata/images/themed/png/light/wb-lamp.png b/rtdata/images/themed/png/1/light/wb-lamp.png similarity index 100% rename from rtdata/images/themed/png/light/wb-lamp.png rename to rtdata/images/themed/png/1/light/wb-lamp.png diff --git a/rtdata/images/themed/png/light/wb-led-small.png b/rtdata/images/themed/png/1/light/wb-led-small.png similarity index 100% rename from rtdata/images/themed/png/light/wb-led-small.png rename to rtdata/images/themed/png/1/light/wb-led-small.png diff --git a/rtdata/images/themed/png/light/wb-led.png b/rtdata/images/themed/png/1/light/wb-led.png similarity index 100% rename from rtdata/images/themed/png/light/wb-led.png rename to rtdata/images/themed/png/1/light/wb-led.png diff --git a/rtdata/images/themed/png/light/wb-shade-small.png b/rtdata/images/themed/png/1/light/wb-shade-small.png similarity index 100% rename from rtdata/images/themed/png/light/wb-shade-small.png rename to rtdata/images/themed/png/1/light/wb-shade-small.png diff --git a/rtdata/images/themed/png/light/wb-shade.png b/rtdata/images/themed/png/1/light/wb-shade.png similarity index 100% rename from rtdata/images/themed/png/light/wb-shade.png rename to rtdata/images/themed/png/1/light/wb-shade.png diff --git a/rtdata/images/themed/png/light/wb-sun-small.png b/rtdata/images/themed/png/1/light/wb-sun-small.png similarity index 100% rename from rtdata/images/themed/png/light/wb-sun-small.png rename to rtdata/images/themed/png/1/light/wb-sun-small.png diff --git a/rtdata/images/themed/png/light/wb-sun.png b/rtdata/images/themed/png/1/light/wb-sun.png similarity index 100% rename from rtdata/images/themed/png/light/wb-sun.png rename to rtdata/images/themed/png/1/light/wb-sun.png diff --git a/rtdata/images/themed/png/light/wb-tungsten-small.png b/rtdata/images/themed/png/1/light/wb-tungsten-small.png similarity index 100% rename from rtdata/images/themed/png/light/wb-tungsten-small.png rename to rtdata/images/themed/png/1/light/wb-tungsten-small.png diff --git a/rtdata/images/themed/png/light/wb-tungsten.png b/rtdata/images/themed/png/1/light/wb-tungsten.png similarity index 100% rename from rtdata/images/themed/png/light/wb-tungsten.png rename to rtdata/images/themed/png/1/light/wb-tungsten.png diff --git a/rtdata/images/themed/png/light/wb-water-small.png b/rtdata/images/themed/png/1/light/wb-water-small.png similarity index 100% rename from rtdata/images/themed/png/light/wb-water-small.png rename to rtdata/images/themed/png/1/light/wb-water-small.png diff --git a/rtdata/images/themed/png/light/wb-water.png b/rtdata/images/themed/png/1/light/wb-water.png similarity index 100% rename from rtdata/images/themed/png/light/wb-water.png rename to rtdata/images/themed/png/1/light/wb-water.png diff --git a/rtdata/images/themed/png/light/window-add.png b/rtdata/images/themed/png/1/light/window-add.png similarity index 100% rename from rtdata/images/themed/png/light/window-add.png rename to rtdata/images/themed/png/1/light/window-add.png diff --git a/rtdata/images/themed/png/2/dark/add-small.png b/rtdata/images/themed/png/2/dark/add-small.png new file mode 100644 index 000000000..de3d5a805 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/add-small.png differ diff --git a/rtdata/images/themed/png/2/dark/add.png b/rtdata/images/themed/png/2/dark/add.png new file mode 100644 index 000000000..1bef96fb1 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/add.png differ diff --git a/rtdata/images/themed/png/2/dark/aperture.png b/rtdata/images/themed/png/2/dark/aperture.png new file mode 100644 index 000000000..b2e265e26 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/aperture.png differ diff --git a/rtdata/images/themed/png/2/dark/arrow-down-small.png b/rtdata/images/themed/png/2/dark/arrow-down-small.png new file mode 100644 index 000000000..84e8e7c17 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/arrow-down-small.png differ diff --git a/rtdata/images/themed/png/2/dark/arrow-left-small.png b/rtdata/images/themed/png/2/dark/arrow-left-small.png new file mode 100644 index 000000000..260e15cfb Binary files /dev/null and b/rtdata/images/themed/png/2/dark/arrow-left-small.png differ diff --git a/rtdata/images/themed/png/2/dark/arrow-right-small.png b/rtdata/images/themed/png/2/dark/arrow-right-small.png new file mode 100644 index 000000000..af6859e83 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/arrow-right-small.png differ diff --git a/rtdata/images/themed/png/2/dark/arrow-up-small.png b/rtdata/images/themed/png/2/dark/arrow-up-small.png new file mode 100644 index 000000000..f646e81bb Binary files /dev/null and b/rtdata/images/themed/png/2/dark/arrow-up-small.png differ diff --git a/rtdata/images/themed/png/2/dark/arrow-updown.png b/rtdata/images/themed/png/2/dark/arrow-updown.png new file mode 100644 index 000000000..a4e6a8031 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/arrow-updown.png differ diff --git a/rtdata/images/themed/png/2/dark/arrow2-left.png b/rtdata/images/themed/png/2/dark/arrow2-left.png new file mode 100644 index 000000000..3b9b436cc Binary files /dev/null and b/rtdata/images/themed/png/2/dark/arrow2-left.png differ diff --git a/rtdata/images/themed/png/2/dark/arrow2-right.png b/rtdata/images/themed/png/2/dark/arrow2-right.png new file mode 100644 index 000000000..b12845da6 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/arrow2-right.png differ diff --git a/rtdata/images/themed/png/2/dark/atom.png b/rtdata/images/themed/png/2/dark/atom.png new file mode 100644 index 000000000..9a20ebf47 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/atom.png differ diff --git a/rtdata/images/themed/png/2/dark/bayer.png b/rtdata/images/themed/png/2/dark/bayer.png new file mode 100644 index 000000000..90188c195 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/bayer.png differ diff --git a/rtdata/images/themed/png/2/dark/beforeafter.png b/rtdata/images/themed/png/2/dark/beforeafter.png new file mode 100644 index 000000000..f758b60e3 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/beforeafter.png differ diff --git a/rtdata/images/themed/png/2/dark/cancel-small.png b/rtdata/images/themed/png/2/dark/cancel-small.png new file mode 100644 index 000000000..58692874a Binary files /dev/null and b/rtdata/images/themed/png/2/dark/cancel-small.png differ diff --git a/rtdata/images/themed/png/2/dark/cancel.png b/rtdata/images/themed/png/2/dark/cancel.png new file mode 100644 index 000000000..5e3a8811a Binary files /dev/null and b/rtdata/images/themed/png/2/dark/cancel.png differ diff --git a/rtdata/images/themed/png/2/dark/circle-black-small.png b/rtdata/images/themed/png/2/dark/circle-black-small.png new file mode 100644 index 000000000..c7e218f3a Binary files /dev/null and b/rtdata/images/themed/png/2/dark/circle-black-small.png differ diff --git a/rtdata/images/themed/png/2/dark/circle-blue-green-small.png b/rtdata/images/themed/png/2/dark/circle-blue-green-small.png new file mode 100644 index 000000000..0b4d9652a Binary files /dev/null and b/rtdata/images/themed/png/2/dark/circle-blue-green-small.png differ diff --git a/rtdata/images/themed/png/2/dark/circle-blue-red-small.png b/rtdata/images/themed/png/2/dark/circle-blue-red-small.png new file mode 100644 index 000000000..b5a224288 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/circle-blue-red-small.png differ diff --git a/rtdata/images/themed/png/2/dark/circle-blue-small.png b/rtdata/images/themed/png/2/dark/circle-blue-small.png new file mode 100644 index 000000000..f72a53404 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/circle-blue-small.png differ diff --git a/rtdata/images/themed/png/2/dark/circle-blue-yellow-small.png b/rtdata/images/themed/png/2/dark/circle-blue-yellow-small.png new file mode 100644 index 000000000..c164be2f9 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/circle-blue-yellow-small.png differ diff --git a/rtdata/images/themed/png/2/dark/circle-cyan-red-small.png b/rtdata/images/themed/png/2/dark/circle-cyan-red-small.png new file mode 100644 index 000000000..da9c12742 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/circle-cyan-red-small.png differ diff --git a/rtdata/images/themed/png/2/dark/circle-cyan-small.png b/rtdata/images/themed/png/2/dark/circle-cyan-small.png new file mode 100644 index 000000000..9e2d0f47b Binary files /dev/null and b/rtdata/images/themed/png/2/dark/circle-cyan-small.png differ diff --git a/rtdata/images/themed/png/2/dark/circle-darkgray-small.png b/rtdata/images/themed/png/2/dark/circle-darkgray-small.png new file mode 100644 index 000000000..ce86636da Binary files /dev/null and b/rtdata/images/themed/png/2/dark/circle-darkgray-small.png differ diff --git a/rtdata/images/themed/png/2/dark/circle-empty-blue-small.png b/rtdata/images/themed/png/2/dark/circle-empty-blue-small.png new file mode 100644 index 000000000..b4509923f Binary files /dev/null and b/rtdata/images/themed/png/2/dark/circle-empty-blue-small.png differ diff --git a/rtdata/images/themed/png/2/dark/circle-empty-darkgray-small.png b/rtdata/images/themed/png/2/dark/circle-empty-darkgray-small.png new file mode 100644 index 000000000..63a4f0ebd Binary files /dev/null and b/rtdata/images/themed/png/2/dark/circle-empty-darkgray-small.png differ diff --git a/rtdata/images/themed/png/2/dark/circle-empty-gray-small.png b/rtdata/images/themed/png/2/dark/circle-empty-gray-small.png new file mode 100644 index 000000000..1d737c949 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/circle-empty-gray-small.png differ diff --git a/rtdata/images/themed/png/2/dark/circle-empty-green-small.png b/rtdata/images/themed/png/2/dark/circle-empty-green-small.png new file mode 100644 index 000000000..92c0bb183 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/circle-empty-green-small.png differ diff --git a/rtdata/images/themed/png/2/dark/circle-empty-purple-small.png b/rtdata/images/themed/png/2/dark/circle-empty-purple-small.png new file mode 100644 index 000000000..76a64d3b6 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/circle-empty-purple-small.png differ diff --git a/rtdata/images/themed/png/2/dark/circle-empty-red-small.png b/rtdata/images/themed/png/2/dark/circle-empty-red-small.png new file mode 100644 index 000000000..577db3cd6 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/circle-empty-red-small.png differ diff --git a/rtdata/images/themed/png/2/dark/circle-empty-yellow-small.png b/rtdata/images/themed/png/2/dark/circle-empty-yellow-small.png new file mode 100644 index 000000000..6868376f9 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/circle-empty-yellow-small.png differ diff --git a/rtdata/images/themed/png/2/dark/circle-gray-blue-small.png b/rtdata/images/themed/png/2/dark/circle-gray-blue-small.png new file mode 100644 index 000000000..befd24c0e Binary files /dev/null and b/rtdata/images/themed/png/2/dark/circle-gray-blue-small.png differ diff --git a/rtdata/images/themed/png/2/dark/circle-gray-green-small.png b/rtdata/images/themed/png/2/dark/circle-gray-green-small.png new file mode 100644 index 000000000..cc604c173 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/circle-gray-green-small.png differ diff --git a/rtdata/images/themed/png/2/dark/circle-gray-red-small.png b/rtdata/images/themed/png/2/dark/circle-gray-red-small.png new file mode 100644 index 000000000..6eb5588c9 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/circle-gray-red-small.png differ diff --git a/rtdata/images/themed/png/2/dark/circle-gray-small.png b/rtdata/images/themed/png/2/dark/circle-gray-small.png new file mode 100644 index 000000000..1962d3a50 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/circle-gray-small.png differ diff --git a/rtdata/images/themed/png/2/dark/circle-green-blue-small.png b/rtdata/images/themed/png/2/dark/circle-green-blue-small.png new file mode 100644 index 000000000..45f01beea Binary files /dev/null and b/rtdata/images/themed/png/2/dark/circle-green-blue-small.png differ diff --git a/rtdata/images/themed/png/2/dark/circle-green-red-small.png b/rtdata/images/themed/png/2/dark/circle-green-red-small.png new file mode 100644 index 000000000..43bb56c18 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/circle-green-red-small.png differ diff --git a/rtdata/images/themed/png/2/dark/circle-green-small.png b/rtdata/images/themed/png/2/dark/circle-green-small.png new file mode 100644 index 000000000..72915c10a Binary files /dev/null and b/rtdata/images/themed/png/2/dark/circle-green-small.png differ diff --git a/rtdata/images/themed/png/2/dark/circle-magenta-small.png b/rtdata/images/themed/png/2/dark/circle-magenta-small.png new file mode 100644 index 000000000..9a47fd789 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/circle-magenta-small.png differ diff --git a/rtdata/images/themed/png/2/dark/circle-orange-small.png b/rtdata/images/themed/png/2/dark/circle-orange-small.png new file mode 100644 index 000000000..b619e22ea Binary files /dev/null and b/rtdata/images/themed/png/2/dark/circle-orange-small.png differ diff --git a/rtdata/images/themed/png/2/dark/circle-purple-small.png b/rtdata/images/themed/png/2/dark/circle-purple-small.png new file mode 100644 index 000000000..a85c50b6b Binary files /dev/null and b/rtdata/images/themed/png/2/dark/circle-purple-small.png differ diff --git a/rtdata/images/themed/png/2/dark/circle-red-blue-small.png b/rtdata/images/themed/png/2/dark/circle-red-blue-small.png new file mode 100644 index 000000000..1dc5f80c5 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/circle-red-blue-small.png differ diff --git a/rtdata/images/themed/png/2/dark/circle-red-cyan-small.png b/rtdata/images/themed/png/2/dark/circle-red-cyan-small.png new file mode 100644 index 000000000..52706baef Binary files /dev/null and b/rtdata/images/themed/png/2/dark/circle-red-cyan-small.png differ diff --git a/rtdata/images/themed/png/2/dark/circle-red-green-small.png b/rtdata/images/themed/png/2/dark/circle-red-green-small.png new file mode 100644 index 000000000..e58fd35da Binary files /dev/null and b/rtdata/images/themed/png/2/dark/circle-red-green-small.png differ diff --git a/rtdata/images/themed/png/2/dark/circle-red-small.png b/rtdata/images/themed/png/2/dark/circle-red-small.png new file mode 100644 index 000000000..67975abdd Binary files /dev/null and b/rtdata/images/themed/png/2/dark/circle-red-small.png differ diff --git a/rtdata/images/themed/png/2/dark/circle-white-small.png b/rtdata/images/themed/png/2/dark/circle-white-small.png new file mode 100644 index 000000000..0e7ba1b6d Binary files /dev/null and b/rtdata/images/themed/png/2/dark/circle-white-small.png differ diff --git a/rtdata/images/themed/png/2/dark/circle-yellow-blue-small.png b/rtdata/images/themed/png/2/dark/circle-yellow-blue-small.png new file mode 100644 index 000000000..058edfe96 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/circle-yellow-blue-small.png differ diff --git a/rtdata/images/themed/png/2/dark/circle-yellow-small.png b/rtdata/images/themed/png/2/dark/circle-yellow-small.png new file mode 100644 index 000000000..e0c97e9fe Binary files /dev/null and b/rtdata/images/themed/png/2/dark/circle-yellow-small.png differ diff --git a/rtdata/images/themed/png/2/dark/color-circles.png b/rtdata/images/themed/png/2/dark/color-circles.png new file mode 100644 index 000000000..4a5518fab Binary files /dev/null and b/rtdata/images/themed/png/2/dark/color-circles.png differ diff --git a/rtdata/images/themed/png/2/dark/color-picker-add-hicontrast.png b/rtdata/images/themed/png/2/dark/color-picker-add-hicontrast.png new file mode 100644 index 000000000..c23b27bb8 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/color-picker-add-hicontrast.png differ diff --git a/rtdata/images/themed/png/2/dark/color-picker-add.png b/rtdata/images/themed/png/2/dark/color-picker-add.png new file mode 100644 index 000000000..6d8e0cdbd Binary files /dev/null and b/rtdata/images/themed/png/2/dark/color-picker-add.png differ diff --git a/rtdata/images/themed/png/2/dark/color-picker-bars.png b/rtdata/images/themed/png/2/dark/color-picker-bars.png new file mode 100644 index 000000000..65593175a Binary files /dev/null and b/rtdata/images/themed/png/2/dark/color-picker-bars.png differ diff --git a/rtdata/images/themed/png/2/dark/color-picker-hicontrast.png b/rtdata/images/themed/png/2/dark/color-picker-hicontrast.png new file mode 100644 index 000000000..59a134e1c Binary files /dev/null and b/rtdata/images/themed/png/2/dark/color-picker-hicontrast.png differ diff --git a/rtdata/images/themed/png/2/dark/color-picker-hide.png b/rtdata/images/themed/png/2/dark/color-picker-hide.png new file mode 100644 index 000000000..ce5433b97 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/color-picker-hide.png differ diff --git a/rtdata/images/themed/png/2/dark/color-picker.png b/rtdata/images/themed/png/2/dark/color-picker.png new file mode 100644 index 000000000..a8444207b Binary files /dev/null and b/rtdata/images/themed/png/2/dark/color-picker.png differ diff --git a/rtdata/images/themed/png/2/dark/contrastmask-off.png b/rtdata/images/themed/png/2/dark/contrastmask-off.png new file mode 100644 index 000000000..930d57221 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/contrastmask-off.png differ diff --git a/rtdata/images/themed/png/2/dark/contrastmask-on.png b/rtdata/images/themed/png/2/dark/contrastmask-on.png new file mode 100644 index 000000000..0fda6bd36 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/contrastmask-on.png differ diff --git a/rtdata/images/themed/png/2/dark/copy.png b/rtdata/images/themed/png/2/dark/copy.png new file mode 100644 index 000000000..990f2c26b Binary files /dev/null and b/rtdata/images/themed/png/2/dark/copy.png differ diff --git a/rtdata/images/themed/png/2/dark/crop-auto-small.png b/rtdata/images/themed/png/2/dark/crop-auto-small.png new file mode 100644 index 000000000..dfc61de42 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/crop-auto-small.png differ diff --git a/rtdata/images/themed/png/2/dark/crop-auto.png b/rtdata/images/themed/png/2/dark/crop-auto.png new file mode 100644 index 000000000..0548b544e Binary files /dev/null and b/rtdata/images/themed/png/2/dark/crop-auto.png differ diff --git a/rtdata/images/themed/png/2/dark/crop-point-hicontrast.png b/rtdata/images/themed/png/2/dark/crop-point-hicontrast.png new file mode 100644 index 000000000..d688246d1 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/crop-point-hicontrast.png differ diff --git a/rtdata/images/themed/png/2/dark/crop-small.png b/rtdata/images/themed/png/2/dark/crop-small.png new file mode 100644 index 000000000..e7b9e616a Binary files /dev/null and b/rtdata/images/themed/png/2/dark/crop-small.png differ diff --git a/rtdata/images/themed/png/2/dark/crop.png b/rtdata/images/themed/png/2/dark/crop.png new file mode 100644 index 000000000..c9156bb89 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/crop.png differ diff --git a/rtdata/images/themed/png/2/dark/crossed-arrows-in.png b/rtdata/images/themed/png/2/dark/crossed-arrows-in.png new file mode 100644 index 000000000..f5ad4eebd Binary files /dev/null and b/rtdata/images/themed/png/2/dark/crossed-arrows-in.png differ diff --git a/rtdata/images/themed/png/2/dark/crossed-arrows-out.png b/rtdata/images/themed/png/2/dark/crossed-arrows-out.png new file mode 100644 index 000000000..38442be17 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/crossed-arrows-out.png differ diff --git a/rtdata/images/themed/png/2/dark/crosshair-adjust.png b/rtdata/images/themed/png/2/dark/crosshair-adjust.png new file mode 100644 index 000000000..dcabef474 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/crosshair-adjust.png differ diff --git a/rtdata/images/themed/png/2/dark/crosshair-hicontrast.png b/rtdata/images/themed/png/2/dark/crosshair-hicontrast.png new file mode 100644 index 000000000..aee472818 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/crosshair-hicontrast.png differ diff --git a/rtdata/images/themed/png/2/dark/crosshair-node-curve.png b/rtdata/images/themed/png/2/dark/crosshair-node-curve.png new file mode 100644 index 000000000..8010fab4c Binary files /dev/null and b/rtdata/images/themed/png/2/dark/crosshair-node-curve.png differ diff --git a/rtdata/images/themed/png/2/dark/crosshair-small.png b/rtdata/images/themed/png/2/dark/crosshair-small.png new file mode 100644 index 000000000..48df764f6 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/crosshair-small.png differ diff --git a/rtdata/images/themed/png/2/dark/curve-controlpoints-small.png b/rtdata/images/themed/png/2/dark/curve-controlpoints-small.png new file mode 100644 index 000000000..4d6f560b7 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/curve-controlpoints-small.png differ diff --git a/rtdata/images/themed/png/2/dark/curve-controlpoints.png b/rtdata/images/themed/png/2/dark/curve-controlpoints.png new file mode 100644 index 000000000..766daa88e Binary files /dev/null and b/rtdata/images/themed/png/2/dark/curve-controlpoints.png differ diff --git a/rtdata/images/themed/png/2/dark/curve-flat-small.png b/rtdata/images/themed/png/2/dark/curve-flat-small.png new file mode 100644 index 000000000..e6aa55e9e Binary files /dev/null and b/rtdata/images/themed/png/2/dark/curve-flat-small.png differ diff --git a/rtdata/images/themed/png/2/dark/curve-flat.png b/rtdata/images/themed/png/2/dark/curve-flat.png new file mode 100644 index 000000000..abbea5b37 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/curve-flat.png differ diff --git a/rtdata/images/themed/png/2/dark/curve-linear-small.png b/rtdata/images/themed/png/2/dark/curve-linear-small.png new file mode 100644 index 000000000..eca35e82f Binary files /dev/null and b/rtdata/images/themed/png/2/dark/curve-linear-small.png differ diff --git a/rtdata/images/themed/png/2/dark/curve-linear.png b/rtdata/images/themed/png/2/dark/curve-linear.png new file mode 100644 index 000000000..f57074c00 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/curve-linear.png differ diff --git a/rtdata/images/themed/png/2/dark/curve-nurbs-small.png b/rtdata/images/themed/png/2/dark/curve-nurbs-small.png new file mode 100644 index 000000000..69273d2a0 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/curve-nurbs-small.png differ diff --git a/rtdata/images/themed/png/2/dark/curve-nurbs.png b/rtdata/images/themed/png/2/dark/curve-nurbs.png new file mode 100644 index 000000000..8b3016bb5 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/curve-nurbs.png differ diff --git a/rtdata/images/themed/png/2/dark/curve-parametric-small.png b/rtdata/images/themed/png/2/dark/curve-parametric-small.png new file mode 100644 index 000000000..3e58cafb1 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/curve-parametric-small.png differ diff --git a/rtdata/images/themed/png/2/dark/curve-parametric.png b/rtdata/images/themed/png/2/dark/curve-parametric.png new file mode 100644 index 000000000..e2b3227a8 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/curve-parametric.png differ diff --git a/rtdata/images/themed/png/2/dark/curve-spline-small.png b/rtdata/images/themed/png/2/dark/curve-spline-small.png new file mode 100644 index 000000000..ede348138 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/curve-spline-small.png differ diff --git a/rtdata/images/themed/png/2/dark/curve-spline.png b/rtdata/images/themed/png/2/dark/curve-spline.png new file mode 100644 index 000000000..ce70aafec Binary files /dev/null and b/rtdata/images/themed/png/2/dark/curve-spline.png differ diff --git a/rtdata/images/themed/png/2/dark/detail.png b/rtdata/images/themed/png/2/dark/detail.png new file mode 100644 index 000000000..318f955b5 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/detail.png differ diff --git a/rtdata/images/themed/png/2/dark/device-floppy.png b/rtdata/images/themed/png/2/dark/device-floppy.png new file mode 100644 index 000000000..aeb324dcc Binary files /dev/null and b/rtdata/images/themed/png/2/dark/device-floppy.png differ diff --git a/rtdata/images/themed/png/2/dark/device-hdd.png b/rtdata/images/themed/png/2/dark/device-hdd.png new file mode 100644 index 000000000..7282d8873 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/device-hdd.png differ diff --git a/rtdata/images/themed/png/2/dark/device-network.png b/rtdata/images/themed/png/2/dark/device-network.png new file mode 100644 index 000000000..6188c256b Binary files /dev/null and b/rtdata/images/themed/png/2/dark/device-network.png differ diff --git a/rtdata/images/themed/png/2/dark/device-optical.png b/rtdata/images/themed/png/2/dark/device-optical.png new file mode 100644 index 000000000..b1b614ecd Binary files /dev/null and b/rtdata/images/themed/png/2/dark/device-optical.png differ diff --git a/rtdata/images/themed/png/2/dark/device-usb.png b/rtdata/images/themed/png/2/dark/device-usb.png new file mode 100644 index 000000000..da79da5a0 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/device-usb.png differ diff --git a/rtdata/images/themed/png/2/dark/distortion-auto-small.png b/rtdata/images/themed/png/2/dark/distortion-auto-small.png new file mode 100644 index 000000000..6e79fcf83 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/distortion-auto-small.png differ diff --git a/rtdata/images/themed/png/2/dark/distortion-auto.png b/rtdata/images/themed/png/2/dark/distortion-auto.png new file mode 100644 index 000000000..2f2d12373 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/distortion-auto.png differ diff --git a/rtdata/images/themed/png/2/dark/distortion-barrel-small.png b/rtdata/images/themed/png/2/dark/distortion-barrel-small.png new file mode 100644 index 000000000..43329b03a Binary files /dev/null and b/rtdata/images/themed/png/2/dark/distortion-barrel-small.png differ diff --git a/rtdata/images/themed/png/2/dark/distortion-barrel.png b/rtdata/images/themed/png/2/dark/distortion-barrel.png new file mode 100644 index 000000000..0eecc1ecb Binary files /dev/null and b/rtdata/images/themed/png/2/dark/distortion-barrel.png differ diff --git a/rtdata/images/themed/png/2/dark/distortion-pincushion-small.png b/rtdata/images/themed/png/2/dark/distortion-pincushion-small.png new file mode 100644 index 000000000..8da93f204 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/distortion-pincushion-small.png differ diff --git a/rtdata/images/themed/png/2/dark/distortion-pincushion.png b/rtdata/images/themed/png/2/dark/distortion-pincushion.png new file mode 100644 index 000000000..6dc89aeb2 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/distortion-pincushion.png differ diff --git a/rtdata/images/themed/png/2/dark/edit-point.png b/rtdata/images/themed/png/2/dark/edit-point.png new file mode 100644 index 000000000..9f242fbb1 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/edit-point.png differ diff --git a/rtdata/images/themed/png/2/dark/equilizer-narrow.png b/rtdata/images/themed/png/2/dark/equilizer-narrow.png new file mode 100644 index 000000000..2989749b5 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/equilizer-narrow.png differ diff --git a/rtdata/images/themed/png/2/dark/equilizer-wide.png b/rtdata/images/themed/png/2/dark/equilizer-wide.png new file mode 100644 index 000000000..beda36416 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/equilizer-wide.png differ diff --git a/rtdata/images/themed/png/2/dark/expander-closed-small.png b/rtdata/images/themed/png/2/dark/expander-closed-small.png new file mode 100644 index 000000000..3f59f4a84 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/expander-closed-small.png differ diff --git a/rtdata/images/themed/png/2/dark/expander-open-small.png b/rtdata/images/themed/png/2/dark/expander-open-small.png new file mode 100644 index 000000000..849a2b594 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/expander-open-small.png differ diff --git a/rtdata/images/themed/png/2/dark/exposure.png b/rtdata/images/themed/png/2/dark/exposure.png new file mode 100644 index 000000000..351326d77 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/exposure.png differ diff --git a/rtdata/images/themed/png/2/dark/filetype-hdr.png b/rtdata/images/themed/png/2/dark/filetype-hdr.png new file mode 100644 index 000000000..5b560e66e Binary files /dev/null and b/rtdata/images/themed/png/2/dark/filetype-hdr.png differ diff --git a/rtdata/images/themed/png/2/dark/filetype-ps.png b/rtdata/images/themed/png/2/dark/filetype-ps.png new file mode 100644 index 000000000..a6fbd3412 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/filetype-ps.png differ diff --git a/rtdata/images/themed/png/2/dark/filter-clear.png b/rtdata/images/themed/png/2/dark/filter-clear.png new file mode 100644 index 000000000..51c827351 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/filter-clear.png differ diff --git a/rtdata/images/themed/png/2/dark/filter-original.png b/rtdata/images/themed/png/2/dark/filter-original.png new file mode 100644 index 000000000..48f0ad2ee Binary files /dev/null and b/rtdata/images/themed/png/2/dark/filter-original.png differ diff --git a/rtdata/images/themed/png/2/dark/filter-original2.png b/rtdata/images/themed/png/2/dark/filter-original2.png new file mode 100644 index 000000000..d2b77864c Binary files /dev/null and b/rtdata/images/themed/png/2/dark/filter-original2.png differ diff --git a/rtdata/images/themed/png/2/dark/filter.png b/rtdata/images/themed/png/2/dark/filter.png new file mode 100644 index 000000000..6552cd917 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/filter.png differ diff --git a/rtdata/images/themed/png/2/dark/flip-horizontal.png b/rtdata/images/themed/png/2/dark/flip-horizontal.png new file mode 100644 index 000000000..380d8ed8f Binary files /dev/null and b/rtdata/images/themed/png/2/dark/flip-horizontal.png differ diff --git a/rtdata/images/themed/png/2/dark/flip-vertical.png b/rtdata/images/themed/png/2/dark/flip-vertical.png new file mode 100644 index 000000000..72555343f Binary files /dev/null and b/rtdata/images/themed/png/2/dark/flip-vertical.png differ diff --git a/rtdata/images/themed/png/2/dark/focusscreen-off.png b/rtdata/images/themed/png/2/dark/focusscreen-off.png new file mode 100644 index 000000000..4ec1e7971 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/focusscreen-off.png differ diff --git a/rtdata/images/themed/png/2/dark/focusscreen-on.png b/rtdata/images/themed/png/2/dark/focusscreen-on.png new file mode 100644 index 000000000..1edde1374 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/focusscreen-on.png differ diff --git a/rtdata/images/themed/png/2/dark/folder-closed-home-small.png b/rtdata/images/themed/png/2/dark/folder-closed-home-small.png new file mode 100644 index 000000000..9855bb25c Binary files /dev/null and b/rtdata/images/themed/png/2/dark/folder-closed-home-small.png differ diff --git a/rtdata/images/themed/png/2/dark/folder-closed-home.png b/rtdata/images/themed/png/2/dark/folder-closed-home.png new file mode 100644 index 000000000..b48edf7de Binary files /dev/null and b/rtdata/images/themed/png/2/dark/folder-closed-home.png differ diff --git a/rtdata/images/themed/png/2/dark/folder-closed-recent-small.png b/rtdata/images/themed/png/2/dark/folder-closed-recent-small.png new file mode 100644 index 000000000..468560bae Binary files /dev/null and b/rtdata/images/themed/png/2/dark/folder-closed-recent-small.png differ diff --git a/rtdata/images/themed/png/2/dark/folder-closed-recent.png b/rtdata/images/themed/png/2/dark/folder-closed-recent.png new file mode 100644 index 000000000..4ad733718 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/folder-closed-recent.png differ diff --git a/rtdata/images/themed/png/2/dark/folder-closed-small.png b/rtdata/images/themed/png/2/dark/folder-closed-small.png new file mode 100644 index 000000000..131757ee3 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/folder-closed-small.png differ diff --git a/rtdata/images/themed/png/2/dark/folder-closed.png b/rtdata/images/themed/png/2/dark/folder-closed.png new file mode 100644 index 000000000..cde085484 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/folder-closed.png differ diff --git a/rtdata/images/themed/png/2/dark/folder-open-recent-small.png b/rtdata/images/themed/png/2/dark/folder-open-recent-small.png new file mode 100644 index 000000000..05b527e6c Binary files /dev/null and b/rtdata/images/themed/png/2/dark/folder-open-recent-small.png differ diff --git a/rtdata/images/themed/png/2/dark/folder-open-recent.png b/rtdata/images/themed/png/2/dark/folder-open-recent.png new file mode 100644 index 000000000..d7af81cc5 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/folder-open-recent.png differ diff --git a/rtdata/images/themed/png/2/dark/folder-open-small.png b/rtdata/images/themed/png/2/dark/folder-open-small.png new file mode 100644 index 000000000..41ee660cb Binary files /dev/null and b/rtdata/images/themed/png/2/dark/folder-open-small.png differ diff --git a/rtdata/images/themed/png/2/dark/folder-open.png b/rtdata/images/themed/png/2/dark/folder-open.png new file mode 100644 index 000000000..eac051af0 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/folder-open.png differ diff --git a/rtdata/images/themed/png/2/dark/fullscreen-enter.png b/rtdata/images/themed/png/2/dark/fullscreen-enter.png new file mode 100644 index 000000000..8c529f721 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/fullscreen-enter.png differ diff --git a/rtdata/images/themed/png/2/dark/fullscreen-leave.png b/rtdata/images/themed/png/2/dark/fullscreen-leave.png new file mode 100644 index 000000000..ac4ebf916 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/fullscreen-leave.png differ diff --git a/rtdata/images/themed/png/2/dark/gamut-hist.png b/rtdata/images/themed/png/2/dark/gamut-hist.png new file mode 100644 index 000000000..f7732ff78 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/gamut-hist.png differ diff --git a/rtdata/images/themed/png/2/dark/gamut-plus.png b/rtdata/images/themed/png/2/dark/gamut-plus.png new file mode 100644 index 000000000..ebb1757ab Binary files /dev/null and b/rtdata/images/themed/png/2/dark/gamut-plus.png differ diff --git a/rtdata/images/themed/png/2/dark/gamut-softproof.png b/rtdata/images/themed/png/2/dark/gamut-softproof.png new file mode 100644 index 000000000..28c2382c1 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/gamut-softproof.png differ diff --git a/rtdata/images/themed/png/2/dark/gamut-warning.png b/rtdata/images/themed/png/2/dark/gamut-warning.png new file mode 100644 index 000000000..61cdda514 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/gamut-warning.png differ diff --git a/rtdata/images/themed/png/2/dark/gamut_srgb_prophoto_xy.png b/rtdata/images/themed/png/2/dark/gamut_srgb_prophoto_xy.png new file mode 100644 index 000000000..1a101f79f Binary files /dev/null and b/rtdata/images/themed/png/2/dark/gamut_srgb_prophoto_xy.png differ diff --git a/rtdata/images/themed/png/2/dark/gears-pause.png b/rtdata/images/themed/png/2/dark/gears-pause.png new file mode 100644 index 000000000..92dc39880 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/gears-pause.png differ diff --git a/rtdata/images/themed/png/2/dark/gears-play.png b/rtdata/images/themed/png/2/dark/gears-play.png new file mode 100644 index 000000000..66f0c0b4a Binary files /dev/null and b/rtdata/images/themed/png/2/dark/gears-play.png differ diff --git a/rtdata/images/themed/png/2/dark/gears-small.png b/rtdata/images/themed/png/2/dark/gears-small.png new file mode 100644 index 000000000..ffe0708bc Binary files /dev/null and b/rtdata/images/themed/png/2/dark/gears-small.png differ diff --git a/rtdata/images/themed/png/2/dark/gears.png b/rtdata/images/themed/png/2/dark/gears.png new file mode 100644 index 000000000..e04f7a19c Binary files /dev/null and b/rtdata/images/themed/png/2/dark/gears.png differ diff --git a/rtdata/images/themed/png/2/dark/goto-end-small.png b/rtdata/images/themed/png/2/dark/goto-end-small.png new file mode 100644 index 000000000..28d519928 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/goto-end-small.png differ diff --git a/rtdata/images/themed/png/2/dark/goto-start-small.png b/rtdata/images/themed/png/2/dark/goto-start-small.png new file mode 100644 index 000000000..195fe0965 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/goto-start-small.png differ diff --git a/rtdata/images/themed/png/2/dark/hand-closed-hicontrast.png b/rtdata/images/themed/png/2/dark/hand-closed-hicontrast.png new file mode 100644 index 000000000..046f3c341 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/hand-closed-hicontrast.png differ diff --git a/rtdata/images/themed/png/2/dark/hand-open-hicontrast.png b/rtdata/images/themed/png/2/dark/hand-open-hicontrast.png new file mode 100644 index 000000000..d6aba1ed8 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/hand-open-hicontrast.png differ diff --git a/rtdata/images/themed/png/2/dark/hand-open.png b/rtdata/images/themed/png/2/dark/hand-open.png new file mode 100644 index 000000000..0cbc54c35 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/hand-open.png differ diff --git a/rtdata/images/themed/png/2/dark/histogram-bar-off-small.png b/rtdata/images/themed/png/2/dark/histogram-bar-off-small.png new file mode 100644 index 000000000..f47125233 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/histogram-bar-off-small.png differ diff --git a/rtdata/images/themed/png/2/dark/histogram-bar-on-small.png b/rtdata/images/themed/png/2/dark/histogram-bar-on-small.png new file mode 100644 index 000000000..2cd94077e Binary files /dev/null and b/rtdata/images/themed/png/2/dark/histogram-bar-on-small.png differ diff --git a/rtdata/images/themed/png/2/dark/histogram-bayer-off-small.png b/rtdata/images/themed/png/2/dark/histogram-bayer-off-small.png new file mode 100644 index 000000000..dfa42090d Binary files /dev/null and b/rtdata/images/themed/png/2/dark/histogram-bayer-off-small.png differ diff --git a/rtdata/images/themed/png/2/dark/histogram-bayer-on-small.png b/rtdata/images/themed/png/2/dark/histogram-bayer-on-small.png new file mode 100644 index 000000000..5ed266350 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/histogram-bayer-on-small.png differ diff --git a/rtdata/images/themed/png/2/dark/histogram-blue-off-small.png b/rtdata/images/themed/png/2/dark/histogram-blue-off-small.png new file mode 100644 index 000000000..7fa647f44 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/histogram-blue-off-small.png differ diff --git a/rtdata/images/themed/png/2/dark/histogram-blue-on-small.png b/rtdata/images/themed/png/2/dark/histogram-blue-on-small.png new file mode 100644 index 000000000..2da44ea64 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/histogram-blue-on-small.png differ diff --git a/rtdata/images/themed/png/2/dark/histogram-gold-off-small.png b/rtdata/images/themed/png/2/dark/histogram-gold-off-small.png new file mode 100644 index 000000000..e3c0eec86 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/histogram-gold-off-small.png differ diff --git a/rtdata/images/themed/png/2/dark/histogram-gold-on-small.png b/rtdata/images/themed/png/2/dark/histogram-gold-on-small.png new file mode 100644 index 000000000..08ad39f12 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/histogram-gold-on-small.png differ diff --git a/rtdata/images/themed/png/2/dark/histogram-green-off-small.png b/rtdata/images/themed/png/2/dark/histogram-green-off-small.png new file mode 100644 index 000000000..1471f6bea Binary files /dev/null and b/rtdata/images/themed/png/2/dark/histogram-green-off-small.png differ diff --git a/rtdata/images/themed/png/2/dark/histogram-green-on-small.png b/rtdata/images/themed/png/2/dark/histogram-green-on-small.png new file mode 100644 index 000000000..4b7ec0f11 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/histogram-green-on-small.png differ diff --git a/rtdata/images/themed/png/2/dark/histogram-mode-linear-small.png b/rtdata/images/themed/png/2/dark/histogram-mode-linear-small.png new file mode 100644 index 000000000..2ff1ce9b1 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/histogram-mode-linear-small.png differ diff --git a/rtdata/images/themed/png/2/dark/histogram-mode-logx-small.png b/rtdata/images/themed/png/2/dark/histogram-mode-logx-small.png new file mode 100644 index 000000000..e4dc2596c Binary files /dev/null and b/rtdata/images/themed/png/2/dark/histogram-mode-logx-small.png differ diff --git a/rtdata/images/themed/png/2/dark/histogram-mode-logxy-small.png b/rtdata/images/themed/png/2/dark/histogram-mode-logxy-small.png new file mode 100644 index 000000000..e2dfe8cca Binary files /dev/null and b/rtdata/images/themed/png/2/dark/histogram-mode-logxy-small.png differ diff --git a/rtdata/images/themed/png/2/dark/histogram-red-off-small.png b/rtdata/images/themed/png/2/dark/histogram-red-off-small.png new file mode 100644 index 000000000..cfa4e5fdf Binary files /dev/null and b/rtdata/images/themed/png/2/dark/histogram-red-off-small.png differ diff --git a/rtdata/images/themed/png/2/dark/histogram-red-on-small.png b/rtdata/images/themed/png/2/dark/histogram-red-on-small.png new file mode 100644 index 000000000..3778d0837 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/histogram-red-on-small.png differ diff --git a/rtdata/images/themed/png/2/dark/histogram-silver-off-small.png b/rtdata/images/themed/png/2/dark/histogram-silver-off-small.png new file mode 100644 index 000000000..18f5b2bac Binary files /dev/null and b/rtdata/images/themed/png/2/dark/histogram-silver-off-small.png differ diff --git a/rtdata/images/themed/png/2/dark/histogram-silver-on-small.png b/rtdata/images/themed/png/2/dark/histogram-silver-on-small.png new file mode 100644 index 000000000..144330442 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/histogram-silver-on-small.png differ diff --git a/rtdata/images/themed/png/2/dark/info.png b/rtdata/images/themed/png/2/dark/info.png new file mode 100644 index 000000000..b2ff0ee4f Binary files /dev/null and b/rtdata/images/themed/png/2/dark/info.png differ diff --git a/rtdata/images/themed/png/2/dark/intent-absolute.png b/rtdata/images/themed/png/2/dark/intent-absolute.png new file mode 100644 index 000000000..20a42214a Binary files /dev/null and b/rtdata/images/themed/png/2/dark/intent-absolute.png differ diff --git a/rtdata/images/themed/png/2/dark/intent-perceptual.png b/rtdata/images/themed/png/2/dark/intent-perceptual.png new file mode 100644 index 000000000..0897030e3 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/intent-perceptual.png differ diff --git a/rtdata/images/themed/png/2/dark/intent-relative.png b/rtdata/images/themed/png/2/dark/intent-relative.png new file mode 100644 index 000000000..ead1c8f06 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/intent-relative.png differ diff --git a/rtdata/images/themed/png/2/dark/intent-saturation.png b/rtdata/images/themed/png/2/dark/intent-saturation.png new file mode 100644 index 000000000..ead09b164 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/intent-saturation.png differ diff --git a/rtdata/images/themed/png/2/dark/magnifier-1to1-small.png b/rtdata/images/themed/png/2/dark/magnifier-1to1-small.png new file mode 100644 index 000000000..b31b42734 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/magnifier-1to1-small.png differ diff --git a/rtdata/images/themed/png/2/dark/magnifier-1to1.png b/rtdata/images/themed/png/2/dark/magnifier-1to1.png new file mode 100644 index 000000000..a1992dae4 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/magnifier-1to1.png differ diff --git a/rtdata/images/themed/png/2/dark/magnifier-crop.png b/rtdata/images/themed/png/2/dark/magnifier-crop.png new file mode 100644 index 000000000..7a3485424 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/magnifier-crop.png differ diff --git a/rtdata/images/themed/png/2/dark/magnifier-fit.png b/rtdata/images/themed/png/2/dark/magnifier-fit.png new file mode 100644 index 000000000..176b20931 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/magnifier-fit.png differ diff --git a/rtdata/images/themed/png/2/dark/magnifier-minus-small.png b/rtdata/images/themed/png/2/dark/magnifier-minus-small.png new file mode 100644 index 000000000..2ac7ba158 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/magnifier-minus-small.png differ diff --git a/rtdata/images/themed/png/2/dark/magnifier-minus.png b/rtdata/images/themed/png/2/dark/magnifier-minus.png new file mode 100644 index 000000000..333576ed7 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/magnifier-minus.png differ diff --git a/rtdata/images/themed/png/2/dark/magnifier-plus-small.png b/rtdata/images/themed/png/2/dark/magnifier-plus-small.png new file mode 100644 index 000000000..71b07115f Binary files /dev/null and b/rtdata/images/themed/png/2/dark/magnifier-plus-small.png differ diff --git a/rtdata/images/themed/png/2/dark/magnifier-plus.png b/rtdata/images/themed/png/2/dark/magnifier-plus.png new file mode 100644 index 000000000..d78cd4260 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/magnifier-plus.png differ diff --git a/rtdata/images/themed/png/2/dark/magnifier.png b/rtdata/images/themed/png/2/dark/magnifier.png new file mode 100644 index 000000000..245cb344a Binary files /dev/null and b/rtdata/images/themed/png/2/dark/magnifier.png differ diff --git a/rtdata/images/themed/png/2/dark/metadata.png b/rtdata/images/themed/png/2/dark/metadata.png new file mode 100644 index 000000000..0439e9b8c Binary files /dev/null and b/rtdata/images/themed/png/2/dark/metadata.png differ diff --git a/rtdata/images/themed/png/2/dark/node-move-nw-se-hicontrast.png b/rtdata/images/themed/png/2/dark/node-move-nw-se-hicontrast.png new file mode 100644 index 000000000..f4f710cab Binary files /dev/null and b/rtdata/images/themed/png/2/dark/node-move-nw-se-hicontrast.png differ diff --git a/rtdata/images/themed/png/2/dark/node-move-sw-ne-hicontrast.png b/rtdata/images/themed/png/2/dark/node-move-sw-ne-hicontrast.png new file mode 100644 index 000000000..cd3705cb9 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/node-move-sw-ne-hicontrast.png differ diff --git a/rtdata/images/themed/png/2/dark/node-move-x-hicontrast.png b/rtdata/images/themed/png/2/dark/node-move-x-hicontrast.png new file mode 100644 index 000000000..d3f1b6327 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/node-move-x-hicontrast.png differ diff --git a/rtdata/images/themed/png/2/dark/node-move-xy-hicontrast.png b/rtdata/images/themed/png/2/dark/node-move-xy-hicontrast.png new file mode 100644 index 000000000..ef0c0e667 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/node-move-xy-hicontrast.png differ diff --git a/rtdata/images/themed/png/2/dark/node-move-y-hicontrast.png b/rtdata/images/themed/png/2/dark/node-move-y-hicontrast.png new file mode 100644 index 000000000..1b0b471f5 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/node-move-y-hicontrast.png differ diff --git a/rtdata/images/themed/png/2/dark/one-to-one-small.png b/rtdata/images/themed/png/2/dark/one-to-one-small.png new file mode 100644 index 000000000..1c8dbe57e Binary files /dev/null and b/rtdata/images/themed/png/2/dark/one-to-one-small.png differ diff --git a/rtdata/images/themed/png/2/dark/ornament1.png b/rtdata/images/themed/png/2/dark/ornament1.png new file mode 100644 index 000000000..3268460a7 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/ornament1.png differ diff --git a/rtdata/images/themed/png/2/dark/padlock-locked-small.png b/rtdata/images/themed/png/2/dark/padlock-locked-small.png new file mode 100644 index 000000000..44af25244 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/padlock-locked-small.png differ diff --git a/rtdata/images/themed/png/2/dark/padlock-unlocked-small.png b/rtdata/images/themed/png/2/dark/padlock-unlocked-small.png new file mode 100644 index 000000000..394626389 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/padlock-unlocked-small.png differ diff --git a/rtdata/images/themed/png/2/dark/palette-brush.png b/rtdata/images/themed/png/2/dark/palette-brush.png new file mode 100644 index 000000000..70519a9a9 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/palette-brush.png differ diff --git a/rtdata/images/themed/png/2/dark/panel-to-bottom.png b/rtdata/images/themed/png/2/dark/panel-to-bottom.png new file mode 100644 index 000000000..c377a8b9e Binary files /dev/null and b/rtdata/images/themed/png/2/dark/panel-to-bottom.png differ diff --git a/rtdata/images/themed/png/2/dark/panel-to-left.png b/rtdata/images/themed/png/2/dark/panel-to-left.png new file mode 100644 index 000000000..5e2ed1baa Binary files /dev/null and b/rtdata/images/themed/png/2/dark/panel-to-left.png differ diff --git a/rtdata/images/themed/png/2/dark/panel-to-right.png b/rtdata/images/themed/png/2/dark/panel-to-right.png new file mode 100644 index 000000000..bd21edd74 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/panel-to-right.png differ diff --git a/rtdata/images/themed/png/2/dark/panel-to-top.png b/rtdata/images/themed/png/2/dark/panel-to-top.png new file mode 100644 index 000000000..f006db82b Binary files /dev/null and b/rtdata/images/themed/png/2/dark/panel-to-top.png differ diff --git a/rtdata/images/themed/png/2/dark/paste.png b/rtdata/images/themed/png/2/dark/paste.png new file mode 100644 index 000000000..079874070 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/paste.png differ diff --git a/rtdata/images/themed/png/2/dark/perspective-horizontal-left-small.png b/rtdata/images/themed/png/2/dark/perspective-horizontal-left-small.png new file mode 100644 index 000000000..c8d7ec8df Binary files /dev/null and b/rtdata/images/themed/png/2/dark/perspective-horizontal-left-small.png differ diff --git a/rtdata/images/themed/png/2/dark/perspective-horizontal-left.png b/rtdata/images/themed/png/2/dark/perspective-horizontal-left.png new file mode 100644 index 000000000..3c375716a Binary files /dev/null and b/rtdata/images/themed/png/2/dark/perspective-horizontal-left.png differ diff --git a/rtdata/images/themed/png/2/dark/perspective-horizontal-right-small.png b/rtdata/images/themed/png/2/dark/perspective-horizontal-right-small.png new file mode 100644 index 000000000..413f2b772 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/perspective-horizontal-right-small.png differ diff --git a/rtdata/images/themed/png/2/dark/perspective-horizontal-right.png b/rtdata/images/themed/png/2/dark/perspective-horizontal-right.png new file mode 100644 index 000000000..ffacc961f Binary files /dev/null and b/rtdata/images/themed/png/2/dark/perspective-horizontal-right.png differ diff --git a/rtdata/images/themed/png/2/dark/perspective-vertical-bottom-small.png b/rtdata/images/themed/png/2/dark/perspective-vertical-bottom-small.png new file mode 100644 index 000000000..09c1e1c1d Binary files /dev/null and b/rtdata/images/themed/png/2/dark/perspective-vertical-bottom-small.png differ diff --git a/rtdata/images/themed/png/2/dark/perspective-vertical-bottom.png b/rtdata/images/themed/png/2/dark/perspective-vertical-bottom.png new file mode 100644 index 000000000..c47f46f67 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/perspective-vertical-bottom.png differ diff --git a/rtdata/images/themed/png/2/dark/perspective-vertical-top-small.png b/rtdata/images/themed/png/2/dark/perspective-vertical-top-small.png new file mode 100644 index 000000000..1279ea36d Binary files /dev/null and b/rtdata/images/themed/png/2/dark/perspective-vertical-top-small.png differ diff --git a/rtdata/images/themed/png/2/dark/perspective-vertical-top.png b/rtdata/images/themed/png/2/dark/perspective-vertical-top.png new file mode 100644 index 000000000..756993ca7 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/perspective-vertical-top.png differ diff --git a/rtdata/images/themed/png/2/dark/power-inconsistent-small.png b/rtdata/images/themed/png/2/dark/power-inconsistent-small.png new file mode 100644 index 000000000..bca5c1e27 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/power-inconsistent-small.png differ diff --git a/rtdata/images/themed/png/2/dark/power-off-small.png b/rtdata/images/themed/png/2/dark/power-off-small.png new file mode 100644 index 000000000..9ccf19312 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/power-off-small.png differ diff --git a/rtdata/images/themed/png/2/dark/power-on-small.png b/rtdata/images/themed/png/2/dark/power-on-small.png new file mode 100644 index 000000000..b3bb313c9 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/power-on-small.png differ diff --git a/rtdata/images/themed/png/2/dark/preferences.png b/rtdata/images/themed/png/2/dark/preferences.png new file mode 100644 index 000000000..66ba13843 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/preferences.png differ diff --git a/rtdata/images/themed/png/2/dark/profile-filled.png b/rtdata/images/themed/png/2/dark/profile-filled.png new file mode 100644 index 000000000..bb67d7263 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/profile-filled.png differ diff --git a/rtdata/images/themed/png/2/dark/profile-partial.png b/rtdata/images/themed/png/2/dark/profile-partial.png new file mode 100644 index 000000000..320103f53 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/profile-partial.png differ diff --git a/rtdata/images/themed/png/2/dark/redo-all.png b/rtdata/images/themed/png/2/dark/redo-all.png new file mode 100644 index 000000000..3092aad49 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/redo-all.png differ diff --git a/rtdata/images/themed/png/2/dark/redo-small.png b/rtdata/images/themed/png/2/dark/redo-small.png new file mode 100644 index 000000000..24d585c08 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/redo-small.png differ diff --git a/rtdata/images/themed/png/2/dark/redo.png b/rtdata/images/themed/png/2/dark/redo.png new file mode 100644 index 000000000..e15b71ce0 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/redo.png differ diff --git a/rtdata/images/themed/png/2/dark/refresh-red-small.png b/rtdata/images/themed/png/2/dark/refresh-red-small.png new file mode 100644 index 000000000..058b52f2f Binary files /dev/null and b/rtdata/images/themed/png/2/dark/refresh-red-small.png differ diff --git a/rtdata/images/themed/png/2/dark/refresh-small.png b/rtdata/images/themed/png/2/dark/refresh-small.png new file mode 100644 index 000000000..960c287d4 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/refresh-small.png differ diff --git a/rtdata/images/themed/png/2/dark/refresh.png b/rtdata/images/themed/png/2/dark/refresh.png new file mode 100644 index 000000000..4425c1e96 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/refresh.png differ diff --git a/rtdata/images/themed/png/2/dark/remove-small.png b/rtdata/images/themed/png/2/dark/remove-small.png new file mode 100644 index 000000000..e33108752 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/remove-small.png differ diff --git a/rtdata/images/themed/png/2/dark/remove.png b/rtdata/images/themed/png/2/dark/remove.png new file mode 100644 index 000000000..1f806d0b0 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/remove.png differ diff --git a/rtdata/images/themed/png/2/dark/rotate-aroundnode-hicontrast.png b/rtdata/images/themed/png/2/dark/rotate-aroundnode-hicontrast.png new file mode 100644 index 000000000..df718d745 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/rotate-aroundnode-hicontrast.png differ diff --git a/rtdata/images/themed/png/2/dark/rotate-aroundnode.png b/rtdata/images/themed/png/2/dark/rotate-aroundnode.png new file mode 100644 index 000000000..433705896 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/rotate-aroundnode.png differ diff --git a/rtdata/images/themed/png/2/dark/rotate-left-90.png b/rtdata/images/themed/png/2/dark/rotate-left-90.png new file mode 100644 index 000000000..e7fe7d05a Binary files /dev/null and b/rtdata/images/themed/png/2/dark/rotate-left-90.png differ diff --git a/rtdata/images/themed/png/2/dark/rotate-left-small.png b/rtdata/images/themed/png/2/dark/rotate-left-small.png new file mode 100644 index 000000000..22d551d19 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/rotate-left-small.png differ diff --git a/rtdata/images/themed/png/2/dark/rotate-left.png b/rtdata/images/themed/png/2/dark/rotate-left.png new file mode 100644 index 000000000..700578c35 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/rotate-left.png differ diff --git a/rtdata/images/themed/png/2/dark/rotate-right-90.png b/rtdata/images/themed/png/2/dark/rotate-right-90.png new file mode 100644 index 000000000..f1d095a8c Binary files /dev/null and b/rtdata/images/themed/png/2/dark/rotate-right-90.png differ diff --git a/rtdata/images/themed/png/2/dark/rotate-right-small.png b/rtdata/images/themed/png/2/dark/rotate-right-small.png new file mode 100644 index 000000000..ccaa6bb38 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/rotate-right-small.png differ diff --git a/rtdata/images/themed/png/2/dark/rotate-right.png b/rtdata/images/themed/png/2/dark/rotate-right.png new file mode 100644 index 000000000..e68fe64cf Binary files /dev/null and b/rtdata/images/themed/png/2/dark/rotate-right.png differ diff --git a/rtdata/images/themed/png/2/dark/rotate-straighten-small.png b/rtdata/images/themed/png/2/dark/rotate-straighten-small.png new file mode 100644 index 000000000..5bafb7a8f Binary files /dev/null and b/rtdata/images/themed/png/2/dark/rotate-straighten-small.png differ diff --git a/rtdata/images/themed/png/2/dark/rotate-straighten.png b/rtdata/images/themed/png/2/dark/rotate-straighten.png new file mode 100644 index 000000000..468eeacb9 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/rotate-straighten.png differ diff --git a/rtdata/images/themed/png/2/dark/save-small.png b/rtdata/images/themed/png/2/dark/save-small.png new file mode 100644 index 000000000..3577a202e Binary files /dev/null and b/rtdata/images/themed/png/2/dark/save-small.png differ diff --git a/rtdata/images/themed/png/2/dark/save.png b/rtdata/images/themed/png/2/dark/save.png new file mode 100644 index 000000000..ebed0d49a Binary files /dev/null and b/rtdata/images/themed/png/2/dark/save.png differ diff --git a/rtdata/images/themed/png/2/dark/saved-no-small.png b/rtdata/images/themed/png/2/dark/saved-no-small.png new file mode 100644 index 000000000..de12bf59c Binary files /dev/null and b/rtdata/images/themed/png/2/dark/saved-no-small.png differ diff --git a/rtdata/images/themed/png/2/dark/saved-yes-small.png b/rtdata/images/themed/png/2/dark/saved-yes-small.png new file mode 100644 index 000000000..f8c497891 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/saved-yes-small.png differ diff --git a/rtdata/images/themed/png/2/dark/square-toggle-black-off-narrow.png b/rtdata/images/themed/png/2/dark/square-toggle-black-off-narrow.png new file mode 100644 index 000000000..90ecba649 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/square-toggle-black-off-narrow.png differ diff --git a/rtdata/images/themed/png/2/dark/square-toggle-black-on-narrow.png b/rtdata/images/themed/png/2/dark/square-toggle-black-on-narrow.png new file mode 100644 index 000000000..6b7da20b7 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/square-toggle-black-on-narrow.png differ diff --git a/rtdata/images/themed/png/2/dark/square-toggle-blue-off-narrow.png b/rtdata/images/themed/png/2/dark/square-toggle-blue-off-narrow.png new file mode 100644 index 000000000..8fd01165c Binary files /dev/null and b/rtdata/images/themed/png/2/dark/square-toggle-blue-off-narrow.png differ diff --git a/rtdata/images/themed/png/2/dark/square-toggle-blue-on-narrow.png b/rtdata/images/themed/png/2/dark/square-toggle-blue-on-narrow.png new file mode 100644 index 000000000..2f97cd050 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/square-toggle-blue-on-narrow.png differ diff --git a/rtdata/images/themed/png/2/dark/square-toggle-gray-off-narrow.png b/rtdata/images/themed/png/2/dark/square-toggle-gray-off-narrow.png new file mode 100644 index 000000000..779d4eb3b Binary files /dev/null and b/rtdata/images/themed/png/2/dark/square-toggle-gray-off-narrow.png differ diff --git a/rtdata/images/themed/png/2/dark/square-toggle-gray-on-narrow.png b/rtdata/images/themed/png/2/dark/square-toggle-gray-on-narrow.png new file mode 100644 index 000000000..30923caaa Binary files /dev/null and b/rtdata/images/themed/png/2/dark/square-toggle-gray-on-narrow.png differ diff --git a/rtdata/images/themed/png/2/dark/square-toggle-green-off-narrow.png b/rtdata/images/themed/png/2/dark/square-toggle-green-off-narrow.png new file mode 100644 index 000000000..3184167df Binary files /dev/null and b/rtdata/images/themed/png/2/dark/square-toggle-green-off-narrow.png differ diff --git a/rtdata/images/themed/png/2/dark/square-toggle-green-on-narrow.png b/rtdata/images/themed/png/2/dark/square-toggle-green-on-narrow.png new file mode 100644 index 000000000..7e338b190 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/square-toggle-green-on-narrow.png differ diff --git a/rtdata/images/themed/png/2/dark/square-toggle-luminosity-off-narrow.png b/rtdata/images/themed/png/2/dark/square-toggle-luminosity-off-narrow.png new file mode 100644 index 000000000..1c7ae0717 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/square-toggle-luminosity-off-narrow.png differ diff --git a/rtdata/images/themed/png/2/dark/square-toggle-luminosity-on-narrow.png b/rtdata/images/themed/png/2/dark/square-toggle-luminosity-on-narrow.png new file mode 100644 index 000000000..8108aee67 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/square-toggle-luminosity-on-narrow.png differ diff --git a/rtdata/images/themed/png/2/dark/square-toggle-red-off-narrow.png b/rtdata/images/themed/png/2/dark/square-toggle-red-off-narrow.png new file mode 100644 index 000000000..7d0b299c9 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/square-toggle-red-off-narrow.png differ diff --git a/rtdata/images/themed/png/2/dark/square-toggle-red-on-narrow.png b/rtdata/images/themed/png/2/dark/square-toggle-red-on-narrow.png new file mode 100644 index 000000000..cd5fe85e6 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/square-toggle-red-on-narrow.png differ diff --git a/rtdata/images/themed/png/2/dark/square-toggle-theme-off-narrow.png b/rtdata/images/themed/png/2/dark/square-toggle-theme-off-narrow.png new file mode 100644 index 000000000..31d2d57c6 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/square-toggle-theme-off-narrow.png differ diff --git a/rtdata/images/themed/png/2/dark/square-toggle-theme-on-narrow.png b/rtdata/images/themed/png/2/dark/square-toggle-theme-on-narrow.png new file mode 100644 index 000000000..14461a3ce Binary files /dev/null and b/rtdata/images/themed/png/2/dark/square-toggle-theme-on-narrow.png differ diff --git a/rtdata/images/themed/png/2/dark/square-toggle-white-off-narrow.png b/rtdata/images/themed/png/2/dark/square-toggle-white-off-narrow.png new file mode 100644 index 000000000..12831eb4b Binary files /dev/null and b/rtdata/images/themed/png/2/dark/square-toggle-white-off-narrow.png differ diff --git a/rtdata/images/themed/png/2/dark/square-toggle-white-on-narrow.png b/rtdata/images/themed/png/2/dark/square-toggle-white-on-narrow.png new file mode 100644 index 000000000..9640a492e Binary files /dev/null and b/rtdata/images/themed/png/2/dark/square-toggle-white-on-narrow.png differ diff --git a/rtdata/images/themed/png/2/dark/star-gold-hollow-narrow.png b/rtdata/images/themed/png/2/dark/star-gold-hollow-narrow.png new file mode 100644 index 000000000..cda3c345f Binary files /dev/null and b/rtdata/images/themed/png/2/dark/star-gold-hollow-narrow.png differ diff --git a/rtdata/images/themed/png/2/dark/star-gold-hollow-small.png b/rtdata/images/themed/png/2/dark/star-gold-hollow-small.png new file mode 100644 index 000000000..c4816cfa4 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/star-gold-hollow-small.png differ diff --git a/rtdata/images/themed/png/2/dark/star-gold-narrow.png b/rtdata/images/themed/png/2/dark/star-gold-narrow.png new file mode 100644 index 000000000..c51ff057f Binary files /dev/null and b/rtdata/images/themed/png/2/dark/star-gold-narrow.png differ diff --git a/rtdata/images/themed/png/2/dark/star-gold-small.png b/rtdata/images/themed/png/2/dark/star-gold-small.png new file mode 100644 index 000000000..89c3b7c3d Binary files /dev/null and b/rtdata/images/themed/png/2/dark/star-gold-small.png differ diff --git a/rtdata/images/themed/png/2/dark/star-hollow-narrow.png b/rtdata/images/themed/png/2/dark/star-hollow-narrow.png new file mode 100644 index 000000000..a29c53f17 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/star-hollow-narrow.png differ diff --git a/rtdata/images/themed/png/2/dark/star-hollow-small.png b/rtdata/images/themed/png/2/dark/star-hollow-small.png new file mode 100644 index 000000000..bc19037d2 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/star-hollow-small.png differ diff --git a/rtdata/images/themed/png/2/dark/star-narrow.png b/rtdata/images/themed/png/2/dark/star-narrow.png new file mode 100644 index 000000000..f60159c9f Binary files /dev/null and b/rtdata/images/themed/png/2/dark/star-narrow.png differ diff --git a/rtdata/images/themed/png/2/dark/star-small.png b/rtdata/images/themed/png/2/dark/star-small.png new file mode 100644 index 000000000..e3730a2a5 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/star-small.png differ diff --git a/rtdata/images/themed/png/2/dark/template-16.png b/rtdata/images/themed/png/2/dark/template-16.png new file mode 100644 index 000000000..aea362a25 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/template-16.png differ diff --git a/rtdata/images/themed/png/2/dark/template-24.png b/rtdata/images/themed/png/2/dark/template-24.png new file mode 100644 index 000000000..87e3f7e3e Binary files /dev/null and b/rtdata/images/themed/png/2/dark/template-24.png differ diff --git a/rtdata/images/themed/png/2/dark/template-narrow.png b/rtdata/images/themed/png/2/dark/template-narrow.png new file mode 100644 index 000000000..16fc0bfbf Binary files /dev/null and b/rtdata/images/themed/png/2/dark/template-narrow.png differ diff --git a/rtdata/images/themed/png/2/dark/tick-green-hollow-small.png b/rtdata/images/themed/png/2/dark/tick-green-hollow-small.png new file mode 100644 index 000000000..a89717398 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/tick-green-hollow-small.png differ diff --git a/rtdata/images/themed/png/2/dark/tick-green-hollow.png b/rtdata/images/themed/png/2/dark/tick-green-hollow.png new file mode 100644 index 000000000..f98eeee6c Binary files /dev/null and b/rtdata/images/themed/png/2/dark/tick-green-hollow.png differ diff --git a/rtdata/images/themed/png/2/dark/tick-green-small.png b/rtdata/images/themed/png/2/dark/tick-green-small.png new file mode 100644 index 000000000..934ce85d0 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/tick-green-small.png differ diff --git a/rtdata/images/themed/png/2/dark/tick-green.png b/rtdata/images/themed/png/2/dark/tick-green.png new file mode 100644 index 000000000..d527f670f Binary files /dev/null and b/rtdata/images/themed/png/2/dark/tick-green.png differ diff --git a/rtdata/images/themed/png/2/dark/tick-hollow-small.png b/rtdata/images/themed/png/2/dark/tick-hollow-small.png new file mode 100644 index 000000000..83e83fd49 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/tick-hollow-small.png differ diff --git a/rtdata/images/themed/png/2/dark/tick-small.png b/rtdata/images/themed/png/2/dark/tick-small.png new file mode 100644 index 000000000..e1ca8751b Binary files /dev/null and b/rtdata/images/themed/png/2/dark/tick-small.png differ diff --git a/rtdata/images/themed/png/2/dark/tick.png b/rtdata/images/themed/png/2/dark/tick.png new file mode 100644 index 000000000..d6254daae Binary files /dev/null and b/rtdata/images/themed/png/2/dark/tick.png differ diff --git a/rtdata/images/themed/png/2/dark/transform.png b/rtdata/images/themed/png/2/dark/transform.png new file mode 100644 index 000000000..48a417f9d Binary files /dev/null and b/rtdata/images/themed/png/2/dark/transform.png differ diff --git a/rtdata/images/themed/png/2/dark/trash-delete.png b/rtdata/images/themed/png/2/dark/trash-delete.png new file mode 100644 index 000000000..adf7b5c20 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/trash-delete.png differ diff --git a/rtdata/images/themed/png/2/dark/trash-empty-show.png b/rtdata/images/themed/png/2/dark/trash-empty-show.png new file mode 100644 index 000000000..f503f0ed1 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/trash-empty-show.png differ diff --git a/rtdata/images/themed/png/2/dark/trash-empty.png b/rtdata/images/themed/png/2/dark/trash-empty.png new file mode 100644 index 000000000..046600e7a Binary files /dev/null and b/rtdata/images/themed/png/2/dark/trash-empty.png differ diff --git a/rtdata/images/themed/png/2/dark/trash-full-show.png b/rtdata/images/themed/png/2/dark/trash-full-show.png new file mode 100644 index 000000000..ea03a506f Binary files /dev/null and b/rtdata/images/themed/png/2/dark/trash-full-show.png differ diff --git a/rtdata/images/themed/png/2/dark/trash-full.png b/rtdata/images/themed/png/2/dark/trash-full.png new file mode 100644 index 000000000..e57dba3b2 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/trash-full.png differ diff --git a/rtdata/images/themed/png/2/dark/trash-hide-deleted.png b/rtdata/images/themed/png/2/dark/trash-hide-deleted.png new file mode 100644 index 000000000..a577b9983 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/trash-hide-deleted.png differ diff --git a/rtdata/images/themed/png/2/dark/trash-remove-small.png b/rtdata/images/themed/png/2/dark/trash-remove-small.png new file mode 100644 index 000000000..a33053a31 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/trash-remove-small.png differ diff --git a/rtdata/images/themed/png/2/dark/trash-remove.png b/rtdata/images/themed/png/2/dark/trash-remove.png new file mode 100644 index 000000000..9370ae184 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/trash-remove.png differ diff --git a/rtdata/images/themed/png/2/dark/trash-small.png b/rtdata/images/themed/png/2/dark/trash-small.png new file mode 100644 index 000000000..b8f0b36ba Binary files /dev/null and b/rtdata/images/themed/png/2/dark/trash-small.png differ diff --git a/rtdata/images/themed/png/2/dark/undo-all.png b/rtdata/images/themed/png/2/dark/undo-all.png new file mode 100644 index 000000000..0624e514e Binary files /dev/null and b/rtdata/images/themed/png/2/dark/undo-all.png differ diff --git a/rtdata/images/themed/png/2/dark/undo-small.png b/rtdata/images/themed/png/2/dark/undo-small.png new file mode 100644 index 000000000..ba1719bfb Binary files /dev/null and b/rtdata/images/themed/png/2/dark/undo-small.png differ diff --git a/rtdata/images/themed/png/2/dark/undo.png b/rtdata/images/themed/png/2/dark/undo.png new file mode 100644 index 000000000..721e99f75 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/undo.png differ diff --git a/rtdata/images/themed/png/2/dark/warning-highlights.png b/rtdata/images/themed/png/2/dark/warning-highlights.png new file mode 100644 index 000000000..10197f026 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/warning-highlights.png differ diff --git a/rtdata/images/themed/png/2/dark/warning-shadows.png b/rtdata/images/themed/png/2/dark/warning-shadows.png new file mode 100644 index 000000000..5922308ab Binary files /dev/null and b/rtdata/images/themed/png/2/dark/warning-shadows.png differ diff --git a/rtdata/images/themed/png/2/dark/wavelets.png b/rtdata/images/themed/png/2/dark/wavelets.png new file mode 100644 index 000000000..49b62cb88 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/wavelets.png differ diff --git a/rtdata/images/themed/png/2/dark/wb-auto-small.png b/rtdata/images/themed/png/2/dark/wb-auto-small.png new file mode 100644 index 000000000..785b47c37 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/wb-auto-small.png differ diff --git a/rtdata/images/themed/png/2/dark/wb-auto.png b/rtdata/images/themed/png/2/dark/wb-auto.png new file mode 100644 index 000000000..3a24e5bba Binary files /dev/null and b/rtdata/images/themed/png/2/dark/wb-auto.png differ diff --git a/rtdata/images/themed/png/2/dark/wb-camera-small.png b/rtdata/images/themed/png/2/dark/wb-camera-small.png new file mode 100644 index 000000000..322053b47 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/wb-camera-small.png differ diff --git a/rtdata/images/themed/png/2/dark/wb-camera.png b/rtdata/images/themed/png/2/dark/wb-camera.png new file mode 100644 index 000000000..15d90f426 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/wb-camera.png differ diff --git a/rtdata/images/themed/png/2/dark/wb-cloudy-small.png b/rtdata/images/themed/png/2/dark/wb-cloudy-small.png new file mode 100644 index 000000000..94c372bf6 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/wb-cloudy-small.png differ diff --git a/rtdata/images/themed/png/2/dark/wb-cloudy.png b/rtdata/images/themed/png/2/dark/wb-cloudy.png new file mode 100644 index 000000000..ad068a403 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/wb-cloudy.png differ diff --git a/rtdata/images/themed/png/2/dark/wb-custom-small.png b/rtdata/images/themed/png/2/dark/wb-custom-small.png new file mode 100644 index 000000000..e2746ec05 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/wb-custom-small.png differ diff --git a/rtdata/images/themed/png/2/dark/wb-custom.png b/rtdata/images/themed/png/2/dark/wb-custom.png new file mode 100644 index 000000000..cd9552fda Binary files /dev/null and b/rtdata/images/themed/png/2/dark/wb-custom.png differ diff --git a/rtdata/images/themed/png/2/dark/wb-flash-small.png b/rtdata/images/themed/png/2/dark/wb-flash-small.png new file mode 100644 index 000000000..305f3ca86 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/wb-flash-small.png differ diff --git a/rtdata/images/themed/png/2/dark/wb-flash.png b/rtdata/images/themed/png/2/dark/wb-flash.png new file mode 100644 index 000000000..ff07fce0a Binary files /dev/null and b/rtdata/images/themed/png/2/dark/wb-flash.png differ diff --git a/rtdata/images/themed/png/2/dark/wb-fluorescent-small.png b/rtdata/images/themed/png/2/dark/wb-fluorescent-small.png new file mode 100644 index 000000000..402fed469 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/wb-fluorescent-small.png differ diff --git a/rtdata/images/themed/png/2/dark/wb-fluorescent.png b/rtdata/images/themed/png/2/dark/wb-fluorescent.png new file mode 100644 index 000000000..6ce08e982 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/wb-fluorescent.png differ diff --git a/rtdata/images/themed/png/2/dark/wb-lamp-small.png b/rtdata/images/themed/png/2/dark/wb-lamp-small.png new file mode 100644 index 000000000..bf1a8b295 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/wb-lamp-small.png differ diff --git a/rtdata/images/themed/png/2/dark/wb-lamp.png b/rtdata/images/themed/png/2/dark/wb-lamp.png new file mode 100644 index 000000000..9f77705a6 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/wb-lamp.png differ diff --git a/rtdata/images/themed/png/2/dark/wb-led-small.png b/rtdata/images/themed/png/2/dark/wb-led-small.png new file mode 100644 index 000000000..200f9b4e9 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/wb-led-small.png differ diff --git a/rtdata/images/themed/png/2/dark/wb-led.png b/rtdata/images/themed/png/2/dark/wb-led.png new file mode 100644 index 000000000..6b11b848e Binary files /dev/null and b/rtdata/images/themed/png/2/dark/wb-led.png differ diff --git a/rtdata/images/themed/png/2/dark/wb-shade-small.png b/rtdata/images/themed/png/2/dark/wb-shade-small.png new file mode 100644 index 000000000..62df33798 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/wb-shade-small.png differ diff --git a/rtdata/images/themed/png/2/dark/wb-shade.png b/rtdata/images/themed/png/2/dark/wb-shade.png new file mode 100644 index 000000000..a10511d3b Binary files /dev/null and b/rtdata/images/themed/png/2/dark/wb-shade.png differ diff --git a/rtdata/images/themed/png/2/dark/wb-sun-small.png b/rtdata/images/themed/png/2/dark/wb-sun-small.png new file mode 100644 index 000000000..996cc837f Binary files /dev/null and b/rtdata/images/themed/png/2/dark/wb-sun-small.png differ diff --git a/rtdata/images/themed/png/2/dark/wb-sun.png b/rtdata/images/themed/png/2/dark/wb-sun.png new file mode 100644 index 000000000..7bd9cf6e8 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/wb-sun.png differ diff --git a/rtdata/images/themed/png/2/dark/wb-tungsten-small.png b/rtdata/images/themed/png/2/dark/wb-tungsten-small.png new file mode 100644 index 000000000..59c339e3a Binary files /dev/null and b/rtdata/images/themed/png/2/dark/wb-tungsten-small.png differ diff --git a/rtdata/images/themed/png/2/dark/wb-tungsten.png b/rtdata/images/themed/png/2/dark/wb-tungsten.png new file mode 100644 index 000000000..1029d23b5 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/wb-tungsten.png differ diff --git a/rtdata/images/themed/png/2/dark/wb-water-small.png b/rtdata/images/themed/png/2/dark/wb-water-small.png new file mode 100644 index 000000000..4b4f6e5cd Binary files /dev/null and b/rtdata/images/themed/png/2/dark/wb-water-small.png differ diff --git a/rtdata/images/themed/png/2/dark/wb-water.png b/rtdata/images/themed/png/2/dark/wb-water.png new file mode 100644 index 000000000..c29d66f43 Binary files /dev/null and b/rtdata/images/themed/png/2/dark/wb-water.png differ diff --git a/rtdata/images/themed/png/2/dark/window-add.png b/rtdata/images/themed/png/2/dark/window-add.png new file mode 100644 index 000000000..457fdff5f Binary files /dev/null and b/rtdata/images/themed/png/2/dark/window-add.png differ diff --git a/rtdata/images/themed/png/2/light/add-small.png b/rtdata/images/themed/png/2/light/add-small.png new file mode 100644 index 000000000..47cfbe3e1 Binary files /dev/null and b/rtdata/images/themed/png/2/light/add-small.png differ diff --git a/rtdata/images/themed/png/2/light/add.png b/rtdata/images/themed/png/2/light/add.png new file mode 100644 index 000000000..dd7c49cc1 Binary files /dev/null and b/rtdata/images/themed/png/2/light/add.png differ diff --git a/rtdata/images/themed/png/2/light/aperture.png b/rtdata/images/themed/png/2/light/aperture.png new file mode 100644 index 000000000..3f2a0236d Binary files /dev/null and b/rtdata/images/themed/png/2/light/aperture.png differ diff --git a/rtdata/images/themed/png/2/light/arrow-down-small.png b/rtdata/images/themed/png/2/light/arrow-down-small.png new file mode 100644 index 000000000..1d0a8dd85 Binary files /dev/null and b/rtdata/images/themed/png/2/light/arrow-down-small.png differ diff --git a/rtdata/images/themed/png/2/light/arrow-left-small.png b/rtdata/images/themed/png/2/light/arrow-left-small.png new file mode 100644 index 000000000..a0be67065 Binary files /dev/null and b/rtdata/images/themed/png/2/light/arrow-left-small.png differ diff --git a/rtdata/images/themed/png/2/light/arrow-right-small.png b/rtdata/images/themed/png/2/light/arrow-right-small.png new file mode 100644 index 000000000..7ede037f5 Binary files /dev/null and b/rtdata/images/themed/png/2/light/arrow-right-small.png differ diff --git a/rtdata/images/themed/png/2/light/arrow-up-small.png b/rtdata/images/themed/png/2/light/arrow-up-small.png new file mode 100644 index 000000000..156a6327d Binary files /dev/null and b/rtdata/images/themed/png/2/light/arrow-up-small.png differ diff --git a/rtdata/images/themed/png/2/light/arrow-updown.png b/rtdata/images/themed/png/2/light/arrow-updown.png new file mode 100644 index 000000000..4113355bf Binary files /dev/null and b/rtdata/images/themed/png/2/light/arrow-updown.png differ diff --git a/rtdata/images/themed/png/2/light/arrow2-left.png b/rtdata/images/themed/png/2/light/arrow2-left.png new file mode 100644 index 000000000..8fc68384f Binary files /dev/null and b/rtdata/images/themed/png/2/light/arrow2-left.png differ diff --git a/rtdata/images/themed/png/2/light/arrow2-right.png b/rtdata/images/themed/png/2/light/arrow2-right.png new file mode 100644 index 000000000..dd1d69572 Binary files /dev/null and b/rtdata/images/themed/png/2/light/arrow2-right.png differ diff --git a/rtdata/images/themed/png/2/light/atom.png b/rtdata/images/themed/png/2/light/atom.png new file mode 100644 index 000000000..e3b23fe24 Binary files /dev/null and b/rtdata/images/themed/png/2/light/atom.png differ diff --git a/rtdata/images/themed/png/2/light/bayer.png b/rtdata/images/themed/png/2/light/bayer.png new file mode 100644 index 000000000..bd8138608 Binary files /dev/null and b/rtdata/images/themed/png/2/light/bayer.png differ diff --git a/rtdata/images/themed/png/2/light/beforeafter.png b/rtdata/images/themed/png/2/light/beforeafter.png new file mode 100644 index 000000000..5763237d2 Binary files /dev/null and b/rtdata/images/themed/png/2/light/beforeafter.png differ diff --git a/rtdata/images/themed/png/2/light/cancel-small.png b/rtdata/images/themed/png/2/light/cancel-small.png new file mode 100644 index 000000000..90412607a Binary files /dev/null and b/rtdata/images/themed/png/2/light/cancel-small.png differ diff --git a/rtdata/images/themed/png/2/light/cancel.png b/rtdata/images/themed/png/2/light/cancel.png new file mode 100644 index 000000000..6a12fa283 Binary files /dev/null and b/rtdata/images/themed/png/2/light/cancel.png differ diff --git a/rtdata/images/themed/png/2/light/circle-black-small.png b/rtdata/images/themed/png/2/light/circle-black-small.png new file mode 100644 index 000000000..c7e218f3a Binary files /dev/null and b/rtdata/images/themed/png/2/light/circle-black-small.png differ diff --git a/rtdata/images/themed/png/2/light/circle-blue-green-small.png b/rtdata/images/themed/png/2/light/circle-blue-green-small.png new file mode 100644 index 000000000..0b4d9652a Binary files /dev/null and b/rtdata/images/themed/png/2/light/circle-blue-green-small.png differ diff --git a/rtdata/images/themed/png/2/light/circle-blue-red-small.png b/rtdata/images/themed/png/2/light/circle-blue-red-small.png new file mode 100644 index 000000000..b5a224288 Binary files /dev/null and b/rtdata/images/themed/png/2/light/circle-blue-red-small.png differ diff --git a/rtdata/images/themed/png/2/light/circle-blue-small.png b/rtdata/images/themed/png/2/light/circle-blue-small.png new file mode 100644 index 000000000..f72a53404 Binary files /dev/null and b/rtdata/images/themed/png/2/light/circle-blue-small.png differ diff --git a/rtdata/images/themed/png/2/light/circle-blue-yellow-small.png b/rtdata/images/themed/png/2/light/circle-blue-yellow-small.png new file mode 100644 index 000000000..c164be2f9 Binary files /dev/null and b/rtdata/images/themed/png/2/light/circle-blue-yellow-small.png differ diff --git a/rtdata/images/themed/png/2/light/circle-cyan-red-small.png b/rtdata/images/themed/png/2/light/circle-cyan-red-small.png new file mode 100644 index 000000000..da9c12742 Binary files /dev/null and b/rtdata/images/themed/png/2/light/circle-cyan-red-small.png differ diff --git a/rtdata/images/themed/png/2/light/circle-cyan-small.png b/rtdata/images/themed/png/2/light/circle-cyan-small.png new file mode 100644 index 000000000..9e2d0f47b Binary files /dev/null and b/rtdata/images/themed/png/2/light/circle-cyan-small.png differ diff --git a/rtdata/images/themed/png/2/light/circle-darkgray-small.png b/rtdata/images/themed/png/2/light/circle-darkgray-small.png new file mode 100644 index 000000000..ce86636da Binary files /dev/null and b/rtdata/images/themed/png/2/light/circle-darkgray-small.png differ diff --git a/rtdata/images/themed/png/2/light/circle-empty-blue-small.png b/rtdata/images/themed/png/2/light/circle-empty-blue-small.png new file mode 100644 index 000000000..b4509923f Binary files /dev/null and b/rtdata/images/themed/png/2/light/circle-empty-blue-small.png differ diff --git a/rtdata/images/themed/png/2/light/circle-empty-darkgray-small.png b/rtdata/images/themed/png/2/light/circle-empty-darkgray-small.png new file mode 100644 index 000000000..63a4f0ebd Binary files /dev/null and b/rtdata/images/themed/png/2/light/circle-empty-darkgray-small.png differ diff --git a/rtdata/images/themed/png/2/light/circle-empty-gray-small.png b/rtdata/images/themed/png/2/light/circle-empty-gray-small.png new file mode 100644 index 000000000..1d737c949 Binary files /dev/null and b/rtdata/images/themed/png/2/light/circle-empty-gray-small.png differ diff --git a/rtdata/images/themed/png/2/light/circle-empty-green-small.png b/rtdata/images/themed/png/2/light/circle-empty-green-small.png new file mode 100644 index 000000000..92c0bb183 Binary files /dev/null and b/rtdata/images/themed/png/2/light/circle-empty-green-small.png differ diff --git a/rtdata/images/themed/png/2/light/circle-empty-purple-small.png b/rtdata/images/themed/png/2/light/circle-empty-purple-small.png new file mode 100644 index 000000000..76a64d3b6 Binary files /dev/null and b/rtdata/images/themed/png/2/light/circle-empty-purple-small.png differ diff --git a/rtdata/images/themed/png/2/light/circle-empty-red-small.png b/rtdata/images/themed/png/2/light/circle-empty-red-small.png new file mode 100644 index 000000000..577db3cd6 Binary files /dev/null and b/rtdata/images/themed/png/2/light/circle-empty-red-small.png differ diff --git a/rtdata/images/themed/png/2/light/circle-empty-yellow-small.png b/rtdata/images/themed/png/2/light/circle-empty-yellow-small.png new file mode 100644 index 000000000..6868376f9 Binary files /dev/null and b/rtdata/images/themed/png/2/light/circle-empty-yellow-small.png differ diff --git a/rtdata/images/themed/png/2/light/circle-gray-blue-small.png b/rtdata/images/themed/png/2/light/circle-gray-blue-small.png new file mode 100644 index 000000000..befd24c0e Binary files /dev/null and b/rtdata/images/themed/png/2/light/circle-gray-blue-small.png differ diff --git a/rtdata/images/themed/png/2/light/circle-gray-green-small.png b/rtdata/images/themed/png/2/light/circle-gray-green-small.png new file mode 100644 index 000000000..cc604c173 Binary files /dev/null and b/rtdata/images/themed/png/2/light/circle-gray-green-small.png differ diff --git a/rtdata/images/themed/png/2/light/circle-gray-red-small.png b/rtdata/images/themed/png/2/light/circle-gray-red-small.png new file mode 100644 index 000000000..6eb5588c9 Binary files /dev/null and b/rtdata/images/themed/png/2/light/circle-gray-red-small.png differ diff --git a/rtdata/images/themed/png/2/light/circle-gray-small.png b/rtdata/images/themed/png/2/light/circle-gray-small.png new file mode 100644 index 000000000..1962d3a50 Binary files /dev/null and b/rtdata/images/themed/png/2/light/circle-gray-small.png differ diff --git a/rtdata/images/themed/png/2/light/circle-green-blue-small.png b/rtdata/images/themed/png/2/light/circle-green-blue-small.png new file mode 100644 index 000000000..45f01beea Binary files /dev/null and b/rtdata/images/themed/png/2/light/circle-green-blue-small.png differ diff --git a/rtdata/images/themed/png/2/light/circle-green-red-small.png b/rtdata/images/themed/png/2/light/circle-green-red-small.png new file mode 100644 index 000000000..43bb56c18 Binary files /dev/null and b/rtdata/images/themed/png/2/light/circle-green-red-small.png differ diff --git a/rtdata/images/themed/png/2/light/circle-green-small.png b/rtdata/images/themed/png/2/light/circle-green-small.png new file mode 100644 index 000000000..72915c10a Binary files /dev/null and b/rtdata/images/themed/png/2/light/circle-green-small.png differ diff --git a/rtdata/images/themed/png/2/light/circle-magenta-small.png b/rtdata/images/themed/png/2/light/circle-magenta-small.png new file mode 100644 index 000000000..9a47fd789 Binary files /dev/null and b/rtdata/images/themed/png/2/light/circle-magenta-small.png differ diff --git a/rtdata/images/themed/png/2/light/circle-orange-small.png b/rtdata/images/themed/png/2/light/circle-orange-small.png new file mode 100644 index 000000000..b619e22ea Binary files /dev/null and b/rtdata/images/themed/png/2/light/circle-orange-small.png differ diff --git a/rtdata/images/themed/png/2/light/circle-purple-small.png b/rtdata/images/themed/png/2/light/circle-purple-small.png new file mode 100644 index 000000000..a85c50b6b Binary files /dev/null and b/rtdata/images/themed/png/2/light/circle-purple-small.png differ diff --git a/rtdata/images/themed/png/2/light/circle-red-blue-small.png b/rtdata/images/themed/png/2/light/circle-red-blue-small.png new file mode 100644 index 000000000..1dc5f80c5 Binary files /dev/null and b/rtdata/images/themed/png/2/light/circle-red-blue-small.png differ diff --git a/rtdata/images/themed/png/2/light/circle-red-cyan-small.png b/rtdata/images/themed/png/2/light/circle-red-cyan-small.png new file mode 100644 index 000000000..52706baef Binary files /dev/null and b/rtdata/images/themed/png/2/light/circle-red-cyan-small.png differ diff --git a/rtdata/images/themed/png/2/light/circle-red-green-small.png b/rtdata/images/themed/png/2/light/circle-red-green-small.png new file mode 100644 index 000000000..e58fd35da Binary files /dev/null and b/rtdata/images/themed/png/2/light/circle-red-green-small.png differ diff --git a/rtdata/images/themed/png/2/light/circle-red-small.png b/rtdata/images/themed/png/2/light/circle-red-small.png new file mode 100644 index 000000000..67975abdd Binary files /dev/null and b/rtdata/images/themed/png/2/light/circle-red-small.png differ diff --git a/rtdata/images/themed/png/2/light/circle-white-small.png b/rtdata/images/themed/png/2/light/circle-white-small.png new file mode 100644 index 000000000..0e7ba1b6d Binary files /dev/null and b/rtdata/images/themed/png/2/light/circle-white-small.png differ diff --git a/rtdata/images/themed/png/2/light/circle-yellow-blue-small.png b/rtdata/images/themed/png/2/light/circle-yellow-blue-small.png new file mode 100644 index 000000000..058edfe96 Binary files /dev/null and b/rtdata/images/themed/png/2/light/circle-yellow-blue-small.png differ diff --git a/rtdata/images/themed/png/2/light/circle-yellow-small.png b/rtdata/images/themed/png/2/light/circle-yellow-small.png new file mode 100644 index 000000000..e0c97e9fe Binary files /dev/null and b/rtdata/images/themed/png/2/light/circle-yellow-small.png differ diff --git a/rtdata/images/themed/png/2/light/color-circles.png b/rtdata/images/themed/png/2/light/color-circles.png new file mode 100644 index 000000000..6f779097f Binary files /dev/null and b/rtdata/images/themed/png/2/light/color-circles.png differ diff --git a/rtdata/images/themed/png/2/light/color-picker-add-hicontrast.png b/rtdata/images/themed/png/2/light/color-picker-add-hicontrast.png new file mode 100644 index 000000000..c23b27bb8 Binary files /dev/null and b/rtdata/images/themed/png/2/light/color-picker-add-hicontrast.png differ diff --git a/rtdata/images/themed/png/2/light/color-picker-add.png b/rtdata/images/themed/png/2/light/color-picker-add.png new file mode 100644 index 000000000..706f2f530 Binary files /dev/null and b/rtdata/images/themed/png/2/light/color-picker-add.png differ diff --git a/rtdata/images/themed/png/2/light/color-picker-bars.png b/rtdata/images/themed/png/2/light/color-picker-bars.png new file mode 100644 index 000000000..9a880dedd Binary files /dev/null and b/rtdata/images/themed/png/2/light/color-picker-bars.png differ diff --git a/rtdata/images/themed/png/2/light/color-picker-hicontrast.png b/rtdata/images/themed/png/2/light/color-picker-hicontrast.png new file mode 100644 index 000000000..59a134e1c Binary files /dev/null and b/rtdata/images/themed/png/2/light/color-picker-hicontrast.png differ diff --git a/rtdata/images/themed/png/2/light/color-picker-hide.png b/rtdata/images/themed/png/2/light/color-picker-hide.png new file mode 100644 index 000000000..3cf14d619 Binary files /dev/null and b/rtdata/images/themed/png/2/light/color-picker-hide.png differ diff --git a/rtdata/images/themed/png/2/light/color-picker.png b/rtdata/images/themed/png/2/light/color-picker.png new file mode 100644 index 000000000..d6d729e80 Binary files /dev/null and b/rtdata/images/themed/png/2/light/color-picker.png differ diff --git a/rtdata/images/themed/png/2/light/contrastmask-off.png b/rtdata/images/themed/png/2/light/contrastmask-off.png new file mode 100644 index 000000000..d6cab5eea Binary files /dev/null and b/rtdata/images/themed/png/2/light/contrastmask-off.png differ diff --git a/rtdata/images/themed/png/2/light/contrastmask-on.png b/rtdata/images/themed/png/2/light/contrastmask-on.png new file mode 100644 index 000000000..0b60d8131 Binary files /dev/null and b/rtdata/images/themed/png/2/light/contrastmask-on.png differ diff --git a/rtdata/images/themed/png/2/light/copy.png b/rtdata/images/themed/png/2/light/copy.png new file mode 100644 index 000000000..b9210f2ff Binary files /dev/null and b/rtdata/images/themed/png/2/light/copy.png differ diff --git a/rtdata/images/themed/png/2/light/crop-auto-small.png b/rtdata/images/themed/png/2/light/crop-auto-small.png new file mode 100644 index 000000000..c1ab19b71 Binary files /dev/null and b/rtdata/images/themed/png/2/light/crop-auto-small.png differ diff --git a/rtdata/images/themed/png/2/light/crop-auto.png b/rtdata/images/themed/png/2/light/crop-auto.png new file mode 100644 index 000000000..6d26a8b52 Binary files /dev/null and b/rtdata/images/themed/png/2/light/crop-auto.png differ diff --git a/rtdata/images/themed/png/2/light/crop-point-hicontrast.png b/rtdata/images/themed/png/2/light/crop-point-hicontrast.png new file mode 100644 index 000000000..d688246d1 Binary files /dev/null and b/rtdata/images/themed/png/2/light/crop-point-hicontrast.png differ diff --git a/rtdata/images/themed/png/2/light/crop-small.png b/rtdata/images/themed/png/2/light/crop-small.png new file mode 100644 index 000000000..45f7ef049 Binary files /dev/null and b/rtdata/images/themed/png/2/light/crop-small.png differ diff --git a/rtdata/images/themed/png/2/light/crop.png b/rtdata/images/themed/png/2/light/crop.png new file mode 100644 index 000000000..86ed3f5d1 Binary files /dev/null and b/rtdata/images/themed/png/2/light/crop.png differ diff --git a/rtdata/images/themed/png/2/light/crossed-arrows-in.png b/rtdata/images/themed/png/2/light/crossed-arrows-in.png new file mode 100644 index 000000000..7fd43ef05 Binary files /dev/null and b/rtdata/images/themed/png/2/light/crossed-arrows-in.png differ diff --git a/rtdata/images/themed/png/2/light/crossed-arrows-out.png b/rtdata/images/themed/png/2/light/crossed-arrows-out.png new file mode 100644 index 000000000..abefcda21 Binary files /dev/null and b/rtdata/images/themed/png/2/light/crossed-arrows-out.png differ diff --git a/rtdata/images/themed/png/2/light/crosshair-adjust.png b/rtdata/images/themed/png/2/light/crosshair-adjust.png new file mode 100644 index 000000000..12961f3a4 Binary files /dev/null and b/rtdata/images/themed/png/2/light/crosshair-adjust.png differ diff --git a/rtdata/images/themed/png/2/light/crosshair-hicontrast.png b/rtdata/images/themed/png/2/light/crosshair-hicontrast.png new file mode 100644 index 000000000..aee472818 Binary files /dev/null and b/rtdata/images/themed/png/2/light/crosshair-hicontrast.png differ diff --git a/rtdata/images/themed/png/2/light/crosshair-node-curve.png b/rtdata/images/themed/png/2/light/crosshair-node-curve.png new file mode 100644 index 000000000..5f67e3ba2 Binary files /dev/null and b/rtdata/images/themed/png/2/light/crosshair-node-curve.png differ diff --git a/rtdata/images/themed/png/2/light/crosshair-small.png b/rtdata/images/themed/png/2/light/crosshair-small.png new file mode 100644 index 000000000..4df3399ef Binary files /dev/null and b/rtdata/images/themed/png/2/light/crosshair-small.png differ diff --git a/rtdata/images/themed/png/2/light/curve-controlpoints-small.png b/rtdata/images/themed/png/2/light/curve-controlpoints-small.png new file mode 100644 index 000000000..616257011 Binary files /dev/null and b/rtdata/images/themed/png/2/light/curve-controlpoints-small.png differ diff --git a/rtdata/images/themed/png/2/light/curve-controlpoints.png b/rtdata/images/themed/png/2/light/curve-controlpoints.png new file mode 100644 index 000000000..af104d838 Binary files /dev/null and b/rtdata/images/themed/png/2/light/curve-controlpoints.png differ diff --git a/rtdata/images/themed/png/2/light/curve-flat-small.png b/rtdata/images/themed/png/2/light/curve-flat-small.png new file mode 100644 index 000000000..e7417c751 Binary files /dev/null and b/rtdata/images/themed/png/2/light/curve-flat-small.png differ diff --git a/rtdata/images/themed/png/2/light/curve-flat.png b/rtdata/images/themed/png/2/light/curve-flat.png new file mode 100644 index 000000000..5016a5238 Binary files /dev/null and b/rtdata/images/themed/png/2/light/curve-flat.png differ diff --git a/rtdata/images/themed/png/2/light/curve-linear-small.png b/rtdata/images/themed/png/2/light/curve-linear-small.png new file mode 100644 index 000000000..f425e33e7 Binary files /dev/null and b/rtdata/images/themed/png/2/light/curve-linear-small.png differ diff --git a/rtdata/images/themed/png/2/light/curve-linear.png b/rtdata/images/themed/png/2/light/curve-linear.png new file mode 100644 index 000000000..bae422aea Binary files /dev/null and b/rtdata/images/themed/png/2/light/curve-linear.png differ diff --git a/rtdata/images/themed/png/2/light/curve-nurbs-small.png b/rtdata/images/themed/png/2/light/curve-nurbs-small.png new file mode 100644 index 000000000..aa2821f88 Binary files /dev/null and b/rtdata/images/themed/png/2/light/curve-nurbs-small.png differ diff --git a/rtdata/images/themed/png/2/light/curve-nurbs.png b/rtdata/images/themed/png/2/light/curve-nurbs.png new file mode 100644 index 000000000..b750a35b0 Binary files /dev/null and b/rtdata/images/themed/png/2/light/curve-nurbs.png differ diff --git a/rtdata/images/themed/png/2/light/curve-parametric-small.png b/rtdata/images/themed/png/2/light/curve-parametric-small.png new file mode 100644 index 000000000..f4fc5041f Binary files /dev/null and b/rtdata/images/themed/png/2/light/curve-parametric-small.png differ diff --git a/rtdata/images/themed/png/2/light/curve-parametric.png b/rtdata/images/themed/png/2/light/curve-parametric.png new file mode 100644 index 000000000..4785738e5 Binary files /dev/null and b/rtdata/images/themed/png/2/light/curve-parametric.png differ diff --git a/rtdata/images/themed/png/2/light/curve-spline-small.png b/rtdata/images/themed/png/2/light/curve-spline-small.png new file mode 100644 index 000000000..342916d9a Binary files /dev/null and b/rtdata/images/themed/png/2/light/curve-spline-small.png differ diff --git a/rtdata/images/themed/png/2/light/curve-spline.png b/rtdata/images/themed/png/2/light/curve-spline.png new file mode 100644 index 000000000..35ce864fc Binary files /dev/null and b/rtdata/images/themed/png/2/light/curve-spline.png differ diff --git a/rtdata/images/themed/png/2/light/detail.png b/rtdata/images/themed/png/2/light/detail.png new file mode 100644 index 000000000..638ade9e2 Binary files /dev/null and b/rtdata/images/themed/png/2/light/detail.png differ diff --git a/rtdata/images/themed/png/2/light/device-floppy.png b/rtdata/images/themed/png/2/light/device-floppy.png new file mode 100644 index 000000000..ad9eff616 Binary files /dev/null and b/rtdata/images/themed/png/2/light/device-floppy.png differ diff --git a/rtdata/images/themed/png/2/light/device-hdd.png b/rtdata/images/themed/png/2/light/device-hdd.png new file mode 100644 index 000000000..b84f2c06f Binary files /dev/null and b/rtdata/images/themed/png/2/light/device-hdd.png differ diff --git a/rtdata/images/themed/png/2/light/device-network.png b/rtdata/images/themed/png/2/light/device-network.png new file mode 100644 index 000000000..d4063257d Binary files /dev/null and b/rtdata/images/themed/png/2/light/device-network.png differ diff --git a/rtdata/images/themed/png/2/light/device-optical.png b/rtdata/images/themed/png/2/light/device-optical.png new file mode 100644 index 000000000..e8f4c2b04 Binary files /dev/null and b/rtdata/images/themed/png/2/light/device-optical.png differ diff --git a/rtdata/images/themed/png/2/light/device-usb.png b/rtdata/images/themed/png/2/light/device-usb.png new file mode 100644 index 000000000..c70ec0573 Binary files /dev/null and b/rtdata/images/themed/png/2/light/device-usb.png differ diff --git a/rtdata/images/themed/png/2/light/distortion-auto-small.png b/rtdata/images/themed/png/2/light/distortion-auto-small.png new file mode 100644 index 000000000..0d36f1beb Binary files /dev/null and b/rtdata/images/themed/png/2/light/distortion-auto-small.png differ diff --git a/rtdata/images/themed/png/2/light/distortion-auto.png b/rtdata/images/themed/png/2/light/distortion-auto.png new file mode 100644 index 000000000..6ae99d47a Binary files /dev/null and b/rtdata/images/themed/png/2/light/distortion-auto.png differ diff --git a/rtdata/images/themed/png/2/light/distortion-barrel-small.png b/rtdata/images/themed/png/2/light/distortion-barrel-small.png new file mode 100644 index 000000000..187da8c22 Binary files /dev/null and b/rtdata/images/themed/png/2/light/distortion-barrel-small.png differ diff --git a/rtdata/images/themed/png/2/light/distortion-barrel.png b/rtdata/images/themed/png/2/light/distortion-barrel.png new file mode 100644 index 000000000..acd401b3e Binary files /dev/null and b/rtdata/images/themed/png/2/light/distortion-barrel.png differ diff --git a/rtdata/images/themed/png/2/light/distortion-pincushion-small.png b/rtdata/images/themed/png/2/light/distortion-pincushion-small.png new file mode 100644 index 000000000..7807ff848 Binary files /dev/null and b/rtdata/images/themed/png/2/light/distortion-pincushion-small.png differ diff --git a/rtdata/images/themed/png/2/light/distortion-pincushion.png b/rtdata/images/themed/png/2/light/distortion-pincushion.png new file mode 100644 index 000000000..bff92f848 Binary files /dev/null and b/rtdata/images/themed/png/2/light/distortion-pincushion.png differ diff --git a/rtdata/images/themed/png/2/light/edit-point.png b/rtdata/images/themed/png/2/light/edit-point.png new file mode 100644 index 000000000..134de5a26 Binary files /dev/null and b/rtdata/images/themed/png/2/light/edit-point.png differ diff --git a/rtdata/images/themed/png/2/light/equilizer-narrow.png b/rtdata/images/themed/png/2/light/equilizer-narrow.png new file mode 100644 index 000000000..5f7817511 Binary files /dev/null and b/rtdata/images/themed/png/2/light/equilizer-narrow.png differ diff --git a/rtdata/images/themed/png/2/light/equilizer-wide.png b/rtdata/images/themed/png/2/light/equilizer-wide.png new file mode 100644 index 000000000..7e1a36166 Binary files /dev/null and b/rtdata/images/themed/png/2/light/equilizer-wide.png differ diff --git a/rtdata/images/themed/png/2/light/expander-closed-small.png b/rtdata/images/themed/png/2/light/expander-closed-small.png new file mode 100644 index 000000000..4985dc1e6 Binary files /dev/null and b/rtdata/images/themed/png/2/light/expander-closed-small.png differ diff --git a/rtdata/images/themed/png/2/light/expander-open-small.png b/rtdata/images/themed/png/2/light/expander-open-small.png new file mode 100644 index 000000000..b6aeff9a3 Binary files /dev/null and b/rtdata/images/themed/png/2/light/expander-open-small.png differ diff --git a/rtdata/images/themed/png/2/light/exposure.png b/rtdata/images/themed/png/2/light/exposure.png new file mode 100644 index 000000000..b795920ea Binary files /dev/null and b/rtdata/images/themed/png/2/light/exposure.png differ diff --git a/rtdata/images/themed/png/2/light/filetype-hdr.png b/rtdata/images/themed/png/2/light/filetype-hdr.png new file mode 100644 index 000000000..a284f442f Binary files /dev/null and b/rtdata/images/themed/png/2/light/filetype-hdr.png differ diff --git a/rtdata/images/themed/png/2/light/filetype-ps.png b/rtdata/images/themed/png/2/light/filetype-ps.png new file mode 100644 index 000000000..853c1456e Binary files /dev/null and b/rtdata/images/themed/png/2/light/filetype-ps.png differ diff --git a/rtdata/images/themed/png/2/light/filter-clear.png b/rtdata/images/themed/png/2/light/filter-clear.png new file mode 100644 index 000000000..2936b4158 Binary files /dev/null and b/rtdata/images/themed/png/2/light/filter-clear.png differ diff --git a/rtdata/images/themed/png/2/light/filter-original.png b/rtdata/images/themed/png/2/light/filter-original.png new file mode 100644 index 000000000..99b42c483 Binary files /dev/null and b/rtdata/images/themed/png/2/light/filter-original.png differ diff --git a/rtdata/images/themed/png/2/light/filter-original2.png b/rtdata/images/themed/png/2/light/filter-original2.png new file mode 100644 index 000000000..619efd3b7 Binary files /dev/null and b/rtdata/images/themed/png/2/light/filter-original2.png differ diff --git a/rtdata/images/themed/png/2/light/filter.png b/rtdata/images/themed/png/2/light/filter.png new file mode 100644 index 000000000..2f59198cf Binary files /dev/null and b/rtdata/images/themed/png/2/light/filter.png differ diff --git a/rtdata/images/themed/png/2/light/flip-horizontal.png b/rtdata/images/themed/png/2/light/flip-horizontal.png new file mode 100644 index 000000000..b75671218 Binary files /dev/null and b/rtdata/images/themed/png/2/light/flip-horizontal.png differ diff --git a/rtdata/images/themed/png/2/light/flip-vertical.png b/rtdata/images/themed/png/2/light/flip-vertical.png new file mode 100644 index 000000000..7230cd6b0 Binary files /dev/null and b/rtdata/images/themed/png/2/light/flip-vertical.png differ diff --git a/rtdata/images/themed/png/2/light/focusscreen-off.png b/rtdata/images/themed/png/2/light/focusscreen-off.png new file mode 100644 index 000000000..1e963edeb Binary files /dev/null and b/rtdata/images/themed/png/2/light/focusscreen-off.png differ diff --git a/rtdata/images/themed/png/2/light/focusscreen-on.png b/rtdata/images/themed/png/2/light/focusscreen-on.png new file mode 100644 index 000000000..1edde1374 Binary files /dev/null and b/rtdata/images/themed/png/2/light/focusscreen-on.png differ diff --git a/rtdata/images/themed/png/2/light/folder-closed-home-small.png b/rtdata/images/themed/png/2/light/folder-closed-home-small.png new file mode 100644 index 000000000..2ee8fbebe Binary files /dev/null and b/rtdata/images/themed/png/2/light/folder-closed-home-small.png differ diff --git a/rtdata/images/themed/png/2/light/folder-closed-home.png b/rtdata/images/themed/png/2/light/folder-closed-home.png new file mode 100644 index 000000000..c60bb0a6a Binary files /dev/null and b/rtdata/images/themed/png/2/light/folder-closed-home.png differ diff --git a/rtdata/images/themed/png/2/light/folder-closed-recent-small.png b/rtdata/images/themed/png/2/light/folder-closed-recent-small.png new file mode 100644 index 000000000..914a3eb4b Binary files /dev/null and b/rtdata/images/themed/png/2/light/folder-closed-recent-small.png differ diff --git a/rtdata/images/themed/png/2/light/folder-closed-recent.png b/rtdata/images/themed/png/2/light/folder-closed-recent.png new file mode 100644 index 000000000..97d833a0e Binary files /dev/null and b/rtdata/images/themed/png/2/light/folder-closed-recent.png differ diff --git a/rtdata/images/themed/png/2/light/folder-closed-small.png b/rtdata/images/themed/png/2/light/folder-closed-small.png new file mode 100644 index 000000000..544c4b973 Binary files /dev/null and b/rtdata/images/themed/png/2/light/folder-closed-small.png differ diff --git a/rtdata/images/themed/png/2/light/folder-closed.png b/rtdata/images/themed/png/2/light/folder-closed.png new file mode 100644 index 000000000..ada9476e8 Binary files /dev/null and b/rtdata/images/themed/png/2/light/folder-closed.png differ diff --git a/rtdata/images/themed/png/2/light/folder-open-recent-small.png b/rtdata/images/themed/png/2/light/folder-open-recent-small.png new file mode 100644 index 000000000..7963e859c Binary files /dev/null and b/rtdata/images/themed/png/2/light/folder-open-recent-small.png differ diff --git a/rtdata/images/themed/png/2/light/folder-open-recent.png b/rtdata/images/themed/png/2/light/folder-open-recent.png new file mode 100644 index 000000000..b83826c3f Binary files /dev/null and b/rtdata/images/themed/png/2/light/folder-open-recent.png differ diff --git a/rtdata/images/themed/png/2/light/folder-open-small.png b/rtdata/images/themed/png/2/light/folder-open-small.png new file mode 100644 index 000000000..bee500fc0 Binary files /dev/null and b/rtdata/images/themed/png/2/light/folder-open-small.png differ diff --git a/rtdata/images/themed/png/2/light/folder-open.png b/rtdata/images/themed/png/2/light/folder-open.png new file mode 100644 index 000000000..8ee628f72 Binary files /dev/null and b/rtdata/images/themed/png/2/light/folder-open.png differ diff --git a/rtdata/images/themed/png/2/light/fullscreen-enter.png b/rtdata/images/themed/png/2/light/fullscreen-enter.png new file mode 100644 index 000000000..d070a7f84 Binary files /dev/null and b/rtdata/images/themed/png/2/light/fullscreen-enter.png differ diff --git a/rtdata/images/themed/png/2/light/fullscreen-leave.png b/rtdata/images/themed/png/2/light/fullscreen-leave.png new file mode 100644 index 000000000..90c0a6f01 Binary files /dev/null and b/rtdata/images/themed/png/2/light/fullscreen-leave.png differ diff --git a/rtdata/images/themed/png/2/light/gamut-hist.png b/rtdata/images/themed/png/2/light/gamut-hist.png new file mode 100644 index 000000000..3c2408d69 Binary files /dev/null and b/rtdata/images/themed/png/2/light/gamut-hist.png differ diff --git a/rtdata/images/themed/png/2/light/gamut-plus.png b/rtdata/images/themed/png/2/light/gamut-plus.png new file mode 100644 index 000000000..3f6e92a74 Binary files /dev/null and b/rtdata/images/themed/png/2/light/gamut-plus.png differ diff --git a/rtdata/images/themed/png/2/light/gamut-softproof.png b/rtdata/images/themed/png/2/light/gamut-softproof.png new file mode 100644 index 000000000..fb72a95d8 Binary files /dev/null and b/rtdata/images/themed/png/2/light/gamut-softproof.png differ diff --git a/rtdata/images/themed/png/2/light/gamut-warning.png b/rtdata/images/themed/png/2/light/gamut-warning.png new file mode 100644 index 000000000..af5aa074c Binary files /dev/null and b/rtdata/images/themed/png/2/light/gamut-warning.png differ diff --git a/rtdata/images/themed/png/2/light/gamut_srgb_prophoto_xy.png b/rtdata/images/themed/png/2/light/gamut_srgb_prophoto_xy.png new file mode 100644 index 000000000..fbc0370ec Binary files /dev/null and b/rtdata/images/themed/png/2/light/gamut_srgb_prophoto_xy.png differ diff --git a/rtdata/images/themed/png/2/light/gears-pause.png b/rtdata/images/themed/png/2/light/gears-pause.png new file mode 100644 index 000000000..fd91e43e7 Binary files /dev/null and b/rtdata/images/themed/png/2/light/gears-pause.png differ diff --git a/rtdata/images/themed/png/2/light/gears-play.png b/rtdata/images/themed/png/2/light/gears-play.png new file mode 100644 index 000000000..2e123d3ee Binary files /dev/null and b/rtdata/images/themed/png/2/light/gears-play.png differ diff --git a/rtdata/images/themed/png/2/light/gears-small.png b/rtdata/images/themed/png/2/light/gears-small.png new file mode 100644 index 000000000..4a4b82473 Binary files /dev/null and b/rtdata/images/themed/png/2/light/gears-small.png differ diff --git a/rtdata/images/themed/png/2/light/gears.png b/rtdata/images/themed/png/2/light/gears.png new file mode 100644 index 000000000..8dd0251cb Binary files /dev/null and b/rtdata/images/themed/png/2/light/gears.png differ diff --git a/rtdata/images/themed/png/2/light/goto-end-small.png b/rtdata/images/themed/png/2/light/goto-end-small.png new file mode 100644 index 000000000..cedbadbf2 Binary files /dev/null and b/rtdata/images/themed/png/2/light/goto-end-small.png differ diff --git a/rtdata/images/themed/png/2/light/goto-start-small.png b/rtdata/images/themed/png/2/light/goto-start-small.png new file mode 100644 index 000000000..68be83190 Binary files /dev/null and b/rtdata/images/themed/png/2/light/goto-start-small.png differ diff --git a/rtdata/images/themed/png/2/light/hand-closed-hicontrast.png b/rtdata/images/themed/png/2/light/hand-closed-hicontrast.png new file mode 100644 index 000000000..046f3c341 Binary files /dev/null and b/rtdata/images/themed/png/2/light/hand-closed-hicontrast.png differ diff --git a/rtdata/images/themed/png/2/light/hand-open-hicontrast.png b/rtdata/images/themed/png/2/light/hand-open-hicontrast.png new file mode 100644 index 000000000..d6aba1ed8 Binary files /dev/null and b/rtdata/images/themed/png/2/light/hand-open-hicontrast.png differ diff --git a/rtdata/images/themed/png/2/light/hand-open.png b/rtdata/images/themed/png/2/light/hand-open.png new file mode 100644 index 000000000..40d488aca Binary files /dev/null and b/rtdata/images/themed/png/2/light/hand-open.png differ diff --git a/rtdata/images/themed/png/2/light/histogram-bar-off-small.png b/rtdata/images/themed/png/2/light/histogram-bar-off-small.png new file mode 100644 index 000000000..0e645d3c1 Binary files /dev/null and b/rtdata/images/themed/png/2/light/histogram-bar-off-small.png differ diff --git a/rtdata/images/themed/png/2/light/histogram-bar-on-small.png b/rtdata/images/themed/png/2/light/histogram-bar-on-small.png new file mode 100644 index 000000000..64e69ed4e Binary files /dev/null and b/rtdata/images/themed/png/2/light/histogram-bar-on-small.png differ diff --git a/rtdata/images/themed/png/2/light/histogram-bayer-off-small.png b/rtdata/images/themed/png/2/light/histogram-bayer-off-small.png new file mode 100644 index 000000000..dfa42090d Binary files /dev/null and b/rtdata/images/themed/png/2/light/histogram-bayer-off-small.png differ diff --git a/rtdata/images/themed/png/2/light/histogram-bayer-on-small.png b/rtdata/images/themed/png/2/light/histogram-bayer-on-small.png new file mode 100644 index 000000000..5ed266350 Binary files /dev/null and b/rtdata/images/themed/png/2/light/histogram-bayer-on-small.png differ diff --git a/rtdata/images/themed/png/2/light/histogram-blue-off-small.png b/rtdata/images/themed/png/2/light/histogram-blue-off-small.png new file mode 100644 index 000000000..7fa647f44 Binary files /dev/null and b/rtdata/images/themed/png/2/light/histogram-blue-off-small.png differ diff --git a/rtdata/images/themed/png/2/light/histogram-blue-on-small.png b/rtdata/images/themed/png/2/light/histogram-blue-on-small.png new file mode 100644 index 000000000..2da44ea64 Binary files /dev/null and b/rtdata/images/themed/png/2/light/histogram-blue-on-small.png differ diff --git a/rtdata/images/themed/png/2/light/histogram-gold-off-small.png b/rtdata/images/themed/png/2/light/histogram-gold-off-small.png new file mode 100644 index 000000000..e3c0eec86 Binary files /dev/null and b/rtdata/images/themed/png/2/light/histogram-gold-off-small.png differ diff --git a/rtdata/images/themed/png/2/light/histogram-gold-on-small.png b/rtdata/images/themed/png/2/light/histogram-gold-on-small.png new file mode 100644 index 000000000..08ad39f12 Binary files /dev/null and b/rtdata/images/themed/png/2/light/histogram-gold-on-small.png differ diff --git a/rtdata/images/themed/png/2/light/histogram-green-off-small.png b/rtdata/images/themed/png/2/light/histogram-green-off-small.png new file mode 100644 index 000000000..1471f6bea Binary files /dev/null and b/rtdata/images/themed/png/2/light/histogram-green-off-small.png differ diff --git a/rtdata/images/themed/png/2/light/histogram-green-on-small.png b/rtdata/images/themed/png/2/light/histogram-green-on-small.png new file mode 100644 index 000000000..4b7ec0f11 Binary files /dev/null and b/rtdata/images/themed/png/2/light/histogram-green-on-small.png differ diff --git a/rtdata/images/themed/png/2/light/histogram-mode-linear-small.png b/rtdata/images/themed/png/2/light/histogram-mode-linear-small.png new file mode 100644 index 000000000..105adc1c0 Binary files /dev/null and b/rtdata/images/themed/png/2/light/histogram-mode-linear-small.png differ diff --git a/rtdata/images/themed/png/2/light/histogram-mode-logx-small.png b/rtdata/images/themed/png/2/light/histogram-mode-logx-small.png new file mode 100644 index 000000000..e8f52fa2b Binary files /dev/null and b/rtdata/images/themed/png/2/light/histogram-mode-logx-small.png differ diff --git a/rtdata/images/themed/png/2/light/histogram-mode-logxy-small.png b/rtdata/images/themed/png/2/light/histogram-mode-logxy-small.png new file mode 100644 index 000000000..6d1b13db4 Binary files /dev/null and b/rtdata/images/themed/png/2/light/histogram-mode-logxy-small.png differ diff --git a/rtdata/images/themed/png/2/light/histogram-red-off-small.png b/rtdata/images/themed/png/2/light/histogram-red-off-small.png new file mode 100644 index 000000000..cfa4e5fdf Binary files /dev/null and b/rtdata/images/themed/png/2/light/histogram-red-off-small.png differ diff --git a/rtdata/images/themed/png/2/light/histogram-red-on-small.png b/rtdata/images/themed/png/2/light/histogram-red-on-small.png new file mode 100644 index 000000000..3778d0837 Binary files /dev/null and b/rtdata/images/themed/png/2/light/histogram-red-on-small.png differ diff --git a/rtdata/images/themed/png/2/light/histogram-silver-off-small.png b/rtdata/images/themed/png/2/light/histogram-silver-off-small.png new file mode 100644 index 000000000..18f5b2bac Binary files /dev/null and b/rtdata/images/themed/png/2/light/histogram-silver-off-small.png differ diff --git a/rtdata/images/themed/png/2/light/histogram-silver-on-small.png b/rtdata/images/themed/png/2/light/histogram-silver-on-small.png new file mode 100644 index 000000000..144330442 Binary files /dev/null and b/rtdata/images/themed/png/2/light/histogram-silver-on-small.png differ diff --git a/rtdata/images/themed/png/2/light/info.png b/rtdata/images/themed/png/2/light/info.png new file mode 100644 index 000000000..687e28c53 Binary files /dev/null and b/rtdata/images/themed/png/2/light/info.png differ diff --git a/rtdata/images/themed/png/2/light/intent-absolute.png b/rtdata/images/themed/png/2/light/intent-absolute.png new file mode 100644 index 000000000..ceb695d0a Binary files /dev/null and b/rtdata/images/themed/png/2/light/intent-absolute.png differ diff --git a/rtdata/images/themed/png/2/light/intent-perceptual.png b/rtdata/images/themed/png/2/light/intent-perceptual.png new file mode 100644 index 000000000..136d4d109 Binary files /dev/null and b/rtdata/images/themed/png/2/light/intent-perceptual.png differ diff --git a/rtdata/images/themed/png/2/light/intent-relative.png b/rtdata/images/themed/png/2/light/intent-relative.png new file mode 100644 index 000000000..f8c7d86d8 Binary files /dev/null and b/rtdata/images/themed/png/2/light/intent-relative.png differ diff --git a/rtdata/images/themed/png/2/light/intent-saturation.png b/rtdata/images/themed/png/2/light/intent-saturation.png new file mode 100644 index 000000000..3b7edfa29 Binary files /dev/null and b/rtdata/images/themed/png/2/light/intent-saturation.png differ diff --git a/rtdata/images/themed/png/2/light/magnifier-1to1-small.png b/rtdata/images/themed/png/2/light/magnifier-1to1-small.png new file mode 100644 index 000000000..ac01575ba Binary files /dev/null and b/rtdata/images/themed/png/2/light/magnifier-1to1-small.png differ diff --git a/rtdata/images/themed/png/2/light/magnifier-1to1.png b/rtdata/images/themed/png/2/light/magnifier-1to1.png new file mode 100644 index 000000000..3666c7c9f Binary files /dev/null and b/rtdata/images/themed/png/2/light/magnifier-1to1.png differ diff --git a/rtdata/images/themed/png/2/light/magnifier-crop.png b/rtdata/images/themed/png/2/light/magnifier-crop.png new file mode 100644 index 000000000..8ffec5650 Binary files /dev/null and b/rtdata/images/themed/png/2/light/magnifier-crop.png differ diff --git a/rtdata/images/themed/png/2/light/magnifier-fit.png b/rtdata/images/themed/png/2/light/magnifier-fit.png new file mode 100644 index 000000000..79a2bace9 Binary files /dev/null and b/rtdata/images/themed/png/2/light/magnifier-fit.png differ diff --git a/rtdata/images/themed/png/2/light/magnifier-minus-small.png b/rtdata/images/themed/png/2/light/magnifier-minus-small.png new file mode 100644 index 000000000..840cd94df Binary files /dev/null and b/rtdata/images/themed/png/2/light/magnifier-minus-small.png differ diff --git a/rtdata/images/themed/png/2/light/magnifier-minus.png b/rtdata/images/themed/png/2/light/magnifier-minus.png new file mode 100644 index 000000000..1e12044c8 Binary files /dev/null and b/rtdata/images/themed/png/2/light/magnifier-minus.png differ diff --git a/rtdata/images/themed/png/2/light/magnifier-plus-small.png b/rtdata/images/themed/png/2/light/magnifier-plus-small.png new file mode 100644 index 000000000..ee39b0617 Binary files /dev/null and b/rtdata/images/themed/png/2/light/magnifier-plus-small.png differ diff --git a/rtdata/images/themed/png/2/light/magnifier-plus.png b/rtdata/images/themed/png/2/light/magnifier-plus.png new file mode 100644 index 000000000..3224168b2 Binary files /dev/null and b/rtdata/images/themed/png/2/light/magnifier-plus.png differ diff --git a/rtdata/images/themed/png/2/light/magnifier.png b/rtdata/images/themed/png/2/light/magnifier.png new file mode 100644 index 000000000..28a52f612 Binary files /dev/null and b/rtdata/images/themed/png/2/light/magnifier.png differ diff --git a/rtdata/images/themed/png/2/light/metadata.png b/rtdata/images/themed/png/2/light/metadata.png new file mode 100644 index 000000000..58681091e Binary files /dev/null and b/rtdata/images/themed/png/2/light/metadata.png differ diff --git a/rtdata/images/themed/png/2/light/node-move-nw-se-hicontrast.png b/rtdata/images/themed/png/2/light/node-move-nw-se-hicontrast.png new file mode 100644 index 000000000..f4f710cab Binary files /dev/null and b/rtdata/images/themed/png/2/light/node-move-nw-se-hicontrast.png differ diff --git a/rtdata/images/themed/png/2/light/node-move-sw-ne-hicontrast.png b/rtdata/images/themed/png/2/light/node-move-sw-ne-hicontrast.png new file mode 100644 index 000000000..cd3705cb9 Binary files /dev/null and b/rtdata/images/themed/png/2/light/node-move-sw-ne-hicontrast.png differ diff --git a/rtdata/images/themed/png/2/light/node-move-x-hicontrast.png b/rtdata/images/themed/png/2/light/node-move-x-hicontrast.png new file mode 100644 index 000000000..d3f1b6327 Binary files /dev/null and b/rtdata/images/themed/png/2/light/node-move-x-hicontrast.png differ diff --git a/rtdata/images/themed/png/2/light/node-move-xy-hicontrast.png b/rtdata/images/themed/png/2/light/node-move-xy-hicontrast.png new file mode 100644 index 000000000..ef0c0e667 Binary files /dev/null and b/rtdata/images/themed/png/2/light/node-move-xy-hicontrast.png differ diff --git a/rtdata/images/themed/png/2/light/node-move-y-hicontrast.png b/rtdata/images/themed/png/2/light/node-move-y-hicontrast.png new file mode 100644 index 000000000..1b0b471f5 Binary files /dev/null and b/rtdata/images/themed/png/2/light/node-move-y-hicontrast.png differ diff --git a/rtdata/images/themed/png/2/light/one-to-one-small.png b/rtdata/images/themed/png/2/light/one-to-one-small.png new file mode 100644 index 000000000..ea2f52bc6 Binary files /dev/null and b/rtdata/images/themed/png/2/light/one-to-one-small.png differ diff --git a/rtdata/images/themed/png/2/light/ornament1.png b/rtdata/images/themed/png/2/light/ornament1.png new file mode 100644 index 000000000..840cad73f Binary files /dev/null and b/rtdata/images/themed/png/2/light/ornament1.png differ diff --git a/rtdata/images/themed/png/2/light/padlock-locked-small.png b/rtdata/images/themed/png/2/light/padlock-locked-small.png new file mode 100644 index 000000000..85c7bf0a9 Binary files /dev/null and b/rtdata/images/themed/png/2/light/padlock-locked-small.png differ diff --git a/rtdata/images/themed/png/2/light/padlock-unlocked-small.png b/rtdata/images/themed/png/2/light/padlock-unlocked-small.png new file mode 100644 index 000000000..8561ee0d7 Binary files /dev/null and b/rtdata/images/themed/png/2/light/padlock-unlocked-small.png differ diff --git a/rtdata/images/themed/png/2/light/palette-brush.png b/rtdata/images/themed/png/2/light/palette-brush.png new file mode 100644 index 000000000..4ee2b1326 Binary files /dev/null and b/rtdata/images/themed/png/2/light/palette-brush.png differ diff --git a/rtdata/images/themed/png/2/light/panel-to-bottom.png b/rtdata/images/themed/png/2/light/panel-to-bottom.png new file mode 100644 index 000000000..1bc71fc5b Binary files /dev/null and b/rtdata/images/themed/png/2/light/panel-to-bottom.png differ diff --git a/rtdata/images/themed/png/2/light/panel-to-left.png b/rtdata/images/themed/png/2/light/panel-to-left.png new file mode 100644 index 000000000..cc8dc09d5 Binary files /dev/null and b/rtdata/images/themed/png/2/light/panel-to-left.png differ diff --git a/rtdata/images/themed/png/2/light/panel-to-right.png b/rtdata/images/themed/png/2/light/panel-to-right.png new file mode 100644 index 000000000..03be7d5ab Binary files /dev/null and b/rtdata/images/themed/png/2/light/panel-to-right.png differ diff --git a/rtdata/images/themed/png/2/light/panel-to-top.png b/rtdata/images/themed/png/2/light/panel-to-top.png new file mode 100644 index 000000000..00f9d6bf1 Binary files /dev/null and b/rtdata/images/themed/png/2/light/panel-to-top.png differ diff --git a/rtdata/images/themed/png/2/light/paste.png b/rtdata/images/themed/png/2/light/paste.png new file mode 100644 index 000000000..87faeef4f Binary files /dev/null and b/rtdata/images/themed/png/2/light/paste.png differ diff --git a/rtdata/images/themed/png/2/light/perspective-horizontal-left-small.png b/rtdata/images/themed/png/2/light/perspective-horizontal-left-small.png new file mode 100644 index 000000000..c2303ec02 Binary files /dev/null and b/rtdata/images/themed/png/2/light/perspective-horizontal-left-small.png differ diff --git a/rtdata/images/themed/png/2/light/perspective-horizontal-left.png b/rtdata/images/themed/png/2/light/perspective-horizontal-left.png new file mode 100644 index 000000000..fee33a572 Binary files /dev/null and b/rtdata/images/themed/png/2/light/perspective-horizontal-left.png differ diff --git a/rtdata/images/themed/png/2/light/perspective-horizontal-right-small.png b/rtdata/images/themed/png/2/light/perspective-horizontal-right-small.png new file mode 100644 index 000000000..d2b737a0f Binary files /dev/null and b/rtdata/images/themed/png/2/light/perspective-horizontal-right-small.png differ diff --git a/rtdata/images/themed/png/2/light/perspective-horizontal-right.png b/rtdata/images/themed/png/2/light/perspective-horizontal-right.png new file mode 100644 index 000000000..f93109934 Binary files /dev/null and b/rtdata/images/themed/png/2/light/perspective-horizontal-right.png differ diff --git a/rtdata/images/themed/png/2/light/perspective-vertical-bottom-small.png b/rtdata/images/themed/png/2/light/perspective-vertical-bottom-small.png new file mode 100644 index 000000000..2b74a756b Binary files /dev/null and b/rtdata/images/themed/png/2/light/perspective-vertical-bottom-small.png differ diff --git a/rtdata/images/themed/png/2/light/perspective-vertical-bottom.png b/rtdata/images/themed/png/2/light/perspective-vertical-bottom.png new file mode 100644 index 000000000..64715d863 Binary files /dev/null and b/rtdata/images/themed/png/2/light/perspective-vertical-bottom.png differ diff --git a/rtdata/images/themed/png/2/light/perspective-vertical-top-small.png b/rtdata/images/themed/png/2/light/perspective-vertical-top-small.png new file mode 100644 index 000000000..246c48bdb Binary files /dev/null and b/rtdata/images/themed/png/2/light/perspective-vertical-top-small.png differ diff --git a/rtdata/images/themed/png/2/light/perspective-vertical-top.png b/rtdata/images/themed/png/2/light/perspective-vertical-top.png new file mode 100644 index 000000000..5c8ae4c0a Binary files /dev/null and b/rtdata/images/themed/png/2/light/perspective-vertical-top.png differ diff --git a/rtdata/images/themed/png/2/light/power-inconsistent-small.png b/rtdata/images/themed/png/2/light/power-inconsistent-small.png new file mode 100644 index 000000000..8b1eadc76 Binary files /dev/null and b/rtdata/images/themed/png/2/light/power-inconsistent-small.png differ diff --git a/rtdata/images/themed/png/2/light/power-off-small.png b/rtdata/images/themed/png/2/light/power-off-small.png new file mode 100644 index 000000000..350691740 Binary files /dev/null and b/rtdata/images/themed/png/2/light/power-off-small.png differ diff --git a/rtdata/images/themed/png/2/light/power-on-small.png b/rtdata/images/themed/png/2/light/power-on-small.png new file mode 100644 index 000000000..75e6980c1 Binary files /dev/null and b/rtdata/images/themed/png/2/light/power-on-small.png differ diff --git a/rtdata/images/themed/png/2/light/preferences.png b/rtdata/images/themed/png/2/light/preferences.png new file mode 100644 index 000000000..bb4434b4f Binary files /dev/null and b/rtdata/images/themed/png/2/light/preferences.png differ diff --git a/rtdata/images/themed/png/2/light/profile-filled.png b/rtdata/images/themed/png/2/light/profile-filled.png new file mode 100644 index 000000000..f919043d1 Binary files /dev/null and b/rtdata/images/themed/png/2/light/profile-filled.png differ diff --git a/rtdata/images/themed/png/2/light/profile-partial.png b/rtdata/images/themed/png/2/light/profile-partial.png new file mode 100644 index 000000000..c6aa1bbe2 Binary files /dev/null and b/rtdata/images/themed/png/2/light/profile-partial.png differ diff --git a/rtdata/images/themed/png/2/light/redo-all.png b/rtdata/images/themed/png/2/light/redo-all.png new file mode 100644 index 000000000..88c3ff9da Binary files /dev/null and b/rtdata/images/themed/png/2/light/redo-all.png differ diff --git a/rtdata/images/themed/png/2/light/redo-small.png b/rtdata/images/themed/png/2/light/redo-small.png new file mode 100644 index 000000000..75856d89d Binary files /dev/null and b/rtdata/images/themed/png/2/light/redo-small.png differ diff --git a/rtdata/images/themed/png/2/light/redo.png b/rtdata/images/themed/png/2/light/redo.png new file mode 100644 index 000000000..6ec202fe9 Binary files /dev/null and b/rtdata/images/themed/png/2/light/redo.png differ diff --git a/rtdata/images/themed/png/2/light/refresh-red-small.png b/rtdata/images/themed/png/2/light/refresh-red-small.png new file mode 100644 index 000000000..058b52f2f Binary files /dev/null and b/rtdata/images/themed/png/2/light/refresh-red-small.png differ diff --git a/rtdata/images/themed/png/2/light/refresh-small.png b/rtdata/images/themed/png/2/light/refresh-small.png new file mode 100644 index 000000000..1b5031f80 Binary files /dev/null and b/rtdata/images/themed/png/2/light/refresh-small.png differ diff --git a/rtdata/images/themed/png/2/light/refresh.png b/rtdata/images/themed/png/2/light/refresh.png new file mode 100644 index 000000000..e30930d3c Binary files /dev/null and b/rtdata/images/themed/png/2/light/refresh.png differ diff --git a/rtdata/images/themed/png/2/light/remove-small.png b/rtdata/images/themed/png/2/light/remove-small.png new file mode 100644 index 000000000..c687d7fc2 Binary files /dev/null and b/rtdata/images/themed/png/2/light/remove-small.png differ diff --git a/rtdata/images/themed/png/2/light/remove.png b/rtdata/images/themed/png/2/light/remove.png new file mode 100644 index 000000000..7a9f75cfa Binary files /dev/null and b/rtdata/images/themed/png/2/light/remove.png differ diff --git a/rtdata/images/themed/png/2/light/rotate-aroundnode-hicontrast.png b/rtdata/images/themed/png/2/light/rotate-aroundnode-hicontrast.png new file mode 100644 index 000000000..df718d745 Binary files /dev/null and b/rtdata/images/themed/png/2/light/rotate-aroundnode-hicontrast.png differ diff --git a/rtdata/images/themed/png/2/light/rotate-aroundnode.png b/rtdata/images/themed/png/2/light/rotate-aroundnode.png new file mode 100644 index 000000000..597bcfc84 Binary files /dev/null and b/rtdata/images/themed/png/2/light/rotate-aroundnode.png differ diff --git a/rtdata/images/themed/png/2/light/rotate-left-90.png b/rtdata/images/themed/png/2/light/rotate-left-90.png new file mode 100644 index 000000000..b43595833 Binary files /dev/null and b/rtdata/images/themed/png/2/light/rotate-left-90.png differ diff --git a/rtdata/images/themed/png/2/light/rotate-left-small.png b/rtdata/images/themed/png/2/light/rotate-left-small.png new file mode 100644 index 000000000..2d445dc01 Binary files /dev/null and b/rtdata/images/themed/png/2/light/rotate-left-small.png differ diff --git a/rtdata/images/themed/png/2/light/rotate-left.png b/rtdata/images/themed/png/2/light/rotate-left.png new file mode 100644 index 000000000..d939d9dec Binary files /dev/null and b/rtdata/images/themed/png/2/light/rotate-left.png differ diff --git a/rtdata/images/themed/png/2/light/rotate-right-90.png b/rtdata/images/themed/png/2/light/rotate-right-90.png new file mode 100644 index 000000000..0c671cdc0 Binary files /dev/null and b/rtdata/images/themed/png/2/light/rotate-right-90.png differ diff --git a/rtdata/images/themed/png/2/light/rotate-right-small.png b/rtdata/images/themed/png/2/light/rotate-right-small.png new file mode 100644 index 000000000..871a6acbb Binary files /dev/null and b/rtdata/images/themed/png/2/light/rotate-right-small.png differ diff --git a/rtdata/images/themed/png/2/light/rotate-right.png b/rtdata/images/themed/png/2/light/rotate-right.png new file mode 100644 index 000000000..ea4ed46af Binary files /dev/null and b/rtdata/images/themed/png/2/light/rotate-right.png differ diff --git a/rtdata/images/themed/png/2/light/rotate-straighten-small.png b/rtdata/images/themed/png/2/light/rotate-straighten-small.png new file mode 100644 index 000000000..fa81961a0 Binary files /dev/null and b/rtdata/images/themed/png/2/light/rotate-straighten-small.png differ diff --git a/rtdata/images/themed/png/2/light/rotate-straighten.png b/rtdata/images/themed/png/2/light/rotate-straighten.png new file mode 100644 index 000000000..9d2220ee2 Binary files /dev/null and b/rtdata/images/themed/png/2/light/rotate-straighten.png differ diff --git a/rtdata/images/themed/png/2/light/save-small.png b/rtdata/images/themed/png/2/light/save-small.png new file mode 100644 index 000000000..4520e8229 Binary files /dev/null and b/rtdata/images/themed/png/2/light/save-small.png differ diff --git a/rtdata/images/themed/png/2/light/save.png b/rtdata/images/themed/png/2/light/save.png new file mode 100644 index 000000000..e563e7110 Binary files /dev/null and b/rtdata/images/themed/png/2/light/save.png differ diff --git a/rtdata/images/themed/png/2/light/saved-no-small.png b/rtdata/images/themed/png/2/light/saved-no-small.png new file mode 100644 index 000000000..73cb4c7d3 Binary files /dev/null and b/rtdata/images/themed/png/2/light/saved-no-small.png differ diff --git a/rtdata/images/themed/png/2/light/saved-yes-small.png b/rtdata/images/themed/png/2/light/saved-yes-small.png new file mode 100644 index 000000000..65ec6ecaf Binary files /dev/null and b/rtdata/images/themed/png/2/light/saved-yes-small.png differ diff --git a/rtdata/images/themed/png/2/light/square-toggle-black-off-narrow.png b/rtdata/images/themed/png/2/light/square-toggle-black-off-narrow.png new file mode 100644 index 000000000..90ecba649 Binary files /dev/null and b/rtdata/images/themed/png/2/light/square-toggle-black-off-narrow.png differ diff --git a/rtdata/images/themed/png/2/light/square-toggle-black-on-narrow.png b/rtdata/images/themed/png/2/light/square-toggle-black-on-narrow.png new file mode 100644 index 000000000..6b7da20b7 Binary files /dev/null and b/rtdata/images/themed/png/2/light/square-toggle-black-on-narrow.png differ diff --git a/rtdata/images/themed/png/2/light/square-toggle-blue-off-narrow.png b/rtdata/images/themed/png/2/light/square-toggle-blue-off-narrow.png new file mode 100644 index 000000000..8fd01165c Binary files /dev/null and b/rtdata/images/themed/png/2/light/square-toggle-blue-off-narrow.png differ diff --git a/rtdata/images/themed/png/2/light/square-toggle-blue-on-narrow.png b/rtdata/images/themed/png/2/light/square-toggle-blue-on-narrow.png new file mode 100644 index 000000000..2f97cd050 Binary files /dev/null and b/rtdata/images/themed/png/2/light/square-toggle-blue-on-narrow.png differ diff --git a/rtdata/images/themed/png/2/light/square-toggle-gray-off-narrow.png b/rtdata/images/themed/png/2/light/square-toggle-gray-off-narrow.png new file mode 100644 index 000000000..779d4eb3b Binary files /dev/null and b/rtdata/images/themed/png/2/light/square-toggle-gray-off-narrow.png differ diff --git a/rtdata/images/themed/png/2/light/square-toggle-gray-on-narrow.png b/rtdata/images/themed/png/2/light/square-toggle-gray-on-narrow.png new file mode 100644 index 000000000..30923caaa Binary files /dev/null and b/rtdata/images/themed/png/2/light/square-toggle-gray-on-narrow.png differ diff --git a/rtdata/images/themed/png/2/light/square-toggle-green-off-narrow.png b/rtdata/images/themed/png/2/light/square-toggle-green-off-narrow.png new file mode 100644 index 000000000..3184167df Binary files /dev/null and b/rtdata/images/themed/png/2/light/square-toggle-green-off-narrow.png differ diff --git a/rtdata/images/themed/png/2/light/square-toggle-green-on-narrow.png b/rtdata/images/themed/png/2/light/square-toggle-green-on-narrow.png new file mode 100644 index 000000000..7e338b190 Binary files /dev/null and b/rtdata/images/themed/png/2/light/square-toggle-green-on-narrow.png differ diff --git a/rtdata/images/themed/png/2/light/square-toggle-luminosity-off-narrow.png b/rtdata/images/themed/png/2/light/square-toggle-luminosity-off-narrow.png new file mode 100644 index 000000000..1c7ae0717 Binary files /dev/null and b/rtdata/images/themed/png/2/light/square-toggle-luminosity-off-narrow.png differ diff --git a/rtdata/images/themed/png/2/light/square-toggle-luminosity-on-narrow.png b/rtdata/images/themed/png/2/light/square-toggle-luminosity-on-narrow.png new file mode 100644 index 000000000..8108aee67 Binary files /dev/null and b/rtdata/images/themed/png/2/light/square-toggle-luminosity-on-narrow.png differ diff --git a/rtdata/images/themed/png/2/light/square-toggle-red-off-narrow.png b/rtdata/images/themed/png/2/light/square-toggle-red-off-narrow.png new file mode 100644 index 000000000..7d0b299c9 Binary files /dev/null and b/rtdata/images/themed/png/2/light/square-toggle-red-off-narrow.png differ diff --git a/rtdata/images/themed/png/2/light/square-toggle-red-on-narrow.png b/rtdata/images/themed/png/2/light/square-toggle-red-on-narrow.png new file mode 100644 index 000000000..cd5fe85e6 Binary files /dev/null and b/rtdata/images/themed/png/2/light/square-toggle-red-on-narrow.png differ diff --git a/rtdata/images/themed/png/2/light/square-toggle-theme-off-narrow.png b/rtdata/images/themed/png/2/light/square-toggle-theme-off-narrow.png new file mode 100644 index 000000000..31d2d57c6 Binary files /dev/null and b/rtdata/images/themed/png/2/light/square-toggle-theme-off-narrow.png differ diff --git a/rtdata/images/themed/png/2/light/square-toggle-theme-on-narrow.png b/rtdata/images/themed/png/2/light/square-toggle-theme-on-narrow.png new file mode 100644 index 000000000..14461a3ce Binary files /dev/null and b/rtdata/images/themed/png/2/light/square-toggle-theme-on-narrow.png differ diff --git a/rtdata/images/themed/png/2/light/square-toggle-white-off-narrow.png b/rtdata/images/themed/png/2/light/square-toggle-white-off-narrow.png new file mode 100644 index 000000000..12831eb4b Binary files /dev/null and b/rtdata/images/themed/png/2/light/square-toggle-white-off-narrow.png differ diff --git a/rtdata/images/themed/png/2/light/square-toggle-white-on-narrow.png b/rtdata/images/themed/png/2/light/square-toggle-white-on-narrow.png new file mode 100644 index 000000000..9640a492e Binary files /dev/null and b/rtdata/images/themed/png/2/light/square-toggle-white-on-narrow.png differ diff --git a/rtdata/images/themed/png/2/light/star-gold-hollow-narrow.png b/rtdata/images/themed/png/2/light/star-gold-hollow-narrow.png new file mode 100644 index 000000000..cda3c345f Binary files /dev/null and b/rtdata/images/themed/png/2/light/star-gold-hollow-narrow.png differ diff --git a/rtdata/images/themed/png/2/light/star-gold-hollow-small.png b/rtdata/images/themed/png/2/light/star-gold-hollow-small.png new file mode 100644 index 000000000..c4816cfa4 Binary files /dev/null and b/rtdata/images/themed/png/2/light/star-gold-hollow-small.png differ diff --git a/rtdata/images/themed/png/2/light/star-gold-narrow.png b/rtdata/images/themed/png/2/light/star-gold-narrow.png new file mode 100644 index 000000000..c51ff057f Binary files /dev/null and b/rtdata/images/themed/png/2/light/star-gold-narrow.png differ diff --git a/rtdata/images/themed/png/2/light/star-gold-small.png b/rtdata/images/themed/png/2/light/star-gold-small.png new file mode 100644 index 000000000..89c3b7c3d Binary files /dev/null and b/rtdata/images/themed/png/2/light/star-gold-small.png differ diff --git a/rtdata/images/themed/png/2/light/star-hollow-narrow.png b/rtdata/images/themed/png/2/light/star-hollow-narrow.png new file mode 100644 index 000000000..cb2ee448c Binary files /dev/null and b/rtdata/images/themed/png/2/light/star-hollow-narrow.png differ diff --git a/rtdata/images/themed/png/2/light/star-hollow-small.png b/rtdata/images/themed/png/2/light/star-hollow-small.png new file mode 100644 index 000000000..f3cf13b21 Binary files /dev/null and b/rtdata/images/themed/png/2/light/star-hollow-small.png differ diff --git a/rtdata/images/themed/png/2/light/star-narrow.png b/rtdata/images/themed/png/2/light/star-narrow.png new file mode 100644 index 000000000..90ec99662 Binary files /dev/null and b/rtdata/images/themed/png/2/light/star-narrow.png differ diff --git a/rtdata/images/themed/png/2/light/star-small.png b/rtdata/images/themed/png/2/light/star-small.png new file mode 100644 index 000000000..ecd6bc817 Binary files /dev/null and b/rtdata/images/themed/png/2/light/star-small.png differ diff --git a/rtdata/images/themed/png/2/light/template-16.png b/rtdata/images/themed/png/2/light/template-16.png new file mode 100644 index 000000000..aea362a25 Binary files /dev/null and b/rtdata/images/themed/png/2/light/template-16.png differ diff --git a/rtdata/images/themed/png/2/light/template-24.png b/rtdata/images/themed/png/2/light/template-24.png new file mode 100644 index 000000000..87e3f7e3e Binary files /dev/null and b/rtdata/images/themed/png/2/light/template-24.png differ diff --git a/rtdata/images/themed/png/2/light/template-narrow.png b/rtdata/images/themed/png/2/light/template-narrow.png new file mode 100644 index 000000000..16fc0bfbf Binary files /dev/null and b/rtdata/images/themed/png/2/light/template-narrow.png differ diff --git a/rtdata/images/themed/png/2/light/tick-green-hollow-small.png b/rtdata/images/themed/png/2/light/tick-green-hollow-small.png new file mode 100644 index 000000000..a89717398 Binary files /dev/null and b/rtdata/images/themed/png/2/light/tick-green-hollow-small.png differ diff --git a/rtdata/images/themed/png/2/light/tick-green-hollow.png b/rtdata/images/themed/png/2/light/tick-green-hollow.png new file mode 100644 index 000000000..f98eeee6c Binary files /dev/null and b/rtdata/images/themed/png/2/light/tick-green-hollow.png differ diff --git a/rtdata/images/themed/png/2/light/tick-green-small.png b/rtdata/images/themed/png/2/light/tick-green-small.png new file mode 100644 index 000000000..934ce85d0 Binary files /dev/null and b/rtdata/images/themed/png/2/light/tick-green-small.png differ diff --git a/rtdata/images/themed/png/2/light/tick-green.png b/rtdata/images/themed/png/2/light/tick-green.png new file mode 100644 index 000000000..d527f670f Binary files /dev/null and b/rtdata/images/themed/png/2/light/tick-green.png differ diff --git a/rtdata/images/themed/png/2/light/tick-hollow-small.png b/rtdata/images/themed/png/2/light/tick-hollow-small.png new file mode 100644 index 000000000..55caae189 Binary files /dev/null and b/rtdata/images/themed/png/2/light/tick-hollow-small.png differ diff --git a/rtdata/images/themed/png/2/light/tick-small.png b/rtdata/images/themed/png/2/light/tick-small.png new file mode 100644 index 000000000..a77cc1015 Binary files /dev/null and b/rtdata/images/themed/png/2/light/tick-small.png differ diff --git a/rtdata/images/themed/png/2/light/tick.png b/rtdata/images/themed/png/2/light/tick.png new file mode 100644 index 000000000..8d0310088 Binary files /dev/null and b/rtdata/images/themed/png/2/light/tick.png differ diff --git a/rtdata/images/themed/png/2/light/transform.png b/rtdata/images/themed/png/2/light/transform.png new file mode 100644 index 000000000..6f408cc4c Binary files /dev/null and b/rtdata/images/themed/png/2/light/transform.png differ diff --git a/rtdata/images/themed/png/2/light/trash-delete.png b/rtdata/images/themed/png/2/light/trash-delete.png new file mode 100644 index 000000000..402ad8048 Binary files /dev/null and b/rtdata/images/themed/png/2/light/trash-delete.png differ diff --git a/rtdata/images/themed/png/2/light/trash-empty-show.png b/rtdata/images/themed/png/2/light/trash-empty-show.png new file mode 100644 index 000000000..c83d9b961 Binary files /dev/null and b/rtdata/images/themed/png/2/light/trash-empty-show.png differ diff --git a/rtdata/images/themed/png/2/light/trash-empty.png b/rtdata/images/themed/png/2/light/trash-empty.png new file mode 100644 index 000000000..d2ddc6b84 Binary files /dev/null and b/rtdata/images/themed/png/2/light/trash-empty.png differ diff --git a/rtdata/images/themed/png/2/light/trash-full-show.png b/rtdata/images/themed/png/2/light/trash-full-show.png new file mode 100644 index 000000000..1e78d41a5 Binary files /dev/null and b/rtdata/images/themed/png/2/light/trash-full-show.png differ diff --git a/rtdata/images/themed/png/2/light/trash-full.png b/rtdata/images/themed/png/2/light/trash-full.png new file mode 100644 index 000000000..372ae94d1 Binary files /dev/null and b/rtdata/images/themed/png/2/light/trash-full.png differ diff --git a/rtdata/images/themed/png/2/light/trash-hide-deleted.png b/rtdata/images/themed/png/2/light/trash-hide-deleted.png new file mode 100644 index 000000000..2c8fb6680 Binary files /dev/null and b/rtdata/images/themed/png/2/light/trash-hide-deleted.png differ diff --git a/rtdata/images/themed/png/2/light/trash-remove-small.png b/rtdata/images/themed/png/2/light/trash-remove-small.png new file mode 100644 index 000000000..da5202076 Binary files /dev/null and b/rtdata/images/themed/png/2/light/trash-remove-small.png differ diff --git a/rtdata/images/themed/png/2/light/trash-remove.png b/rtdata/images/themed/png/2/light/trash-remove.png new file mode 100644 index 000000000..78dcc30b0 Binary files /dev/null and b/rtdata/images/themed/png/2/light/trash-remove.png differ diff --git a/rtdata/images/themed/png/2/light/trash-small.png b/rtdata/images/themed/png/2/light/trash-small.png new file mode 100644 index 000000000..0077c2501 Binary files /dev/null and b/rtdata/images/themed/png/2/light/trash-small.png differ diff --git a/rtdata/images/themed/png/2/light/undo-all.png b/rtdata/images/themed/png/2/light/undo-all.png new file mode 100644 index 000000000..c34cbda51 Binary files /dev/null and b/rtdata/images/themed/png/2/light/undo-all.png differ diff --git a/rtdata/images/themed/png/2/light/undo-small.png b/rtdata/images/themed/png/2/light/undo-small.png new file mode 100644 index 000000000..813274bdb Binary files /dev/null and b/rtdata/images/themed/png/2/light/undo-small.png differ diff --git a/rtdata/images/themed/png/2/light/undo.png b/rtdata/images/themed/png/2/light/undo.png new file mode 100644 index 000000000..f84c79d0f Binary files /dev/null and b/rtdata/images/themed/png/2/light/undo.png differ diff --git a/rtdata/images/themed/png/2/light/warning-highlights.png b/rtdata/images/themed/png/2/light/warning-highlights.png new file mode 100644 index 000000000..0645845d5 Binary files /dev/null and b/rtdata/images/themed/png/2/light/warning-highlights.png differ diff --git a/rtdata/images/themed/png/2/light/warning-shadows.png b/rtdata/images/themed/png/2/light/warning-shadows.png new file mode 100644 index 000000000..1ca2690d6 Binary files /dev/null and b/rtdata/images/themed/png/2/light/warning-shadows.png differ diff --git a/rtdata/images/themed/png/2/light/wavelets.png b/rtdata/images/themed/png/2/light/wavelets.png new file mode 100644 index 000000000..43af4a1aa Binary files /dev/null and b/rtdata/images/themed/png/2/light/wavelets.png differ diff --git a/rtdata/images/themed/png/2/light/wb-auto-small.png b/rtdata/images/themed/png/2/light/wb-auto-small.png new file mode 100644 index 000000000..e24d0b5bf Binary files /dev/null and b/rtdata/images/themed/png/2/light/wb-auto-small.png differ diff --git a/rtdata/images/themed/png/2/light/wb-auto.png b/rtdata/images/themed/png/2/light/wb-auto.png new file mode 100644 index 000000000..325cd1982 Binary files /dev/null and b/rtdata/images/themed/png/2/light/wb-auto.png differ diff --git a/rtdata/images/themed/png/2/light/wb-camera-small.png b/rtdata/images/themed/png/2/light/wb-camera-small.png new file mode 100644 index 000000000..c718f66ed Binary files /dev/null and b/rtdata/images/themed/png/2/light/wb-camera-small.png differ diff --git a/rtdata/images/themed/png/2/light/wb-camera.png b/rtdata/images/themed/png/2/light/wb-camera.png new file mode 100644 index 000000000..277ec15af Binary files /dev/null and b/rtdata/images/themed/png/2/light/wb-camera.png differ diff --git a/rtdata/images/themed/png/2/light/wb-cloudy-small.png b/rtdata/images/themed/png/2/light/wb-cloudy-small.png new file mode 100644 index 000000000..05af9bb0f Binary files /dev/null and b/rtdata/images/themed/png/2/light/wb-cloudy-small.png differ diff --git a/rtdata/images/themed/png/2/light/wb-cloudy.png b/rtdata/images/themed/png/2/light/wb-cloudy.png new file mode 100644 index 000000000..2176d4fed Binary files /dev/null and b/rtdata/images/themed/png/2/light/wb-cloudy.png differ diff --git a/rtdata/images/themed/png/2/light/wb-custom-small.png b/rtdata/images/themed/png/2/light/wb-custom-small.png new file mode 100644 index 000000000..343e0bb77 Binary files /dev/null and b/rtdata/images/themed/png/2/light/wb-custom-small.png differ diff --git a/rtdata/images/themed/png/2/light/wb-custom.png b/rtdata/images/themed/png/2/light/wb-custom.png new file mode 100644 index 000000000..e872d9120 Binary files /dev/null and b/rtdata/images/themed/png/2/light/wb-custom.png differ diff --git a/rtdata/images/themed/png/2/light/wb-flash-small.png b/rtdata/images/themed/png/2/light/wb-flash-small.png new file mode 100644 index 000000000..c2742aa50 Binary files /dev/null and b/rtdata/images/themed/png/2/light/wb-flash-small.png differ diff --git a/rtdata/images/themed/png/2/light/wb-flash.png b/rtdata/images/themed/png/2/light/wb-flash.png new file mode 100644 index 000000000..f76ac038d Binary files /dev/null and b/rtdata/images/themed/png/2/light/wb-flash.png differ diff --git a/rtdata/images/themed/png/2/light/wb-fluorescent-small.png b/rtdata/images/themed/png/2/light/wb-fluorescent-small.png new file mode 100644 index 000000000..916bb1131 Binary files /dev/null and b/rtdata/images/themed/png/2/light/wb-fluorescent-small.png differ diff --git a/rtdata/images/themed/png/2/light/wb-fluorescent.png b/rtdata/images/themed/png/2/light/wb-fluorescent.png new file mode 100644 index 000000000..8bf3ce919 Binary files /dev/null and b/rtdata/images/themed/png/2/light/wb-fluorescent.png differ diff --git a/rtdata/images/themed/png/2/light/wb-lamp-small.png b/rtdata/images/themed/png/2/light/wb-lamp-small.png new file mode 100644 index 000000000..0f165db05 Binary files /dev/null and b/rtdata/images/themed/png/2/light/wb-lamp-small.png differ diff --git a/rtdata/images/themed/png/2/light/wb-lamp.png b/rtdata/images/themed/png/2/light/wb-lamp.png new file mode 100644 index 000000000..a05c6c29c Binary files /dev/null and b/rtdata/images/themed/png/2/light/wb-lamp.png differ diff --git a/rtdata/images/themed/png/2/light/wb-led-small.png b/rtdata/images/themed/png/2/light/wb-led-small.png new file mode 100644 index 000000000..d9f73e0b7 Binary files /dev/null and b/rtdata/images/themed/png/2/light/wb-led-small.png differ diff --git a/rtdata/images/themed/png/2/light/wb-led.png b/rtdata/images/themed/png/2/light/wb-led.png new file mode 100644 index 000000000..b5b9156f1 Binary files /dev/null and b/rtdata/images/themed/png/2/light/wb-led.png differ diff --git a/rtdata/images/themed/png/2/light/wb-shade-small.png b/rtdata/images/themed/png/2/light/wb-shade-small.png new file mode 100644 index 000000000..6dd0112db Binary files /dev/null and b/rtdata/images/themed/png/2/light/wb-shade-small.png differ diff --git a/rtdata/images/themed/png/2/light/wb-shade.png b/rtdata/images/themed/png/2/light/wb-shade.png new file mode 100644 index 000000000..9a109cc2c Binary files /dev/null and b/rtdata/images/themed/png/2/light/wb-shade.png differ diff --git a/rtdata/images/themed/png/2/light/wb-sun-small.png b/rtdata/images/themed/png/2/light/wb-sun-small.png new file mode 100644 index 000000000..12acb06fb Binary files /dev/null and b/rtdata/images/themed/png/2/light/wb-sun-small.png differ diff --git a/rtdata/images/themed/png/2/light/wb-sun.png b/rtdata/images/themed/png/2/light/wb-sun.png new file mode 100644 index 000000000..99487a579 Binary files /dev/null and b/rtdata/images/themed/png/2/light/wb-sun.png differ diff --git a/rtdata/images/themed/png/2/light/wb-tungsten-small.png b/rtdata/images/themed/png/2/light/wb-tungsten-small.png new file mode 100644 index 000000000..6d44568ce Binary files /dev/null and b/rtdata/images/themed/png/2/light/wb-tungsten-small.png differ diff --git a/rtdata/images/themed/png/2/light/wb-tungsten.png b/rtdata/images/themed/png/2/light/wb-tungsten.png new file mode 100644 index 000000000..98ded526f Binary files /dev/null and b/rtdata/images/themed/png/2/light/wb-tungsten.png differ diff --git a/rtdata/images/themed/png/2/light/wb-water-small.png b/rtdata/images/themed/png/2/light/wb-water-small.png new file mode 100644 index 000000000..bb8d1f001 Binary files /dev/null and b/rtdata/images/themed/png/2/light/wb-water-small.png differ diff --git a/rtdata/images/themed/png/2/light/wb-water.png b/rtdata/images/themed/png/2/light/wb-water.png new file mode 100644 index 000000000..e946e7f18 Binary files /dev/null and b/rtdata/images/themed/png/2/light/wb-water.png differ diff --git a/rtdata/images/themed/png/2/light/window-add.png b/rtdata/images/themed/png/2/light/window-add.png new file mode 100644 index 000000000..4f5b38b1c Binary files /dev/null and b/rtdata/images/themed/png/2/light/window-add.png differ diff --git a/rtengine/fast_demo.cc b/rtengine/fast_demo.cc index cab38b1f2..f3a222044 100644 --- a/rtengine/fast_demo.cc +++ b/rtengine/fast_demo.cc @@ -77,10 +77,10 @@ void RawImageSource::fast_demosaic() #endif { - char (*buffer); - float (*greentile); - float (*redtile); - float (*bluetile); + char *buffer; + float *greentile; + float *redtile; + float *bluetile; #define CLF 1 // assign working space buffer = (char *) calloc(3 * sizeof(float) * TS * TS + 3 * CLF * 64 + 63, 1); diff --git a/rtengine/icons.cc b/rtengine/icons.cc index ccc5ebd09..660b805bf 100644 --- a/rtengine/icons.cc +++ b/rtengine/icons.cc @@ -2,7 +2,7 @@ * This file is part of RawTherapee. * * Copyright (c) 2004-2010 Gabor Horvath - * Copyright (c) 2011 Jean-Christophe FRISCH + * Copyright (c) 2018 Jean-Christophe FRISCH * * RawTherapee is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,62 +25,52 @@ namespace rtengine { -std::vector imagePaths; +Glib::ustring imagePath; +Glib::ustring imagePath1; +Glib::ustring imagePath2; -bool loadIconSet(const Glib::ustring& iconSet) +Glib::ustring findIconAbsolutePath (const Glib::ustring& iconName, double &dpi) { try { + double fallBackDPI = 0.; + Glib::ustring path; + Glib::ustring fallBackPath; - Glib::KeyFile keyFile; - keyFile.load_from_file (iconSet); - - auto iconSetDir = keyFile.get_string ("General", "Iconset"); - - if (!iconSetDir.empty ()) { - imagePaths.push_back (Glib::build_filename (argv0, "images", iconSetDir, "actions")); - imagePaths.push_back (Glib::build_filename (argv0, "images", iconSetDir)); - imagePaths.push_back (Glib::build_filename (argv0, "images", iconSetDir, "devices")); - imagePaths.push_back (Glib::build_filename (argv0, "images", iconSetDir, "places")); + if (dpi == 96.) { + path = imagePath1; + fallBackPath = imagePath2; + fallBackDPI = 192.; + } else { + path = imagePath2; + fallBackPath = imagePath1; + dpi = 192.; + fallBackDPI = 96.; } - iconSetDir = keyFile.get_string ("General", "FallbackIconset"); - - if (!iconSetDir.empty ()) { - imagePaths.push_back (Glib::build_filename (argv0, "images", iconSetDir, "actions")); - imagePaths.push_back (Glib::build_filename (argv0, "images", iconSetDir)); - imagePaths.push_back (Glib::build_filename (argv0, "images", iconSetDir, "devices")); - imagePaths.push_back (Glib::build_filename (argv0, "images", iconSetDir, "places")); - } - - return true; - - } catch (const Glib::Exception& exception) { - - if (options.rtSettings.verbose) { - std::cerr << "Failed to load icon set \"" << iconSet << "\": " << exception.what() << std::endl; - } - - return false; - - } -} - -Glib::ustring findIconAbsolutePath (const Glib::ustring& iconName) -{ - try { - - for (const auto& imagePath : imagePaths) { - const auto iconPath = Glib::build_filename(imagePath, iconName); + auto iconPath = Glib::build_filename(path, iconName); + if (Glib::file_test(iconPath, Glib::FILE_TEST_IS_REGULAR)) { + return iconPath; + } else { + // fallback solution + iconPath = Glib::build_filename(fallBackPath, iconName); if (Glib::file_test(iconPath, Glib::FILE_TEST_IS_REGULAR)) { + dpi = fallBackDPI; return iconPath; + } else { + // second fallback solution: icon not resolution dependent + iconPath = Glib::build_filename(imagePath, iconName); + if (Glib::file_test(iconPath, Glib::FILE_TEST_IS_REGULAR)) { + dpi = -1; + return iconPath; + } } } } catch(const Glib::Exception&) {} if (options.rtSettings.verbose) { - std::cerr << "Icon \"" << iconName << "\" could not be found!" << std::endl; + std::cerr << "Icon \"" << iconName << "\" (" << dpi << " dpi) could not be found!" << std::endl; } return Glib::ustring(); @@ -106,12 +96,11 @@ void setPaths () loadIconSet (Glib::build_filename (argv0, "themes", "Default.iconset")); }*/ - imagePaths.clear (); - - imagePaths.push_back (Glib::build_filename(argv0, "images", "dark")); + imagePath1 = Glib::build_filename(argv0, "images", "1", "dark"); + imagePath2 = Glib::build_filename(argv0, "images", "2", "dark"); // The images folder is the second fallback solution. - imagePaths.push_back (Glib::build_filename(argv0, "images")); + imagePath = Glib::build_filename(argv0, "images"); } } diff --git a/rtengine/icons.h b/rtengine/icons.h index a890555b2..d8572efca 100644 --- a/rtengine/icons.h +++ b/rtengine/icons.h @@ -2,6 +2,7 @@ * This file is part of RawTherapee. * * Copyright (c) 2004-2010 Gabor Horvath + * Copyright (c) 2018 Jean-Christophe FRISCH * * RawTherapee is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,7 +26,13 @@ namespace rtengine { -Glib::ustring findIconAbsolutePath (const Glib::ustring& iconName); +/** + * @brief Find the absolute path for an icon name of the desired DPI. + * + * @return the absolute path to the icon file + * @return deiredDPI is updated to another DPI if the desired one wasn't found but a fallback solution exist, or -1 if the icon is not resolution dependent + */ +Glib::ustring findIconAbsolutePath (const Glib::ustring& iconName, double &dpi); void setPaths (); } diff --git a/rtgui/CMakeLists.txt b/rtgui/CMakeLists.txt index 8150fbce3..5ee6a14a0 100644 --- a/rtgui/CMakeLists.txt +++ b/rtgui/CMakeLists.txt @@ -120,6 +120,8 @@ set(NONCLISOURCEFILES rgbcurves.cc rotate.cc rtimage.cc + rtsurface.cc + rtscalable.cc rtwindow.cc saveasdlg.cc saveformatpanel.cc @@ -240,6 +242,10 @@ add_executable(rth-cli ${EXTRA_SRC_CLI} ${CLISOURCEFILES}) add_dependencies(rth UpdateInfo) add_dependencies(rth-cli UpdateInfo) +#Define a target specific definition to use in code +target_compile_definitions(rth PUBLIC GUIVERSION) +target_compile_definitions(rth-cli PUBLIC CLIVERSION) + # Set executables targets properties, i.e. output filename and compile flags # for "Debug" builds, open a console in all cases for Windows version if((WIN32) AND NOT(UPPER_CMAKE_BUILD_TYPE STREQUAL "DEBUG")) diff --git a/rtgui/batchqueuebuttonset.cc b/rtgui/batchqueuebuttonset.cc index 19c309791..f5be480e8 100644 --- a/rtgui/batchqueuebuttonset.cc +++ b/rtgui/batchqueuebuttonset.cc @@ -23,17 +23,17 @@ bool BatchQueueButtonSet::iconsLoaded = false; -Cairo::RefPtr BatchQueueButtonSet::cancelIcon; -Cairo::RefPtr BatchQueueButtonSet::headIcon; -Cairo::RefPtr BatchQueueButtonSet::tailIcon; +Cairo::RefPtr BatchQueueButtonSet::cancelIcon; +Cairo::RefPtr BatchQueueButtonSet::headIcon; +Cairo::RefPtr BatchQueueButtonSet::tailIcon; BatchQueueButtonSet::BatchQueueButtonSet (BatchQueueEntry* myEntry) { if (!iconsLoaded) { - cancelIcon = RTImage::createFromPng ("cancel-small.png"); - headIcon = RTImage::createFromPng ("goto-start-small.png"); - tailIcon = RTImage::createFromPng ("goto-end-small.png"); + cancelIcon = Cairo::RefPtr(new RTSurface("cancel-small.png")); + headIcon = Cairo::RefPtr(new RTSurface("goto-start-small.png")); + tailIcon = Cairo::RefPtr(new RTSurface("goto-end-small.png")); iconsLoaded = true; } diff --git a/rtgui/batchqueuebuttonset.h b/rtgui/batchqueuebuttonset.h index bef125bb6..66dab91a1 100644 --- a/rtgui/batchqueuebuttonset.h +++ b/rtgui/batchqueuebuttonset.h @@ -20,6 +20,7 @@ #define _BATCHQUEUEBUTTONSET_ #include "lwbuttonset.h" +#include "rtsurface.h" #include class BatchQueueEntry; @@ -29,9 +30,9 @@ class BatchQueueButtonSet : public LWButtonSet static bool iconsLoaded; public: - static Cairo::RefPtr cancelIcon; - static Cairo::RefPtr headIcon; - static Cairo::RefPtr tailIcon; + static Cairo::RefPtr cancelIcon; + static Cairo::RefPtr headIcon; + static Cairo::RefPtr tailIcon; explicit BatchQueueButtonSet (BatchQueueEntry* myEntry); }; diff --git a/rtgui/batchqueueentry.cc b/rtgui/batchqueueentry.cc index b5383205f..fb65e0324 100644 --- a/rtgui/batchqueueentry.cc +++ b/rtgui/batchqueueentry.cc @@ -27,7 +27,7 @@ #include "thumbbrowserbase.h" bool BatchQueueEntry::iconsLoaded(false); -Glib::RefPtr BatchQueueEntry::savedAsIcon; +Cairo::RefPtr BatchQueueEntry::savedAsIcon; BatchQueueEntry::BatchQueueEntry (rtengine::ProcessingJob* pjob, const rtengine::procparams::ProcParams& pparams, Glib::ustring fname, int prevw, int prevh, Thumbnail* thm) : ThumbBrowserEntryBase(fname), @@ -145,10 +145,10 @@ void BatchQueueEntry::removeButtonSet () buttonSet = nullptr; } -std::vector > BatchQueueEntry::getIconsOnImageArea () +std::vector > BatchQueueEntry::getIconsOnImageArea () { - std::vector > ret; + std::vector > ret; if (!outFileName.empty()) { ret.push_back (savedAsIcon); diff --git a/rtgui/batchqueueentry.h b/rtgui/batchqueueentry.h index caf1b8eff..3d6618256 100644 --- a/rtgui/batchqueueentry.h +++ b/rtgui/batchqueueentry.h @@ -43,7 +43,7 @@ class BatchQueueEntry : public ThumbBrowserEntryBase, public BQEntryUpdateListen public: - static Glib::RefPtr savedAsIcon; + static Cairo::RefPtr savedAsIcon; rtengine::ProcessingJob* job; rtengine::procparams::ProcParams params; @@ -65,7 +65,7 @@ public: void removeButtonSet (); - virtual std::vector > getIconsOnImageArea (); + virtual std::vector > getIconsOnImageArea (); virtual void getIconSize (int& w, int& h); virtual Glib::ustring getToolTip (int x, int y); diff --git a/rtgui/cropwindow.cc b/rtgui/cropwindow.cc index 69d7a98b4..790f5c294 100644 --- a/rtgui/cropwindow.cc +++ b/rtgui/cropwindow.cc @@ -57,11 +57,11 @@ CropWindow::CropWindow (ImageArea* parent, bool isLowUpdatePriority_, bool isDet titleHeight = ih; - bZoomOut = new LWButton (RTImage::createFromPng ("magnifier-minus-small.png"), 0, nullptr, LWButton::Left, LWButton::Center, "Zoom Out"); - bZoomIn = new LWButton (RTImage::createFromPng ("magnifier-plus-small.png"), 1, nullptr, LWButton::Left, LWButton::Center, "Zoom In"); - bZoom100 = new LWButton (RTImage::createFromPng ("magnifier-1to1-small.png"), 2, nullptr, LWButton::Left, LWButton::Center, "Zoom 100/%"); - //bZoomFit = new LWButton (RTImage::createFromPng ("magnifier-fit.png"), 3, NULL, LWButton::Left, LWButton::Center, "Zoom Fit"); - bClose = new LWButton (RTImage::createFromPng ("cancel-small.png"), 4, nullptr, LWButton::Right, LWButton::Center, "Close"); + bZoomOut = new LWButton (Cairo::RefPtr(new RTSurface("magnifier-minus-small.png")), 0, nullptr, LWButton::Left, LWButton::Center, "Zoom Out"); + bZoomIn = new LWButton (Cairo::RefPtr(new RTSurface("magnifier-plus-small.png")), 1, nullptr, LWButton::Left, LWButton::Center, "Zoom In"); + bZoom100 = new LWButton (Cairo::RefPtr(new RTSurface("magnifier-1to1-small.png")), 2, nullptr, LWButton::Left, LWButton::Center, "Zoom 100/%"); + //bZoomFit = new LWButton (Cairo::RefPtr(new RTSurface("magnifier-fit.png")), 3, NULL, LWButton::Left, LWButton::Center, "Zoom Fit"); + bClose = new LWButton (Cairo::RefPtr(new RTSurface("cancel-small.png")), 4, nullptr, LWButton::Right, LWButton::Center, "Close"); buttonSet.add (bZoomOut); buttonSet.add (bZoomIn); @@ -2372,7 +2372,7 @@ void CropWindow::drawDecoration (Cairo::RefPtr cr) // draw label cr->set_source_rgba (1, 1, 1, 0.5); - cr->move_to (x + 10 + sideBorderWidth + bZoomIn->getIcon()->get_width() + bZoomOut->getIcon()->get_width() + bZoom100->getIcon()->get_width(), y + 1 + upperBorderWidth + (titleHeight - ih) / 2); + cr->move_to (x + 10 + sideBorderWidth + bZoomIn->getIcon()->getWidth() + bZoomOut->getIcon()->getWidth() + bZoom100->getIcon()->getWidth(), y + 1 + upperBorderWidth + (titleHeight - ih) / 2); cllayout->add_to_cairo_context (cr); cr->fill (); diff --git a/rtgui/cursormanager.cc b/rtgui/cursormanager.cc index 34efbcac8..d614634d5 100644 --- a/rtgui/cursormanager.cc +++ b/rtgui/cursormanager.cc @@ -36,25 +36,25 @@ void CursorManager::init (Glib::RefPtr mainWindow) #endif - Glib::RefPtr add = RTImage::createFromFile("crosshair-small.png"); - Glib::RefPtr colPick = RTImage::createFromFile("color-picker-hicontrast.png"); - Glib::RefPtr colPickAdd = RTImage::createFromFile("color-picker-add-hicontrast.png"); - Glib::RefPtr cropDraw = RTImage::createFromFile("crop-point-hicontrast.png"); - Glib::RefPtr crosshair = RTImage::createFromFile("crosshair-hicontrast.png"); - Glib::RefPtr empty = RTImage::createFromFile("empty.png"); - Glib::RefPtr handClosed = RTImage::createFromFile("hand-closed-hicontrast.png"); - Glib::RefPtr handOpen = RTImage::createFromFile("hand-open-hicontrast.png"); - Glib::RefPtr moveBL = RTImage::createFromFile("node-move-sw-ne-hicontrast.png"); - Glib::RefPtr moveBR = RTImage::createFromFile("node-move-nw-se-hicontrast.png"); - Glib::RefPtr moveL = RTImage::createFromFile("node-move-x-hicontrast.png"); - Glib::RefPtr moveR = RTImage::createFromFile("node-move-x-hicontrast.png"); - Glib::RefPtr moveTL = RTImage::createFromFile("node-move-nw-se-hicontrast.png"); - Glib::RefPtr moveTR = RTImage::createFromFile("node-move-sw-ne-hicontrast.png"); - Glib::RefPtr moveX = RTImage::createFromFile("node-move-x-hicontrast.png"); - Glib::RefPtr moveXY = RTImage::createFromFile("node-move-xy-hicontrast.png"); - Glib::RefPtr moveY = RTImage::createFromFile("node-move-y-hicontrast.png"); - Glib::RefPtr rotate = RTImage::createFromFile("rotate-aroundnode-hicontrast.png"); - Glib::RefPtr wait = RTImage::createFromFile("gears.png"); // Currently unused, create *-hicontrast once used. + Cairo::RefPtr add = RTImage::createFromFile("crosshair-small.png"); + Cairo::RefPtr colPick = RTImage::createFromFile("color-picker-hicontrast.png"); + Cairo::RefPtr colPickAdd = RTImage::createFromFile("color-picker-add-hicontrast.png"); + Cairo::RefPtr cropDraw = RTImage::createFromFile("crop-point-hicontrast.png"); + Cairo::RefPtr crosshair = RTImage::createFromFile("crosshair-hicontrast.png"); + Cairo::RefPtr empty = RTImage::createFromFile("empty.png"); + Cairo::RefPtr handClosed = RTImage::createFromFile("hand-closed-hicontrast.png"); + Cairo::RefPtr handOpen = RTImage::createFromFile("hand-open-hicontrast.png"); + Cairo::RefPtr moveBL = RTImage::createFromFile("node-move-sw-ne-hicontrast.png"); + Cairo::RefPtr moveBR = RTImage::createFromFile("node-move-nw-se-hicontrast.png"); + Cairo::RefPtr moveL = RTImage::createFromFile("node-move-x-hicontrast.png"); + Cairo::RefPtr moveR = RTImage::createFromFile("node-move-x-hicontrast.png"); + Cairo::RefPtr moveTL = RTImage::createFromFile("node-move-nw-se-hicontrast.png"); + Cairo::RefPtr moveTR = RTImage::createFromFile("node-move-sw-ne-hicontrast.png"); + Cairo::RefPtr moveX = RTImage::createFromFile("node-move-x-hicontrast.png"); + Cairo::RefPtr moveXY = RTImage::createFromFile("node-move-xy-hicontrast.png"); + Cairo::RefPtr moveY = RTImage::createFromFile("node-move-y-hicontrast.png"); + Cairo::RefPtr rotate = RTImage::createFromFile("rotate-aroundnode-hicontrast.png"); + Cairo::RefPtr wait = RTImage::createFromFile("gears.png"); // Currently unused, create *-hicontrast once used. cAdd = add ? Gdk::Cursor::create(display, add, 8, 8) : Gdk::Cursor::create(display, Gdk::PLUS); cAddPicker = colPickAdd ? Gdk::Cursor::create(display, colPickAdd, 4, 21) : Gdk::Cursor::create(display, Gdk::PLUS); diff --git a/rtgui/dirbrowser.cc b/rtgui/dirbrowser.cc index 501296860..1077d919f 100644 --- a/rtgui/dirbrowser.cc +++ b/rtgui/dirbrowser.cc @@ -121,13 +121,20 @@ DirBrowser::~DirBrowser() void DirBrowser::fillDirTree () { - openfolder = RTImage::createFromFile ("folder-open-small.png"); - closedfolder = RTImage::createFromFile ("folder-closed-small.png"); - icdrom = RTImage::createFromFile ("device-optical.png"); - ifloppy = RTImage::createFromFile ("device-floppy.png"); - ihdd = RTImage::createFromFile ("device-hdd.png"); - iremovable = RTImage::createFromFile ("device-usb.png"); - inetwork = RTImage::createFromFile ("device-network.png"); + Cairo::RefPtr openfolder_ = RTImage::createFromFile ("folder-open-small.png"); + openfolder = Gdk::Pixbuf::create(openfolder_, 0, 0, openfolder_->get_width(), openfolder_->get_height()); + Cairo::RefPtr closedfolder_ = RTImage::createFromFile ("folder-open-small.png"); + closedfolder = Gdk::Pixbuf::create(closedfolder_, 0, 0, closedfolder_->get_width(), closedfolder_->get_height()); + Cairo::RefPtr icdrom_ = RTImage::createFromFile ("folder-open-small.png"); + icdrom = Gdk::Pixbuf::create(icdrom_, 0, 0, icdrom_->get_width(), icdrom_->get_height()); + Cairo::RefPtr ifloppy_ = RTImage::createFromFile ("folder-open-small.png"); + ifloppy = Gdk::Pixbuf::create(ifloppy_, 0, 0, ifloppy_->get_width(), ifloppy_->get_height()); + Cairo::RefPtr ihdd_ = RTImage::createFromFile ("folder-open-small.png"); + ihdd = Gdk::Pixbuf::create(ihdd_, 0, 0, ihdd_->get_width(), ihdd_->get_height()); + Cairo::RefPtr iremovable_ = RTImage::createFromFile ("folder-open-small.png"); + iremovable = Gdk::Pixbuf::create(iremovable_, 0, 0, iremovable_->get_width(), iremovable_->get_height()); + Cairo::RefPtr inetwork_ = RTImage::createFromFile ("folder-open-small.png"); + inetwork = Gdk::Pixbuf::create(inetwork_, 0, 0, inetwork_->get_width(), inetwork_->get_height()); //Create the Tree model: dirTreeModel = Gtk::TreeStore::create(dtColumns); diff --git a/rtgui/edit.cc b/rtgui/edit.cc index e68fec15c..c7b1ca937 100644 --- a/rtgui/edit.cc +++ b/rtgui/edit.cc @@ -166,6 +166,8 @@ RGBColor Geometry::getOuterLineColor () return color; } +#ifdef GUIVERSION + void Circle::drawOuterGeometry(Cairo::RefPtr &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem) { if ((flags & F_VISIBLE) && state != INSENSITIVE) { @@ -801,11 +803,11 @@ void OPIcon::drivenPointToRectangle(const rtengine::Coord &pos, bottomRight.y = topLeft.y + H - 1; } -OPIcon::OPIcon(const Cairo::RefPtr &normal, - const Cairo::RefPtr &active, - const Cairo::RefPtr &prelight, - const Cairo::RefPtr &dragged, - const Cairo::RefPtr &insensitive, +OPIcon::OPIcon(const Cairo::RefPtr &normal, + const Cairo::RefPtr &active, + const Cairo::RefPtr &prelight, + const Cairo::RefPtr &dragged, + const Cairo::RefPtr &insensitive, DrivenPoint drivenPoint) : drivenPoint(drivenPoint) { @@ -834,53 +836,53 @@ OPIcon::OPIcon(Glib::ustring normalImage, Glib::ustring activeImage, Glib::ustri Glib::ustring draggedImage, Glib::ustring insensitiveImage, DrivenPoint drivenPoint) : drivenPoint(drivenPoint) { if (!normalImage.empty()) { - normalImg = Cairo::ImageSurface::create_from_png( rtengine::findIconAbsolutePath(normalImage) ); + normalImg->setImage(normalImage); } if (!prelightImage.empty()) { - prelightImg = Cairo::ImageSurface::create_from_png( rtengine::findIconAbsolutePath(prelightImage) ); + prelightImg->setImage(prelightImage); } if (!activeImage.empty()) { - activeImg = Cairo::ImageSurface::create_from_png( rtengine::findIconAbsolutePath(activeImage) ); + activeImg->setImage(activeImage); } if (!draggedImage.empty()) { - draggedImg = Cairo::ImageSurface::create_from_png( rtengine::findIconAbsolutePath(draggedImage) ); + draggedImg->setImage(draggedImage); } if (!insensitiveImage.empty()) { - insensitiveImg = Cairo::ImageSurface::create_from_png( rtengine::findIconAbsolutePath(insensitiveImage) ); + insensitiveImg->setImage(insensitiveImage); } } -const Cairo::RefPtr OPIcon::getNormalImg() +const Cairo::RefPtr OPIcon::getNormalImg() { return normalImg; } -const Cairo::RefPtr OPIcon::getPrelightImg() +const Cairo::RefPtr OPIcon::getPrelightImg() { return prelightImg; } -const Cairo::RefPtr OPIcon::getActiveImg() +const Cairo::RefPtr OPIcon::getActiveImg() { return activeImg; } -const Cairo::RefPtr OPIcon::getDraggedImg() +const Cairo::RefPtr OPIcon::getDraggedImg() { return draggedImg; } -const Cairo::RefPtr OPIcon::getInsensitiveImg() +const Cairo::RefPtr OPIcon::getInsensitiveImg() { return insensitiveImg; } -void OPIcon::drawImage(const Cairo::RefPtr &img, +void OPIcon::drawImage(Cairo::RefPtr &img, Cairo::RefPtr &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem) { - int imgW = img->get_width(); - int imgH = img->get_height(); + int imgW = img->getWidth(); + int imgH = img->getHeight(); rtengine::Coord pos; @@ -895,19 +897,19 @@ void OPIcon::drawImage(const Cairo::RefPtr &img, rtengine::Coord tl, br; // Coordinate of the rectangle in the CropBuffer coordinate system drivenPointToRectangle(pos, tl, br, imgW, imgH); - cr->set_source(img, tl.x, tl.y); + cr->set_source(img->surface, tl.x, tl.y); cr->set_line_width(0.); cr->rectangle(tl.x, tl.y, imgW, imgH); cr->fill(); } -void OPIcon::drawMOImage(const Cairo::RefPtr &img, Cairo::RefPtr &cr, +void OPIcon::drawMOImage(Cairo::RefPtr &img, Cairo::RefPtr &cr, unsigned short id, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem) { // test of F_HOVERABLE has already been done - int imgW = img->get_width(); - int imgH = img->get_height(); + int imgW = img->getWidth(); + int imgH = img->getHeight(); rtengine::Coord pos; @@ -1035,6 +1037,8 @@ void OPIcon::drawToMOChannel(Cairo::RefPtr &cr, unsigned short i } } +#endif + EditSubscriber::EditSubscriber (EditType editType) : ID(EUID_None), editingType(editType), bufferType(BT_SINGLEPLANE_FLOAT), provider(nullptr), action(ES_ACTION_NONE) {} void EditSubscriber::setEditProvider(EditDataProvider *provider) diff --git a/rtgui/edit.h b/rtgui/edit.h index 611d95e1c..f7c4f7292 100644 --- a/rtgui/edit.h +++ b/rtgui/edit.h @@ -16,9 +16,7 @@ * You should have received a copy of the GNU General Public License * along with RawTherapee. If not, see . */ -#ifndef _EDIT_H_ -#define _EDIT_H_ - +#pragma once #include #include "../rtengine/imagefloat.h" #include "editid.h" @@ -28,6 +26,10 @@ #include "guiutils.h" #include "options.h" +#ifdef GUIVERSION +#include "rtsurface.h" +#endif + class EditDataProvider; class EditSubscriber; @@ -336,6 +338,8 @@ public: virtual void drawToMOChannel (Cairo::RefPtr &cr, unsigned short id, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem) = 0; }; +#ifdef GUIVERSION + class Circle : public Geometry { public: @@ -403,34 +407,34 @@ class OPIcon : public Geometry // OP stands for "On Preview" { private: - Cairo::RefPtr normalImg; - Cairo::RefPtr prelightImg; - Cairo::RefPtr activeImg; - Cairo::RefPtr draggedImg; - Cairo::RefPtr insensitiveImg; + Cairo::RefPtr normalImg; + Cairo::RefPtr prelightImg; + Cairo::RefPtr activeImg; + Cairo::RefPtr draggedImg; + Cairo::RefPtr insensitiveImg; static void updateImages(); void changeImage(Glib::ustring &newImage); - void drawImage (const Cairo::RefPtr &img, Cairo::RefPtr &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem); - void drawMOImage (const Cairo::RefPtr &img, Cairo::RefPtr &cr, unsigned short id, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem); + void drawImage (Cairo::RefPtr &img, Cairo::RefPtr &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem); + void drawMOImage (Cairo::RefPtr &img, Cairo::RefPtr &cr, unsigned short id, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem); void drivenPointToRectangle(const rtengine::Coord &pos, rtengine::Coord &topLeft, rtengine::Coord &bottomRight, int W, int H); public: DrivenPoint drivenPoint; rtengine::Coord position; - OPIcon (const Cairo::RefPtr &normal, - const Cairo::RefPtr &active, - const Cairo::RefPtr &prelight = {}, - const Cairo::RefPtr &dragged = {}, - const Cairo::RefPtr &insensitive = {}, + OPIcon (const Cairo::RefPtr &normal, + const Cairo::RefPtr &active, + const Cairo::RefPtr &prelight = {}, + const Cairo::RefPtr &dragged = {}, + const Cairo::RefPtr &insensitive = {}, DrivenPoint drivenPoint = DP_CENTERCENTER); OPIcon (Glib::ustring normalImage, Glib::ustring activeImage, Glib::ustring prelightImage = "", Glib::ustring draggedImage = "", Glib::ustring insensitiveImage = "", DrivenPoint drivenPoint = DP_CENTERCENTER); - const Cairo::RefPtr getNormalImg(); - const Cairo::RefPtr getPrelightImg(); - const Cairo::RefPtr getActiveImg(); - const Cairo::RefPtr getDraggedImg(); - const Cairo::RefPtr getInsensitiveImg(); + const Cairo::RefPtr getNormalImg(); + const Cairo::RefPtr getPrelightImg(); + const Cairo::RefPtr getActiveImg(); + const Cairo::RefPtr getDraggedImg(); + const Cairo::RefPtr getInsensitiveImg(); void drawOuterGeometry (Cairo::RefPtr &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem); void drawInnerGeometry (Cairo::RefPtr &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem); void drawToMOChannel (Cairo::RefPtr &cr, unsigned short id, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem); @@ -441,6 +445,8 @@ class OPAdjuster : public Geometry // OP stands for "On Preview" }; +#endif + /// @brief Method for client tools needing Edit information class EditSubscriber { @@ -791,23 +797,6 @@ inline Geometry::Geometry () : IMAGE), state (NORMAL) { } -inline Circle::Circle () : - center (100, 100), radius (10), filled (false), radiusInImageSpace ( - false) { -} - -inline Rectangle::Rectangle () : - topLeft (0, 0), bottomRight (10, 10), filled (false) { -} - -inline Polyline::Polyline () : - filled (false) { -} - -inline Line::Line () : - begin (10, 10), end (100, 100) { -} - inline RGBAColor::RGBAColor () : RGBColor (0., 0., 0.), a (0.) { } @@ -832,6 +821,25 @@ inline RGBAColor::RGBAColor (char r, char g, char b, char a) : RGBColor (r, g, b), a (double (a) / 255.) { } +#ifdef GUIVERSION + +inline Circle::Circle () : + center (100, 100), radius (10), filled (false), radiusInImageSpace ( + false) { +} + +inline Rectangle::Rectangle () : + topLeft (0, 0), bottomRight (10, 10), filled (false) { +} + +inline Polyline::Polyline () : + filled (false) { +} + +inline Line::Line () : + begin (10, 10), end (100, 100) { +} + inline Circle::Circle (rtengine::Coord& center, int radius, bool filled, bool radiusInImageSpace) : center (center), radius (radius), filled (filled), radiusInImageSpace ( diff --git a/rtgui/editwindow.cc b/rtgui/editwindow.cc index a5592e6da..b93d7eede 100644 --- a/rtgui/editwindow.cc +++ b/rtgui/editwindow.cc @@ -50,18 +50,11 @@ EditWindow* EditWindow::getInstance(RTWindow* p, bool restore) return &instance_.editWnd; } -EditWindow::EditWindow (RTWindow* p) : parent(p) , isFullscreen(false), isClosed(true) +EditWindow::EditWindow (RTWindow* p) : resolution(96.), parent(p) , isFullscreen(false), isClosed(true) { - Glib::ustring fName = "rawtherapee-logo-24.png"; - Glib::ustring fullPath = rtengine::findIconAbsolutePath(fName); - - try { - set_default_icon_from_file (fullPath); - } catch(Glib::Exception& ex) { - printf ("%s\n", ex.what().c_str()); - } - + updateResolution(); + setAppIcon(); set_title_decorated(""); set_modal(false); set_resizable(true); @@ -128,8 +121,59 @@ void EditWindow::on_realize () editWindowCursorManager.init (get_window()); } +bool EditWindow::updateResolution() +{ + int scale = get_scale_factor(); + double res = get_screen()->get_resolution(); + if (scale == 2) { + // from Windows' behavior : if scale==2, resolution = 192. (Gtk shows 96 dpi !?), there's no higher value + res = 192.; + } + bool retVal = res != resolution; + resolution = res; + return retVal; +} + +void EditWindow::setAppIcon() +{ + Glib::ustring fName; + bool downsize = false; + // findIconAbsolutePath won't be able to select the image based on resolution with the + // storage of the images, we're doing the selection here + if (resolution == 96.) { + fName = "rawtherapee-logo-24.png"; + } else { + fName = "rawtherapee-logo-48.png"; + if (resolution < 192.) { + downsize = true; + } + } + double resolution2 = resolution; + Glib::ustring fullPath = rtengine::findIconAbsolutePath(fName, resolution2); + if (!fullPath.empty()) { + const Glib::RefPtr pixbuf = Gdk::Pixbuf::create_from_file(fullPath); + if (!pixbuf) { + return; + } + if (downsize) { + int size = int((48. * resolution) / 192.); + pixbuf->scale_simple(size, size, Gdk::InterpType::INTERP_BILINEAR); + } + + try { + set_default_icon(pixbuf); + } catch(Glib::Exception& ex) { + printf ("%s\n", ex.what().c_str()); + } + } +} + bool EditWindow::on_configure_event(GdkEventConfigure* event) { + if (updateResolution()) { + setAppIcon(); + } + if (get_realized() && is_visible()) { if(!is_maximized()) { get_position(options.meowX, options.meowY); @@ -142,7 +186,7 @@ bool EditWindow::on_configure_event(GdkEventConfigure* event) } /* HOMBRE: Disabling this since it's maximized when opened anyway. - * Someday, the EditorWindow migh save it own position and state, so it'll have to be uncommented + * Someday, the EditorWindow might save its own position and state, so it'll have to be uncommented bool EditWindow::on_window_state_event(GdkEventWindowState* event) { if (event->changed_mask & GDK_WINDOW_STATE_MAXIMIZED) { diff --git a/rtgui/editwindow.h b/rtgui/editwindow.h index 8cf93dbf8..3c13936f5 100644 --- a/rtgui/editwindow.h +++ b/rtgui/editwindow.h @@ -26,7 +26,9 @@ class EditWindow : public Gtk::Window { private: + double resolution; RTWindow* parent; + RTImage appIcon; Gtk::Notebook* mainNB; std::set filesEdited; @@ -36,6 +38,11 @@ private: bool isClosed; void toggleFullscreen (); void restoreWindow(); + bool updateResolution(); + void setAppIcon(); + bool on_configure_event(GdkEventConfigure* event); + bool on_delete_event(GdkEventAny* event); + void on_realize (); public: // Check if the system has more than one display and option is set @@ -55,12 +62,9 @@ public: void toFront(); bool keyPressed (GdkEventKey* event); - bool on_configure_event(GdkEventConfigure* event); - bool on_delete_event(GdkEventAny* event); //bool on_window_state_event(GdkEventWindowState* event); void on_mainNB_switch_page(Gtk::Widget* page, guint page_num); void set_title_decorated(Glib::ustring fname); - void on_realize (); }; #endif diff --git a/rtgui/exifpanel.cc b/rtgui/exifpanel.cc index fa362a351..42cbba0a5 100644 --- a/rtgui/exifpanel.cc +++ b/rtgui/exifpanel.cc @@ -48,9 +48,12 @@ ExifPanel::ExifPanel () : idata (nullptr) exifTree->set_grid_lines (Gtk::TREE_VIEW_GRID_LINES_NONE); exifTree->set_row_separator_func (sigc::mem_fun(*this, &ExifPanel::rowSeperatorFunc)); - delicon = RTImage::createFromFile ("cancel-small.png"); - keepicon = RTImage::createFromFile ("tick-small.png"); - editicon = RTImage::createFromFile ("add-small.png"); + Cairo::RefPtr delicon_ = RTImage::createFromFile ("cancel-small.png"); + delicon = Gdk::Pixbuf::create(delicon_, 0, 0, delicon_->get_width(), delicon_->get_height()); + Cairo::RefPtr keepicon_ = RTImage::createFromFile ("tick-small.png"); + keepicon = Gdk::Pixbuf::create(keepicon_, 0, 0, keepicon_->get_width(), keepicon_->get_height()); + Cairo::RefPtr editicon_ = RTImage::createFromFile ("add-small.png"); + editicon = Gdk::Pixbuf::create(editicon_, 0, 0, editicon_->get_width(), editicon_->get_height()); Gtk::TreeView::Column *viewcol = Gtk::manage (new Gtk::TreeView::Column ("Field Name")); Gtk::CellRendererPixbuf* render_pb = Gtk::manage (new Gtk::CellRendererPixbuf ()); @@ -100,21 +103,21 @@ ExifPanel::ExifPanel () : idata (nullptr) setExpandAlignProperties (buttons2, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER); remove = Gtk::manage (new Gtk::Button ()); // M("EXIFPANEL_REMOVE") - remove->set_image (*Gtk::manage (new Gtk::Image (delicon))); + remove->set_image (*Gtk::manage (new RTImage(delicon))); remove->set_tooltip_text (M ("EXIFPANEL_REMOVEHINT")); remove->get_style_context()->add_class ("Left"); setExpandAlignProperties (remove, true, true, Gtk::ALIGN_FILL, Gtk::ALIGN_FILL); buttons1->attach_next_to (*remove, Gtk::POS_LEFT, 1, 1); keep = Gtk::manage (new Gtk::Button ()); // M("EXIFPANEL_KEEP") - keep->set_image (*Gtk::manage (new Gtk::Image (keepicon))); + keep->set_image (*Gtk::manage (new RTImage(keepicon))); keep->set_tooltip_text (M ("EXIFPANEL_KEEPHINT")); keep->get_style_context()->add_class ("MiddleH"); setExpandAlignProperties (keep, true, true, Gtk::ALIGN_FILL, Gtk::ALIGN_FILL); buttons1->attach_next_to (*keep, Gtk::POS_RIGHT, 1, 1); add = Gtk::manage (new Gtk::Button ()); // M("EXIFPANEL_ADDEDIT") - add->set_image (*Gtk::manage (new Gtk::Image (editicon))); + add->set_image (*Gtk::manage (new RTImage(editicon))); add->set_tooltip_text (M ("EXIFPANEL_ADDEDITHINT")); add->get_style_context()->add_class ("Right"); setExpandAlignProperties (add, true, true, Gtk::ALIGN_FILL, Gtk::ALIGN_FILL); @@ -128,7 +131,7 @@ ExifPanel::ExifPanel () : idata (nullptr) buttons2->attach_next_to (*showAll, Gtk::POS_LEFT, 1, 1); reset = Gtk::manage (new Gtk::Button ()); // M("EXIFPANEL_RESET") - reset->set_image (*Gtk::manage (new RTImage ("undo.png", "redo.png"))); + reset->set_image (*Gtk::manage (new RTImage("undo.png", "redo.png"))); reset->set_tooltip_text (M ("EXIFPANEL_RESETHINT")); reset->get_style_context()->add_class ("MiddleH"); setExpandAlignProperties (reset, true, true, Gtk::ALIGN_FILL, Gtk::ALIGN_FILL); diff --git a/rtgui/exifpanel.h b/rtgui/exifpanel.h index 5121eff4f..fbaed22f9 100644 --- a/rtgui/exifpanel.h +++ b/rtgui/exifpanel.h @@ -59,9 +59,9 @@ private: add (isSeparator); } }; - Glib::RefPtr delicon; - Glib::RefPtr keepicon; - Glib::RefPtr editicon; + Glib::RefPtr delicon; + Glib::RefPtr keepicon; + Glib::RefPtr editicon; ExifColumns exifColumns; Gtk::TreeView* exifTree; diff --git a/rtgui/filebrowserentry.cc b/rtgui/filebrowserentry.cc index 71e6aef24..4056d6805 100644 --- a/rtgui/filebrowserentry.cc +++ b/rtgui/filebrowserentry.cc @@ -33,11 +33,11 @@ //extern Glib::Threads::Thread* mainThread; bool FileBrowserEntry::iconsLoaded(false); -Glib::RefPtr FileBrowserEntry::editedIcon; -Glib::RefPtr FileBrowserEntry::recentlySavedIcon; -Glib::RefPtr FileBrowserEntry::enqueuedIcon; -Glib::RefPtr FileBrowserEntry::hdr; -Glib::RefPtr FileBrowserEntry::ps; +Cairo::RefPtr FileBrowserEntry::editedIcon; +Cairo::RefPtr FileBrowserEntry::recentlySavedIcon; +Cairo::RefPtr FileBrowserEntry::enqueuedIcon; +Cairo::RefPtr FileBrowserEntry::hdr; +Cairo::RefPtr FileBrowserEntry::ps; FileBrowserEntry::FileBrowserEntry (Thumbnail* thm, const Glib::ustring& fname) : ThumbBrowserEntryBase (fname), wasInside(false), iatlistener(nullptr), press_x(0), press_y(0), action_x(0), action_y(0), rot_deg(0.0), landscape(true), cropgl(nullptr), state(SNormal), crop_custom_ratio(0.f) @@ -117,10 +117,10 @@ void FileBrowserEntry::calcThumbnailSize () } } -std::vector > FileBrowserEntry::getIconsOnImageArea () +std::vector > FileBrowserEntry::getIconsOnImageArea () { - std::vector > ret; + std::vector > ret; if (!thumbnail) { return ret; @@ -141,10 +141,10 @@ std::vector > FileBrowserEntry::getIconsOnImageArea () return ret; } -std::vector > FileBrowserEntry::getSpecificityIconsOnImageArea () +std::vector > FileBrowserEntry::getSpecificityIconsOnImageArea () { - std::vector > ret; + std::vector > ret; if (!thumbnail) { return ret; diff --git a/rtgui/filebrowserentry.h b/rtgui/filebrowserentry.h index ada726dfc..7ec494e7c 100644 --- a/rtgui/filebrowserentry.h +++ b/rtgui/filebrowserentry.h @@ -71,11 +71,11 @@ class FileBrowserEntry : public ThumbBrowserEntryBase, public: - static Glib::RefPtr editedIcon; - static Glib::RefPtr recentlySavedIcon; - static Glib::RefPtr enqueuedIcon; - static Glib::RefPtr hdr; - static Glib::RefPtr ps; + static Cairo::RefPtr editedIcon; + static Cairo::RefPtr recentlySavedIcon; + static Cairo::RefPtr enqueuedIcon; + static Cairo::RefPtr hdr; + static Cairo::RefPtr ps; FileBrowserEntry (Thumbnail* thm, const Glib::ustring& fname); ~FileBrowserEntry (); @@ -92,8 +92,8 @@ public: void refreshQuickThumbnailImage (); void calcThumbnailSize (); - virtual std::vector > getIconsOnImageArea (); - virtual std::vector > getSpecificityIconsOnImageArea (); + virtual std::vector > getIconsOnImageArea (); + virtual std::vector > getSpecificityIconsOnImageArea (); virtual void getIconSize (int& w, int& h); // thumbnaillistener interface diff --git a/rtgui/filethumbnailbuttonset.cc b/rtgui/filethumbnailbuttonset.cc index 556397b7b..455ed8555 100644 --- a/rtgui/filethumbnailbuttonset.cc +++ b/rtgui/filethumbnailbuttonset.cc @@ -21,40 +21,38 @@ #include "rtimage.h" #include "multilangmgr.h" -extern Glib::ustring argv0; - bool FileThumbnailButtonSet::iconsLoaded = false; -Cairo::RefPtr FileThumbnailButtonSet::rankIcon; -Cairo::RefPtr FileThumbnailButtonSet::gRankIcon; -Cairo::RefPtr FileThumbnailButtonSet::unRankIcon; -Cairo::RefPtr FileThumbnailButtonSet::trashIcon; -Cairo::RefPtr FileThumbnailButtonSet::unTrashIcon; -Cairo::RefPtr FileThumbnailButtonSet::processIcon; -Cairo::RefPtr FileThumbnailButtonSet::colorLabelIcon_0; -Cairo::RefPtr FileThumbnailButtonSet::colorLabelIcon_1; -Cairo::RefPtr FileThumbnailButtonSet::colorLabelIcon_2; -Cairo::RefPtr FileThumbnailButtonSet::colorLabelIcon_3; -Cairo::RefPtr FileThumbnailButtonSet::colorLabelIcon_4; -Cairo::RefPtr FileThumbnailButtonSet::colorLabelIcon_5; +Cairo::RefPtr FileThumbnailButtonSet::rankIcon; +Cairo::RefPtr FileThumbnailButtonSet::gRankIcon; +Cairo::RefPtr FileThumbnailButtonSet::unRankIcon; +Cairo::RefPtr FileThumbnailButtonSet::trashIcon; +Cairo::RefPtr FileThumbnailButtonSet::unTrashIcon; +Cairo::RefPtr FileThumbnailButtonSet::processIcon; +Cairo::RefPtr FileThumbnailButtonSet::colorLabelIcon_0; +Cairo::RefPtr FileThumbnailButtonSet::colorLabelIcon_1; +Cairo::RefPtr FileThumbnailButtonSet::colorLabelIcon_2; +Cairo::RefPtr FileThumbnailButtonSet::colorLabelIcon_3; +Cairo::RefPtr FileThumbnailButtonSet::colorLabelIcon_4; +Cairo::RefPtr FileThumbnailButtonSet::colorLabelIcon_5; FileThumbnailButtonSet::FileThumbnailButtonSet (FileBrowserEntry* myEntry) { if (!iconsLoaded) { - unRankIcon = RTImage::createFromPng ("star-hollow-narrow.png"); - rankIcon = RTImage::createFromPng ("star-gold-narrow.png"); - gRankIcon = RTImage::createFromPng ("star-narrow.png"); - trashIcon = RTImage::createFromPng ("trash-small.png"); - unTrashIcon = RTImage::createFromPng ("trash-remove-small.png"); - processIcon = RTImage::createFromPng ("gears-small.png"); + unRankIcon = Cairo::RefPtr(new RTSurface("star-hollow-narrow.png")); + rankIcon = Cairo::RefPtr(new RTSurface("star-gold-narrow.png")); + gRankIcon = Cairo::RefPtr(new RTSurface("star-narrow.png")); + trashIcon = Cairo::RefPtr(new RTSurface("trash-small.png")); + unTrashIcon = Cairo::RefPtr(new RTSurface("trash-remove-small.png")); + processIcon = Cairo::RefPtr(new RTSurface("gears-small.png")); - colorLabelIcon_0 = RTImage::createFromPng ("circle-empty-gray-small.png"); - colorLabelIcon_1 = RTImage::createFromPng ("circle-red-small.png"); - colorLabelIcon_2 = RTImage::createFromPng ("circle-yellow-small.png"); - colorLabelIcon_3 = RTImage::createFromPng ("circle-green-small.png"); - colorLabelIcon_4 = RTImage::createFromPng ("circle-blue-small.png"); - colorLabelIcon_5 = RTImage::createFromPng ("circle-purple-small.png"); + colorLabelIcon_0 = Cairo::RefPtr(new RTSurface("circle-empty-gray-small.png")); + colorLabelIcon_1 = Cairo::RefPtr(new RTSurface("circle-red-small.png")); + colorLabelIcon_2 = Cairo::RefPtr(new RTSurface("circle-yellow-small.png")); + colorLabelIcon_3 = Cairo::RefPtr(new RTSurface("circle-green-small.png")); + colorLabelIcon_4 = Cairo::RefPtr(new RTSurface("circle-blue-small.png")); + colorLabelIcon_5 = Cairo::RefPtr(new RTSurface("circle-purple-small.png"));; iconsLoaded = true; } diff --git a/rtgui/filethumbnailbuttonset.h b/rtgui/filethumbnailbuttonset.h index a83bacf7b..57811addd 100644 --- a/rtgui/filethumbnailbuttonset.h +++ b/rtgui/filethumbnailbuttonset.h @@ -22,6 +22,7 @@ #include "lwbuttonset.h" #include #include "filebrowserentry.h" +#include "rtsurface.h" class FileBrowserEntry; class FileThumbnailButtonSet : public LWButtonSet @@ -30,19 +31,19 @@ class FileThumbnailButtonSet : public LWButtonSet static bool iconsLoaded; public: - static Cairo::RefPtr rankIcon; - static Cairo::RefPtr gRankIcon; - static Cairo::RefPtr unRankIcon; - static Cairo::RefPtr trashIcon; - static Cairo::RefPtr unTrashIcon; - static Cairo::RefPtr processIcon; + static Cairo::RefPtr rankIcon; + static Cairo::RefPtr gRankIcon; + static Cairo::RefPtr unRankIcon; + static Cairo::RefPtr trashIcon; + static Cairo::RefPtr unTrashIcon; + static Cairo::RefPtr processIcon; - static Cairo::RefPtr colorLabelIcon_0; - static Cairo::RefPtr colorLabelIcon_1; - static Cairo::RefPtr colorLabelIcon_2; - static Cairo::RefPtr colorLabelIcon_3; - static Cairo::RefPtr colorLabelIcon_4; - static Cairo::RefPtr colorLabelIcon_5; + static Cairo::RefPtr colorLabelIcon_0; + static Cairo::RefPtr colorLabelIcon_1; + static Cairo::RefPtr colorLabelIcon_2; + static Cairo::RefPtr colorLabelIcon_3; + static Cairo::RefPtr colorLabelIcon_4; + static Cairo::RefPtr colorLabelIcon_5; explicit FileThumbnailButtonSet (FileBrowserEntry* myEntry); void setRank (int stars); diff --git a/rtgui/guiutils.cc b/rtgui/guiutils.cc index 980b94765..c1c0d9764 100644 --- a/rtgui/guiutils.cc +++ b/rtgui/guiutils.cc @@ -32,11 +32,11 @@ using namespace std; -Glib::RefPtr MyExpander::inconsistentPBuf; -Glib::RefPtr MyExpander::enabledPBuf; -Glib::RefPtr MyExpander::disabledPBuf; -Glib::RefPtr MyExpander::openedPBuf; -Glib::RefPtr MyExpander::closedPBuf; +Glib::RefPtr MyExpander::inconsistentImage; +Glib::RefPtr MyExpander::enabledImage; +Glib::RefPtr MyExpander::disabledImage; +Glib::RefPtr MyExpander::openedImage; +Glib::RefPtr MyExpander::closedImage; IdleRegister::~IdleRegister() { @@ -553,16 +553,18 @@ void ExpanderBox::hideBox() void MyExpander::init() { - inconsistentPBuf = Gdk::Pixbuf::create_from_file(rtengine::findIconAbsolutePath("power-inconsistent-small.png")); - enabledPBuf = Gdk::Pixbuf::create_from_file(rtengine::findIconAbsolutePath("power-on-small.png")); - disabledPBuf = Gdk::Pixbuf::create_from_file(rtengine::findIconAbsolutePath("power-off-small.png")); - openedPBuf = Gdk::Pixbuf::create_from_file(rtengine::findIconAbsolutePath("expander-open-small.png")); - closedPBuf = Gdk::Pixbuf::create_from_file(rtengine::findIconAbsolutePath("expander-closed-small.png")); + if (!inconsistentImage) { // if one is null, all are null + inconsistentImage = Glib::RefPtr(new RTImage("power-inconsistent-small.png")); + enabledImage = Glib::RefPtr(new RTImage("power-on-small.png")); + disabledImage = Glib::RefPtr(new RTImage("power-off-small.png")); + openedImage = Glib::RefPtr(new RTImage("expander-open-small.png")); + closedImage = Glib::RefPtr(new RTImage("expander-closed-small.png")); + } } MyExpander::MyExpander(bool useEnabled, Gtk::Widget* titleWidget) : enabled(false), inconsistent(false), flushEvent(false), expBox(nullptr), - child(nullptr), headerWidget(nullptr), statusImage(nullptr), + child(nullptr), headerWidget(nullptr), label(nullptr), useEnabled(useEnabled) { set_spacing(0); @@ -575,7 +577,7 @@ MyExpander::MyExpander(bool useEnabled, Gtk::Widget* titleWidget) : setExpandAlignProperties(headerHBox, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_FILL); if (useEnabled) { - statusImage = Gtk::manage(new Gtk::Image(disabledPBuf)); + statusImage = Gtk::manage(new RTImage(*(disabledImage.get()))); imageEvBox = Gtk::manage(new Gtk::EventBox()); imageEvBox->add(*statusImage); imageEvBox->set_above_child(true); @@ -584,7 +586,7 @@ MyExpander::MyExpander(bool useEnabled, Gtk::Widget* titleWidget) : imageEvBox->signal_leave_notify_event().connect( sigc::mem_fun(this, & MyExpander::on_enter_leave_enable), false ); headerHBox->pack_start(*imageEvBox, Gtk::PACK_SHRINK, 0); } else { - statusImage = Gtk::manage(new Gtk::Image(openedPBuf)); + statusImage = Gtk::manage(new RTImage(*(openedImage.get()))); headerHBox->pack_start(*statusImage, Gtk::PACK_SHRINK, 0); } @@ -614,7 +616,7 @@ MyExpander::MyExpander(bool useEnabled, Gtk::Widget* titleWidget) : MyExpander::MyExpander(bool useEnabled, Glib::ustring titleLabel) : enabled(false), inconsistent(false), flushEvent(false), expBox(nullptr), - child(nullptr), headerWidget(nullptr), statusImage(nullptr), + child(nullptr), headerWidget(nullptr), label(nullptr), useEnabled(useEnabled) { set_spacing(0); @@ -628,7 +630,7 @@ MyExpander::MyExpander(bool useEnabled, Glib::ustring titleLabel) : if (useEnabled) { - statusImage = Gtk::manage(new Gtk::Image(disabledPBuf)); + statusImage = Gtk::manage(new RTImage(*(disabledImage.get()))); imageEvBox = Gtk::manage(new Gtk::EventBox()); imageEvBox->set_name("MyExpanderStatus"); imageEvBox->add(*statusImage); @@ -638,7 +640,7 @@ MyExpander::MyExpander(bool useEnabled, Glib::ustring titleLabel) : imageEvBox->signal_leave_notify_event().connect( sigc::mem_fun(this, & MyExpander::on_enter_leave_enable), false ); headerHBox->pack_start(*imageEvBox, Gtk::PACK_SHRINK, 0); } else { - statusImage = Gtk::manage(new Gtk::Image(openedPBuf)); + statusImage = Gtk::manage(new RTImage(*(openedImage.get()))); headerHBox->pack_start(*statusImage, Gtk::PACK_SHRINK, 0); } @@ -758,12 +760,12 @@ void MyExpander::set_inconsistent(bool isInconsistent) if (useEnabled) { if (isInconsistent) { - statusImage->set(inconsistentPBuf); + statusImage->from(inconsistentImage); } else { if (enabled) { - statusImage->set(enabledPBuf); + statusImage->from(enabledImage); } else { - statusImage->set(disabledPBuf); + statusImage->from(disabledImage); } } } @@ -789,14 +791,14 @@ void MyExpander::setEnabled(bool isEnabled) enabled = false; if (!inconsistent) { - statusImage->set(disabledPBuf); + statusImage->from(disabledImage); message.emit(); } } else { enabled = true; if (!inconsistent) { - statusImage->set(enabledPBuf); + statusImage->from(enabledImage); message.emit(); } } @@ -832,9 +834,9 @@ void MyExpander::set_expanded( bool expanded ) if (!useEnabled) { if (expanded ) { - statusImage->set(openedPBuf); + statusImage->from(openedImage); } else { - statusImage->set(closedPBuf); + statusImage->from(closedImage); } } @@ -877,9 +879,9 @@ bool MyExpander::on_toggle(GdkEventButton* event) if (!useEnabled) { if (isVisible) { - statusImage->set(closedPBuf); + statusImage->from(closedImage); } else { - statusImage->set(openedPBuf); + statusImage->from(openedImage); } } @@ -904,10 +906,10 @@ bool MyExpander::on_enabled_change(GdkEventButton* event) if (event->button == 1) { if (enabled) { enabled = false; - statusImage->set(disabledPBuf); + statusImage->from(disabledImage); } else { enabled = true; - statusImage->set(enabledPBuf); + statusImage->from(enabledImage); } message.emit(); @@ -1437,7 +1439,9 @@ void MyFileChooserButton::get_preferred_width_for_height_vfunc (int height, int TextOrIcon::TextOrIcon (const Glib::ustring &fname, const Glib::ustring &labelTx, const Glib::ustring &tooltipTx) { - pack_start(*Gtk::manage(new RTImage(fname)), Gtk::PACK_SHRINK, 0); + RTImage *img = Gtk::manage(new RTImage(fname)); + printf(">>> TOI \"%s\" : %d x %d\n", fname.c_str(), img->get_width(), img->get_height()); + pack_start(*img, Gtk::PACK_SHRINK, 0); set_tooltip_markup("" + labelTx + "\n" + tooltipTx); set_name("TextOrIcon"); diff --git a/rtgui/guiutils.h b/rtgui/guiutils.h index 8816eca4f..37dc3f903 100644 --- a/rtgui/guiutils.h +++ b/rtgui/guiutils.h @@ -181,11 +181,11 @@ public: typedef sigc::signal type_signal_enabled_toggled; private: type_signal_enabled_toggled message; - static Glib::RefPtr inconsistentPBuf; /// "inconsistent" image, displayed when useEnabled is true ; in this case, nothing will tell that an expander is opened/closed - static Glib::RefPtr enabledPBuf; /// "enabled" image, displayed when useEnabled is true ; in this case, nothing will tell that an expander is opened/closed - static Glib::RefPtr disabledPBuf; /// "disabled" image, displayed when useEnabled is true ; in this case, nothing will tell that an expander is opened/closed - static Glib::RefPtr openedPBuf; /// "opened" image, displayed when useEnabled is false - static Glib::RefPtr closedPBuf; /// "closed" image, displayed when useEnabled is false + static Glib::RefPtr inconsistentImage; /// "inconsistent" image, displayed when useEnabled is true ; in this case, nothing will tell that an expander is opened/closed + static Glib::RefPtr enabledImage; /// "enabled" image, displayed when useEnabled is true ; in this case, nothing will tell that an expander is opened/closed + static Glib::RefPtr disabledImage; /// "disabled" image, displayed when useEnabled is true ; in this case, nothing will tell that an expander is opened/closed + static Glib::RefPtr openedImage; /// "opened" image, displayed when useEnabled is false + static Glib::RefPtr closedImage; /// "closed" image, displayed when useEnabled is false bool enabled; /// Enabled feature (default to true) bool inconsistent; /// True if the enabled button is inconsistent Gtk::EventBox *titleEvBox; /// EventBox of the title, to get a connector from it @@ -208,7 +208,7 @@ private: protected: Gtk::Container* child; /// Gtk::Contained to display below the expander's title Gtk::Widget* headerWidget; /// Widget to display in the header, next to the arrow image ; can be NULL if the "string" version of the ctor has been used - Gtk::Image* statusImage; /// Image to display the opened/closed status (if useEnabled is false) of the enabled/disabled status (if useEnabled is true) + RTImage* statusImage; /// Image to display the opened/closed status (if useEnabled is false) of the enabled/disabled status (if useEnabled is true) Gtk::Label* label; /// Text to display in the header, next to the arrow image ; can be NULL if the "widget" version of the ctor has been used bool useEnabled; /// Set whether to handle an enabled/disabled feature and display the appropriate images diff --git a/rtgui/lwbutton.cc b/rtgui/lwbutton.cc index 4998a302e..b1ed940c2 100644 --- a/rtgui/lwbutton.cc +++ b/rtgui/lwbutton.cc @@ -19,13 +19,13 @@ #include "lwbutton.h" #include "guiutils.h" -LWButton::LWButton (Cairo::RefPtr i, int aCode, void* aData, Alignment ha, Alignment va, Glib::ustring tooltip) +LWButton::LWButton (Cairo::RefPtr i, int aCode, void* aData, Alignment ha, Alignment va, Glib::ustring tooltip) : xpos(0), ypos(0), halign(ha), valign(va), icon(i), bgr(0.0), bgg(0.0), bgb(0.0), fgr(0.0), fgg(0.0), fgb(0.0), state(Normal), listener(nullptr), actionCode(aCode), actionData(aData), toolTip(tooltip) { if (i) { - w = i->get_width () + 2; - h = i->get_height () + 2; + w = i->getWidth () + 2; + h = i->getHeight () + 2; } else { w = h = 2; } @@ -52,20 +52,20 @@ void LWButton::getPosition (int& x, int& y) y = ypos; } -void LWButton::setIcon (Cairo::RefPtr i) +void LWButton::setIcon (Cairo::RefPtr i) { icon = i; if (i) { - w = i->get_width () + 2; - h = i->get_height () + 2; + w = i->getWidth () + 2; + h = i->getHeight () + 2; } else { w = h = 2; } } -Cairo::RefPtr LWButton::getIcon () +Cairo::RefPtr LWButton::getIcon () { return icon; @@ -205,7 +205,7 @@ void LWButton::redraw (Cairo::RefPtr context) } if (icon) { - context->set_source (icon, xpos + dilat, ypos + dilat); + context->set_source (icon->surface, xpos + dilat, ypos + dilat); context->paint (); } } diff --git a/rtgui/lwbutton.h b/rtgui/lwbutton.h index 2053911be..078fe0035 100644 --- a/rtgui/lwbutton.h +++ b/rtgui/lwbutton.h @@ -20,6 +20,7 @@ #define _LWBUTTON_ #include +#include "rtsurface.h" class LWButton; class LWButtonListener @@ -41,7 +42,7 @@ public: private: int xpos, ypos, w, h; Alignment halign, valign; - Cairo::RefPtr icon; + Cairo::RefPtr icon; double bgr, bgg, bgb; double fgr, fgg, fgb; State state; @@ -51,15 +52,15 @@ private: Glib::ustring toolTip; public: - LWButton (Cairo::RefPtr i, int aCode, void* aData, Alignment ha = Left, Alignment va = Center, Glib::ustring tooltip = ""); + LWButton (Cairo::RefPtr i, int aCode, void* aData, Alignment ha = Left, Alignment va = Center, Glib::ustring tooltip = ""); void getSize (int& minw, int& minh); void getAlignment (Alignment& ha, Alignment& va); void setPosition (int x, int y); void getPosition (int& x, int& y); bool inside (int x, int y); - void setIcon (Cairo::RefPtr i); - Cairo::RefPtr getIcon (); + void setIcon (Cairo::RefPtr i); + Cairo::RefPtr getIcon (); void setColors (const Gdk::RGBA& bg, const Gdk::RGBA& fg); void setToolTip (const Glib::ustring& tooltip); diff --git a/rtgui/main-cli.cc b/rtgui/main-cli.cc index 347161cd5..345dd2971 100644 --- a/rtgui/main-cli.cc +++ b/rtgui/main-cli.cc @@ -282,6 +282,10 @@ int processLineParams ( int argc, char **argv ) if ( currParam.at (0) == '-' ) { switch ( currParam.at (1) ) { + case '-': + // GTK --argument, we're skipping it + break; + case 'O': copyParamsFile = true; diff --git a/rtgui/main.cc b/rtgui/main.cc index f345fecc8..15f5c8a4a 100644 --- a/rtgui/main.cc +++ b/rtgui/main.cc @@ -133,6 +133,10 @@ int processLineParams ( int argc, char **argv ) if ( currParam.at (0) == '-' ) { switch ( currParam.at (1) ) { + case '-': + // GTK --argument, we're skipping it + break; + #ifdef WIN32 case 'w': // This case is handled outside this function @@ -248,7 +252,6 @@ RTWindow *create_rt_window() defaultIconTheme->append_search_path (icon_path); rtengine::setPaths(); - MyExpander::init(); // has to stay AFTER rtengine::setPaths // ------- loading theme files diff --git a/rtgui/rtimage.cc b/rtgui/rtimage.cc index b24158b00..4763b90e7 100644 --- a/rtgui/rtimage.cc +++ b/rtgui/rtimage.cc @@ -2,7 +2,7 @@ * This file is part of RawTherapee. * * Copyright (c) 2004-2010 Gabor Horvath - * Copyright (c) 2011 Jean-Christophe FRISCH + * Copyright (c) 2018 Jean-Christophe FRISCH * * RawTherapee is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -28,15 +28,44 @@ namespace { -std::map> pixbufCache; +std::map> surfaceCache; } -RTImage::RTImage (const Glib::ustring& fileName, const Glib::ustring& rtlFileName) : Gtk::Image() +double RTImage::dpiBack = 0.; +int RTImage::scaleBack = 0; + +RTImage::RTImage () {} + +RTImage::RTImage (const Glib::ustring& fileName, const Glib::ustring& rtlFileName) +{ + setImage (fileName, rtlFileName); +} + +RTImage::RTImage (RTImage &other) +{ + from(&other); +} + +RTImage::RTImage (Glib::RefPtr &pixbuf) +{ + if (pixbuf) { + set(pixbuf); + } +} + +RTImage::RTImage (Glib::RefPtr &other) +{ + if (other) { + from(other.get()); + } +} + +void RTImage::setImage (const Glib::ustring& fileName, const Glib::ustring& rtlFileName) { Glib::ustring imageName; - if (!rtlFileName.empty () && get_direction () == Gtk::TEXT_DIR_RTL) { + if (!rtlFileName.empty() && getDirection() == Gtk::TEXT_DIR_RTL) { imageName = rtlFileName; } else { imageName = fileName; @@ -45,73 +74,113 @@ RTImage::RTImage (const Glib::ustring& fileName, const Glib::ustring& rtlFileNam changeImage (imageName); } +/* + * On windows, if scale = 2, the dpi is non significant, i.e. should be considered = 192 + */ +void RTImage::setDPInScale (const double newDPI, const int newScale) +{ + if (scaleBack != newScale || (scaleBack == 1 && dpiBack != newDPI)) { + RTScalable::setDPInScale(newDPI, newScale); + dpiBack = getDPI(); + scaleBack = getScale(); + printf("RTImage::setDPInScale : New scale = %d & new DPI = %.3f (%.3f asked) -> Reloading all RTImage\n", scaleBack, dpiBack, newDPI); + updateImages(); + } +} + void RTImage::changeImage (const Glib::ustring& imageName) { clear (); - auto iterator = pixbufCache.find (imageName); + auto iterator = surfaceCache.find (imageName); - if (iterator == pixbufCache.end ()) { - const auto imagePath = rtengine::findIconAbsolutePath (imageName); - const auto pixbuf = Gdk::Pixbuf::create_from_file (imagePath); - - iterator = pixbufCache.emplace (imageName, pixbuf).first; + if (iterator == surfaceCache.end ()) { + const auto pixbuf = createFromFile(imageName); + iterator = surfaceCache.emplace (imageName, pixbuf).first; } + surface = iterator->second; set(iterator->second); } +void RTImage::init() +{ + dpiBack = RTScalable::getDPI(); + scaleBack = RTScalable::getScale(); +} + void RTImage::updateImages() { - for (auto& entry : pixbufCache) { - const auto imagePath = rtengine::findIconAbsolutePath (entry.first); - entry.second = Gdk::Pixbuf::create_from_file (imagePath); + for (auto& entry : surfaceCache) { + entry.second = createFromFile(entry.first); } } -Glib::RefPtr RTImage::createFromFile (const Glib::ustring& fileName) +void RTImage::from(RTImage* other) { - Glib::RefPtr pixbuf; + if (!other) { + return; + } + + if (other->get_pixbuf()) { + set(other->get_pixbuf()); + } else { + surface = other->surface; + set(surface); + } +} + +void RTImage::from(Glib::RefPtr other) +{ + if (other) { + from (other.get()); + } +} + +Cairo::RefPtr RTImage::createFromFile (const Glib::ustring& fileName) +{ + Cairo::RefPtr surf; try { - const auto filePath = rtengine::findIconAbsolutePath (fileName); + double requestedDPI = getDPI(); + const auto filePath = rtengine::findIconAbsolutePath (fileName, requestedDPI); + // requestedDPI is now the icon's DPI, not necessarily the one we asked if (!filePath.empty ()) { - pixbuf = Gdk::Pixbuf::create_from_file (filePath); + surf = Cairo::ImageSurface::create_from_png(filePath); } - } catch (const Glib::Exception& exception) { + if (!surf) { + return surf; // nullptr + } + if (getDPI() > 0. && requestedDPI != -1 && requestedDPI != getDPI()) { + // scale the bitmap + printf("Resizing from %.1f to %.1f DPI\n", requestedDPI, getDPI()); + resizeImage(surf, getDPI() / requestedDPI); + } + + double x=0., y=0.; + cairo_surface_get_device_scale(surf->cobj(), &x, &y); + printf(" -> Cairo::ImageSurface is now %dx%d (scale: %.1f)\n", surf->get_width(), surf->get_height(), (float)x); + if (getScale() == 2) { + cairo_surface_set_device_scale(surf->cobj(), 0.5, 0.5); + cairo_surface_get_device_scale(surf->cobj(), &x, &y); + surf->flush(); + printf(" Cairo::ImageSurface is now %dx%d (scale: %.1f)\n", surf->get_width(), surf->get_height(), (float)x); + } + } catch (const Glib::Exception& exception) { if (options.rtSettings.verbose) { std::cerr << "Failed to load image \"" << fileName << "\": " << exception.what() << std::endl; } - } - return pixbuf; + return surf; } -Cairo::RefPtr RTImage::createFromPng (const Glib::ustring& fileName) +/* +bool RTImage::on_configure_event(GdkEventConfigure* configure_event) { - Cairo::RefPtr surface; - - try { - - const auto filePath = rtengine::findIconAbsolutePath (fileName); - - if (!filePath.empty()) { - surface = Cairo::ImageSurface::create_from_png (Glib::locale_from_utf8 (filePath)); - } - - } catch (const Glib::Exception& exception) { - - if (options.rtSettings.verbose) { - std::cerr << "Failed to load PNG \"" << fileName << "\": " << exception.what() << std::endl; - } - } - - return surface; } - - +*/ diff --git a/rtgui/rtimage.h b/rtgui/rtimage.h index 0286d990b..35652e163 100644 --- a/rtgui/rtimage.h +++ b/rtgui/rtimage.h @@ -2,6 +2,7 @@ * This file is part of RawTherapee. * * Copyright (c) 2004-2010 Gabor Horvath + * Copyright (c) 2018 Jean-Christophe FRISCH * * RawTherapee is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,26 +17,40 @@ * You should have received a copy of the GNU General Public License * along with RawTherapee. If not, see . */ -#ifndef _RTIMAGE_ -#define _RTIMAGE_ +#pragma once #include - -class Options; +#include "rtscalable.h" /** * @brief A derived class of Gtk::Image in order to handle theme-related icon sets. */ -class RTImage : public Gtk::Image +class RTImage : public Gtk::Image, public RTScalable { + static double dpiBack; // used to keep track of master dpi change + static int scaleBack; // used to keep track of master scale change + //bool on_configure_event(GdkEventConfigure* configure_event); + +protected: + Cairo::RefPtr surface; + public: + RTImage (); + RTImage (RTImage &other); + RTImage (Glib::RefPtr &pixbuf); + RTImage (Glib::RefPtr &other); RTImage (const Glib::ustring& fileName, const Glib::ustring& rtlFileName = Glib::ustring()); + void setImage (const Glib::ustring& fileName, const Glib::ustring& rtlFileName = Glib::ustring()); void changeImage (const Glib::ustring& imageName); + + static void init(); static void updateImages (); + static void setDPInScale (const double newDPI, const int newScale); + static void setScale (const int newScale); - static Glib::RefPtr createFromFile (const Glib::ustring& fileName); - static Cairo::RefPtr createFromPng (const Glib::ustring& fileName); + static Cairo::RefPtr createFromFile (const Glib::ustring& fileName); + + void from(RTImage* other); + void from(Glib::RefPtr other); }; - -#endif diff --git a/rtgui/rtscalable.cc b/rtgui/rtscalable.cc new file mode 100644 index 000000000..6d376d9d8 --- /dev/null +++ b/rtgui/rtscalable.cc @@ -0,0 +1,74 @@ +/* + * This file is part of RawTherapee. + * + * Copyright (c) 2018 Jean-Christophe FRISCH + * + * RawTherapee is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * RawTherapee is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with RawTherapee. If not, see . + */ + +#include "rtscalable.h" +#include "../rtengine/icons.h" + +double RTScalable::dpi = 0.; +int RTScalable::scale = 0; +Gtk::TextDirection RTScalable::direction = Gtk::TextDirection::TEXT_DIR_NONE; + +void RTScalable::setDPInScale (const double newDPI, const int newScale) +{ + if (scale != newScale || (scale == 1 && dpi != newDPI)) { + // reload all images + scale = newScale; + // HOMBRE: On windows, if scale = 2, the dpi is non significant, i.e. should be considered = 192 ; don't know for linux/macos + dpi = scale == 2 ? 192 : newDPI; + printf("RTScalable::setDPInScale / New scale = %d & new DPI = %.3f (%.3f asked) -> Reloading all RTScalable\n", scale, dpi, newDPI); + } +} + +double RTScalable::getDPI () +{ + return dpi; +} + +int RTScalable::getScale () +{ + return scale; +} + +Gtk::TextDirection RTScalable::getDirection() +{ + return direction; +} + +void RTScalable::init(Gtk::Window *window) +{ + printf("RTScalable::init\n"); + setDPInScale(window->get_screen()->get_resolution(), window->get_scale_factor()); +} + +void RTScalable::resizeImage(Cairo::RefPtr &surf, double factor) +{ + int newWidth = int((double)surf->get_width() * factor); + int newHeight = int((double)surf->get_height() * factor); + printf("Resizing from %dx%d to %dx%d (factor: %.5f)\n", surf->get_width(), surf->get_height(), newWidth, newHeight, factor); + Cairo::RefPtr surf2 = Cairo::ImageSurface::create(surf->get_format(), newWidth, newHeight); + Cairo::RefPtr c = Cairo::Context::create(surf2); + c->scale (factor, factor); + c->set_source(surf, 0., 0.); + //Cairo::RefPtr p = Cairo::SurfacePattern::create(surf); + //p->set_filter (Cairo::FILTER_BILINEAR); + c->paint (); + surf2->flush(); + + surf = surf2; +} diff --git a/rtgui/rtscalable.h b/rtgui/rtscalable.h new file mode 100644 index 000000000..9f3f913b9 --- /dev/null +++ b/rtgui/rtscalable.h @@ -0,0 +1,44 @@ +/* + * This file is part of RawTherapee. + * + * Copyright (c) 2018 Jean-Christophe FRISCH + * + * RawTherapee is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * RawTherapee is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with RawTherapee. If not, see . + */ + +#pragma once + +#include + +/** + * @brief A master class for derived class of Gtk::Image in order to handle theme-related icon sets. + */ +class RTScalable +{ + static double dpi; + static int scale; + static Gtk::TextDirection direction; // cached value for text-direction + +protected: + static void setDPInScale (const double newDPI, const int newScale); + static double getDPI (); + static int getScale (); + static void resizeImage(Cairo::RefPtr &surf, double factor); + Gtk::TextDirection getDirection(); + + +public: + static void init(Gtk::Window *window); + +}; diff --git a/rtgui/rtsurface.cc b/rtgui/rtsurface.cc new file mode 100644 index 000000000..4209012b7 --- /dev/null +++ b/rtgui/rtsurface.cc @@ -0,0 +1,132 @@ +/* + * This file is part of RawTherapee. + * + * Copyright (c) 2018 Jean-Christophe FRISCH + * + * RawTherapee is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * RawTherapee is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with RawTherapee. If not, see . + */ + +#include + +#include "options.h" +#include "../rtengine/icons.h" +#include "rtsurface.h" + +namespace +{ + +std::map> surfaceCache; + +} + +double RTSurface::dpiBack = 0.; +int RTSurface::scaleBack = 0; + +RTSurface::RTSurface () : RTScalable() { + Cairo::RefPtr imgSurf(new Cairo::ImageSurface(nullptr, false)); + surface = imgSurf; +} + +RTSurface::RTSurface (Glib::ustring fileName, Glib::ustring rtlFileName) : RTScalable() +{ + Cairo::RefPtr imgSurf(new Cairo::ImageSurface(nullptr, false)); + surface = imgSurf; + setImage (fileName, rtlFileName); +} + +void RTSurface::setImage (Glib::ustring fileName, Glib::ustring rtlFileName) +{ + Glib::ustring imageName; + + if (!rtlFileName.empty() && getDirection() == Gtk::TEXT_DIR_RTL) { + imageName = rtlFileName; + } else { + imageName = fileName; + } + + changeImage (imageName); +} + +void RTSurface::setDPInScale (const double newDPI, const int newScale) +{ + if (getScale() != newScale || (getScale() == 1 && getDPI() != newDPI)) { + RTScalable::setDPInScale(newDPI, newScale); + dpiBack = getDPI(); + scaleBack = getScale(); + printf("RTSurface::setDPInScale : New scale = %d & new DPI = %.3f (%.3f asked) -> Reloading all RTSurface\n", scaleBack, dpiBack, newDPI); + updateImages(); + } +} + +void RTSurface::changeImage (Glib::ustring imageName) +{ + auto iterator = surfaceCache.find (imageName); + + if (iterator == surfaceCache.end ()) { + double requestedDPI = getDPI(); + const auto imagePath = rtengine::findIconAbsolutePath (imageName, requestedDPI); + surface = Cairo::ImageSurface::create_from_png(imagePath); + + if (getDPI() > 0. && requestedDPI != -1 && requestedDPI != getDPI()) { + // scale the bitmap + printf("Resizing from %.1f to %.1f DPI\n", requestedDPI, getDPI()); + resizeImage(surface, getDPI() / requestedDPI); + } + + double x=0., y=0.; + cairo_surface_get_device_scale(surface->cobj(), &x, &y); + printf(" -> Cairo::ImageSurface is now %dx%d (scale: %.1f)\n", surface->get_width(), surface->get_height(), (float)x); + if (getScale() == 2) { + cairo_surface_set_device_scale(surface->cobj(), 0.5, 0.5); + cairo_surface_get_device_scale(surface->cobj(), &x, &y); + surface->flush(); + printf(" Cairo::ImageSurface is now %dx%d (scale: %.1f)\n", surface->get_width(), surface->get_height(), (float)x); + } + + iterator = surfaceCache.emplace (imageName, surface).first; + } + + surface = iterator->second; +} + +int RTSurface::getWidth() +{ + return surface ? surface->get_width() : -1; +} + +int RTSurface::getHeight() +{ + return surface ? surface->get_height() : -1; +} + +void RTSurface::init() +{ + dpiBack = RTScalable::getDPI(); + scaleBack = RTScalable::getScale(); +} + +void RTSurface::updateImages() +{ + for (auto& entry : surfaceCache) { + double imgDPI = getDPI(); + const auto imagePath = rtengine::findIconAbsolutePath (entry.first, imgDPI); + entry.second = Cairo::ImageSurface::create_from_png(imagePath); + printf("RTSurface::updateImages : %s\n", imagePath.c_str()); + } +} + +void RTSurface::from(Glib::RefPtr other) +{ + surface = other->surface; +} diff --git a/rtgui/rtsurface.h b/rtgui/rtsurface.h new file mode 100644 index 000000000..4c2c50bb3 --- /dev/null +++ b/rtgui/rtsurface.h @@ -0,0 +1,49 @@ +/* + * This file is part of RawTherapee. + * + * Copyright (c) 2018 Jean-Christophe FRISCH + * + * RawTherapee is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * RawTherapee is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with RawTherapee. If not, see . + */ +#pragma once + +#include +#include "rtscalable.h" + +/** + * @brief A derived class of Gtk::Image in order to handle theme-related icon sets. + */ +class RTSurface : public RTScalable +{ + static double dpiBack; // used to keep track of master dpi change + static int scaleBack; // used to keep track of master scale change + +public: + Cairo::RefPtr surface; + + RTSurface (); + RTSurface (Glib::ustring fileName, Glib::ustring rtlFileName = Glib::ustring()); + + void setImage (Glib::ustring fileName, Glib::ustring rtlFileName = Glib::ustring()); + void changeImage (Glib::ustring imageName); + int getWidth(); + int getHeight(); + + static void init(); + static void updateImages (); + static void setDPInScale (const double newDPI, const int newScale); + static void setScale (const int newScale); + + void from(Glib::RefPtr other); +}; diff --git a/rtgui/rtwindow.cc b/rtgui/rtwindow.cc index a52fd1ba5..c6064434f 100644 --- a/rtgui/rtwindow.cc +++ b/rtgui/rtwindow.cc @@ -25,6 +25,7 @@ #include "cursormanager.h" #include "rtimage.h" #include "whitebalance.h" +#include "rtscalable.h" #include "../rtengine/icons.h" #if defined(__APPLE__) @@ -93,6 +94,10 @@ RTWindow::RTWindow () cacheMgr->init (); WhiteBalance::init(); ProfilePanel::init (this); + RTScalable::init(this); + RTSurface::init(); + RTImage::init(); + MyExpander::init(); #ifndef WIN32 const std::vector> appIcons = { @@ -192,10 +197,14 @@ RTWindow::RTWindow () if (options.mainNBVertical) { mainNB->set_tab_pos (Gtk::POS_LEFT); fpl->set_angle (90); - fpanelLabelGrid->attach_next_to (*Gtk::manage (new RTImage ("folder-closed.png")), Gtk::POS_TOP, 1, 1); + RTImage* folderIcon = Gtk::manage (new RTImage ("folder-closed.png")); + fpanelLabelGrid->attach_next_to (*folderIcon, Gtk::POS_TOP, 1, 1); fpanelLabelGrid->attach_next_to (*fpl, Gtk::POS_TOP, 1, 1); } else { - fpanelLabelGrid->attach_next_to (*Gtk::manage (new RTImage ("folder-closed.png")), Gtk::POS_RIGHT, 1, 1); + printf("---------------- folder-closed\n"); + RTImage* folderIcon = Gtk::manage (new RTImage ("folder-closed.png")); + printf("---------------- folder-closed : %dx%d\n", folderIcon->get_width(), folderIcon->get_height()); + fpanelLabelGrid->attach_next_to (*folderIcon, Gtk::POS_RIGHT, 1, 1); fpanelLabelGrid->attach_next_to (*fpl, Gtk::POS_RIGHT, 1, 1); } @@ -396,6 +405,12 @@ bool RTWindow::on_configure_event (GdkEventConfigure* event) get_position (options.windowX, options.windowY); } + printf("RTWindow::on_configure_event : May update the RTImage and RTSurface\n"); + int newScale = get_window()->get_scale_factor(); + double newDPI = get_window()->get_screen()->get_resolution(); + RTImage::setDPInScale(newDPI, newScale); // will update the RTImage on scale/resolution change + RTSurface::setDPInScale(newDPI, newScale); // will update the RTSurface on scale/resolution change + return Gtk::Widget::on_configure_event (event); } diff --git a/rtgui/splash.cc b/rtgui/splash.cc index b95071d0b..f89e50b8e 100644 --- a/rtgui/splash.cc +++ b/rtgui/splash.cc @@ -29,15 +29,15 @@ extern Glib::ustring versionString; SplashImage::SplashImage () { - pixbuf = RTImage::createFromFile ("splash.png"); + surface = RTImage::createFromFile ("splash.png"); } bool SplashImage::on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr) { Glib::RefPtr window = get_window(); - Gdk::Cairo::set_source_pixbuf(cr, pixbuf); - cr->rectangle(0, 0, pixbuf->get_width(), pixbuf->get_height()); + cr->set_source(surface, 0., 0.); + cr->rectangle(0, 0, surface->get_width(), surface->get_height()); cr->fill(); Cairo::FontOptions cfo; @@ -58,7 +58,7 @@ bool SplashImage::on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr) cr->set_source_rgb (0., 0., 0.); cr->set_line_width(3.); cr->set_line_join(Cairo::LINE_JOIN_ROUND); - cr->move_to (pixbuf->get_width() - w - 32, pixbuf->get_height() - h - 20); + cr->move_to (surface->get_width() - w - 32, surface->get_height() - h - 20); version->add_to_cairo_context (cr); cr->stroke_preserve(); cr->set_source_rgb (1., 1., 1.); @@ -76,12 +76,12 @@ Gtk::SizeRequestMode SplashImage::get_request_mode_vfunc () const void SplashImage::get_preferred_height_vfunc (int &minimum_height, int &natural_height) const { - minimum_height = natural_height = pixbuf ? pixbuf->get_height() : 100; + minimum_height = natural_height = surface ? surface->get_height() : 100; } void SplashImage::get_preferred_width_vfunc (int &minimum_width, int &natural_width) const { - minimum_width = natural_width = pixbuf ? pixbuf->get_width() : 100; + minimum_width = natural_width = surface ? surface->get_width() : 100; } void SplashImage::get_preferred_height_for_width_vfunc (int width, int &minimum_height, int &natural_height) const diff --git a/rtgui/splash.h b/rtgui/splash.h index 4769700f6..cffdb92e1 100644 --- a/rtgui/splash.h +++ b/rtgui/splash.h @@ -25,7 +25,7 @@ class SplashImage : public Gtk::DrawingArea { private: - Glib::RefPtr pixbuf; + Cairo::RefPtr surface; Glib::RefPtr version; public: diff --git a/rtgui/thumbbrowserbase.cc b/rtgui/thumbbrowserbase.cc index 829aec9f7..43454d8f5 100644 --- a/rtgui/thumbbrowserbase.cc +++ b/rtgui/thumbbrowserbase.cc @@ -657,6 +657,14 @@ void ThumbBrowserBase::enableInspector() } } +bool ThumbBrowserBase::Internal::on_configure_event(GdkEventConfigure *configure_event) +{ + double resolution = get_window()->get_screen()->get_resolution(); + printf("ThumbBrowserBase::Internal::on_configure_event / Scale:%d StyleScale:%d X:%d Y:%d W:%d H:%d / DPI: %.3f\n", + get_scale_factor(), get_style_context()->get_scale(), configure_event->x, configure_event->y, configure_event->width, configure_event->height, (float)resolution); + return true; +} + void ThumbBrowserBase::Internal::on_style_updated() { style = get_style_context (); diff --git a/rtgui/thumbbrowserbase.h b/rtgui/thumbbrowserbase.h index d4d7e63e2..dd63f5bf4 100644 --- a/rtgui/thumbbrowserbase.h +++ b/rtgui/thumbbrowserbase.h @@ -51,6 +51,7 @@ class ThumbBrowserBase : public Gtk::Grid void setParent (ThumbBrowserBase* p); void on_realize(); void on_style_updated(); + bool on_configure_event(GdkEventConfigure *configure_event); bool on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr); Gtk::SizeRequestMode get_request_mode_vfunc () const; diff --git a/rtgui/thumbbrowserentrybase.cc b/rtgui/thumbbrowserentrybase.cc index ed34c65c7..f1ca76b7c 100644 --- a/rtgui/thumbbrowserentrybase.cc +++ b/rtgui/thumbbrowserentrybase.cc @@ -315,7 +315,7 @@ void ThumbBrowserEntryBase::updateBackBuffer () for (size_t i = 0; i < bbIcons.size(); i++) { // Draw the image at 110, 90, except for the outermost 10 pixels. - Gdk::Cairo::set_source_pixbuf(cc, bbIcons[i], istartx, istarty); + cc->set_source(bbIcons[i], istartx, istarty); cc->rectangle(istartx, istarty, bbIcons[i]->get_width(), bbIcons[i]->get_height()); cc->fill(); istartx += bbIcons[i]->get_width() + igap; @@ -329,7 +329,7 @@ void ThumbBrowserEntryBase::updateBackBuffer () for (size_t i = 0; i < bbSpecificityIcons.size(); ++i) { istartx2 -= bbSpecificityIcons[i]->get_width() - igap; - Gdk::Cairo::set_source_pixbuf(cc, bbSpecificityIcons[i], istartx2, istarty2 - bbSpecificityIcons[i]->get_height()); + cc->set_source(bbSpecificityIcons[i], istartx2, istarty2 - bbSpecificityIcons[i]->get_height()); cc->rectangle(istartx2, istarty2 - bbSpecificityIcons[i]->get_height(), bbSpecificityIcons[i]->get_width(), bbSpecificityIcons[i]->get_height()); cc->fill(); } @@ -700,14 +700,14 @@ bool ThumbBrowserEntryBase::insideWindow (int x, int y, int w, int h) return !(ofsX + startx > x + w || ofsX + startx + exp_width < x || ofsY + starty > y + h || ofsY + starty + exp_height < y); } -std::vector > ThumbBrowserEntryBase::getIconsOnImageArea() +std::vector > ThumbBrowserEntryBase::getIconsOnImageArea() { - return std::vector >(); + return std::vector >(); } -std::vector > ThumbBrowserEntryBase::getSpecificityIconsOnImageArea() +std::vector > ThumbBrowserEntryBase::getSpecificityIconsOnImageArea() { - return std::vector >(); + return std::vector >(); } void ThumbBrowserEntryBase::getIconSize(int& w, int& h) diff --git a/rtgui/thumbbrowserentrybase.h b/rtgui/thumbbrowserentrybase.h index 8237b7c6b..ef2c01ea6 100644 --- a/rtgui/thumbbrowserentrybase.h +++ b/rtgui/thumbbrowserentrybase.h @@ -82,8 +82,8 @@ protected: Glib::RefPtr backBuffer; bool bbSelected, bbFramed; guint8* bbPreview; - std::vector > bbIcons; - std::vector > bbSpecificityIcons; + std::vector > bbIcons; + std::vector > bbSpecificityIcons; CursorShape cursor_type; void drawFrame (Cairo::RefPtr cr, const Gdk::RGBA& bg, const Gdk::RGBA& fg); @@ -188,8 +188,8 @@ public: virtual void drawProgressBar (Glib::RefPtr win, const Gdk::RGBA& foregr, const Gdk::RGBA& backgr, int x, int w, int y, int h) {} - virtual std::vector > getIconsOnImageArea (); - virtual std::vector > getSpecificityIconsOnImageArea (); + virtual std::vector > getIconsOnImageArea (); + virtual std::vector > getSpecificityIconsOnImageArea (); virtual void getIconSize (int& w, int& h); virtual bool motionNotify (int x, int y); diff --git a/rtgui/whitebalance.cc b/rtgui/whitebalance.cc index 681ac16c2..cf46f370b 100644 --- a/rtgui/whitebalance.cc +++ b/rtgui/whitebalance.cc @@ -34,34 +34,34 @@ using namespace rtengine; using namespace rtengine::procparams; -Glib::RefPtr WhiteBalance::wbPixbufs[toUnderlying(WBEntry::Type::CUSTOM) + 1]; +Glib::RefPtr WhiteBalance::wbIcon[toUnderlying(WBEntry::Type::CUSTOM) + 1]; /* -Glib::RefPtr WhiteBalance::wbCameraPB, WhiteBalance::wbAutoPB, WhiteBalance::wbSunPB, WhiteBalance::wbTungstenPB, +Glib::RefPtr WhiteBalance::wbCameraPB, WhiteBalance::wbAutoPB, WhiteBalance::wbSunPB, WhiteBalance::wbTungstenPB, WhiteBalance::wbCloudyPB, WhiteBalance::wbShadePB, WhiteBalance::wbFluorescentPB, WhiteBalance::wbLampPB, WhiteBalance::wbFlashPB, WhiteBalance::wbLedPB, WhiteBalance::wbCustomPB; */ void WhiteBalance::init () { - wbPixbufs[toUnderlying(WBEntry::Type::CAMERA)] = RTImage::createFromFile ("wb-camera-small.png"); - wbPixbufs[toUnderlying(WBEntry::Type::AUTO)] = RTImage::createFromFile ("wb-auto-small.png"); - wbPixbufs[toUnderlying(WBEntry::Type::DAYLIGHT)] = RTImage::createFromFile ("wb-sun-small.png"); - wbPixbufs[toUnderlying(WBEntry::Type::CLOUDY)] = RTImage::createFromFile ("wb-cloudy-small.png"); - wbPixbufs[toUnderlying(WBEntry::Type::SHADE)] = RTImage::createFromFile ("wb-shade-small.png"); - wbPixbufs[toUnderlying(WBEntry::Type::WATER)] = RTImage::createFromFile ("wb-water-small.png"); - //wbPixbufs[WBEntry::Type::WATER2] = RTImage::createFromFile ("wb-water-small.png"); - wbPixbufs[toUnderlying(WBEntry::Type::TUNGSTEN)] = RTImage::createFromFile ("wb-tungsten-small.png"); - wbPixbufs[toUnderlying(WBEntry::Type::FLUORESCENT)] = RTImage::createFromFile ("wb-fluorescent-small.png"); - wbPixbufs[toUnderlying(WBEntry::Type::LAMP)] = RTImage::createFromFile ("wb-lamp-small.png"); - wbPixbufs[toUnderlying(WBEntry::Type::FLASH)] = RTImage::createFromFile ("wb-flash-small.png"); - wbPixbufs[toUnderlying(WBEntry::Type::LED)] = RTImage::createFromFile ("wb-led-small.png"); - wbPixbufs[toUnderlying(WBEntry::Type::CUSTOM)] = RTImage::createFromFile ("wb-custom-small.png"); + wbIcon[toUnderlying(WBEntry::Type::CAMERA)] = Glib::RefPtr( new RTImage("wb-camera-small.png")); + wbIcon[toUnderlying(WBEntry::Type::AUTO)] = Glib::RefPtr( new RTImage("wb-auto-small.png")); + wbIcon[toUnderlying(WBEntry::Type::DAYLIGHT)] = Glib::RefPtr( new RTImage("wb-sun-small.png")); + wbIcon[toUnderlying(WBEntry::Type::CLOUDY)] = Glib::RefPtr( new RTImage("wb-cloudy-small.png")); + wbIcon[toUnderlying(WBEntry::Type::SHADE)] = Glib::RefPtr( new RTImage("wb-shade-small.png")); + wbIcon[toUnderlying(WBEntry::Type::WATER)] = Glib::RefPtr( new RTImage("wb-water-small.png")); + //wbIcon[toUnderlying(WBEntry::Type::WATER2)] = Glib::RefPtr( new RTImage("wb-water-small.png")); + wbIcon[toUnderlying(WBEntry::Type::TUNGSTEN)] = Glib::RefPtr( new RTImage("wb-tungsten-small.png")); + wbIcon[toUnderlying(WBEntry::Type::FLUORESCENT)] = Glib::RefPtr( new RTImage("wb-fluorescent-small.png")); + wbIcon[toUnderlying(WBEntry::Type::LAMP)] = Glib::RefPtr( new RTImage("wb-lamp-small.png")); + wbIcon[toUnderlying(WBEntry::Type::FLASH)] = Glib::RefPtr( new RTImage("wb-flash-small.png")); + wbIcon[toUnderlying(WBEntry::Type::LED)] = Glib::RefPtr( new RTImage("wb-led-small.png")); + wbIcon[toUnderlying(WBEntry::Type::CUSTOM)] = Glib::RefPtr( new RTImage("wb-custom-small.png")); } void WhiteBalance::cleanup () { for (unsigned int i = 0; i < toUnderlying(WBEntry::Type::CUSTOM) + 1; i++) { - wbPixbufs[i].reset(); + wbIcon[i].reset(); } } @@ -173,7 +173,7 @@ WhiteBalance::WhiteBalance () : FoldableToolPanel(this, "whitebalance", M("TP_WB if (currType == WBEntry::Type::FLUORESCENT) { // Creating the Fluorescent subcategory header row = *(refTreeModel->append()); - row[methodColumns.colIcon] = wbPixbufs[toUnderlying(currType)]; + row[methodColumns.colIcon] = wbIcon[toUnderlying(currType)]; row[methodColumns.colLabel] = M("TP_WBALANCE_FLUO_HEADER"); row[methodColumns.colId] = i + 100; } @@ -181,7 +181,7 @@ WhiteBalance::WhiteBalance () : FoldableToolPanel(this, "whitebalance", M("TP_WB if (currType == WBEntry::Type::WATER) { // Creating the under water subcategory header row = *(refTreeModel->append()); - row[methodColumns.colIcon] = wbPixbufs[toUnderlying(currType)]; + row[methodColumns.colIcon] = wbIcon[toUnderlying(currType)]; row[methodColumns.colLabel] = M("TP_WBALANCE_WATER_HEADER"); row[methodColumns.colId] = i + 100; } @@ -189,7 +189,7 @@ WhiteBalance::WhiteBalance () : FoldableToolPanel(this, "whitebalance", M("TP_WB if (currType == WBEntry::Type::LAMP) { // Creating the Lamp subcategory header row = *(refTreeModel->append()); - row[methodColumns.colIcon] = wbPixbufs[toUnderlying(currType)]; + row[methodColumns.colIcon] = wbIcon[toUnderlying(currType)]; row[methodColumns.colLabel] = M("TP_WBALANCE_LAMP_HEADER"); row[methodColumns.colId] = i + 100; } @@ -197,7 +197,7 @@ WhiteBalance::WhiteBalance () : FoldableToolPanel(this, "whitebalance", M("TP_WB if (currType == WBEntry::Type::LED) { // Creating the LED subcategory header row = *(refTreeModel->append()); - row[methodColumns.colIcon] = wbPixbufs[toUnderlying(currType)]; + row[methodColumns.colIcon] = wbIcon[toUnderlying(currType)]; row[methodColumns.colLabel] = M("TP_WBALANCE_LED_HEADER"); row[methodColumns.colId] = i + 100; } @@ -205,7 +205,7 @@ WhiteBalance::WhiteBalance () : FoldableToolPanel(this, "whitebalance", M("TP_WB if (currType == WBEntry::Type::FLASH) { // Creating the Flash subcategory header row = *(refTreeModel->append()); - row[methodColumns.colIcon] = wbPixbufs[toUnderlying(currType)]; + row[methodColumns.colIcon] = wbIcon[toUnderlying(currType)]; row[methodColumns.colLabel] = M("TP_WBALANCE_FLASH_HEADER"); row[methodColumns.colId] = i + 100; } @@ -218,12 +218,12 @@ WhiteBalance::WhiteBalance () : FoldableToolPanel(this, "whitebalance", M("TP_WB || currType == WBEntry::Type::LED ) { childrow = *(refTreeModel->append(row.children())); - childrow[methodColumns.colIcon] = wbPixbufs[toUnderlying(currType)]; + childrow[methodColumns.colIcon] = wbIcon[toUnderlying(currType)]; childrow[methodColumns.colLabel] = WBParams::getWbEntries()[i].GUILabel; childrow[methodColumns.colId] = i; } else { row = *(refTreeModel->append()); - row[methodColumns.colIcon] = wbPixbufs[toUnderlying(currType)]; + row[methodColumns.colIcon] = wbIcon[toUnderlying(currType)]; row[methodColumns.colLabel] = WBParams::getWbEntries()[i].GUILabel; row[methodColumns.colId] = i; } diff --git a/rtgui/whitebalance.h b/rtgui/whitebalance.h index 8603d1c59..b774075c0 100644 --- a/rtgui/whitebalance.h +++ b/rtgui/whitebalance.h @@ -46,7 +46,7 @@ protected: class MethodColumns : public Gtk::TreeModel::ColumnRecord { public: - Gtk::TreeModelColumn< Glib::RefPtr > colIcon; + Gtk::TreeModelColumn< Glib::RefPtr > colIcon; Gtk::TreeModelColumn colLabel; Gtk::TreeModelColumn colId; MethodColumns() @@ -57,7 +57,7 @@ protected: } }; - static Glib::RefPtr wbPixbufs[rtengine::toUnderlying(rtengine::procparams::WBEntry::Type::CUSTOM) + 1]; + static Glib::RefPtr wbIcon[rtengine::toUnderlying(rtengine::procparams::WBEntry::Type::CUSTOM) + 1]; Glib::RefPtr refTreeModel; MethodColumns methodColumns; MyComboBox* method;