[gimp] icons, tools: new icon lists for modules.



commit ddd9fe8bdcc53e85c57ddaf23267c7fa9b1475bd
Author: Jehan <jehan girinstud io>
Date:   Mon Jan 31 17:59:11 2022 +0100

    icons, tools: new icon lists for modules.

 icons/Color/icon-list.mk              | 93 +++++++++++++++++++----------------
 icons/Color/meson.build               |  8 ++-
 icons/Symbolic/icon-list.mk           | 93 +++++++++++++++++++----------------
 icons/Symbolic/meson.build            | 10 ++--
 icons/icon-lists/bitmap_16.list       | 16 +-----
 icons/icon-lists/bitmap_24.list       | 13 +----
 icons/icon-lists/bitmap_32.list       |  6 +++
 icons/icon-lists/color-selectors.list | 20 ++++++++
 icons/icon-lists/controllers.list     | 14 ++++++
 icons/icon-lists/display-filters.list | 14 ++++++
 icons/icon-lists/scalable.list        | 15 ------
 tools/generate-icon-makefiles.py      | 16 ++++--
 12 files changed, 182 insertions(+), 136 deletions(-)
---
diff --git a/icons/Color/icon-list.mk b/icons/Color/icon-list.mk
index 67160bfd5c..c9d0355287 100644
--- a/icons/Color/icon-list.mk
+++ b/icons/Color/icon-list.mk
@@ -94,7 +94,6 @@ scalable_images = \
        scalable/gimp-clipboard.svg                             \
        scalable/gimp-close.svg                                 \
        scalable/gimp-close-all.svg                             \
-       scalable/gimp-color-cmyk.svg                            \
        scalable/gimp-color-pick-from-screen.svg                \
        scalable/gimp-color-picker-black.svg                    \
        scalable/gimp-color-picker-gray.svg                     \
@@ -102,14 +101,7 @@ scalable_images = \
        scalable/gimp-color-space-linear.svg                    \
        scalable/gimp-color-space-non-linear.svg                \
        scalable/gimp-color-space-perceptual.svg                \
-       scalable/gimp-color-triangle.svg                        \
-       scalable/gimp-color-water.svg                           \
        scalable/gimp-colormap.svg                              \
-       scalable/gimp-controller.svg                            \
-       scalable/gimp-controller-keyboard.svg                   \
-       scalable/gimp-controller-linux-input.svg                \
-       scalable/gimp-controller-midi.svg                       \
-       scalable/gimp-controller-wheel.svg                      \
        scalable/gimp-convert-grayscale.svg                     \
        scalable/gimp-convert-indexed.svg                       \
        scalable/gimp-convert-rgb.svg                           \
@@ -122,13 +114,6 @@ scalable_images = \
        scalable/gimp-default-colors.svg                        \
        scalable/gimp-detach.svg                                \
        scalable/gimp-device-status.svg                         \
-       scalable/gimp-display-filter.svg                        \
-       scalable/gimp-display-filter-clip-warning.svg           \
-       scalable/gimp-display-filter-colorblind.svg             \
-       scalable/gimp-display-filter-contrast.svg               \
-       scalable/gimp-display-filter-gamma.svg                  \
-       scalable/gimp-display-filter-lcms.svg                   \
-       scalable/gimp-display-filter-proof.svg                  \
        scalable/gimp-duplicate.svg                             \
        scalable/gimp-dynamics.svg                              \
        scalable/gimp-file-manager.svg                          \
@@ -259,6 +244,28 @@ scalable_images = \
        scalable/gimp-wilber-outline.svg                        \
        scalable/gimp-zoom-follow-window.svg                    \
        \
+       scalable/gimp-color-cmyk.svg                            \
+       scalable/gimp-color-triangle.svg                        \
+       scalable/gimp-color-water.svg                           \
+       \
+       scalable/gimp-tool-options.svg                          \
+       \
+       scalable/gimp-controller.svg                            \
+       \
+       scalable/gimp-controller-keyboard.svg                   \
+       scalable/gimp-controller-linux-input.svg                \
+       scalable/gimp-controller-midi.svg                       \
+       scalable/gimp-controller-wheel.svg                      \
+       \
+       scalable/gimp-display-filter.svg                        \
+       \
+       scalable/gimp-display-filter-clip-warning.svg           \
+       scalable/gimp-display-filter-colorblind.svg             \
+       scalable/gimp-display-filter-contrast.svg               \
+       scalable/gimp-display-filter-gamma.svg                  \
+       scalable/gimp-display-filter-lcms.svg                   \
+       scalable/gimp-display-filter-proof.svg                  \
+       \
        scalable/gimp-prefs-color-management.svg                \
        \
        scalable/gimp-prefs-controllers.svg                     \
@@ -341,7 +348,6 @@ scalable_images = \
        scalable/gimp-tool-mypaint-brush.svg                    \
        scalable/gimp-tool-n-point-deformation.svg              \
        scalable/gimp-tool-offset.svg                           \
-       scalable/gimp-tool-options.svg                          \
        scalable/gimp-tool-paintbrush.svg                       \
        scalable/gimp-tool-paint-select.svg                     \
        scalable/gimp-tool-path.svg                             \
@@ -445,6 +451,7 @@ icons16_images = \
        16/gtk-edit.png                                         \
        16/gtk-no.png                                           \
        16/gtk-ok.png                                           \
+       \
        16/gtk-select-color.png                                 \
        16/gtk-select-font.png                                  \
        16/gtk-yes.png                                          \
@@ -465,19 +472,11 @@ icons16_images = \
        16/gimp-char-picker.png                                 \
        16/gimp-clipboard.png                                   \
        16/gimp-close-all.png                                   \
-       16/gimp-color-cmyk.png                                  \
        16/gimp-color-pick-from-screen.png                      \
        16/gimp-color-space-linear.png                          \
        16/gimp-color-space-non-linear.png                      \
        16/gimp-color-space-perceptual.png                      \
-       16/gimp-color-triangle.png                              \
-       16/gimp-color-water.png                                 \
        16/gimp-colormap.png                                    \
-       16/gimp-controller-keyboard.png                         \
-       16/gimp-controller-linux-input.png                      \
-       16/gimp-controller-midi.png                             \
-       16/gimp-controller-wheel.png                            \
-       16/gimp-controller.png                                  \
        16/gimp-convert-grayscale.png                           \
        16/gimp-convert-indexed.png                             \
        16/gimp-convert-rgb.png                                 \
@@ -488,12 +487,7 @@ icons16_images = \
        16/gimp-curve-smooth.png                                \
        16/gimp-dashboard.png                                   \
        16/gimp-device-status.png                               \
-       16/gimp-display-filter-clip-warning.png                 \
-       16/gimp-display-filter-colorblind.png                   \
-       16/gimp-display-filter-contrast.png                     \
-       16/gimp-display-filter-gamma.png                        \
-       16/gimp-display-filter-lcms.png                         \
-       16/gimp-display-filter-proof.png                        \
+       \
        16/gimp-display-filter.png                              \
        16/gimp-duplicate.png                                   \
        16/gimp-dynamics.png                                    \
@@ -580,6 +574,26 @@ icons16_images = \
        16/gimp-web.png                                         \
        16/gimp-wilber.png                                      \
        \
+       16/gimp-color-cmyk.png                                  \
+       16/gimp-color-triangle.png                              \
+       16/gimp-color-water.png                                 \
+       \
+       16/gimp-tool-options.png                                \
+       \
+       16/gimp-controller.png                                  \
+       \
+       16/gimp-controller-keyboard.png                         \
+       16/gimp-controller-linux-input.png                      \
+       16/gimp-controller-midi.png                             \
+       16/gimp-controller-wheel.png                            \
+       \
+       16/gimp-display-filter-clip-warning.png                 \
+       16/gimp-display-filter-colorblind.png                   \
+       16/gimp-display-filter-contrast.png                     \
+       16/gimp-display-filter-gamma.png                        \
+       16/gimp-display-filter-lcms.png                         \
+       16/gimp-display-filter-proof.png                        \
+       \
        16/gimp-prefs-color-management.png                      \
        \
        16/gimp-prefs-controllers.png                           \
@@ -663,7 +677,6 @@ icons16_images = \
        16/gimp-tool-mypaint-brush.png                          \
        16/gimp-tool-n-point-deformation.png                    \
        16/gimp-tool-offset.png                                 \
-       16/gimp-tool-options.png                                \
        16/gimp-tool-paintbrush.png                             \
        16/gimp-tool-paint-select.png                           \
        16/gimp-tool-path.png                                   \
@@ -740,22 +753,12 @@ icons24_images = \
        24/gimp-color-space-non-linear.png                      \
        24/gimp-color-space-perceptual.png                      \
        24/gimp-colormap.png                                    \
-       24/gimp-controller-keyboard.png                         \
-       24/gimp-controller-linux-input.png                      \
-       24/gimp-controller-midi.png                             \
-       24/gimp-controller-wheel.png                            \
-       24/gimp-controller.png                                  \
        24/gimp-cursor.png                                      \
        24/gimp-dashboard.png                                   \
        24/gimp-detach.png                                      \
        24/gimp-device-status.png                               \
+       \
        24/gimp-display-filter.png                              \
-       24/gimp-display-filter-clip-warning.png                 \
-       24/gimp-display-filter-colorblind.png                   \
-       24/gimp-display-filter-contrast.png                     \
-       24/gimp-display-filter-gamma.png                        \
-       24/gimp-display-filter-lcms.png                         \
-       24/gimp-display-filter-proof.png                        \
        24/gimp-floating-selection.png                          \
        24/gimp-gegl.png                                        \
        24/gimp-gravity-east.png                                \
@@ -873,13 +876,17 @@ icons32_images = \
        32/gimp-channel-indexed.png                             \
        32/gimp-channel-red.png                                 \
        32/gimp-channel.png                                     \
+       \
+       32/gimp-color-triangle.png                              \
        32/gimp-floating-selection.png                          \
        32/gimp-image.png                                       \
        32/gimp-layer-mask.png                                  \
        32/gimp-layer.png                                       \
        32/gimp-text-layer.png                                  \
        32/gimp-user-manual.png                                 \
-       32/gimp-wilber.png
+       32/gimp-wilber.png                                      \
+       \
+       32/gtk-select-color.png
 
 icons48_images = \
        48/folder.png                                           \
diff --git a/icons/Color/meson.build b/icons/Color/meson.build
index a424cbd771..6a0bc7659d 100644
--- a/icons/Color/meson.build
+++ b/icons/Color/meson.build
@@ -5,7 +5,9 @@ if have_vector_icons
       'outdir': 'scalable',
       'indir':  'scalable',
       'suffix': '.svg',
-      'files':  [ 'scalable', 'prefs', 'templates', 'tools' ],
+      'files':  [ 'scalable',
+                  'color-selectors', 'controllers', 'display-filters',
+                  'prefs', 'templates', 'tools' ],
     },
     {
       'outdir': '64x64',
@@ -17,7 +19,9 @@ if have_vector_icons
 else
   build_icons = {
     '12':  [ 'bitmap_12', ],
-    '16':  [ 'bitmap_16', 'prefs', 'templates', 'tools' ],
+    '16':  [ 'bitmap_16',
+             'color-selectors', 'controllers', 'display-filters',
+             'prefs', 'templates', 'tools' ],
     '18':  [ 'bitmap_18', ],
     '20':  [ 'bitmap_20', ],
     '22':  [ 'bitmap_22', ],
diff --git a/icons/Symbolic/icon-list.mk b/icons/Symbolic/icon-list.mk
index cee130d4e5..7cde4103e2 100644
--- a/icons/Symbolic/icon-list.mk
+++ b/icons/Symbolic/icon-list.mk
@@ -94,7 +94,6 @@ scalable_images = \
        scalable/gimp-clipboard-symbolic.svg                                    \
        scalable/gimp-close-symbolic.svg                                        \
        scalable/gimp-close-all-symbolic.svg                                    \
-       scalable/gimp-color-cmyk-symbolic.svg                                   \
        scalable/gimp-color-pick-from-screen-symbolic.svg                       \
        scalable/gimp-color-picker-black-symbolic.svg                           \
        scalable/gimp-color-picker-gray-symbolic.svg                            \
@@ -102,14 +101,7 @@ scalable_images = \
        scalable/gimp-color-space-linear-symbolic.svg                           \
        scalable/gimp-color-space-non-linear-symbolic.svg                       \
        scalable/gimp-color-space-perceptual-symbolic.svg                       \
-       scalable/gimp-color-triangle-symbolic.svg                               \
-       scalable/gimp-color-water-symbolic.svg                                  \
        scalable/gimp-colormap-symbolic.svg                                     \
-       scalable/gimp-controller-symbolic.svg                                   \
-       scalable/gimp-controller-keyboard-symbolic.svg                          \
-       scalable/gimp-controller-linux-input-symbolic.svg                       \
-       scalable/gimp-controller-midi-symbolic.svg                              \
-       scalable/gimp-controller-wheel-symbolic.svg                             \
        scalable/gimp-convert-grayscale-symbolic.svg                            \
        scalable/gimp-convert-indexed-symbolic.svg                              \
        scalable/gimp-convert-rgb-symbolic.svg                                  \
@@ -122,13 +114,6 @@ scalable_images = \
        scalable/gimp-default-colors-symbolic.svg                               \
        scalable/gimp-detach-symbolic.svg                                       \
        scalable/gimp-device-status-symbolic.svg                                \
-       scalable/gimp-display-filter-symbolic.svg                               \
-       scalable/gimp-display-filter-clip-warning-symbolic.svg                  \
-       scalable/gimp-display-filter-colorblind-symbolic.svg                    \
-       scalable/gimp-display-filter-contrast-symbolic.svg                      \
-       scalable/gimp-display-filter-gamma-symbolic.svg                         \
-       scalable/gimp-display-filter-lcms-symbolic.svg                          \
-       scalable/gimp-display-filter-proof-symbolic.svg                         \
        scalable/gimp-duplicate-symbolic.svg                                    \
        scalable/gimp-dynamics-symbolic.svg                                     \
        scalable/gimp-file-manager-symbolic.svg                                 \
@@ -259,6 +244,28 @@ scalable_images = \
        scalable/gimp-wilber-outline-symbolic.svg                               \
        scalable/gimp-zoom-follow-window-symbolic.svg                           \
        \
+       scalable/gimp-color-cmyk-symbolic.svg                                   \
+       scalable/gimp-color-triangle-symbolic.svg                               \
+       scalable/gimp-color-water-symbolic.svg                                  \
+       \
+       scalable/gimp-tool-options-symbolic.svg                                 \
+       \
+       scalable/gimp-controller-symbolic.svg                                   \
+       \
+       scalable/gimp-controller-keyboard-symbolic.svg                          \
+       scalable/gimp-controller-linux-input-symbolic.svg                       \
+       scalable/gimp-controller-midi-symbolic.svg                              \
+       scalable/gimp-controller-wheel-symbolic.svg                             \
+       \
+       scalable/gimp-display-filter-symbolic.svg                               \
+       \
+       scalable/gimp-display-filter-clip-warning-symbolic.svg                  \
+       scalable/gimp-display-filter-colorblind-symbolic.svg                    \
+       scalable/gimp-display-filter-contrast-symbolic.svg                      \
+       scalable/gimp-display-filter-gamma-symbolic.svg                         \
+       scalable/gimp-display-filter-lcms-symbolic.svg                          \
+       scalable/gimp-display-filter-proof-symbolic.svg                         \
+       \
        scalable/gimp-prefs-color-management-symbolic.svg                       \
        \
        scalable/gimp-prefs-controllers-symbolic.svg                            \
@@ -341,7 +348,6 @@ scalable_images = \
        scalable/gimp-tool-mypaint-brush-symbolic.svg                           \
        scalable/gimp-tool-n-point-deformation-symbolic.svg                     \
        scalable/gimp-tool-offset-symbolic.svg                                  \
-       scalable/gimp-tool-options-symbolic.svg                                 \
        scalable/gimp-tool-paintbrush-symbolic.svg                              \
        scalable/gimp-tool-paint-select-symbolic.svg                            \
        scalable/gimp-tool-path-symbolic.svg                                    \
@@ -445,6 +451,7 @@ icons16_images = \
        16/gtk-edit-symbolic.symbolic.png                                       \
        16/gtk-no-symbolic.symbolic.png                                         \
        16/gtk-ok-symbolic.symbolic.png                                         \
+       \
        16/gtk-select-color-symbolic.symbolic.png                               \
        16/gtk-select-font-symbolic.symbolic.png                                \
        16/gtk-yes-symbolic.symbolic.png                                        \
@@ -465,19 +472,11 @@ icons16_images = \
        16/gimp-char-picker-symbolic.symbolic.png                               \
        16/gimp-clipboard-symbolic.symbolic.png                                 \
        16/gimp-close-all-symbolic.symbolic.png                                 \
-       16/gimp-color-cmyk-symbolic.symbolic.png                                \
        16/gimp-color-pick-from-screen-symbolic.symbolic.png                    \
        16/gimp-color-space-linear-symbolic.symbolic.png                        \
        16/gimp-color-space-non-linear-symbolic.symbolic.png                    \
        16/gimp-color-space-perceptual-symbolic.symbolic.png                    \
-       16/gimp-color-triangle-symbolic.symbolic.png                            \
-       16/gimp-color-water-symbolic.symbolic.png                               \
        16/gimp-colormap-symbolic.symbolic.png                                  \
-       16/gimp-controller-keyboard-symbolic.symbolic.png                       \
-       16/gimp-controller-linux-input-symbolic.symbolic.png                    \
-       16/gimp-controller-midi-symbolic.symbolic.png                           \
-       16/gimp-controller-wheel-symbolic.symbolic.png                          \
-       16/gimp-controller-symbolic.symbolic.png                                \
        16/gimp-convert-grayscale-symbolic.symbolic.png                         \
        16/gimp-convert-indexed-symbolic.symbolic.png                           \
        16/gimp-convert-rgb-symbolic.symbolic.png                               \
@@ -488,12 +487,7 @@ icons16_images = \
        16/gimp-curve-smooth-symbolic.symbolic.png                              \
        16/gimp-dashboard-symbolic.symbolic.png                                 \
        16/gimp-device-status-symbolic.symbolic.png                             \
-       16/gimp-display-filter-clip-warning-symbolic.symbolic.png               \
-       16/gimp-display-filter-colorblind-symbolic.symbolic.png                 \
-       16/gimp-display-filter-contrast-symbolic.symbolic.png                   \
-       16/gimp-display-filter-gamma-symbolic.symbolic.png                      \
-       16/gimp-display-filter-lcms-symbolic.symbolic.png                       \
-       16/gimp-display-filter-proof-symbolic.symbolic.png                      \
+       \
        16/gimp-display-filter-symbolic.symbolic.png                            \
        16/gimp-duplicate-symbolic.symbolic.png                                 \
        16/gimp-dynamics-symbolic.symbolic.png                                  \
@@ -580,6 +574,26 @@ icons16_images = \
        16/gimp-web-symbolic.symbolic.png                                       \
        16/gimp-wilber-symbolic.symbolic.png                                    \
        \
+       16/gimp-color-cmyk-symbolic.symbolic.png                                \
+       16/gimp-color-triangle-symbolic.symbolic.png                            \
+       16/gimp-color-water-symbolic.symbolic.png                               \
+       \
+       16/gimp-tool-options-symbolic.symbolic.png                              \
+       \
+       16/gimp-controller-symbolic.symbolic.png                                \
+       \
+       16/gimp-controller-keyboard-symbolic.symbolic.png                       \
+       16/gimp-controller-linux-input-symbolic.symbolic.png                    \
+       16/gimp-controller-midi-symbolic.symbolic.png                           \
+       16/gimp-controller-wheel-symbolic.symbolic.png                          \
+       \
+       16/gimp-display-filter-clip-warning-symbolic.symbolic.png               \
+       16/gimp-display-filter-colorblind-symbolic.symbolic.png                 \
+       16/gimp-display-filter-contrast-symbolic.symbolic.png                   \
+       16/gimp-display-filter-gamma-symbolic.symbolic.png                      \
+       16/gimp-display-filter-lcms-symbolic.symbolic.png                       \
+       16/gimp-display-filter-proof-symbolic.symbolic.png                      \
+       \
        16/gimp-prefs-color-management-symbolic.symbolic.png                    \
        \
        16/gimp-prefs-controllers-symbolic.symbolic.png                         \
@@ -663,7 +677,6 @@ icons16_images = \
        16/gimp-tool-mypaint-brush-symbolic.symbolic.png                        \
        16/gimp-tool-n-point-deformation-symbolic.symbolic.png                  \
        16/gimp-tool-offset-symbolic.symbolic.png                               \
-       16/gimp-tool-options-symbolic.symbolic.png                              \
        16/gimp-tool-paintbrush-symbolic.symbolic.png                           \
        16/gimp-tool-paint-select-symbolic.symbolic.png                         \
        16/gimp-tool-path-symbolic.symbolic.png                                 \
@@ -740,22 +753,12 @@ icons24_images = \
        24/gimp-color-space-non-linear-symbolic.symbolic.png                    \
        24/gimp-color-space-perceptual-symbolic.symbolic.png                    \
        24/gimp-colormap-symbolic.symbolic.png                                  \
-       24/gimp-controller-keyboard-symbolic.symbolic.png                       \
-       24/gimp-controller-linux-input-symbolic.symbolic.png                    \
-       24/gimp-controller-midi-symbolic.symbolic.png                           \
-       24/gimp-controller-wheel-symbolic.symbolic.png                          \
-       24/gimp-controller-symbolic.symbolic.png                                \
        24/gimp-cursor-symbolic.symbolic.png                                    \
        24/gimp-dashboard-symbolic.symbolic.png                                 \
        24/gimp-detach-symbolic.symbolic.png                                    \
        24/gimp-device-status-symbolic.symbolic.png                             \
+       \
        24/gimp-display-filter-symbolic.symbolic.png                            \
-       24/gimp-display-filter-clip-warning-symbolic.symbolic.png               \
-       24/gimp-display-filter-colorblind-symbolic.symbolic.png                 \
-       24/gimp-display-filter-contrast-symbolic.symbolic.png                   \
-       24/gimp-display-filter-gamma-symbolic.symbolic.png                      \
-       24/gimp-display-filter-lcms-symbolic.symbolic.png                       \
-       24/gimp-display-filter-proof-symbolic.symbolic.png                      \
        24/gimp-floating-selection-symbolic.symbolic.png                        \
        24/gimp-gegl-symbolic.symbolic.png                                      \
        24/gimp-gravity-east-symbolic.symbolic.png                              \
@@ -873,13 +876,17 @@ icons32_images = \
        32/gimp-channel-indexed-symbolic.symbolic.png                           \
        32/gimp-channel-red-symbolic.symbolic.png                               \
        32/gimp-channel-symbolic.symbolic.png                                   \
+       \
+       32/gimp-color-triangle-symbolic.symbolic.png                            \
        32/gimp-floating-selection-symbolic.symbolic.png                        \
        32/gimp-image-symbolic.symbolic.png                                     \
        32/gimp-layer-mask-symbolic.symbolic.png                                \
        32/gimp-layer-symbolic.symbolic.png                                     \
        32/gimp-text-layer-symbolic.symbolic.png                                \
        32/gimp-user-manual-symbolic.symbolic.png                               \
-       32/gimp-wilber-symbolic.symbolic.png
+       32/gimp-wilber-symbolic.symbolic.png                                    \
+       \
+       32/gtk-select-color-symbolic.symbolic.png
 
 icons48_images = \
        48/folder-symbolic.symbolic.png                                         \
diff --git a/icons/Symbolic/meson.build b/icons/Symbolic/meson.build
index 9dc2358cc3..518d719a89 100644
--- a/icons/Symbolic/meson.build
+++ b/icons/Symbolic/meson.build
@@ -5,7 +5,9 @@ if have_vector_icons
       'outdir': 'scalable',
       'indir':  'scalable',
       'suffix': '-symbolic.svg',
-      'files':  [ 'scalable', 'prefs', 'tools' ],
+      'files':  [ 'scalable',
+                  'color-selectors', 'controllers', 'display-filters',
+                  'prefs', 'templates', 'tools' ],
     },
     {
       'outdir': '64x64',
@@ -18,11 +20,11 @@ if have_vector_icons
 else
   gtk_encode_symbolic_svg = find_program('gtk-encode-symbolic-svg', native: true)
 
-  sizes = [ '12', '16', '18', '20', '22', '24', '32',
-            '48', '64', '96', '128', '192', '256' ]
   build_icons = {
     '12':  [ 'bitmap_12', ],
-    '16':  [ 'bitmap_16', 'prefs', 'tools' ],
+    '16':  [ 'bitmap_16',
+             'color-selectors', 'controllers', 'display-filters',
+             'prefs', 'templates', 'tools' ],
     '18':  [ 'bitmap_18', ],
     '20':  [ 'bitmap_20', ],
     '22':  [ 'bitmap_22', ],
diff --git a/icons/icon-lists/bitmap_16.list b/icons/icon-lists/bitmap_16.list
index 65f7bb7d9f..f63391ffde 100644
--- a/icons/icon-lists/bitmap_16.list
+++ b/icons/icon-lists/bitmap_16.list
@@ -55,6 +55,7 @@ gtk-cancel
 gtk-edit
 gtk-no
 gtk-ok
+# Used for many action icons (GIMP_ICON_PALETTE)
 gtk-select-color
 gtk-select-font
 gtk-yes
@@ -75,19 +76,11 @@ gimp-channels
 gimp-char-picker
 gimp-clipboard
 gimp-close-all
-gimp-color-cmyk
 gimp-color-pick-from-screen
 gimp-color-space-linear
 gimp-color-space-non-linear
 gimp-color-space-perceptual
-gimp-color-triangle
-gimp-color-water
 gimp-colormap
-gimp-controller-keyboard
-gimp-controller-linux-input
-gimp-controller-midi
-gimp-controller-wheel
-gimp-controller
 gimp-convert-grayscale
 gimp-convert-indexed
 gimp-convert-rgb
@@ -98,12 +91,7 @@ gimp-curve-point-smooth
 gimp-curve-smooth
 gimp-dashboard
 gimp-device-status
-gimp-display-filter-clip-warning
-gimp-display-filter-colorblind
-gimp-display-filter-contrast
-gimp-display-filter-gamma
-gimp-display-filter-lcms
-gimp-display-filter-proof
+# Used as view-display-filters action (usually 16px).
 gimp-display-filter
 gimp-duplicate
 gimp-dynamics
diff --git a/icons/icon-lists/bitmap_24.list b/icons/icon-lists/bitmap_24.list
index 3da2fc3488..bc071dc0e5 100644
--- a/icons/icon-lists/bitmap_24.list
+++ b/icons/icon-lists/bitmap_24.list
@@ -22,22 +22,13 @@ gimp-color-space-linear
 gimp-color-space-non-linear
 gimp-color-space-perceptual
 gimp-colormap
-gimp-controller-keyboard
-gimp-controller-linux-input
-gimp-controller-midi
-gimp-controller-wheel
-gimp-controller
 gimp-cursor
 gimp-dashboard
 gimp-detach
 gimp-device-status
+# Used as GimpViewableDialog icon in gimpdisplayshell-filter-dialog.c,
+# i.e. as GTK_ICON_SIZE_LARGE_TOOLBAR (24px).
 gimp-display-filter
-gimp-display-filter-clip-warning
-gimp-display-filter-colorblind
-gimp-display-filter-contrast
-gimp-display-filter-gamma
-gimp-display-filter-lcms
-gimp-display-filter-proof
 gimp-floating-selection
 gimp-gegl
 gimp-gravity-east
diff --git a/icons/icon-lists/bitmap_32.list b/icons/icon-lists/bitmap_32.list
index 94f6001f48..811cac4241 100644
--- a/icons/icon-lists/bitmap_32.list
+++ b/icons/icon-lists/bitmap_32.list
@@ -5,6 +5,9 @@ gimp-channel-green
 gimp-channel-indexed
 gimp-channel-red
 gimp-channel
+# In data/tool-presets/FX/Glow-Lights.gtp preset icon, which can be
+# viewed in "Tool Presets" list/grid as GIMP_VIEW_SIZE_MEDIUM.
+gimp-color-triangle
 gimp-floating-selection
 gimp-image
 gimp-layer-mask
@@ -12,3 +15,6 @@ gimp-layer
 gimp-text-layer
 gimp-user-manual
 gimp-wilber
+
+# GIMP_ICON_PALETTE used for Palettes dialog as GIMP_VIEW_SIZE_MEDIUM
+gtk-select-color
diff --git a/icons/icon-lists/color-selectors.list b/icons/icon-lists/color-selectors.list
new file mode 100644
index 0000000000..34dd0faa93
--- /dev/null
+++ b/icons/icon-lists/color-selectors.list
@@ -0,0 +1,20 @@
+# grep -rI icon_name modules/color-selector-*
+#
+# Color selector modules whose icon is used in:
+# - GimpColorEditor as GTK_ICON_SIZE_MENU (16px)
+# - GimpColorNotebook:
+#   * tab-icon-size style tab label (button size both in
+#     DEFAULT_TAB_ICON_SIZE amd System theme, i.e. 16px.).
+#   * menu size (16px)
+#   * DEFAULT_TAB_ICON_SIZE (button, 16px)
+
+gimp-color-cmyk
+gimp-color-triangle
+gimp-color-water
+
+# GIMP_ICON_PALETTE, which is the default icon of GimpColorSelector.
+gtk-select-color
+# GIMP_ICON_WILBER, overriden by GimpColorSelect subclass.
+gimp-wilber
+# GIMP_ICON_DIALOG_TOOL_OPTIONS overriden by GimpColorScales subclass.
+gimp-tool-options
diff --git a/icons/icon-lists/controllers.list b/icons/icon-lists/controllers.list
new file mode 100644
index 0000000000..119edda8c7
--- /dev/null
+++ b/icons/icon-lists/controllers.list
@@ -0,0 +1,14 @@
+# grep -rI icon_name modules/controller-* app/widgets/gimpcontroller*
+# Used in:
+# - GimpControllerList as GtkCellRendererPixbuf (16px).
+
+# Default
+gimp-controller
+
+gimp-controller-keyboard
+gimp-controller-linux-input
+gimp-controller-midi
+gimp-controller-wheel
+
+# GIMP_ICON_CONTROLLER_MOUSE == GIMP_ICON_CURSOR
+gimp-cursor
diff --git a/icons/icon-lists/display-filters.list b/icons/icon-lists/display-filters.list
new file mode 100644
index 0000000000..795bc782bc
--- /dev/null
+++ b/icons/icon-lists/display-filters.list
@@ -0,0 +1,14 @@
+# grep -rI icon_name modules/display-filter*
+# These are used in:
+# - GtkCellRendererPixbuf in GimpColorDisplayEditor (default 16px)
+
+# Default icon of GimpColorDisplay. Doesn't think it's actually used in
+# this context since it's always overriden. Still must be installed.
+gimp-display-filter
+
+gimp-display-filter-clip-warning
+gimp-display-filter-colorblind
+gimp-display-filter-contrast
+gimp-display-filter-gamma
+gimp-display-filter-lcms
+gimp-display-filter-proof
diff --git a/icons/icon-lists/scalable.list b/icons/icon-lists/scalable.list
index 303a5d024d..bfd1c01fba 100644
--- a/icons/icon-lists/scalable.list
+++ b/icons/icon-lists/scalable.list
@@ -86,7 +86,6 @@ gimp-char-picker
 gimp-clipboard
 gimp-close
 gimp-close-all
-gimp-color-cmyk
 gimp-color-pick-from-screen
 gimp-color-picker-black
 gimp-color-picker-gray
@@ -94,14 +93,7 @@ gimp-color-picker-white
 gimp-color-space-linear
 gimp-color-space-non-linear
 gimp-color-space-perceptual
-gimp-color-triangle
-gimp-color-water
 gimp-colormap
-gimp-controller
-gimp-controller-keyboard
-gimp-controller-linux-input
-gimp-controller-midi
-gimp-controller-wheel
 gimp-convert-grayscale
 gimp-convert-indexed
 gimp-convert-rgb
@@ -114,13 +106,6 @@ gimp-dashboard
 gimp-default-colors
 gimp-detach
 gimp-device-status
-gimp-display-filter
-gimp-display-filter-clip-warning
-gimp-display-filter-colorblind
-gimp-display-filter-contrast
-gimp-display-filter-gamma
-gimp-display-filter-lcms
-gimp-display-filter-proof
 gimp-duplicate
 gimp-dynamics
 gimp-file-manager
diff --git a/tools/generate-icon-makefiles.py b/tools/generate-icon-makefiles.py
index 74047a1abb..a4e3e3887c 100755
--- a/tools/generate-icon-makefiles.py
+++ b/tools/generate-icon-makefiles.py
@@ -115,10 +115,14 @@ if __name__ == "__main__":
     # should contain nearly all images. So we compute max_len once and
     # reuse this value on all lists.
     col_max_len = print_icons(list_dir,
-                              ['scalable.list', 'prefs.list', 'templates.list', 'tools.list'],
+                              ['scalable.list',
+                               'color-selectors.list', 'controllers.list', 'display-filters.list',
+                               'prefs.list', 'templates.list', 'tools.list'],
                               None, "scalable/", ".svg", colorf)
     sym_max_len = print_icons(list_dir,
-                              ['scalable.list', 'prefs.list', 'templates.list', 'tools.list'],
+                              ['scalable.list',
+                               'color-selectors.list', 'controllers.list', 'display-filters.list',
+                               'prefs.list', 'templates.list', 'tools.list'],
                               None, "scalable/", "-symbolic.svg", symbolicf)
 
     # 12x12 bitmap
@@ -131,10 +135,14 @@ if __name__ == "__main__":
     print("\nicons16_images = \\", file=colorf)
     print("\nicons16_images = \\", file=symbolicf)
     print_icons(list_dir,
-                ['bitmap_16.list', 'prefs.list', 'templates.list', 'tools.list'],
+                ['bitmap_16.list',
+                 'color-selectors.list', 'controllers.list', 'display-filters.list',
+                 'prefs.list', 'templates.list', 'tools.list'],
                 col_max_len, "16/", ".png", colorf)
     print_icons(list_dir,
-                ['bitmap_16.list', 'prefs.list', 'templates.list', 'tools.list'],
+                ['bitmap_16.list',
+                 'color-selectors.list', 'controllers.list', 'display-filters.list',
+                 'prefs.list', 'templates.list', 'tools.list'],
                 sym_max_len, "16/", "-symbolic.symbolic.png", symbolicf)
 
     # 18x18 bitmap


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]