Commit c911a1a3 authored by Akkana Peck's avatar Akkana Peck

app/actions/image-actions.c app/tools/gimpaligntool.c

	* app/actions/image-actions.c
	* app/tools/gimpaligntool.c
	* menus/image-menu.xml.in
	* plug-ins/common/AlienMap2.c
	* plug-ins/common/autostretch_hsv.c
	* plug-ins/common/borderaverage.c
	* plug-ins/common/c_astretch.c
	* plug-ins/common/ccanalyze.c
	* plug-ins/common/channel_mixer.c
	* plug-ins/common/color_enhance.c
	* plug-ins/common/colorify.c
	* plug-ins/common/colortoalpha.c
	* plug-ins/common/compose.c
	* plug-ins/common/decompose.c
	* plug-ins/common/exchange.c
	* plug-ins/common/fp.c
	* plug-ins/common/gradmap.c
	* plug-ins/common/hot.c
	* plug-ins/common/mapcolor.c
	* plug-ins/common/max_rgb.c
	* plug-ins/common/normalize.c
	* plug-ins/common/retinex.c
	* plug-ins/common/sample_colorize.c
	* plug-ins/common/semiflatten.c
	* plug-ins/common/smooth_palette.c
	* plug-ins/common/vinvert.c
	* plug-ins/rcm/rcm.c
	* plug-ins/script-fu/scripts/hsv-graph.scm: Move all color-related
	functions from the Image and Filters menus to a new toplevel
	Colors menu (as discussed in bug 116145).
parent da9eb037
2005-08-15 Akkana Peck <akkana@cvs.gnome.org>
* app/actions/image-actions.c
* app/tools/gimpaligntool.c
* menus/image-menu.xml.in
* plug-ins/common/AlienMap2.c
* plug-ins/common/autostretch_hsv.c
* plug-ins/common/borderaverage.c
* plug-ins/common/c_astretch.c
* plug-ins/common/ccanalyze.c
* plug-ins/common/channel_mixer.c
* plug-ins/common/color_enhance.c
* plug-ins/common/colorify.c
* plug-ins/common/colortoalpha.c
* plug-ins/common/compose.c
* plug-ins/common/decompose.c
* plug-ins/common/exchange.c
* plug-ins/common/fp.c
* plug-ins/common/gradmap.c
* plug-ins/common/hot.c
* plug-ins/common/mapcolor.c
* plug-ins/common/max_rgb.c
* plug-ins/common/normalize.c
* plug-ins/common/retinex.c
* plug-ins/common/sample_colorize.c
* plug-ins/common/semiflatten.c
* plug-ins/common/smooth_palette.c
* plug-ins/common/vinvert.c
* plug-ins/rcm/rcm.c
* plug-ins/script-fu/scripts/hsv-graph.scm: Move all color-related
functions from the Image and Filters menus to a new toplevel
Colors menu (as discussed in bug 116145).
2005-08-16 Sven Neumann <sven@gimp.org>
* configure.in: define G_DISABLE_DEPRECATED unless glib >= 2.9.0.
......
......@@ -57,7 +57,7 @@ static GimpActionEntry image_actions[] =
{ "extensions-menu", NULL, N_("_Xtns") },
{ "image-menu", NULL, N_("_Image") },
{ "image-mode-menu", NULL, N_("_Mode") },
{ "image-mode-menu", NULL, N_("_Image Mode") },
{ "image-transform-menu", NULL, N_("_Transform") },
{ "image-guides-menu", NULL, N_("_Guides") },
......
......@@ -588,7 +588,8 @@ do_horizontal_alignment (GtkWidget *widget,
align_tool->ref_horz_align_type,
align_tool->horz_offset);
gimp_image_flush (GIMP_TOOL (align_tool)->gdisp->gimage);
if (GIMP_TOOL (align_tool)->gdisp)
gimp_image_flush (GIMP_TOOL (align_tool)->gdisp->gimage);
gimp_draw_tool_resume (GIMP_DRAW_TOOL (align_tool));
}
......@@ -609,7 +610,8 @@ do_vertical_alignment (GtkWidget *widget,
align_tool->ref_vert_align_type,
align_tool->vert_offset);
gimp_image_flush (GIMP_TOOL (align_tool)->gdisp->gimage);
if (GIMP_TOOL (align_tool)->gdisp)
gimp_image_flush (GIMP_TOOL (align_tool)->gdisp->gimage);
gimp_draw_tool_resume (GIMP_DRAW_TOOL (align_tool));
}
......
......@@ -268,12 +268,6 @@
<placeholder name="New">
<menuitem action="image-duplicate" />
</placeholder>
<menu action="image-mode-menu" name="Mode">
<menuitem action="image-convert-rgb" />
<menuitem action="image-convert-grayscale" />
<menuitem action="image-convert-indexed" />
<separator />
</menu>
<menu action="image-transform-menu" name="Transform">
<placeholder name="Flip">
<menuitem action="image-flip-horizontal" />
......@@ -340,28 +334,6 @@
</placeholder>
<separator />
</menu>
<menu action="layers-colors-menu" name="Colors">
<menuitem action="tools-color-balance" />
<menuitem action="tools-hue-saturation" />
<menuitem action="tools-colorize" />
<menuitem action="tools-brightness-contrast" />
<menuitem action="tools-threshold" />
<menuitem action="tools-levels" />
<menuitem action="tools-curves" />
<menuitem action="tools-posterize" />
<separator />
<menuitem action="drawable-desaturate" />
<menuitem action="drawable-invert" />
<menu action="layers-colors-auto-menu" name="Auto">
<menuitem action="drawable-equalize" />
<menuitem action="drawable-levels-stretch" />
</menu>
<separator />
<placeholder name="Info">
<menuitem action="dialogs-histogram" />
</placeholder>
<separator />
</menu>
<menu action="layers-mask-menu" name="Mask">
<placeholder name="Modify">
<menuitem action="layers-mask-add" />
......@@ -450,6 +422,37 @@
<separator />
</menu>
<menu action="layers-colors-menu" name="Colors">
<menu action="image-mode-menu" name="Image Mode">
<menuitem action="image-convert-rgb" />
<menuitem action="image-convert-grayscale" />
<menuitem action="image-convert-indexed" />
</menu>
<separator />
<menuitem action="tools-color-balance" />
<menuitem action="tools-hue-saturation" />
<menuitem action="tools-colorize" />
<menuitem action="tools-brightness-contrast" />
<menuitem action="tools-threshold" />
<menuitem action="tools-levels" />
<menuitem action="tools-curves" />
<menuitem action="tools-posterize" />
<separator />
<menuitem action="drawable-desaturate" />
<menuitem action="drawable-invert" />
<menu action="layers-colors-auto-menu" name="Auto">
<menuitem action="drawable-equalize" />
<menuitem action="drawable-levels-stretch" />
</menu>
<separator />
<placeholder name="Info">
<menuitem action="dialogs-histogram" />
</placeholder>
<separator />
<menu action="plug-in-colors-map-menu" name="Map" />
<placeholder action="plug-in-colors-menu" name="Color Plug-Ins" />
</menu>
<menu action="tools-menu" name="Tools">
<menuitem action="dialogs-toolbox" />
<menuitem action="context-colors-default" />
......@@ -520,9 +523,6 @@
<menu action="plug-in-blur-menu" name="Blur" />
<menu action="plug-in-enhance-menu" name="Enhance" />
<menu action="plug-in-distorts-menu" name="Distorts" />
<menu action="plug-in-colors-menu" name="Colors">
<menu action="plug-in-colors-map-menu" name="Map" />
</menu>
<menu action="plug-in-light-shadow-menu" name="Light and Shadow">
<placeholder name="Light" />
<separator />
......
......@@ -193,7 +193,7 @@ query (void)
G_N_ELEMENTS (args), 0,
args, NULL);
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Filters/Colors/Map");
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Colors/Map");
}
static void
......
......@@ -86,7 +86,7 @@ query (void)
G_N_ELEMENTS (args), 0,
args, NULL);
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Layer/Colors/Auto");
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Colors/Auto");
}
static void
......
......@@ -108,7 +108,7 @@ query (void)
G_N_ELEMENTS (return_vals),
args, return_vals);
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Filters/Colors");
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Colors");
}
static void
......
......@@ -84,7 +84,7 @@ query (void)
G_N_ELEMENTS (args), 0,
args, NULL);
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Layer/Colors/Auto");
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Colors/Auto");
}
static void
......
......@@ -116,8 +116,7 @@ query (void)
G_N_ELEMENTS (args), G_N_ELEMENTS (return_vals),
args, return_vals);
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Filters/Colors");
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Layer/Colors/Info");
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Colors/Info");
}
/* main function */
......
......@@ -187,7 +187,7 @@ query (void)
G_N_ELEMENTS (args), 0,
args, NULL);
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Filters/Colors");
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Colors");
}
/*----------------------------------------------------------------------
......
......@@ -86,7 +86,7 @@ query (void)
G_N_ELEMENTS (args), 0,
args, NULL);
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Layer/Colors/Auto");
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Colors/Auto");
}
static void
......
......@@ -113,7 +113,7 @@ query (void)
G_N_ELEMENTS (args), 0,
args, NULL);
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Filters/Colors");
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Colors");
}
static void
......
......@@ -106,8 +106,10 @@ query (void)
G_N_ELEMENTS (args), 0,
args, NULL);
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Filters/Colors");
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Layer/Transparency/Modify");
gimp_plugin_menu_register ("plug_in_colortoalpha",
"<Image>/Colors");
gimp_plugin_menu_register ("plug_in_colortoalpha",
"<Image>/Layer/Transparency/Modify");
}
static void
......
......@@ -323,8 +323,8 @@ query (void)
G_N_ELEMENTS (return_vals),
args, return_vals);
gimp_plugin_menu_register (COMPOSE_PROC, "<Image>/Filters/Colors");
gimp_plugin_menu_register (COMPOSE_PROC, "<Image>/Image/Mode");
gimp_plugin_menu_register (COMPOSE_PROC, "<Image>/Colors");
gimp_plugin_menu_register (COMPOSE_PROC, "<Image>/Colors/Image Mode");
gimp_install_procedure (DRAWABLE_COMPOSE_PROC,
"Compose an image from multiple drawables of gray images",
......@@ -355,8 +355,8 @@ query (void)
G_N_ELEMENTS (recompose_args), 0,
recompose_args, NULL);
gimp_plugin_menu_register (RECOMPOSE_PROC, "<Image>/Filters/Colors");
gimp_plugin_menu_register (RECOMPOSE_PROC, "<Image>/Image/Mode");
gimp_plugin_menu_register (RECOMPOSE_PROC, "<Image>/Colors");
gimp_plugin_menu_register (RECOMPOSE_PROC, "<Image>/Colors/Image Mode");
}
......
......@@ -253,8 +253,8 @@ query (void)
G_N_ELEMENTS (return_vals),
args, return_vals);
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Filters/Colors");
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Image/Mode");
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Colors");
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Colors/Image Mode");
}
static void
......
......@@ -132,7 +132,7 @@ query (void)
G_N_ELEMENTS (args), 0,
args, NULL);
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Filters/Colors/Map");
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Colors/Map");
}
/* main function */
......
......@@ -332,7 +332,7 @@ query (void)
G_N_ELEMENTS (args), 0,
args, NULL);
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Filters/Colors");
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Colors");
}
/********************************STANDARD RUN*************************/
......
......@@ -101,7 +101,7 @@ query (void)
G_N_ELEMENTS (args), 0,
args, NULL);
gimp_plugin_menu_register (GRADMAP_PROC, "<Image>/Filters/Colors/Map");
gimp_plugin_menu_register (GRADMAP_PROC, "<Image>/Colors/Map");
gimp_install_procedure (PALETTEMAP_PROC,
"Map the contents of the specified drawable with "
......@@ -124,7 +124,7 @@ query (void)
G_N_ELEMENTS (args), 0,
args, NULL);
gimp_plugin_menu_register (PALETTEMAP_PROC, "<Image>/Filters/Colors/Map");
gimp_plugin_menu_register (PALETTEMAP_PROC, "<Image>/Colors/Map");
}
static void
......
......@@ -220,7 +220,7 @@ query (void)
G_N_ELEMENTS (args), 0,
args, NULL);
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Filters/Colors");
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Colors");
}
static void
......
......@@ -155,7 +155,7 @@ query (void)
G_N_ELEMENTS (adjust_args), 0,
adjust_args, NULL);
gimp_plugin_menu_register (COLOR_ADJUST_PROC, "<Image>/Filters/Colors/Map");
gimp_plugin_menu_register (COLOR_ADJUST_PROC, "<Image>/Colors/Map");
gimp_install_procedure (COLOR_MAP_PROC,
"Map color range specified by two colors"
......@@ -172,7 +172,7 @@ query (void)
G_N_ELEMENTS (map_args), 0,
map_args, NULL);
gimp_plugin_menu_register (COLOR_MAP_PROC, "<Image>/Filters/Colors/Map");
gimp_plugin_menu_register (COLOR_MAP_PROC, "<Image>/Colors/Map");
}
......
......@@ -103,7 +103,7 @@ query (void)
G_N_ELEMENTS (args), 0,
args, NULL);
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Filters/Colors");
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Colors");
}
static void
......
......@@ -93,7 +93,7 @@ query (void)
G_N_ELEMENTS (args), 0,
args, NULL);
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Layer/Colors/Auto");
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Colors/Auto");
}
static void
......
......@@ -171,7 +171,7 @@ query (void)
G_N_ELEMENTS (args), 0,
args, NULL);
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Filters/Colors");
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Colors");
}
static void
......
......@@ -307,7 +307,7 @@ query (void)
G_N_ELEMENTS (args), 0,
args, NULL);
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Filters/Colors/Map");
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Colors/Map");
}
static void
......
......@@ -80,7 +80,7 @@ query (void)
G_N_ELEMENTS (args), 0,
args, NULL);
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Filters/Colors");
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Colors");
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Layer/Transparency/Modify");
}
......
......@@ -91,7 +91,7 @@ query (void)
G_N_ELEMENTS (args), G_N_ELEMENTS (return_vals),
args, return_vals);
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Filters/Colors");
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Colors");
}
static struct
......
......@@ -87,7 +87,7 @@ query (void)
G_N_ELEMENTS (args), 0,
args, NULL);
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Filters/Colors");
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Colors");
}
static void
......
......@@ -106,7 +106,7 @@ query (void)
G_N_ELEMENTS (args), 0,
args, NULL);
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Filters/Colors/Map");
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Colors/Map");
}
......
......@@ -349,4 +349,4 @@
SF-ADJUSTMENT _"End Y" (cons script-fu-hsv-graph-end-y '(0 5000 1 10 0 1)))
(script-fu-menu-register "script-fu-hsv-graph"
"<Image>/Filters/Colors")
"<Image>/Colors")
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment