diff --git a/ChangeLog b/ChangeLog index fcff2ff80b..74ad8d2fba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2003-03-22 Sven Neumann + + * themes/Default/images/Makefile.am + * themes/Default/images/stock-channels-24.png + * themes/Default/images/stock-images-24.png + * themes/Default/images/stock-layers-24.png + * themes/Default/images/stock-paths-22.png: added larger versions of + some icons (provided by Jimmac). + + * libgimpwidgets/gimpstock.c: added the new icons. Register icons + in dialog size first. + 2003-03-22 Sven Neumann * app/gui/layers-commands.c: always flush the image when applying diff --git a/devel-docs/ChangeLog b/devel-docs/ChangeLog index fc7fe47872..ee1afaf23d 100644 --- a/devel-docs/ChangeLog +++ b/devel-docs/ChangeLog @@ -1,3 +1,8 @@ +2003-03-22 Sven Neumann + + * libgimpwidgets/tmpl/gimpstock.sgml: added new icons. Show icons + in all available sizes. + 2003-03-20 Sven Neumann * libgimpwidgets/libgimpwidgets.types diff --git a/devel-docs/libgimpwidgets/tmpl/gimpstock.sgml b/devel-docs/libgimpwidgets/tmpl/gimpstock.sgml index f8e85c3bd7..69427e0908 100644 --- a/devel-docs/libgimpwidgets/tmpl/gimpstock.sgml +++ b/devel-docs/libgimpwidgets/tmpl/gimpstock.sgml @@ -167,6 +167,7 @@ size). + @@ -174,6 +175,7 @@ size). + @@ -349,6 +351,7 @@ size). + @@ -356,12 +359,14 @@ size). + + @@ -369,6 +374,7 @@ size). + @@ -376,6 +382,7 @@ size). + @@ -384,6 +391,7 @@ size). + @@ -769,6 +777,8 @@ size). + + @@ -783,6 +793,8 @@ size). + + @@ -790,6 +802,9 @@ size). + + + @@ -798,6 +813,3 @@ size). - - - diff --git a/libgimpwidgets/gimpstock.c b/libgimpwidgets/gimpstock.c index db18751174..cc8ce170e7 100644 --- a/libgimpwidgets/gimpstock.c +++ b/libgimpwidgets/gimpstock.c @@ -271,6 +271,11 @@ gimp_stock_button_pixbufs[] = { GIMP_STOCK_LETTER_SPACING, stock_letter_spacing_22 }, { GIMP_STOCK_LINE_SPACING, stock_line_spacing_22 }, + { GIMP_STOCK_IMAGES, stock_images_24 }, + { GIMP_STOCK_LAYERS, stock_layers_24 }, + { GIMP_STOCK_CHANNELS, stock_channels_24 }, + { GIMP_STOCK_PATHS, stock_paths_22 }, + { GIMP_STOCK_LAYER, stock_layer_24 }, { GIMP_STOCK_CHANNEL, stock_channel_24 }, @@ -398,6 +403,14 @@ gimp_stock_init (void) gimp_stock_factory = gtk_icon_factory_new (); + for (i = 0; i < G_N_ELEMENTS (gimp_stock_dialog_pixbufs); i++) + { + add_sized_with_same_fallback (gimp_stock_factory, + gimp_stock_dialog_pixbufs[i].inline_data, + GTK_ICON_SIZE_DIALOG, + gimp_stock_dialog_pixbufs[i].stock_id); + } + for (i = 0; i < G_N_ELEMENTS (gimp_stock_button_pixbufs); i++) { add_sized_with_same_fallback (gimp_stock_factory, @@ -414,14 +427,6 @@ gimp_stock_init (void) gimp_stock_menu_pixbufs[i].stock_id); } - for (i = 0; i < G_N_ELEMENTS (gimp_stock_dialog_pixbufs); i++) - { - add_sized_with_same_fallback (gimp_stock_factory, - gimp_stock_dialog_pixbufs[i].inline_data, - GTK_ICON_SIZE_DIALOG, - gimp_stock_dialog_pixbufs[i].stock_id); - } - gtk_icon_factory_add_default (gimp_stock_factory); gtk_stock_add_static (gimp_stock_items, G_N_ELEMENTS (gimp_stock_items)); diff --git a/themes/Default/images/Makefile.am b/themes/Default/images/Makefile.am index fbea800174..c25a617e84 100644 --- a/themes/Default/images/Makefile.am +++ b/themes/Default/images/Makefile.am @@ -22,10 +22,46 @@ WILBER_VARIABLES = \ ## Below are compiled in stock icons +STOCK_MENU_IMAGES = \ + stock-channel-16.png \ + stock-channels-16.png \ + stock-convert-grayscale-16.png \ + stock-convert-indexed-16.png \ + stock-convert-rgb-16.png \ + stock-default-colors-12.png \ + stock-device-status-16.png \ + stock-eye-12.png \ + stock-images-16.png \ + stock-info-16.png \ + stock-invert-16.png \ + stock-layer-16.png \ + stock-layer-to-imagesize-16.png \ + stock-layers-16.png \ + stock-merge-down-16.png \ + stock-navigation-16.png \ + stock-paths-16.png \ + stock-plugin-16.png \ + stock-qmask-off-16.png \ + stock-qmask-on-16.png \ + stock-reshow-filter-16.png \ + stock-resize-16.png \ + stock-rotate-180-16.png \ + stock-rotate-270-16.png \ + stock-rotate-90-16.png \ + stock-scale-16.png \ + stock-selection-all-16.png \ + stock-selection-grow-16.png \ + stock-selection-none-16.png \ + stock-selection-shrink-16.png \ + stock-swap-colors-12.png \ + stock-tool-options-16.png \ + stock-warning-16.png \ + stock-wilber-16.png + STOCK_BUTTON_IMAGES = \ stock-anchor-16.png \ - stock-channel-16.png \ stock-channel-24.png \ + stock-channels-24.png \ stock-char-picker-22.png \ stock-color-picker-black-18.png \ stock-color-picker-gray-18.png \ @@ -35,7 +71,6 @@ STOCK_BUTTON_IMAGES = \ stock-curve-smooth-16.png \ stock-duplicate-16.png \ stock-edit-16.png \ - stock-eye-12.png \ stock-eye-20.png \ stock-gravity-east-24.png \ stock-gravity-north-24.png \ @@ -45,63 +80,32 @@ STOCK_BUTTON_IMAGES = \ stock-gravity-south-east-24.png \ stock-gravity-south-west-24.png \ stock-gravity-west-24.png \ - stock-layer-16.png \ + stock-hchain-24.png \ + stock-hchain-broken-24.png \ + stock-images-24.png \ + stock-info-24.png \ stock-layer-24.png \ + stock-layers-24.png \ + stock-letter-spacing-22.png \ stock-line-spacing-22.png \ stock-linked-12.png \ stock-linked-20.png \ - stock-letter-spacing-22.png \ stock-paste-as-new-16.png \ stock-paste-into-16.png \ + stock-path-stroke-16.png \ + stock-paths-22.png \ stock-reset-16.png \ - stock-selection-replace-16.png \ stock-selection-add-16.png \ - stock-selection-subtract-16.png \ stock-selection-intersect-16.png \ + stock-selection-replace-16.png \ stock-selection-stroke-16.png \ + stock-selection-subtract-16.png \ stock-selection-to-channel-16.png \ stock-selection-to-path-16.png \ - stock-path-stroke-16.png \ - stock-hchain-24.png \ - stock-hchain-broken-24.png \ stock-vchain-24.png \ stock-vchain-broken-24.png \ - stock-info-24.png \ stock-warning-24.png -STOCK_MENU_IMAGES = \ - stock-convert-grayscale-16.png \ - stock-convert-indexed-16.png \ - stock-convert-rgb-16.png \ - stock-invert-16.png \ - stock-merge-down-16.png \ - stock-layer-to-imagesize-16.png \ - stock-plugin-16.png \ - stock-reshow-filter-16.png \ - stock-rotate-180-16.png \ - stock-rotate-270-16.png \ - stock-rotate-90-16.png \ - stock-resize-16.png \ - stock-scale-16.png \ - stock-images-16.png \ - stock-layers-16.png \ - stock-channels-16.png \ - stock-paths-16.png \ - stock-selection-all-16.png \ - stock-selection-none-16.png \ - stock-selection-grow-16.png \ - stock-selection-shrink-16.png \ - stock-navigation-16.png \ - stock-qmask-off-16.png \ - stock-qmask-on-16.png \ - stock-default-colors-12.png \ - stock-swap-colors-12.png \ - stock-tool-options-16.png \ - stock-device-status-16.png \ - stock-info-16.png \ - stock-warning-16.png \ - stock-wilber-16.png - STOCK_DIALOG_IMAGES = \ stock-error-64.png \ stock-info-64.png \ @@ -151,8 +155,8 @@ STOCK_TOOL_IMAGES = \ tools/stock-tool-zoom-22.png STOCK_IMAGES = \ - $(STOCK_BUTTON_IMAGES) \ $(STOCK_MENU_IMAGES) \ + $(STOCK_BUTTON_IMAGES) \ $(STOCK_DIALOG_IMAGES) \ $(STOCK_TOOL_IMAGES) diff --git a/themes/Default/images/stock-channels-24.png b/themes/Default/images/stock-channels-24.png new file mode 100644 index 0000000000..fd00c2e37d Binary files /dev/null and b/themes/Default/images/stock-channels-24.png differ diff --git a/themes/Default/images/stock-images-24.png b/themes/Default/images/stock-images-24.png new file mode 100644 index 0000000000..8fe17a3101 Binary files /dev/null and b/themes/Default/images/stock-images-24.png differ diff --git a/themes/Default/images/stock-layers-24.png b/themes/Default/images/stock-layers-24.png new file mode 100644 index 0000000000..f8cadd2d58 Binary files /dev/null and b/themes/Default/images/stock-layers-24.png differ diff --git a/themes/Default/images/stock-paths-22.png b/themes/Default/images/stock-paths-22.png new file mode 100644 index 0000000000..c4f328623e Binary files /dev/null and b/themes/Default/images/stock-paths-22.png differ