diff --git a/.gitignore b/.gitignore index dcd25d421c..249c4a2c7c 100644 --- a/.gitignore +++ b/.gitignore @@ -187,4 +187,5 @@ convert.exe *-icon-win-folder.png *-sidebar.png *-w10startmenu.png +*state-*.png theme.qrc diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 9209968367..0f0d4c9e50 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -376,7 +376,7 @@ endif() function(generate_sized_png_from_svg icon_path size) set(options) - set(oneValueArgs OUTPUT_ICON_NAME OUTPUT_ICON_PATH) + set(oneValueArgs OUTPUT_ICON_NAME OUTPUT_ICON_FULL_NAME_WLE OUTPUT_ICON_PATH) set(multiValueArgs) cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) @@ -392,11 +392,17 @@ function(generate_sized_png_from_svg icon_path size) set(icon_name_dir ${ARG_OUTPUT_ICON_PATH}) endif () - if (EXISTS "${icon_name_dir}/${size}-${icon_name_wle}.png") + set(output_icon_full_name_wle "${size}-${icon_name_wle}") + + if (ARG_OUTPUT_ICON_FULL_NAME_WLE) + set(output_icon_full_name_wle ${ARG_OUTPUT_ICON_FULL_NAME_WLE}) + endif () + + if (EXISTS "${icon_name_dir}/${output_icon_full_name_wle}.png") return() endif() - set(icon_output_name "${size}-${icon_name_wle}.png") + set(icon_output_name "${output_icon_full_name_wle}.png") message(STATUS "Generate ${icon_output_name}") execute_process(COMMAND "${SVG_CONVERTER}" -w ${size} -h ${size} "${icon_path}" -o "${icon_output_name}" @@ -413,6 +419,23 @@ function(generate_sized_png_from_svg icon_path size) endif() endfunction() +set(STATE_ICONS_COLORS colored black white) + +foreach(state_icons_color ${STATE_ICONS_COLORS}) + set(STATE_ICONS_PATH "${theme_dir}/${state_icons_color}/") + + message("Generating state icons from SVG in path: "${STATE_ICONS_PATH}) + + file(GLOB_RECURSE STATE_ICONS_SVG "${STATE_ICONS_PATH}/state-*.svg") + + foreach(state_icon_svg ${STATE_ICONS_SVG}) + get_filename_component(status_icon_name_wle ${state_icon_svg} NAME_WLE) + foreach(size IN ITEMS 16;32;64;128;256) + generate_sized_png_from_svg(${state_icon_svg} ${size} OUTPUT_ICON_FULL_NAME_WLE "${status_icon_name_wle}-${size}") + endforeach() + endforeach() +endforeach() + if ((APPLICATION_ICON_SET MATCHES "PNG") AND (NOT EXISTS "${theme_dir}/colored/${APPLICATION_ICON_NAME}-icon.svg")) diff --git a/theme/black/state-error-128.png b/theme/black/state-error-128.png deleted file mode 100644 index 51547e39f6..0000000000 Binary files a/theme/black/state-error-128.png and /dev/null differ diff --git a/theme/black/state-error-16.png b/theme/black/state-error-16.png deleted file mode 100644 index 50d1437709..0000000000 Binary files a/theme/black/state-error-16.png and /dev/null differ diff --git a/theme/black/state-error-256.png b/theme/black/state-error-256.png deleted file mode 100644 index 3929a90779..0000000000 Binary files a/theme/black/state-error-256.png and /dev/null differ diff --git a/theme/black/state-error-32.png b/theme/black/state-error-32.png deleted file mode 100644 index 44ed474280..0000000000 Binary files a/theme/black/state-error-32.png and /dev/null differ diff --git a/theme/black/state-error-64.png b/theme/black/state-error-64.png deleted file mode 100644 index 00891049ce..0000000000 Binary files a/theme/black/state-error-64.png and /dev/null differ diff --git a/theme/black/state-offline-128.png b/theme/black/state-offline-128.png deleted file mode 100644 index dd57aafc12..0000000000 Binary files a/theme/black/state-offline-128.png and /dev/null differ diff --git a/theme/black/state-offline-16.png b/theme/black/state-offline-16.png deleted file mode 100644 index 9270cf3b7e..0000000000 Binary files a/theme/black/state-offline-16.png and /dev/null differ diff --git a/theme/black/state-offline-256.png b/theme/black/state-offline-256.png deleted file mode 100644 index 32bbd257b1..0000000000 Binary files a/theme/black/state-offline-256.png and /dev/null differ diff --git a/theme/black/state-offline-32.png b/theme/black/state-offline-32.png deleted file mode 100644 index 3a29e4acd7..0000000000 Binary files a/theme/black/state-offline-32.png and /dev/null differ diff --git a/theme/black/state-offline-64.png b/theme/black/state-offline-64.png deleted file mode 100644 index 7f2a47c669..0000000000 Binary files a/theme/black/state-offline-64.png and /dev/null differ diff --git a/theme/black/state-ok-128.png b/theme/black/state-ok-128.png deleted file mode 100644 index f5fd5d9f48..0000000000 Binary files a/theme/black/state-ok-128.png and /dev/null differ diff --git a/theme/black/state-ok-16.png b/theme/black/state-ok-16.png deleted file mode 100644 index b4fbfe6cca..0000000000 Binary files a/theme/black/state-ok-16.png and /dev/null differ diff --git a/theme/black/state-ok-256.png b/theme/black/state-ok-256.png deleted file mode 100644 index cf138ee4d4..0000000000 Binary files a/theme/black/state-ok-256.png and /dev/null differ diff --git a/theme/black/state-ok-32.png b/theme/black/state-ok-32.png deleted file mode 100644 index f0e878cef8..0000000000 Binary files a/theme/black/state-ok-32.png and /dev/null differ diff --git a/theme/black/state-ok-64.png b/theme/black/state-ok-64.png deleted file mode 100644 index b6f88cd1d5..0000000000 Binary files a/theme/black/state-ok-64.png and /dev/null differ diff --git a/theme/black/state-pause-128.png b/theme/black/state-pause-128.png deleted file mode 100644 index b0d635b4b4..0000000000 Binary files a/theme/black/state-pause-128.png and /dev/null differ diff --git a/theme/black/state-pause-16.png b/theme/black/state-pause-16.png deleted file mode 100644 index 25b41929a5..0000000000 Binary files a/theme/black/state-pause-16.png and /dev/null differ diff --git a/theme/black/state-pause-256.png b/theme/black/state-pause-256.png deleted file mode 100644 index 2d25d0e2fb..0000000000 Binary files a/theme/black/state-pause-256.png and /dev/null differ diff --git a/theme/black/state-pause-32.png b/theme/black/state-pause-32.png deleted file mode 100644 index ffc57f9cbd..0000000000 Binary files a/theme/black/state-pause-32.png and /dev/null differ diff --git a/theme/black/state-pause-64.png b/theme/black/state-pause-64.png deleted file mode 100644 index 97cf3b1d53..0000000000 Binary files a/theme/black/state-pause-64.png and /dev/null differ diff --git a/theme/black/state-sync-128.png b/theme/black/state-sync-128.png deleted file mode 100644 index 730eeb420b..0000000000 Binary files a/theme/black/state-sync-128.png and /dev/null differ diff --git a/theme/black/state-sync-16.png b/theme/black/state-sync-16.png deleted file mode 100644 index b34040d4d6..0000000000 Binary files a/theme/black/state-sync-16.png and /dev/null differ diff --git a/theme/black/state-sync-256.png b/theme/black/state-sync-256.png deleted file mode 100644 index b69e8a7fe0..0000000000 Binary files a/theme/black/state-sync-256.png and /dev/null differ diff --git a/theme/black/state-sync-32.png b/theme/black/state-sync-32.png deleted file mode 100644 index fdf2cebb09..0000000000 Binary files a/theme/black/state-sync-32.png and /dev/null differ diff --git a/theme/black/state-sync-64.png b/theme/black/state-sync-64.png deleted file mode 100644 index 068287fb4a..0000000000 Binary files a/theme/black/state-sync-64.png and /dev/null differ diff --git a/theme/black/state-warning-128.png b/theme/black/state-warning-128.png deleted file mode 100644 index 1f1e7be77b..0000000000 Binary files a/theme/black/state-warning-128.png and /dev/null differ diff --git a/theme/black/state-warning-16.png b/theme/black/state-warning-16.png deleted file mode 100644 index a4ba05d96d..0000000000 Binary files a/theme/black/state-warning-16.png and /dev/null differ diff --git a/theme/black/state-warning-256.png b/theme/black/state-warning-256.png deleted file mode 100644 index e4d11c6ffe..0000000000 Binary files a/theme/black/state-warning-256.png and /dev/null differ diff --git a/theme/black/state-warning-32.png b/theme/black/state-warning-32.png deleted file mode 100644 index 651f049443..0000000000 Binary files a/theme/black/state-warning-32.png and /dev/null differ diff --git a/theme/black/state-warning-64.png b/theme/black/state-warning-64.png deleted file mode 100644 index bef3b9f4b6..0000000000 Binary files a/theme/black/state-warning-64.png and /dev/null differ diff --git a/theme/colored/state-error-128.png b/theme/colored/state-error-128.png deleted file mode 100644 index b8654f9345..0000000000 Binary files a/theme/colored/state-error-128.png and /dev/null differ diff --git a/theme/colored/state-error-16.png b/theme/colored/state-error-16.png deleted file mode 100644 index ae39c60d62..0000000000 Binary files a/theme/colored/state-error-16.png and /dev/null differ diff --git a/theme/colored/state-error-256.png b/theme/colored/state-error-256.png deleted file mode 100644 index 2a23976b2d..0000000000 Binary files a/theme/colored/state-error-256.png and /dev/null differ diff --git a/theme/colored/state-error-32.png b/theme/colored/state-error-32.png deleted file mode 100644 index e6891b4dc4..0000000000 Binary files a/theme/colored/state-error-32.png and /dev/null differ diff --git a/theme/colored/state-error-64.png b/theme/colored/state-error-64.png deleted file mode 100644 index 8349bed8ad..0000000000 Binary files a/theme/colored/state-error-64.png and /dev/null differ diff --git a/theme/colored/state-offline-128.png b/theme/colored/state-offline-128.png deleted file mode 100644 index 38015f5516..0000000000 Binary files a/theme/colored/state-offline-128.png and /dev/null differ diff --git a/theme/colored/state-offline-16.png b/theme/colored/state-offline-16.png deleted file mode 100644 index d0046d8ebd..0000000000 Binary files a/theme/colored/state-offline-16.png and /dev/null differ diff --git a/theme/colored/state-offline-256.png b/theme/colored/state-offline-256.png deleted file mode 100644 index e889a02b7b..0000000000 Binary files a/theme/colored/state-offline-256.png and /dev/null differ diff --git a/theme/colored/state-offline-32.png b/theme/colored/state-offline-32.png deleted file mode 100644 index 73f2c56d50..0000000000 Binary files a/theme/colored/state-offline-32.png and /dev/null differ diff --git a/theme/colored/state-offline-64.png b/theme/colored/state-offline-64.png deleted file mode 100644 index 9467e2cffc..0000000000 Binary files a/theme/colored/state-offline-64.png and /dev/null differ diff --git a/theme/colored/state-ok-128.png b/theme/colored/state-ok-128.png deleted file mode 100644 index 38b3938b09..0000000000 Binary files a/theme/colored/state-ok-128.png and /dev/null differ diff --git a/theme/colored/state-ok-16.png b/theme/colored/state-ok-16.png deleted file mode 100644 index 61e73812ad..0000000000 Binary files a/theme/colored/state-ok-16.png and /dev/null differ diff --git a/theme/colored/state-ok-256.png b/theme/colored/state-ok-256.png deleted file mode 100644 index b1f5a40d31..0000000000 Binary files a/theme/colored/state-ok-256.png and /dev/null differ diff --git a/theme/colored/state-ok-32.png b/theme/colored/state-ok-32.png deleted file mode 100644 index e6dd2a6f80..0000000000 Binary files a/theme/colored/state-ok-32.png and /dev/null differ diff --git a/theme/colored/state-ok-64.png b/theme/colored/state-ok-64.png deleted file mode 100644 index 5268ed0245..0000000000 Binary files a/theme/colored/state-ok-64.png and /dev/null differ diff --git a/theme/colored/state-pause-128.png b/theme/colored/state-pause-128.png deleted file mode 100644 index a423df5023..0000000000 Binary files a/theme/colored/state-pause-128.png and /dev/null differ diff --git a/theme/colored/state-pause-16.png b/theme/colored/state-pause-16.png deleted file mode 100644 index 0563bf3f1f..0000000000 Binary files a/theme/colored/state-pause-16.png and /dev/null differ diff --git a/theme/colored/state-pause-256.png b/theme/colored/state-pause-256.png deleted file mode 100644 index cc52d94f31..0000000000 Binary files a/theme/colored/state-pause-256.png and /dev/null differ diff --git a/theme/colored/state-pause-32.png b/theme/colored/state-pause-32.png deleted file mode 100644 index 5853fa4886..0000000000 Binary files a/theme/colored/state-pause-32.png and /dev/null differ diff --git a/theme/colored/state-pause-64.png b/theme/colored/state-pause-64.png deleted file mode 100644 index 76d6192d87..0000000000 Binary files a/theme/colored/state-pause-64.png and /dev/null differ diff --git a/theme/colored/state-sync-128.png b/theme/colored/state-sync-128.png deleted file mode 100644 index 1bd18e70be..0000000000 Binary files a/theme/colored/state-sync-128.png and /dev/null differ diff --git a/theme/colored/state-sync-16.png b/theme/colored/state-sync-16.png deleted file mode 100644 index 686af598b2..0000000000 Binary files a/theme/colored/state-sync-16.png and /dev/null differ diff --git a/theme/colored/state-sync-256.png b/theme/colored/state-sync-256.png deleted file mode 100644 index 4d72cc03df..0000000000 Binary files a/theme/colored/state-sync-256.png and /dev/null differ diff --git a/theme/colored/state-sync-32.png b/theme/colored/state-sync-32.png deleted file mode 100644 index ea92f3a494..0000000000 Binary files a/theme/colored/state-sync-32.png and /dev/null differ diff --git a/theme/colored/state-sync-64.png b/theme/colored/state-sync-64.png deleted file mode 100644 index fff5ee4fd4..0000000000 Binary files a/theme/colored/state-sync-64.png and /dev/null differ diff --git a/theme/colored/state-warning-128.png b/theme/colored/state-warning-128.png deleted file mode 100644 index 7330ff100c..0000000000 Binary files a/theme/colored/state-warning-128.png and /dev/null differ diff --git a/theme/colored/state-warning-16.png b/theme/colored/state-warning-16.png deleted file mode 100644 index 1f47731896..0000000000 Binary files a/theme/colored/state-warning-16.png and /dev/null differ diff --git a/theme/colored/state-warning-256.png b/theme/colored/state-warning-256.png deleted file mode 100644 index d7dd0f1fd6..0000000000 Binary files a/theme/colored/state-warning-256.png and /dev/null differ diff --git a/theme/colored/state-warning-32.png b/theme/colored/state-warning-32.png deleted file mode 100644 index 4b2a718b11..0000000000 Binary files a/theme/colored/state-warning-32.png and /dev/null differ diff --git a/theme/colored/state-warning-64.png b/theme/colored/state-warning-64.png deleted file mode 100644 index 1e8f501947..0000000000 Binary files a/theme/colored/state-warning-64.png and /dev/null differ diff --git a/theme/white/state-error-128.png b/theme/white/state-error-128.png deleted file mode 100644 index 5a43539ac5..0000000000 Binary files a/theme/white/state-error-128.png and /dev/null differ diff --git a/theme/white/state-error-16.png b/theme/white/state-error-16.png deleted file mode 100644 index 9727647a60..0000000000 Binary files a/theme/white/state-error-16.png and /dev/null differ diff --git a/theme/white/state-error-256.png b/theme/white/state-error-256.png deleted file mode 100644 index d99711271e..0000000000 Binary files a/theme/white/state-error-256.png and /dev/null differ diff --git a/theme/white/state-error-32.png b/theme/white/state-error-32.png deleted file mode 100644 index 74bab33d16..0000000000 Binary files a/theme/white/state-error-32.png and /dev/null differ diff --git a/theme/white/state-error-64.png b/theme/white/state-error-64.png deleted file mode 100644 index 67043c0015..0000000000 Binary files a/theme/white/state-error-64.png and /dev/null differ diff --git a/theme/white/state-offline-128.png b/theme/white/state-offline-128.png deleted file mode 100644 index 46742d4d7a..0000000000 Binary files a/theme/white/state-offline-128.png and /dev/null differ diff --git a/theme/white/state-offline-16.png b/theme/white/state-offline-16.png deleted file mode 100644 index b1fd238c85..0000000000 Binary files a/theme/white/state-offline-16.png and /dev/null differ diff --git a/theme/white/state-offline-256.png b/theme/white/state-offline-256.png deleted file mode 100644 index 25b563a5f6..0000000000 Binary files a/theme/white/state-offline-256.png and /dev/null differ diff --git a/theme/white/state-offline-32.png b/theme/white/state-offline-32.png deleted file mode 100644 index 3e78bc15bc..0000000000 Binary files a/theme/white/state-offline-32.png and /dev/null differ diff --git a/theme/white/state-offline-64.png b/theme/white/state-offline-64.png deleted file mode 100644 index 3bc947c578..0000000000 Binary files a/theme/white/state-offline-64.png and /dev/null differ diff --git a/theme/white/state-ok-128.png b/theme/white/state-ok-128.png deleted file mode 100644 index 9157e5405d..0000000000 Binary files a/theme/white/state-ok-128.png and /dev/null differ diff --git a/theme/white/state-ok-16.png b/theme/white/state-ok-16.png deleted file mode 100644 index 90b00ab040..0000000000 Binary files a/theme/white/state-ok-16.png and /dev/null differ diff --git a/theme/white/state-ok-256.png b/theme/white/state-ok-256.png deleted file mode 100644 index d0f10ec50c..0000000000 Binary files a/theme/white/state-ok-256.png and /dev/null differ diff --git a/theme/white/state-ok-32.png b/theme/white/state-ok-32.png deleted file mode 100644 index 6a528d49fa..0000000000 Binary files a/theme/white/state-ok-32.png and /dev/null differ diff --git a/theme/white/state-ok-64.png b/theme/white/state-ok-64.png deleted file mode 100644 index 5c991270d8..0000000000 Binary files a/theme/white/state-ok-64.png and /dev/null differ diff --git a/theme/white/state-pause-128.png b/theme/white/state-pause-128.png deleted file mode 100644 index d3f741a4b0..0000000000 Binary files a/theme/white/state-pause-128.png and /dev/null differ diff --git a/theme/white/state-pause-16.png b/theme/white/state-pause-16.png deleted file mode 100644 index 3a217cc840..0000000000 Binary files a/theme/white/state-pause-16.png and /dev/null differ diff --git a/theme/white/state-pause-256.png b/theme/white/state-pause-256.png deleted file mode 100644 index 092cc30ebb..0000000000 Binary files a/theme/white/state-pause-256.png and /dev/null differ diff --git a/theme/white/state-pause-32.png b/theme/white/state-pause-32.png deleted file mode 100644 index 788274be2d..0000000000 Binary files a/theme/white/state-pause-32.png and /dev/null differ diff --git a/theme/white/state-pause-64.png b/theme/white/state-pause-64.png deleted file mode 100644 index 042b71da75..0000000000 Binary files a/theme/white/state-pause-64.png and /dev/null differ diff --git a/theme/white/state-sync-128.png b/theme/white/state-sync-128.png deleted file mode 100644 index 71ae65637d..0000000000 Binary files a/theme/white/state-sync-128.png and /dev/null differ diff --git a/theme/white/state-sync-16.png b/theme/white/state-sync-16.png deleted file mode 100644 index cf502d0158..0000000000 Binary files a/theme/white/state-sync-16.png and /dev/null differ diff --git a/theme/white/state-sync-256.png b/theme/white/state-sync-256.png deleted file mode 100644 index 9468065a07..0000000000 Binary files a/theme/white/state-sync-256.png and /dev/null differ diff --git a/theme/white/state-sync-32.png b/theme/white/state-sync-32.png deleted file mode 100644 index 41ffb660e5..0000000000 Binary files a/theme/white/state-sync-32.png and /dev/null differ diff --git a/theme/white/state-sync-64.png b/theme/white/state-sync-64.png deleted file mode 100644 index 6c556a1358..0000000000 Binary files a/theme/white/state-sync-64.png and /dev/null differ diff --git a/theme/white/state-warning-128.png b/theme/white/state-warning-128.png deleted file mode 100644 index 8723019478..0000000000 Binary files a/theme/white/state-warning-128.png and /dev/null differ diff --git a/theme/white/state-warning-16.png b/theme/white/state-warning-16.png deleted file mode 100644 index a52e73e3c9..0000000000 Binary files a/theme/white/state-warning-16.png and /dev/null differ diff --git a/theme/white/state-warning-256.png b/theme/white/state-warning-256.png deleted file mode 100644 index 79e996b6dd..0000000000 Binary files a/theme/white/state-warning-256.png and /dev/null differ diff --git a/theme/white/state-warning-32.png b/theme/white/state-warning-32.png deleted file mode 100644 index 7475c0db51..0000000000 Binary files a/theme/white/state-warning-32.png and /dev/null differ diff --git a/theme/white/state-warning-64.png b/theme/white/state-warning-64.png deleted file mode 100644 index bc68129649..0000000000 Binary files a/theme/white/state-warning-64.png and /dev/null differ