diff --git a/icons/Color/Makefile.am b/icons/Color/Makefile.am index 007f7c9205..be3292e1bd 100644 --- a/icons/Color/Makefile.am +++ b/icons/Color/Makefile.am @@ -29,9 +29,6 @@ endif 18/%.png: scalable/%.svg ../../tools/colorsvg2png mkdir -p $(@D) && \ $(top_builddir)/tools/colorsvg2png $< $@ $(@D) -20/%.png: scalable/%.svg ../../tools/colorsvg2png - mkdir -p $(@D) && \ - $(top_builddir)/tools/colorsvg2png $< $@ $(@D) 22/%.png: scalable/%.svg ../../tools/colorsvg2png mkdir -p $(@D) && \ $(top_builddir)/tools/colorsvg2png $< $@ $(@D) diff --git a/icons/Color/icon-list.mk b/icons/Color/icon-list.mk index 1f65fa1e21..805dd485cf 100644 --- a/icons/Color/icon-list.mk +++ b/icons/Color/icon-list.mk @@ -164,12 +164,6 @@ scalable_images = \ scalable/gimp-line-spacing.svg \ scalable/gimp-linked.svg \ scalable/gimp-list.svg \ - scalable/gimp-lock.svg \ - scalable/gimp-lock-multi.svg \ - scalable/gimp-lock-alpha.svg \ - scalable/gimp-lock-content.svg \ - scalable/gimp-lock-position.svg \ - scalable/gimp-lock-visibility.svg \ scalable/gimp-marker.svg \ scalable/gimp-menu-left.svg \ scalable/gimp-menu-right.svg \ @@ -265,6 +259,13 @@ scalable_images = \ scalable/gimp-display-filter-lcms.svg \ scalable/gimp-display-filter-proof.svg \ \ + scalable/gimp-lock.svg \ + scalable/gimp-lock-multi.svg \ + scalable/gimp-lock-alpha.svg \ + scalable/gimp-lock-content.svg \ + scalable/gimp-lock-position.svg \ + scalable/gimp-lock-visibility.svg \ + \ scalable/gimp-prefs-color-management.svg \ \ scalable/gimp-prefs-controllers.svg \ @@ -374,7 +375,6 @@ icons12_images = \ 12/gimp-close.png \ 12/gimp-default-colors.png \ 12/gimp-detach.png \ - 12/gimp-linked.png \ 12/gimp-menu-left.png \ 12/gimp-menu-right.png \ 12/gimp-pivot-center.png \ @@ -389,7 +389,6 @@ icons12_images = \ 12/gimp-quick-mask-off.png \ 12/gimp-quick-mask-on.png \ 12/gimp-swap-colors.png \ - 12/gimp-visible.png \ 12/gimp-zoom-follow-window.png icons16_images = \ @@ -523,6 +522,8 @@ icons16_images = \ 16/gimp-layer-to-imagesize.png \ 16/gimp-layer.png \ 16/gimp-layers.png \ + \ + 16/gimp-linked.png \ 16/gimp-list.png \ 16/gimp-marker.png \ 16/gimp-merge-down.png \ @@ -570,6 +571,8 @@ icons16_images = \ 16/gimp-undo-history.png \ 16/gimp-user-manual.png \ \ + 16/gimp-visible.png \ + \ 16/gimp-web.png \ 16/gimp-wilber.png \ \ @@ -593,6 +596,13 @@ icons16_images = \ 16/gimp-display-filter-lcms.png \ 16/gimp-display-filter-proof.png \ \ + 16/gimp-lock.png \ + 16/gimp-lock-multi.png \ + 16/gimp-lock-alpha.png \ + 16/gimp-lock-content.png \ + 16/gimp-lock-position.png \ + 16/gimp-lock-visibility.png \ + \ 16/gimp-prefs-color-management.png \ \ 16/gimp-prefs-controllers.png \ @@ -703,10 +713,6 @@ icons18_images = \ 18/gimp-color-picker-gray.png \ 18/gimp-color-picker-white.png -icons20_images = \ - 20/gimp-linked.png \ - 20/gimp-visible.png - icons22_images = \ 22/folder.png \ 22/format-indent-more.png \ @@ -991,7 +997,6 @@ else icons12dir = $(iconsdir)/12x12/apps icons16dir = $(iconsdir)/16x16/apps icons18dir = $(iconsdir)/18x18/apps -icons20dir = $(iconsdir)/20x20/apps icons22dir = $(iconsdir)/22x22/apps icons24dir = $(iconsdir)/24x24/apps icons32dir = $(iconsdir)/32x32/apps @@ -1011,9 +1016,6 @@ icons16_DATA = \ icons18_DATA = \ $(icons18_images) -icons20_DATA = \ - $(icons20_images) - icons22_DATA = \ $(icons22_images) diff --git a/icons/Symbolic/Makefile.am b/icons/Symbolic/Makefile.am index fb491b61dc..9de7015cdd 100644 --- a/icons/Symbolic/Makefile.am +++ b/icons/Symbolic/Makefile.am @@ -36,9 +36,6 @@ endif 18/%.symbolic.png: scalable/%.svg mkdir -p $(@D) && \ $(GTK_ENCODE_SYMBOLIC_SVG) -o $(@D) $< $(@D)x$(@D) -20/%.symbolic.png: scalable/%.svg - mkdir -p $(@D) && \ - $(GTK_ENCODE_SYMBOLIC_SVG) -o $(@D) $< $(@D)x$(@D) 22/%.symbolic.png: scalable/%.svg mkdir -p $(@D) && \ $(GTK_ENCODE_SYMBOLIC_SVG) -o $(@D) $< $(@D)x$(@D) diff --git a/icons/Symbolic/icon-list.mk b/icons/Symbolic/icon-list.mk index b765090a25..0edfaa3abd 100644 --- a/icons/Symbolic/icon-list.mk +++ b/icons/Symbolic/icon-list.mk @@ -164,12 +164,6 @@ scalable_images = \ scalable/gimp-line-spacing-symbolic.svg \ scalable/gimp-linked-symbolic.svg \ scalable/gimp-list-symbolic.svg \ - scalable/gimp-lock-symbolic.svg \ - scalable/gimp-lock-multi-symbolic.svg \ - scalable/gimp-lock-alpha-symbolic.svg \ - scalable/gimp-lock-content-symbolic.svg \ - scalable/gimp-lock-position-symbolic.svg \ - scalable/gimp-lock-visibility-symbolic.svg \ scalable/gimp-marker-symbolic.svg \ scalable/gimp-menu-left-symbolic.svg \ scalable/gimp-menu-right-symbolic.svg \ @@ -265,6 +259,13 @@ scalable_images = \ scalable/gimp-display-filter-lcms-symbolic.svg \ scalable/gimp-display-filter-proof-symbolic.svg \ \ + scalable/gimp-lock-symbolic.svg \ + scalable/gimp-lock-multi-symbolic.svg \ + scalable/gimp-lock-alpha-symbolic.svg \ + scalable/gimp-lock-content-symbolic.svg \ + scalable/gimp-lock-position-symbolic.svg \ + scalable/gimp-lock-visibility-symbolic.svg \ + \ scalable/gimp-prefs-color-management-symbolic.svg \ \ scalable/gimp-prefs-controllers-symbolic.svg \ @@ -374,7 +375,6 @@ icons12_images = \ 12/gimp-close-symbolic.symbolic.png \ 12/gimp-default-colors-symbolic.symbolic.png \ 12/gimp-detach-symbolic.symbolic.png \ - 12/gimp-linked-symbolic.symbolic.png \ 12/gimp-menu-left-symbolic.symbolic.png \ 12/gimp-menu-right-symbolic.symbolic.png \ 12/gimp-pivot-center-symbolic.symbolic.png \ @@ -389,7 +389,6 @@ icons12_images = \ 12/gimp-quick-mask-off-symbolic.symbolic.png \ 12/gimp-quick-mask-on-symbolic.symbolic.png \ 12/gimp-swap-colors-symbolic.symbolic.png \ - 12/gimp-visible-symbolic.symbolic.png \ 12/gimp-zoom-follow-window-symbolic.symbolic.png icons16_images = \ @@ -523,6 +522,8 @@ icons16_images = \ 16/gimp-layer-to-imagesize-symbolic.symbolic.png \ 16/gimp-layer-symbolic.symbolic.png \ 16/gimp-layers-symbolic.symbolic.png \ + \ + 16/gimp-linked-symbolic.symbolic.png \ 16/gimp-list-symbolic.symbolic.png \ 16/gimp-marker-symbolic.symbolic.png \ 16/gimp-merge-down-symbolic.symbolic.png \ @@ -570,6 +571,8 @@ icons16_images = \ 16/gimp-undo-history-symbolic.symbolic.png \ 16/gimp-user-manual-symbolic.symbolic.png \ \ + 16/gimp-visible-symbolic.symbolic.png \ + \ 16/gimp-web-symbolic.symbolic.png \ 16/gimp-wilber-symbolic.symbolic.png \ \ @@ -593,6 +596,13 @@ icons16_images = \ 16/gimp-display-filter-lcms-symbolic.symbolic.png \ 16/gimp-display-filter-proof-symbolic.symbolic.png \ \ + 16/gimp-lock-symbolic.symbolic.png \ + 16/gimp-lock-multi-symbolic.symbolic.png \ + 16/gimp-lock-alpha-symbolic.symbolic.png \ + 16/gimp-lock-content-symbolic.symbolic.png \ + 16/gimp-lock-position-symbolic.symbolic.png \ + 16/gimp-lock-visibility-symbolic.symbolic.png \ + \ 16/gimp-prefs-color-management-symbolic.symbolic.png \ \ 16/gimp-prefs-controllers-symbolic.symbolic.png \ @@ -703,10 +713,6 @@ icons18_images = \ 18/gimp-color-picker-gray-symbolic.symbolic.png \ 18/gimp-color-picker-white-symbolic.symbolic.png -icons20_images = \ - 20/gimp-linked-symbolic.symbolic.png \ - 20/gimp-visible-symbolic.symbolic.png - icons22_images = \ 22/folder-symbolic.symbolic.png \ 22/format-indent-more-symbolic.symbolic.png \ @@ -991,7 +997,6 @@ else icons12dir = $(iconsdir)/12x12/apps icons16dir = $(iconsdir)/16x16/apps icons18dir = $(iconsdir)/18x18/apps -icons20dir = $(iconsdir)/20x20/apps icons22dir = $(iconsdir)/22x22/apps icons24dir = $(iconsdir)/24x24/apps icons32dir = $(iconsdir)/32x32/apps @@ -1011,9 +1016,6 @@ icons16_DATA = \ icons18_DATA = \ $(icons18_images) -icons20_DATA = \ - $(icons20_images) - icons22_DATA = \ $(icons22_images) diff --git a/icons/icon-lists/bitmap_12.list b/icons/icon-lists/bitmap_12.list index 27e4899ca9..ca2c4e9369 100644 --- a/icons/icon-lists/bitmap_12.list +++ b/icons/icon-lists/bitmap_12.list @@ -2,7 +2,6 @@ gimp-attach gimp-close gimp-default-colors gimp-detach -gimp-linked gimp-menu-left gimp-menu-right gimp-pivot-center @@ -17,5 +16,4 @@ gimp-pivot-west gimp-quick-mask-off gimp-quick-mask-on gimp-swap-colors -gimp-visible gimp-zoom-follow-window diff --git a/icons/icon-lists/bitmap_16.list b/icons/icon-lists/bitmap_16.list index f63391ffde..8338ac7945 100644 --- a/icons/icon-lists/bitmap_16.list +++ b/icons/icon-lists/bitmap_16.list @@ -128,6 +128,12 @@ gimp-layer-mask gimp-layer-to-imagesize gimp-layer gimp-layers +# GIMP_ICON_LINKED used in: +# - gimppaintoptions-gui.c as GTK_ICON_SIZE_MENU button (16px). +# - gimplayertreeview.c as button-icon-size (in our system theme +# GimpEditor-button-icon-size is set to "menu", i.e. 16px) button. +# - various action icons. +gimp-linked gimp-list gimp-marker gimp-merge-down @@ -174,6 +180,15 @@ gimp-transform-3d-rotate gimp-transparency gimp-undo-history gimp-user-manual +# GIMP_ICON_VISIBLE used in: +# - gimpitemtreeview.c as button-icon-size (in our system theme +# GimpEditor-button-icon-size is set to "menu", i.e. 16px) image and +# GimpCellRendererToggle (16px). +# - gimptooleditor.c and gimpcomponenteditor.c as GimpCellRendererToggle (16px). +# - gimpcolordisplayeditor.c as menu size image (16px). +# - various action icons. +# - item-options-dialog.c as GTK_ICON_SIZE_BUTTON check button (16px). +gimp-visible # - GTK_ICON_SIZE_BUTTON (16px) in file-open-location-dialog.c # - file-open-location action (menu, action search, etc. Usually 16px) # - GTK_ICON_SIZE_BUTTON in web-page plug-in. diff --git a/icons/icon-lists/bitmap_20.list b/icons/icon-lists/bitmap_20.list deleted file mode 100644 index 0bfe4bb1f8..0000000000 --- a/icons/icon-lists/bitmap_20.list +++ /dev/null @@ -1,2 +0,0 @@ -gimp-linked -gimp-visible diff --git a/icons/icon-lists/icon-list.mk.eof b/icons/icon-lists/icon-list.mk.eof index 51856ff487..3ad94616df 100644 --- a/icons/icon-lists/icon-list.mk.eof +++ b/icons/icon-lists/icon-list.mk.eof @@ -10,7 +10,6 @@ else icons12dir = $(iconsdir)/12x12/apps icons16dir = $(iconsdir)/16x16/apps icons18dir = $(iconsdir)/18x18/apps -icons20dir = $(iconsdir)/20x20/apps icons22dir = $(iconsdir)/22x22/apps icons24dir = $(iconsdir)/24x24/apps icons32dir = $(iconsdir)/32x32/apps @@ -30,9 +29,6 @@ icons16_DATA = \ icons18_DATA = \ $(icons18_images) -icons20_DATA = \ - $(icons20_images) - icons22_DATA = \ $(icons22_images) diff --git a/icons/icon-lists/scalable.list b/icons/icon-lists/scalable.list index 259decf279..5e9a86df1a 100644 --- a/icons/icon-lists/scalable.list +++ b/icons/icon-lists/scalable.list @@ -155,12 +155,6 @@ gimp-letter-spacing gimp-line-spacing gimp-linked gimp-list -gimp-lock -gimp-lock-multi -gimp-lock-alpha -gimp-lock-content -gimp-lock-position -gimp-lock-visibility gimp-marker gimp-menu-left gimp-menu-right diff --git a/icons/meson.build b/icons/meson.build index b5e6242ca8..83bbaf4ab2 100644 --- a/icons/meson.build +++ b/icons/meson.build @@ -32,7 +32,7 @@ foreach theme : themes 'suffix': suffix, 'files': [ 'scalable', 'color-selectors', 'controllers', 'display-filters', - 'prefs', 'templates', 'tools' ], + 'locks', 'prefs', 'templates', 'tools' ], }, ] else @@ -40,9 +40,8 @@ foreach theme : themes '12': [ 'bitmap_12', ], '16': [ 'bitmap_16', 'color-selectors', 'controllers', 'display-filters', - 'prefs', 'templates', 'tools' ], + 'locks', 'prefs', 'templates', 'tools' ], '18': [ 'bitmap_18', ], - '20': [ 'bitmap_20', ], '22': [ 'bitmap_22', ], '24': [ 'bitmap_24', 'templates', 'tools' ], '32': [ 'bitmap_32', ], diff --git a/tools/generate-icon-makefiles.py b/tools/generate-icon-makefiles.py index ac8d728448..cf4ef74884 100755 --- a/tools/generate-icon-makefiles.py +++ b/tools/generate-icon-makefiles.py @@ -117,12 +117,12 @@ if __name__ == "__main__": col_max_len = print_icons(list_dir, ['scalable.list', 'color-selectors.list', 'controllers.list', 'display-filters.list', - 'prefs.list', 'templates.list', 'tools.list'], + 'locks.list', 'prefs.list', 'templates.list', 'tools.list'], None, "scalable/", ".svg", colorf) sym_max_len = print_icons(list_dir, ['scalable.list', 'color-selectors.list', 'controllers.list', 'display-filters.list', - 'prefs.list', 'templates.list', 'tools.list'], + 'locks.list', 'prefs.list', 'templates.list', 'tools.list'], None, "scalable/", "-symbolic.svg", symbolicf) # 12x12 bitmap @@ -137,12 +137,12 @@ if __name__ == "__main__": print_icons(list_dir, ['bitmap_16.list', 'color-selectors.list', 'controllers.list', 'display-filters.list', - 'prefs.list', 'templates.list', 'tools.list'], + 'locks.list', 'prefs.list', 'templates.list', 'tools.list'], col_max_len, "16/", ".png", colorf) print_icons(list_dir, ['bitmap_16.list', 'color-selectors.list', 'controllers.list', 'display-filters.list', - 'prefs.list', 'templates.list', 'tools.list'], + 'locks.list', 'prefs.list', 'templates.list', 'tools.list'], sym_max_len, "16/", "-symbolic.symbolic.png", symbolicf) # 18x18 bitmap @@ -151,12 +151,6 @@ if __name__ == "__main__": print_icons(list_dir, ['bitmap_18.list'], col_max_len, "18/", ".png", colorf) print_icons(list_dir, ['bitmap_18.list'], sym_max_len, "18/", "-symbolic.symbolic.png", symbolicf) - # 20x20 bitmap - print("\nicons20_images = \\", file=colorf) - print("\nicons20_images = \\", file=symbolicf) - print_icons(list_dir, ['bitmap_20.list'], col_max_len, "20/", ".png", colorf) - print_icons(list_dir, ['bitmap_20.list'], sym_max_len, "20/", "-symbolic.symbolic.png", symbolicf) - # 22x22 bitmap print("\nicons22_images = \\", file=colorf) print("\nicons22_images = \\", file=symbolicf)