From b2874464f5e41d68255164009caa3e59f66e1a25 Mon Sep 17 00:00:00 2001 From: Alx Sa Date: Sun, 14 May 2023 21:54:24 +0000 Subject: [PATCH] icons: Revert most of !909 Per @Jehan, this solution would prevent default icons from being loaded in custom themes if they did not include their own version. The only thing kept from !909 is the replacement of hardcoded strings in a few files with constants defined in gimpicons.h. --- icons/Color/icon-list.mk | 20 +++++++++---------- ...gimp-document-new.svg => document-new.svg} | 0 .../{gimp-edit-delete.svg => edit-delete.svg} | 0 .../{gimp-folder-new.svg => folder-new.svg} | 0 .../{gimp-go-down.svg => go-down.svg} | 0 .../scalable/{gimp-go-up.svg => go-up.svg} | 0 icons/Symbolic/icon-list.mk | 20 +++++++++---------- ...symbolic.svg => document-new-symbolic.svg} | 0 ...-symbolic.svg => edit-delete-symbolic.svg} | 0 ...w-symbolic.svg => folder-new-symbolic.svg} | 0 ...down-symbolic.svg => go-down-symbolic.svg} | 0 ...-go-up-symbolic.svg => go-up-symbolic.svg} | 0 icons/icon-lists/bitmap_16.list | 10 +++++----- icons/icon-lists/scalable.list | 10 +++++----- libgimpwidgets/gimpicons.h | 10 +++++----- menus/tool-options-menu.ui | 2 +- tools/performance-log-viewer.py | 8 ++++---- 17 files changed, 40 insertions(+), 40 deletions(-) rename icons/Color/scalable/{gimp-document-new.svg => document-new.svg} (100%) rename icons/Color/scalable/{gimp-edit-delete.svg => edit-delete.svg} (100%) rename icons/Color/scalable/{gimp-folder-new.svg => folder-new.svg} (100%) rename icons/Color/scalable/{gimp-go-down.svg => go-down.svg} (100%) rename icons/Color/scalable/{gimp-go-up.svg => go-up.svg} (100%) rename icons/Symbolic/scalable/{gimp-document-new-symbolic.svg => document-new-symbolic.svg} (100%) rename icons/Symbolic/scalable/{gimp-edit-delete-symbolic.svg => edit-delete-symbolic.svg} (100%) rename icons/Symbolic/scalable/{gimp-folder-new-symbolic.svg => folder-new-symbolic.svg} (100%) rename icons/Symbolic/scalable/{gimp-go-down-symbolic.svg => go-down-symbolic.svg} (100%) rename icons/Symbolic/scalable/{gimp-go-up-symbolic.svg => go-up-symbolic.svg} (100%) diff --git a/icons/Color/icon-list.mk b/icons/Color/icon-list.mk index 138fcda0f5..92c9fdf161 100644 --- a/icons/Color/icon-list.mk +++ b/icons/Color/icon-list.mk @@ -11,6 +11,7 @@ scalable_images = \ scalable/dialog-information.svg \ scalable/dialog-question.svg \ scalable/dialog-warning.svg \ + scalable/document-new.svg \ scalable/document-open.svg \ scalable/document-open-recent.svg \ scalable/document-print.svg \ @@ -20,10 +21,12 @@ scalable_images = \ scalable/edit-clear.svg \ scalable/edit-copy.svg \ scalable/edit-cut.svg \ + scalable/edit-delete.svg \ scalable/edit-paste.svg \ scalable/edit-redo.svg \ scalable/edit-undo.svg \ scalable/folder.svg \ + scalable/folder-new.svg \ scalable/format-indent-more.svg \ scalable/format-justify-center.svg \ scalable/format-justify-fill.svg \ @@ -32,12 +35,14 @@ scalable_images = \ scalable/format-text-direction-ltr.svg \ scalable/format-text-direction-rtl.svg \ scalable/go-bottom.svg \ + scalable/go-down.svg \ scalable/go-first.svg \ scalable/go-home.svg \ scalable/go-last.svg \ scalable/go-next.svg \ scalable/go-previous.svg \ scalable/go-top.svg \ + scalable/go-up.svg \ scalable/help-about.svg \ scalable/list-add.svg \ scalable/list-remove.svg \ @@ -108,18 +113,13 @@ scalable_images = \ scalable/gimp-default-colors.svg \ scalable/gimp-detach.svg \ scalable/gimp-device-status.svg \ - scalable/gimp-document-new.svg \ scalable/gimp-duplicate.svg \ scalable/gimp-dynamics.svg \ - scalable/gimp-edit-delete.svg \ scalable/gimp-even-horizontal-gap.svg \ scalable/gimp-even-vertical-gap.svg \ scalable/gimp-file-manager.svg \ scalable/gimp-floating-selection.svg \ - scalable/gimp-folder-new.svg \ scalable/gimp-gegl.svg \ - scalable/gimp-go-down.svg \ - scalable/gimp-go-up.svg \ scalable/gimp-gradient-bilinear.svg \ scalable/gimp-gradient-conical-asymmetric.svg \ scalable/gimp-gradient-conical-symmetric.svg \ @@ -398,6 +398,7 @@ icons16_images = \ 16/dialog-information.png \ 16/dialog-question.png \ 16/dialog-warning.png \ + 16/document-new.png \ 16/document-open.png \ 16/document-open-recent.png \ 16/document-print.png \ @@ -407,17 +408,21 @@ icons16_images = \ 16/edit-clear.png \ 16/edit-copy.png \ 16/edit-cut.png \ + 16/edit-delete.png \ 16/edit-paste.png \ 16/edit-redo.png \ 16/edit-undo.png \ 16/folder.png \ + 16/folder-new.png \ 16/go-bottom.png \ + 16/go-down.png \ 16/go-first.png \ 16/go-home.png \ 16/go-last.png \ 16/go-next.png \ 16/go-previous.png \ 16/go-top.png \ + 16/go-up.png \ 16/help-about.png \ 16/list-add.png \ 16/list-remove.png \ @@ -484,16 +489,11 @@ icons16_images = \ 16/gimp-device-status.png \ \ 16/gimp-display-filter.png \ - 16/gimp-document-new.png \ 16/gimp-duplicate.png \ 16/gimp-dynamics.png \ - 16/gimp-edit-delete.png \ 16/gimp-file-manager.png \ 16/gimp-floating-selection.png \ - 16/gimp-folder-new.png \ 16/gimp-gegl.png \ - 16/gimp-go-down.png \ - 16/gimp-go-up.png \ 16/gimp-gradient-bilinear.png \ 16/gimp-gradient-conical-asymmetric.png \ 16/gimp-gradient-conical-symmetric.png \ diff --git a/icons/Color/scalable/gimp-document-new.svg b/icons/Color/scalable/document-new.svg similarity index 100% rename from icons/Color/scalable/gimp-document-new.svg rename to icons/Color/scalable/document-new.svg diff --git a/icons/Color/scalable/gimp-edit-delete.svg b/icons/Color/scalable/edit-delete.svg similarity index 100% rename from icons/Color/scalable/gimp-edit-delete.svg rename to icons/Color/scalable/edit-delete.svg diff --git a/icons/Color/scalable/gimp-folder-new.svg b/icons/Color/scalable/folder-new.svg similarity index 100% rename from icons/Color/scalable/gimp-folder-new.svg rename to icons/Color/scalable/folder-new.svg diff --git a/icons/Color/scalable/gimp-go-down.svg b/icons/Color/scalable/go-down.svg similarity index 100% rename from icons/Color/scalable/gimp-go-down.svg rename to icons/Color/scalable/go-down.svg diff --git a/icons/Color/scalable/gimp-go-up.svg b/icons/Color/scalable/go-up.svg similarity index 100% rename from icons/Color/scalable/gimp-go-up.svg rename to icons/Color/scalable/go-up.svg diff --git a/icons/Symbolic/icon-list.mk b/icons/Symbolic/icon-list.mk index 76d94b42f2..1bc99b5e8a 100644 --- a/icons/Symbolic/icon-list.mk +++ b/icons/Symbolic/icon-list.mk @@ -11,6 +11,7 @@ scalable_images = \ scalable/dialog-information-symbolic.svg \ scalable/dialog-question-symbolic.svg \ scalable/dialog-warning-symbolic.svg \ + scalable/document-new-symbolic.svg \ scalable/document-open-symbolic.svg \ scalable/document-open-recent-symbolic.svg \ scalable/document-print-symbolic.svg \ @@ -20,10 +21,12 @@ scalable_images = \ scalable/edit-clear-symbolic.svg \ scalable/edit-copy-symbolic.svg \ scalable/edit-cut-symbolic.svg \ + scalable/edit-delete-symbolic.svg \ scalable/edit-paste-symbolic.svg \ scalable/edit-redo-symbolic.svg \ scalable/edit-undo-symbolic.svg \ scalable/folder-symbolic.svg \ + scalable/folder-new-symbolic.svg \ scalable/format-indent-more-symbolic.svg \ scalable/format-justify-center-symbolic.svg \ scalable/format-justify-fill-symbolic.svg \ @@ -32,12 +35,14 @@ scalable_images = \ scalable/format-text-direction-ltr-symbolic.svg \ scalable/format-text-direction-rtl-symbolic.svg \ scalable/go-bottom-symbolic.svg \ + scalable/go-down-symbolic.svg \ scalable/go-first-symbolic.svg \ scalable/go-home-symbolic.svg \ scalable/go-last-symbolic.svg \ scalable/go-next-symbolic.svg \ scalable/go-previous-symbolic.svg \ scalable/go-top-symbolic.svg \ + scalable/go-up-symbolic.svg \ scalable/help-about-symbolic.svg \ scalable/list-add-symbolic.svg \ scalable/list-remove-symbolic.svg \ @@ -108,18 +113,13 @@ scalable_images = \ scalable/gimp-default-colors-symbolic.svg \ scalable/gimp-detach-symbolic.svg \ scalable/gimp-device-status-symbolic.svg \ - scalable/gimp-document-new-symbolic.svg \ scalable/gimp-duplicate-symbolic.svg \ scalable/gimp-dynamics-symbolic.svg \ - scalable/gimp-edit-delete-symbolic.svg \ scalable/gimp-even-horizontal-gap-symbolic.svg \ scalable/gimp-even-vertical-gap-symbolic.svg \ scalable/gimp-file-manager-symbolic.svg \ scalable/gimp-floating-selection-symbolic.svg \ - scalable/gimp-folder-new-symbolic.svg \ scalable/gimp-gegl-symbolic.svg \ - scalable/gimp-go-down-symbolic.svg \ - scalable/gimp-go-up-symbolic.svg \ scalable/gimp-gradient-bilinear-symbolic.svg \ scalable/gimp-gradient-conical-asymmetric-symbolic.svg \ scalable/gimp-gradient-conical-symmetric-symbolic.svg \ @@ -398,6 +398,7 @@ icons16_images = \ 16/dialog-information-symbolic.symbolic.png \ 16/dialog-question-symbolic.symbolic.png \ 16/dialog-warning-symbolic.symbolic.png \ + 16/document-new-symbolic.symbolic.png \ 16/document-open-symbolic.symbolic.png \ 16/document-open-recent-symbolic.symbolic.png \ 16/document-print-symbolic.symbolic.png \ @@ -407,17 +408,21 @@ icons16_images = \ 16/edit-clear-symbolic.symbolic.png \ 16/edit-copy-symbolic.symbolic.png \ 16/edit-cut-symbolic.symbolic.png \ + 16/edit-delete-symbolic.symbolic.png \ 16/edit-paste-symbolic.symbolic.png \ 16/edit-redo-symbolic.symbolic.png \ 16/edit-undo-symbolic.symbolic.png \ 16/folder-symbolic.symbolic.png \ + 16/folder-new-symbolic.symbolic.png \ 16/go-bottom-symbolic.symbolic.png \ + 16/go-down-symbolic.symbolic.png \ 16/go-first-symbolic.symbolic.png \ 16/go-home-symbolic.symbolic.png \ 16/go-last-symbolic.symbolic.png \ 16/go-next-symbolic.symbolic.png \ 16/go-previous-symbolic.symbolic.png \ 16/go-top-symbolic.symbolic.png \ + 16/go-up-symbolic.symbolic.png \ 16/help-about-symbolic.symbolic.png \ 16/list-add-symbolic.symbolic.png \ 16/list-remove-symbolic.symbolic.png \ @@ -484,16 +489,11 @@ icons16_images = \ 16/gimp-device-status-symbolic.symbolic.png \ \ 16/gimp-display-filter-symbolic.symbolic.png \ - 16/gimp-document-new-symbolic.symbolic.png \ 16/gimp-duplicate-symbolic.symbolic.png \ 16/gimp-dynamics-symbolic.symbolic.png \ - 16/gimp-edit-delete-symbolic.symbolic.png \ 16/gimp-file-manager-symbolic.symbolic.png \ 16/gimp-floating-selection-symbolic.symbolic.png \ - 16/gimp-folder-new-symbolic.symbolic.png \ 16/gimp-gegl-symbolic.symbolic.png \ - 16/gimp-go-down-symbolic.symbolic.png \ - 16/gimp-go-up-symbolic.symbolic.png \ 16/gimp-gradient-bilinear-symbolic.symbolic.png \ 16/gimp-gradient-conical-asymmetric-symbolic.symbolic.png \ 16/gimp-gradient-conical-symmetric-symbolic.symbolic.png \ diff --git a/icons/Symbolic/scalable/gimp-document-new-symbolic.svg b/icons/Symbolic/scalable/document-new-symbolic.svg similarity index 100% rename from icons/Symbolic/scalable/gimp-document-new-symbolic.svg rename to icons/Symbolic/scalable/document-new-symbolic.svg diff --git a/icons/Symbolic/scalable/gimp-edit-delete-symbolic.svg b/icons/Symbolic/scalable/edit-delete-symbolic.svg similarity index 100% rename from icons/Symbolic/scalable/gimp-edit-delete-symbolic.svg rename to icons/Symbolic/scalable/edit-delete-symbolic.svg diff --git a/icons/Symbolic/scalable/gimp-folder-new-symbolic.svg b/icons/Symbolic/scalable/folder-new-symbolic.svg similarity index 100% rename from icons/Symbolic/scalable/gimp-folder-new-symbolic.svg rename to icons/Symbolic/scalable/folder-new-symbolic.svg diff --git a/icons/Symbolic/scalable/gimp-go-down-symbolic.svg b/icons/Symbolic/scalable/go-down-symbolic.svg similarity index 100% rename from icons/Symbolic/scalable/gimp-go-down-symbolic.svg rename to icons/Symbolic/scalable/go-down-symbolic.svg diff --git a/icons/Symbolic/scalable/gimp-go-up-symbolic.svg b/icons/Symbolic/scalable/go-up-symbolic.svg similarity index 100% rename from icons/Symbolic/scalable/gimp-go-up-symbolic.svg rename to icons/Symbolic/scalable/go-up-symbolic.svg diff --git a/icons/icon-lists/bitmap_16.list b/icons/icon-lists/bitmap_16.list index 1b0cd17cc9..8338ac7945 100644 --- a/icons/icon-lists/bitmap_16.list +++ b/icons/icon-lists/bitmap_16.list @@ -2,6 +2,7 @@ dialog-error dialog-information dialog-question dialog-warning +document-new document-open document-open-recent document-print @@ -11,17 +12,21 @@ document-save-as edit-clear edit-copy edit-cut +edit-delete edit-paste edit-redo edit-undo folder +folder-new go-bottom +go-down go-first go-home go-last go-next go-previous go-top +go-up help-about list-add list-remove @@ -88,16 +93,11 @@ gimp-dashboard gimp-device-status # Used as view-display-filters action (usually 16px). gimp-display-filter -gimp-document-new gimp-duplicate gimp-dynamics -gimp-edit-delete gimp-file-manager gimp-floating-selection -gimp-folder-new gimp-gegl -gimp-go-down -gimp-go-up gimp-gradient-bilinear gimp-gradient-conical-asymmetric gimp-gradient-conical-symmetric diff --git a/icons/icon-lists/scalable.list b/icons/icon-lists/scalable.list index 91f559e6b9..5fbeb97ddb 100644 --- a/icons/icon-lists/scalable.list +++ b/icons/icon-lists/scalable.list @@ -2,6 +2,7 @@ dialog-error dialog-information dialog-question dialog-warning +document-new document-open document-open-recent document-print @@ -11,10 +12,12 @@ document-save-as edit-clear edit-copy edit-cut +edit-delete edit-paste edit-redo edit-undo folder +folder-new format-indent-more format-justify-center format-justify-fill @@ -23,12 +26,14 @@ format-justify-right format-text-direction-ltr format-text-direction-rtl go-bottom +go-down go-first go-home go-last go-next go-previous go-top +go-up help-about list-add list-remove @@ -99,18 +104,13 @@ gimp-dashboard gimp-default-colors gimp-detach gimp-device-status -gimp-document-new gimp-duplicate gimp-dynamics -gimp-edit-delete gimp-even-horizontal-gap gimp-even-vertical-gap gimp-file-manager gimp-floating-selection -gimp-folder-new gimp-gegl -gimp-go-down -gimp-go-up gimp-gradient-bilinear gimp-gradient-conical-asymmetric gimp-gradient-conical-symmetric diff --git a/libgimpwidgets/gimpicons.h b/libgimpwidgets/gimpicons.h index c5e70d37c0..1c0309588f 100644 --- a/libgimpwidgets/gimpicons.h +++ b/libgimpwidgets/gimpicons.h @@ -187,7 +187,7 @@ G_BEGIN_DECLS #define GIMP_ICON_LOCK_VISIBILITY "gimp-lock-visibility" #define GIMP_ICON_LOCK_MULTI "gimp-lock-multi" -#define GIMP_ICON_DOCUMENT_NEW "gimp-document-new" +#define GIMP_ICON_DOCUMENT_NEW "document-new" #define GIMP_ICON_DOCUMENT_OPEN "document-open" #define GIMP_ICON_DOCUMENT_OPEN_RECENT "document-open-recent" #define GIMP_ICON_DOCUMENT_PAGE_SETUP "document-page-setup" @@ -202,7 +202,7 @@ G_BEGIN_DECLS #define GIMP_ICON_EDIT_CLEAR "edit-clear" #define GIMP_ICON_EDIT_COPY "edit-copy" #define GIMP_ICON_EDIT_CUT "edit-cut" -#define GIMP_ICON_EDIT_DELETE "gimp-edit-delete" +#define GIMP_ICON_EDIT_DELETE "edit-delete" #define GIMP_ICON_EDIT_FIND "edit-find" #define GIMP_ICON_EDIT_PASTE "edit-paste" #define GIMP_ICON_EDIT_PASTE_AS_NEW "gimp-paste-as-new" @@ -216,7 +216,7 @@ G_BEGIN_DECLS #define GIMP_ICON_FILL_HORIZONTAL "gimp-hfill" #define GIMP_ICON_FILL_VERTICAL "gimp-vfill" -#define GIMP_ICON_FOLDER_NEW "gimp-folder-new" +#define GIMP_ICON_FOLDER_NEW "folder-new" #define GIMP_ICON_FORMAT_INDENT_MORE "format-indent-more" #define GIMP_ICON_FORMAT_INDENT_LESS "format-indent-less" @@ -259,12 +259,12 @@ G_BEGIN_DECLS #define GIMP_ICON_GRAVITY_WEST "gimp-gravity-west" #define GIMP_ICON_GO_BOTTOM "go-bottom" -#define GIMP_ICON_GO_DOWN "gimp-go-down" +#define GIMP_ICON_GO_DOWN "go-down" #define GIMP_ICON_GO_FIRST "go-first" #define GIMP_ICON_GO_HOME "go-home" #define GIMP_ICON_GO_LAST "go-last" #define GIMP_ICON_GO_TOP "go-top" -#define GIMP_ICON_GO_UP "gimp-go-up" +#define GIMP_ICON_GO_UP "go-up" #define GIMP_ICON_GO_PREVIOUS "go-previous" #define GIMP_ICON_GO_NEXT "go-next" diff --git a/menus/tool-options-menu.ui b/menus/tool-options-menu.ui index 87f5739fbc..3c9d376aa9 100644 --- a/menus/tool-options-menu.ui +++ b/menus/tool-options-menu.ui @@ -22,7 +22,7 @@ _Delete Tool Preset - gimp-edit-delete + edit-delete
tool-options.tool-options-reset diff --git a/tools/performance-log-viewer.py b/tools/performance-log-viewer.py index 41adda1cf7..8e87eb8027 100755 --- a/tools/performance-log-viewer.py +++ b/tools/performance-log-viewer.py @@ -1416,13 +1416,13 @@ class SampleGraphList (Gtk.Box): buttons.add (button) button.show () - button = Gtk.Button.new_from_icon_name ("gimp-go-up-symbolic", + button = Gtk.Button.new_from_icon_name ("go-up-symbolic", Gtk.IconSize.BUTTON) move_up_button = button buttons.add (button) button.show () - button = Gtk.Button.new_from_icon_name ("gimp-go-down-symbolic", + button = Gtk.Button.new_from_icon_name ("go-down-symbolic", Gtk.IconSize.BUTTON) move_down_button = button buttons.add (button) @@ -3092,7 +3092,7 @@ class ProfileViewer (Gtk.ScrolledWindow): box.get_style_context ().add_class ("raised") box.show () - button = Gtk.Button.new_from_icon_name ("gimp-go-up-symbolic", + button = Gtk.Button.new_from_icon_name ("go-up-symbolic", Gtk.IconSize.BUTTON) self.prev_button = button box.pack_start (button, False, True, 0) @@ -3100,7 +3100,7 @@ class ProfileViewer (Gtk.ScrolledWindow): button.connect ("clicked", lambda *args: self.move (-1)) - button = Gtk.Button.new_from_icon_name ("gimp-go-down-symbolic", + button = Gtk.Button.new_from_icon_name ("go-down-symbolic", Gtk.IconSize.BUTTON) self.next_button = button box.pack_end (button, False, True, 0)