Commit 33cc34dd authored by jaycox's avatar jaycox
Browse files

----------------------------------------------------------------------


 ----------------------------------------------------------------------
 Modified Files:
 	ChangeLog app/brush_select.c app/gimpbrush.c app/gimpbrush.h
 	app/gimpbrushlist.c
      made the scrollbars recalc in brush_select when a brush is
      added/removed.
      GimpBrushLists now force brush names to be unique.
 ----------------------------------------------------------------------
parent e624645c
Sun Jul 19 15:26:11 PDT 1998 Jay Cox <jaycox@eartlink.net>
* app/brush_select.c
recalc the scrollbar when a brush is added/removed.
* app/gimpbrush.c app/gimpbrush.h app/gimpbrushlist.c
Make sure brush names are unique when they are added to a
brush list.
Sun Jul 19 20:55:36 BST 1998 Adam D. Moss <adam@gimp.org>
* plug-ins/animationplay/animationplay.c: Another
......
......@@ -412,6 +412,7 @@ brush_added_callback(GimpBrushList *list, GimpBrushP brush,
BrushSelectP bsp)
{
connect_signals_to_brush(brush, bsp);
preview_calc_scrollbar(bsp);
brush_select_brush_changed(bsp, brush);
}
......@@ -420,7 +421,7 @@ brush_removed_callback(GimpBrushList *list, GimpBrushP brush,
BrushSelectP bsp)
{
disconnect_signals_from_brush(brush, bsp);
/* brush_select_brush_changed(bsp, brush); */
preview_calc_scrollbar(bsp);
}
......
......@@ -113,6 +113,23 @@ gimp_brush_get_mask (GimpBrush *brush)
return brush->mask;
}
char *
gimp_brush_get_name (GimpBrush *brush)
{
g_return_val_if_fail(GIMP_IS_BRUSH(brush), NULL);
return brush->name;
}
void
gimp_brush_set_name (GimpBrush *brush, char *name)
{
g_return_val_if_fail(GIMP_IS_BRUSH(brush), NULL);
if (brush->name)
g_free(brush->name);
brush->name = g_strdup(name);
gtk_signal_emit(GTK_OBJECT(brush), gimp_brush_signals[RENAME]);
}
void
gimp_brush_load(GimpBrush *brush, char *filename)
{
......
......@@ -113,6 +113,23 @@ gimp_brush_get_mask (GimpBrush *brush)
return brush->mask;
}
char *
gimp_brush_get_name (GimpBrush *brush)
{
g_return_val_if_fail(GIMP_IS_BRUSH(brush), NULL);
return brush->name;
}
void
gimp_brush_set_name (GimpBrush *brush, char *name)
{
g_return_val_if_fail(GIMP_IS_BRUSH(brush), NULL);
if (brush->name)
g_free(brush->name);
brush->name = g_strdup(name);
gtk_signal_emit(GTK_OBJECT(brush), gimp_brush_signals[RENAME]);
}
void
gimp_brush_load(GimpBrush *brush, char *filename)
{
......
......@@ -51,5 +51,7 @@ GimpBrush * gimp_brush_new (char *filename);
void gimp_brush_load (GimpBrush *brush, char *filename);
GtkType gimp_brush_get_type (void);
TempBuf * gimp_brush_get_mask (GimpBrush *brush);
char * gimp_brush_get_name (GimpBrush *brush);
void gimp_brush_set_name (GimpBrush *brush, char *name);
#endif /* __GIMPBRUSH_H__ */
......@@ -113,6 +113,23 @@ gimp_brush_get_mask (GimpBrush *brush)
return brush->mask;
}
char *
gimp_brush_get_name (GimpBrush *brush)
{
g_return_val_if_fail(GIMP_IS_BRUSH(brush), NULL);
return brush->name;
}
void
gimp_brush_set_name (GimpBrush *brush, char *name)
{
g_return_val_if_fail(GIMP_IS_BRUSH(brush), NULL);
if (brush->name)
g_free(brush->name);
brush->name = g_strdup(name);
gtk_signal_emit(GTK_OBJECT(brush), gimp_brush_signals[RENAME]);
}
void
gimp_brush_load(GimpBrush *brush, char *filename)
{
......
......@@ -51,5 +51,7 @@ GimpBrush * gimp_brush_new (char *filename);
void gimp_brush_load (GimpBrush *brush, char *filename);
GtkType gimp_brush_get_type (void);
TempBuf * gimp_brush_get_mask (GimpBrush *brush);
char * gimp_brush_get_name (GimpBrush *brush);
void gimp_brush_set_name (GimpBrush *brush, char *name);
#endif /* __GIMPBRUSH_H__ */
......@@ -22,6 +22,7 @@
#include <dirent.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <math.h>
#include "appenv.h"
#include "gimpbrushgenerated.h"
#include "brush_header.h"
......@@ -63,7 +64,6 @@ static void create_default_brush (void);
static gint brush_compare_func (gconstpointer, gconstpointer);
static void gimp_brush_list_recalc_indexes(GimpBrushList *brush_list);
static void gimp_brush_list_uniquefy_names(GimpBrushList *brush_list);
static void brush_load (char *filename);
/* class functions */
......@@ -128,46 +128,6 @@ gimp_brush_list_new ()
return list;
}
void gimp_brush_list_uniquefy_names(GimpBrushList *blist)
{
GSList *list = GIMP_LIST(blist)->list;
GimpBrush * gb_start = NULL;
gint gb_count = 0;
while (list)
{
GimpBrush * gb = (GimpBrush *)list->data;
list = g_slist_next(list);
if(list) {
GimpBrush * gb2 = (GimpBrush *)list->data;
if(gb_start == NULL) {
gb_start = gb;
}
if(gb_start->name
&& gb2->name
&& (strcmp(gb_start->name,gb2->name) == 0)) {
gint b_digits = 2;
gint gb_tmp_cnt = gb_count++;
/* Alter gb2... */
g_free(gb2->name);
while((gb_tmp_cnt /= 10) > 0)
b_digits++;
/* name str + " #" + digits + null */
gb2->name = g_malloc(strlen(gb_start->name)+3+b_digits);
sprintf(gb2->name,"%s #%d",gb_start->name,gb_count);
}
else
{
gb_start = gb2;
gb_count = 0;
}
}
}
}
/* function declarations */
void
......@@ -187,7 +147,6 @@ brushes_init (int no_data)
datafiles_read_directories (brush_path,(datafile_loader_t)brush_load, 0);
gimp_brush_list_recalc_indexes(brush_list);
gimp_brush_list_uniquefy_names(brush_list);
}
static void
......@@ -303,17 +262,72 @@ gimp_brush_list_recalc_indexes(GimpBrushList *brush_list)
&index);
}
static void
gimp_brush_list_uniquefy_brush_name(GimpBrushList *brush_list,
GimpBrush *brush)
{
GSList *list;
GimpBrush *brushb;
int number = 1;
char *newname;
char *oldname;
char *ext;
g_return_if_fail(GIMP_IS_BRUSH_LIST(brush_list));
g_return_if_fail(GIMP_IS_BRUSH(brush));
list = GIMP_LIST(brush_list)->list;
while (list)
{
brushb = GIMP_BRUSH(list->data);
if (brush != brushb &&
strcmp(gimp_brush_get_name(brush), gimp_brush_get_name(brushb)) == 0)
{ /* names conflict */
oldname = gimp_brush_get_name(brush);
newname = g_malloc(strlen(oldname)+10); /* if this aint enough
yer screwed */
strcpy (newname, oldname);
if ((ext = strrchr(newname, '#')))
{
number = atoi(ext+1);
if (&ext[(int)(log10(number) + 1)] != &newname[strlen(newname) - 1])
{
number = 1;
ext = &newname[strlen(newname)];
}
}
else
{
number = 1;
ext = &newname[strlen(newname)];
}
sprintf(ext, "#%d", number+1);
gimp_brush_set_name(brush, newname);
g_free(newname);
return;
}
list = list->next;
}
}
static void brush_renamed(GimpBrush *brush, GimpBrushList *brush_list)
{
gimp_brush_list_uniquefy_brush_name(brush_list, brush);
}
void
gimp_brush_list_add (GimpBrushList *brush_list, GimpBrush * brush)
{
gimp_list_add(GIMP_LIST(brush_list), brush);
gtk_object_sink(GTK_OBJECT(brush));
gimp_brush_list_recalc_indexes(brush_list);
gtk_signal_connect(GTK_OBJECT(brush), "rename",
(GtkSignalFunc)brush_renamed, brush_list);
gimp_brush_list_recalc_indexes(brush_list); /* ugh */
gimp_brush_list_uniquefy_brush_name(brush_list, brush);
}
void
gimp_brush_list_remove (GimpBrushList *brush_list, GimpBrush * brush)
{
gtk_signal_disconnect_by_data(GTK_OBJECT(brush), brush_list);
gimp_list_remove(GIMP_LIST(brush_list), brush);
gimp_brush_list_recalc_indexes(brush_list);
}
......
......@@ -412,6 +412,7 @@ brush_added_callback(GimpBrushList *list, GimpBrushP brush,
BrushSelectP bsp)
{
connect_signals_to_brush(brush, bsp);
preview_calc_scrollbar(bsp);
brush_select_brush_changed(bsp, brush);
}
......@@ -420,7 +421,7 @@ brush_removed_callback(GimpBrushList *list, GimpBrushP brush,
BrushSelectP bsp)
{
disconnect_signals_from_brush(brush, bsp);
/* brush_select_brush_changed(bsp, brush); */
preview_calc_scrollbar(bsp);
}
......
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