Commit c1dffc05 authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer

Removed deprecated and broken list views based on GtkList[Item] (fixes bug

2003-03-20  Michael Natterer  <mitch@gimp.org>

	Removed deprecated and broken list views
	based on GtkList[Item] (fixes bug #90965):

	* app/widgets/gimpchannellistitem.[ch]
	* app/widgets/gimpchannellistview.[ch]
	* app/widgets/gimpcontainerlistview.[ch]
	* app/widgets/gimpdrawablelistitem.[ch]
	* app/widgets/gimpdrawablelistview.[ch]
	* app/widgets/gimpitemlistitem.[ch]
	* app/widgets/gimpitemlistview.[ch]
	* app/widgets/gimplayerlistitem.[ch]
	* app/widgets/gimplayerlistview.[ch]
	* app/widgets/gimplistitem.[ch]
	* app/widgets/gimpvectorslistview.[ch]: removed.

	* app/widgets/Makefile.am
	* app/widgets/widgets-types.h
	* app/widgets/widgets-enums.h
	* app/widgets/gimpcontainereditor.c
	* app/widgets/gimpcontainerview-utils.c
	* app/widgets/gimpdatafactoryview.c
	* app/gui/channels-commands.c
	* app/gui/channels-menu.c
	* app/gui/drawable-commands.c
	* app/gui/layers-commands.c
	* app/gui/layers-menu.c
	* app/gui/palettes-commands.c
	* app/gui/test-commands.c
	* app/gui/vectors-commands.c
	* app/gui/vectors-menu.c: changed accordingly.

	* app/gui/dialogs-commands.c
	* app/gui/dialogs-constructors.[ch]
	* app/gui/dialogs-menu.c
	* app/gui/dialogs.c: removed the term "tree" from all user visible
	places and create tree views when lists are requested.

2003-03-20  Michael Natterer  <mitch@gimp.org>

	* POTFILES.in: app/widgets/*list* -> *tree*
parent 906c5a9f
2003-03-20 Michael Natterer <mitch@gimp.org>
Removed deprecated and broken list views
based on GtkList[Item] (fixes bug #90965):
* app/widgets/gimpchannellistitem.[ch]
* app/widgets/gimpchannellistview.[ch]
* app/widgets/gimpcontainerlistview.[ch]
* app/widgets/gimpdrawablelistitem.[ch]
* app/widgets/gimpdrawablelistview.[ch]
* app/widgets/gimpitemlistitem.[ch]
* app/widgets/gimpitemlistview.[ch]
* app/widgets/gimplayerlistitem.[ch]
* app/widgets/gimplayerlistview.[ch]
* app/widgets/gimplistitem.[ch]
* app/widgets/gimpvectorslistview.[ch]: removed.
* app/widgets/Makefile.am
* app/widgets/widgets-types.h
* app/widgets/widgets-enums.h
* app/widgets/gimpcontainereditor.c
* app/widgets/gimpcontainerview-utils.c
* app/widgets/gimpdatafactoryview.c
* app/gui/channels-commands.c
* app/gui/channels-menu.c
* app/gui/drawable-commands.c
* app/gui/layers-commands.c
* app/gui/layers-menu.c
* app/gui/palettes-commands.c
* app/gui/test-commands.c
* app/gui/vectors-commands.c
* app/gui/vectors-menu.c: changed accordingly.
* app/gui/dialogs-commands.c
* app/gui/dialogs-constructors.[ch]
* app/gui/dialogs-menu.c
* app/gui/dialogs.c: removed the term "tree" from all user visible
places and create tree views when lists are requested.
2003-03-20 Michael Natterer <mitch@gimp.org>
* app/display/gimpdisplay.[ch]: removed gdisp->draw_guides
......@@ -37,7 +37,6 @@
#include "widgets/gimpcolorpanel.h"
#include "widgets/gimpcomponenteditor.h"
#include "widgets/gimpitemlistview.h"
#include "widgets/gimpitemtreeview.h"
#include "widgets/gimpviewabledialog.h"
......@@ -63,8 +62,6 @@ static void channels_color_changed (GimpColorButton *button,
gimage = gimp_context_get_image (gimp_get_user_context (GIMP (data))); \
else if (GIMP_IS_COMPONENT_EDITOR (data)) \
gimage = ((GimpImageEditor *) data)->gimage; \
else if (GIMP_IS_ITEM_LIST_VIEW (data)) \
gimage = ((GimpItemListView *) data)->gimage; \
else if (GIMP_IS_ITEM_TREE_VIEW (data)) \
gimage = ((GimpItemTreeView *) data)->gimage; \
else \
......
......@@ -177,9 +177,6 @@ dialogs_toggle_view_cmd_callback (GtkWidget *widget,
if (! substring)
substring = strstr (identifier, "list");
if (! substring)
substring = strstr (identifier, "tree");
if (substring)
{
GimpContainerView *old_view;
......@@ -190,8 +187,6 @@ dialogs_toggle_view_cmd_callback (GtkWidget *widget,
memcpy (substring, "list", 4);
else if (view_type == GIMP_VIEW_TYPE_GRID)
memcpy (substring, "grid", 4);
else if (view_type == GIMP_VIEW_TYPE_TREE)
memcpy (substring, "tree", 4);
old_view = gimp_container_view_get_by_dockable (dockable);
......
......@@ -34,7 +34,7 @@
#include "core/gimpdrawable-invert.h"
#include "core/gimpimage.h"
#include "widgets/gimpitemlistview.h"
#include "widgets/gimpitemtreeview.h"
#include "display/gimpdisplay.h"
......@@ -49,8 +49,8 @@
gimage = ((GimpDisplay *) data)->gimage; \
else if (GIMP_IS_GIMP (data)) \
gimage = gimp_context_get_image (gimp_get_user_context (GIMP (data))); \
else if (GIMP_IS_ITEM_LIST_VIEW (data)) \
gimage = ((GimpItemListView *) data)->gimage; \
else if (GIMP_IS_ITEM_TREE_VIEW (data)) \
gimage = ((GimpItemTreeView *) data)->gimage; \
else \
gimage = NULL; \
\
......
......@@ -42,7 +42,6 @@
#include "pdb/procedural_db.h"
#include "widgets/gimpenummenu.h"
#include "widgets/gimpitemlistview.h"
#include "widgets/gimpitemtreeview.h"
#include "widgets/gimpviewabledialog.h"
......@@ -68,8 +67,6 @@ static void layers_resize_layer_query (GimpImage *gimage,
gimage = ((GimpDisplay *) data)->gimage; \
else if (GIMP_IS_GIMP (data)) \
gimage = gimp_context_get_image (gimp_get_user_context (GIMP (data))); \
else if (GIMP_IS_ITEM_LIST_VIEW (data)) \
gimage = ((GimpItemListView *) data)->gimage; \
else if (GIMP_IS_ITEM_TREE_VIEW (data)) \
gimage = ((GimpItemTreeView *) data)->gimage; \
else \
......
......@@ -28,20 +28,13 @@
#include "core/gimpcontainer.h"
#include "core/gimpcontext.h"
#include "widgets/gimpcontainerlistview.h"
#include "widgets/gimpcontainertreeview.h"
#include "widgets/gimpdatafactoryview.h"
#include "widgets/gimplistitem.h"
#include "widgets/gimppreview.h"
#include "palette-import-dialog.h"
#include "palettes-commands.h"
#ifdef __GNUC__
#warning GTK_DISABLE_DEPRECATED
#endif
#undef GTK_DISABLE_DEPRECATED
#include <gtk/gtklist.h>
#include "libgimp/gimpintl.h"
......@@ -101,6 +94,10 @@ palettes_merge_palettes_callback (GtkWidget *widget,
gchar *palette_name,
gpointer data)
{
#ifdef __GNUC__
#warning FIXME: reimplement palettes_merge_palettes_callback()
#endif
#if 0
GimpContainerEditor *editor;
GimpPalette *palette;
GimpPalette *new_palette;
......@@ -145,4 +142,5 @@ palettes_merge_palettes_callback (GtkWidget *widget,
gimp_container_add (editor->view->container,
GIMP_OBJECT (new_palette));
#endif
}
......@@ -42,7 +42,6 @@
#include "vectors/gimpvectors.h"
#include "widgets/gimpitemlistview.h"
#include "widgets/gimpitemtreeview.h"
#include "widgets/gimpviewabledialog.h"
......@@ -62,8 +61,6 @@
gimage = ((GimpDisplay *) data)->gimage; \
else if (GIMP_IS_GIMP (data)) \
gimage = gimp_context_get_image (gimp_get_user_context (GIMP (data))); \
else if (GIMP_IS_ITEM_LIST_VIEW (data)) \
gimage = ((GimpItemListView *) data)->gimage; \
else if (GIMP_IS_ITEM_TREE_VIEW (data)) \
gimage = ((GimpItemTreeView *) data)->gimage; \
else \
......
......@@ -43,7 +43,6 @@
#include "widgets/gimpbufferview.h"
#include "widgets/gimpcoloreditor.h"
#include "widgets/gimpcolormapeditor.h"
#include "widgets/gimpcontainerlistview.h"
#include "widgets/gimpcontainergridview.h"
#include "widgets/gimpcontainertreeview.h"
#include "widgets/gimpdataeditor.h"
......@@ -51,21 +50,17 @@
#include "widgets/gimpdialogfactory.h"
#include "widgets/gimpimagedock.h"
#include "widgets/gimpimageview.h"
#include "widgets/gimpitemlistview.h"
#include "widgets/gimpitemtreeview.h"
#include "widgets/gimpdockable.h"
#include "widgets/gimpdockbook.h"
#include "widgets/gimpdocumentview.h"
#include "widgets/gimpgradienteditor.h"
#include "widgets/gimplayerlistview.h"
#include "widgets/gimplistitem.h"
#include "widgets/gimppaletteeditor.h"
#include "widgets/gimppreview.h"
#include "widgets/gimpselectioneditor.h"
#include "widgets/gimptoolbox.h"
#include "widgets/gimptoolbox-color-area.h"
#include "widgets/gimpundoeditor.h"
#include "widgets/gimpvectorslistview.h"
#include "widgets/gimpvectorstreeview.h"
#include "display/gimpdisplay.h"
......@@ -353,7 +348,7 @@ dialogs_pattern_list_view_new (GimpDialogFactory *factory,
context,
preview_size,
5, 3,
factory->menu_factory, "<Patterns>");
factory->menu_factory, "<Patterns>");
return dialogs_dockable_new (view,
_("Pattern List"), _("Patterns"), NULL,
......@@ -374,7 +369,7 @@ dialogs_gradient_list_view_new (GimpDialogFactory *factory,
context,
preview_size,
5, 3,
factory->menu_factory, "<Gradients>");
factory->menu_factory, "<Gradients>");
return dialogs_dockable_new (view,
_("Gradient List"), _("Gradients"), NULL,
......@@ -395,7 +390,7 @@ dialogs_palette_list_view_new (GimpDialogFactory *factory,
context,
preview_size,
5, 3,
factory->menu_factory, "<Palettes>");
factory->menu_factory, "<Palettes>");
return dialogs_dockable_new (view,
_("Palette List"), _("Palettes"), NULL,
......@@ -410,7 +405,7 @@ dialogs_tool_list_view_new (GimpDialogFactory *factory,
{
GtkWidget *view;
view = gimp_container_list_view_new (context->gimp->tool_info_list,
view = gimp_container_tree_view_new (context->gimp->tool_info_list,
context,
preview_size,
FALSE,
......@@ -592,154 +587,6 @@ dialogs_buffer_grid_view_new (GimpDialogFactory *factory,
}
/***** tree views *****/
GtkWidget *
dialogs_image_tree_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size)
{
GtkWidget *view;
view = gimp_image_view_new (GIMP_VIEW_TYPE_TREE,
context->gimp->images,
context,
preview_size,
5, 3,
factory->menu_factory);
return dialogs_dockable_new (view,
_("Image Tree"), _("Images"), NULL,
NULL,
dialogs_set_editor_context_func);
}
GtkWidget *
dialogs_brush_tree_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size)
{
GtkWidget *view;
view = gimp_brush_factory_view_new (GIMP_VIEW_TYPE_TREE,
context->gimp->brush_factory,
dialogs_edit_brush_func,
context,
TRUE,
preview_size,
5, 3,
factory->menu_factory);
return dialogs_dockable_new (view,
_("Brush Tree"), _("Brushes"), NULL,
dialogs_brush_tab_func,
dialogs_set_editor_context_func);
}
GtkWidget *
dialogs_pattern_tree_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size)
{
GtkWidget *view;
view = gimp_data_factory_view_new (GIMP_VIEW_TYPE_TREE,
context->gimp->pattern_factory,
NULL,
context,
preview_size,
5, 3,
factory->menu_factory, "<Patterns>");
return dialogs_dockable_new (view,
_("Pattern Tree"), _("Patterns"), NULL,
dialogs_pattern_tab_func,
dialogs_set_editor_context_func);
}
GtkWidget *
dialogs_gradient_tree_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size)
{
GtkWidget *view;
view = gimp_data_factory_view_new (GIMP_VIEW_TYPE_TREE,
context->gimp->gradient_factory,
dialogs_edit_gradient_func,
context,
preview_size,
5, 3,
factory->menu_factory, "<Gradients>");
return dialogs_dockable_new (view,
_("Gradient Tree"), _("Gradients"), NULL,
dialogs_gradient_tab_func,
dialogs_set_editor_context_func);
}
GtkWidget *
dialogs_palette_tree_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size)
{
GtkWidget *view;
view = gimp_data_factory_view_new (GIMP_VIEW_TYPE_TREE,
context->gimp->palette_factory,
dialogs_edit_palette_func,
context,
preview_size,
5, 3,
factory->menu_factory, "<Palettes>");
return dialogs_dockable_new (view,
_("Palette Tree"), _("Palettes"), NULL,
dialogs_palette_tab_func,
dialogs_set_editor_context_func);
}
GtkWidget *
dialogs_tool_tree_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size)
{
GtkWidget *view;
view = gimp_container_tree_view_new (context->gimp->tool_info_list,
context,
preview_size,
FALSE,
5, 3);
return dialogs_dockable_new (view,
_("Tool Tree"), _("Tools"), NULL,
dialogs_tool_tab_func,
dialogs_set_view_context_func);
}
GtkWidget *
dialogs_buffer_tree_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size)
{
GtkWidget *view;
view = gimp_buffer_view_new (GIMP_VIEW_TYPE_TREE,
context->gimp->named_buffers,
context,
preview_size,
5, 3,
factory->menu_factory);
return dialogs_dockable_new (view,
_("Buffer Tree"), _("Buffers"),
GTK_STOCK_PASTE,
dialogs_stock_text_tab_func,
dialogs_set_editor_context_func);
}
/***** image related dialogs *****/
GtkWidget *
......@@ -753,40 +600,6 @@ dialogs_layer_list_view_new (GimpDialogFactory *factory,
gimage = gimp_context_get_image (context);
if (preview_size < 1)
preview_size = context->gimp->config->layer_preview_size;
view =
gimp_item_list_view_new (preview_size,
gimage,
GIMP_TYPE_LAYER,
"active_layer_changed",
(GimpNewItemFunc) layers_new_layer_query,
(GimpEditItemFunc) layers_edit_layer_query,
(GimpActivateItemFunc) layers_edit_layer_query,
factory->menu_factory, "<Layers>");
dockable = dialogs_dockable_new (view,
_("Layer List"), _("Layers"), NULL,
NULL,
dialogs_set_image_item_context_func);
gimp_dockable_set_context (GIMP_DOCKABLE (dockable), context);
return dockable;
}
GtkWidget *
dialogs_layer_tree_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size)
{
GimpImage *gimage;
GtkWidget *view;
GtkWidget *dockable;
gimage = gimp_context_get_image (context);
if (preview_size < 1)
preview_size = context->gimp->config->layer_preview_size;
......@@ -801,7 +614,7 @@ dialogs_layer_tree_view_new (GimpDialogFactory *factory,
factory->menu_factory, "<Layers>");
dockable = dialogs_dockable_new (view,
"Layer Tree", _("Layers"), NULL,
"Layer List", _("Layers"), NULL,
NULL,
dialogs_set_image_item_context_func);
......@@ -821,40 +634,6 @@ dialogs_channel_list_view_new (GimpDialogFactory *factory,
gimage = gimp_context_get_image (context);
if (preview_size < 1)
preview_size = context->gimp->config->layer_preview_size;
view =
gimp_item_list_view_new (preview_size,
gimage,
GIMP_TYPE_CHANNEL,
"active_channel_changed",
(GimpNewItemFunc) channels_new_channel_query,
(GimpEditItemFunc) channels_edit_channel_query,
(GimpActivateItemFunc) channels_edit_channel_query,
factory->menu_factory, "<Channels>");
dockable = dialogs_dockable_new (view,
_("Channel List"), _("Channels"), NULL,
NULL,
dialogs_set_image_item_context_func);
gimp_dockable_set_context (GIMP_DOCKABLE (dockable), context);
return dockable;
}
GtkWidget *
dialogs_channel_tree_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size)
{
GimpImage *gimage;
GtkWidget *view;
GtkWidget *dockable;
gimage = gimp_context_get_image (context);
if (preview_size < 1)
preview_size = context->gimp->config->layer_preview_size;
......@@ -869,7 +648,7 @@ dialogs_channel_tree_view_new (GimpDialogFactory *factory,
factory->menu_factory, "<Channels>");
dockable = dialogs_dockable_new (view,
"Channel Tree", _("Channels"), NULL,
"Channel List", _("Channels"), NULL,
NULL,
dialogs_set_image_item_context_func);
......@@ -882,45 +661,6 @@ GtkWidget *
dialogs_vectors_list_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size)
{
GimpImage *gimage;
GimpVectorsListView *vectors_view;
GtkWidget *view;
GtkWidget *dockable;
gimage = gimp_context_get_image (context);
if (preview_size < 1)
preview_size = context->gimp->config->layer_preview_size;
view =
gimp_item_list_view_new (preview_size,
gimage,
GIMP_TYPE_VECTORS,
"active_vectors_changed",
(GimpNewItemFunc) vectors_new_vectors_query,
(GimpEditItemFunc) vectors_edit_vectors_query,
(GimpActivateItemFunc) vectors_vectors_tool,
factory->menu_factory, "<Vectors>");
vectors_view = GIMP_VECTORS_LIST_VIEW (view);
vectors_view->stroke_item_func = vectors_stroke_vectors;
dockable = dialogs_dockable_new (view,
_("Paths List"), _("Paths"), NULL,
NULL,
dialogs_set_image_item_context_func);
gimp_dockable_set_context (GIMP_DOCKABLE (dockable), context);
return dockable;
}
GtkWidget *
dialogs_vectors_tree_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size)
{
GimpImage *gimage;
GimpVectorsTreeView *vectors_view;
......@@ -947,7 +687,7 @@ dialogs_vectors_tree_view_new (GimpDialogFactory *factory,
vectors_view->stroke_item_func = vectors_stroke_vectors;
dockable = dialogs_dockable_new (view,
"Paths Tree", _("Paths"), NULL,
"Paths List", _("Paths"), NULL,
NULL,
dialogs_set_image_item_context_func);
......@@ -1120,28 +860,6 @@ dialogs_document_grid_new (GimpDialogFactory *factory,
dialogs_set_editor_context_func);
}
GtkWidget *
dialogs_document_tree_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size)
{
GtkWidget *view;
view = gimp_document_view_new (GIMP_VIEW_TYPE_TREE,
context->gimp->documents,
context,
preview_size,
5, 3,
file_file_open_dialog,
factory->menu_factory);
return dialogs_dockable_new (view,
_("Document History Tree"), _("History"),
GTK_STOCK_OPEN,
dialogs_stock_text_tab_func,
dialogs_set_editor_context_func);
}
/***** editors *****/
......@@ -1726,10 +1444,7 @@ dialogs_image_item_view_image_changed (GimpContext *context,
GimpImage *gimage,
GimpContainerView *view)
{
if (GIMP_IS_ITEM_LIST_VIEW (view))
gimp_item_list_view_set_image (GIMP_ITEM_LIST_VIEW (view), gimage);
else if (GIMP_IS_ITEM_TREE_VIEW (view))
gimp_item_tree_view_set_image (GIMP_ITEM_TREE_VIEW (view), gimage);
gimp_item_tree_view_set_image (GIMP_ITEM_TREE_VIEW (view), gimage);
}
static void
......
......@@ -105,46 +105,15 @@ GtkWidget * dialogs_buffer_grid_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
GtkWidget * dialogs_image_tree_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
GtkWidget * dialogs_brush_tree_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
GtkWidget * dialogs_pattern_tree_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
GtkWidget * dialogs_gradient_tree_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
GtkWidget * dialogs_palette_tree_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
GtkWidget * dialogs_tool_tree_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
GtkWidget * dialogs_buffer_tree_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
GtkWidget * dialogs_layer_list_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
GtkWidget * dialogs_layer_tree_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
GtkWidget * dialogs_channel_list_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
GtkWidget * dialogs_channel_tree_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
GtkWidget * dialogs_vectors_list_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
GtkWidget * dialogs_vectors_tree_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
GtkWidget * dialogs_path_list_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
......
......@@ -91,33 +91,12 @@ static const GimpDialogFactoryEntry dock_entries[] =
{ "gimp-buffer-grid", dialogs_buffer_grid_view_new,
GIMP_PREVIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
{ "gimp-image-tree", dialogs_image_tree_view_new,
GIMP_PREVIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
{ "gimp-brush-tree", dialogs_brush_tree_view_new,
GIMP_PREVIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
{ "gimp-pattern-tree", dialogs_pattern_tree_view_new,
GIMP_PREVIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
{ "gimp-gradient-tree", dialogs_gradient_tree_view_new,
GIMP_PREVIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
{ "gimp-palette-tree", dialogs_palette_tree_view_new,
GIMP_PREVIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
{ "gimp-tool-tree", dialogs_tool_tree_view_new,
GIMP_PREVIEW_SIZE_SMALL, FALSE, FALSE, FALSE, TRUE },
{ "gimp-buffer-tree", dialogs_buffer_tree_view_new,
GIMP_PREVIEW_SIZE_MEDIUM, FALSE, FALSE, FALSE, TRUE },
{ "gimp-layer-list", dialogs_layer_list_view_new,
0, FALSE, FALSE, FALSE, TRUE },
{ "gimp-layer-tree", dialogs_layer_tree_view_new,
0, FALSE, FALSE, FALSE, TRUE },
{ "gimp-channel-list", dialogs_channel_list_view_new,
0, FALSE, FALSE, FALSE, TRUE },
{ "gimp-channel-tree", dialogs_channel_tree_view_new,
0, FALSE, FALSE, FALSE, TRUE },
{ "gimp-vectors-list", dialogs_vectors_list_view_new,
0, FALSE, FALSE, FALSE, TRUE },
{ "gimp-vectors-tree", dialogs_vectors_tree_view_new,
0, FALSE, FALSE, FALSE, TRUE },
{ "gimp-path-list", dialogs_path_list_view_new,
0, TRUE, FALSE, FALSE, TRUE },
{ "gimp-indexed-palette", dialogs_indexed_palette_new,
......@@ -134,8 +113,6 @@ static const GimpDialogFactoryEntry dock_entries[] =
GIMP_PREVIEW_SIZE_LARGE, FALSE, FALSE, FALSE, TRUE },
{ "gimp-document-grid", dialogs_document_grid_new,
GIMP_PREVIEW_SIZE_LARGE, FALSE, FALSE, FALSE, TRUE },
{ "gimp-document-tree", dialogs_document_tree_new,
GIMP_PREVIEW_SIZE_LARGE, FALSE, FALSE, FALSE, TRUE },
{ "gimp-brush-editor", dialogs_brush_editor_get,
0, TRUE, FALSE, FALSE, TRUE },
......
......@@ -37,7 +37,6 @@
#include "widgets/gimpcolorpanel.h"
#include "widgets/gimpcomponenteditor.h"
#include "widgets/gimpitemlistview.h"
#include "widgets/gimpitemtreeview.h"
#include "widgets/gimpviewabledialog.h"
......@@ -63,8 +62,6 @@ static void channels_color_changed (GimpColorButton *button,
gimage = gimp_context_get_image (gimp_get_user_context (GIMP (data))); \
else if (GIMP_IS_COMPONENT_EDITOR (data)) \
gimage = ((GimpImageEditor *) data)->gimage; \
else if (GIMP_IS_ITEM_LIST_VIEW (data)) \
gimage = ((GimpItemListView *) data)->gimage; \
else if (GIMP_IS_ITEM_TREE_VIEW (data)) \
gimage = ((GimpItemTreeView *) data)->gimage; \
else \
......
......@@ -29,7 +29,6 @@
#include "widgets/gimpcomponenteditor.h"
#include "widgets/gimpitemfactory.h"
#include "widgets/gimpitemlistview.h"
#include "widgets/gimpitemtreeview.h"
#include "channels-commands.h"
......@@ -127,12 +126,7 @@ channels_menu_update (GtkItemFactory *factory,
{
GList *list;
if (GIMP_IS_ITEM_LIST_VIEW (data))
gimage = GIMP_ITEM_LIST_VIEW (data)->gimage;
else if (GIMP_IS_ITEM_TREE_VIEW (data))
gimage = GIMP_ITEM_TREE_VIEW (data)->gimage;
else
return;
gimage = GIMP_ITEM_TREE_VIEW (data)->gimage;