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

./mitch --sanitize-identifier-namespace

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

	./mitch --sanitize-identifier-namespace

	* app/core/gimpcontext.c
	* app/display/gimpdisplayshell-callbacks.c
	* app/display/gimpdisplayshell-dnd.c
	* app/gui/dialogs-commands.c
	* app/gui/dialogs-constructors.c
	* app/gui/dialogs.c
	* app/gui/edit-commands.c
	* app/gui/gui.c
	* app/gui/menus.c
	* app/gui/vectors-commands.c
	* app/gui/view-commands.c
	* app/tools/gimpairbrushtool.c
	* app/tools/gimpbezierselecttool.c
	* app/tools/gimpblendtool.c
	* app/tools/gimpbrightnesscontrasttool.c
	* app/tools/gimpbucketfilltool.c
	* app/tools/gimpbycolorselecttool.c
	* app/tools/gimpclonetool.c
	* app/tools/gimpcolorbalancetool.c
	* app/tools/gimpcolorpickertool.c
	* app/tools/gimpconvolvetool.c
	* app/tools/gimpcroptool.c
	* app/tools/gimpcurvestool.c
	* app/tools/gimpdodgeburntool.c
	* app/tools/gimpellipseselecttool.c
	* app/tools/gimperasertool.c
	* app/tools/gimpfliptool.c
	* app/tools/gimpfreeselecttool.c
	* app/tools/gimpfuzzyselecttool.c
	* app/tools/gimphistogramtool.c
	* app/tools/gimphuesaturationtool.c
	* app/tools/gimpinktool.c
	* app/tools/gimpiscissorstool.c
	* app/tools/gimplevelstool.c
	* app/tools/gimpmagnifytool.c
	* app/tools/gimpmeasuretool.c
	* app/tools/gimpmovetool.c
	* app/tools/gimppaintbrushtool.c
	* app/tools/gimppathtool.c
	* app/tools/gimppenciltool.c
	* app/tools/gimpperspectivetool.c
	* app/tools/gimpposterizetool.c
	* app/tools/gimprectselecttool.c
	* app/tools/gimprotatetool.c
	* app/tools/gimpscaletool.c
	* app/tools/gimpsheartool.c
	* app/tools/gimpsmudgetool.c
	* app/tools/gimptexttool.c
	* app/tools/gimpthresholdtool.c
	* app/tools/gimpvectortool.c
	* app/widgets/gimpdnd.c
	* app/widgets/gimptoolbox-indicator-area.c
	* app/widgets/gimptoolbox.c: s/gimp:/gimp-/g and s/_/-/g for all
	identifier strings (e.g. gimp:eraser_tool -> gimp-eraser-tool,
	gimp:layer-list -> gimp-layer-list, ...)

	* plug-ins/tools/common/gimpbrushselecttool.c:
	s/gimp:brush_select_tool/gimp-brush-select-tool-module/

	Don't quite remember why I introduced the "gimp:" prefix in the
	first place, but we can always add it back if we need it (for
	whatever reason)

	You may want to edit your ~/.gimp-1.3/sessionrc and devicerc or
	all session settings will be lost due to parse errors.
parent 6ce08f3c
2002-03-20 Michael Natterer <mitch@gimp.org>
./mitch --sanitize-identifier-namespace
* app/core/gimpcontext.c
* app/display/gimpdisplayshell-callbacks.c
* app/display/gimpdisplayshell-dnd.c
* app/gui/dialogs-commands.c
* app/gui/dialogs-constructors.c
* app/gui/dialogs.c
* app/gui/edit-commands.c
* app/gui/gui.c
* app/gui/menus.c
* app/gui/vectors-commands.c
* app/gui/view-commands.c
* app/tools/gimpairbrushtool.c
* app/tools/gimpbezierselecttool.c
* app/tools/gimpblendtool.c
* app/tools/gimpbrightnesscontrasttool.c
* app/tools/gimpbucketfilltool.c
* app/tools/gimpbycolorselecttool.c
* app/tools/gimpclonetool.c
* app/tools/gimpcolorbalancetool.c
* app/tools/gimpcolorpickertool.c
* app/tools/gimpconvolvetool.c
* app/tools/gimpcroptool.c
* app/tools/gimpcurvestool.c
* app/tools/gimpdodgeburntool.c
* app/tools/gimpellipseselecttool.c
* app/tools/gimperasertool.c
* app/tools/gimpfliptool.c
* app/tools/gimpfreeselecttool.c
* app/tools/gimpfuzzyselecttool.c
* app/tools/gimphistogramtool.c
* app/tools/gimphuesaturationtool.c
* app/tools/gimpinktool.c
* app/tools/gimpiscissorstool.c
* app/tools/gimplevelstool.c
* app/tools/gimpmagnifytool.c
* app/tools/gimpmeasuretool.c
* app/tools/gimpmovetool.c
* app/tools/gimppaintbrushtool.c
* app/tools/gimppathtool.c
* app/tools/gimppenciltool.c
* app/tools/gimpperspectivetool.c
* app/tools/gimpposterizetool.c
* app/tools/gimprectselecttool.c
* app/tools/gimprotatetool.c
* app/tools/gimpscaletool.c
* app/tools/gimpsheartool.c
* app/tools/gimpsmudgetool.c
* app/tools/gimptexttool.c
* app/tools/gimpthresholdtool.c
* app/tools/gimpvectortool.c
* app/widgets/gimpdnd.c
* app/widgets/gimptoolbox-indicator-area.c
* app/widgets/gimptoolbox.c: s/gimp:/gimp-/g and s/_/-/g for all
identifier strings (e.g. gimp:eraser_tool -> gimp-eraser-tool,
gimp:layer-list -> gimp-layer-list, ...)
* plug-ins/tools/common/gimpbrushselecttool.c:
s/gimp:brush_select_tool/gimp-brush-select-tool-module/
Don't quite remember why I introduced the "gimp:" prefix in the
first place, but we can always add it back if we need it (for
whatever reason)
You may want to edit your ~/.gimp-1.3/sessionrc and devicerc or
all session settings will be lost due to parse errors.
2002-03-20 Michael Natterer <mitch@gimp.org>
* app/gui/Makefile.am
......
......@@ -305,10 +305,10 @@ dialogs_create_lc_cmd_callback (GtkWidget *widget,
const gchar *tabs[] =
{
"gimp:layer-list",
"gimp:channel-list",
"gimp:vectors-list",
"gimp:indexed-palette"
"gimp-layer-list",
"gimp-channel-list",
"gimp-vectors-list",
"gimp-indexed-palette"
};
gint i;
......@@ -343,13 +343,13 @@ dialogs_create_stuff_cmd_callback (GtkWidget *widget,
const gchar *tabs[] =
{
"gimp:brush-grid",
"gimp:pattern-grid",
"gimp:gradient-list",
"gimp:palette-list",
"gimp:buffer-list",
"gimp:image-list",
"gimp:document-history"
"gimp-brush-grid",
"gimp-pattern-grid",
"gimp-gradient-list",
"gimp-palette-list",
"gimp-buffer-list",
"gimp-image-list",
"gimp-document-history"
};
gint i;
......
......@@ -229,7 +229,7 @@ void
edit_named_paste_cmd_callback (GtkWidget *widget,
gpointer data)
{
gimp_dialog_factory_dialog_raise (global_dock_factory, "gimp:buffer-list", -1);
gimp_dialog_factory_dialog_raise (global_dock_factory, "gimp-buffer-list", -1);
}
void
......
......@@ -302,7 +302,7 @@ vectors_stroke_vectors (GimpVectors *vectors)
{
tool_info = (GimpToolInfo *)
gimp_container_get_child_by_name (gimage->gimp->tool_info_list,
"gimp:paintbrush_tool");
"gimp-paintbrush-tool");
}
paint_options = (GimpPaintOptions *) tool_info->tool_options;
......
......@@ -160,7 +160,7 @@ view_display_filters_cmd_callback (GtkWidget *widget,
shell = GIMP_DISPLAY_SHELL (gdisp->shell);
gimp_dialog_factory_dialog_new (global_dialog_factory,
"gimp:display-filters-dialog", -1);
"gimp-display-filters-dialog", -1);
}
void
......
......@@ -104,7 +104,7 @@ gimp_color_balance_tool_register (Gimp *gimp,
GIMP_TYPE_COLOR_BALANCE_TOOL,
NULL,
FALSE,
"gimp:color_balance_tool",
"gimp-color-balance-tool",
_("Color Balance"),
_("Adjust color balance"),
N_("/Layer/Colors/Color Balance..."), NULL,
......
......@@ -212,7 +212,7 @@ gimp_curves_tool_register (Gimp *gimp,
GIMP_TYPE_CURVES_TOOL,
NULL,
FALSE,
"gimp:curves_tool",
"gimp-curves-tool",
_("Curves"),
_("Adjust color curves"),
N_("/Layer/Colors/Curves..."), NULL,
......
......@@ -130,7 +130,7 @@ gimp_hue_saturation_tool_register (Gimp *gimp,
GIMP_TYPE_HUE_SATURATION_TOOL,
NULL,
FALSE,
"gimp:hue_saturation_tool",
"gimp-hue-saturation-tool",
_("Hue-Saturation"),
_("Adjust hue and saturation"),
N_("/Layer/Colors/Hue-Saturation..."), NULL,
......
......@@ -110,7 +110,7 @@ gimp_threshold_tool_register (Gimp *gimp,
GIMP_TYPE_THRESHOLD_TOOL,
NULL,
FALSE,
"gimp:threshold_tool",
"gimp-threshold-tool",
_("Threshold"),
_("Reduce image to two colors using a threshold"),
N_("/Layer/Colors/Threshold..."), NULL,
......
......@@ -1484,7 +1484,7 @@ gimp_context_tool_list_thaw (GimpContainer *container,
GimpToolInfo *tool_info;
if (! context->tool_name)
context->tool_name = g_strdup ("gimp:rect-select-tool");
context->tool_name = g_strdup ("gimp-rect-select-tool");
if ((tool_info = (GimpToolInfo *)
gimp_container_get_child_by_name (container,
......
......@@ -839,7 +839,7 @@ void
dialogs_edit_brush_func (GimpData *data)
{
gimp_dialog_factory_dialog_raise (global_dock_factory,
"gimp:brush-editor",
"gimp-brush-editor",
-1);
gimp_data_editor_set_data (brush_editor, data);
......@@ -866,7 +866,7 @@ void
dialogs_edit_gradient_func (GimpData *data)
{
gimp_dialog_factory_dialog_raise (global_dock_factory,
"gimp:gradient-editor",
"gimp-gradient-editor",
-1);
gimp_data_editor_set_data (gradient_editor, data);
......@@ -893,7 +893,7 @@ void
dialogs_edit_palette_func (GimpData *data)
{
gimp_dialog_factory_dialog_raise (global_dock_factory,
"gimp:palette-editor",
"gimp-palette-editor",
-1);
gimp_data_editor_set_data (palette_editor, data);
......
......@@ -39,47 +39,47 @@ GimpDialogFactory *global_toolbox_factory = NULL;
static const GimpDialogFactoryEntry toplevel_entries[] =
{
{ "gimp:device-status-dialog", dialogs_device_status_get, 32, TRUE, TRUE, FALSE, TRUE },
{ "gimp:preferences-dialog", dialogs_preferences_get, 32, TRUE, FALSE, FALSE, TRUE },
{ "gimp:module-browser-dialog", dialogs_module_browser_get, 32, TRUE, FALSE, FALSE, TRUE },
{ "gimp:undo-history-dialog", dialogs_undo_history_get, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp:display-filters-dialog", dialogs_display_filters_get, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp:tips-dialog", dialogs_tips_get, 32, TRUE, FALSE, FALSE, TRUE },
{ "gimp:about-dialog", dialogs_about_get, 32, TRUE, FALSE, FALSE, TRUE }
{ "gimp-device-status-dialog", dialogs_device_status_get, 32, TRUE, TRUE, FALSE, TRUE },
{ "gimp-preferences-dialog", dialogs_preferences_get, 32, TRUE, FALSE, FALSE, TRUE },
{ "gimp-module-browser-dialog", dialogs_module_browser_get, 32, TRUE, FALSE, FALSE, TRUE },
{ "gimp-undo-history-dialog", dialogs_undo_history_get, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp-display-filters-dialog", dialogs_display_filters_get, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp-tips-dialog", dialogs_tips_get, 32, TRUE, FALSE, FALSE, TRUE },
{ "gimp-about-dialog", dialogs_about_get, 32, TRUE, FALSE, FALSE, TRUE }
};
static const GimpDialogFactoryEntry dock_entries[] =
{
{ "gimp:tool-options", dialogs_tool_options_get, 0, TRUE, FALSE, FALSE, TRUE },
{ "gimp:error-console", dialogs_error_console_get, 0, TRUE, FALSE, FALSE, TRUE },
{ "gimp:image-list", dialogs_image_list_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp:brush-list", dialogs_brush_list_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp:pattern-list", dialogs_pattern_list_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp:gradient-list", dialogs_gradient_list_view_new, 16, FALSE, FALSE, FALSE, TRUE },
{ "gimp:palette-list", dialogs_palette_list_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp:tool-list", dialogs_tool_list_view_new, 24, FALSE, FALSE, FALSE, TRUE },
{ "gimp:buffer-list", dialogs_buffer_list_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp:image-grid", dialogs_image_grid_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp:brush-grid", dialogs_brush_grid_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp:pattern-grid", dialogs_pattern_grid_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp:gradient-grid", dialogs_gradient_grid_view_new, 16, FALSE, FALSE, FALSE, TRUE },
{ "gimp:palette-grid", dialogs_palette_grid_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp:tool-grid", dialogs_tool_grid_view_new, 24, FALSE, FALSE, FALSE, TRUE },
{ "gimp:buffer-grid", dialogs_buffer_grid_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp:layer-list", dialogs_layer_list_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp:channel-list", dialogs_channel_list_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp:vectors-list", dialogs_vectors_list_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp:path-list", dialogs_path_list_view_new, 32, TRUE, FALSE, FALSE, TRUE },
{ "gimp:indexed-palette", dialogs_indexed_palette_new, 32, 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 },
{ "gimp:gradient-editor", dialogs_gradient_editor_get, 0, TRUE, FALSE, FALSE, TRUE },
{ "gimp:palette-editor", dialogs_palette_editor_get, 0, TRUE, FALSE, FALSE, TRUE }
{ "gimp-tool-options", dialogs_tool_options_get, 0, TRUE, FALSE, FALSE, TRUE },
{ "gimp-error-console", dialogs_error_console_get, 0, TRUE, FALSE, FALSE, TRUE },
{ "gimp-image-list", dialogs_image_list_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp-brush-list", dialogs_brush_list_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp-pattern-list", dialogs_pattern_list_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp-gradient-list", dialogs_gradient_list_view_new, 16, FALSE, FALSE, FALSE, TRUE },
{ "gimp-palette-list", dialogs_palette_list_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp-tool-list", dialogs_tool_list_view_new, 24, FALSE, FALSE, FALSE, TRUE },
{ "gimp-buffer-list", dialogs_buffer_list_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp-image-grid", dialogs_image_grid_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp-brush-grid", dialogs_brush_grid_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp-pattern-grid", dialogs_pattern_grid_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp-gradient-grid", dialogs_gradient_grid_view_new, 16, FALSE, FALSE, FALSE, TRUE },
{ "gimp-palette-grid", dialogs_palette_grid_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp-tool-grid", dialogs_tool_grid_view_new, 24, FALSE, FALSE, FALSE, TRUE },
{ "gimp-buffer-grid", dialogs_buffer_grid_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp-layer-list", dialogs_layer_list_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp-channel-list", dialogs_channel_list_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp-vectors-list", dialogs_vectors_list_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp-path-list", dialogs_path_list_view_new, 32, TRUE, FALSE, FALSE, TRUE },
{ "gimp-indexed-palette", dialogs_indexed_palette_new, 32, 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 },
{ "gimp-gradient-editor", dialogs_gradient_editor_get, 0, TRUE, FALSE, FALSE, TRUE },
{ "gimp-palette-editor", dialogs_palette_editor_get, 0, TRUE, FALSE, FALSE, TRUE }
};
......
......@@ -1033,7 +1033,7 @@ gimp_display_shell_hruler_button_press (GtkWidget *widget,
tool_info = (GimpToolInfo *)
gimp_container_get_child_by_name (gdisp->gimage->gimp->tool_info_list,
"gimp:move_tool");
"gimp-move-tool");
if (tool_info)
{
......@@ -1077,7 +1077,7 @@ gimp_display_shell_vruler_button_press (GtkWidget *widget,
tool_info = (GimpToolInfo *)
gimp_container_get_child_by_name (gdisp->gimage->gimp->tool_info_list,
"gimp:move_tool");
"gimp-move-tool");
if (tool_info)
{
......
......@@ -100,7 +100,7 @@ gimp_display_shell_bucket_fill (GimpImage *gimage,
/* Get the bucket fill context */
tool_info = (GimpToolInfo *)
gimp_container_get_child_by_name (gimage->gimp->tool_info_list,
"gimp:bucket_fill_tool");
"gimp-bucket-fill-tool");
if (tool_info && tool_info->context)
{
......
......@@ -305,10 +305,10 @@ dialogs_create_lc_cmd_callback (GtkWidget *widget,
const gchar *tabs[] =
{
"gimp:layer-list",
"gimp:channel-list",
"gimp:vectors-list",
"gimp:indexed-palette"
"gimp-layer-list",
"gimp-channel-list",
"gimp-vectors-list",
"gimp-indexed-palette"
};
gint i;
......@@ -343,13 +343,13 @@ dialogs_create_stuff_cmd_callback (GtkWidget *widget,
const gchar *tabs[] =
{
"gimp:brush-grid",
"gimp:pattern-grid",
"gimp:gradient-list",
"gimp:palette-list",
"gimp:buffer-list",
"gimp:image-list",
"gimp:document-history"
"gimp-brush-grid",
"gimp-pattern-grid",
"gimp-gradient-list",
"gimp-palette-list",
"gimp-buffer-list",
"gimp-image-list",
"gimp-document-history"
};
gint i;
......
......@@ -839,7 +839,7 @@ void
dialogs_edit_brush_func (GimpData *data)
{
gimp_dialog_factory_dialog_raise (global_dock_factory,
"gimp:brush-editor",
"gimp-brush-editor",
-1);
gimp_data_editor_set_data (brush_editor, data);
......@@ -866,7 +866,7 @@ void
dialogs_edit_gradient_func (GimpData *data)
{
gimp_dialog_factory_dialog_raise (global_dock_factory,
"gimp:gradient-editor",
"gimp-gradient-editor",
-1);
gimp_data_editor_set_data (gradient_editor, data);
......@@ -893,7 +893,7 @@ void
dialogs_edit_palette_func (GimpData *data)
{
gimp_dialog_factory_dialog_raise (global_dock_factory,
"gimp:palette-editor",
"gimp-palette-editor",
-1);
gimp_data_editor_set_data (palette_editor, data);
......
......@@ -39,47 +39,47 @@ GimpDialogFactory *global_toolbox_factory = NULL;
static const GimpDialogFactoryEntry toplevel_entries[] =
{
{ "gimp:device-status-dialog", dialogs_device_status_get, 32, TRUE, TRUE, FALSE, TRUE },
{ "gimp:preferences-dialog", dialogs_preferences_get, 32, TRUE, FALSE, FALSE, TRUE },
{ "gimp:module-browser-dialog", dialogs_module_browser_get, 32, TRUE, FALSE, FALSE, TRUE },
{ "gimp:undo-history-dialog", dialogs_undo_history_get, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp:display-filters-dialog", dialogs_display_filters_get, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp:tips-dialog", dialogs_tips_get, 32, TRUE, FALSE, FALSE, TRUE },
{ "gimp:about-dialog", dialogs_about_get, 32, TRUE, FALSE, FALSE, TRUE }
{ "gimp-device-status-dialog", dialogs_device_status_get, 32, TRUE, TRUE, FALSE, TRUE },
{ "gimp-preferences-dialog", dialogs_preferences_get, 32, TRUE, FALSE, FALSE, TRUE },
{ "gimp-module-browser-dialog", dialogs_module_browser_get, 32, TRUE, FALSE, FALSE, TRUE },
{ "gimp-undo-history-dialog", dialogs_undo_history_get, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp-display-filters-dialog", dialogs_display_filters_get, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp-tips-dialog", dialogs_tips_get, 32, TRUE, FALSE, FALSE, TRUE },
{ "gimp-about-dialog", dialogs_about_get, 32, TRUE, FALSE, FALSE, TRUE }
};
static const GimpDialogFactoryEntry dock_entries[] =
{
{ "gimp:tool-options", dialogs_tool_options_get, 0, TRUE, FALSE, FALSE, TRUE },
{ "gimp:error-console", dialogs_error_console_get, 0, TRUE, FALSE, FALSE, TRUE },
{ "gimp:image-list", dialogs_image_list_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp:brush-list", dialogs_brush_list_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp:pattern-list", dialogs_pattern_list_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp:gradient-list", dialogs_gradient_list_view_new, 16, FALSE, FALSE, FALSE, TRUE },
{ "gimp:palette-list", dialogs_palette_list_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp:tool-list", dialogs_tool_list_view_new, 24, FALSE, FALSE, FALSE, TRUE },
{ "gimp:buffer-list", dialogs_buffer_list_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp:image-grid", dialogs_image_grid_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp:brush-grid", dialogs_brush_grid_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp:pattern-grid", dialogs_pattern_grid_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp:gradient-grid", dialogs_gradient_grid_view_new, 16, FALSE, FALSE, FALSE, TRUE },
{ "gimp:palette-grid", dialogs_palette_grid_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp:tool-grid", dialogs_tool_grid_view_new, 24, FALSE, FALSE, FALSE, TRUE },
{ "gimp:buffer-grid", dialogs_buffer_grid_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp:layer-list", dialogs_layer_list_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp:channel-list", dialogs_channel_list_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp:vectors-list", dialogs_vectors_list_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp:path-list", dialogs_path_list_view_new, 32, TRUE, FALSE, FALSE, TRUE },
{ "gimp:indexed-palette", dialogs_indexed_palette_new, 32, 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 },
{ "gimp:gradient-editor", dialogs_gradient_editor_get, 0, TRUE, FALSE, FALSE, TRUE },
{ "gimp:palette-editor", dialogs_palette_editor_get, 0, TRUE, FALSE, FALSE, TRUE }
{ "gimp-tool-options", dialogs_tool_options_get, 0, TRUE, FALSE, FALSE, TRUE },
{ "gimp-error-console", dialogs_error_console_get, 0, TRUE, FALSE, FALSE, TRUE },
{ "gimp-image-list", dialogs_image_list_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp-brush-list", dialogs_brush_list_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp-pattern-list", dialogs_pattern_list_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp-gradient-list", dialogs_gradient_list_view_new, 16, FALSE, FALSE, FALSE, TRUE },
{ "gimp-palette-list", dialogs_palette_list_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp-tool-list", dialogs_tool_list_view_new, 24, FALSE, FALSE, FALSE, TRUE },
{ "gimp-buffer-list", dialogs_buffer_list_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp-image-grid", dialogs_image_grid_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp-brush-grid", dialogs_brush_grid_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp-pattern-grid", dialogs_pattern_grid_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp-gradient-grid", dialogs_gradient_grid_view_new, 16, FALSE, FALSE, FALSE, TRUE },
{ "gimp-palette-grid", dialogs_palette_grid_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp-tool-grid", dialogs_tool_grid_view_new, 24, FALSE, FALSE, FALSE, TRUE },
{ "gimp-buffer-grid", dialogs_buffer_grid_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp-layer-list", dialogs_layer_list_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp-channel-list", dialogs_channel_list_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp-vectors-list", dialogs_vectors_list_view_new, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp-path-list", dialogs_path_list_view_new, 32, TRUE, FALSE, FALSE, TRUE },
{ "gimp-indexed-palette", dialogs_indexed_palette_new, 32, 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 },
{ "gimp-gradient-editor", dialogs_gradient_editor_get, 0, TRUE, FALSE, FALSE, TRUE },
{ "gimp-palette-editor", dialogs_palette_editor_get, 0, TRUE, FALSE, FALSE, TRUE }
};
......
......@@ -229,7 +229,7 @@ void
edit_named_paste_cmd_callback (GtkWidget *widget,
gpointer data)
{
gimp_dialog_factory_dialog_raise (global_dock_factory, "gimp:buffer-list", -1);
gimp_dialog_factory_dialog_raise (global_dock_factory, "gimp-buffer-list", -1);
}
void
......
......@@ -267,7 +267,7 @@ gui_post_init (Gimp *gimp)
if (gimprc.show_tips)
{
gimp_dialog_factory_dialog_new (global_dialog_factory,
"gimp:tips-dialog", -1);
"gimp-tips-dialog", -1);
}
}
......@@ -411,7 +411,7 @@ gui_message (Gimp *gimp,
case GIMP_ERROR_CONSOLE:
gimp_dialog_factory_dialog_raise (global_dock_factory,
"gimp:error-console", -1);
"gimp-error-console", -1);
error_console_add (gimp, message);
break;
......
......@@ -140,7 +140,7 @@ static GimpItemFactoryEntry toolbox_entries[] =
{ { N_("/File/Preferences..."), NULL,
dialogs_create_toplevel_cmd_callback, 0,
"<StockItem>", GTK_STOCK_PREFERENCES },
"gimp:preferences-dialog",
"gimp-preferences-dialog",
"file/dialogs/preferences/preferences.html", NULL },
/* <Toolbox>/File/Dialogs */
......@@ -155,55 +155,55 @@ static GimpItemFactoryEntry toolbox_entries[] =
NULL, NULL },
{ { N_("/File/Dialogs/Tool Options..."), "<control><shift>T",
dialogs_create_dockable_cmd_callback, 0 },
"gimp:tool-options",
"gimp-tool-options",
"file/dialogs/tool_options.html", NULL },
{ { N_("/File/Dialogs/Device Status..."), NULL,
dialogs_create_toplevel_cmd_callback, 0 },
"gimp:device-status-dialog",
"gimp-device-status-dialog",
"file/dialogs/device_status.html", NULL },
SEPARATOR ("/File/Dialogs/---"),
{ { N_("/File/Dialogs/Brushes..."), "<control><shift>B",
dialogs_create_dockable_cmd_callback, 0 },
"gimp:brush-grid",
"gimp-brush-grid",
"file/dialogs/brush_selection.html", NULL },
{ { N_("/File/Dialogs/Patterns..."), "<control><shift>P",
dialogs_create_dockable_cmd_callback, 0 },
"gimp:pattern-grid",
"gimp-pattern-grid",
"file/dialogs/pattern_selection.html", NULL },
{ { N_("/File/Dialogs/Gradients..."), "<control>G",
dialogs_create_dockable_cmd_callback, 0 },
"gimp:gradient-list",
"gimp-gradient-list",
"file/dialogs/gradient_selection.html", NULL },
{ { N_("/File/Dialogs/Palettes..."), "<control>P",
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GTK_STOCK_SELECT_COLOR },
"gimp:palette-list",
"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",
"gimp-indexed-palette",
"file/dialogs/indexed_palette.html", NULL },
{ { N_("/File/Dialogs/Buffers..."), NULL,
dialogs_create_dockable_cmd_callback, 0 },
"gimp:buffer-list",
"gimp-buffer-list",
NULL, NULL },
{ { N_("/File/Dialogs/Images..."), NULL,
dialogs_create_dockable_cmd_callback, 0 },
"gimp:image-list",
"gimp-image-list",
NULL, NULL },
SEPARATOR ("/File/Dialogs/---"),
{ { N_("/File/Dialogs/Document History..."), NULL,
dialogs_create_dockable_cmd_callback, 0 },
"gimp:document-history",
"gimp-document-history",
"file/dialogs/document_index.html", NULL },
{ { N_("/File/Dialogs/Error Console..."), NULL,
dialogs_create_dockable_cmd_callback, 0 },
"gimp:error-console",
"gimp-error-console",
"file/dialogs/error_console.html", NULL },
#ifdef ENABLE_DEBUG_ENTRIES
......@@ -236,7 +236,7 @@ static GimpItemFactoryEntry toolbox_entries[] =
{ { N_("/Xtns/Module Browser..."), NULL,
dialogs_create_toplevel_cmd_callback, 0 },
"gimp:module-browser-dialog",
"gimp-module-browser-dialog",
"dialogs/module_browser.html", NULL },
SEPARATOR ("/Xtns/---"),
......@@ -257,11 +257,11 @@ static GimpItemFactoryEntry toolbox_entries[] =
"help/context_help.html", NULL },
{ { N_("/Help/Tip of the Day..."), NULL,
dialogs_create_toplevel_cmd_callback, 0 },
"gimp:tips-dialog",
"gimp-tips-dialog",
"help/dialogs/tip_of_the_day.html", NULL },
{ { N_("/Help/About..."), NULL,
dialogs_create_toplevel_cmd_callback, 0 },
"gimp:about-dialog",
"gimp-about-dialog",
"help/dialogs/about.html", NULL }
};
......@@ -657,7 +657,7 @@ static GimpItemFactoryEntry image_entries[] =
{ { N_("/Image/Undo History..."), NULL,
dialogs_create_toplevel_cmd_callback, 0 },
"gimp:undo-history-dialog",
"gimp-undo-history-dialog",