Commit 99c0d4a1 authored by jaycox's avatar jaycox

make the edit button active if the default brush is a generated brush.


	* app/brush_select.c: make the edit button active if the default
 	brush is a generated brush.  Make sure brush spacing >= 1.0
	* app/gimpbrushlist.c: do not add a brush to the brush list if it
 	failed to load
	* app/gradient.c:  Fix typo that caused a crash with --no-data
	* app/main.c: be more forgiving of fp rounding in gserialize tests
parent 43639fa0
1999-01-19 Jay Cox <jaycox@earthlink.net>
* app/brush_select.c: make the edit button active if the default
brush is a generated brush. Make sure brush spacing >= 1.0
* app/gimpbrushlist.c: do not add a brush to the brush list if it
failed to load
* app/gradient.c: Fix typo that caused a crash with --no-data
* app/main.c: be more forgiving of fp rounding in gserialize tests
Mon Jan 18 23:36:57 1999 Austin Donnelly <austin@gimp.org>
* app/menus.c: include module browser, plus re-instate the 'swap
......
......@@ -74,8 +74,9 @@ Name: Jay Cox
Email: jaycox@earthlink.net
url:
ircnick: j
expertise: Brushes, selection functions, Parasites.
current work: Parasites
expertise: Brushes, selection functions, Parasites, paint_funcs,
threads, cmyk, xcf.
current work: Multi-processor support.
commit access: yes
Name: Larry Ewing
......
......@@ -301,7 +301,7 @@ brush_select_new (gchar * title,
gtk_box_pack_start (GTK_BOX (bsp->options_box), util_box, FALSE, FALSE, 0);
label = gtk_label_new (_("Spacing:"));
gtk_box_pack_start (GTK_BOX (util_box), label, FALSE, FALSE, 2);
bsp->spacing_data = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 1000.0, 1.0, 1.0, 0.0));
bsp->spacing_data = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 1.0, 1000.0, 1.0, 1.0, 0.0));
slider = gtk_hscale_new (bsp->spacing_data);
gtk_box_pack_start (GTK_BOX (util_box), slider, TRUE, TRUE, 0);
gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP);
......@@ -410,7 +410,7 @@ brush_select_new (gchar * title,
gtk_signal_emit_by_name (GTK_OBJECT (bsp->spacing_data), "value_changed");
}
bsp->redraw = old_value;
if (GIMP_IS_BRUSH_GENERATED(active) && title)
if (GIMP_IS_BRUSH_GENERATED(active))
gtk_widget_set_sensitive (bsp->edit_button, 1);
else
gtk_widget_set_sensitive (bsp->edit_button, 0);
......
......@@ -151,12 +151,21 @@ brush_load(char *filename)
{
if (strcmp(&filename[strlen(filename) - 4], ".gbr") == 0)
{
gimp_brush_list_add(brush_list, gimp_brush_new(filename));
GimpBrush *brush;
brush = gimp_brush_new(filename);
if (brush != NULL)
gimp_brush_list_add(brush_list, brush);
else
g_message("Warning: failed to load brush \"%s\"", filename);
}
else if (strcmp(&filename[strlen(filename) - 4], ".vbr") == 0)
{
gimp_brush_list_add(brush_list,
GIMP_BRUSH(gimp_brush_generated_load(filename)));
GimpBrushGenerated *brush;
brush = gimp_brush_generated_load(filename);
if (brush != NULL)
gimp_brush_list_add(brush_list, GIMP_BRUSH(brush));
else
g_message("Warning: failed to load brush \"%s\"", filename);
}
}
......
......@@ -5980,7 +5980,7 @@ build_user_filename(char *name, char *path_str)
path = g_strdup(token);
} /* else */
filename = g_strdup_printf(filename, "%s/%s", path, name);
filename = g_strdup_printf("%s/%s", path, name);
g_free(path);
} /* if */
......
......@@ -5980,7 +5980,7 @@ build_user_filename(char *name, char *path_str)
path = g_strdup(token);
} /* else */
filename = g_strdup_printf(filename, "%s/%s", path, name);
filename = g_strdup_printf("%s/%s", path, name);
g_free(path);
} /* if */
......
......@@ -301,7 +301,7 @@ brush_select_new (gchar * title,
gtk_box_pack_start (GTK_BOX (bsp->options_box), util_box, FALSE, FALSE, 0);
label = gtk_label_new (_("Spacing:"));
gtk_box_pack_start (GTK_BOX (util_box), label, FALSE, FALSE, 2);
bsp->spacing_data = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 1000.0, 1.0, 1.0, 0.0));
bsp->spacing_data = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 1.0, 1000.0, 1.0, 1.0, 0.0));
slider = gtk_hscale_new (bsp->spacing_data);
gtk_box_pack_start (GTK_BOX (util_box), slider, TRUE, TRUE, 0);
gtk_scale_set_value_pos (GTK_SCALE (slider), GTK_POS_TOP);
......@@ -410,7 +410,7 @@ brush_select_new (gchar * title,
gtk_signal_emit_by_name (GTK_OBJECT (bsp->spacing_data), "value_changed");
}
bsp->redraw = old_value;
if (GIMP_IS_BRUSH_GENERATED(active) && title)
if (GIMP_IS_BRUSH_GENERATED(active))
gtk_widget_set_sensitive (bsp->edit_button, 1);
else
gtk_widget_set_sensitive (bsp->edit_button, 0);
......
......@@ -5980,7 +5980,7 @@ build_user_filename(char *name, char *path_str)
path = g_strdup(token);
} /* else */
filename = g_strdup_printf(filename, "%s/%s", path, name);
filename = g_strdup_printf("%s/%s", path, name);
g_free(path);
} /* if */
......
......@@ -453,9 +453,11 @@ static void test_gserialize()
g_deserialize(test_struct_descript, (char *)(void*)to, ser_1);
#define EPSILON .0001
if (to->test_gint32 != ts->test_gint32)
g_message("gint32 test failed (please email your system configuration to jaycox@earthlink.net): %d\n", to->test_gint32);
if (to->test_float != ts->test_float)
if (to->test_float + EPSILON < ts->test_float || to->test_float - EPSILON > ts->test_float)
g_message("float test failed (please email your system configuration to jaycox@earthlink.net): %f\n", to->test_float);
if (strcmp(to->test_string, ts->test_string) != 0)
g_message("string test failed (please email your system configuration to jaycox@earthlink.net): %s\n", to->test_string);
......
......@@ -5980,7 +5980,7 @@ build_user_filename(char *name, char *path_str)
path = g_strdup(token);
} /* else */
filename = g_strdup_printf(filename, "%s/%s", path, name);
filename = g_strdup_printf("%s/%s", path, name);
g_free(path);
} /* if */
......
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