Merge pull request #4622 from nextcloud/feature/generate-state-icons-…

…from-svg Feature/generate state icons from svg
nextcloud · Jun 10, 2022 · d7217d1 · d7217d1
2 parents 7566d03 + db9d83b
commit d7217d1
Show file tree

Hide file tree

Showing 92 changed files with 27 additions and 3 deletions.
diff --git 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
@@ -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
diff --git a/theme/black/state-error-16.png b/theme/black/state-error-16.png
diff --git a/theme/black/state-error-256.png b/theme/black/state-error-256.png
diff --git a/theme/black/state-error-32.png b/theme/black/state-error-32.png
diff --git a/theme/black/state-error-64.png b/theme/black/state-error-64.png
diff --git a/theme/black/state-offline-128.png b/theme/black/state-offline-128.png
diff --git a/theme/black/state-offline-16.png b/theme/black/state-offline-16.png
diff --git a/theme/black/state-offline-256.png b/theme/black/state-offline-256.png
diff --git a/theme/black/state-offline-32.png b/theme/black/state-offline-32.png
diff --git a/theme/black/state-offline-64.png b/theme/black/state-offline-64.png
diff --git a/theme/black/state-ok-128.png b/theme/black/state-ok-128.png
diff --git a/theme/black/state-ok-16.png b/theme/black/state-ok-16.png
diff --git a/theme/black/state-ok-256.png b/theme/black/state-ok-256.png
diff --git a/theme/black/state-ok-32.png b/theme/black/state-ok-32.png
diff --git a/theme/black/state-ok-64.png b/theme/black/state-ok-64.png
diff --git a/theme/black/state-pause-128.png b/theme/black/state-pause-128.png
diff --git a/theme/black/state-pause-16.png b/theme/black/state-pause-16.png
diff --git a/theme/black/state-pause-256.png b/theme/black/state-pause-256.png
diff --git a/theme/black/state-pause-32.png b/theme/black/state-pause-32.png
diff --git a/theme/black/state-pause-64.png b/theme/black/state-pause-64.png
diff --git a/theme/black/state-sync-128.png b/theme/black/state-sync-128.png
diff --git a/theme/black/state-sync-16.png b/theme/black/state-sync-16.png
diff --git a/theme/black/state-sync-256.png b/theme/black/state-sync-256.png
diff --git a/theme/black/state-sync-32.png b/theme/black/state-sync-32.png
diff --git a/theme/black/state-sync-64.png b/theme/black/state-sync-64.png
diff --git a/theme/black/state-warning-128.png b/theme/black/state-warning-128.png
diff --git a/theme/black/state-warning-16.png b/theme/black/state-warning-16.png
diff --git a/theme/black/state-warning-256.png b/theme/black/state-warning-256.png
diff --git a/theme/black/state-warning-32.png b/theme/black/state-warning-32.png
diff --git a/theme/black/state-warning-64.png b/theme/black/state-warning-64.png
diff --git a/theme/colored/state-error-128.png b/theme/colored/state-error-128.png
diff --git a/theme/colored/state-error-16.png b/theme/colored/state-error-16.png
diff --git a/theme/colored/state-error-256.png b/theme/colored/state-error-256.png
diff --git a/theme/colored/state-error-32.png b/theme/colored/state-error-32.png
diff --git a/theme/colored/state-error-64.png b/theme/colored/state-error-64.png
diff --git a/theme/colored/state-offline-128.png b/theme/colored/state-offline-128.png
diff --git a/theme/colored/state-offline-16.png b/theme/colored/state-offline-16.png
diff --git a/theme/colored/state-offline-256.png b/theme/colored/state-offline-256.png
diff --git a/theme/colored/state-offline-32.png b/theme/colored/state-offline-32.png
diff --git a/theme/colored/state-offline-64.png b/theme/colored/state-offline-64.png
diff --git a/theme/colored/state-ok-128.png b/theme/colored/state-ok-128.png
diff --git a/theme/colored/state-ok-16.png b/theme/colored/state-ok-16.png
diff --git a/theme/colored/state-ok-256.png b/theme/colored/state-ok-256.png
diff --git a/theme/colored/state-ok-32.png b/theme/colored/state-ok-32.png
diff --git a/theme/colored/state-ok-64.png b/theme/colored/state-ok-64.png
diff --git a/theme/colored/state-pause-128.png b/theme/colored/state-pause-128.png
diff --git a/theme/colored/state-pause-16.png b/theme/colored/state-pause-16.png
diff --git a/theme/colored/state-pause-256.png b/theme/colored/state-pause-256.png
diff --git a/theme/colored/state-pause-32.png b/theme/colored/state-pause-32.png
diff --git a/theme/colored/state-pause-64.png b/theme/colored/state-pause-64.png
diff --git a/theme/colored/state-sync-128.png b/theme/colored/state-sync-128.png
diff --git a/theme/colored/state-sync-16.png b/theme/colored/state-sync-16.png
diff --git a/theme/colored/state-sync-256.png b/theme/colored/state-sync-256.png
diff --git a/theme/colored/state-sync-32.png b/theme/colored/state-sync-32.png
diff --git a/theme/colored/state-sync-64.png b/theme/colored/state-sync-64.png
diff --git a/theme/colored/state-warning-128.png b/theme/colored/state-warning-128.png
diff --git a/theme/colored/state-warning-16.png b/theme/colored/state-warning-16.png
diff --git a/theme/colored/state-warning-256.png b/theme/colored/state-warning-256.png
diff --git a/theme/colored/state-warning-32.png b/theme/colored/state-warning-32.png
diff --git a/theme/colored/state-warning-64.png b/theme/colored/state-warning-64.png
diff --git a/theme/white/state-error-128.png b/theme/white/state-error-128.png
diff --git a/theme/white/state-error-16.png b/theme/white/state-error-16.png
diff --git a/theme/white/state-error-256.png b/theme/white/state-error-256.png
diff --git a/theme/white/state-error-32.png b/theme/white/state-error-32.png
diff --git a/theme/white/state-error-64.png b/theme/white/state-error-64.png
diff --git a/theme/white/state-offline-128.png b/theme/white/state-offline-128.png
diff --git a/theme/white/state-offline-16.png b/theme/white/state-offline-16.png
diff --git a/theme/white/state-offline-256.png b/theme/white/state-offline-256.png
diff --git a/theme/white/state-offline-32.png b/theme/white/state-offline-32.png
diff --git a/theme/white/state-offline-64.png b/theme/white/state-offline-64.png
diff --git a/theme/white/state-ok-128.png b/theme/white/state-ok-128.png
diff --git a/theme/white/state-ok-16.png b/theme/white/state-ok-16.png
diff --git a/theme/white/state-ok-256.png b/theme/white/state-ok-256.png
diff --git a/theme/white/state-ok-32.png b/theme/white/state-ok-32.png
diff --git a/theme/white/state-ok-64.png b/theme/white/state-ok-64.png
diff --git a/theme/white/state-pause-128.png b/theme/white/state-pause-128.png
diff --git a/theme/white/state-pause-16.png b/theme/white/state-pause-16.png
diff --git a/theme/white/state-pause-256.png b/theme/white/state-pause-256.png
diff --git a/theme/white/state-pause-32.png b/theme/white/state-pause-32.png
diff --git a/theme/white/state-pause-64.png b/theme/white/state-pause-64.png
diff --git a/theme/white/state-sync-128.png b/theme/white/state-sync-128.png
diff --git a/theme/white/state-sync-16.png b/theme/white/state-sync-16.png
diff --git a/theme/white/state-sync-256.png b/theme/white/state-sync-256.png
diff --git a/theme/white/state-sync-32.png b/theme/white/state-sync-32.png
diff --git a/theme/white/state-sync-64.png b/theme/white/state-sync-64.png
diff --git a/theme/white/state-warning-128.png b/theme/white/state-warning-128.png
diff --git a/theme/white/state-warning-16.png b/theme/white/state-warning-16.png
diff --git a/theme/white/state-warning-256.png b/theme/white/state-warning-256.png
diff --git a/theme/white/state-warning-32.png b/theme/white/state-warning-32.png
diff --git a/theme/white/state-warning-64.png b/theme/white/state-warning-64.png