[gimp/soc-2010-cage-2] app: some cleanup in the new paint options code
- From: Michael Muré <mmure src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/soc-2010-cage-2] app: some cleanup in the new paint options code
- Date: Thu, 30 Dec 2010 18:12:31 +0000 (UTC)
commit 81fb1d2d94354ca32c1521660dca6850d57f8d2b
Author: Michael Natterer <mitch gimp org>
Date: Thu Nov 25 21:30:29 2010 +0100
app: some cleanup in the new paint options code
app/paint/gimppaintoptions.c | 27 ++++++--------
app/paint/gimppaintoptions.h | 17 ++++-----
app/tools/gimppaintoptions-gui.c | 74 ++++++++++++++++---------------------
3 files changed, 52 insertions(+), 66 deletions(-)
---
diff --git a/app/paint/gimppaintoptions.c b/app/paint/gimppaintoptions.c
index 8277328..0a0d315 100644
--- a/app/paint/gimppaintoptions.c
+++ b/app/paint/gimppaintoptions.c
@@ -44,7 +44,6 @@
#define DEFAULT_APPLICATION_MODE GIMP_PAINT_CONSTANT
#define DEFAULT_HARD FALSE
-
#define DEFAULT_USE_JITTER FALSE
#define DEFAULT_JITTER_AMOUNT 0.2
@@ -63,6 +62,7 @@
#define DYNAMIC_MAX_VALUE 1.0
#define DYNAMIC_MIN_VALUE 0.0
+
enum
{
PROP_0,
@@ -168,12 +168,11 @@ gimp_paint_options_class_init (GimpPaintOptionsClass *klass)
0.0, 50.0, DEFAULT_JITTER_AMOUNT,
GIMP_PARAM_STATIC_STRINGS);
-
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_DYNAMICS_EXPANDED,
"dynamics-expanded", NULL,
DEFAULT_DYNAMICS_EXPANDED,
GIMP_PARAM_STATIC_STRINGS);
-
+
GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_FADE_LENGTH,
"fade-length", NULL,
0.0, 32767.0, DEFAULT_FADE_LENGTH,
@@ -251,8 +250,8 @@ gimp_paint_options_init (GimpPaintOptions *options)
{
options->application_mode_save = DEFAULT_APPLICATION_MODE;
- options->fade_options = g_slice_new0 (GimpFadeOptions);
options->jitter_options = g_slice_new0 (GimpJitterOptions);
+ options->fade_options = g_slice_new0 (GimpFadeOptions);
options->gradient_options = g_slice_new0 (GimpGradientOptions);
}
@@ -275,8 +274,8 @@ gimp_paint_options_finalize (GObject *object)
{
GimpPaintOptions *options = GIMP_PAINT_OPTIONS (object);
- g_slice_free (GimpFadeOptions, options->fade_options);
g_slice_free (GimpJitterOptions, options->jitter_options);
+ g_slice_free (GimpFadeOptions, options->fade_options);
g_slice_free (GimpGradientOptions, options->gradient_options);
G_OBJECT_CLASS (parent_class)->finalize (object);
@@ -288,10 +287,10 @@ gimp_paint_options_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec)
{
- GimpPaintOptions *options = GIMP_PAINT_OPTIONS (object);
- GimpFadeOptions *fade_options = options->fade_options;
- GimpJitterOptions *jitter_options = options->jitter_options;
- GimpGradientOptions *gradient_options = options->gradient_options;
+ GimpPaintOptions *options = GIMP_PAINT_OPTIONS (object);
+ GimpJitterOptions *jitter_options = options->jitter_options;
+ GimpFadeOptions *fade_options = options->fade_options;
+ GimpGradientOptions *gradient_options = options->gradient_options;
switch (property_id)
{
@@ -395,10 +394,10 @@ gimp_paint_options_get_property (GObject *object,
GValue *value,
GParamSpec *pspec)
{
- GimpPaintOptions *options = GIMP_PAINT_OPTIONS (object);
- GimpFadeOptions *fade_options = options->fade_options;
- GimpJitterOptions *jitter_options = options->jitter_options;
- GimpGradientOptions *gradient_options = options->gradient_options;
+ GimpPaintOptions *options = GIMP_PAINT_OPTIONS (object);
+ GimpJitterOptions *jitter_options = options->jitter_options;
+ GimpFadeOptions *fade_options = options->fade_options;
+ GimpGradientOptions *gradient_options = options->gradient_options;
switch (property_id)
{
@@ -524,7 +523,6 @@ gimp_paint_options_get_fade (GimpPaintOptions *paint_options,
gdouble unit_factor;
gdouble pos;
-
g_return_val_if_fail (GIMP_IS_PAINT_OPTIONS (paint_options),
DYNAMIC_MAX_VALUE);
g_return_val_if_fail (GIMP_IS_IMAGE (image), DYNAMIC_MAX_VALUE);
@@ -581,7 +579,6 @@ gimp_paint_options_get_fade (GimpPaintOptions *paint_options,
z = 1.0 - z;
return z; /* ln (1/255) */
-
}
gdouble
diff --git a/app/paint/gimppaintoptions.h b/app/paint/gimppaintoptions.h
index 30908a0..c306a57 100644
--- a/app/paint/gimppaintoptions.h
+++ b/app/paint/gimppaintoptions.h
@@ -30,10 +30,15 @@
GIMP_CONTEXT_DYNAMICS_MASK
-typedef struct _GimpFadeOptions GimpFadeOptions;
typedef struct _GimpJitterOptions GimpJitterOptions;
+typedef struct _GimpFadeOptions GimpFadeOptions;
typedef struct _GimpGradientOptions GimpGradientOptions;
+struct _GimpJitterOptions
+{
+ gboolean use_jitter;
+ gdouble jitter_amount;
+};
struct _GimpFadeOptions
{
@@ -43,12 +48,6 @@ struct _GimpFadeOptions
GimpRepeatMode fade_repeat;
};
-struct _GimpJitterOptions
-{
- gboolean use_jitter;
- gdouble jitter_amount;
-};
-
struct _GimpGradientOptions
{
gboolean gradient_reverse;
@@ -81,10 +80,10 @@ struct _GimpPaintOptions
gboolean hard;
- gboolean dynamics_expanded;
+ GimpJitterOptions *jitter_options;
+ gboolean dynamics_expanded;
GimpFadeOptions *fade_options;
- GimpJitterOptions *jitter_options;
GimpGradientOptions *gradient_options;
GimpViewType brush_view_type;
diff --git a/app/tools/gimppaintoptions-gui.c b/app/tools/gimppaintoptions-gui.c
index 2d2aa78..eb117e0 100644
--- a/app/tools/gimppaintoptions-gui.c
+++ b/app/tools/gimppaintoptions-gui.c
@@ -55,7 +55,6 @@
static GtkWidget * dynamics_options_gui (GimpPaintOptions *paint_options,
GType tool_type);
-
static GtkWidget * jitter_options_gui (GimpPaintOptions *paint_options,
GType tool_type);
@@ -201,8 +200,6 @@ gimp_paint_options_gui (GimpToolOptions *tool_options)
gtk_widget_show (button);
}
-
-
return vbox;
}
@@ -216,44 +213,43 @@ dynamics_options_gui (GimpPaintOptions *paint_options,
GObject *config = G_OBJECT (paint_options);
GtkWidget *frame;
GtkWidget *inner_frame;
- GtkWidget *fade_table;
- GtkWidget *gradient_table;
+ GtkWidget *table;
GtkWidget *scale;
GtkWidget *menu;
GtkWidget *combo;
GtkWidget *checkbox;
GtkWidget *vbox;
+ GtkWidget *inner_vbox;
+ GtkWidget *hbox;
GtkWidget *box;
- frame = gimp_prop_expander_new (config, "dynamics-expanded",
- _("Dynamics options"));
+ frame = gimp_prop_expander_new (config, "dynamics-expanded",
+ _("Dynamics Options"));
vbox = gtk_vbox_new (FALSE, 2);
gtk_container_add (GTK_CONTAINER (frame), vbox);
gtk_widget_show (vbox);
- inner_frame = gimp_frame_new (_("Fade options:"));
+ inner_frame = gimp_frame_new (_("Fade Options"));
gtk_box_pack_start (GTK_BOX (vbox), inner_frame, FALSE, FALSE, 0);
gtk_widget_show (inner_frame);
- fade_table = gtk_table_new (3, 3, FALSE);
- gtk_table_set_col_spacings (GTK_TABLE (fade_table), 2);
- gtk_table_set_row_spacings (GTK_TABLE (fade_table), 2);
-
- gtk_container_add (GTK_CONTAINER (inner_frame), fade_table);
- gtk_widget_show (fade_table);
-
- /* the fade-out sizeentry */
+ inner_vbox = gtk_vbox_new (FALSE, 2);
+ gtk_container_add (GTK_CONTAINER (inner_frame), inner_vbox);
+ gtk_widget_show (inner_vbox);
+
+ /* the fade-out scale & unitmenu */
+ hbox = gtk_hbox_new (FALSE, 2);
+ gtk_box_pack_start (GTK_BOX (inner_vbox), hbox, FALSE, FALSE, 0);
+ gtk_widget_show (hbox);
+
scale = gimp_prop_spin_scale_new (config, "fade-length",
_("Fade length"), 1.0, 50.0, 0);
- gtk_table_attach (GTK_TABLE (fade_table), scale, 0, 2, 0, 1,
- GTK_EXPAND | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0);
gtk_widget_show (scale);
- /* the fade-out unitmenu */
menu = gimp_prop_unit_combo_box_new (config, "fade-unit");
- gtk_table_attach (GTK_TABLE (fade_table), menu, 2, 3, 0, 1,
- GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), menu, FALSE, FALSE, 0);
gtk_widget_show (menu);
#if 0
@@ -262,42 +258,36 @@ dynamics_options_gui (GimpPaintOptions *paint_options,
gimp_unit_menu_set_pixel_digits (GIMP_UNIT_MENU (menu), 0);
#endif
- /* the repeat type */
+ /* the repeat type */
+ table = gtk_table_new (1, 2, FALSE);
+ gtk_table_set_col_spacings (GTK_TABLE (table), 2);
+ gtk_box_pack_start (GTK_BOX (inner_vbox), table, FALSE, FALSE, 0);
+ gtk_widget_show (table);
+
combo = gimp_prop_enum_combo_box_new (config, "fade-repeat", 0, 0);
- gimp_table_attach_aligned (GTK_TABLE (fade_table), 0, 2,
+ gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Repeat:"), 0.0, 0.5,
- combo, 2, FALSE);
+ combo, 1, FALSE);
- checkbox = gimp_prop_check_button_new (config,
- "fade-reverse",
- _("Reverse"));
- gtk_table_attach (GTK_TABLE (fade_table), checkbox, 0, 2, 3, 4,
- GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
+ checkbox = gimp_prop_check_button_new (config, "fade-reverse",
+ _("Reverse"));
+ gtk_box_pack_start (GTK_BOX (inner_vbox), checkbox, FALSE, FALSE, 0);
gtk_widget_show (checkbox);
- /*Color UI*/
+ /* Color UI */
if (g_type_is_a (tool_type, GIMP_TYPE_PAINTBRUSH_TOOL))
{
- inner_frame = gimp_frame_new (_("Color options:"));
+ inner_frame = gimp_frame_new (_("Color Options"));
gtk_box_pack_start (GTK_BOX (vbox), inner_frame, FALSE, FALSE, 0);
gtk_widget_show (inner_frame);
- gradient_table = gtk_table_new (1, 3, FALSE);
- gtk_table_set_col_spacings (GTK_TABLE (gradient_table), 2);
- gtk_table_set_row_spacings (GTK_TABLE (gradient_table), 2);
-
- gtk_container_add (GTK_CONTAINER (inner_frame), gradient_table);
- gtk_widget_show (gradient_table);
-
box = gimp_prop_gradient_box_new (NULL, GIMP_CONTEXT (config),
_("Gradient"), 2,
"gradient-view-type",
"gradient-view-size",
"gradient-reverse");
-
- gimp_table_attach_aligned (GTK_TABLE (gradient_table), 0, 1,
- _("Colors:"), 0.0, 0.5,
- box, 2, FALSE);
+ gtk_container_add (GTK_CONTAINER (inner_frame), box);
+ gtk_widget_show (box);
}
return frame;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
