diff --git a/.gitignore b/.gitignore index dcd25d421c3a3..249c4a2c7c346 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 9209968367385..0f0d4c9e50d56 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 51547e39f6e65..0000000000000 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 50d1437709f9a..0000000000000 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 3929a9077990a..0000000000000 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 44ed474280eff..0000000000000 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 00891049ceb64..0000000000000 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 dd57aafc123d0..0000000000000 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 9270cf3b7eb4c..0000000000000 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 32bbd257b1d29..0000000000000 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 3a29e4acd7a86..0000000000000 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 7f2a47c6695a8..0000000000000 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 f5fd5d9f482a5..0000000000000 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 b4fbfe6ccae7e..0000000000000 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 cf138ee4d4384..0000000000000 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 f0e878cef808a..0000000000000 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 b6f88cd1d5668..0000000000000 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 b0d635b4b4520..0000000000000 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 25b41929a5e20..0000000000000 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 2d25d0e2fbfc3..0000000000000 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 ffc57f9cbdfd1..0000000000000 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 97cf3b1d5358c..0000000000000 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 730eeb420b954..0000000000000 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 b34040d4d6755..0000000000000 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 b69e8a7fe0b1d..0000000000000 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 fdf2cebb09a38..0000000000000 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 068287fb4a784..0000000000000 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 1f1e7be77b26a..0000000000000 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 a4ba05d96d623..0000000000000 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 e4d11c6ffe4f3..0000000000000 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 651f049443c35..0000000000000 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 bef3b9f4b652e..0000000000000 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 b8654f93451a3..0000000000000 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 ae39c60d62303..0000000000000 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 2a23976b2d3e1..0000000000000 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 e6891b4dc4b25..0000000000000 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 8349bed8adb47..0000000000000 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 38015f55163e2..0000000000000 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 d0046d8ebd51f..0000000000000 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 e889a02b7bd9a..0000000000000 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 73f2c56d50744..0000000000000 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 9467e2cffc232..0000000000000 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 38b3938b0936c..0000000000000 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 61e73812add89..0000000000000 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 b1f5a40d318f9..0000000000000 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 e6dd2a6f80eff..0000000000000 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 5268ed0245cf4..0000000000000 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 a423df502339d..0000000000000 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 0563bf3f1fa0e..0000000000000 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 cc52d94f31748..0000000000000 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 5853fa4886b68..0000000000000 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 76d6192d87213..0000000000000 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 1bd18e70be534..0000000000000 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 686af598b2b2e..0000000000000 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 4d72cc03df03f..0000000000000 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 ea92f3a494f5e..0000000000000 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 fff5ee4fd413d..0000000000000 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 7330ff100cb95..0000000000000 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 1f47731896de4..0000000000000 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 d7dd0f1fd6c10..0000000000000 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 4b2a718b11b15..0000000000000 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 1e8f501947d54..0000000000000 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 5a43539ac5181..0000000000000 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 9727647a60cc4..0000000000000 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 d99711271eb27..0000000000000 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 74bab33d16385..0000000000000 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 67043c001573c..0000000000000 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 46742d4d7a496..0000000000000 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 b1fd238c85f4c..0000000000000 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 25b563a5f680c..0000000000000 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 3e78bc15bc646..0000000000000 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 3bc947c578240..0000000000000 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 9157e5405d033..0000000000000 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 90b00ab040a6a..0000000000000 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 d0f10ec50cd9d..0000000000000 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 6a528d49fa34a..0000000000000 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 5c991270d8571..0000000000000 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 d3f741a4b0b18..0000000000000 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 3a217cc840fcd..0000000000000 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 092cc30ebbe8c..0000000000000 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 788274be2d325..0000000000000 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 042b71da75e5b..0000000000000 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 71ae65637dd48..0000000000000 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 cf502d0158bab..0000000000000 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 9468065a07cd3..0000000000000 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 41ffb660e5305..0000000000000 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 6c556a1358a40..0000000000000 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 872301947898e..0000000000000 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 a52e73e3c98a7..0000000000000 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 79e996b6ddebf..0000000000000 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 7475c0db51429..0000000000000 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 bc68129649ba7..0000000000000 Binary files a/theme/white/state-warning-64.png and /dev/null differ