mirror of https://github.com/GNOME/gimp.git
Giving shape to the new dynamics object
This commit is contained in:
parent
822e394981
commit
6e1d5ad83e
|
@ -457,14 +457,15 @@ gimp_dynamics_options_class_init (GimpDynamicsOptionsClass *klass)
|
||||||
static void
|
static void
|
||||||
gimp_dynamics_options_init (GimpDynamicsOptions *options)
|
gimp_dynamics_options_init (GimpDynamicsOptions *options)
|
||||||
{
|
{
|
||||||
//options->application_mode_save = DEFAULT_APPLICATION_MODE;
|
|
||||||
|
|
||||||
options->pressure_options = g_slice_new0 (GimpDynamicOptions);
|
options->opacity_dynamics = g_slice_new0 (GimpDynamicOutputOptions);
|
||||||
options->velocity_options = g_slice_new0 (GimpDynamicOptions);
|
options->hardness_dynamics = g_slice_new0 (GimpDynamicOutputOptions);
|
||||||
options->direction_options = g_slice_new0 (GimpDynamicOptions);
|
options->rate_dynamics = g_slice_new0 (GimpDynamicOutputOptions);
|
||||||
options->tilt_options = g_slice_new0 (GimpDynamicOptions);
|
options->size_dynamics = g_slice_new0 (GimpDynamicOutputOptions);
|
||||||
options->random_options = g_slice_new0 (GimpDynamicOptions);
|
options->aspect_ratio_dynamics = g_slice_new0 (GimpDynamicOutputOptions);
|
||||||
options->fading_options = g_slice_new0 (GimpDynamicOptions);
|
options->color_dynamics = g_slice_new0 (GimpDynamicOutputOptions);
|
||||||
|
options->angle_dynamics = g_slice_new0 (GimpDynamicOutputOptions);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -473,16 +474,14 @@ gimp_dynamics_options_finalize (GObject *object)
|
||||||
{
|
{
|
||||||
GimpDynamicsOptions *options = GIMP_DYNAMICS_OPTIONS (object);
|
GimpDynamicsOptions *options = GIMP_DYNAMICS_OPTIONS (object);
|
||||||
|
|
||||||
|
g_slice_free (GimpDynamicOutputOptions, options->opacity_dynamics);
|
||||||
|
g_slice_free (GimpDynamicOutputOptions, options->hardness_dynamics);
|
||||||
|
g_slice_free (GimpDynamicOutputOptions, options->rate_dynamics);
|
||||||
|
g_slice_free (GimpDynamicOutputOptions, options->size_dynamics);
|
||||||
|
g_slice_free (GimpDynamicOutputOptions, options->aspect_ratio_dynamics);
|
||||||
|
g_slice_free (GimpDynamicOutputOptions, options->color_dynamics);
|
||||||
|
g_slice_free (GimpDynamicOutputOptions, options->angle_dynamics);
|
||||||
|
|
||||||
if (options->dynamics_info)
|
|
||||||
g_object_unref (options->dynamics_info);
|
|
||||||
|
|
||||||
g_slice_free (GimpDynamicOptions, options->pressure_options);
|
|
||||||
g_slice_free (GimpDynamicOptions, options->velocity_options);
|
|
||||||
g_slice_free (GimpDynamicOptions, options->direction_options);
|
|
||||||
g_slice_free (GimpDynamicOptions, options->tilt_options);
|
|
||||||
g_slice_free (GimpDynamicOptions, options->random_options);
|
|
||||||
g_slice_free (GimpDynamicOptions, options->fading_options);
|
|
||||||
|
|
||||||
G_OBJECT_CLASS (parent_class)->finalize (object);
|
G_OBJECT_CLASS (parent_class)->finalize (object);
|
||||||
}
|
}
|
||||||
|
@ -494,234 +493,187 @@ gimp_dynamics_options_set_property (GObject *object,
|
||||||
GParamSpec *pspec)
|
GParamSpec *pspec)
|
||||||
{
|
{
|
||||||
GimpDynamicsOptions *options = GIMP_DYNAMICS_OPTIONS (object);
|
GimpDynamicsOptions *options = GIMP_DYNAMICS_OPTIONS (object);
|
||||||
GimpDynamicOptions *pressure_options = options->pressure_options;
|
|
||||||
GimpDynamicOptions *velocity_options = options->velocity_options;
|
GimpDynamicOutputOptions *opacity_dynamics = options->opacity_dynamics;
|
||||||
GimpDynamicOptions *direction_options = options->direction_options;
|
GimpDynamicOutputOptions *hardness_dynamics = options->hardness_dynamics;
|
||||||
GimpDynamicOptions *tilt_options = options->tilt_options;
|
GimpDynamicOutputOptions *rate_dynamics = options->rate_dynamics;
|
||||||
GimpDynamicOptions *random_options = options->random_options;
|
GimpDynamicOutputOptions *size_dynamics = options->size_dynamics;
|
||||||
GimpDynamicOptions *fading_options = options->fading_options;
|
GimpDynamicOutputOptions *aspect_ratio_dynamics = options->aspect_ratio_dynamics;
|
||||||
|
GimpDynamicOutputOptions *color_dynamics = options->color_dynamics;
|
||||||
|
GimpDynamicOutputOptions *angle_dynamics = options->angle_dynamics;
|
||||||
|
|
||||||
switch (property_id)
|
switch (property_id)
|
||||||
{
|
{
|
||||||
|
|
||||||
case PROP_DYNAMICS_INFO:
|
|
||||||
g_value_set_object (value, options->dynamics_info);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case PROP_PRESSURE_OPACITY:
|
case PROP_PRESSURE_OPACITY:
|
||||||
pressure_options->opacity = g_value_get_boolean (value);
|
opacity_dynamics->pressure = g_value_get_boolean (value);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_PRESSURE_HARDNESS:
|
case PROP_PRESSURE_HARDNESS:
|
||||||
pressure_options->hardness = g_value_get_boolean (value);
|
hardness_dynamics->pressure = g_value_get_boolean (value);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_PRESSURE_RATE:
|
case PROP_PRESSURE_RATE:
|
||||||
pressure_options->rate = g_value_get_boolean (value);
|
rate_dynamics->pressure = g_value_get_boolean (value);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_PRESSURE_SIZE:
|
case PROP_PRESSURE_SIZE:
|
||||||
pressure_options->size = g_value_get_boolean (value);
|
size_dynamics->pressure = g_value_get_boolean (value);
|
||||||
break;
|
|
||||||
|
|
||||||
case PROP_PRESSURE_INVERSE_SIZE:
|
|
||||||
pressure_options->inverse_size = g_value_get_boolean (value);
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_PRESSURE_ASPECT_RATIO:
|
case PROP_PRESSURE_ASPECT_RATIO:
|
||||||
pressure_options->aspect_ratio = g_value_get_boolean (value);
|
aspect_ratio_dynamics->pressure = g_value_get_boolean (value);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_PRESSURE_COLOR:
|
case PROP_PRESSURE_COLOR:
|
||||||
pressure_options->color = g_value_get_boolean (value);
|
color_dynamics->pressure = g_value_get_boolean (value);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_PRESSURE_ANGLE:
|
case PROP_PRESSURE_ANGLE:
|
||||||
pressure_options->angle = g_value_get_boolean (value);
|
angle_dynamics->pressure = g_value_get_boolean (value);
|
||||||
break;
|
|
||||||
|
|
||||||
case PROP_PRESSURE_PRESCALE:
|
|
||||||
pressure_options->prescale = g_value_get_double (value);
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_VELOCITY_OPACITY:
|
case PROP_VELOCITY_OPACITY:
|
||||||
velocity_options->opacity = g_value_get_boolean (value);
|
opacity_dynamics->velocity = g_value_get_boolean (value);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_VELOCITY_HARDNESS:
|
case PROP_VELOCITY_HARDNESS:
|
||||||
velocity_options->hardness = g_value_get_boolean (value);
|
hardness_dynamics->velocity = g_value_get_boolean (value);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_VELOCITY_RATE:
|
case PROP_VELOCITY_RATE:
|
||||||
velocity_options->rate = g_value_get_boolean (value);
|
rate_dynamics->velocity = g_value_get_boolean (value);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_VELOCITY_SIZE:
|
case PROP_VELOCITY_SIZE:
|
||||||
velocity_options->size = g_value_get_boolean (value);
|
size_dynamics->velocity = g_value_get_boolean (value);
|
||||||
break;
|
|
||||||
|
|
||||||
case PROP_VELOCITY_INVERSE_SIZE:
|
|
||||||
velocity_options->inverse_size = g_value_get_boolean (value);
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_VELOCITY_ASPECT_RATIO:
|
case PROP_VELOCITY_ASPECT_RATIO:
|
||||||
velocity_options->aspect_ratio = g_value_get_boolean (value);
|
aspect_ratio_dynamics->velocity = g_value_get_boolean (value);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_VELOCITY_COLOR:
|
case PROP_VELOCITY_COLOR:
|
||||||
velocity_options->color = g_value_get_boolean (value);
|
color_dynamics->velocity = g_value_get_boolean (value);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_VELOCITY_ANGLE:
|
case PROP_VELOCITY_ANGLE:
|
||||||
velocity_options->angle = g_value_get_boolean (value);
|
angle_dynamics->velocity = g_value_get_boolean (value);
|
||||||
break;
|
|
||||||
|
|
||||||
case PROP_VELOCITY_PRESCALE:
|
|
||||||
velocity_options->prescale = g_value_get_double (value);
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_DIRECTION_OPACITY:
|
case PROP_DIRECTION_OPACITY:
|
||||||
direction_options->opacity = g_value_get_boolean (value);
|
opacity_dynamics->direction = g_value_get_boolean (value);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_DIRECTION_HARDNESS:
|
case PROP_DIRECTION_HARDNESS:
|
||||||
direction_options->hardness = g_value_get_boolean (value);
|
hardness_dynamics->direction = g_value_get_boolean (value);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_DIRECTION_RATE:
|
case PROP_DIRECTION_RATE:
|
||||||
direction_options->rate = g_value_get_boolean (value);
|
rate_dynamics->direction = g_value_get_boolean (value);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_DIRECTION_SIZE:
|
case PROP_DIRECTION_SIZE:
|
||||||
direction_options->size = g_value_get_boolean (value);
|
size_dynamics->direction = g_value_get_boolean (value);
|
||||||
break;
|
|
||||||
|
|
||||||
case PROP_DIRECTION_INVERSE_SIZE:
|
|
||||||
direction_options->inverse_size = g_value_get_boolean (value);
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_DIRECTION_ASPECT_RATIO:
|
case PROP_DIRECTION_ASPECT_RATIO:
|
||||||
direction_options->aspect_ratio = g_value_get_boolean (value);
|
aspect_ratio_dynamics->direction = g_value_get_boolean (value);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_DIRECTION_COLOR:
|
case PROP_DIRECTION_COLOR:
|
||||||
direction_options->color = g_value_get_boolean (value);
|
color_dynamics->direction = g_value_get_boolean (value);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_DIRECTION_ANGLE:
|
case PROP_DIRECTION_ANGLE:
|
||||||
direction_options->angle = g_value_get_boolean (value);
|
angle_dynamics->direction = g_value_get_boolean (value);
|
||||||
break;
|
|
||||||
|
|
||||||
case PROP_DIRECTION_PRESCALE:
|
|
||||||
direction_options->prescale = g_value_get_double (value);
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_TILT_OPACITY:
|
case PROP_TILT_OPACITY:
|
||||||
tilt_options->opacity = g_value_get_boolean (value);
|
opacity_dynamics->tilt = g_value_get_boolean (value);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_TILT_HARDNESS:
|
case PROP_TILT_HARDNESS:
|
||||||
tilt_options->hardness = g_value_get_boolean (value);
|
hardness_dynamics->tilt = g_value_get_boolean (value);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_TILT_RATE:
|
case PROP_TILT_RATE:
|
||||||
tilt_options->rate = g_value_get_boolean (value);
|
rate_dynamics->tilt = g_value_get_boolean (value);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_TILT_SIZE:
|
case PROP_TILT_SIZE:
|
||||||
tilt_options->size = g_value_get_boolean (value);
|
size_dynamics->tilt = g_value_get_boolean (value);
|
||||||
break;
|
|
||||||
|
|
||||||
case PROP_TILT_INVERSE_SIZE:
|
|
||||||
tilt_options->inverse_size = g_value_get_boolean (value);
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_TILT_ASPECT_RATIO:
|
case PROP_TILT_ASPECT_RATIO:
|
||||||
tilt_options->aspect_ratio = g_value_get_boolean (value);
|
aspect_ratio_dynamics->tilt = g_value_get_boolean (value);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_TILT_COLOR:
|
case PROP_TILT_COLOR:
|
||||||
tilt_options->color = g_value_get_boolean (value);
|
color_dynamics->tilt = g_value_get_boolean (value);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_TILT_ANGLE:
|
case PROP_TILT_ANGLE:
|
||||||
tilt_options->angle = g_value_get_boolean (value);
|
angle_dynamics->tilt = g_value_get_boolean (value);
|
||||||
break;
|
|
||||||
|
|
||||||
case PROP_TILT_PRESCALE:
|
|
||||||
tilt_options->prescale = g_value_get_double (value);
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_RANDOM_OPACITY:
|
case PROP_RANDOM_OPACITY:
|
||||||
random_options->opacity = g_value_get_boolean (value);
|
opacity_dynamics->random = g_value_get_boolean (value);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_RANDOM_HARDNESS:
|
case PROP_RANDOM_HARDNESS:
|
||||||
random_options->hardness = g_value_get_boolean (value);
|
hardness_dynamics->random = g_value_get_boolean (value);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_RANDOM_RATE:
|
case PROP_RANDOM_RATE:
|
||||||
random_options->rate = g_value_get_boolean (value);
|
rate_dynamics->random = g_value_get_boolean (value);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_RANDOM_SIZE:
|
case PROP_RANDOM_SIZE:
|
||||||
random_options->size = g_value_get_boolean (value);
|
size_dynamics->random = g_value_get_boolean (value);
|
||||||
break;
|
|
||||||
|
|
||||||
case PROP_RANDOM_INVERSE_SIZE:
|
|
||||||
random_options->inverse_size = g_value_get_boolean (value);
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_RANDOM_ASPECT_RATIO:
|
case PROP_RANDOM_ASPECT_RATIO:
|
||||||
random_options->aspect_ratio = g_value_get_boolean (value);
|
aspect_ratio_dynamics->random = g_value_get_boolean (value);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_RANDOM_COLOR:
|
case PROP_RANDOM_COLOR:
|
||||||
random_options->color = g_value_get_boolean (value);
|
color_dynamics->random = g_value_get_boolean (value);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_RANDOM_ANGLE:
|
case PROP_RANDOM_ANGLE:
|
||||||
random_options->angle = g_value_get_boolean (value);
|
angle_dynamics->random = g_value_get_boolean (value);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_RANDOM_PRESCALE:
|
|
||||||
random_options->prescale = g_value_get_double (value);
|
|
||||||
break;
|
|
||||||
/*Fading*/
|
/*Fading*/
|
||||||
case PROP_FADING_OPACITY:
|
case PROP_FADING_OPACITY:
|
||||||
fading_options->opacity = g_value_get_boolean (value);
|
opacity_dynamics->fade = g_value_get_boolean (value);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_FADING_HARDNESS:
|
case PROP_FADING_HARDNESS:
|
||||||
fading_options->hardness = g_value_get_boolean (value);
|
hardness_dynamics->fade = g_value_get_boolean (value);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_FADING_RATE:
|
case PROP_FADING_RATE:
|
||||||
fading_options->rate = g_value_get_boolean (value);
|
rate_dynamics->fade = g_value_get_boolean (value);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_FADING_SIZE:
|
case PROP_FADING_SIZE:
|
||||||
fading_options->size = g_value_get_boolean (value);
|
size_dynamics->fade = g_value_get_boolean (value);
|
||||||
break;
|
|
||||||
|
|
||||||
case PROP_FADING_INVERSE_SIZE:
|
|
||||||
fading_options->inverse_size = g_value_get_boolean (value);
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_FADING_ASPECT_RATIO:
|
case PROP_FADING_ASPECT_RATIO:
|
||||||
fading_options->aspect_ratio = g_value_get_boolean (value);
|
aspect_ratio_dynamics->fade = g_value_get_boolean (value);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_FADING_COLOR:
|
case PROP_FADING_COLOR:
|
||||||
fading_options->color = g_value_get_boolean (value);
|
color_dynamics->fade = g_value_get_boolean (value);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_FADING_ANGLE:
|
case PROP_FADING_ANGLE:
|
||||||
fading_options->angle = g_value_get_boolean (value);
|
angle_dynamics->fade = g_value_get_boolean (value);
|
||||||
break;
|
|
||||||
|
|
||||||
case PROP_FADING_PRESCALE:
|
|
||||||
fading_options->prescale = g_value_get_double (value);
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
@ -739,236 +691,186 @@ gimp_dynamics_options_get_property (GObject *object,
|
||||||
GParamSpec *pspec)
|
GParamSpec *pspec)
|
||||||
{
|
{
|
||||||
GimpDynamicsOptions *options = GIMP_DYNAMICS_OPTIONS (object);
|
GimpDynamicsOptions *options = GIMP_DYNAMICS_OPTIONS (object);
|
||||||
GimpDynamicOptions *pressure_options = options->pressure_options;
|
GimpDynamicOutputOptions *opacity_dynamics = options->opacity_dynamics;
|
||||||
GimpDynamicOptions *velocity_options = options->velocity_options;
|
GimpDynamicOutputOptions *hardness_dynamics = options->hardness_dynamics;
|
||||||
GimpDynamicOptions *direction_options = options->direction_options;
|
GimpDynamicOutputOptions *rate_dynamics = options->rate_dynamics;
|
||||||
GimpDynamicOptions *tilt_options = options->tilt_options;
|
GimpDynamicOutputOptions *size_dynamics = options->size_dynamics;
|
||||||
GimpDynamicOptions *random_options = options->random_options;
|
GimpDynamicOutputOptions *aspect_ratio_dynamics = options->aspect_ratio_dynamics;
|
||||||
GimpDynamicOptions *fading_options = options->fading_options;
|
GimpDynamicOutputOptions *color_dynamics = options->color_dynamics;
|
||||||
|
GimpDynamicOutputOptions *angle_dynamics = options->angle_dynamics;
|
||||||
|
|
||||||
switch (property_id)
|
switch (property_id)
|
||||||
{
|
{
|
||||||
case PROP_DYNAMICS_INFO:
|
|
||||||
g_value_set_object (value, options->dynamics_info);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case PROP_PRESSURE_OPACITY:
|
case PROP_PRESSURE_OPACITY:
|
||||||
g_value_set_boolean (value, pressure_options->opacity);
|
g_value_set_boolean (value, opacity_dynamics->pressure);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_PRESSURE_HARDNESS:
|
case PROP_PRESSURE_HARDNESS:
|
||||||
g_value_set_boolean (value, pressure_options->hardness);
|
g_value_set_boolean (value, hardness_dynamics->pressure);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_PRESSURE_RATE:
|
case PROP_PRESSURE_RATE:
|
||||||
g_value_set_boolean (value, pressure_options->rate);
|
g_value_set_boolean (value, rate_dynamics->pressure);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_PRESSURE_SIZE:
|
case PROP_PRESSURE_SIZE:
|
||||||
g_value_set_boolean (value, pressure_options->size);
|
g_value_set_boolean (value, size_dynamics->pressure);
|
||||||
break;
|
|
||||||
|
|
||||||
case PROP_PRESSURE_INVERSE_SIZE:
|
|
||||||
g_value_set_boolean (value, pressure_options->inverse_size);
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_PRESSURE_ASPECT_RATIO:
|
case PROP_PRESSURE_ASPECT_RATIO:
|
||||||
g_value_set_boolean (value, pressure_options->aspect_ratio);
|
g_value_set_boolean (value, aspect_ratio_dynamics->pressure);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_PRESSURE_COLOR:
|
case PROP_PRESSURE_COLOR:
|
||||||
g_value_set_boolean (value, pressure_options->color);
|
g_value_set_boolean (value, color_dynamics->pressure);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_PRESSURE_ANGLE:
|
case PROP_PRESSURE_ANGLE:
|
||||||
g_value_set_boolean (value, pressure_options->angle);
|
g_value_set_boolean (value, angle_dynamics->pressure);
|
||||||
break;
|
|
||||||
|
|
||||||
case PROP_PRESSURE_PRESCALE:
|
|
||||||
g_value_set_double (value, pressure_options->prescale);
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_VELOCITY_OPACITY:
|
case PROP_VELOCITY_OPACITY:
|
||||||
g_value_set_boolean (value, velocity_options->opacity);
|
g_value_set_boolean (value, opacity_dynamics->velocity);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_VELOCITY_HARDNESS:
|
case PROP_VELOCITY_HARDNESS:
|
||||||
g_value_set_boolean (value, velocity_options->hardness);
|
g_value_set_boolean (value, hardness_dynamics->velocity);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_VELOCITY_RATE:
|
case PROP_VELOCITY_RATE:
|
||||||
g_value_set_boolean (value, velocity_options->rate);
|
g_value_set_boolean (value, rate_dynamics->velocity);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_VELOCITY_SIZE:
|
case PROP_VELOCITY_SIZE:
|
||||||
g_value_set_boolean (value, velocity_options->size);
|
g_value_set_boolean (value, size_dynamics->velocity);
|
||||||
break;
|
|
||||||
|
|
||||||
case PROP_VELOCITY_INVERSE_SIZE:
|
|
||||||
g_value_set_boolean (value, velocity_options->inverse_size);
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_VELOCITY_ASPECT_RATIO:
|
case PROP_VELOCITY_ASPECT_RATIO:
|
||||||
g_value_set_boolean (value, velocity_options->aspect_ratio);
|
g_value_set_boolean (value, aspect_ratio_dynamics->velocity);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_VELOCITY_COLOR:
|
case PROP_VELOCITY_COLOR:
|
||||||
g_value_set_boolean (value, velocity_options->color);
|
g_value_set_boolean (value, color_dynamics->velocity);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_VELOCITY_ANGLE:
|
case PROP_VELOCITY_ANGLE:
|
||||||
g_value_set_boolean (value, velocity_options->angle);
|
g_value_set_boolean (value, angle_dynamics->velocity);
|
||||||
break;
|
|
||||||
|
|
||||||
case PROP_VELOCITY_PRESCALE:
|
|
||||||
g_value_set_double (value, velocity_options->prescale);
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_DIRECTION_OPACITY:
|
case PROP_DIRECTION_OPACITY:
|
||||||
g_value_set_boolean (value, direction_options->opacity);
|
g_value_set_boolean (value, opacity_dynamics->direction);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_DIRECTION_HARDNESS:
|
case PROP_DIRECTION_HARDNESS:
|
||||||
g_value_set_boolean (value, direction_options->hardness);
|
g_value_set_boolean (value, hardness_dynamics->direction);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_DIRECTION_RATE:
|
case PROP_DIRECTION_RATE:
|
||||||
g_value_set_boolean (value, direction_options->rate);
|
g_value_set_boolean (value, rate_dynamics->direction);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_DIRECTION_SIZE:
|
case PROP_DIRECTION_SIZE:
|
||||||
g_value_set_boolean (value, direction_options->size);
|
g_value_set_boolean (value, size_dynamics->direction);
|
||||||
break;
|
|
||||||
|
|
||||||
case PROP_DIRECTION_INVERSE_SIZE:
|
|
||||||
g_value_set_boolean (value, direction_options->inverse_size);
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_DIRECTION_ASPECT_RATIO:
|
case PROP_DIRECTION_ASPECT_RATIO:
|
||||||
g_value_set_boolean (value, direction_options->aspect_ratio);
|
g_value_set_boolean (value, aspect_ratio_dynamics->direction);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_DIRECTION_COLOR:
|
case PROP_DIRECTION_COLOR:
|
||||||
g_value_set_boolean (value, direction_options->color);
|
g_value_set_boolean (value, color_dynamics->direction);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_DIRECTION_ANGLE:
|
case PROP_DIRECTION_ANGLE:
|
||||||
g_value_set_boolean (value, direction_options->angle);
|
g_value_set_boolean (value, angle_dynamics->direction);
|
||||||
break;
|
|
||||||
|
|
||||||
case PROP_DIRECTION_PRESCALE:
|
|
||||||
g_value_set_double (value, direction_options->prescale);
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
||||||
case PROP_TILT_OPACITY:
|
case PROP_TILT_OPACITY:
|
||||||
g_value_set_boolean (value, tilt_options->opacity);
|
g_value_set_boolean (value, opacity_dynamics->tilt);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_TILT_HARDNESS:
|
case PROP_TILT_HARDNESS:
|
||||||
g_value_set_boolean (value, tilt_options->hardness);
|
g_value_set_boolean (value, hardness_dynamics->tilt);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_TILT_RATE:
|
case PROP_TILT_RATE:
|
||||||
g_value_set_boolean (value, tilt_options->rate);
|
g_value_set_boolean (value, rate_dynamics->tilt);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_TILT_SIZE:
|
case PROP_TILT_SIZE:
|
||||||
g_value_set_boolean (value, tilt_options->size);
|
g_value_set_boolean (value, size_dynamics->tilt);
|
||||||
break;
|
|
||||||
|
|
||||||
case PROP_TILT_INVERSE_SIZE:
|
|
||||||
g_value_set_boolean (value, tilt_options->inverse_size);
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_TILT_ASPECT_RATIO:
|
case PROP_TILT_ASPECT_RATIO:
|
||||||
g_value_set_boolean (value, tilt_options->aspect_ratio);
|
g_value_set_boolean (value, aspect_ratio_dynamics->tilt);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_TILT_COLOR:
|
case PROP_TILT_COLOR:
|
||||||
g_value_set_boolean (value, tilt_options->color);
|
g_value_set_boolean (value, color_dynamics->tilt);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_TILT_ANGLE:
|
case PROP_TILT_ANGLE:
|
||||||
g_value_set_boolean (value, tilt_options->angle);
|
g_value_set_boolean (value, angle_dynamics->tilt);
|
||||||
break;
|
|
||||||
|
|
||||||
case PROP_TILT_PRESCALE:
|
|
||||||
g_value_set_double (value, tilt_options->prescale);
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_RANDOM_OPACITY:
|
case PROP_RANDOM_OPACITY:
|
||||||
g_value_set_boolean (value, random_options->opacity);
|
g_value_set_boolean (value, opacity_dynamics->random);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_RANDOM_HARDNESS:
|
case PROP_RANDOM_HARDNESS:
|
||||||
g_value_set_boolean (value, random_options->hardness);
|
g_value_set_boolean (value, hardness_dynamics->random);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_RANDOM_RATE:
|
case PROP_RANDOM_RATE:
|
||||||
g_value_set_boolean (value, random_options->rate);
|
g_value_set_boolean (value, rate_dynamics->random);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_RANDOM_SIZE:
|
case PROP_RANDOM_SIZE:
|
||||||
g_value_set_boolean (value, random_options->size);
|
g_value_set_boolean (value, size_dynamics->random);
|
||||||
break;
|
|
||||||
|
|
||||||
case PROP_RANDOM_INVERSE_SIZE:
|
|
||||||
g_value_set_boolean (value, random_options->inverse_size);
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_RANDOM_ASPECT_RATIO:
|
case PROP_RANDOM_ASPECT_RATIO:
|
||||||
g_value_set_boolean (value, random_options->aspect_ratio);
|
g_value_set_boolean (value, aspect_ratio_dynamics->random);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_RANDOM_COLOR:
|
case PROP_RANDOM_COLOR:
|
||||||
g_value_set_boolean (value, random_options->color);
|
g_value_set_boolean (value, color_dynamics->random);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_RANDOM_ANGLE:
|
case PROP_RANDOM_ANGLE:
|
||||||
g_value_set_boolean (value, random_options->angle);
|
g_value_set_boolean (value, angle_dynamics->random);
|
||||||
break;
|
|
||||||
|
|
||||||
case PROP_RANDOM_PRESCALE:
|
|
||||||
g_value_set_double (value, random_options->prescale);
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
/*fading*/
|
/*fading*/
|
||||||
|
|
||||||
case PROP_FADING_OPACITY:
|
case PROP_FADING_OPACITY:
|
||||||
g_value_set_boolean (value, fading_options->opacity);
|
g_value_set_boolean (value, opacity_dynamics->fade);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_FADING_HARDNESS:
|
case PROP_FADING_HARDNESS:
|
||||||
g_value_set_boolean (value, fading_options->hardness);
|
g_value_set_boolean (value, hardness_dynamics->fade);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_FADING_RATE:
|
case PROP_FADING_RATE:
|
||||||
g_value_set_boolean (value, fading_options->rate);
|
g_value_set_boolean (value, rate_dynamics->fade);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_FADING_SIZE:
|
case PROP_FADING_SIZE:
|
||||||
g_value_set_boolean (value, fading_options->size);
|
g_value_set_boolean (value, size_dynamics->fade);
|
||||||
break;
|
|
||||||
|
|
||||||
case PROP_FADING_INVERSE_SIZE:
|
|
||||||
g_value_set_boolean (value, fading_options->inverse_size);
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_FADING_ASPECT_RATIO:
|
case PROP_FADING_ASPECT_RATIO:
|
||||||
g_value_set_boolean (value, fading_options->aspect_ratio);
|
g_value_set_boolean (value, aspect_ratio_dynamics->fade);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_FADING_COLOR:
|
case PROP_FADING_COLOR:
|
||||||
g_value_set_boolean (value, fading_options->color);
|
g_value_set_boolean (value, color_dynamics->fade);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_FADING_ANGLE:
|
case PROP_FADING_ANGLE:
|
||||||
g_value_set_boolean (value, fading_options->angle);
|
g_value_set_boolean (value, angle_dynamics->fade);
|
||||||
break;
|
|
||||||
|
|
||||||
case PROP_FADING_PRESCALE:
|
|
||||||
g_value_set_double (value, fading_options->prescale);
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
@ -1002,21 +904,21 @@ gimp_dynamics_options_notify (GObject *object,
|
||||||
|
|
||||||
if (G_OBJECT_CLASS (parent_class)->notify)
|
if (G_OBJECT_CLASS (parent_class)->notify)
|
||||||
G_OBJECT_CLASS (parent_class)->notify (object, pspec);
|
G_OBJECT_CLASS (parent_class)->notify (object, pspec);
|
||||||
*/
|
*/
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
GimpData *
|
GimpData *
|
||||||
gimp_dynamics_options_new (GimpPaintInfo *dynamics_info)
|
gimp_dynamics_options_new (GimpPaintInfo *paint_info)
|
||||||
{
|
{
|
||||||
GimpDynamicsOptions *options;
|
GimpDynamicsOptions *options;
|
||||||
|
|
||||||
g_return_val_if_fail (GIMP_IS_PAINT_INFO (dynamics_info), NULL);
|
g_return_val_if_fail (GIMP_IS_PAINT_INFO (paint_info), NULL);
|
||||||
|
|
||||||
options = g_object_new (dynamics_info->paint_options_type,
|
options = g_object_new (GIMP_TYPE_DYNAMICS_OPTIONS,
|
||||||
"gimp", dynamics_info->gimp,
|
"gimp", paint_info->gimp,
|
||||||
"name", GIMP_OBJECT (dynamics_info)->name,
|
"name", GIMP_OBJECT (paint_info)->name,
|
||||||
"paint-info", dynamics_info,
|
// "paint-info", paint_info,
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
return options;
|
return options;
|
||||||
|
|
|
@ -23,23 +23,8 @@
|
||||||
#include "gimppaintoptions.h"
|
#include "gimppaintoptions.h"
|
||||||
#include "core/gimpdata.h"
|
#include "core/gimpdata.h"
|
||||||
|
|
||||||
#define GIMP_DYNAMICS_DRIVERS 6
|
typedef struct _GimpDynamicOutputOptions GimpDynamicOutputOptions;
|
||||||
|
|
||||||
typedef struct _GimpDynamicOptions GimpDynamicOptions;
|
|
||||||
|
|
||||||
|
|
||||||
struct _GimpDynamicOptions
|
|
||||||
{
|
|
||||||
gboolean opacity;
|
|
||||||
gboolean hardness;
|
|
||||||
gboolean rate;
|
|
||||||
gboolean size;
|
|
||||||
gboolean inverse_size;
|
|
||||||
gboolean aspect_ratio;
|
|
||||||
gboolean color;
|
|
||||||
gboolean angle;
|
|
||||||
gdouble prescale;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct _GimpDynamicOutputOptions
|
struct _GimpDynamicOutputOptions
|
||||||
{
|
{
|
||||||
|
@ -76,16 +61,16 @@ typedef struct _GimpDynamicsOptionsClass GimpDynamicsOptionsClass;
|
||||||
|
|
||||||
struct _GimpDynamicsOptions
|
struct _GimpDynamicsOptions
|
||||||
{
|
{
|
||||||
GimpPaintOptions parent_instance;
|
GimpDataClass parent_instance;
|
||||||
|
|
||||||
GimpPaintInfo *dynamics_info;
|
GimpDynamicOutputOptions* opacity_dynamics;
|
||||||
|
GimpDynamicOutputOptions* hardness_dynamics;
|
||||||
|
GimpDynamicOutputOptions* rate_dynamics;
|
||||||
|
GimpDynamicOutputOptions* size_dynamics;
|
||||||
|
GimpDynamicOutputOptions* aspect_ratio_dynamics;
|
||||||
|
GimpDynamicOutputOptions* color_dynamics;
|
||||||
|
GimpDynamicOutputOptions* angle_dynamics;
|
||||||
|
|
||||||
GimpDynamicOptions *pressure_options;
|
|
||||||
GimpDynamicOptions *velocity_options;
|
|
||||||
GimpDynamicOptions *direction_options;
|
|
||||||
GimpDynamicOptions *tilt_options;
|
|
||||||
GimpDynamicOptions *random_options;
|
|
||||||
GimpDynamicOptions *fading_options;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
struct _GimpDynamicsOptionsClass
|
struct _GimpDynamicsOptionsClass
|
||||||
|
@ -96,7 +81,7 @@ struct _GimpDynamicsOptionsClass
|
||||||
|
|
||||||
GType gimp_dynamics_options_get_type (void) G_GNUC_CONST;
|
GType gimp_dynamics_options_get_type (void) G_GNUC_CONST;
|
||||||
|
|
||||||
GimpData * gimp_dynamics_options_new (GimpPaintInfo *dynamics_info);
|
GimpData * gimp_dynamics_options_new (GimpPaintInfo *paint_info);
|
||||||
|
|
||||||
GimpData * gimp_dynamics_get_standard (void);
|
GimpData * gimp_dynamics_get_standard (void);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue