prefixed ALL, NONE, GROW and SHRINK with SELECTION_ since they should only

2003-01-10  Sven Neumann  <sven@gimp.org>

	* libgimpwidgets/gimpstock.[ch]: prefixed ALL, NONE, GROW and
	SHRINK with SELECTION_ since they should only be used for in a
	selection context. Register a few icons in dialog size as well.

	* app/gui/menus.c
	* app/widgets/gimpselectioneditor.c: changed accordingly.

	* themes/Default/images: renamed icons accordingly.

	* plug-ins/common/uniteditor.c: use stock items.
This commit is contained in:
Sven Neumann
2003-01-10 13:01:41 +00:00
committed by Sven Neumann
parent e4a4952d1c
commit a46305046a
16 changed files with 139 additions and 98 deletions

View File

@ -30,9 +30,8 @@ IGNORE_HFILES =
# Images to copy into HTML directory
IMAGES_DIR = $(top_srcdir)/themes/Default/images/
IMAGES_DIR = $(top_srcdir)/themes/Default/images
HTML_IMAGES = \
$(IMAGES_DIR)/stock-all-16.png \
$(IMAGES_DIR)/stock-anchor-16.png \
$(IMAGES_DIR)/stock-char-picker-22.png \
$(IMAGES_DIR)/stock-color-picker-black-18.png \
@ -46,10 +45,10 @@ HTML_IMAGES = \
$(IMAGES_DIR)/stock-duplicate-16.png \
$(IMAGES_DIR)/stock-edit-16.png \
$(IMAGES_DIR)/stock-eye-20.png \
$(IMAGES_DIR)/stock-grow-16.png \
$(IMAGES_DIR)/stock-selection-grow-16.png \
$(IMAGES_DIR)/stock-hchain-24.png \
$(IMAGES_DIR)/stock-hchain-broken-24.png \
$(IMAGES_DIR)/stock-info-24.png \
$(IMAGES_DIR)/stock-info-64.png \
$(IMAGES_DIR)/stock-invert-16.png \
$(IMAGES_DIR)/stock-layer-to-imagesize-16.png \
$(IMAGES_DIR)/stock-letter-spacing-22.png \
@ -57,7 +56,6 @@ HTML_IMAGES = \
$(IMAGES_DIR)/stock-linked-20.png \
$(IMAGES_DIR)/stock-merge-down-16.png \
$(IMAGES_DIR)/stock-navigation-16.png \
$(IMAGES_DIR)/stock-none-16.png \
$(IMAGES_DIR)/stock-paste-as-new-16.png \
$(IMAGES_DIR)/stock-paste-into-16.png \
$(IMAGES_DIR)/stock-path-stroke-16.png \
@ -72,19 +70,21 @@ HTML_IMAGES = \
$(IMAGES_DIR)/stock-rotate-90-16.png \
$(IMAGES_DIR)/stock-scale-16.png \
$(IMAGES_DIR)/stock-selection-add-16.png \
$(IMAGES_DIR)/stock-selection-all-16.png \
$(IMAGES_DIR)/stock-selection-intersect-16.png \
$(IMAGES_DIR)/stock-selection-none-16.png \
$(IMAGES_DIR)/stock-selection-replace-16.png \
$(IMAGES_DIR)/stock-selection-shrink-16.png \
$(IMAGES_DIR)/stock-selection-stroke-16.png \
$(IMAGES_DIR)/stock-selection-subtract-16.png \
$(IMAGES_DIR)/stock-selection-to-channel-16.png \
$(IMAGES_DIR)/stock-selection-to-path-16.png \
$(IMAGES_DIR)/stock-shrink-16.png \
$(IMAGES_DIR)/stock-swap-colors-12.png \
$(IMAGES_DIR)/stock-tool-options-16.png \
$(IMAGES_DIR)/stock-vchain-24.png \
$(IMAGES_DIR)/stock-vchain-broken-24.png \
$(IMAGES_DIR)/stock-warning-24.png \
$(IMAGES_DIR)/stock-wilber-16.png \
$(IMAGES_DIR)/stock-warning-64.png \
$(IMAGES_DIR)/stock-wilber-64.png \
$(IMAGES_DIR)/stock-wilber-eek-64.png \
$(IMAGES_DIR)/tools/stock-tool-airbrush-22.png \
$(IMAGES_DIR)/tools/stock-tool-bezier-select-22.png \

View File

@ -265,13 +265,9 @@ GIMP_QUERY_BOX_VBOX
<TITLE>GimpStock</TITLE>
gimp_stock_init
<SUBSECTION Stock IDs>
GIMP_STOCK_ALL
GIMP_STOCK_NONE
GIMP_STOCK_ANCHOR
GIMP_STOCK_DUPLICATE
GIMP_STOCK_EDIT
GIMP_STOCK_GROW
GIMP_STOCK_SHRINK
GIMP_STOCK_INVERT
GIMP_STOCK_LAYER_TO_IMAGESIZE
GIMP_STOCK_MERGE_DOWN
@ -291,11 +287,15 @@ GIMP_STOCK_ROTATE_90
GIMP_STOCK_SCALE
GIMP_STOCK_LINKED
GIMP_STOCK_VISIBLE
GIMP_STOCK_SELECTION_ALL
GIMP_STOCK_SELECTION_NONE
GIMP_STOCK_SELECTION_GROW
GIMP_STOCK_SELECTION_SHRINK
GIMP_STOCK_SELECTION_ADD
GIMP_STOCK_SELECTION_INTERSECT
GIMP_STOCK_SELECTION_REPLACE
GIMP_STOCK_SELECTION_STROKE
GIMP_STOCK_SELECTION_SUBTRACT
GIMP_STOCK_SELECTION_REPLACE
GIMP_STOCK_SELECTION_INTERSECT
GIMP_STOCK_SELECTION_STROKE
GIMP_STOCK_SELECTION_TO_CHANNEL
GIMP_STOCK_SELECTION_TO_PATH
GIMP_STOCK_CHAR_PICKER

View File

@ -24,20 +24,6 @@ size).
<!-- ##### MACRO GIMP_STOCK_ALL ##### -->
<para>
<inlinegraphic fileref="stock-all-16.png" format="png"></inlinegraphic>
</para>
<!-- ##### MACRO GIMP_STOCK_NONE ##### -->
<para>
<inlinegraphic fileref="stock-none-16.png" format="png"></inlinegraphic>
</para>
<!-- ##### MACRO GIMP_STOCK_ANCHOR ##### -->
<para>
<inlinegraphic fileref="stock-anchor-16.png" format="png"></inlinegraphic>
@ -59,20 +45,6 @@ size).
<!-- ##### MACRO GIMP_STOCK_GROW ##### -->
<para>
<inlinegraphic fileref="stock-grow-16.png" format="png"></inlinegraphic>
</para>
<!-- ##### MACRO GIMP_STOCK_SHRINK ##### -->
<para>
<inlinegraphic fileref="stock-shrink-16.png" format="png"></inlinegraphic>
</para>
<!-- ##### MACRO GIMP_STOCK_INVERT ##### -->
<para>
<inlinegraphic fileref="stock-invert-16.png" format="png"></inlinegraphic>
@ -206,6 +178,34 @@ size).
<!-- ##### MACRO GIMP_STOCK_SELECTION_ALL ##### -->
<para>
</para>
<!-- ##### MACRO GIMP_STOCK_SELECTION_NONE ##### -->
<para>
</para>
<!-- ##### MACRO GIMP_STOCK_SELECTION_GROW ##### -->
<para>
</para>
<!-- ##### MACRO GIMP_STOCK_SELECTION_SHRINK ##### -->
<para>
</para>
<!-- ##### MACRO GIMP_STOCK_SELECTION_ADD ##### -->
<para>
<inlinegraphic fileref="stock-selection-add-16.png" format="png"></inlinegraphic>
@ -213,9 +213,9 @@ size).
<!-- ##### MACRO GIMP_STOCK_SELECTION_INTERSECT ##### -->
<!-- ##### MACRO GIMP_STOCK_SELECTION_SUBTRACT ##### -->
<para>
<inlinegraphic fileref="stock-selection-intersect-16.png" format="png"></inlinegraphic>
<inlinegraphic fileref="stock-selection-subtract-16.png" format="png"></inlinegraphic>
</para>
@ -227,16 +227,16 @@ size).
<!-- ##### MACRO GIMP_STOCK_SELECTION_STROKE ##### -->
<!-- ##### MACRO GIMP_STOCK_SELECTION_INTERSECT ##### -->
<para>
<inlinegraphic fileref="stock-selection-stroke-16.png" format="png"></inlinegraphic>
<inlinegraphic fileref="stock-selection-intersect-16.png" format="png"></inlinegraphic>
</para>
<!-- ##### MACRO GIMP_STOCK_SELECTION_SUBTRACT ##### -->
<!-- ##### MACRO GIMP_STOCK_SELECTION_STROKE ##### -->
<para>
<inlinegraphic fileref="stock-selection-subtract-16.png" format="png"></inlinegraphic>
<inlinegraphic fileref="stock-selection-stroke-16.png" format="png"></inlinegraphic>
</para>
@ -642,21 +642,21 @@ size).
<!-- ##### MACRO GIMP_STOCK_INFO ##### -->
<para>
<inlinegraphic fileref="stock-info-24.png" format="png"></inlinegraphic>
<inlinegraphic fileref="stock-info-64.png" format="png"></inlinegraphic>
</para>
<!-- ##### MACRO GIMP_STOCK_WARNING ##### -->
<para>
<inlinegraphic fileref="stock-warning-24.png" format="png"></inlinegraphic>
<inlinegraphic fileref="stock-warning-64.png" format="png"></inlinegraphic>
</para>
<!-- ##### MACRO GIMP_STOCK_WILBER ##### -->
<para>
<inlinegraphic fileref="stock-wilber-16.png" format="png"></inlinegraphic>
<inlinegraphic fileref="stock-wilber-64.png" format="png"></inlinegraphic>
</para>