dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

replace the identical GimpPressureOptions, GimpVelocityOptions and 

2008-05-26  Michael Natterer  <mitch@gimp.org>

	* app/paint/gimppaintoptions.[ch]: replace the identical
	GimpPressureOptions, GimpVelocityOptions and GimpRandomOptions
	struct by a single GimpDynamicOptions struct.

	* app/tools/gimppaintoptions-gui.c: don't pass the various
	sub-structs to the _options_gui() function because they are not
	needed.


svn path=/trunk/; revision=25814
This commit is contained in:
Michael Natterer 2008-05-26 18:54:28 +00:00 committed by Michael Natterer
parent e6ac9be670
commit cd2c6fee40
4 changed files with 78 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2008-05-26 Michael Natterer <mitch@gimp.org>
* app/paint/gimppaintoptions.[ch]: replace the identical
GimpPressureOptions, GimpVelocityOptions and GimpRandomOptions
struct by a single GimpDynamicOptions struct.
* app/tools/gimppaintoptions-gui.c: don't pass the various
sub-structs to the _options_gui() function because they are not
needed.
2008-05-26 Michael Natterer <mitch@gimp.org>
* app/gegl/gimpcolorbalanceconfig.c

24
app/paint/gimppaintoptions.c
View File

@ -348,9 +348,9 @@ gimp_paint_options_init (GimpPaintOptions *options)
{
options->application_mode_save = DEFAULT_APPLICATION_MODE;
options->pressure_options = g_slice_new0 (GimpPressureOptions);
options->velocity_options = g_slice_new0 (GimpVelocityOptions);
options->random_options = g_slice_new0 (GimpRandomOptions);
options->pressure_options = g_slice_new0 (GimpDynamicOptions);
options->velocity_options = g_slice_new0 (GimpDynamicOptions);
options->random_options = g_slice_new0 (GimpDynamicOptions);
options->fade_options = g_slice_new0 (GimpFadeOptions);
options->jitter_options = g_slice_new0 (GimpJitterOptions);
options->gradient_options = g_slice_new0 (GimpGradientOptions);
@ -364,9 +364,9 @@ gimp_paint_options_finalize (GObject *object)
if (options->paint_info)
g_object_unref (options->paint_info);
g_slice_free (GimpPressureOptions, options->pressure_options);
g_slice_free (GimpVelocityOptions, options->velocity_options);
g_slice_free (GimpRandomOptions, options->random_options);
g_slice_free (GimpDynamicOptions, options->pressure_options);
g_slice_free (GimpDynamicOptions, options->velocity_options);
g_slice_free (GimpDynamicOptions, options->random_options);
g_slice_free (GimpFadeOptions, options->fade_options);
g_slice_free (GimpJitterOptions, options->jitter_options);
g_slice_free (GimpGradientOptions, options->gradient_options);
@ -381,9 +381,9 @@ gimp_paint_options_set_property (GObject *object,
GParamSpec *pspec)
{
GimpPaintOptions *options = GIMP_PAINT_OPTIONS (object);
GimpPressureOptions *pressure_options = options->pressure_options;
GimpVelocityOptions *velocity_options = options->velocity_options;
GimpRandomOptions *random_options = options->random_options;
GimpDynamicOptions *pressure_options = options->pressure_options;
GimpDynamicOptions *velocity_options = options->velocity_options;
GimpDynamicOptions *random_options = options->random_options;
GimpFadeOptions *fade_options = options->fade_options;
GimpJitterOptions *jitter_options = options->jitter_options;
GimpGradientOptions *gradient_options = options->gradient_options;
@ -532,9 +532,9 @@ gimp_paint_options_get_property (GObject *object,
GParamSpec *pspec)
{
GimpPaintOptions *options = GIMP_PAINT_OPTIONS (object);
GimpPressureOptions *pressure_options = options->pressure_options;
GimpVelocityOptions *velocity_options = options->velocity_options;
GimpRandomOptions *random_options = options->random_options;
GimpDynamicOptions *pressure_options = options->pressure_options;
GimpDynamicOptions *velocity_options = options->velocity_options;
GimpDynamicOptions *random_options = options->random_options;
GimpFadeOptions *fade_options = options->fade_options;
GimpJitterOptions *jitter_options = options->jitter_options;
GimpGradientOptions *gradient_options = options->gradient_options;

32
app/paint/gimppaintoptions.h
View File

@ -30,34 +30,12 @@
GIMP_CONTEXT_BRUSH_MASK
typedef struct _GimpPressureOptions GimpPressureOptions;
typedef struct _GimpVelocityOptions GimpVelocityOptions;
typedef struct _GimpRandomOptions GimpRandomOptions;
typedef struct _GimpDynamicOptions GimpDynamicOptions;
typedef struct _GimpFadeOptions GimpFadeOptions;
typedef struct _GimpJitterOptions GimpJitterOptions;
typedef struct _GimpGradientOptions GimpGradientOptions;
struct _GimpPressureOptions
{
gboolean opacity;
gboolean hardness;
gboolean rate;
gboolean size;
gboolean inverse_size;
gboolean color;
};
struct _GimpVelocityOptions
{
gboolean opacity;
gboolean hardness;
gboolean rate;
gboolean size;
gboolean inverse_size;
gboolean color;
};
struct _GimpRandomOptions
struct _GimpDynamicOptions
{
gboolean opacity;
gboolean hardness;
@ -116,9 +94,9 @@ struct _GimpPaintOptions
gboolean hard;
gboolean dynamics_expanded;
GimpPressureOptions *pressure_options;
GimpVelocityOptions *velocity_options;
GimpRandomOptions *random_options;
GimpDynamicOptions *pressure_options;
GimpDynamicOptions *velocity_options;
GimpDynamicOptions *random_options;
GimpFadeOptions *fade_options;
GimpJitterOptions *jitter_options;

120
app/tools/gimppaintoptions-gui.c
View File

@ -51,38 +51,32 @@
#include "gimp-intl.h"
static gboolean tool_has_opacity_dynamics (GType tool_type);
static gboolean tool_has_hardness_dynamics (GType tool_type);
static gboolean tool_has_rate_dynamics (GType tool_type);
static gboolean tool_has_size_dynamics (GType tool_type);
static gboolean tool_has_color_dynamics (GType tool_type);
static gboolean tool_has_opacity_dynamics (GType tool_type);
static gboolean tool_has_hardness_dynamics (GType tool_type);
static gboolean tool_has_rate_dynamics (GType tool_type);
static gboolean tool_has_size_dynamics (GType tool_type);
static gboolean tool_has_color_dynamics (GType tool_type);
static void pressure_options_gui (GimpPressureOptions *pressure,
GimpPaintOptions *paint_options,
GType tool_type,
GtkTable *table,
gint row,
GtkWidget *labels[]);
static void velocity_options_gui (GimpVelocityOptions *velocity,
GimpPaintOptions *paint_options,
GType tool_type,
GtkTable *table,
gint row);
static void random_options_gui (GimpRandomOptions *random,
GimpPaintOptions *paint_options,
GType tool_type,
GtkTable *table,
gint row);
static GtkWidget * fade_options_gui (GimpFadeOptions *fade,
GimpPaintOptions *paint_options,
GType tool_type);
static GtkWidget * gradient_options_gui (GimpGradientOptions *gradient,
GimpPaintOptions *paint_options,
GType tool_type,
GtkWidget *incremental_toggle);
static GtkWidget * jitter_options_gui (GimpJitterOptions *jitter,
GimpPaintOptions *paint_options,
GType tool_type);
static void pressure_options_gui (GimpPaintOptions *paint_options,
GType tool_type,
GtkTable *table,
gint row,
GtkWidget *labels[]);
static void velocity_options_gui (GimpPaintOptions *paint_options,
GType tool_type,
GtkTable *table,
gint row);
static void random_options_gui (GimpPaintOptions *paint_options,
GType tool_type,
GtkTable *table,
gint row);
static GtkWidget * fade_options_gui (GimpPaintOptions *paint_options,
GType tool_type);
static GtkWidget * gradient_options_gui (GimpPaintOptions *paint_options,
GType tool_type,
GtkWidget *incremental_toggle);
static GtkWidget * jitter_options_gui (GimpPaintOptions *paint_options,
GType tool_type);
/* public functions */
@ -234,17 +228,14 @@ gimp_paint_options_gui (GimpToolOptions *tool_options)
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (label);
pressure_options_gui (options->pressure_options,
options, tool_type,
pressure_options_gui (options, tool_type,
GTK_TABLE (table), 1,
dynamics_labels);
velocity_options_gui (options->velocity_options,
options, tool_type,
velocity_options_gui (options, tool_type,
GTK_TABLE (table), 2);
random_options_gui (options->random_options,
options, tool_type,
random_options_gui (options, tool_type,
GTK_TABLE (table), 3);
/* EEK: pack the fixed *after* the buttons so the table calls
@ -266,16 +257,14 @@ gimp_paint_options_gui (GimpToolOptions *tool_options)
}
}
frame = fade_options_gui (options->fade_options,
options, tool_type);
frame = fade_options_gui (options, tool_type);
if (frame)
{
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
}
frame = jitter_options_gui (options->jitter_options,
options, tool_type);
frame = jitter_options_gui (options, tool_type);
if (frame)
{
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
@ -311,8 +300,7 @@ gimp_paint_options_gui (GimpToolOptions *tool_options)
gtk_widget_show (button);
}
frame = gradient_options_gui (options->gradient_options,
options, tool_type,
frame = gradient_options_gui (options, tool_type,
incremental_toggle);
if (frame)
{
@ -416,12 +404,11 @@ dynamics_check_button_size_allocate (GtkWidget *toggle,
}
static void
pressure_options_gui (GimpPressureOptions *pressure,
GimpPaintOptions *paint_options,
GType tool_type,
GtkTable *table,
gint row,
GtkWidget *labels[])
pressure_options_gui (GimpPaintOptions *paint_options,
GType tool_type,
GtkTable *table,
gint row,
GtkWidget *labels[])
{
GObject *config = G_OBJECT (paint_options);
GtkWidget *button;
@ -484,11 +471,10 @@ pressure_options_gui (GimpPressureOptions *pressure,
}
static void
velocity_options_gui (GimpVelocityOptions *velocity,
GimpPaintOptions *paint_options,
GType tool_type,
GtkTable *table,
gint row)
velocity_options_gui (GimpPaintOptions *paint_options,
GType tool_type,
GtkTable *table,
gint row)
{
GObject *config = G_OBJECT (paint_options);
gint column = 1;
@ -525,11 +511,10 @@ velocity_options_gui (GimpVelocityOptions *velocity,
}
static void
random_options_gui (GimpRandomOptions *random,
GimpPaintOptions *paint_options,
GType tool_type,
GtkTable *table,
gint row)
random_options_gui (GimpPaintOptions *paint_options,
GType tool_type,
GtkTable *table,
gint row)
{
GObject*config = G_OBJECT (paint_options);
gint column = 1;
@ -566,8 +551,7 @@ random_options_gui (GimpRandomOptions *random,
}
static GtkWidget *
fade_options_gui (GimpFadeOptions *fade,
GimpPaintOptions *paint_options,
fade_options_gui (GimpPaintOptions *paint_options,
GType tool_type)
{
GObject *config = G_OBJECT (paint_options);
@ -609,9 +593,8 @@ fade_options_gui (GimpFadeOptions *fade,
}
static GtkWidget *
jitter_options_gui (GimpJitterOptions *jitter,
GimpPaintOptions *paint_options,
GType tool_type)
jitter_options_gui (GimpPaintOptions *paint_options,
GType tool_type)
{
GObject *config = G_OBJECT (paint_options);
GtkWidget *frame = NULL;
@ -638,10 +621,9 @@ jitter_options_gui (GimpJitterOptions *jitter,
}
static GtkWidget *
gradient_options_gui (GimpGradientOptions *gradient,
GimpPaintOptions *paint_options,
GType tool_type,
GtkWidget *incremental_toggle)
gradient_options_gui (GimpPaintOptions *paint_options,
GType tool_type,
GtkWidget *incremental_toggle)
{
GObject *config = G_OBJECT (paint_options);
GtkWidget *frame = NULL;
@ -665,7 +647,7 @@ gradient_options_gui (GimpGradientOptions *gradient,
if (incremental_toggle)
{
gtk_widget_set_sensitive (incremental_toggle,
! gradient->use_gradient);
! paint_options->gradient_options->use_gradient);
g_object_set_data (G_OBJECT (button), "inverse_sensitive",
incremental_toggle);
}