Commit f299ada6 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

themes/Default/images/Makefile.am

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

	* themes/Default/images/Makefile.am
	* themes/Default/images/stock-histogram-linear-16.png
	* themes/Default/images/stock-histogram-logarithmic-16.png:
	added placeholders for new icons.

	* libgimpwidgets/gimpstock.[ch]: register the new icons.

	* app/tools/gimphistogramtool.c: made the dialog more compact by
	using a stock-box for the histogram scale.

	* app/widgets/gimphistogramview.c (gimp_histogram_view_expose):
	don't invert the histogram view if the full range is selected.

	* app/widgets/gimphistogrambox.c: moved the range widgets below
	the histogram.

	* app/config/gimpconfig-params.h: added macro
	GIMP_CONFIG_INSTALL_PROP_RESOLUTION() that installs a double
	property with the suitable range.

	* app/core/gimptemplate.c
	* app/config/gimpdisplayconfig.c: use it here.
parent a7476d12
2003-10-24 Sven Neumann <sven@gimp.org>
* themes/Default/images/Makefile.am
* themes/Default/images/stock-histogram-linear-16.png
* themes/Default/images/stock-histogram-logarithmic-16.png:
added placeholders for new icons.
* libgimpwidgets/gimpstock.[ch]: register the new icons.
* app/tools/gimphistogramtool.c: made the dialog more compact by
using a stock-box for the histogram scale.
* app/widgets/gimphistogramview.c (gimp_histogram_view_expose):
don't invert the histogram view if the full range is selected.
* app/widgets/gimphistogrambox.c: moved the range widgets below
the histogram.
* app/config/gimpconfig-params.h: added macro
GIMP_CONFIG_INSTALL_PROP_RESOLUTION() that installs a double
property with the suitable range.
* app/core/gimptemplate.c
* app/config/gimpdisplayconfig.c: use it here.
2003-10-23 Helvetix Victorinox <helvetix@gimp.org>
* app/composite/gimp-composite-3dnow.c:
Incorrectly reported the inverse of whether not the 3dNow
instruction set is supported by the current CPU.
* app/composite/gimp-composite-{mmx,sse}.c:
Removed linkage of gimp_composite_divide_*. Something is
inexplicably broken, and this will get people working again
......@@ -149,6 +149,13 @@ GParamSpec * gimp_param_spec_unit (const gchar *name,
g_param_spec_double (name, NULL, blurb,\
min, max, default,\
flags | GIMP_CONFIG_PARAM_FLAGS))
#define GIMP_CONFIG_INSTALL_PROP_RESOLUTION(class, id,\
name, blurb, default, flags)\
g_object_class_install_property (class, id,\
g_param_spec_double (name, NULL, blurb,\
GIMP_MIN_RESOLUTION, GIMP_MAX_RESOLUTION, \
default,\
flags | GIMP_CONFIG_PARAM_FLAGS))
#define GIMP_CONFIG_INSTALL_PROP_ENUM(class, id,\
name, blurb, enum_type, default, flags)\
g_object_class_install_property (class, id,\
......
......@@ -182,7 +182,8 @@ gimp_display_config_class_init (GimpDisplayConfigClass *klass)
TRUE,
0);
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_SHOW_BRUSH_OUTLINE,
"show-brush-outline", SHOW_BRUSH_OUTLINE_BLURB,
"show-brush-outline",
SHOW_BRUSH_OUTLINE_BLURB,
TRUE,
0);
GIMP_CONFIG_INSTALL_PROP_STRING (object_class, PROP_IMAGE_TITLE_FORMAT,
......@@ -199,16 +200,16 @@ gimp_display_config_class_init (GimpDisplayConfigClass *klass)
"confirm-on-close", CONFIRM_ON_CLOSE_BLURB,
TRUE,
0);
GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_MONITOR_XRESOLUTION,
"monitor-xresolution",
MONITOR_XRESOLUTION_BLURB,
GIMP_MIN_RESOLUTION, G_MAXDOUBLE, 72.0,
0);
GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_MONITOR_YRESOLUTION,
"monitor-yresolution",
MONITOR_YRESOLUTION_BLURB,
GIMP_MIN_RESOLUTION, G_MAXDOUBLE, 72.0,
0);
GIMP_CONFIG_INSTALL_PROP_RESOLUTION (object_class, PROP_MONITOR_XRESOLUTION,
"monitor-xresolution",
MONITOR_XRESOLUTION_BLURB,
72.0,
0);
GIMP_CONFIG_INSTALL_PROP_RESOLUTION (object_class, PROP_MONITOR_YRESOLUTION,
"monitor-yresolution",
MONITOR_YRESOLUTION_BLURB,
72.0,
0);
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_MONITOR_RES_FROM_GDK,
"monitor-resolution-from-windowing-system",
MONITOR_RES_FROM_GDK_BLURB,
......
......@@ -133,11 +133,11 @@ gimp_template_class_init (GimpTemplateClass *klass)
GIMP_CONFIG_INSTALL_PROP_INT (object_class, PROP_WIDTH, "width",
NULL,
1, GIMP_MAX_IMAGE_SIZE, 256,
GIMP_MIN_IMAGE_SIZE, GIMP_MAX_IMAGE_SIZE, 256,
0);
GIMP_CONFIG_INSTALL_PROP_INT (object_class, PROP_HEIGHT, "height",
NULL,
1, GIMP_MAX_IMAGE_SIZE, 256,
GIMP_MIN_IMAGE_SIZE, GIMP_MAX_IMAGE_SIZE, 256,
0);
GIMP_CONFIG_INSTALL_PROP_UNIT (object_class, PROP_UNIT, "unit",
N_("The unit used for coordinate display "
......@@ -145,18 +145,16 @@ gimp_template_class_init (GimpTemplateClass *klass)
FALSE, FALSE, GIMP_UNIT_INCH,
0);
GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_XRESOLUTION,
"xresolution",
N_("The horizonal image resolution."),
GIMP_MIN_RESOLUTION, GIMP_MAX_RESOLUTION,
72.0,
0);
GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_YRESOLUTION,
"yresolution",
N_("The vertical image resolution."),
GIMP_MIN_RESOLUTION, GIMP_MAX_RESOLUTION,
72.0,
0);
GIMP_CONFIG_INSTALL_PROP_RESOLUTION (object_class, PROP_XRESOLUTION,
"xresolution",
N_("The horizonal image resolution."),
72.0,
0);
GIMP_CONFIG_INSTALL_PROP_RESOLUTION (object_class, PROP_YRESOLUTION,
"yresolution",
N_("The vertical image resolution."),
72.0,
0);
GIMP_CONFIG_INSTALL_PROP_UNIT (object_class, PROP_RESOLUTION_UNIT,
"resolution-unit",
NULL,
......
......@@ -371,9 +371,16 @@ histogram_tool_dialog_new (GimpToolInfo *tool_info)
"channel", 0, 0);
gimp_enum_option_menu_set_stock_prefix (GTK_OPTION_MENU (htd->channel_menu),
"gimp-channel");
gtk_box_pack_start (GTK_BOX (hbox), htd->channel_menu, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (hbox), htd->channel_menu, TRUE, TRUE, 0);
gtk_widget_show (htd->channel_menu);
/* The option menu for selecting the histogram scale */
menu =
gimp_prop_enum_stock_box_new (G_OBJECT (htd->histogram_box->histogram),
"scale", "gimp-histogram", 0, 0);
gtk_box_pack_end (GTK_BOX (hbox), menu, FALSE, FALSE, 0);
gtk_widget_show (menu);
/* The histogram tool histogram */
gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (htd->histogram_box),
TRUE, TRUE, 0);
......@@ -383,21 +390,6 @@ histogram_tool_dialog_new (GimpToolInfo *tool_info)
G_CALLBACK (histogram_tool_histogram_range),
htd);
/* The option menu for selecting the histogram scale */
hbox = gtk_hbox_new (FALSE, 6);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
label = gtk_label_new (_("Histogram Scale:"));
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
menu =
gimp_prop_enum_option_menu_new (G_OBJECT (htd->histogram_box->histogram),
"scale", 0, 0);
gtk_box_pack_start (GTK_BOX (hbox), menu, FALSE, FALSE, 0);
gtk_widget_show (menu);
/* The table containing histogram information */
table = gtk_table_new (3, 4, TRUE);
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
......
......@@ -84,7 +84,7 @@ gimp_histogram_box_get_type (void)
};
box_type = g_type_register_static (GTK_TYPE_VBOX,
"GimpHistogramBox",
"GimpHistogramBox",
&box_info, 0);
}
......@@ -114,38 +114,6 @@ gimp_histogram_box_init (GimpHistogramBox *box)
gtk_box_set_spacing (GTK_BOX (box), 4);
hbox = gtk_hbox_new (FALSE, 4);
gtk_box_pack_start (GTK_BOX (box), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
box->label = gtk_label_new (NULL);
gtk_box_pack_start (GTK_BOX (hbox), box->label, FALSE, FALSE, 0);
gtk_widget_show (box->label);
/* low spinbutton */
spinbutton = gimp_spin_button_new (&adjustment,
0.0, 0.0, 255.0, 1.0, 16.0, 0.0,
1.0, 0);
box->low_adj = GTK_ADJUSTMENT (adjustment);
gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
gtk_widget_show (spinbutton);
g_signal_connect (adjustment, "value_changed",
G_CALLBACK (gimp_histogram_box_low_adj_update),
box);
/* high spinbutton */
spinbutton = gimp_spin_button_new (&adjustment,
255.0, 0.0, 255.0, 1.0, 16.0, 0.0,
1.0, 0);
box->high_adj = GTK_ADJUSTMENT (adjustment);
gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
gtk_widget_show (spinbutton);
g_signal_connect (adjustment, "value_changed",
G_CALLBACK (gimp_histogram_box_high_adj_update),
box);
/* The histogram */
frame = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
......@@ -171,7 +139,7 @@ gimp_histogram_box_init (GimpHistogramBox *box)
gtk_widget_show (frame);
box->gradient = gtk_drawing_area_new ();
gtk_widget_set_size_request (box->gradient,
gtk_widget_set_size_request (box->gradient,
GIMP_HISTOGRAM_VIEW_WIDTH, GRADIENT_HEIGHT);
gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (box->gradient));
gtk_widget_show (box->gradient);
......@@ -186,13 +154,46 @@ gimp_histogram_box_init (GimpHistogramBox *box)
g_signal_connect_swapped (view, "notify::channel",
G_CALLBACK (gtk_widget_queue_draw),
box->gradient);
/* The range selection */
hbox = gtk_hbox_new (FALSE, 4);
gtk_box_pack_start (GTK_BOX (box), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
box->label = gtk_label_new (NULL);
gtk_box_pack_start (GTK_BOX (hbox), box->label, FALSE, FALSE, 0);
gtk_widget_show (box->label);
/* low spinbutton */
spinbutton = gimp_spin_button_new (&adjustment,
0.0, 0.0, 255.0, 1.0, 16.0, 0.0,
1.0, 0);
box->low_adj = GTK_ADJUSTMENT (adjustment);
gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
gtk_widget_show (spinbutton);
g_signal_connect (adjustment, "value_changed",
G_CALLBACK (gimp_histogram_box_low_adj_update),
box);
/* high spinbutton */
spinbutton = gimp_spin_button_new (&adjustment,
255.0, 0.0, 255.0, 1.0, 16.0, 0.0,
1.0, 0);
box->high_adj = GTK_ADJUSTMENT (adjustment);
gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
gtk_widget_show (spinbutton);
g_signal_connect (adjustment, "value_changed",
G_CALLBACK (gimp_histogram_box_high_adj_update),
box);
}
static void
gimp_histogram_box_finalize (GObject *object)
{
GimpHistogramBox *box = GIMP_HISTOGRAM_BOX (object);
g_free (box->gradient_buf);
box->gradient_buf = NULL;
......@@ -208,7 +209,7 @@ gimp_histogram_box_low_adj_update (GtkAdjustment *adjustment,
box->high_adj->lower = adjustment->value;
gtk_adjustment_changed (box->high_adj);
gimp_histogram_view_set_range (box->histogram,
adjustment->value, box->histogram->end);
}
......@@ -222,7 +223,7 @@ gimp_histogram_box_high_adj_update (GtkAdjustment *adjustment,
box->low_adj->upper = adjustment->value;
gtk_adjustment_changed (box->low_adj);
gimp_histogram_view_set_range (box->histogram,
box->histogram->start, adjustment->value);
}
......@@ -248,7 +249,7 @@ gimp_histogram_box_gradient_size_allocate (GtkWidget *widget,
gpointer data)
{
GimpHistogramBox *box = GIMP_HISTOGRAM_BOX (data);
box->gradient_buf = g_realloc (box->gradient_buf,
3 * ((allocation->width - 2) *
(allocation->height - 2)));
......@@ -310,7 +311,7 @@ gimp_histogram_box_gradient_expose (GtkWidget *widget,
gdk_draw_rgb_image (widget->window, widget->style->black_gc,
1, 1, width, height, GDK_RGB_DITHER_NORMAL,
box->gradient_buf, 3 * width);
return TRUE;
}
......
......@@ -139,7 +139,7 @@ gimp_histogram_view_class_init (GimpHistogramViewClass *klass)
G_PARAM_CONSTRUCT));
}
static void
static void
gimp_histogram_view_init (GimpHistogramView *view)
{
view->histogram = NULL;
......@@ -147,11 +147,11 @@ gimp_histogram_view_init (GimpHistogramView *view)
view->end = 255;
}
static void
static void
gimp_histogram_view_finalize (GObject *object)
{
GimpHistogramView *view = GIMP_HISTOGRAM_VIEW (object);
if (view->range_gc)
{
g_object_unref (view->range_gc);
......@@ -178,7 +178,7 @@ gimp_histogram_view_set_property (GObject *object,
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
}
}
}
static void
......@@ -200,7 +200,7 @@ gimp_histogram_view_get_property (GObject *object,
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
}
}
}
static gboolean
......@@ -209,6 +209,7 @@ gimp_histogram_view_expose (GtkWidget *widget,
{
GimpHistogramView *view;
gint x;
gint x1, x2;
gint width, height;
gdouble max;
......@@ -239,7 +240,7 @@ gimp_histogram_view_expose (GtkWidget *widget,
/* Draw the axis */
gdk_draw_line (widget->window, widget->style->black_gc,
1, height + 1, width, height + 1);
/* Draw the spikes */
for (x = 0; x < width; x++)
{
......@@ -272,13 +273,16 @@ gimp_histogram_view_expose (GtkWidget *widget,
x + 1, height + 1 - y);
}
if (view->start >= 0 && view->end >= 0)
x1 = CLAMP (MIN (view->start, view->end), 0, 255);
x2 = CLAMP (MAX (view->start, view->end), 0, 255);
if (! (x1 == 0 && x2 == 255))
{
gint x1 = (width * MIN (view->start, view->end)) / 256;
gint x2 = (width * MAX (view->start, view->end)) / 255;
x1 = (x1 * width) / 256;
x2 = (x2 * width) / 255;
if (x2 == x1)
x2++;
x2++;
if (!view->range_gc)
{
......@@ -312,7 +316,7 @@ gimp_histogram_view_events (GimpHistogramView *view,
if (bevent->button != 1)
break;
gdk_pointer_grab (widget->window, FALSE,
gdk_pointer_grab (widget->window, FALSE,
GDK_BUTTON_RELEASE_MASK | GDK_BUTTON1_MOTION_MASK,
NULL, NULL, bevent->time);
......@@ -398,7 +402,7 @@ gimp_histogram_view_set_histogram (GimpHistogramView *view,
if (histogram && view->channel >= gimp_histogram_nchannels (histogram))
gimp_histogram_view_set_channel (view, 0);
}
gtk_widget_queue_draw (GTK_WIDGET (view));
}
......@@ -444,8 +448,8 @@ gimp_histogram_view_get_channel (GimpHistogramView *view)
}
void
gimp_histogram_view_set_scale (GimpHistogramView *view,
GimpHistogramScale scale)
gimp_histogram_view_set_scale (GimpHistogramView *view,
GimpHistogramScale scale)
{
g_return_if_fail (GIMP_IS_HISTOGRAM_VIEW (view));
......
2003-10-24 Sven Neumann <sven@gimp.org>
* libgimpwidgets/libgimpwidgets-sections.txt
* libgimpwidgets/tmpl/gimpstock.sgml: added new icons.
2003-10-23 Sven Neumann <sven@gimp.org>
* app/app.types
......
......@@ -288,6 +288,8 @@ GIMP_STOCK_PATH_STROKE
GIMP_STOCK_PLUGIN
GIMP_STOCK_QMASK_OFF
GIMP_STOCK_QMASK_ON
GIMP_STOCK_HISTOGRAM_LINEAR
GIMP_STOCK_HISTOGRAM_LOGARITHMIC
GIMP_STOCK_RESHOW_FILTER
GIMP_STOCK_RESIZE
GIMP_STOCK_FLIP_HORIZONTAL
......
......@@ -143,6 +143,20 @@ the ones in dialog size).
<!-- ##### MACRO GIMP_STOCK_HISTOGRAM_LINEAR ##### -->
<para>
<inlinegraphic fileref="stock-histogram-linear-16.png" format="png"></inlinegraphic>
</para>
<!-- ##### MACRO GIMP_STOCK_HISTOGRAM_LOGARITHMIC ##### -->
<para>
<inlinegraphic fileref="stock-histogram-logarithmic-16.png" format="png"></inlinegraphic>
</para>
<!-- ##### MACRO GIMP_STOCK_RESHOW_FILTER ##### -->
<para>
<inlinegraphic fileref="stock-reshow-filter-16.png" format="png"></inlinegraphic>
......
......@@ -149,6 +149,13 @@ GParamSpec * gimp_param_spec_unit (const gchar *name,
g_param_spec_double (name, NULL, blurb,\
min, max, default,\
flags | GIMP_CONFIG_PARAM_FLAGS))
#define GIMP_CONFIG_INSTALL_PROP_RESOLUTION(class, id,\
name, blurb, default, flags)\
g_object_class_install_property (class, id,\
g_param_spec_double (name, NULL, blurb,\
GIMP_MIN_RESOLUTION, GIMP_MAX_RESOLUTION, \
default,\
flags | GIMP_CONFIG_PARAM_FLAGS))
#define GIMP_CONFIG_INSTALL_PROP_ENUM(class, id,\
name, blurb, enum_type, default, flags)\
g_object_class_install_property (class, id,\
......
......@@ -219,6 +219,8 @@ static GtkStockItem gimp_stock_items[] =
{ GIMP_STOCK_TEXTURE, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_QMASK_OFF, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_QMASK_ON, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_HISTOGRAM_LINEAR, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_HISTOGRAM_LOGARITHMIC, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_LIST, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_GRID, NULL, 0, 0, LIBGIMP_DOMAIN },
......@@ -469,6 +471,9 @@ gimp_stock_menu_pixbufs[] =
{ GIMP_STOCK_QMASK_OFF, stock_qmask_off_16 },
{ GIMP_STOCK_QMASK_ON, stock_qmask_on_16 },
{ GIMP_STOCK_HISTOGRAM_LINEAR, stock_histogram_linear_16 },
{ GIMP_STOCK_HISTOGRAM_LOGARITHMIC, stock_histogram_logarithmic_16 },
{ GIMP_STOCK_LIST, stock_list_16 },
{ GIMP_STOCK_GRID, stock_grid_16 },
......
......@@ -30,14 +30,14 @@ G_BEGIN_DECLS
/* in button size: */
#define GIMP_STOCK_ANCHOR "gimp-anchor"
#define GIMP_STOCK_DUPLICATE "gimp-duplicate"
#define GIMP_STOCK_EDIT "gimp-edit"
#define GIMP_STOCK_LINKED "gimp-linked"
#define GIMP_STOCK_PASTE_AS_NEW "gimp-paste-as-new"
#define GIMP_STOCK_PASTE_INTO "gimp-paste-into"
#define GIMP_STOCK_RESET "gimp-reset"
#define GIMP_STOCK_VISIBLE "gimp-visible"
#define GIMP_STOCK_ANCHOR "gimp-anchor"
#define GIMP_STOCK_DUPLICATE "gimp-duplicate"
#define GIMP_STOCK_EDIT "gimp-edit"
#define GIMP_STOCK_LINKED "gimp-linked"
#define GIMP_STOCK_PASTE_AS_NEW "gimp-paste-as-new"
#define GIMP_STOCK_PASTE_INTO "gimp-paste-into"
#define GIMP_STOCK_RESET "gimp-reset"
#define GIMP_STOCK_VISIBLE "gimp-visible"
#define GIMP_STOCK_GRADIENT_LINEAR "gimp-gradient-linear"
#define GIMP_STOCK_GRADIENT_BILINEAR "gimp-gradient-bilinear"
......@@ -52,45 +52,45 @@ G_BEGIN_DECLS
#define GIMP_STOCK_GRADIENT_SPIRAL_ANTICLOCKWISE "gimp-gradient-spiral-anticlockwise"
#define GIMP_STOCK_GRAVITY_EAST "gimp-gravity-east"
#define GIMP_STOCK_GRAVITY_NORTH "gimp-gravity-north"
#define GIMP_STOCK_GRAVITY_NORTH_EAST "gimp-gravity-north-east"
#define GIMP_STOCK_GRAVITY_NORTH_WEST "gimp-gravity-north-west"
#define GIMP_STOCK_GRAVITY_SOUTH "gimp-gravity-south"
#define GIMP_STOCK_GRAVITY_SOUTH_EAST "gimp-gravity-south-east"
#define GIMP_STOCK_GRAVITY_SOUTH_WEST "gimp-gravity-south-west"
#define GIMP_STOCK_GRAVITY_WEST "gimp-gravity-west"
#define GIMP_STOCK_GRAVITY_EAST "gimp-gravity-east"
#define GIMP_STOCK_GRAVITY_NORTH "gimp-gravity-north"
#define GIMP_STOCK_GRAVITY_NORTH_EAST "gimp-gravity-north-east"
#define GIMP_STOCK_GRAVITY_NORTH_WEST "gimp-gravity-north-west"
#define GIMP_STOCK_GRAVITY_SOUTH "gimp-gravity-south"
#define GIMP_STOCK_GRAVITY_SOUTH_EAST "gimp-gravity-south-east"
#define GIMP_STOCK_GRAVITY_SOUTH_WEST "gimp-gravity-south-west"
#define GIMP_STOCK_GRAVITY_WEST "gimp-gravity-west"
#define GIMP_STOCK_HCHAIN "gimp-hchain"
#define GIMP_STOCK_HCHAIN_BROKEN "gimp-hchain-broken"
#define GIMP_STOCK_VCHAIN "gimp-vchain"
#define GIMP_STOCK_VCHAIN_BROKEN "gimp-vchain-broken"
#define GIMP_STOCK_HCHAIN "gimp-hchain"
#define GIMP_STOCK_HCHAIN_BROKEN "gimp-hchain-broken"
#define GIMP_STOCK_VCHAIN "gimp-vchain"
#define GIMP_STOCK_VCHAIN_BROKEN "gimp-vchain-broken"
#define GIMP_STOCK_SELECTION "gimp-selection"
#define GIMP_STOCK_SELECTION_REPLACE "gimp-selection-replace"
#define GIMP_STOCK_SELECTION_ADD "gimp-selection-add"
#define GIMP_STOCK_SELECTION_SUBTRACT "gimp-selection-subtract"
#define GIMP_STOCK_SELECTION_INTERSECT "gimp-selection-intersect"
#define GIMP_STOCK_SELECTION_STROKE "gimp-selection-stroke"
#define GIMP_STOCK_SELECTION_TO_CHANNEL "gimp-selection-to-channel"
#define GIMP_STOCK_SELECTION_TO_PATH "gimp-selection-to-path"
#define GIMP_STOCK_SELECTION "gimp-selection"
#define GIMP_STOCK_SELECTION_REPLACE "gimp-selection-replace"
#define GIMP_STOCK_SELECTION_ADD "gimp-selection-add"
#define GIMP_STOCK_SELECTION_SUBTRACT "gimp-selection-subtract"
#define GIMP_STOCK_SELECTION_INTERSECT "gimp-selection-intersect"
#define GIMP_STOCK_SELECTION_STROKE "gimp-selection-stroke"
#define GIMP_STOCK_SELECTION_TO_CHANNEL "gimp-selection-to-channel"
#define GIMP_STOCK_SELECTION_TO_PATH "gimp-selection-to-path"
#define GIMP_STOCK_PATH_STROKE "gimp-path-stroke"
#define GIMP_STOCK_PATH_STROKE "gimp-path-stroke"
#define GIMP_STOCK_CURVE_FREE "gimp-curve-free"
#define GIMP_STOCK_CURVE_SMOOTH "gimp-curve-smooth"
#define GIMP_STOCK_CURVE_FREE "gimp-curve-free"
#define GIMP_STOCK_CURVE_SMOOTH "gimp-curve-smooth"
#define GIMP_STOCK_COLOR_PICKER_BLACK "gimp-color-picker-black"
#define GIMP_STOCK_COLOR_PICKER_GRAY "gimp-color-picker-gray"
#define GIMP_STOCK_COLOR_PICKER_WHITE "gimp-color-picker-white"
#define GIMP_STOCK_COLOR_TRIANGLE "gimp-color-triangle"
#define GIMP_STOCK_COLOR_PICKER_BLACK "gimp-color-picker-black"
#define GIMP_STOCK_COLOR_PICKER_GRAY "gimp-color-picker-gray"
#define GIMP_STOCK_COLOR_PICKER_WHITE "gimp-color-picker-white"
#define GIMP_STOCK_COLOR_TRIANGLE "gimp-color-triangle"
#define GIMP_STOCK_CHAR_PICKER "gimp-char-picker"
#define GIMP_STOCK_LETTER_SPACING "gimp-letter-spacing"
#define GIMP_STOCK_LINE_SPACING "gimp-line-spacing"
#define GIMP_STOCK_CHAR_PICKER "gimp-char-picker"
#define GIMP_STOCK_LETTER_SPACING "gimp-letter-spacing"
#define GIMP_STOCK_LINE_SPACING "gimp-line-spacing"
#define GIMP_STOCK_TEXT_DIR_LTR "gimp-text-dir-ltr"
#define GIMP_STOCK_TEXT_DIR_RTL "gimp-text-dir-rtl"
#define GIMP_STOCK_TEXT_DIR_LTR "gimp-text-dir-ltr"
#define GIMP_STOCK_TEXT_DIR_RTL "gimp-text-dir-rtl"
#define GIMP_STOCK_TOOL_AIRBRUSH "gimp-tool-airbrush"
#define GIMP_STOCK_TOOL_BLEND "gimp-tool-blend"
......@@ -133,87 +133,90 @@ G_BEGIN_DECLS
/* in menu size: */
#define GIMP_STOCK_CONVERT_RGB "gimp-convert-rgb"
#define GIMP_STOCK_CONVERT_GRAYSCALE "gimp-convert-grayscale"
#define GIMP_STOCK_CONVERT_INDEXED "gimp-convert-indexed"
#define GIMP_STOCK_INVERT "gimp-invert"
#define GIMP_STOCK_MERGE_DOWN "gimp-merge-down"
#define GIMP_STOCK_LAYER_TO_IMAGESIZE "gimp-layer-to-imagesize"
#define GIMP_STOCK_PLUGIN "gimp-plugin"
#define GIMP_STOCK_UNDO_HISTORY "gimp-undo-history"
#define GIMP_STOCK_RESHOW_FILTER "gimp-reshow-filter"
#define GIMP_STOCK_ROTATE_90 "gimp-rotate-90"
#define GIMP_STOCK_ROTATE_180 "gimp-rotate-180"
#define GIMP_STOCK_ROTATE_270 "gimp-rotate-270"
#define GIMP_STOCK_RESIZE "gimp-resize"
#define GIMP_STOCK_SCALE "gimp-scale"
#define GIMP_STOCK_FLIP_HORIZONTAL "gimp-flip-horizontal"
#define GIMP_STOCK_FLIP_VERTICAL "gimp-flip-vertical"
#define GIMP_STOCK_IMAGE "gimp-image"
#define GIMP_STOCK_LAYER "gimp-layer"
#define GIMP_STOCK_TEXT_LAYER "gimp-text-layer"
#define GIMP_STOCK_FLOATING_SELECTION "gimp-floating-selection"
#define GIMP_STOCK_CHANNEL "gimp-channel"
#define GIMP_STOCK_CHANNEL_RED "gimp-channel-red"
#define GIMP_STOCK_CHANNEL_GREEN "gimp-channel-green"
#define GIMP_STOCK_CHANNEL_BLUE "gimp-channel-blue"
#define GIMP_STOCK_CHANNEL_GRAY "gimp-channel-gray"
#define GIMP_STOCK_CHANNEL_ALPHA "gimp-channel-alpha"
#define GIMP_STOCK_PATH "gimp-path"
#define GIMP_STOCK_TEMPLATE "gimp-template"
#define GIMP_STOCK_INDEXED_PALETTE "gimp-indexed-palette"
#define GIMP_STOCK_TRANSPARENCY "gimp-transparency"
#define GIMP_STOCK_IMAGES "gimp-images"
#define GIMP_STOCK_LAYERS "gimp-layers"
#define GIMP_STOCK_CHANNELS "gimp-channels"
#define GIMP_STOCK_PATHS "gimp-paths"
#define GIMP_STOCK_SELECTION_ALL "gimp-selection-all"
#define GIMP_STOCK_SELECTION_NONE "gimp-selection-none"
#define GIMP_STOCK_SELECTION_GROW "gimp-selection-grow"
#define GIMP_STOCK_SELECTION_SHRINK "gimp-selection-shrink"
#define GIMP_STOCK_NAVIGATION "gimp-navigation"
#define GIMP_STOCK_QMASK_OFF "gimp-qmask-off"
#define GIMP_STOCK_QMASK_ON "gimp-qmask-on"
#define GIMP_STOCK_CLOSE "gimp-close"
#define GIMP_STOCK_MENU_LEFT "gimp-menu-left"
#define GIMP_STOCK_MENU_RIGHT "gimp-menu-right"
#define GIMP_STOCK_DEFAULT_COLORS "gimp-default-colors"
#define GIMP_STOCK_SWAP_COLORS "gimp-swap-colors"
#define GIMP_STOCK_TOOLS "gimp-tools"
#define GIMP_STOCK_TOOL_OPTIONS "gimp-tool-options"
#define GIMP_STOCK_DEVICE_STATUS "gimp-device-status"
#define GIMP_STOCK_LIST "gimp-list"
#define GIMP_STOCK_GRID "gimp-grid"
#define GIMP_STOCK_PORTRAIT "gimp-portrait"
#define GIMP_STOCK_LANDSCAPE "gimp-landscape"
#define GIMP_STOCK_WEB "gimp-web"
#define GIMP_STOCK_VIDEO "gimp-video"
#define GIMP_STOCK_CAP_BUTT "gimp-cap-butt"
#define GIMP_STOCK_CAP_ROUND "gimp-cap-round"
#define GIMP_STOCK_CAP_SQUARE "gimp-cap-square"
#define GIMP_STOCK_JOIN_MITER "gimp-join-miter"
#define GIMP_STOCK_JOIN_ROUND "gimp-join-round"
#define GIMP_STOCK_JOIN_BEVEL "gimp-join-bevel"
#define GIMP_STOCK_CONVERT_RGB "gimp-convert-rgb"
#define GIMP_STOCK_CONVERT_GRAYSCALE "gimp-convert-grayscale"
#define GIMP_STOCK_CONVERT_INDEXED "gimp-convert-indexed"
#define GIMP_STOCK_INVERT "gimp-invert"
#define GIMP_STOCK_MERGE_DOWN "gimp-merge-down"
#define GIMP_STOCK_LAYER_TO_IMAGESIZE "gimp-layer-to-imagesize"
#define GIMP_STOCK_PLUGIN "gimp-plugin"
#define GIMP_STOCK_UNDO_HISTORY "gimp-undo-history"
#define GIMP_STOCK_RESHOW_FILTER "gimp-reshow-filter"
#define GIMP_STOCK_ROTATE_90 "gimp-rotate-90"
#define GIMP_STOCK_ROTATE_180 "gimp-rotate-180"
#define GIMP_STOCK_ROTATE_270 "gimp-rotate-270"
#define GIMP_STOCK_RESIZE "gimp-resize"
#define GIMP_STOCK_SCALE "gimp-scale"
#define GIMP_STOCK_FLIP_HORIZONTAL "gimp-flip-horizontal"
#define GIMP_STOCK_FLIP_VERTICAL "gimp-flip-vertical"
#define GIMP_STOCK_IMAGE "gimp-image"
#define GIMP_STOCK_LAYER "gimp-layer"
#define GIMP_STOCK_TEXT_LAYER "gimp-text-layer"
#define GIMP_STOCK_FLOATING_SELECTION "gimp-floating-selection"
#define GIMP_STOCK_CHANNEL "gimp-channel"
#define GIMP_STOCK_CHANNEL_RED "gimp-channel-red"
#define GIMP_STOCK_CHANNEL_GREEN "gimp-channel-green"
#define GIMP_STOCK_CHANNEL_BLUE "gimp-channel-blue"
#define GIMP_STOCK_CHANNEL_GRAY "gimp-channel-gray"
#define GIMP_STOCK_CHANNEL_ALPHA "gimp-channel-alpha"
#define GIMP_STOCK_PATH "gimp-path"
#define GIMP_STOCK_TEMPLATE "gimp-template"
#define GIMP_STOCK_INDEXED_PALETTE "gimp-indexed-palette"
#define GIMP_STOCK_TRANSPARENCY "gimp-transparency"
#define GIMP_STOCK_IMAGES "gimp-images"
#define GIMP_STOCK_LAYERS "gimp-layers"
#define GIMP_STOCK_CHANNELS "gimp-channels"
#define GIMP_STOCK_PATHS "gimp-paths"
#define GIMP_STOCK_SELECTION_ALL "gimp-selection-all"
#define GIMP_STOCK_SELECTION_NONE "gimp-selection-none"
#define GIMP_STOCK_SELECTION_GROW "gimp-selection-grow"
#define GIMP_STOCK_SELECTION_SHRINK "gimp-selection-shrink"
#define GIMP_STOCK_NAVIGATION "gimp-navigation"
#define GIMP_STOCK_QMASK_OFF "gimp-qmask-off"
#define GIMP_STOCK_QMASK_ON "gimp-qmask-on"
#define GIMP_STOCK_HISTOGRAM_LINEAR "gimp-histogram-linear"
#define GIMP_STOCK_HISTOGRAM_LOGARITHMIC "gimp-histogram-logarithmic"
#define GIMP_STOCK_CLOSE "gimp-close"
#define GIMP_STOCK_MENU_LEFT "gimp-menu-left"
#define GIMP_STOCK_MENU_RIGHT "gimp-menu-right"
#define GIMP_STOCK_DEFAULT_COLORS "gimp-default-colors"
#define GIMP_STOCK_SWAP_COLORS "gimp-swap-colors"
#define GIMP_STOCK_TOOLS "gimp-tools"
#define GIMP_STOCK_TOOL_OPTIONS "gimp-tool-options"
#define GIMP_STOCK_DEVICE_STATUS "gimp-device-status"
#define GIMP_STOCK_LIST "gimp-list"
#define GIMP_STOCK_GRID "gimp-grid"
#define GIMP_STOCK_PORTRAIT "gimp-portrait"
#define GIMP_STOCK_LANDSCAPE "gimp-landscape"
#define GIMP_STOCK_WEB "gimp-web"
#define GIMP_STOCK_VIDEO "gimp-video"
#define GIMP_STOCK_CAP_BUTT "gimp-cap-butt"
#define GIMP_STOCK_CAP_ROUND "gimp-cap-round"
#define GIMP_STOCK_CAP_SQUARE "gimp-cap-square"
#define GIMP_STOCK_JOIN_MITER "gimp-join-miter"
#define GIMP_STOCK_JOIN_ROUND "gimp-join-round"
#define GIMP_STOCK_JOIN_BEVEL "gimp-join-bevel"
/* in dialog size: */