Commit fcc85686 authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer
Browse files

app/paint/gimpbrushcore.c app/paint/gimppaintoptions.[ch] renamed

2005-01-03  Michael Natterer  <mitch@gimp.org>

	* app/paint/gimpbrushcore.c
	* app/paint/gimppaintoptions.[ch]
	* app/tools/gimppaintoptions-gui.c: renamed "invsize" to
	"inverse-size" and reordered it to be after "size".
parent 6bf71cc8
2005-01-03 Michael Natterer <mitch@gimp.org>
* app/paint/gimpbrushcore.c
* app/paint/gimppaintoptions.[ch]
* app/tools/gimppaintoptions-gui.c: renamed "invsize" to
"inverse-size" and reordered it to be after "size".
2005-01-03 Sven Neumann <sven@gimp.org>
* etc/ps-menurc: another update from Eric Pierce.
......
......@@ -662,7 +662,7 @@ gimp_brush_core_get_paint_area (GimpPaintCore *paint_core,
{
GimpPressureOptions *pressure_options = paint_options->pressure_options;
if (pressure_options->inv_size)
if (pressure_options->inverse_size)
core->scale = 1.0 - 0.9 * paint_core->cur_coords.pressure;
else if (pressure_options->size)
core->scale = paint_core->cur_coords.pressure;
......
......@@ -35,25 +35,25 @@
#include "gimppaintoptions.h"
#define DEFAULT_APPLICATION_MODE GIMP_PAINT_CONSTANT
#define DEFAULT_HARD FALSE
#define DEFAULT_APPLICATION_MODE GIMP_PAINT_CONSTANT
#define DEFAULT_HARD FALSE
#define DEFAULT_PRESSURE_OPACITY TRUE
#define DEFAULT_PRESSURE_HARDNESS FALSE
#define DEFAULT_PRESSURE_RATE FALSE
#define DEFAULT_PRESSURE_SIZE FALSE
#define DEFAULT_PRESSURE_COLOR FALSE
#define DEFAULT_PRESSURE_INVSIZE FALSE
#define DEFAULT_PRESSURE_OPACITY TRUE
#define DEFAULT_PRESSURE_HARDNESS FALSE
#define DEFAULT_PRESSURE_RATE FALSE
#define DEFAULT_PRESSURE_SIZE FALSE
#define DEFAULT_PRESSURE_INVERSE_SIZE FALSE
#define DEFAULT_PRESSURE_COLOR FALSE
#define DEFAULT_USE_FADE FALSE
#define DEFAULT_FADE_LENGTH 100.0
#define DEFAULT_FADE_UNIT GIMP_UNIT_PIXEL
#define DEFAULT_USE_FADE FALSE
#define DEFAULT_FADE_LENGTH 100.0
#define DEFAULT_FADE_UNIT GIMP_UNIT_PIXEL
#define DEFAULT_USE_GRADIENT FALSE
#define DEFAULT_GRADIENT_REVERSE FALSE
#define DEFAULT_GRADIENT_REPEAT GIMP_REPEAT_TRIANGULAR
#define DEFAULT_GRADIENT_LENGTH 100.0
#define DEFAULT_GRADIENT_UNIT GIMP_UNIT_PIXEL
#define DEFAULT_USE_GRADIENT FALSE
#define DEFAULT_GRADIENT_REVERSE FALSE
#define DEFAULT_GRADIENT_REPEAT GIMP_REPEAT_TRIANGULAR
#define DEFAULT_GRADIENT_LENGTH 100.0
#define DEFAULT_GRADIENT_UNIT GIMP_UNIT_PIXEL
enum
......@@ -66,8 +66,8 @@ enum
PROP_PRESSURE_HARDNESS,
PROP_PRESSURE_RATE,
PROP_PRESSURE_SIZE,
PROP_PRESSURE_INVERSE_SIZE,
PROP_PRESSURE_COLOR,
PROP_PRESSURE_INVSIZE,
PROP_USE_FADE,
PROP_FADE_LENGTH,
PROP_FADE_UNIT,
......@@ -175,9 +175,9 @@ gimp_paint_options_class_init (GimpPaintOptionsClass *klass)
"pressure-color", NULL,
DEFAULT_PRESSURE_COLOR,
0);
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_PRESSURE_INVSIZE,
"pressure-invsize", NULL,
DEFAULT_PRESSURE_INVSIZE,
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_PRESSURE_INVERSE_SIZE,
"pressure-inverse-size", NULL,
DEFAULT_PRESSURE_INVERSE_SIZE,
0);
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_USE_FADE,
......@@ -279,12 +279,12 @@ gimp_paint_options_set_property (GObject *object,
case PROP_PRESSURE_SIZE:
pressure_options->size = g_value_get_boolean (value);
break;
case PROP_PRESSURE_INVERSE_SIZE:
pressure_options->inverse_size = g_value_get_boolean (value);
break;
case PROP_PRESSURE_COLOR:
pressure_options->color = g_value_get_boolean (value);
break;
case PROP_PRESSURE_INVSIZE:
pressure_options->inv_size = g_value_get_boolean (value);
break;
case PROP_USE_FADE:
fade_options->use_fade = g_value_get_boolean (value);
......@@ -358,12 +358,12 @@ gimp_paint_options_get_property (GObject *object,
case PROP_PRESSURE_SIZE:
g_value_set_boolean (value, pressure_options->size);
break;
case PROP_PRESSURE_INVERSE_SIZE:
g_value_set_boolean (value, pressure_options->inverse_size);
break;
case PROP_PRESSURE_COLOR:
g_value_set_boolean (value, pressure_options->color);
break;
case PROP_PRESSURE_INVSIZE:
g_value_set_boolean (value, pressure_options->inv_size);
break;
case PROP_USE_FADE:
g_value_set_boolean (value, fade_options->use_fade);
......
......@@ -40,8 +40,8 @@ struct _GimpPressureOptions
gboolean hardness;
gboolean rate;
gboolean size;
gboolean inverse_size;
gboolean color;
gboolean inv_size;
};
struct _GimpFadeOptions
......
......@@ -279,6 +279,15 @@ pressure_options_gui (GimpPressureOptions *pressure,
gtk_widget_show (button);
}
/* the inverse size toggle */
if (g_type_is_a (tool_type, GIMP_TYPE_AIRBRUSH_TOOL))
{
button = gimp_prop_check_button_new (config, "pressure-inverse-size",
_("Size"));
gtk_container_add (GTK_CONTAINER (wbox), button);
gtk_widget_show (button);
}
/* the color toggle */
if (g_type_is_a (tool_type, GIMP_TYPE_PAINTBRUSH_TOOL))
{
......@@ -288,15 +297,6 @@ pressure_options_gui (GimpPressureOptions *pressure,
gtk_widget_show (button);
}
/* the inverse size toggle */
if (g_type_is_a (tool_type, GIMP_TYPE_AIRBRUSH_TOOL))
{
button = gimp_prop_check_button_new (config, "pressure-invsize",
_("Size"));
gtk_container_add (GTK_CONTAINER (wbox), button);
gtk_widget_show (button);
}
return frame;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment