gimp r27827 - in trunk: . app/actions app/widgets
- From: martinn svn gnome org
- To: svn-commits-list gnome org
- Subject: gimp r27827 - in trunk: . app/actions app/widgets
- Date: Thu, 25 Dec 2008 11:31:51 +0000 (UTC)
Author: martinn
Date: Thu Dec 25 11:31:51 2008
New Revision: 27827
URL: http://svn.gnome.org/viewvc/gimp?rev=27827&view=rev
Log:
* app/widgets/gimpitemtreeview.[ch]: Make instance member private
and add getter that didn't already exist.
(gimp_item_tree_view_get_new_button)
(gimp_item_tree_view_get_edit_button): New getters.
* app/actions/actions.c
* app/widgets/gimpvectorstreeview.c
* app/widgets/gimplayertreeview.c
* app/widgets/gimpdrawabletreeview.c
* app/widgets/gimpchanneltreeview.c: Use new getters.
Modified:
trunk/ChangeLog
trunk/app/actions/actions.c
trunk/app/widgets/gimpchanneltreeview.c
trunk/app/widgets/gimpdrawabletreeview.c
trunk/app/widgets/gimpitemtreeview.c
trunk/app/widgets/gimpitemtreeview.h
trunk/app/widgets/gimplayertreeview.c
trunk/app/widgets/gimpvectorstreeview.c
Modified: trunk/app/actions/actions.c
==============================================================================
--- trunk/app/actions/actions.c (original)
+++ trunk/app/actions/actions.c Thu Dec 25 11:31:51 2008
@@ -324,7 +324,7 @@
else if (GIMP_IS_DOCK (data))
context = ((GimpDock *) data)->context;
else if (GIMP_IS_ITEM_TREE_VIEW (data))
- return ((GimpItemTreeView *) data)->image;
+ return gimp_item_tree_view_get_image ((GimpItemTreeView *) data);
else if (GIMP_IS_IMAGE_EDITOR (data))
return ((GimpImageEditor *) data)->image;
else if (GIMP_IS_NAVIGATION_EDITOR (data))
Modified: trunk/app/widgets/gimpchanneltreeview.c
==============================================================================
--- trunk/app/widgets/gimpchanneltreeview.c (original)
+++ trunk/app/widgets/gimpchanneltreeview.c Thu Dec 25 11:31:51 2008
@@ -191,7 +191,7 @@
item_view_class = GIMP_ITEM_TREE_VIEW_GET_CLASS (item_view);
if (GIMP_IS_DRAWABLE (src_viewable) &&
- (item_view->image != gimp_item_get_image (GIMP_ITEM (src_viewable)) ||
+ (gimp_item_tree_view_get_image (item_view) != gimp_item_get_image (GIMP_ITEM (src_viewable)) ||
G_TYPE_FROM_INSTANCE (src_viewable) != item_view_class->item_type))
{
GimpItem *new_item;
@@ -199,7 +199,7 @@
if (dest_viewable)
{
- index = gimp_image_get_channel_index (item_view->image,
+ index = gimp_image_get_channel_index (gimp_item_tree_view_get_image (item_view),
GIMP_CHANNEL (dest_viewable));
if (drop_pos == GTK_TREE_VIEW_DROP_AFTER)
@@ -207,13 +207,13 @@
}
new_item = gimp_item_convert (GIMP_ITEM (src_viewable),
- item_view->image,
+ gimp_item_tree_view_get_image (item_view),
item_view_class->item_type);
gimp_item_set_linked (new_item, FALSE, FALSE);
- item_view_class->add_item (item_view->image, new_item, index, TRUE);
- gimp_image_flush (item_view->image);
+ item_view_class->add_item (gimp_item_tree_view_get_image (item_view), new_item, index, TRUE);
+ gimp_image_flush (gimp_item_tree_view_get_image (item_view));
return;
}
@@ -238,7 +238,7 @@
if (dest_viewable)
{
- index = gimp_image_get_channel_index (item_view->image,
+ index = gimp_image_get_channel_index (gimp_item_tree_view_get_image (item_view),
GIMP_CHANNEL (dest_viewable));
if (drop_pos == GTK_TREE_VIEW_DROP_AFTER)
@@ -259,12 +259,12 @@
g_free (name);
- if (src_image != item_view->image)
- GIMP_ITEM_GET_CLASS (new_item)->convert (new_item, item_view->image);
+ if (src_image != gimp_item_tree_view_get_image (item_view))
+ GIMP_ITEM_GET_CLASS (new_item)->convert (new_item, gimp_item_tree_view_get_image (item_view));
- gimp_image_add_channel (item_view->image, GIMP_CHANNEL (new_item), index,
+ gimp_image_add_channel (gimp_item_tree_view_get_image (item_view), GIMP_CHANNEL (new_item), index,
TRUE);
- gimp_image_flush (item_view->image);
+ gimp_image_flush (gimp_item_tree_view_get_image (item_view));
}
@@ -302,7 +302,7 @@
GIMP_ITEM_TREE_VIEW_CLASS (parent_class)->set_image (item_view, image);
- if (item_view->image)
+ if (gimp_item_tree_view_get_image (item_view))
gtk_widget_show (channel_view->component_editor);
}
Modified: trunk/app/widgets/gimpdrawabletreeview.c
==============================================================================
--- trunk/app/widgets/gimpdrawabletreeview.c (original)
+++ trunk/app/widgets/gimpdrawabletreeview.c Thu Dec 25 11:31:51 2008
@@ -146,10 +146,10 @@
tree_view = GIMP_CONTAINER_TREE_VIEW (object);
item_view = GIMP_ITEM_TREE_VIEW (object);
- gimp_dnd_viewable_dest_add (item_view->new_button, GIMP_TYPE_PATTERN,
+ gimp_dnd_viewable_dest_add (gimp_item_tree_view_get_new_button (item_view), GIMP_TYPE_PATTERN,
gimp_drawable_tree_view_new_pattern_dropped,
item_view);
- gimp_dnd_color_dest_add (item_view->new_button,
+ gimp_dnd_color_dest_add (gimp_item_tree_view_get_new_button (item_view),
gimp_drawable_tree_view_new_color_dropped,
item_view);
@@ -172,10 +172,10 @@
GimpItemTreeView *item_view = GIMP_ITEM_TREE_VIEW (view);
gboolean success = TRUE;
- if (item_view->image)
+ if (gimp_item_tree_view_get_image (item_view))
{
GimpLayer *floating_sel =
- gimp_image_get_floating_selection (item_view->image);
+ gimp_image_get_floating_selection (gimp_item_tree_view_get_image (item_view));
success = (item == NULL ||
floating_sel == NULL ||
@@ -246,7 +246,7 @@
0.0, FALSE, /* fill params */
0.0, 0.0, /* ignored */
NULL, GIMP_PATTERN (src_viewable));
- gimp_image_flush (GIMP_ITEM_TREE_VIEW (view)->image);
+ gimp_image_flush (gimp_item_tree_view_get_image (GIMP_ITEM_TREE_VIEW (view)));
return;
}
@@ -273,7 +273,7 @@
0.0, FALSE, /* fill params */
0.0, 0.0, /* ignored */
color, NULL);
- gimp_image_flush (GIMP_ITEM_TREE_VIEW (view)->image);
+ gimp_image_flush (gimp_item_tree_view_get_image (GIMP_ITEM_TREE_VIEW (view)));
}
}
@@ -284,15 +284,15 @@
gimp_drawable_tree_view_set_image (GimpItemTreeView *view,
GimpImage *image)
{
- if (view->image)
- g_signal_handlers_disconnect_by_func (view->image,
+ if (gimp_item_tree_view_get_image (view))
+ g_signal_handlers_disconnect_by_func (gimp_item_tree_view_get_image (view),
gimp_drawable_tree_view_floating_selection_changed,
view);
GIMP_ITEM_TREE_VIEW_CLASS (parent_class)->set_image (view, image);
- if (view->image)
- g_signal_connect (view->image,
+ if (gimp_item_tree_view_get_image (view))
+ g_signal_connect (gimp_item_tree_view_get_image (view),
"floating-selection-changed",
G_CALLBACK (gimp_drawable_tree_view_floating_selection_changed),
view);
@@ -324,16 +324,16 @@
{
GimpItem *item;
- gimp_image_undo_group_start (view->image, GIMP_UNDO_GROUP_EDIT_PASTE,
+ gimp_image_undo_group_start (gimp_item_tree_view_get_image (view), GIMP_UNDO_GROUP_EDIT_PASTE,
_("New Layer"));
- item = GIMP_ITEM_TREE_VIEW_GET_CLASS (view)->new_item (view->image);
+ item = GIMP_ITEM_TREE_VIEW_GET_CLASS (view)->new_item (gimp_item_tree_view_get_image (view));
if (item)
{
/* Get the bucket fill context */
GimpContext *context;
- GimpToolInfo *tool_info = gimp_get_tool_info (view->image->gimp,
+ GimpToolInfo *tool_info = gimp_get_tool_info (gimp_item_tree_view_get_image (view)->gimp,
"gimp-bucket-fill-tool");
if (tool_info && tool_info->tool_options)
@@ -352,9 +352,9 @@
color, pattern);
}
- gimp_image_undo_group_end (view->image);
+ gimp_image_undo_group_end (gimp_item_tree_view_get_image (view));
- gimp_image_flush (view->image);
+ gimp_image_flush (gimp_item_tree_view_get_image (view));
}
static void
Modified: trunk/app/widgets/gimpitemtreeview.c
==============================================================================
--- trunk/app/widgets/gimpitemtreeview.c (original)
+++ trunk/app/widgets/gimpitemtreeview.c Thu Dec 25 11:31:51 2008
@@ -64,6 +64,27 @@
};
+struct _GimpItemTreeViewPriv
+{
+ GimpImage *image;
+
+ GtkWidget *edit_button;
+ GtkWidget *new_button;
+ GtkWidget *raise_button;
+ GtkWidget *lower_button;
+ GtkWidget *duplicate_button;
+ GtkWidget *delete_button;
+
+ gint model_column_visible;
+ gint model_column_linked;
+ GtkCellRenderer *eye_cell;
+ GtkCellRenderer *chain_cell;
+
+ GQuark visible_changed_handler_id;
+ GQuark linked_changed_handler_id;
+};
+
+
static void gimp_item_tree_view_view_iface_init (GimpContainerViewInterface *view_iface);
static void gimp_item_tree_view_docked_iface_init (GimpDockedInterface *docked_iface);
@@ -214,6 +235,8 @@
klass->duplicate_action = NULL;
klass->delete_action = NULL;
klass->reorder_desc = NULL;
+
+ g_type_class_add_private (klass, sizeof (GimpItemTreeViewPriv));
}
static void
@@ -240,6 +263,10 @@
{
GimpContainerTreeView *tree_view = GIMP_CONTAINER_TREE_VIEW (view);
+ view->priv = G_TYPE_INSTANCE_GET_PRIVATE (view,
+ GIMP_TYPE_ITEM_TREE_VIEW,
+ GimpItemTreeViewPriv);
+
/* The following used to read:
*
* tree_view->model_columns[tree_view->n_model_columns++] = ...
@@ -249,20 +276,20 @@
* value, probably due to bad instruction reordering). See bug #113144 for
* more info.
*/
- view->model_column_visible = tree_view->n_model_columns;
+ view->priv->model_column_visible = tree_view->n_model_columns;
tree_view->model_columns[tree_view->n_model_columns] = G_TYPE_BOOLEAN;
tree_view->n_model_columns++;
- view->model_column_linked = tree_view->n_model_columns;
+ view->priv->model_column_linked = tree_view->n_model_columns;
tree_view->model_columns[tree_view->n_model_columns] = G_TYPE_BOOLEAN;
tree_view->n_model_columns++;
gimp_container_tree_view_set_dnd_drop_to_empty (tree_view, TRUE);
- view->image = NULL;
+ view->priv->image = NULL;
- view->visible_changed_handler_id = 0;
- view->linked_changed_handler_id = 0;
+ view->priv->visible_changed_handler_id = 0;
+ view->priv->linked_changed_handler_id = 0;
}
static GObject *
@@ -291,34 +318,34 @@
column = gtk_tree_view_column_new ();
gtk_tree_view_insert_column (tree_view->view, column, 0);
- item_view->eye_cell = gimp_cell_renderer_toggle_new (GIMP_STOCK_VISIBLE);
- gtk_tree_view_column_pack_start (column, item_view->eye_cell, FALSE);
- gtk_tree_view_column_set_attributes (column, item_view->eye_cell,
+ item_view->priv->eye_cell = gimp_cell_renderer_toggle_new (GIMP_STOCK_VISIBLE);
+ gtk_tree_view_column_pack_start (column, item_view->priv->eye_cell, FALSE);
+ gtk_tree_view_column_set_attributes (column, item_view->priv->eye_cell,
"active",
- item_view->model_column_visible,
+ item_view->priv->model_column_visible,
NULL);
gimp_container_tree_view_prepend_toggle_cell_renderer (tree_view,
- item_view->eye_cell);
+ item_view->priv->eye_cell);
- g_signal_connect (item_view->eye_cell, "clicked",
+ g_signal_connect (item_view->priv->eye_cell, "clicked",
G_CALLBACK (gimp_item_tree_view_eye_clicked),
item_view);
column = gtk_tree_view_column_new ();
gtk_tree_view_insert_column (tree_view->view, column, 1);
- item_view->chain_cell = gimp_cell_renderer_toggle_new (GIMP_STOCK_LINKED);
- gtk_tree_view_column_pack_start (column, item_view->chain_cell, FALSE);
- gtk_tree_view_column_set_attributes (column, item_view->chain_cell,
+ item_view->priv->chain_cell = gimp_cell_renderer_toggle_new (GIMP_STOCK_LINKED);
+ gtk_tree_view_column_pack_start (column, item_view->priv->chain_cell, FALSE);
+ gtk_tree_view_column_set_attributes (column, item_view->priv->chain_cell,
"active",
- item_view->model_column_linked,
+ item_view->priv->model_column_linked,
NULL);
gimp_container_tree_view_prepend_toggle_cell_renderer (tree_view,
- item_view->chain_cell);
+ item_view->priv->chain_cell);
- g_signal_connect (item_view->chain_cell, "clicked",
+ g_signal_connect (item_view->priv->chain_cell, "clicked",
G_CALLBACK (gimp_item_tree_view_chain_clicked),
item_view);
@@ -330,14 +357,14 @@
item_view_class->item_type,
GDK_ACTION_MOVE | GDK_ACTION_COPY);
- item_view->edit_button =
+ item_view->priv->edit_button =
gimp_editor_add_action_button (editor, item_view_class->action_group,
item_view_class->edit_action, NULL);
gimp_container_view_enable_dnd (GIMP_CONTAINER_VIEW (item_view),
- GTK_BUTTON (item_view->edit_button),
+ GTK_BUTTON (item_view->priv->edit_button),
item_view_class->item_type);
- item_view->new_button =
+ item_view->priv->new_button =
gimp_editor_add_action_button (editor, item_view_class->action_group,
item_view_class->new_action,
item_view_class->new_default_action,
@@ -346,37 +373,37 @@
/* connect "drop to new" manually as it makes a difference whether
* it was clicked or dropped
*/
- gimp_dnd_viewable_dest_add (item_view->new_button,
+ gimp_dnd_viewable_dest_add (item_view->priv->new_button,
item_view_class->item_type,
gimp_item_tree_view_new_dropped,
item_view);
- item_view->raise_button =
+ item_view->priv->raise_button =
gimp_editor_add_action_button (editor, item_view_class->action_group,
item_view_class->raise_action,
item_view_class->raise_top_action,
GDK_SHIFT_MASK,
NULL);
- item_view->lower_button =
+ item_view->priv->lower_button =
gimp_editor_add_action_button (editor, item_view_class->action_group,
item_view_class->lower_action,
item_view_class->lower_bottom_action,
GDK_SHIFT_MASK,
NULL);
- item_view->duplicate_button =
+ item_view->priv->duplicate_button =
gimp_editor_add_action_button (editor, item_view_class->action_group,
item_view_class->duplicate_action, NULL);
gimp_container_view_enable_dnd (GIMP_CONTAINER_VIEW (item_view),
- GTK_BUTTON (item_view->duplicate_button),
+ GTK_BUTTON (item_view->priv->duplicate_button),
item_view_class->item_type);
- item_view->delete_button =
+ item_view->priv->delete_button =
gimp_editor_add_action_button (editor, item_view_class->action_group,
item_view_class->delete_action, NULL);
gimp_container_view_enable_dnd (GIMP_CONTAINER_VIEW (item_view),
- GTK_BUTTON (item_view->delete_button),
+ GTK_BUTTON (item_view->priv->delete_button),
item_view_class->item_type);
return object;
@@ -387,7 +414,7 @@
{
GimpItemTreeView *view = GIMP_ITEM_TREE_VIEW (object);
- if (view->image)
+ if (view->priv->image)
gimp_item_tree_view_set_image (view, NULL);
GTK_OBJECT_CLASS (parent_class)->destroy (object);
@@ -447,56 +474,72 @@
{
g_return_val_if_fail (GIMP_IS_ITEM_TREE_VIEW (view), NULL);
- return view->image;
+ return view->priv->image;
+}
+
+GtkWidget *
+gimp_item_tree_view_get_new_button (GimpItemTreeView *view)
+{
+ g_return_val_if_fail (GIMP_IS_ITEM_TREE_VIEW (view), NULL);
+
+ return view->priv->new_button;
+}
+
+GtkWidget *
+gimp_item_tree_view_get_edit_button (GimpItemTreeView *view)
+{
+ g_return_val_if_fail (GIMP_IS_ITEM_TREE_VIEW (view), NULL);
+
+ return view->priv->edit_button;
}
static void
gimp_item_tree_view_real_set_image (GimpItemTreeView *view,
GimpImage *image)
{
- if (view->image == image)
+ if (view->priv->image == image)
return;
- if (view->image)
+ if (view->priv->image)
{
- g_signal_handlers_disconnect_by_func (view->image,
+ g_signal_handlers_disconnect_by_func (view->priv->image,
gimp_item_tree_view_item_changed,
view);
- g_signal_handlers_disconnect_by_func (view->image,
+ g_signal_handlers_disconnect_by_func (view->priv->image,
gimp_item_tree_view_size_changed,
view);
gimp_container_view_set_container (GIMP_CONTAINER_VIEW (view), NULL);
- g_signal_handlers_disconnect_by_func (view->image,
+ g_signal_handlers_disconnect_by_func (view->priv->image,
gimp_item_tree_view_image_flush,
view);
}
- view->image = image;
+ view->priv->image = image;
- if (view->image)
+ if (view->priv->image)
{
GimpContainer *container;
container =
- GIMP_ITEM_TREE_VIEW_GET_CLASS (view)->get_container (view->image);
+ GIMP_ITEM_TREE_VIEW_GET_CLASS (view)->get_container (view->priv->image);
gimp_container_view_set_container (GIMP_CONTAINER_VIEW (view), container);
- g_signal_connect (view->image,
+ g_signal_connect (view->priv->image,
GIMP_ITEM_TREE_VIEW_GET_CLASS (view)->signal_name,
G_CALLBACK (gimp_item_tree_view_item_changed),
view);
- g_signal_connect (view->image, "size-changed",
+ g_signal_connect (view->priv->image, "size-changed",
G_CALLBACK (gimp_item_tree_view_size_changed),
view);
- g_signal_connect (view->image, "flush",
+ g_signal_connect (view->priv->image, "flush",
G_CALLBACK (gimp_item_tree_view_image_flush),
view);
- gimp_item_tree_view_item_changed (view->image, view);
+ gimp_item_tree_view_item_changed (view->priv->image, view);
}
}
@@ -523,23 +566,23 @@
if (old_container)
{
gimp_container_remove_handler (old_container,
- item_view->visible_changed_handler_id);
+ item_view->priv->visible_changed_handler_id);
gimp_container_remove_handler (old_container,
- item_view->linked_changed_handler_id);
+ item_view->priv->linked_changed_handler_id);
- item_view->visible_changed_handler_id = 0;
- item_view->linked_changed_handler_id = 0;
+ item_view->priv->visible_changed_handler_id = 0;
+ item_view->priv->linked_changed_handler_id = 0;
}
parent_view_iface->set_container (view, container);
if (container)
{
- item_view->visible_changed_handler_id =
+ item_view->priv->visible_changed_handler_id =
gimp_container_add_handler (container, "visibility-changed",
G_CALLBACK (gimp_item_tree_view_visible_changed),
view);
- item_view->linked_changed_handler_id =
+ item_view->priv->linked_changed_handler_id =
gimp_container_add_handler (container, "linked-changed",
G_CALLBACK (gimp_item_tree_view_linked_changed),
view);
@@ -594,9 +637,9 @@
iter = parent_view_iface->insert_item (view, viewable, index);
gtk_list_store_set (GTK_LIST_STORE (tree_view->model), iter,
- item_view->model_column_visible,
+ item_view->priv->model_column_visible,
gimp_item_get_visible (item),
- item_view->model_column_linked,
+ item_view->priv->model_column_linked,
gimp_item_get_linked (item),
-1);
@@ -620,14 +663,14 @@
item_view_class = GIMP_ITEM_TREE_VIEW_GET_CLASS (tree_view);
- active_item = item_view_class->get_active_item (tree_view->image);
+ active_item = item_view_class->get_active_item (tree_view->priv->image);
if (active_item != (GimpItem *) item)
{
- item_view_class->set_active_item (tree_view->image,
+ item_view_class->set_active_item (tree_view->priv->image,
GIMP_ITEM (item));
- gimp_image_flush (tree_view->image);
+ gimp_image_flush (tree_view->priv->image);
}
}
@@ -717,7 +760,7 @@
item_view_class = GIMP_ITEM_TREE_VIEW_GET_CLASS (item_view);
- if (item_view->image != gimp_item_get_image (GIMP_ITEM (src_viewable)) ||
+ if (item_view->priv->image != gimp_item_get_image (GIMP_ITEM (src_viewable)) ||
! g_type_is_a (G_TYPE_FROM_INSTANCE (src_viewable),
item_view_class->item_type))
{
@@ -731,11 +774,11 @@
dest_index++;
new_item = gimp_item_convert (GIMP_ITEM (src_viewable),
- item_view->image, item_type);
+ item_view->priv->image, item_type);
gimp_item_set_linked (new_item, FALSE, FALSE);
- item_view_class->add_item (item_view->image, new_item, dest_index, TRUE);
+ item_view_class->add_item (item_view->priv->image, new_item, dest_index, TRUE);
}
else if (dest_viewable)
{
@@ -753,14 +796,14 @@
dest_index--;
}
- item_view_class->reorder_item (item_view->image,
+ item_view_class->reorder_item (item_view->priv->image,
GIMP_ITEM (src_viewable),
dest_index,
TRUE,
item_view_class->reorder_desc);
}
- gimp_image_flush (item_view->image);
+ gimp_image_flush (item_view->priv->image);
}
@@ -806,7 +849,7 @@
{
GimpItem *item;
- item = GIMP_ITEM_TREE_VIEW_GET_CLASS (view)->get_active_item (view->image);
+ item = GIMP_ITEM_TREE_VIEW_GET_CLASS (view)->get_active_item (view->priv->image);
gimp_container_view_select_item (GIMP_CONTAINER_VIEW (view),
(GimpViewable *) item);
@@ -871,7 +914,7 @@
if (error)
{
- gimp_message_literal (view->image->gimp, G_OBJECT (view),
+ gimp_message_literal (view->priv->image->gimp, G_OBJECT (view),
GIMP_MESSAGE_WARNING,
error->message);
g_clear_error (&error);
@@ -900,7 +943,7 @@
if (iter)
gtk_list_store_set (GTK_LIST_STORE (tree_view->model), iter,
- view->model_column_visible,
+ view->priv->model_column_visible,
gimp_item_get_visible (item),
-1);
}
@@ -930,7 +973,7 @@
if (iter)
gtk_list_store_set (GTK_LIST_STORE (tree_view->model), iter,
- view->model_column_linked,
+ view->priv->model_column_linked,
gimp_item_get_linked (item),
-1);
}
Modified: trunk/app/widgets/gimpitemtreeview.h
==============================================================================
--- trunk/app/widgets/gimpitemtreeview.h (original)
+++ trunk/app/widgets/gimpitemtreeview.h Thu Dec 25 11:31:51 2008
@@ -55,28 +55,13 @@
typedef struct _GimpItemTreeViewClass GimpItemTreeViewClass;
+typedef struct _GimpItemTreeViewPriv GimpItemTreeViewPriv;
struct _GimpItemTreeView
{
GimpContainerTreeView parent_instance;
- GimpImage *image;
-
- GtkWidget *edit_button;
- GtkWidget *new_button;
- GtkWidget *raise_button;
- GtkWidget *lower_button;
- GtkWidget *duplicate_button;
- GtkWidget *delete_button;
-
- gint model_column_visible;
- gint model_column_linked;
- GtkCellRenderer *eye_cell;
- GtkCellRenderer *chain_cell;
-
- /*< private >*/
- GQuark visible_changed_handler_id;
- GQuark linked_changed_handler_id;
+ GimpItemTreeViewPriv *priv;
};
struct _GimpItemTreeViewClass
@@ -117,19 +102,21 @@
};
-GType gimp_item_tree_view_get_type (void) G_GNUC_CONST;
-
-GtkWidget * gimp_item_tree_view_new (GType view_type,
- gint view_size,
- gint view_border_width,
- GimpImage *image,
- GimpMenuFactory *menu_facotry,
- const gchar *menu_identifier,
- const gchar *ui_identifier);
-
-void gimp_item_tree_view_set_image (GimpItemTreeView *view,
- GimpImage *image);
-GimpImage * gimp_item_tree_view_get_image (GimpItemTreeView *view);
+GType gimp_item_tree_view_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_item_tree_view_new (GType view_type,
+ gint view_size,
+ gint view_border_width,
+ GimpImage *image,
+ GimpMenuFactory *menu_facotry,
+ const gchar *menu_identifier,
+ const gchar *ui_identifier);
+
+void gimp_item_tree_view_set_image (GimpItemTreeView *view,
+ GimpImage *image);
+GimpImage * gimp_item_tree_view_get_image (GimpItemTreeView *view);
+GtkWidget * gimp_item_tree_view_get_new_button (GimpItemTreeView *view);
+GtkWidget * gimp_item_tree_view_get_edit_button (GimpItemTreeView *view);
#endif /* __GIMP_ITEM_TREE_VIEW_H__ */
Modified: trunk/app/widgets/gimplayertreeview.c
==============================================================================
--- trunk/app/widgets/gimplayertreeview.c (original)
+++ trunk/app/widgets/gimplayertreeview.c Thu Dec 25 11:31:51 2008
@@ -386,7 +386,7 @@
NULL, tree_view);
/* hide basically useless edit button */
- gtk_widget_hide (GIMP_ITEM_TREE_VIEW (layer_view)->edit_button);
+ gtk_widget_hide (gimp_item_tree_view_get_edit_button (GIMP_ITEM_TREE_VIEW (layer_view)));
button = gimp_editor_add_action_button (GIMP_EDITOR (layer_view), "layers",
"layers-anchor", NULL);
@@ -573,7 +573,7 @@
if (! success || gimp_layer_is_floating_sel (GIMP_LAYER (item)))
{
- gtk_widget_set_sensitive (item_view->edit_button, FALSE);
+ gtk_widget_set_sensitive (gimp_item_tree_view_get_edit_button (item_view), FALSE);
}
}
@@ -640,7 +640,7 @@
src_type == GIMP_DND_TYPE_PIXBUF ||
GIMP_IS_DRAWABLE (src_viewable))
{
- GimpImage *dest_image = GIMP_ITEM_TREE_VIEW (tree_view)->image;
+ GimpImage *dest_image = gimp_item_tree_view_get_image (GIMP_ITEM_TREE_VIEW (tree_view));
if (gimp_image_get_floating_selection (dest_image))
return FALSE;
@@ -666,7 +666,7 @@
gimp_text_layer_set (GIMP_TEXT_LAYER (dest_viewable), NULL,
"color", color,
NULL);
- gimp_image_flush (GIMP_ITEM_TREE_VIEW (view)->image);
+ gimp_image_flush (gimp_item_tree_view_get_image (GIMP_ITEM_TREE_VIEW (view)));
return;
}
@@ -683,7 +683,7 @@
{
GimpItemTreeView *item_view = GIMP_ITEM_TREE_VIEW (view);
GimpContainerView *cont_view = GIMP_CONTAINER_VIEW (view);
- GimpImage *image = item_view->image;
+ GimpImage *image = gimp_item_tree_view_get_image (item_view);
gint index = -1;
GList *list;
@@ -752,7 +752,7 @@
if (dest_viewable)
{
- index = gimp_image_get_layer_index (item_view->image,
+ index = gimp_image_get_layer_index (gimp_item_tree_view_get_image (item_view),
GIMP_LAYER (dest_viewable));
if (drop_pos == GTK_TREE_VIEW_DROP_AFTER)
@@ -761,7 +761,7 @@
channel = gimp_channel_new_from_component (src_image, component, NULL, NULL);
- new_item = gimp_item_convert (GIMP_ITEM (channel), item_view->image,
+ new_item = gimp_item_convert (GIMP_ITEM (channel), gimp_item_tree_view_get_image (item_view),
GIMP_TYPE_LAYER);
g_object_unref (channel);
@@ -771,8 +771,8 @@
gimp_object_take_name (GIMP_OBJECT (new_item),
g_strdup_printf (_("%s Channel Copy"), desc));
- gimp_image_add_layer (item_view->image, GIMP_LAYER (new_item), index, TRUE);
- gimp_image_flush (item_view->image);
+ gimp_image_add_layer (gimp_item_tree_view_get_image (item_view), GIMP_LAYER (new_item), index, TRUE);
+ gimp_image_flush (gimp_item_tree_view_get_image (item_view));
}
static void
@@ -782,7 +782,7 @@
GtkTreeViewDropPosition drop_pos)
{
GimpItemTreeView *item_view = GIMP_ITEM_TREE_VIEW (tree_view);
- GimpImage *image = item_view->image;
+ GimpImage *image = gimp_item_tree_view_get_image (item_view);
GimpLayer *new_layer;
gint index = -1;
@@ -811,15 +811,15 @@
gimp_layer_tree_view_set_image (GimpItemTreeView *view,
GimpImage *image)
{
- if (view->image)
- g_signal_handlers_disconnect_by_func (view->image,
+ if (gimp_item_tree_view_get_image (view))
+ g_signal_handlers_disconnect_by_func (gimp_item_tree_view_get_image (view),
gimp_layer_tree_view_floating_selection_changed,
view);
GIMP_ITEM_TREE_VIEW_CLASS (parent_class)->set_image (view, image);
- if (view->image)
- g_signal_connect (view->image,
+ if (gimp_item_tree_view_get_image (view))
+ g_signal_connect (gimp_item_tree_view_get_image (view),
"floating-selection-changed",
G_CALLBACK (gimp_layer_tree_view_floating_selection_changed),
view);
@@ -911,7 +911,7 @@
GimpImage *image;
GimpLayer *layer = NULL;
- image = GIMP_ITEM_TREE_VIEW (view)->image;
+ image = gimp_item_tree_view_get_image (GIMP_ITEM_TREE_VIEW (view));
if (image)
layer = (GimpLayer *)
@@ -954,7 +954,7 @@
GimpImage *image;
GimpLayer *layer;
- image = GIMP_ITEM_TREE_VIEW (view)->image;
+ image = gimp_item_tree_view_get_image (GIMP_ITEM_TREE_VIEW (view));
layer = (GimpLayer *)
GIMP_ITEM_TREE_VIEW_GET_CLASS (view)->get_active_item (image);
@@ -993,7 +993,7 @@
GimpImage *image;
GimpLayer *layer;
- image = GIMP_ITEM_TREE_VIEW (view)->image;
+ image = gimp_item_tree_view_get_image (GIMP_ITEM_TREE_VIEW (view));
layer = (GimpLayer *)
GIMP_ITEM_TREE_VIEW_GET_CLASS (view)->get_active_item (image);
@@ -1038,7 +1038,7 @@
GimpLayer *active_layer;
active_layer = (GimpLayer *)
- GIMP_ITEM_TREE_VIEW_GET_CLASS (view)->get_active_item (item_view->image);
+ GIMP_ITEM_TREE_VIEW_GET_CLASS (view)->get_active_item (gimp_item_tree_view_get_image (item_view));
if (active_layer == layer)
gimp_layer_tree_view_update_options (view, layer);
@@ -1395,7 +1395,7 @@
gimp_layer_tree_view_alpha_update (layer_view, iter, layer);
/* update button states */
- if (gimp_image_get_active_layer (item_view->image) == layer)
+ if (gimp_image_get_active_layer (gimp_item_tree_view_get_image (item_view)) == layer)
gimp_container_view_select_item (GIMP_CONTAINER_VIEW (view),
GIMP_VIEWABLE (layer));
}
Modified: trunk/app/widgets/gimpvectorstreeview.c
==============================================================================
--- trunk/app/widgets/gimpvectorstreeview.c (original)
+++ trunk/app/widgets/gimpvectorstreeview.c Thu Dec 25 11:31:51 2008
@@ -141,7 +141,7 @@
view = GIMP_VECTORS_TREE_VIEW (object);
/* hide basically useless edit button */
- gtk_widget_hide (GIMP_ITEM_TREE_VIEW (view)->edit_button);
+ gtk_widget_hide (gimp_item_tree_view_get_edit_button (GIMP_ITEM_TREE_VIEW (view)));
view->toselection_button =
gimp_editor_add_action_button (editor, "vectors",
@@ -217,7 +217,7 @@
GtkTreeViewDropPosition drop_pos)
{
GimpItemTreeView *view = GIMP_ITEM_TREE_VIEW (tree_view);
- GimpImage *image = view->image;
+ GimpImage *image = gimp_item_tree_view_get_image (view);
gint index = -1;
GError *error = NULL;
@@ -265,7 +265,7 @@
gpointer data)
{
GimpItemTreeView *view = GIMP_ITEM_TREE_VIEW (data);
- GimpImage *image = view->image;
+ GimpImage *image = gimp_item_tree_view_get_image (view);
GimpItem *item;
gchar *svg_data = NULL;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
