Commit 2743f9fa authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer

added virtual functions set_toggles_visible() and set_toggles_sensitive().

2002-11-05  Michael Natterer  <mitch@gimp.org>

	* libgimpwidgets/gimpcolorselector.[ch]: added virtual functions
	set_toggles_visible() and set_toggles_sensitive(). Added a
	stock_id. Emit "color_changed" and "channel_changed" on
	set_color() and set_channel() resp.

	* libgimpwidgets/gimpcolornotebook.[ch]: implement the new
	methods.  Added gimp_color_notebook_set_has_page() to control
	which selectors a notebook contains.

	* libgimpwidgets/gimpcolorscales.[ch]: removed the toggle
	API and implement the new methods.

	* libgimpwidgets/gimpcolorselect.c: added toggle buttons for the
	channels so the widget doesn't need external ones.

	* app/gui/color-notebook.c: changed accordingly.

	* libgimpwidgets/gimpstock.[ch]
	* themes/Default/images/Makefile.am
	* themes/Default/images/stock-color-triangle-16.png: added a
	(bad) icon for the triangle color selector.

	* modules/colorsel_triangle.c: use the new icon.
	* modules/colorsel_water.c: use the "Paintbrush" icon for now.

	* app/widgets/gimpcoloreditor.[ch]: new widget for editing the
	FG/BG color featuring a color notebook, stock buttons for
	selecting the pages and a GimpPickButton.

	* app/widgets/Makefile.am
	* app/widgets/widgets-types.h: changed accordingly.

	* app/gui/dialogs-constructors.[ch]
	* app/gui/dialogs.c: added a dockable wrapper for GimpColorEditor.

	* app/gui/menus.c: added it to the menus. Also added separate
	Layers, Channels and Paths entries. Bind <ctrl>L to the new
	callback so it doesn't always create a new layers dialog.
parent 3e3b5ef3
2002-11-05 Michael Natterer <mitch@gimp.org>
* libgimpwidgets/gimpcolorselector.[ch]: added virtual functions
set_toggles_visible() and set_toggles_sensitive(). Added a
stock_id. Emit "color_changed" and "channel_changed" on
set_color() and set_channel() resp.
* libgimpwidgets/gimpcolornotebook.[ch]: implement the new
methods. Added gimp_color_notebook_set_has_page() to control
which selectors a notebook contains.
* libgimpwidgets/gimpcolorscales.[ch]: removed the toggle
API and implement the new methods.
* libgimpwidgets/gimpcolorselect.c: added toggle buttons for the
channels so the widget doesn't need external ones.
* app/gui/color-notebook.c: changed accordingly.
* libgimpwidgets/gimpstock.[ch]
* themes/Default/images/Makefile.am
* themes/Default/images/stock-color-triangle-16.png: added a
(bad) icon for the triangle color selector.
* modules/colorsel_triangle.c: use the new icon.
* modules/colorsel_water.c: use the "Paintbrush" icon for now.
* app/widgets/gimpcoloreditor.[ch]: new widget for editing the
FG/BG color featuring a color notebook, stock buttons for
selecting the pages and a GimpPickButton.
* app/widgets/Makefile.am
* app/widgets/widgets-types.h: changed accordingly.
* app/gui/dialogs-constructors.[ch]
* app/gui/dialogs.c: added a dockable wrapper for GimpColorEditor.
* app/gui/menus.c: added it to the menus. Also added separate
Layers, Channels and Paths entries. Bind <ctrl>L to the new
callback so it doesn't always create a new layers dialog.
2002-11-05 Michael Natterer <mitch@gimp.org>
* libgimpmodule/gimpmodule.c: on error, always close the module
......
......@@ -369,6 +369,8 @@ color_notebook_new_internal (GimpViewable *viewable,
&cnp->rgb,
&cnp->hsv,
cnp->active_channel);
gimp_color_selector_set_toggles_visible (GIMP_COLOR_SELECTOR (cnp->notebook),
FALSE);
gtk_box_pack_start (GTK_BOX (left_vbox), cnp->notebook, TRUE, TRUE, 0);
gtk_widget_show (cnp->notebook);
......@@ -447,6 +449,8 @@ color_notebook_new_internal (GimpViewable *viewable,
&cnp->rgb,
&cnp->hsv,
cnp->active_channel);
gimp_color_selector_set_toggles_visible (GIMP_COLOR_SELECTOR (cnp->scales),
TRUE);
gimp_color_selector_set_show_alpha (GIMP_COLOR_SELECTOR (cnp->scales),
cnp->show_alpha);
gtk_box_pack_start (GTK_BOX (right_vbox), cnp->scales, TRUE, TRUE, 0);
......@@ -570,18 +574,38 @@ color_notebook_update (ColorNotebook *cnp,
return;
if (update & UPDATE_NOTEBOOK)
gimp_color_selector_set_color (GIMP_COLOR_SELECTOR (cnp->notebook),
&cnp->rgb,
&cnp->hsv);
{
g_signal_handlers_block_by_func (G_OBJECT (cnp->notebook),
G_CALLBACK (color_notebook_notebook_changed),
cnp);
gimp_color_selector_set_color (GIMP_COLOR_SELECTOR (cnp->notebook),
&cnp->rgb,
&cnp->hsv);
g_signal_handlers_unblock_by_func (G_OBJECT (cnp->notebook),
G_CALLBACK (color_notebook_notebook_changed),
cnp);
}
if (update & UPDATE_CHANNEL)
gimp_color_selector_set_channel (GIMP_COLOR_SELECTOR (cnp->notebook),
cnp->active_channel);
if (update & UPDATE_SCALES)
gimp_color_selector_set_color (GIMP_COLOR_SELECTOR (cnp->scales),
&cnp->rgb,
&cnp->hsv);
{
g_signal_handlers_block_by_func (G_OBJECT (cnp->scales),
G_CALLBACK (color_notebook_scales_changed),
cnp);
gimp_color_selector_set_color (GIMP_COLOR_SELECTOR (cnp->scales),
&cnp->rgb,
&cnp->hsv);
g_signal_handlers_unblock_by_func (G_OBJECT (cnp->scales),
G_CALLBACK (color_notebook_scales_changed),
cnp);
}
if (update & UPDATE_ORIG_COLOR)
gimp_color_area_set_color (GIMP_COLOR_AREA (cnp->orig_color),
......@@ -670,8 +694,8 @@ color_notebook_switch_page (GtkWidget *widget,
set_channel =
(GIMP_COLOR_SELECTOR_GET_CLASS (notebook->cur_page)->set_channel != NULL);
gimp_color_scales_set_toggles_sensitive (GIMP_COLOR_SCALES (cnp->scales),
set_channel);
gimp_color_selector_set_toggles_sensitive (GIMP_COLOR_SELECTOR (cnp->scales),
set_channel);
}
......
......@@ -40,6 +40,7 @@
#include "widgets/gimpbrusheditor.h"
#include "widgets/gimpbrushfactoryview.h"
#include "widgets/gimpbufferview.h"
#include "widgets/gimpcoloreditor.h"
#include "widgets/gimpcolormapeditor.h"
#include "widgets/gimpcontainerlistview.h"
#include "widgets/gimpcontainergridview.h"
......@@ -126,6 +127,8 @@ static void dialogs_set_view_context_func (GimpDockable *dockable,
GimpContext *context);
static void dialogs_set_editor_context_func (GimpDockable *dockable,
GimpContext *context);
static void dialogs_set_color_editor_context_func (GimpDockable *dockable,
GimpContext *context);
static void dialogs_set_image_item_context_func (GimpDockable *dockable,
GimpContext *context);
static void dialogs_set_path_context_func (GimpDockable *dockable,
......@@ -844,6 +847,22 @@ dialogs_selection_editor_new (GimpDialogFactory *factory,
/***** misc dockables *****/
GtkWidget *
dialogs_color_editor_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size)
{
GtkWidget *view;
view = gimp_color_editor_new (context);
return dialogs_dockable_new (view,
_("Color Editor"), _("Color"),
GTK_STOCK_SELECT_COLOR,
dialogs_stock_text_tab_func,
dialogs_set_color_editor_context_func);
}
GtkWidget *
dialogs_document_history_new (GimpDialogFactory *factory,
GimpContext *context,
......@@ -1254,6 +1273,19 @@ dialogs_set_editor_context_func (GimpDockable *dockable,
gimp_container_view_set_context (editor->view, context);
}
static void
dialogs_set_color_editor_context_func (GimpDockable *dockable,
GimpContext *context)
{
GimpColorEditor *editor;
editor = (GimpColorEditor *) g_object_get_data (G_OBJECT (dockable),
"gimp-dialogs-view");
if (editor)
gimp_color_editor_set_context (editor, context);
}
static void
dialogs_set_image_item_context_func (GimpDockable *dockable,
GimpContext *context)
......
......@@ -127,6 +127,10 @@ GtkWidget * dialogs_selection_editor_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
GtkWidget * dialogs_color_editor_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
GtkWidget * dialogs_document_history_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
......
......@@ -76,6 +76,8 @@ static const GimpDialogFactoryEntry dock_entries[] =
{ "gimp-indexed-palette", dialogs_indexed_palette_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp-selection-editor", dialogs_selection_editor_new, 0, FALSE, FALSE, FALSE, TRUE },
{ "gimp-color-editor", dialogs_color_editor_new, 0, FALSE, FALSE, FALSE, TRUE },
{ "gimp-document-history", dialogs_document_history_new, 48, FALSE, FALSE, FALSE, TRUE },
{ "gimp-brush-editor", dialogs_brush_editor_get, 0, TRUE, FALSE, FALSE, TRUE },
......
......@@ -369,6 +369,8 @@ color_notebook_new_internal (GimpViewable *viewable,
&cnp->rgb,
&cnp->hsv,
cnp->active_channel);
gimp_color_selector_set_toggles_visible (GIMP_COLOR_SELECTOR (cnp->notebook),
FALSE);
gtk_box_pack_start (GTK_BOX (left_vbox), cnp->notebook, TRUE, TRUE, 0);
gtk_widget_show (cnp->notebook);
......@@ -447,6 +449,8 @@ color_notebook_new_internal (GimpViewable *viewable,
&cnp->rgb,
&cnp->hsv,
cnp->active_channel);
gimp_color_selector_set_toggles_visible (GIMP_COLOR_SELECTOR (cnp->scales),
TRUE);
gimp_color_selector_set_show_alpha (GIMP_COLOR_SELECTOR (cnp->scales),
cnp->show_alpha);
gtk_box_pack_start (GTK_BOX (right_vbox), cnp->scales, TRUE, TRUE, 0);
......@@ -570,18 +574,38 @@ color_notebook_update (ColorNotebook *cnp,
return;
if (update & UPDATE_NOTEBOOK)
gimp_color_selector_set_color (GIMP_COLOR_SELECTOR (cnp->notebook),
&cnp->rgb,
&cnp->hsv);
{
g_signal_handlers_block_by_func (G_OBJECT (cnp->notebook),
G_CALLBACK (color_notebook_notebook_changed),
cnp);
gimp_color_selector_set_color (GIMP_COLOR_SELECTOR (cnp->notebook),
&cnp->rgb,
&cnp->hsv);
g_signal_handlers_unblock_by_func (G_OBJECT (cnp->notebook),
G_CALLBACK (color_notebook_notebook_changed),
cnp);
}
if (update & UPDATE_CHANNEL)
gimp_color_selector_set_channel (GIMP_COLOR_SELECTOR (cnp->notebook),
cnp->active_channel);
if (update & UPDATE_SCALES)
gimp_color_selector_set_color (GIMP_COLOR_SELECTOR (cnp->scales),
&cnp->rgb,
&cnp->hsv);
{
g_signal_handlers_block_by_func (G_OBJECT (cnp->scales),
G_CALLBACK (color_notebook_scales_changed),
cnp);
gimp_color_selector_set_color (GIMP_COLOR_SELECTOR (cnp->scales),
&cnp->rgb,
&cnp->hsv);
g_signal_handlers_unblock_by_func (G_OBJECT (cnp->scales),
G_CALLBACK (color_notebook_scales_changed),
cnp);
}
if (update & UPDATE_ORIG_COLOR)
gimp_color_area_set_color (GIMP_COLOR_AREA (cnp->orig_color),
......@@ -670,8 +694,8 @@ color_notebook_switch_page (GtkWidget *widget,
set_channel =
(GIMP_COLOR_SELECTOR_GET_CLASS (notebook->cur_page)->set_channel != NULL);
gimp_color_scales_set_toggles_sensitive (GIMP_COLOR_SCALES (cnp->scales),
set_channel);
gimp_color_selector_set_toggles_sensitive (GIMP_COLOR_SELECTOR (cnp->scales),
set_channel);
}
......
......@@ -40,6 +40,7 @@
#include "widgets/gimpbrusheditor.h"
#include "widgets/gimpbrushfactoryview.h"
#include "widgets/gimpbufferview.h"
#include "widgets/gimpcoloreditor.h"
#include "widgets/gimpcolormapeditor.h"
#include "widgets/gimpcontainerlistview.h"
#include "widgets/gimpcontainergridview.h"
......@@ -126,6 +127,8 @@ static void dialogs_set_view_context_func (GimpDockable *dockable,
GimpContext *context);
static void dialogs_set_editor_context_func (GimpDockable *dockable,
GimpContext *context);
static void dialogs_set_color_editor_context_func (GimpDockable *dockable,
GimpContext *context);
static void dialogs_set_image_item_context_func (GimpDockable *dockable,
GimpContext *context);
static void dialogs_set_path_context_func (GimpDockable *dockable,
......@@ -844,6 +847,22 @@ dialogs_selection_editor_new (GimpDialogFactory *factory,
/***** misc dockables *****/
GtkWidget *
dialogs_color_editor_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size)
{
GtkWidget *view;
view = gimp_color_editor_new (context);
return dialogs_dockable_new (view,
_("Color Editor"), _("Color"),
GTK_STOCK_SELECT_COLOR,
dialogs_stock_text_tab_func,
dialogs_set_color_editor_context_func);
}
GtkWidget *
dialogs_document_history_new (GimpDialogFactory *factory,
GimpContext *context,
......@@ -1254,6 +1273,19 @@ dialogs_set_editor_context_func (GimpDockable *dockable,
gimp_container_view_set_context (editor->view, context);
}
static void
dialogs_set_color_editor_context_func (GimpDockable *dockable,
GimpContext *context)
{
GimpColorEditor *editor;
editor = (GimpColorEditor *) g_object_get_data (G_OBJECT (dockable),
"gimp-dialogs-view");
if (editor)
gimp_color_editor_set_context (editor, context);
}
static void
dialogs_set_image_item_context_func (GimpDockable *dockable,
GimpContext *context)
......
......@@ -127,6 +127,10 @@ GtkWidget * dialogs_selection_editor_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
GtkWidget * dialogs_color_editor_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
GtkWidget * dialogs_document_history_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
......
......@@ -76,6 +76,8 @@ static const GimpDialogFactoryEntry dock_entries[] =
{ "gimp-indexed-palette", dialogs_indexed_palette_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp-selection-editor", dialogs_selection_editor_new, 0, FALSE, FALSE, FALSE, TRUE },
{ "gimp-color-editor", dialogs_color_editor_new, 0, FALSE, FALSE, FALSE, TRUE },
{ "gimp-document-history", dialogs_document_history_new, 48, FALSE, FALSE, FALSE, TRUE },
{ "gimp-brush-editor", dialogs_brush_editor_get, 0, TRUE, FALSE, FALSE, TRUE },
......
......@@ -147,7 +147,7 @@ static GimpItemFactoryEntry toolbox_entries[] =
/* <Toolbox>/File/Dialogs */
{ { N_("/File/Dialogs/Layers, Channels & Paths..."), "<control>L",
{ { N_("/File/Dialogs/Layers, Channels & Paths..."), NULL,
dialogs_create_lc_cmd_callback, 0 },
NULL,
"file/dialogs/layers_and_channels.html", NULL },
......@@ -167,6 +167,41 @@ static GimpItemFactoryEntry toolbox_entries[] =
SEPARATOR ("/File/Dialogs/---"),
{ { N_("/File/Dialogs/Layers..."), "<control>L",
dialogs_create_dockable_cmd_callback, 0 },
"gimp-layer-list",
NULL, NULL },
{ { N_("/File/Dialogs/Channels..."), NULL,
dialogs_create_dockable_cmd_callback, 0 },
"gimp-channel-list",
NULL, NULL },
{ { N_("/File/Dialogs/Paths..."), NULL,
dialogs_create_dockable_cmd_callback, 0 },
"gimp-vectors-list",
NULL, NULL },
{ { N_("/File/Dialogs/Indexed Palette..."), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GTK_STOCK_SELECT_COLOR },
"gimp-indexed-palette",
"file/dialogs/indexed_palette.html", NULL },
{ { N_("/File/Dialogs/Selection Editor..."), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TOOL_RECT_SELECT },
"gimp-selection-editor",
NULL, NULL },
{ { N_("/File/Dialogs/Navigation..."), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_NAVIGATION },
"gimp-navigation-view",
NULL, NULL },
SEPARATOR ("/File/Dialogs/---"),
{ { N_("/File/Dialogs/Colors..."), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GTK_STOCK_SELECT_COLOR },
"gimp-color-editor",
NULL, NULL },
{ { N_("/File/Dialogs/Brushes..."), "<control><shift>B",
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TOOL_PAINTBRUSH },
......@@ -187,11 +222,6 @@ static GimpItemFactoryEntry toolbox_entries[] =
"<StockItem>", GTK_STOCK_SELECT_COLOR },
"gimp-palette-list",
"file/dialogs/palette_selection.html", NULL },
{ { N_("/File/Dialogs/Indexed Palette..."), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GTK_STOCK_SELECT_COLOR },
"gimp-indexed-palette",
"file/dialogs/indexed_palette.html", NULL },
{ { N_("/File/Dialogs/Buffers..."), "foo",
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GTK_STOCK_PASTE },
......@@ -200,16 +230,6 @@ static GimpItemFactoryEntry toolbox_entries[] =
SEPARATOR ("/File/Dialogs/---"),
{ { N_("/File/Dialogs/Selection Editor..."), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TOOL_RECT_SELECT },
"gimp-selection-editor",
NULL, NULL },
{ { N_("/File/Dialogs/Navigation..."), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_NAVIGATION },
"gimp-navigation-view",
NULL, NULL },
{ { N_("/File/Dialogs/Images..."), NULL,
dialogs_create_dockable_cmd_callback, 0 },
"gimp-image-list",
......@@ -883,7 +903,7 @@ static GimpItemFactoryEntry image_entries[] =
/* <Image>/Dialogs */
{ { N_("/Dialogs/Layers, Channels & Paths..."), "<control>L",
{ { N_("/Dialogs/Layers, Channels & Paths..."), NULL,
dialogs_create_lc_cmd_callback, 0 },
NULL,
"dialogs/layers_and_channels.html", NULL },
......@@ -903,6 +923,41 @@ static GimpItemFactoryEntry image_entries[] =
SEPARATOR ("/Dialogs/---"),
{ { N_("/Dialogs/Layers..."), "<control>L",
dialogs_create_dockable_cmd_callback, 0 },
"gimp-layer-list",
NULL, NULL },
{ { N_("/Dialogs/Channels..."), NULL,
dialogs_create_dockable_cmd_callback, 0 },
"gimp-channel-list",
NULL, NULL },
{ { N_("/Dialogs/Paths..."), NULL,
dialogs_create_dockable_cmd_callback, 0 },
"gimp-vectors-list",
NULL, NULL },
{ { N_("/Dialogs/Indexed Palette..."), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GTK_STOCK_SELECT_COLOR },
"gimp-indexed-palette",
"file/dialogs/indexed_palette.html", NULL },
{ { N_("/Dialogs/Selection Editor..."), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TOOL_RECT_SELECT },
"gimp-selection-editor",
NULL, NULL },
{ { N_("/Dialogs/Navigation..."), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_NAVIGATION },
"gimp-navigation-view",
NULL, NULL },
SEPARATOR ("/Dialogs/---"),
{ { N_("/Dialogs/Colors..."), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GTK_STOCK_SELECT_COLOR },
"gimp-color-editor",
NULL, NULL },
{ { N_("/Dialogs/Brushes..."), "<control><shift>B",
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TOOL_PAINTBRUSH },
......@@ -923,11 +978,6 @@ static GimpItemFactoryEntry image_entries[] =
"<StockItem>", GTK_STOCK_SELECT_COLOR },
"gimp-palette-list",
"dialogs/palette_selection.html", NULL },
{ { N_("/Dialogs/Indexed Palette..."), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GTK_STOCK_SELECT_COLOR },
"gimp-indexed-palette",
"dialogs/indexed_palette.html", NULL },
{ { N_("/Dialogs/Buffers..."), "foo",
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GTK_STOCK_PASTE },
......@@ -936,16 +986,6 @@ static GimpItemFactoryEntry image_entries[] =
SEPARATOR ("/Dialogs/---"),
{ { N_("/Dialogs/Selection Editor..."), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TOOL_RECT_SELECT },
"gimp-selection-editor",
NULL, NULL },
{ { N_("/Dialogs/Navigation..."), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_NAVIGATION },
"gimp-navigation-view",
NULL, NULL },
{ { N_("/Dialogs/Images..."), NULL,
dialogs_create_dockable_cmd_callback, 0 },
"gimp-image-list",
......@@ -1399,14 +1439,25 @@ static GimpItemFactoryEntry dialogs_entries[] =
{ { N_("/Select Tab"), NULL, NULL, 0 },
NULL, NULL, NULL },
ADD_TAB (N_("/Add Tab/Tool Options..."), "gimp-tool-options",
"<StockItem>", GIMP_STOCK_TOOL_OPTIONS),
SEPARATOR ("/Add Tab/---"),
ADD_TAB (N_("/Add Tab/Layers..."), "gimp-layer-list", NULL, NULL),
ADD_TAB (N_("/Add Tab/Channels..."), "gimp-channel-list", NULL, NULL),
ADD_TAB (N_("/Add Tab/Paths..."), "gimp-vectors-list", NULL, NULL),
ADD_TAB (N_("/Add Tab/Tool Options..."), "gimp-tool-options",
"<StockItem>", GIMP_STOCK_TOOL_OPTIONS),
ADD_TAB (N_("/Add Tab/Indexed Palette..."), "gimp-indexed-palette",
"<StockItem>", GTK_STOCK_SELECT_COLOR),
ADD_TAB (N_("/Add Tab/Selection Editor..."), "gimp-selection-editor",
"<StockItem>", GIMP_STOCK_TOOL_RECT_SELECT),
ADD_TAB (N_("/Add Tab/Navigation..."), "gimp-navigation-view",
"<StockItem>", GIMP_STOCK_NAVIGATION),
SEPARATOR ("/Add Tab/---"),
ADD_TAB (N_("/Add Tab/Colors..."), "gimp-color-editor",
"<StockItem>", GTK_STOCK_SELECT_COLOR),
ADD_TAB (N_("/Add Tab/Brushes..."), "gimp-brush-grid",
"<StockItem>", GIMP_STOCK_TOOL_PAINTBRUSH),
ADD_TAB (N_("/Add Tab/Patterns..."), "gimp-pattern-grid",
......@@ -1415,17 +1466,11 @@ static GimpItemFactoryEntry dialogs_entries[] =
"<StockItem>", GIMP_STOCK_TOOL_BLEND),
ADD_TAB (N_("/Add Tab/Palettes..."), "gimp-palette-list",
"<StockItem>", GTK_STOCK_SELECT_COLOR),
ADD_TAB (N_("/Add Tab/Indexed Palette..."), "gimp-indexed-palette",
"<StockItem>", GTK_STOCK_SELECT_COLOR),
ADD_TAB (N_("/Add Tab/Buffers..."), "gimp-buffer-list",
"<StockItem>", GTK_STOCK_PASTE),
SEPARATOR ("/Add Tab/---"),
ADD_TAB (N_("/Add Tab/Selection Editor..."), "gimp-selection-editor",
"<StockItem>", GIMP_STOCK_TOOL_RECT_SELECT),
ADD_TAB (N_("/Add Tab/Navigation..."), "gimp-navigation-view",
"<StockItem>", GIMP_STOCK_NAVIGATION),
ADD_TAB (N_("/Add Tab/Images..."), "gimp-image-list", NULL, NULL),
ADD_TAB (N_("/Add Tab/Document History..."), "gimp-document-history",
"<StockItem>", GTK_STOCK_OPEN),
......
......@@ -147,7 +147,7 @@ static GimpItemFactoryEntry toolbox_entries[] =
/* <Toolbox>/File/Dialogs */
{ { N_("/File/Dialogs/Layers, Channels & Paths..."), "<control>L",
{ { N_("/File/Dialogs/Layers, Channels & Paths..."), NULL,
dialogs_create_lc_cmd_callback, 0 },
NULL,
"file/dialogs/layers_and_channels.html", NULL },
......@@ -167,6 +167,41 @@ static GimpItemFactoryEntry toolbox_entries[] =
SEPARATOR ("/File/Dialogs/---"),
{ { N_("/File/Dialogs/Layers..."), "<control>L",
dialogs_create_dockable_cmd_callback, 0 },
"gimp-layer-list",
NULL, NULL },
{ { N_("/File/Dialogs/Channels..."), NULL,
dialogs_create_dockable_cmd_callback, 0 },
"gimp-channel-list",
NULL, NULL },
{ { N_("/File/Dialogs/Paths..."), NULL,
dialogs_create_dockable_cmd_callback, 0 },
"gimp-vectors-list",
NULL, NULL },
{ { N_("/File/Dialogs/Indexed Palette..."), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GTK_STOCK_SELECT_COLOR },
"gimp-indexed-palette",
"file/dialogs/indexed_palette.html", NULL },
{ { N_("/File/Dialogs/Selection Editor..."), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TOOL_RECT_SELECT },
"gimp-selection-editor",
NULL, NULL },
{ { N_("/File/Dialogs/Navigation..."), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_NAVIGATION },
"gimp-navigation-view",
NULL, NULL },
SEPARATOR ("/File/Dialogs/---"),
{ { N_("/File/Dialogs/Colors..."), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GTK_STOCK_SELECT_COLOR },
"gimp-color-editor",
NULL, NULL },
{ { N_("/File/Dialogs/Brushes..."), "<control><shift>B",
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TOOL_PAINTBRUSH },
......@@ -187,11 +222,6 @@ static GimpItemFactoryEntry toolbox_entries[] =
"<StockItem>", GTK_STOCK_SELECT_COLOR },
"gimp-palette-list",
"file/dialogs/palette_selection.html", NULL },
{ { N_("/File/Dialogs/Indexed Palette..."), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GTK_STOCK_SELECT_COLOR },
"gimp-indexed-palette",
"file/dialogs/indexed_palette.html", NULL },
{ { N_("/File/Dialogs/Buffers..."), "foo",
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GTK_STOCK_PASTE },
......@@ -200,16 +230,6 @@ static GimpItemFactoryEntry toolbox_entries[] =
SEPARATOR ("/File/Dialogs/---"),
{ { N_("/File/Dialogs/Selection Editor..."), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TOOL_RECT_SELECT },
"gimp-selection-editor",
NULL, NULL },
{ { N_("/File/Dialogs/Navigation..."), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_NAVIGATION },
"gimp-navigation-view",
NULL, NULL },
{ { N_("/File/Dialogs/Images..."), NULL,
dialogs_create_dockable_cmd_callback, 0 },
"gimp-image-list",
......@@ -883,7 +903,7 @@ static GimpItemFactoryEntry image_entries[] =
/* <Image>/Dialogs */
{ { N_("/Dialogs/Layers, Channels & Paths..."), "<control>L",
{ { N_("/Dialogs/Layers, Channels & Paths..."), NULL,
dialogs_create_lc_cmd_callback, 0 },
NULL,
"dialogs/layers_and_channels.html", NULL },
......@@ -903,6 +923,41 @@ static GimpItemFactoryEntry image_entries[] =
SEPARATOR ("/Dialogs/---"),
{ { N_("/Dialogs/Layers..."), "<control>L",
dialogs_create_dockable_cmd_callback, 0 },
"gimp-layer-list",
NULL, NULL },
{ { N_("/Dialogs/Channels..."), NULL,
dialogs_create_dockable_cmd_callback, 0 },
"gimp-channel-list",
NULL, NULL },
{ { N_("/Dialogs/Paths..."), NULL,
dialogs_create_dockable_cmd_callback, 0 },
"gimp-vectors-list",
NULL, NULL },
{ { N_("/Dialogs/Indexed Palette..."), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GTK_STOCK_SELECT_COLOR },
"gimp-indexed-palette",
"file/dialogs/indexed_palette.html", NULL },
{ { N_("/Dialogs/Selection Editor..."), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TOOL_RECT_SELECT },
"gimp-selection-editor",
NULL, NULL },
{ { N_("/Dialogs/Navigation..."), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_NAVIGATION },
"gimp-navigation-view",
NULL, NULL },
SEPARATOR ("/Dialogs/---"),
{ { N_("/Dialogs/Colors..."), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GTK_STOCK_SELECT_COLOR },
"gimp-color-editor",
NULL, NULL },
{ { N_("/Dialogs/Brushes..."), "<control><shift>B",
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TOOL_PAINTBRUSH },
......@@ -923,11 +978,6 @@ static GimpItemFactoryEntry image_entries[] =