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

removed the last artefact of context signal handling from 1.2: 

2004-01-29  Michael Natterer  <mitch@gimp.org>

	* app/core/gimpcontext.[ch]: removed the last artefact of context
	signal handling from 1.2:

	GimpContext used to connect to e.g. the current brush's
	"invalidate_preview" and "name_changed" signals and emitted
	"brush_changed" when the callback was invoked. This was needed to
	make 1.2 work, but is conceptually broken with the real model <->
	view approach implemented in the current code.
	This change also optimizes things quite a bit because lots of
	signal emissions are saved.

	Added utility function which finds a container's current object
	after a freeze/thaw.

	* app/widgets/gimpcontainerview.[ch]: added new virtual function
	GimpContainerView::rename_item(). Connect to "name_changed" of the
	corrent container's children and invoke rename_item() accordingly.

	* app/widgets/gimpcontainertreeview.[ch]: removed name_changed
	handler and implement GimpContainerView::rename_item().

	* app/widgets/gimpcontainergridview.c: ditto. the grid view was
	still relying on the removed GimpContext behaviour for updating
	the label showing the sleected item's name.
This commit is contained in:
Michael Natterer 2004-01-29 16:34:41 +00:00 committed by Michael Natterer
parent 44cac5ae91
commit c798f9678d
8 changed files with 278 additions and 312 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ChangeLog
View File

@ -1,3 +1,30 @@
2004-01-29 Michael Natterer <mitch@gimp.org>
* app/core/gimpcontext.[ch]: removed the last artefact of context
signal handling from 1.2:
GimpContext used to connect to e.g. the current brush's
"invalidate_preview" and "name_changed" signals and emitted
"brush_changed" when the callback was invoked. This was needed to
make 1.2 work, but is conceptually broken with the real model <->
view approach implemented in the current code.
This change also optimizes things quite a bit because lots of
signal emissions are saved.
Added utility function which finds a container's current object
after a freeze/thaw.
* app/widgets/gimpcontainerview.[ch]: added new virtual function
GimpContainerView::rename_item(). Connect to "name_changed" of the
corrent container's children and invoke rename_item() accordingly.
* app/widgets/gimpcontainertreeview.[ch]: removed name_changed
handler and implement GimpContainerView::rename_item().
* app/widgets/gimpcontainergridview.c: ditto. the grid view was
still relying on the removed GimpContext behaviour for updating
the label showing the sleected item's name.
2004-01-29 Michael Natterer <mitch@gimp.org>
GimpData code review:

362
app/core/gimpcontext.c
View File

@ -235,6 +235,13 @@ static void gimp_context_real_set_template (GimpContext *context,
GimpTemplate *template);
/* utilities */
static gpointer gimp_context_find_object (GimpContext *context,
GimpContainer *container,
const gchar *object_name,
gpointer standard_object);
/* properties & signals */
enum
@ -663,36 +670,41 @@ gimp_context_class_init (GimpContextClass *klass)
static void
gimp_context_init (GimpContext *context)
{
context->gimp = NULL;
context->gimp = NULL;
context->parent = NULL;
context->parent = NULL;
context->defined_props = GIMP_CONTEXT_ALL_PROPS_MASK;
context->defined_props = GIMP_CONTEXT_ALL_PROPS_MASK;
context->image = NULL;
context->display = NULL;
context->image = NULL;
context->display = NULL;
context->tool_info = NULL;
context->tool_name = NULL;
context->tool_info = NULL;
context->tool_name = NULL;
context->brush = NULL;
context->brush_name = NULL;
context->brush = NULL;
context->brush_name = NULL;
context->pattern = NULL;
context->pattern_name = NULL;
context->pattern = NULL;
context->pattern_name = NULL;
context->gradient = NULL;
context->gradient_name = NULL;
context->gradient = NULL;
context->gradient_name = NULL;
context->palette = NULL;
context->palette_name = NULL;
context->palette = NULL;
context->palette_name = NULL;
context->font = NULL;
context->font_name = NULL;
context->font = NULL;
context->font_name = NULL;
context->buffer = NULL;
context->imagefile = NULL;
context->template = NULL;
context->buffer = NULL;
context->buffer_name = NULL;
context->imagefile = NULL;
context->imagefile_name = NULL;
context->template = NULL;
context->template_name = NULL;
}
static void
@ -888,18 +900,33 @@ gimp_context_finalize (GObject *object)
g_object_unref (context->buffer);
context->buffer = NULL;
}
if (context->buffer_name)
{
g_free (context->buffer_name);
context->buffer_name = NULL;
}
if (context->imagefile)
{
g_object_unref (context->imagefile);
context->imagefile = NULL;
}
if (context->imagefile_name)
{
g_free (context->imagefile_name);
context->imagefile_name = NULL;
}
if (context->template)
{
g_object_unref (context->template);
context->template = NULL;
}
if (context->template_name)
{
g_free (context->template_name);
context->template_name = NULL;
}
G_OBJECT_CLASS (parent_class)->finalize (object);
}
@ -1064,6 +1091,15 @@ gimp_context_get_memsize (GimpObject *object,
if (context->font_name)
memsize += strlen (context->font_name) + 1;
if (context->buffer_name)
memsize += strlen (context->buffer_name) + 1;
if (context->imagefile_name)
memsize += strlen (context->imagefile_name) + 1;
if (context->template_name)
memsize += strlen (context->template_name) + 1;
return memsize + GIMP_OBJECT_CLASS (parent_class)->get_memsize (object,
gui_size);
}
@ -1495,7 +1531,7 @@ gimp_context_copy_property (GimpContext *src,
if (src_name && dest_name_loc)
{
if (! object || object == standard_object)
if (! object || (standard_object && object == standard_object))
{
g_free (*dest_name_loc);
*dest_name_loc = g_strdup (src_name);
@ -1781,9 +1817,6 @@ gimp_context_tool_dirty (GimpToolInfo *tool_info,
{
g_free (context->tool_name);
context->tool_name = g_strdup (GIMP_OBJECT (tool_info)->name);
g_object_notify (G_OBJECT (context), "tool");
gimp_context_tool_changed (context);
}
/* the global tool list is there again after refresh */
@ -1796,21 +1829,11 @@ gimp_context_tool_list_thaw (GimpContainer *container,
if (! context->tool_name)
context->tool_name = g_strdup ("gimp-rect-select-tool");
if ((tool_info = (GimpToolInfo *)
gimp_container_get_child_by_name (container,
context->tool_name)))
{
gimp_context_real_set_tool (context, tool_info);
return;
}
tool_info = gimp_context_find_object (context, container,
context->tool_name,
gimp_tool_info_get_standard (context->gimp));
if (gimp_container_num_children (container))
gimp_context_real_set_tool
(context,
GIMP_TOOL_INFO (gimp_container_get_child_by_index (container, 0)));
else
gimp_context_real_set_tool (context,
gimp_tool_info_get_standard (context->gimp));
gimp_context_real_set_tool (context, tool_info);
}
/* the active tool disappeared */
@ -1864,10 +1887,6 @@ gimp_context_real_set_tool (GimpContext *context,
{
g_object_ref (tool_info);
g_signal_connect_object (tool_info, "invalidate_preview",
G_CALLBACK (gimp_context_tool_dirty),
context,
0);
g_signal_connect_object (tool_info, "name_changed",
G_CALLBACK (gimp_context_tool_dirty),
context,
@ -2155,9 +2174,6 @@ gimp_context_brush_dirty (GimpBrush *brush,
{
g_free (context->brush_name);
context->brush_name = g_strdup (GIMP_OBJECT (brush)->name);
g_object_notify (G_OBJECT (context), "brush");
gimp_context_brush_changed (context);
}
/* the global brush list is there again after refresh */
@ -2170,20 +2186,11 @@ gimp_context_brush_list_thaw (GimpContainer *container,
if (! context->brush_name)
context->brush_name = g_strdup (context->gimp->config->default_brush);
if ((brush = (GimpBrush *)
gimp_container_get_child_by_name (container,
context->brush_name)))
{
gimp_context_real_set_brush (context, brush);
return;
}
brush = gimp_context_find_object (context, container,
context->brush_name,
gimp_brush_get_standard ());
if (gimp_container_num_children (container))
gimp_context_real_set_brush
(context, GIMP_BRUSH (gimp_container_get_child_by_index (container, 0)));
else
gimp_context_real_set_brush (context,
GIMP_BRUSH (gimp_brush_get_standard ()));
gimp_context_real_set_brush (context, brush);
}
/* the active brush disappeared */
@ -2254,10 +2261,6 @@ gimp_context_real_set_brush (GimpContext *context,
g_object_ref (brush);
g_signal_connect_object (brush, "invalidate_preview",
G_CALLBACK (gimp_context_brush_dirty),
context,
0);
g_signal_connect_object (brush, "name_changed",
G_CALLBACK (gimp_context_brush_dirty),
context,
@ -2318,9 +2321,6 @@ gimp_context_pattern_dirty (GimpPattern *pattern,
{
g_free (context->pattern_name);
context->pattern_name = g_strdup (GIMP_OBJECT (pattern)->name);
g_object_notify (G_OBJECT (context), "pattern");
gimp_context_pattern_changed (context);
}
/* the global pattern list is there again after refresh */
@ -2333,21 +2333,11 @@ gimp_context_pattern_list_thaw (GimpContainer *container,
if (! context->pattern_name)
context->pattern_name = g_strdup (context->gimp->config->default_pattern);
if ((pattern = (GimpPattern *)
gimp_container_get_child_by_name (container,
context->pattern_name)))
{
gimp_context_real_set_pattern (context, pattern);
return;
}
pattern = gimp_context_find_object (context, container,
context->pattern_name,
gimp_pattern_get_standard ());
if (gimp_container_num_children (container))
gimp_context_real_set_pattern
(context,
GIMP_PATTERN (gimp_container_get_child_by_index (container, 0)));
else
gimp_context_real_set_pattern (context,
GIMP_PATTERN (gimp_pattern_get_standard ()));
gimp_context_real_set_pattern (context, pattern);
}
/* the active pattern disappeared */
@ -2477,9 +2467,6 @@ gimp_context_gradient_dirty (GimpGradient *gradient,
{
g_free (context->gradient_name);
context->gradient_name = g_strdup (GIMP_OBJECT (gradient)->name);
g_object_notify (G_OBJECT (context), "gradient");
gimp_context_gradient_changed (context);
}
/* the global gradient list is there again after refresh */
@ -2492,21 +2479,11 @@ gimp_context_gradient_list_thaw (GimpContainer *container,
if (! context->gradient_name)
context->gradient_name = g_strdup (context->gimp->config->default_gradient);
if ((gradient = (GimpGradient *)
gimp_container_get_child_by_name (container,
context->gradient_name)))
{
gimp_context_real_set_gradient (context, gradient);
return;
}
gradient = gimp_context_find_object (context, container,
context->gradient_name,
gimp_gradient_get_standard ());
if (gimp_container_num_children (container))
gimp_context_real_set_gradient
(context,
GIMP_GRADIENT (gimp_container_get_child_by_index (container, 0)));
else
gimp_context_real_set_gradient (context,
GIMP_GRADIENT (gimp_gradient_get_standard ()));
gimp_context_real_set_gradient (context, gradient);
}
/* the active gradient disappeared */
@ -2612,12 +2589,9 @@ gimp_context_palette_dirty (GimpPalette *palette,
{
g_free (context->palette_name);
context->palette_name = g_strdup (GIMP_OBJECT (palette)->name);
g_object_notify (G_OBJECT (context), "palette");
gimp_context_palette_changed (context);
}
/* the global gradient list is there again after refresh */
/* the global palette list is there again after refresh */
static void
gimp_context_palette_list_thaw (GimpContainer *container,
GimpContext *context)
@ -2627,21 +2601,11 @@ gimp_context_palette_list_thaw (GimpContainer *container,
if (! context->palette_name)
context->palette_name = g_strdup (context->gimp->config->default_palette);
if ((palette = (GimpPalette *)
gimp_container_get_child_by_name (container,
context->palette_name)))
{
gimp_context_real_set_palette (context, palette);
return;
}
palette = gimp_context_find_object (context, container,
context->palette_name,
gimp_palette_get_standard ());
if (gimp_container_num_children (container))
gimp_context_real_set_palette
(context,
GIMP_PALETTE (gimp_container_get_child_by_index (container, 0)));
else
gimp_context_real_set_palette (context,
GIMP_PALETTE (gimp_palette_get_standard ()));
gimp_context_real_set_palette (context, palette);
}
/* the active palette disappeared */
@ -2747,9 +2711,6 @@ gimp_context_font_dirty (GimpFont *font,
{
g_free (context->font_name);
context->font_name = g_strdup (GIMP_OBJECT (font)->name);
g_object_notify (G_OBJECT (context), "font");
gimp_context_font_changed (context);
}
/* the global font list is there again after refresh */
@ -2762,21 +2723,11 @@ gimp_context_font_list_thaw (GimpContainer *container,
if (! context->font_name)
context->font_name = g_strdup (context->gimp->config->default_font);
if ((font = (GimpFont *)
gimp_container_get_child_by_name (container,
context->font_name)))
{
gimp_context_real_set_font (context, font);
return;
}
font = gimp_context_find_object (context, container,
context->font_name,
gimp_font_get_standard ());
if (gimp_container_num_children (container))
gimp_context_real_set_font
(context,
GIMP_FONT (gimp_container_get_child_by_index (container, 0)));
else
gimp_context_real_set_font (context,
GIMP_FONT (gimp_font_get_standard ()));
gimp_context_real_set_font (context, font);
}
/* the active font disappeared */
@ -2884,52 +2835,35 @@ static void
gimp_context_buffer_dirty (GimpBuffer *buffer,
GimpContext *context)
{
/*
g_free (context->buffer_name);
context->buffer_name = g_strdup (GIMP_OBJECT (buffer)->name);
*/
g_object_notify (G_OBJECT (context), "buffer");
gimp_context_buffer_changed (context);
}
/* the global gradient list is there again after refresh */
/* the global buffer list is there again after refresh */
static void
gimp_context_buffer_list_thaw (GimpContainer *container,
GimpContext *context)
{
/*
GimpBuffer *buffer;
/*
if (! context->buffer_name)
context->buffer_name = g_strdup (context->gimp->config->default_buffer);
*/
if ((buffer = (GimpBuffer *)
gimp_container_get_child_by_name (container,
context->buffer_name)))
buffer = gimp_context_find_object (context, container,
context->buffer_name,
NULL /* gimp_buffer_get_standard () */);
if (buffer)
{
gimp_context_real_set_buffer (context, buffer);
return;
}
*/
if (gimp_container_num_children (container))
{
gimp_context_real_set_buffer
(context,
GIMP_BUFFER (gimp_container_get_child_by_index (container, 0)));
}
else
{
g_object_notify (G_OBJECT (context), "buffer");
gimp_context_buffer_changed (context);
g_object_notify (G_OBJECT (context), "buffer");
gimp_context_buffer_changed (context);
}
/*
else
gimp_context_real_set_buffer (context,
GIMP_BUFFER (gimp_buffer_get_standard ()));
*/
}
/* the active buffer disappeared */
@ -2964,13 +2898,11 @@ gimp_context_real_set_buffer (GimpContext *context,
if (context->buffer == buffer)
return;
/*
if (context->buffer_name && buffer != standard_buffer)
if (context->buffer_name /* && buffer != standard_buffer */)
{
g_free (context->buffer_name);
context->buffer_name = NULL;
}
*/
/* disconnect from the old buffer's signals */
if (context->buffer)
@ -2994,8 +2926,8 @@ gimp_context_real_set_buffer (GimpContext *context,
/*
if (buffer != standard_buffer)
context->buffer_name = g_strdup (GIMP_OBJECT (buffer)->name);
*/
context->buffer_name = g_strdup (GIMP_OBJECT (buffer)->name);
}
g_object_notify (G_OBJECT (context), "buffer");
@ -3043,52 +2975,35 @@ static void
gimp_context_imagefile_dirty (GimpImagefile *imagefile,
GimpContext *context)
{
/*
g_free (context->imagefile_name);
context->imagefile_name = g_strdup (GIMP_OBJECT (imagefile)->name);
*/
g_object_notify (G_OBJECT (context), "imagefile");
gimp_context_imagefile_changed (context);
}
/* the global gradient list is there again after refresh */
/* the global imagefile list is there again after refresh */
static void
gimp_context_imagefile_list_thaw (GimpContainer *container,
GimpContext *context)
{
/*
GimpBuffer *imagefile;
GimpImagefile *imagefile;
/*
if (! context->imagefile_name)
context->imagefile_name = g_strdup (context->gimp->config->default_imagefile);
if ((imagefile = (GimpImagefile *)
gimp_container_get_child_by_name (container,
context->imagefile_name)))
{
gimp_context_real_set_imagefile (context, imagefile);
return;
}
*/
if (gimp_container_num_children (container))
imagefile = gimp_context_find_object (context, container,
context->imagefile_name,
NULL /* gimp_imagefile_get_standard () */);
if (imagefile)
{
gimp_context_real_set_imagefile
(context,
GIMP_IMAGEFILE (gimp_container_get_child_by_index (container, 0)));
gimp_context_real_set_imagefile (context, imagefile);
}
else
{
g_object_notify (G_OBJECT (context), "imagefile");
gimp_context_imagefile_changed (context);
}
/*
else
gimp_context_real_set_imagefile (context,
GIMP_IMAGEFILE (gimp_imagefile_get_standard ()));
*/
}
/* the active imagefile disappeared */
@ -3123,13 +3038,11 @@ gimp_context_real_set_imagefile (GimpContext *context,
if (context->imagefile == imagefile)
return;
/*
if (context->imagefile_name && imagefile != standard_imagefile)
if (context->imagefile_name /* && imagefile != standard_imagefile */)
{
g_free (context->imagefile_name);
context->imagefile_name = NULL;
}
*/
/* disconnect from the old imagefile's signals */
if (context->imagefile)
@ -3153,8 +3066,8 @@ gimp_context_real_set_imagefile (GimpContext *context,
/*
if (imagefile != standard_imagefile)
context->imagefile_name = g_strdup (GIMP_OBJECT (imagefile)->name);
*/
context->imagefile_name = g_strdup (GIMP_OBJECT (imagefile)->name);
}
g_object_notify (G_OBJECT (context), "imagefile");
@ -3202,52 +3115,35 @@ static void
gimp_context_template_dirty (GimpTemplate *template,
GimpContext *context)
{
/*
g_free (context->template_name);
context->template_name = g_strdup (GIMP_OBJECT (template)->name);
*/
g_object_notify (G_OBJECT (context), "template");
gimp_context_template_changed (context);
}
/* the global gradient list is there again after refresh */
/* the global template list is there again after refresh */
static void
gimp_context_template_list_thaw (GimpContainer *container,
GimpContext *context)
{
/*
GimpBuffer *template;
GimpTemplate *template;
/*
if (! context->template_name)
context->template_name = g_strdup (context->gimp->config->default_template);
if ((template = (GimpTemplate *)
gimp_container_get_child_by_name (container,
context->template_name)))
{
gimp_context_real_set_template (context, template);
return;
}
*/
if (gimp_container_num_children (container))
template = gimp_context_find_object (context, container,
context->template_name,
NULL /* gimp_template_get_standard () */);
if (template)
{
gimp_context_real_set_template
(context,
GIMP_TEMPLATE (gimp_container_get_child_by_index (container, 0)));
gimp_context_real_set_template (context, template);
}
else
{
g_object_notify (G_OBJECT (context), "template");
gimp_context_template_changed (context);
}
/*
else
gimp_context_real_set_template (context,
GIMP_TEMPLATE (gimp_template_get_standard ()));
*/
}
/* the active template disappeared */
@ -3282,13 +3178,11 @@ gimp_context_real_set_template (GimpContext *context,
if (context->template == template)
return;
/*
if (context->template_name && template != standard_template)
if (context->template_name /* && template != standard_template */)
{
g_free (context->template_name);
context->template_name = NULL;
}
*/
/* disconnect from the old template's signals */
if (context->template)
@ -3312,10 +3206,34 @@ gimp_context_real_set_template (GimpContext *context,
/*
if (template != standard_template)
context->template_name = g_strdup (GIMP_OBJECT (template)->name);
*/
context->template_name = g_strdup (GIMP_OBJECT (template)->name);
}
g_object_notify (G_OBJECT (context), "template");
gimp_context_template_changed (context);
}
/*****************************************************************************/
/* utility functions *******************************************************/
static gpointer
gimp_context_find_object (GimpContext *context,
GimpContainer *container,
const gchar *object_name,
gpointer standard_object)
{
GimpObject *object = NULL;
if (object_name)
object = gimp_container_get_child_by_name (container, object_name);
if (! object && gimp_container_num_children (container) > 0)
object = gimp_container_get_child_by_index (container, 0);
if (! object)
object = standard_object;
return object;
}

5
app/core/gimpcontext.h
View File

@ -74,8 +74,13 @@ struct _GimpContext
gchar *font_name;
GimpBuffer *buffer;
gchar *buffer_name;
GimpImagefile *imagefile;
gchar *imagefile_name;
GimpTemplate *template;
gchar *template_name;
};
struct _GimpContextClass

87
app/widgets/gimpcontainergridview.c
View File

@ -72,6 +72,9 @@ static void gimp_container_grid_view_reorder_item (GimpContainerView *v
GimpViewable *viewable,
gint new_index,
gpointer insert_data);
static void gimp_container_grid_view_rename_item (GimpContainerView *view,
GimpViewable *viewable,
gpointer insert_data);
static gboolean gimp_container_grid_view_select_item (GimpContainerView *view,
GimpViewable *viewable,
gpointer insert_data);
@ -94,6 +97,7 @@ static void gimp_container_grid_view_viewport_resized (GtkWidget *w
static GimpContainerViewClass *parent_class = NULL;
static guint grid_view_signals[LAST_SIGNAL] = { 0 };
static GimpRGB white_color;
@ -147,6 +151,7 @@ gimp_container_grid_view_class_init (GimpContainerGridViewClass *klass)
container_view_class->insert_item = gimp_container_grid_view_insert_item;
container_view_class->remove_item = gimp_container_grid_view_remove_item;
container_view_class->reorder_item = gimp_container_grid_view_reorder_item;
container_view_class->rename_item = gimp_container_grid_view_rename_item;
container_view_class->select_item = gimp_container_grid_view_select_item;
container_view_class->clear_items = gimp_container_grid_view_clear_items;
container_view_class->set_preview_size = gimp_container_grid_view_set_preview_size;
@ -188,9 +193,7 @@ gimp_container_grid_view_class_init (GimpContainerGridViewClass *klass)
static void
gimp_container_grid_view_init (GimpContainerGridView *grid_view)
{
GimpContainerView *view;
view = GIMP_CONTAINER_VIEW (grid_view);
GimpContainerView *view = GIMP_CONTAINER_VIEW (grid_view);
grid_view->rows = 1;
grid_view->columns = 1;
@ -320,7 +323,7 @@ static gboolean
gimp_container_grid_view_focus (GtkWidget *widget,
GtkDirectionType direction)
{
GimpContainerGridView *view;
GimpContainerGridView *view = GIMP_CONTAINER_GRID_VIEW (widget);
if (GTK_WIDGET_CAN_FOCUS (widget) && !GTK_WIDGET_HAS_FOCUS (widget))
{
@ -328,8 +331,6 @@ gimp_container_grid_view_focus (GtkWidget *widget,
return TRUE;
}
view = GIMP_CONTAINER_GRID_VIEW (widget);
switch (direction)
{
case GTK_DIR_UP:
@ -374,11 +375,8 @@ gimp_container_grid_view_menu_position (GtkMenu *menu,
static gboolean
gimp_container_grid_view_popup_menu (GtkWidget *widget)
{
GimpContainerGridView *grid_view;
GimpEditor *editor;
grid_view = GIMP_CONTAINER_GRID_VIEW (widget);
editor = GIMP_EDITOR (widget);
GimpContainerGridView *grid_view = GIMP_CONTAINER_GRID_VIEW (widget);
GimpEditor *editor = GIMP_EDITOR (widget);
if (editor->item_factory && grid_view->selected_item)
{
@ -399,11 +397,9 @@ gimp_container_grid_view_insert_item (GimpContainerView *view,
GimpViewable *viewable,
gint index)
{
GimpContainerGridView *grid_view;
GimpContainerGridView *grid_view = GIMP_CONTAINER_GRID_VIEW (view);
GtkWidget *preview;
grid_view = GIMP_CONTAINER_GRID_VIEW (view);
preview = gimp_preview_new_full (viewable,
view->preview_size,
view->preview_size,
@ -440,19 +436,13 @@ gimp_container_grid_view_remove_item (GimpContainerView *view,
GimpViewable *viewable,
gpointer insert_data)
{
GimpContainerGridView *grid_view;
GtkWidget *preview;
GimpContainerGridView *grid_view = GIMP_CONTAINER_GRID_VIEW (view);
GtkWidget *preview = GTK_WIDGET (insert_data);
grid_view = GIMP_CONTAINER_GRID_VIEW (view);
preview = GTK_WIDGET (insert_data);
if (preview == (GtkWidget *) grid_view->selected_item)
grid_view->selected_item = NULL;
if (preview)
{
if (preview == (GtkWidget *) grid_view->selected_item)
grid_view->selected_item = NULL;
gtk_container_remove (GTK_CONTAINER (grid_view->wrap_box), preview);
}
gtk_container_remove (GTK_CONTAINER (grid_view->wrap_box), preview);
}
static void
@ -461,16 +451,31 @@ gimp_container_grid_view_reorder_item (GimpContainerView *view,
gint new_index,
gpointer insert_data)
{
GimpContainerGridView *grid_view;
GtkWidget *preview;
grid_view = GIMP_CONTAINER_GRID_VIEW (view);
preview = GTK_WIDGET (insert_data);
GimpContainerGridView *grid_view = GIMP_CONTAINER_GRID_VIEW (view);
GtkWidget *preview = GTK_WIDGET (insert_data);
gtk_wrap_box_reorder_child (GTK_WRAP_BOX (grid_view->wrap_box),
preview, new_index);
}
static void
gimp_container_grid_view_rename_item (GimpContainerView *view,
GimpViewable *viewable,
gpointer insert_data)
{
GimpContainerGridView *grid_view = GIMP_CONTAINER_GRID_VIEW (view);
GtkWidget *preview = GTK_WIDGET (insert_data);
if (preview == (GtkWidget *) grid_view->selected_item)
{
gchar *name = gimp_viewable_get_description (viewable, NULL);
gtk_label_set_text (GTK_LABEL (grid_view->name_label), name);
g_free (name);
}
}
static gboolean
gimp_container_grid_view_select_item (GimpContainerView *view,
GimpViewable *viewable,
@ -484,9 +489,7 @@ gimp_container_grid_view_select_item (GimpContainerView *view,
static void
gimp_container_grid_view_clear_items (GimpContainerView *view)
{
GimpContainerGridView *grid_view;
grid_view = GIMP_CONTAINER_GRID_VIEW (view);
GimpContainerGridView *grid_view = GIMP_CONTAINER_GRID_VIEW (view);
grid_view->selected_item = NULL;
@ -500,11 +503,9 @@ gimp_container_grid_view_clear_items (GimpContainerView *view)
static void
gimp_container_grid_view_set_preview_size (GimpContainerView *view)
{
GimpContainerGridView *grid_view;
GimpContainerGridView *grid_view = GIMP_CONTAINER_GRID_VIEW (view);
GtkWrapBoxChild *child;
grid_view = GIMP_CONTAINER_GRID_VIEW (view);
for (child = GTK_WRAP_BOX (grid_view->wrap_box)->children;
child;
child = child->next)
@ -561,10 +562,8 @@ gimp_container_grid_view_highlight_item (GimpContainerView *view,
GimpViewable *viewable,
gpointer insert_data)
{
GimpContainerGridView *grid_view;
GimpPreview *preview = NULL;
grid_view = GIMP_CONTAINER_GRID_VIEW (view);
GimpContainerGridView *grid_view = GIMP_CONTAINER_GRID_VIEW (view);
GimpPreview *preview = NULL;
if (insert_data)
preview = GIMP_PREVIEW (insert_data);
@ -627,9 +626,7 @@ gimp_container_grid_view_viewport_resized (GtkWidget *widget,
GtkAllocation *allocation,
GimpContainerGridView *grid_view)
{
GimpContainerView *view;
view = GIMP_CONTAINER_VIEW (grid_view);
GimpContainerView *view = GIMP_CONTAINER_VIEW (grid_view);
if (view->container)
{
@ -674,9 +671,7 @@ gimp_container_grid_view_viewport_resized (GtkWidget *widget,
if (grid_view->selected_item)
{
GimpPreview *preview;
preview = grid_view->selected_item;
GimpPreview *preview = grid_view->selected_item;
gimp_container_grid_view_highlight_item (view,
preview->viewable,

69
app/widgets/gimpcontainertreeview.c
View File

@ -75,6 +75,9 @@ static void gimp_container_tree_view_reorder_item (GimpContainerView *v
GimpViewable *viewable,
gint new_index,
gpointer insert_data);
static void gimp_container_tree_view_rename_item (GimpContainerView *view,
GimpViewable *viewable,
gpointer insert_data);
static gboolean gimp_container_tree_view_select_item (GimpContainerView *view,
GimpViewable *viewable,
gpointer insert_data);
@ -88,8 +91,6 @@ static gboolean gimp_container_tree_view_button_press (GtkWidget *w
GimpContainerTreeView *tree_view);
static void gimp_container_tree_view_renderer_update (GimpPreviewRenderer *renderer,
GimpContainerTreeView *tree_view);
static void gimp_container_tree_view_name_changed (GimpObject *object,
GimpContainerTreeView *tree_view);
static GimpViewable * gimp_container_tree_view_drag_viewable (GtkWidget *widget,
gpointer data);
@ -149,6 +150,7 @@ gimp_container_tree_view_class_init (GimpContainerTreeViewClass *klass)
container_view_class->insert_item = gimp_container_tree_view_insert_item;
container_view_class->remove_item = gimp_container_tree_view_remove_item;
container_view_class->reorder_item = gimp_container_tree_view_reorder_item;
container_view_class->rename_item = gimp_container_tree_view_rename_item;
container_view_class->select_item = gimp_container_tree_view_select_item;
container_view_class->clear_items = gimp_container_tree_view_clear_items;
container_view_class->set_preview_size = gimp_container_tree_view_set_preview_size;
@ -437,9 +439,6 @@ gimp_container_tree_view_set_container (GimpContainerView *view,
if (view->container)
{
gimp_container_remove_handler (view->container,
tree_view->name_changed_handler_id);
if (! container)
{
if (gimp_dnd_viewable_source_remove (GTK_WIDGET (tree_view->view),
@ -475,21 +474,6 @@ gimp_container_tree_view_set_container (GimpContainerView *view,
}
GIMP_CONTAINER_VIEW_CLASS (parent_class)->set_container (view, container);
if (view->container)
{
GimpViewableClass *viewable_class;
viewable_class = g_type_class_ref (container->children_type);
tree_view->name_changed_handler_id =
gimp_container_add_handler (view->container,
viewable_class->name_changed_signal,
G_CALLBACK (gimp_container_tree_view_name_changed),
tree_view);
g_type_class_unref (viewable_class);
}
}
static gpointer
@ -599,6 +583,28 @@ gimp_container_tree_view_reorder_item (GimpContainerView *view,
}
}
static void
gimp_container_tree_view_rename_item (GimpContainerView *view,
GimpViewable *viewable,
gpointer insert_data)
{
GimpContainerTreeView *tree_view = GIMP_CONTAINER_TREE_VIEW (view);
GtkTreeIter *iter;
iter = (GtkTreeIter *) insert_data;
if (iter)
{
gchar *name = gimp_viewable_get_description (viewable, NULL);
gtk_list_store_set (GTK_LIST_STORE (tree_view->model), iter,
COLUMN_NAME, name,
-1);
g_free (name);
}
}
static gboolean
gimp_container_tree_view_select_item (GimpContainerView *view,
GimpViewable *viewable,
@ -970,29 +976,6 @@ gimp_container_tree_view_renderer_update (GimpPreviewRenderer *renderer,
}
}
static void
gimp_container_tree_view_name_changed (GimpObject *object,
GimpContainerTreeView *tree_view)
{
GimpContainerView *view = GIMP_CONTAINER_VIEW (tree_view);
GtkTreeIter *iter;
iter = g_hash_table_lookup (view->hash_table, object);
if (iter)
{
gchar *name;
name = gimp_viewable_get_description (GIMP_VIEWABLE (object), NULL);
gtk_list_store_set (GTK_LIST_STORE (tree_view->model), iter,
COLUMN_NAME, name,
-1);
g_free (name);
}
}
static GimpViewable *
gimp_container_tree_view_drag_viewable (GtkWidget *widget,
gpointer data)

1
app/widgets/gimpcontainertreeview.h
View File

@ -60,7 +60,6 @@ struct _GimpContainerTreeView
GList *editable_cells;
GQuark invalidate_preview_handler_id;
GQuark name_changed_handler_id;
GimpViewable *dnd_viewable;

34
app/widgets/gimpcontainerview.c
View File

@ -97,6 +97,8 @@ static void gimp_container_view_freeze (GimpContainerView *view,
GimpContainer *container);
static void gimp_container_view_thaw (GimpContainerView *view,
GimpContainer *container);
static void gimp_container_view_name_changed (GimpViewable *viewable,
GimpContainerView *view);
static GtkWidget * gimp_container_view_get_preview (GimpDocked *docked,
GimpContext *context,
@ -215,6 +217,7 @@ gimp_container_view_class_init (GimpContainerViewClass *klass)
klass->insert_item = NULL;
klass->remove_item = NULL;
klass->reorder_item = NULL;
klass->rename_item = NULL;
klass->clear_items = gimp_container_view_real_clear_items;
klass->set_preview_size = NULL;
@ -352,6 +355,9 @@ gimp_container_view_real_set_container (GimpContainerView *view,
gimp_container_view_select_item (view, NULL);
gimp_container_view_clear_items (view);
gimp_container_remove_handler (view->container,
view->name_changed_handler_id);
g_signal_handlers_disconnect_by_func (view->container,
gimp_container_view_add,
view);
@ -395,10 +401,22 @@ gimp_container_view_real_set_container (GimpContainerView *view,
if (view->container)
{
GimpViewableClass *viewable_class;
viewable_class = g_type_class_ref (container->children_type);
gimp_container_foreach (view->container,
(GFunc) gimp_container_view_add_foreach,
view);
view->name_changed_handler_id =
gimp_container_add_handler (view->container,
viewable_class->name_changed_signal,
G_CALLBACK (gimp_container_view_name_changed),
view);
g_type_class_unref (viewable_class);
g_signal_connect_object (view->container, "add",
G_CALLBACK (gimp_container_view_add),
view,
@ -850,6 +868,22 @@ gimp_container_view_thaw (GimpContainerView *view,
}
}
static void
gimp_container_view_name_changed (GimpViewable *viewable,
GimpContainerView *view)
{
gpointer insert_data;
insert_data = g_hash_table_lookup (view->hash_table, viewable);
if (insert_data)
{
GIMP_CONTAINER_VIEW_GET_CLASS (view)->rename_item (view,
viewable,
insert_data);
}
}
static void
gimp_container_view_set_docked_context (GimpDocked *docked,
GimpContext *context,

5
app/widgets/gimpcontainerview.h
View File

@ -53,6 +53,8 @@ struct _GimpContainerView
/* initialized by subclass */
GtkWidget *dnd_widget;
GQuark name_changed_handler_id;
};
struct _GimpContainerViewClass
@ -83,6 +85,9 @@ struct _GimpContainerViewClass
GimpViewable *object,
gint new_index,
gpointer insert_data);
void (* rename_item) (GimpContainerView *view,
GimpViewable *object,
gpointer insert_data);
void (* clear_items) (GimpContainerView *view);
void (* set_preview_size) (GimpContainerView *view);