diff --git a/app/actions/file-actions.c b/app/actions/file-actions.c index 25f4087dac..5f9e16f9eb 100644 --- a/app/actions/file-actions.c +++ b/app/actions/file-actions.c @@ -72,7 +72,7 @@ static const GimpActionEntry file_actions[] = { "file-create-menu", NULL, NC_("file-action", "Crea_te") }, { "file-open-recent-menu", NULL, NC_("file-action", "Open _Recent") }, - { "file-open", "document-open", + { "file-open", GIMP_STOCK_IMAGE_OPEN, NC_("file-action", "_Open..."), "O", NC_("file-action", "Open an image file"), G_CALLBACK (file_open_cmd_callback), @@ -96,31 +96,31 @@ static const GimpActionEntry file_actions[] = G_CALLBACK (file_create_template_cmd_callback), GIMP_HELP_FILE_CREATE_TEMPLATE }, - { "file-revert", "document-revert", + { "file-revert", GIMP_STOCK_IMAGE_RELOAD, NC_("file-action", "Re_vert"), NULL, NC_("file-action", "Reload the image file from disk"), G_CALLBACK (file_revert_cmd_callback), GIMP_HELP_FILE_REVERT }, - { "file-close-all", "window-close", + { "file-close-all", GIMP_STOCK_CLOSE_ALL, NC_("file-action", "Close all"), "W", NC_("file-action", "Close all opened images"), G_CALLBACK (file_close_all_cmd_callback), GIMP_HELP_FILE_CLOSE_ALL }, - { "file-copy-location", "edit-copy", + { "file-copy-location", GIMP_STOCK_CLIPBOARD NC_("file-action", "Copy _Image Location"), NULL, NC_("file-action", "Copy image file location to clipboard"), G_CALLBACK (file_copy_location_cmd_callback), GIMP_HELP_FILE_COPY_LOCATION }, - { "file-show-in-file-manager", "gtk-directory", + { "file-show-in-file-manager", GIMP_STOCK_FILE_MANAGER NC_("file-action", "Show in _File Manager"), "F", NC_("file-action", "Show image file location in the file manager"), G_CALLBACK (file_show_in_file_manager_cmd_callback), GIMP_HELP_FILE_SHOW_IN_FILE_MANAGER }, - { "file-quit", "application-exit", + { "file-quit", GIMP_STOCK_QUIT, NC_("file-action", "_Quit"), "Q", NC_("file-action", "Quit the GNU Image Manipulation Program"), G_CALLBACK (file_quit_cmd_callback), @@ -129,13 +129,13 @@ static const GimpActionEntry file_actions[] = static const GimpEnumActionEntry file_save_actions[] = { - { "file-save", "document-save", + { "file-save", GIMP_STOCK_SAVE, NC_("file-action", "_Save"), "S", NC_("file-action", "Save this image"), GIMP_SAVE_MODE_SAVE, FALSE, GIMP_HELP_FILE_SAVE }, - { "file-save-as", "document-save-as", + { "file-save-as", GIMP_STOCK_SAVE_AS, NC_("file-action", "Save _As..."), "S", NC_("file-action", "Save this image with a different name"), GIMP_SAVE_MODE_SAVE_AS, FALSE, diff --git a/icons/Color/16/gimp-clipboard.png b/icons/Color/16/gimp-clipboard.png new file mode 100644 index 0000000000..563cc8b481 Binary files /dev/null and b/icons/Color/16/gimp-clipboard.png differ diff --git a/icons/Color/16/gimp-close-all.png b/icons/Color/16/gimp-close-all.png new file mode 100644 index 0000000000..862bf1ea1d Binary files /dev/null and b/icons/Color/16/gimp-close-all.png differ diff --git a/icons/Color/16/gimp-file-manager.png b/icons/Color/16/gimp-file-manager.png new file mode 100644 index 0000000000..8c4f944138 Binary files /dev/null and b/icons/Color/16/gimp-file-manager.png differ diff --git a/icons/Color/16/gimp-image-open.png b/icons/Color/16/gimp-image-open.png new file mode 100644 index 0000000000..0d1430f2f7 Binary files /dev/null and b/icons/Color/16/gimp-image-open.png differ diff --git a/icons/Color/16/gimp-image-reload.png b/icons/Color/16/gimp-image-reload.png new file mode 100644 index 0000000000..e342c4b482 Binary files /dev/null and b/icons/Color/16/gimp-image-reload.png differ diff --git a/icons/Color/16/gimp-quit.png b/icons/Color/16/gimp-quit.png new file mode 100644 index 0000000000..8e4e6b1200 Binary files /dev/null and b/icons/Color/16/gimp-quit.png differ diff --git a/icons/Color/16/gimp-save-as.png b/icons/Color/16/gimp-save-as.png new file mode 100644 index 0000000000..65b7ac8770 Binary files /dev/null and b/icons/Color/16/gimp-save-as.png differ diff --git a/icons/Color/scalable/gimp-clipboard.svg b/icons/Color/scalable/gimp-clipboard.svg new file mode 100644 index 0000000000..79d9cb602d --- /dev/null +++ b/icons/Color/scalable/gimp-clipboard.svg @@ -0,0 +1,330 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Klaus Staedtler + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/Color/scalable/gimp-close-all.svg b/icons/Color/scalable/gimp-close-all.svg new file mode 100644 index 0000000000..9711f8d61d --- /dev/null +++ b/icons/Color/scalable/gimp-close-all.svg @@ -0,0 +1,256 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Klaus Staedtler + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/Color/scalable/gimp-file-manager.svg b/icons/Color/scalable/gimp-file-manager.svg new file mode 100644 index 0000000000..327ba928d1 --- /dev/null +++ b/icons/Color/scalable/gimp-file-manager.svg @@ -0,0 +1,321 @@ + + + + + + + + + image/svg+xml + + + + + many unknown and unnamed, Andrew Chadwick, Alexandre Prokoudine, Aryeom Han, Benoit Touchette, Jakub Steiner, Jehan, Johannes Matschke, Kevin Payne, Klaus Staedtler, Marek Dvoroznak, Michael Natterer + + + Enhanced, extended tango-art-libre for GIMP + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/Color/scalable/gimp-image-open.svg b/icons/Color/scalable/gimp-image-open.svg new file mode 100644 index 0000000000..ac4c073c18 --- /dev/null +++ b/icons/Color/scalable/gimp-image-open.svg @@ -0,0 +1,367 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/Color/scalable/gimp-image-reload.svg b/icons/Color/scalable/gimp-image-reload.svg new file mode 100644 index 0000000000..8ef949cee5 --- /dev/null +++ b/icons/Color/scalable/gimp-image-reload.svg @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Klaus Staedtler + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/Color/scalable/gimp-paste-as-new.svg b/icons/Color/scalable/gimp-paste-as-new.svg index 0f51916073..f77a4ec885 100644 --- a/icons/Color/scalable/gimp-paste-as-new.svg +++ b/icons/Color/scalable/gimp-paste-as-new.svg @@ -2,7 +2,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + style="opacity:1;fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00813413;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#babdb6;fill-opacity:1;fill-rule:evenodd;stroke:#868a84;stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + + + + + + + + + + image/svg+xml + + + + + Klaus Staedtler + + + + + + + + + + + + + + + + + + diff --git a/icons/Color/scalable/gimp-save-as.svg b/icons/Color/scalable/gimp-save-as.svg new file mode 100644 index 0000000000..202ef68ad9 --- /dev/null +++ b/icons/Color/scalable/gimp-save-as.svg @@ -0,0 +1,266 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Klaus Staedtler + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/Prototype/Color/16/gimp-image-open.png b/icons/Prototype/Color/16/gimp-image-open.png deleted file mode 100644 index 002f92b31a..0000000000 Binary files a/icons/Prototype/Color/16/gimp-image-open.png and /dev/null differ diff --git a/icons/Prototype/Symbolic/16/gimp-image-open.png b/icons/Prototype/Symbolic/16/gimp-image-open.png deleted file mode 100644 index 2ab631f9ab..0000000000 Binary files a/icons/Prototype/Symbolic/16/gimp-image-open.png and /dev/null differ diff --git a/icons/Symbolic/16/gimp-clipboard.png b/icons/Symbolic/16/gimp-clipboard.png new file mode 100644 index 0000000000..5732e89f41 Binary files /dev/null and b/icons/Symbolic/16/gimp-clipboard.png differ diff --git a/icons/Symbolic/16/gimp-close-all.png b/icons/Symbolic/16/gimp-close-all.png new file mode 100644 index 0000000000..964bc790d2 Binary files /dev/null and b/icons/Symbolic/16/gimp-close-all.png differ diff --git a/icons/Symbolic/16/gimp-file-manager.png b/icons/Symbolic/16/gimp-file-manager.png new file mode 100644 index 0000000000..66b5660dd4 Binary files /dev/null and b/icons/Symbolic/16/gimp-file-manager.png differ diff --git a/icons/Symbolic/16/gimp-image-open.png b/icons/Symbolic/16/gimp-image-open.png new file mode 100644 index 0000000000..d58609df89 Binary files /dev/null and b/icons/Symbolic/16/gimp-image-open.png differ diff --git a/icons/Symbolic/16/gimp-quit.png b/icons/Symbolic/16/gimp-quit.png new file mode 100644 index 0000000000..af48f7346d Binary files /dev/null and b/icons/Symbolic/16/gimp-quit.png differ diff --git a/icons/Symbolic/16/gimp-save-as.png b/icons/Symbolic/16/gimp-save-as.png new file mode 100644 index 0000000000..487b42b7ba Binary files /dev/null and b/icons/Symbolic/16/gimp-save-as.png differ diff --git a/icons/Symbolic/scalable/gimp-clipboard.svg b/icons/Symbolic/scalable/gimp-clipboard.svg new file mode 100644 index 0000000000..9e974a8495 --- /dev/null +++ b/icons/Symbolic/scalable/gimp-clipboard.svg @@ -0,0 +1,192 @@ + + + + + + + + + image/svg+xml + + + + + Barbara Muraus, Jakub Steiner, Klaus Staedtler + + + Images originally created as the "Art Libre" icon set. Extended and adopted for GIMP + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/Symbolic/scalable/gimp-close-all.svg b/icons/Symbolic/scalable/gimp-close-all.svg new file mode 100644 index 0000000000..8d54abcb64 --- /dev/null +++ b/icons/Symbolic/scalable/gimp-close-all.svg @@ -0,0 +1,216 @@ + + + + + + + + + image/svg+xml + + + + + Barbara Muraus, Jakub Steiner, Klaus Staedtler + + + Images originally created as the "Art Libre" icon set. Extended and adopted for GIMP + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/Symbolic/scalable/gimp-file-manager.svg b/icons/Symbolic/scalable/gimp-file-manager.svg new file mode 100644 index 0000000000..02c7922eba --- /dev/null +++ b/icons/Symbolic/scalable/gimp-file-manager.svg @@ -0,0 +1,75 @@ + + + + + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + Gnome Symbolic Icon Theme + + + + + + + diff --git a/icons/Symbolic/scalable/gimp-image-open.svg b/icons/Symbolic/scalable/gimp-image-open.svg new file mode 100644 index 0000000000..7832ac20b3 --- /dev/null +++ b/icons/Symbolic/scalable/gimp-image-open.svg @@ -0,0 +1,126 @@ + + + + + + + + + + + image/svg+xml + + + + + Klaus Staedtler + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/Symbolic/scalable/gimp-image-reload.svg b/icons/Symbolic/scalable/gimp-image-reload.svg new file mode 100644 index 0000000000..afafdc5c92 --- /dev/null +++ b/icons/Symbolic/scalable/gimp-image-reload.svg @@ -0,0 +1,201 @@ + + + + + + + + + image/svg+xml + + + + + Barbara Muraus, Jakub Steiner, Klaus Staedtler + + + Images originally created as the "Art Libre" icon set. Extended and adopted for GIMP + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/Symbolic/scalable/gimp-quit.svg b/icons/Symbolic/scalable/gimp-quit.svg new file mode 100644 index 0000000000..28aec05f97 --- /dev/null +++ b/icons/Symbolic/scalable/gimp-quit.svg @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + Klaus Staedtler + + + + + + + + + + + + + + + + diff --git a/icons/Symbolic/scalable/gimp-save-as.svg b/icons/Symbolic/scalable/gimp-save-as.svg new file mode 100644 index 0000000000..4f097eb029 --- /dev/null +++ b/icons/Symbolic/scalable/gimp-save-as.svg @@ -0,0 +1,179 @@ + + + + + + + + + + + image/svg+xml + + + + + Klaus Staedtler + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/icon-list.mk b/icons/icon-list.mk index 46aa2e3f29..24df8d57bd 100644 --- a/icons/icon-list.mk +++ b/icons/icon-list.mk @@ -14,7 +14,9 @@ scalable_images = \ scalable/gimp-channels.svg \ scalable/gimp-channel.svg \ scalable/gimp-char-picker.svg \ + scalable/gimp-clipboard.svg \ scalable/gimp-close.svg \ + scalable/gimp-close-all.svg \ scalable/gimp-colormap.svg \ scalable/gimp-color-picker-black.svg \ scalable/gimp-color-picker-gray.svg \ @@ -47,6 +49,7 @@ scalable_images = \ scalable/gimp-dynamics.svg \ scalable/gimp-edit.svg \ scalable/gimp-error.svg \ + scalable/gimp-file-manager.svg \ scalable/gimp-flip-horizontal.svg \ scalable/gimp-flip-vertical.svg \ scalable/gimp-floating-selection.svg \ @@ -81,6 +84,8 @@ scalable_images = \ scalable/gimp-histogram.svg \ scalable/gimp-images.svg \ scalable/gimp-image.svg \ + scalable/gimp-image-open.svg \ + scalable/gimp-image-reload.svg \ scalable/gimp-info.svg \ scalable/gimp-input-device.svg \ scalable/gimp-invert.svg \ @@ -157,6 +162,7 @@ scalable_images = \ scalable/gimp-question.svg \ scalable/gimp-quick-mask-off.svg \ scalable/gimp-quick-mask-on.svg \ + scalable/gimp-quit.svg \ scalable/gimp-reset.svg \ scalable/gimp-reshow-filter.svg \ scalable/gimp-resize.svg \ @@ -165,6 +171,7 @@ scalable_images = \ scalable/gimp-rotate-90.svg \ scalable/gimp-sample-point.svg \ scalable/gimp-save.svg \ + scalabe/gimp-save-as.svg \ scalable/gimp-scale.svg \ scalable/gimp-selection.svg \ scalable/gimp-selection-add.svg \ @@ -437,6 +444,8 @@ icons16_images = \ 16/gimp-channel-red.png \ 16/gimp-channel.png \ 16/gimp-channels.png \ + 16/gimp-clipboard.png \ + 16/gimp-close-all.png \ 16/gimp-color-pick-from-screen.png \ 16/gimp-color-cmyk.png \ 16/gimp-color-palette.png \ @@ -465,6 +474,7 @@ icons16_images = \ 16/gimp-dynamics.png \ 16/gimp-edit.png \ 16/gimp-error.png \ + 16/gimp-file-manager.png \ 16/gimp-flip-horizontal.png \ 16/gimp-flip-vertical.png \ 16/gimp-floating-selection.png \ @@ -487,6 +497,8 @@ icons16_images = \ 16/gimp-histogram.png \ 16/gimp-image.png \ 16/gimp-images.png \ + 16/gimp-image-open.png \ + 16/gimp-image-reload.png \ 16/gimp-info.png \ 16/gimp-input-device.png \ 16/gimp-invert.png \ @@ -539,6 +551,7 @@ icons16_images = \ 16/gimp-previous.png \ 16/gimp-print-resolution.png \ 16/gimp-question.png \ + 16/gimp-quit.png \ 16/gimp-reset.png \ 16/gimp-reshow-filter.png \ 16/gimp-resize.png \ @@ -547,6 +560,7 @@ icons16_images = \ 16/gimp-rotate-90.png \ 16/gimp-sample-point.png \ 16/gimp-save.png \ + 16/gimp-save-as.png \ 16/gimp-scale.png \ 16/gimp-selection-add.png \ 16/gimp-selection-all.png \ diff --git a/libgimpwidgets/gimpicons.c b/libgimpwidgets/gimpicons.c index 9a912efb05..b4ca0371d0 100644 --- a/libgimpwidgets/gimpicons.c +++ b/libgimpwidgets/gimpicons.c @@ -70,7 +70,15 @@ static const GtkStockItem gimp_stock_items[] = { GIMP_STOCK_NEXT, N_("Ne_xt"), 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_PREVIOUS, N_("Pre_vious"), 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_SAVE, N_("_Save"), 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_SAVE_AS, N_("Save as"), 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_CANCEL, N_("_Cancel"), 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_QUIT, N_("_Quit"), 0, 0, LIBGIMP_DOMAIN }, + + { GIMP_STOCK_IMAGE_OPEN, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_IMAGE_RELOAD, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_CLOSE_ALL, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_CLIPBOARD, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_FILE_MANAGER, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_GRADIENT_LINEAR, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_GRADIENT_BILINEAR, NULL, 0, 0, LIBGIMP_DOMAIN }, diff --git a/libgimpwidgets/gimpicons.h b/libgimpwidgets/gimpicons.h index 4c73cc4b68..7ced0ae612 100644 --- a/libgimpwidgets/gimpicons.h +++ b/libgimpwidgets/gimpicons.h @@ -45,7 +45,16 @@ G_BEGIN_DECLS #define GIMP_STOCK_NEXT "gimp-next" #define GIMP_STOCK_PREVIOUS "gimp-previous" #define GIMP_STOCK_SAVE "gimp-save" +#define GIMP_STOCK_SAVE_AS "gimp-save-as" #define GIMP_STOCK_CANCEL "gimp-cancel" +#define GIMP_STOCK_QUIT "gimp-quit" + +#define GIMP_STOCK_IMAGE_OPEN "gimp-image-open" +#define GIMP_STOCK_IMAGE_RELOAD "gimp-image-reload" +#define GIMP_STOCK_CLOSE_ALL "gimp-close-all" +#define GIMP_STOCK_CLIPBOARD "gimp-clipboard" +#define GIMP_STOCK_FILE_MANAGER "gimp-file-manager" + #define GIMP_STOCK_GRADIENT_LINEAR "gimp-gradient-linear" #define GIMP_STOCK_GRADIENT_BILINEAR "gimp-gradient-bilinear"