Commit e51e4902 authored by Manish Singh's avatar Manish Singh

Applied Sven's menu patch

-Yosh
parent 2ce0e150
Sat Jan 24 18:16:35 PST 1998 Manish Singh <yosh@gimp.org>
* applied Sven's menu patch
Sat Jan 24 17:23:13 PST 1998 Manish Singh <yosh@gimp.org> Sat Jan 24 17:23:13 PST 1998 Manish Singh <yosh@gimp.org>
* app/indexed_palette.c: fix for wrong color selected in indexed * app/indexed_palette.c: fix for wrong color selected in indexed
......
...@@ -1014,8 +1014,7 @@ gdisplay_set_menu_sensitivity (GDisplay *gdisp) ...@@ -1014,8 +1014,7 @@ gdisplay_set_menu_sensitivity (GDisplay *gdisp)
menus_set_sensitive ("<Image>/Edit/Stroke", lp); menus_set_sensitive ("<Image>/Edit/Stroke", lp);
menus_set_sensitive ("<Image>/Edit/Cut Named", lp); menus_set_sensitive ("<Image>/Edit/Cut Named", lp);
menus_set_sensitive ("<Image>/Edit/Copy Named", lp); menus_set_sensitive ("<Image>/Edit/Copy Named", lp);
menus_set_sensitive ("<Image>/Image/Map", lp); menus_set_sensitive ("<Image>/Image/Colors", lp);
menus_set_sensitive ("<Image>/Image/Adjust", lp);
menus_set_sensitive ("<Image>/Image/Channel Ops/Offset", lp); menus_set_sensitive ("<Image>/Image/Channel Ops/Offset", lp);
menus_set_sensitive ("<Image>/Image/Histogram", lp); menus_set_sensitive ("<Image>/Image/Histogram", lp);
menus_set_sensitive ("<Image>/Filters", lp); menus_set_sensitive ("<Image>/Filters", lp);
......
...@@ -1014,8 +1014,7 @@ gdisplay_set_menu_sensitivity (GDisplay *gdisp) ...@@ -1014,8 +1014,7 @@ gdisplay_set_menu_sensitivity (GDisplay *gdisp)
menus_set_sensitive ("<Image>/Edit/Stroke", lp); menus_set_sensitive ("<Image>/Edit/Stroke", lp);
menus_set_sensitive ("<Image>/Edit/Cut Named", lp); menus_set_sensitive ("<Image>/Edit/Cut Named", lp);
menus_set_sensitive ("<Image>/Edit/Copy Named", lp); menus_set_sensitive ("<Image>/Edit/Copy Named", lp);
menus_set_sensitive ("<Image>/Image/Map", lp); menus_set_sensitive ("<Image>/Image/Colors", lp);
menus_set_sensitive ("<Image>/Image/Adjust", lp);
menus_set_sensitive ("<Image>/Image/Channel Ops/Offset", lp); menus_set_sensitive ("<Image>/Image/Channel Ops/Offset", lp);
menus_set_sensitive ("<Image>/Image/Histogram", lp); menus_set_sensitive ("<Image>/Image/Histogram", lp);
menus_set_sensitive ("<Image>/Filters", lp); menus_set_sensitive ("<Image>/Filters", lp);
......
...@@ -1014,8 +1014,7 @@ gdisplay_set_menu_sensitivity (GDisplay *gdisp) ...@@ -1014,8 +1014,7 @@ gdisplay_set_menu_sensitivity (GDisplay *gdisp)
menus_set_sensitive ("<Image>/Edit/Stroke", lp); menus_set_sensitive ("<Image>/Edit/Stroke", lp);
menus_set_sensitive ("<Image>/Edit/Cut Named", lp); menus_set_sensitive ("<Image>/Edit/Cut Named", lp);
menus_set_sensitive ("<Image>/Edit/Copy Named", lp); menus_set_sensitive ("<Image>/Edit/Copy Named", lp);
menus_set_sensitive ("<Image>/Image/Map", lp); menus_set_sensitive ("<Image>/Image/Colors", lp);
menus_set_sensitive ("<Image>/Image/Adjust", lp);
menus_set_sensitive ("<Image>/Image/Channel Ops/Offset", lp); menus_set_sensitive ("<Image>/Image/Channel Ops/Offset", lp);
menus_set_sensitive ("<Image>/Image/Histogram", lp); menus_set_sensitive ("<Image>/Image/Histogram", lp);
menus_set_sensitive ("<Image>/Filters", lp); menus_set_sensitive ("<Image>/Filters", lp);
......
...@@ -59,9 +59,7 @@ static GtkMenuEntry menu_items[] = ...@@ -59,9 +59,7 @@ static GtkMenuEntry menu_items[] =
{ "<Toolbox>/File/Dialogs/Gradient Editor...", "<control>G", dialogs_gradient_editor_cmd_callback, NULL }, { "<Toolbox>/File/Dialogs/Gradient Editor...", "<control>G", dialogs_gradient_editor_cmd_callback, NULL },
{ "<Toolbox>/File/Dialogs/Tool Options...", "<control><shift>T", dialogs_tools_options_cmd_callback, NULL }, { "<Toolbox>/File/Dialogs/Tool Options...", "<control><shift>T", dialogs_tools_options_cmd_callback, NULL },
{"<Toolbox>/File/<separator>",NULL,NULL,NULL}, { "<Toolbox>/File/<separator>",NULL,NULL,NULL},
{ "<Toolbox>/File/Quit", "<control>Q", file_quit_cmd_callback, NULL }, { "<Toolbox>/File/Quit", "<control>Q", file_quit_cmd_callback, NULL },
...@@ -73,11 +71,9 @@ static GtkMenuEntry menu_items[] = ...@@ -73,11 +71,9 @@ static GtkMenuEntry menu_items[] =
{ "<Image>/File/<separator>", NULL, NULL, NULL }, { "<Image>/File/<separator>", NULL, NULL, NULL },
{ "<Image>/File/Close", "<control>W", file_close_cmd_callback, NULL }, { "<Image>/File/Close", "<control>W", file_close_cmd_callback, NULL },
{ "<Image>/File/Quit", "<control>Q", file_quit_cmd_callback, NULL }, { "<Image>/File/Quit", "<control>Q", file_quit_cmd_callback, NULL },
{ "<Image>/File/<separator>", NULL, NULL, NULL },
{ "<Image>/Edit/Cut", "<control>X", edit_cut_cmd_callback, NULL }, { "<Image>/Edit/Cut", "<control>X", edit_cut_cmd_callback, NULL },
{ "<Image>/Edit/Copy", "<control>C", edit_copy_cmd_callback, NULL }, { "<Image>/Edit/Copy", "<control>C", edit_copy_cmd_callback, NULL },
...@@ -92,6 +88,7 @@ static GtkMenuEntry menu_items[] = ...@@ -92,6 +88,7 @@ static GtkMenuEntry menu_items[] =
{ "<Image>/Edit/Cut Named", "<control><shift>X", edit_named_cut_cmd_callback, NULL }, { "<Image>/Edit/Cut Named", "<control><shift>X", edit_named_cut_cmd_callback, NULL },
{ "<Image>/Edit/Copy Named", "<control><shift>C", edit_named_copy_cmd_callback, NULL }, { "<Image>/Edit/Copy Named", "<control><shift>C", edit_named_copy_cmd_callback, NULL },
{ "<Image>/Edit/Paste Named", "<control><shift>V", edit_named_paste_cmd_callback, NULL }, { "<Image>/Edit/Paste Named", "<control><shift>V", edit_named_paste_cmd_callback, NULL },
{ "<Image>/Edit/<separator>", NULL, NULL, NULL },
{ "<Image>/Select/Toggle", "<control>T", select_toggle_cmd_callback, NULL }, { "<Image>/Select/Toggle", "<control>T", select_toggle_cmd_callback, NULL },
{ "<Image>/Select/Invert", "<control>I", select_invert_cmd_callback, NULL }, { "<Image>/Select/Invert", "<control>I", select_invert_cmd_callback, NULL },
...@@ -125,17 +122,18 @@ static GtkMenuEntry menu_items[] = ...@@ -125,17 +122,18 @@ static GtkMenuEntry menu_items[] =
{ "<Image>/View/New View", NULL, view_new_view_cmd_callback, NULL }, { "<Image>/View/New View", NULL, view_new_view_cmd_callback, NULL },
{ "<Image>/View/Shrink Wrap", "<control>E", view_shrink_wrap_cmd_callback, NULL }, { "<Image>/View/Shrink Wrap", "<control>E", view_shrink_wrap_cmd_callback, NULL },
{ "<Image>/Image/Map/Equalize", NULL, image_equalize_cmd_callback, NULL }, { "<Image>/Image/Colors/Equalize", NULL, image_equalize_cmd_callback, NULL },
{ "<Image>/Image/Map/Invert", NULL, image_invert_cmd_callback, NULL }, { "<Image>/Image/Colors/Invert", NULL, image_invert_cmd_callback, NULL },
{ "<Image>/Image/Map/Posterize", NULL, image_posterize_cmd_callback, NULL }, { "<Image>/Image/Colors/Posterize", NULL, image_posterize_cmd_callback, NULL },
{ "<Image>/Image/Map/Threshold", NULL, image_threshold_cmd_callback, NULL }, { "<Image>/Image/Colors/Threshold", NULL, image_threshold_cmd_callback, NULL },
{ "<Image>/Image/Adjust/Color Balance", NULL, image_color_balance_cmd_callback, NULL }, { "<Image>/Image/Colors/<separator>", NULL, NULL, NULL },
{ "<Image>/Image/Adjust/Brightness-Contrast", NULL, image_brightness_contrast_cmd_callback, NULL }, { "<Image>/Image/Colors/Color Balance", NULL, image_color_balance_cmd_callback, NULL },
{ "<Image>/Image/Adjust/Hue-Saturation", NULL, image_hue_saturation_cmd_callback, NULL }, { "<Image>/Image/Colors/Brightness-Contrast", NULL, image_brightness_contrast_cmd_callback, NULL },
{ "<Image>/Image/Adjust/Curves", NULL, image_curves_cmd_callback, NULL }, { "<Image>/Image/Colors/Hue-Saturation", NULL, image_hue_saturation_cmd_callback, NULL },
{ "<Image>/Image/Adjust/Levels", NULL, image_levels_cmd_callback, NULL }, { "<Image>/Image/Colors/Curves", NULL, image_curves_cmd_callback, NULL },
{ "<Image>/Image/Adjust/<separator>", NULL, NULL, NULL }, { "<Image>/Image/Colors/Levels", NULL, image_levels_cmd_callback, NULL },
{ "<Image>/Image/Adjust/Desaturate", NULL, image_desaturate_cmd_callback, NULL }, { "<Image>/Image/Colors/<separator>", NULL, NULL, NULL },
{ "<Image>/Image/Colors/Desaturate", NULL, image_desaturate_cmd_callback, NULL },
{ "<Image>/Image/Channel Ops/Duplicate", "<control>D", channel_ops_duplicate_cmd_callback, NULL }, { "<Image>/Image/Channel Ops/Duplicate", "<control>D", channel_ops_duplicate_cmd_callback, NULL },
{ "<Image>/Image/Channel Ops/Offset", "<control><shift>O", channel_ops_offset_cmd_callback, NULL }, { "<Image>/Image/Channel Ops/Offset", "<control><shift>O", channel_ops_offset_cmd_callback, NULL },
{ "<Image>/Image/<separator>", NULL, NULL, NULL }, { "<Image>/Image/<separator>", NULL, NULL, NULL },
...@@ -147,6 +145,7 @@ static GtkMenuEntry menu_items[] = ...@@ -147,6 +145,7 @@ static GtkMenuEntry menu_items[] =
{ "<Image>/Image/Scale", NULL, image_scale_cmd_callback, NULL }, { "<Image>/Image/Scale", NULL, image_scale_cmd_callback, NULL },
{ "<Image>/Image/<separator>", NULL, NULL, NULL }, { "<Image>/Image/<separator>", NULL, NULL, NULL },
{ "<Image>/Image/Histogram", NULL, image_histogram_cmd_callback, NULL }, { "<Image>/Image/Histogram", NULL, image_histogram_cmd_callback, NULL },
{ "<Image>/Image/<separator>", NULL, NULL, NULL },
{ "<Image>/Layers/Layers & Channels...", "<control>L", dialogs_lc_cmd_callback, NULL }, { "<Image>/Layers/Layers & Channels...", "<control>L", dialogs_lc_cmd_callback, NULL },
{ "<Image>/Layers/Raise Layer", "<control>F", layers_raise_cmd_callback, NULL }, { "<Image>/Layers/Raise Layer", "<control>F", layers_raise_cmd_callback, NULL },
......
...@@ -59,9 +59,7 @@ static GtkMenuEntry menu_items[] = ...@@ -59,9 +59,7 @@ static GtkMenuEntry menu_items[] =
{ "<Toolbox>/File/Dialogs/Gradient Editor...", "<control>G", dialogs_gradient_editor_cmd_callback, NULL }, { "<Toolbox>/File/Dialogs/Gradient Editor...", "<control>G", dialogs_gradient_editor_cmd_callback, NULL },
{ "<Toolbox>/File/Dialogs/Tool Options...", "<control><shift>T", dialogs_tools_options_cmd_callback, NULL }, { "<Toolbox>/File/Dialogs/Tool Options...", "<control><shift>T", dialogs_tools_options_cmd_callback, NULL },
{"<Toolbox>/File/<separator>",NULL,NULL,NULL}, { "<Toolbox>/File/<separator>",NULL,NULL,NULL},
{ "<Toolbox>/File/Quit", "<control>Q", file_quit_cmd_callback, NULL }, { "<Toolbox>/File/Quit", "<control>Q", file_quit_cmd_callback, NULL },
...@@ -73,11 +71,9 @@ static GtkMenuEntry menu_items[] = ...@@ -73,11 +71,9 @@ static GtkMenuEntry menu_items[] =
{ "<Image>/File/<separator>", NULL, NULL, NULL }, { "<Image>/File/<separator>", NULL, NULL, NULL },
{ "<Image>/File/Close", "<control>W", file_close_cmd_callback, NULL }, { "<Image>/File/Close", "<control>W", file_close_cmd_callback, NULL },
{ "<Image>/File/Quit", "<control>Q", file_quit_cmd_callback, NULL }, { "<Image>/File/Quit", "<control>Q", file_quit_cmd_callback, NULL },
{ "<Image>/File/<separator>", NULL, NULL, NULL },
{ "<Image>/Edit/Cut", "<control>X", edit_cut_cmd_callback, NULL }, { "<Image>/Edit/Cut", "<control>X", edit_cut_cmd_callback, NULL },
{ "<Image>/Edit/Copy", "<control>C", edit_copy_cmd_callback, NULL }, { "<Image>/Edit/Copy", "<control>C", edit_copy_cmd_callback, NULL },
...@@ -92,6 +88,7 @@ static GtkMenuEntry menu_items[] = ...@@ -92,6 +88,7 @@ static GtkMenuEntry menu_items[] =
{ "<Image>/Edit/Cut Named", "<control><shift>X", edit_named_cut_cmd_callback, NULL }, { "<Image>/Edit/Cut Named", "<control><shift>X", edit_named_cut_cmd_callback, NULL },
{ "<Image>/Edit/Copy Named", "<control><shift>C", edit_named_copy_cmd_callback, NULL }, { "<Image>/Edit/Copy Named", "<control><shift>C", edit_named_copy_cmd_callback, NULL },
{ "<Image>/Edit/Paste Named", "<control><shift>V", edit_named_paste_cmd_callback, NULL }, { "<Image>/Edit/Paste Named", "<control><shift>V", edit_named_paste_cmd_callback, NULL },
{ "<Image>/Edit/<separator>", NULL, NULL, NULL },
{ "<Image>/Select/Toggle", "<control>T", select_toggle_cmd_callback, NULL }, { "<Image>/Select/Toggle", "<control>T", select_toggle_cmd_callback, NULL },
{ "<Image>/Select/Invert", "<control>I", select_invert_cmd_callback, NULL }, { "<Image>/Select/Invert", "<control>I", select_invert_cmd_callback, NULL },
...@@ -125,17 +122,18 @@ static GtkMenuEntry menu_items[] = ...@@ -125,17 +122,18 @@ static GtkMenuEntry menu_items[] =
{ "<Image>/View/New View", NULL, view_new_view_cmd_callback, NULL }, { "<Image>/View/New View", NULL, view_new_view_cmd_callback, NULL },
{ "<Image>/View/Shrink Wrap", "<control>E", view_shrink_wrap_cmd_callback, NULL }, { "<Image>/View/Shrink Wrap", "<control>E", view_shrink_wrap_cmd_callback, NULL },
{ "<Image>/Image/Map/Equalize", NULL, image_equalize_cmd_callback, NULL }, { "<Image>/Image/Colors/Equalize", NULL, image_equalize_cmd_callback, NULL },
{ "<Image>/Image/Map/Invert", NULL, image_invert_cmd_callback, NULL }, { "<Image>/Image/Colors/Invert", NULL, image_invert_cmd_callback, NULL },
{ "<Image>/Image/Map/Posterize", NULL, image_posterize_cmd_callback, NULL }, { "<Image>/Image/Colors/Posterize", NULL, image_posterize_cmd_callback, NULL },
{ "<Image>/Image/Map/Threshold", NULL, image_threshold_cmd_callback, NULL }, { "<Image>/Image/Colors/Threshold", NULL, image_threshold_cmd_callback, NULL },
{ "<Image>/Image/Adjust/Color Balance", NULL, image_color_balance_cmd_callback, NULL }, { "<Image>/Image/Colors/<separator>", NULL, NULL, NULL },
{ "<Image>/Image/Adjust/Brightness-Contrast", NULL, image_brightness_contrast_cmd_callback, NULL }, { "<Image>/Image/Colors/Color Balance", NULL, image_color_balance_cmd_callback, NULL },
{ "<Image>/Image/Adjust/Hue-Saturation", NULL, image_hue_saturation_cmd_callback, NULL }, { "<Image>/Image/Colors/Brightness-Contrast", NULL, image_brightness_contrast_cmd_callback, NULL },
{ "<Image>/Image/Adjust/Curves", NULL, image_curves_cmd_callback, NULL }, { "<Image>/Image/Colors/Hue-Saturation", NULL, image_hue_saturation_cmd_callback, NULL },
{ "<Image>/Image/Adjust/Levels", NULL, image_levels_cmd_callback, NULL }, { "<Image>/Image/Colors/Curves", NULL, image_curves_cmd_callback, NULL },
{ "<Image>/Image/Adjust/<separator>", NULL, NULL, NULL }, { "<Image>/Image/Colors/Levels", NULL, image_levels_cmd_callback, NULL },
{ "<Image>/Image/Adjust/Desaturate", NULL, image_desaturate_cmd_callback, NULL }, { "<Image>/Image/Colors/<separator>", NULL, NULL, NULL },
{ "<Image>/Image/Colors/Desaturate", NULL, image_desaturate_cmd_callback, NULL },
{ "<Image>/Image/Channel Ops/Duplicate", "<control>D", channel_ops_duplicate_cmd_callback, NULL }, { "<Image>/Image/Channel Ops/Duplicate", "<control>D", channel_ops_duplicate_cmd_callback, NULL },
{ "<Image>/Image/Channel Ops/Offset", "<control><shift>O", channel_ops_offset_cmd_callback, NULL }, { "<Image>/Image/Channel Ops/Offset", "<control><shift>O", channel_ops_offset_cmd_callback, NULL },
{ "<Image>/Image/<separator>", NULL, NULL, NULL }, { "<Image>/Image/<separator>", NULL, NULL, NULL },
...@@ -147,6 +145,7 @@ static GtkMenuEntry menu_items[] = ...@@ -147,6 +145,7 @@ static GtkMenuEntry menu_items[] =
{ "<Image>/Image/Scale", NULL, image_scale_cmd_callback, NULL }, { "<Image>/Image/Scale", NULL, image_scale_cmd_callback, NULL },
{ "<Image>/Image/<separator>", NULL, NULL, NULL }, { "<Image>/Image/<separator>", NULL, NULL, NULL },
{ "<Image>/Image/Histogram", NULL, image_histogram_cmd_callback, NULL }, { "<Image>/Image/Histogram", NULL, image_histogram_cmd_callback, NULL },
{ "<Image>/Image/<separator>", NULL, NULL, NULL },
{ "<Image>/Layers/Layers & Channels...", "<control>L", dialogs_lc_cmd_callback, NULL }, { "<Image>/Layers/Layers & Channels...", "<control>L", dialogs_lc_cmd_callback, NULL },
{ "<Image>/Layers/Raise Layer", "<control>F", layers_raise_cmd_callback, NULL }, { "<Image>/Layers/Raise Layer", "<control>F", layers_raise_cmd_callback, NULL },
......
...@@ -59,9 +59,7 @@ static GtkMenuEntry menu_items[] = ...@@ -59,9 +59,7 @@ static GtkMenuEntry menu_items[] =
{ "<Toolbox>/File/Dialogs/Gradient Editor...", "<control>G", dialogs_gradient_editor_cmd_callback, NULL }, { "<Toolbox>/File/Dialogs/Gradient Editor...", "<control>G", dialogs_gradient_editor_cmd_callback, NULL },
{ "<Toolbox>/File/Dialogs/Tool Options...", "<control><shift>T", dialogs_tools_options_cmd_callback, NULL }, { "<Toolbox>/File/Dialogs/Tool Options...", "<control><shift>T", dialogs_tools_options_cmd_callback, NULL },
{"<Toolbox>/File/<separator>",NULL,NULL,NULL}, { "<Toolbox>/File/<separator>",NULL,NULL,NULL},
{ "<Toolbox>/File/Quit", "<control>Q", file_quit_cmd_callback, NULL }, { "<Toolbox>/File/Quit", "<control>Q", file_quit_cmd_callback, NULL },
...@@ -73,11 +71,9 @@ static GtkMenuEntry menu_items[] = ...@@ -73,11 +71,9 @@ static GtkMenuEntry menu_items[] =
{ "<Image>/File/<separator>", NULL, NULL, NULL }, { "<Image>/File/<separator>", NULL, NULL, NULL },
{ "<Image>/File/Close", "<control>W", file_close_cmd_callback, NULL }, { "<Image>/File/Close", "<control>W", file_close_cmd_callback, NULL },
{ "<Image>/File/Quit", "<control>Q", file_quit_cmd_callback, NULL }, { "<Image>/File/Quit", "<control>Q", file_quit_cmd_callback, NULL },
{ "<Image>/File/<separator>", NULL, NULL, NULL },
{ "<Image>/Edit/Cut", "<control>X", edit_cut_cmd_callback, NULL }, { "<Image>/Edit/Cut", "<control>X", edit_cut_cmd_callback, NULL },
{ "<Image>/Edit/Copy", "<control>C", edit_copy_cmd_callback, NULL }, { "<Image>/Edit/Copy", "<control>C", edit_copy_cmd_callback, NULL },
...@@ -92,6 +88,7 @@ static GtkMenuEntry menu_items[] = ...@@ -92,6 +88,7 @@ static GtkMenuEntry menu_items[] =
{ "<Image>/Edit/Cut Named", "<control><shift>X", edit_named_cut_cmd_callback, NULL }, { "<Image>/Edit/Cut Named", "<control><shift>X", edit_named_cut_cmd_callback, NULL },
{ "<Image>/Edit/Copy Named", "<control><shift>C", edit_named_copy_cmd_callback, NULL }, { "<Image>/Edit/Copy Named", "<control><shift>C", edit_named_copy_cmd_callback, NULL },
{ "<Image>/Edit/Paste Named", "<control><shift>V", edit_named_paste_cmd_callback, NULL }, { "<Image>/Edit/Paste Named", "<control><shift>V", edit_named_paste_cmd_callback, NULL },
{ "<Image>/Edit/<separator>", NULL, NULL, NULL },
{ "<Image>/Select/Toggle", "<control>T", select_toggle_cmd_callback, NULL }, { "<Image>/Select/Toggle", "<control>T", select_toggle_cmd_callback, NULL },
{ "<Image>/Select/Invert", "<control>I", select_invert_cmd_callback, NULL }, { "<Image>/Select/Invert", "<control>I", select_invert_cmd_callback, NULL },
...@@ -125,17 +122,18 @@ static GtkMenuEntry menu_items[] = ...@@ -125,17 +122,18 @@ static GtkMenuEntry menu_items[] =
{ "<Image>/View/New View", NULL, view_new_view_cmd_callback, NULL }, { "<Image>/View/New View", NULL, view_new_view_cmd_callback, NULL },
{ "<Image>/View/Shrink Wrap", "<control>E", view_shrink_wrap_cmd_callback, NULL }, { "<Image>/View/Shrink Wrap", "<control>E", view_shrink_wrap_cmd_callback, NULL },
{ "<Image>/Image/Map/Equalize", NULL, image_equalize_cmd_callback, NULL }, { "<Image>/Image/Colors/Equalize", NULL, image_equalize_cmd_callback, NULL },
{ "<Image>/Image/Map/Invert", NULL, image_invert_cmd_callback, NULL }, { "<Image>/Image/Colors/Invert", NULL, image_invert_cmd_callback, NULL },
{ "<Image>/Image/Map/Posterize", NULL, image_posterize_cmd_callback, NULL }, { "<Image>/Image/Colors/Posterize", NULL, image_posterize_cmd_callback, NULL },
{ "<Image>/Image/Map/Threshold", NULL, image_threshold_cmd_callback, NULL }, { "<Image>/Image/Colors/Threshold", NULL, image_threshold_cmd_callback, NULL },
{ "<Image>/Image/Adjust/Color Balance", NULL, image_color_balance_cmd_callback, NULL }, { "<Image>/Image/Colors/<separator>", NULL, NULL, NULL },
{ "<Image>/Image/Adjust/Brightness-Contrast", NULL, image_brightness_contrast_cmd_callback, NULL }, { "<Image>/Image/Colors/Color Balance", NULL, image_color_balance_cmd_callback, NULL },
{ "<Image>/Image/Adjust/Hue-Saturation", NULL, image_hue_saturation_cmd_callback, NULL }, { "<Image>/Image/Colors/Brightness-Contrast", NULL, image_brightness_contrast_cmd_callback, NULL },
{ "<Image>/Image/Adjust/Curves", NULL, image_curves_cmd_callback, NULL }, { "<Image>/Image/Colors/Hue-Saturation", NULL, image_hue_saturation_cmd_callback, NULL },
{ "<Image>/Image/Adjust/Levels", NULL, image_levels_cmd_callback, NULL }, { "<Image>/Image/Colors/Curves", NULL, image_curves_cmd_callback, NULL },
{ "<Image>/Image/Adjust/<separator>", NULL, NULL, NULL }, { "<Image>/Image/Colors/Levels", NULL, image_levels_cmd_callback, NULL },
{ "<Image>/Image/Adjust/Desaturate", NULL, image_desaturate_cmd_callback, NULL }, { "<Image>/Image/Colors/<separator>", NULL, NULL, NULL },
{ "<Image>/Image/Colors/Desaturate", NULL, image_desaturate_cmd_callback, NULL },
{ "<Image>/Image/Channel Ops/Duplicate", "<control>D", channel_ops_duplicate_cmd_callback, NULL }, { "<Image>/Image/Channel Ops/Duplicate", "<control>D", channel_ops_duplicate_cmd_callback, NULL },
{ "<Image>/Image/Channel Ops/Offset", "<control><shift>O", channel_ops_offset_cmd_callback, NULL }, { "<Image>/Image/Channel Ops/Offset", "<control><shift>O", channel_ops_offset_cmd_callback, NULL },
{ "<Image>/Image/<separator>", NULL, NULL, NULL }, { "<Image>/Image/<separator>", NULL, NULL, NULL },
...@@ -147,6 +145,7 @@ static GtkMenuEntry menu_items[] = ...@@ -147,6 +145,7 @@ static GtkMenuEntry menu_items[] =
{ "<Image>/Image/Scale", NULL, image_scale_cmd_callback, NULL }, { "<Image>/Image/Scale", NULL, image_scale_cmd_callback, NULL },
{ "<Image>/Image/<separator>", NULL, NULL, NULL }, { "<Image>/Image/<separator>", NULL, NULL, NULL },
{ "<Image>/Image/Histogram", NULL, image_histogram_cmd_callback, NULL }, { "<Image>/Image/Histogram", NULL, image_histogram_cmd_callback, NULL },
{ "<Image>/Image/<separator>", NULL, NULL, NULL },
{ "<Image>/Layers/Layers & Channels...", "<control>L", dialogs_lc_cmd_callback, NULL }, { "<Image>/Layers/Layers & Channels...", "<control>L", dialogs_lc_cmd_callback, NULL },
{ "<Image>/Layers/Raise Layer", "<control>F", layers_raise_cmd_callback, NULL }, { "<Image>/Layers/Raise Layer", "<control>F", layers_raise_cmd_callback, NULL },
......
...@@ -59,9 +59,7 @@ static GtkMenuEntry menu_items[] = ...@@ -59,9 +59,7 @@ static GtkMenuEntry menu_items[] =
{ "<Toolbox>/File/Dialogs/Gradient Editor...", "<control>G", dialogs_gradient_editor_cmd_callback, NULL }, { "<Toolbox>/File/Dialogs/Gradient Editor...", "<control>G", dialogs_gradient_editor_cmd_callback, NULL },
{ "<Toolbox>/File/Dialogs/Tool Options...", "<control><shift>T", dialogs_tools_options_cmd_callback, NULL }, { "<Toolbox>/File/Dialogs/Tool Options...", "<control><shift>T", dialogs_tools_options_cmd_callback, NULL },
{"<Toolbox>/File/<separator>",NULL,NULL,NULL}, { "<Toolbox>/File/<separator>",NULL,NULL,NULL},
{ "<Toolbox>/File/Quit", "<control>Q", file_quit_cmd_callback, NULL }, { "<Toolbox>/File/Quit", "<control>Q", file_quit_cmd_callback, NULL },
...@@ -73,11 +71,9 @@ static GtkMenuEntry menu_items[] = ...@@ -73,11 +71,9 @@ static GtkMenuEntry menu_items[] =
{ "<Image>/File/<separator>", NULL, NULL, NULL }, { "<Image>/File/<separator>", NULL, NULL, NULL },
{ "<Image>/File/Close", "<control>W", file_close_cmd_callback, NULL }, { "<Image>/File/Close", "<control>W", file_close_cmd_callback, NULL },
{ "<Image>/File/Quit", "<control>Q", file_quit_cmd_callback, NULL }, { "<Image>/File/Quit", "<control>Q", file_quit_cmd_callback, NULL },
{ "<Image>/File/<separator>", NULL, NULL, NULL },
{ "<Image>/Edit/Cut", "<control>X", edit_cut_cmd_callback, NULL }, { "<Image>/Edit/Cut", "<control>X", edit_cut_cmd_callback, NULL },
{ "<Image>/Edit/Copy", "<control>C", edit_copy_cmd_callback, NULL }, { "<Image>/Edit/Copy", "<control>C", edit_copy_cmd_callback, NULL },
...@@ -92,6 +88,7 @@ static GtkMenuEntry menu_items[] = ...@@ -92,6 +88,7 @@ static GtkMenuEntry menu_items[] =
{ "<Image>/Edit/Cut Named", "<control><shift>X", edit_named_cut_cmd_callback, NULL }, { "<Image>/Edit/Cut Named", "<control><shift>X", edit_named_cut_cmd_callback, NULL },
{ "<Image>/Edit/Copy Named", "<control><shift>C", edit_named_copy_cmd_callback, NULL }, { "<Image>/Edit/Copy Named", "<control><shift>C", edit_named_copy_cmd_callback, NULL },
{ "<Image>/Edit/Paste Named", "<control><shift>V", edit_named_paste_cmd_callback, NULL }, { "<Image>/Edit/Paste Named", "<control><shift>V", edit_named_paste_cmd_callback, NULL },
{ "<Image>/Edit/<separator>", NULL, NULL, NULL },
{ "<Image>/Select/Toggle", "<control>T", select_toggle_cmd_callback, NULL }, { "<Image>/Select/Toggle", "<control>T", select_toggle_cmd_callback, NULL },
{ "<Image>/Select/Invert", "<control>I", select_invert_cmd_callback, NULL }, { "<Image>/Select/Invert", "<control>I", select_invert_cmd_callback, NULL },
...@@ -125,17 +122,18 @@ static GtkMenuEntry menu_items[] = ...@@ -125,17 +122,18 @@ static GtkMenuEntry menu_items[] =
{ "<Image>/View/New View", NULL, view_new_view_cmd_callback, NULL }, { "<Image>/View/New View", NULL, view_new_view_cmd_callback, NULL },
{ "<Image>/View/Shrink Wrap", "<control>E", view_shrink_wrap_cmd_callback, NULL }, { "<Image>/View/Shrink Wrap", "<control>E", view_shrink_wrap_cmd_callback, NULL },
{ "<Image>/Image/Map/Equalize", NULL, image_equalize_cmd_callback, NULL }, { "<Image>/Image/Colors/Equalize", NULL, image_equalize_cmd_callback, NULL },
{ "<Image>/Image/Map/Invert", NULL, image_invert_cmd_callback, NULL }, { "<Image>/Image/Colors/Invert", NULL, image_invert_cmd_callback, NULL },
{ "<Image>/Image/Map/Posterize", NULL, image_posterize_cmd_callback, NULL }, { "<Image>/Image/Colors/Posterize", NULL, image_posterize_cmd_callback, NULL },
{ "<Image>/Image/Map/Threshold", NULL, image_threshold_cmd_callback, NULL }, { "<Image>/Image/Colors/Threshold", NULL, image_threshold_cmd_callback, NULL },
{ "<Image>/Image/Adjust/Color Balance", NULL, image_color_balance_cmd_callback, NULL }, { "<Image>/Image/Colors/<separator>", NULL, NULL, NULL },
{ "<Image>/Image/Adjust/Brightness-Contrast", NULL, image_brightness_contrast_cmd_callback, NULL }, { "<Image>/Image/Colors/Color Balance", NULL, image_color_balance_cmd_callback, NULL },
{ "<Image>/Image/Adjust/Hue-Saturation", NULL, image_hue_saturation_cmd_callback, NULL }, { "<Image>/Image/Colors/Brightness-Contrast", NULL, image_brightness_contrast_cmd_callback, NULL },
{ "<Image>/Image/Adjust/Curves", NULL, image_curves_cmd_callback, NULL }, { "<Image>/Image/Colors/Hue-Saturation", NULL, image_hue_saturation_cmd_callback, NULL },
{ "<Image>/Image/Adjust/Levels", NULL, image_levels_cmd_callback, NULL }, { "<Image>/Image/Colors/Curves", NULL, image_curves_cmd_callback, NULL },
{ "<Image>/Image/Adjust/<separator>", NULL, NULL, NULL }, { "<Image>/Image/Colors/Levels", NULL, image_levels_cmd_callback, NULL },
{ "<Image>/Image/Adjust/Desaturate", NULL, image_desaturate_cmd_callback, NULL }, { "<Image>/Image/Colors/<separator>", NULL, NULL, NULL },
{ "<Image>/Image/Colors/Desaturate", NULL, image_desaturate_cmd_callback, NULL },
{ "<Image>/Image/Channel Ops/Duplicate", "<control>D", channel_ops_duplicate_cmd_callback, NULL }, { "<Image>/Image/Channel Ops/Duplicate", "<control>D", channel_ops_duplicate_cmd_callback, NULL },
{ "<Image>/Image/Channel Ops/Offset", "<control><shift>O", channel_ops_offset_cmd_callback, NULL }, { "<Image>/Image/Channel Ops/Offset", "<control><shift>O", channel_ops_offset_cmd_callback, NULL },
{ "<Image>/Image/<separator>", NULL, NULL, NULL }, { "<Image>/Image/<separator>", NULL, NULL, NULL },
...@@ -147,6 +145,7 @@ static GtkMenuEntry menu_items[] = ...@@ -147,6 +145,7 @@ static GtkMenuEntry menu_items[] =
{ "<Image>/Image/Scale", NULL, image_scale_cmd_callback, NULL }, { "<Image>/Image/Scale", NULL, image_scale_cmd_callback, NULL },
{ "<Image>/Image/<separator>", NULL, NULL, NULL }, { "<Image>/Image/<separator>", NULL, NULL, NULL },
{ "<Image>/Image/Histogram", NULL, image_histogram_cmd_callback, NULL }, { "<Image>/Image/Histogram", NULL, image_histogram_cmd_callback, NULL },
{ "<Image>/Image/<separator>", NULL, NULL, NULL },
{ "<Image>/Layers/Layers & Channels...", "<control>L", dialogs_lc_cmd_callback, NULL }, { "<Image>/Layers/Layers & Channels...", "<control>L", dialogs_lc_cmd_callback, NULL },
{ "<Image>/Layers/Raise Layer", "<control>F", layers_raise_cmd_callback, NULL }, { "<Image>/Layers/Raise Layer", "<control>F", layers_raise_cmd_callback, NULL },
......
...@@ -68,7 +68,7 @@ AC_DEFUN(AC_GIMP_CHECK, ...@@ -68,7 +68,7 @@ AC_DEFUN(AC_GIMP_CHECK,
LDFLAGS="$saved_ldflags $X_LDFLAGS $X_LIBS" LDFLAGS="$saved_ldflags $X_LDFLAGS $X_LIBS"
dnl Dont cache this as it depends on CFLAGS, LDFLAGS, etc dnl Dont cache this as it depends on CFLAGS, LDFLAGS, etc
AC_MSG_CHECKING([for glib and gtk >= 0.99.3]) AC_MSG_CHECKING([for gtk >= 0.99.3])
AC_TRY_COMPILE( AC_TRY_COMPILE(
[#include <gtk/gtk.h>], [#include <gtk/gtk.h>],
[GtkArgSetFunc arg_set_func;], [GtkArgSetFunc arg_set_func;],
......
...@@ -187,7 +187,7 @@ query () ...@@ -187,7 +187,7 @@ query ()
"Daniel Cotting (cotting@mygale.org, http://www.mygale.org/~cotting)", "Daniel Cotting (cotting@mygale.org, http://www.mygale.org/~cotting)",
"Daniel Cotting (cotting@mygale.org, http://www.mygale.org/~cotting)", "Daniel Cotting (cotting@mygale.org, http://www.mygale.org/~cotting)",
"1th May 1997", "1th May 1997",
"<Image>/Filters/Image/Alien-Map", "<Image>/Filters/Colors/Alien Map",
"RGB*", "RGB*",
PROC_PLUG_IN, PROC_PLUG_IN,
nargs, nreturn_vals, nargs, nreturn_vals,
......
...@@ -119,7 +119,7 @@ query(void) ...@@ -119,7 +119,7 @@ query(void)
"Daniel Cotting (cotting@mygale.org, http://www.mygale.org/~cotting)", "Daniel Cotting (cotting@mygale.org, http://www.mygale.org/~cotting)",
"Daniel Cotting (cotting@mygale.org, http://www.mygale.org/~cotting)", "Daniel Cotting (cotting@mygale.org, http://www.mygale.org/~cotting)",
"October, 1997", "October, 1997",
"<Image>/Filters/Distorts/Conical Anamorphose", "<Image>/Filters/Glass Effects/Conical Anamorphose",
"RGB*, GRAY*, INDEXED*", "RGB*, GRAY*, INDEXED*",
PROC_PLUG_IN, PROC_PLUG_IN,
nargs, nreturn_vals, nargs, nreturn_vals,
......
...@@ -114,7 +114,7 @@ query(void) ...@@ -114,7 +114,7 @@ query(void)
"Daniel Cotting (cotting@mygale.org, http://www.mygale.org/~cotting)", "Daniel Cotting (cotting@mygale.org, http://www.mygale.org/~cotting)",
"Daniel Cotting (cotting@mygale.org, http://www.mygale.org/~cotting)", "Daniel Cotting (cotting@mygale.org, http://www.mygale.org/~cotting)",
"October, 1997", "October, 1997",
"<Image>/Filters/Distorts/Central-Reflection", "<Image>/Filters/Glass Effects/Central Reflection",
"RGB*, GRAY*, INDEXED*", "RGB*, GRAY*, INDEXED*",
PROC_PLUG_IN, PROC_PLUG_IN,
nargs, nreturn_vals, nargs, nreturn_vals,
......
...@@ -107,7 +107,7 @@ query(void) ...@@ -107,7 +107,7 @@ query(void)
"Daniel Cotting (cotting@mygale.org, http://www.mygale.org/~cotting)", "Daniel Cotting (cotting@mygale.org, http://www.mygale.org/~cotting)",
"Daniel Cotting (cotting@mygale.org, http://www.mygale.org/~cotting)", "Daniel Cotting (cotting@mygale.org, http://www.mygale.org/~cotting)",
"October, 1997", "October, 1997",
"<Image>/Filters/Image/Curtain", "<Image>/Filters/Distorts/Curtain",
"RGB*, GRAY*, INDEXED*", "RGB*, GRAY*, INDEXED*",
PROC_PLUG_IN, PROC_PLUG_IN,
nargs, nreturn_vals, nargs, nreturn_vals,
......
...@@ -122,7 +122,7 @@ query(void) ...@@ -122,7 +122,7 @@ query(void)
"Daniel Cotting (cotting@mygale.org, http://www.mygale.org/~cotting)", "Daniel Cotting (cotting@mygale.org, http://www.mygale.org/~cotting)",
"Daniel Cotting (cotting@mygale.org, http://www.mygale.org/~cotting)", "Daniel Cotting (cotting@mygale.org, http://www.mygale.org/~cotting)",
"December, 1997", "December, 1997",
"<Image>/Filters/Image/Digital Signature", "<Image>/Filters/Crypt/Digital Signature",
"RGB*, GRAY*, INDEXED*", "RGB*, GRAY*, INDEXED*",
PROC_PLUG_IN, PROC_PLUG_IN,
nargs, nreturn_vals, nargs, nreturn_vals,
......
...@@ -161,7 +161,7 @@ query(void) ...@@ -161,7 +161,7 @@ query(void)
"Daniel Cotting (cotting@mygale.org, http://www.mygale.org/~cotting)", "Daniel Cotting (cotting@mygale.org, http://www.mygale.org/~cotting)",
"Daniel Cotting (cotting@mygale.org, http://www.mygale.org/~cotting)", "Daniel Cotting (cotting@mygale.org, http://www.mygale.org/~cotting)",
"October, 1997", "October, 1997",
"<Image>/Filters/Image/Encrypt & Decrypt", "<Image>/Filters/Crypt/Encrypt and Decrypt",
"RGB*, GRAY*, INDEXED*", "RGB*, GRAY*, INDEXED*",
PROC_PLUG_IN, PROC_PLUG_IN,
nargs, nreturn_vals, nargs, nreturn_vals,
......
...@@ -134,7 +134,7 @@ static void query(void) ...@@ -134,7 +134,7 @@ static void query(void)
"Tom Bech & Federico Mena Quintero", "Tom Bech & Federico Mena Quintero",
"Tom Bech & Federico Mena Quintero", "Tom Bech & Federico Mena Quintero",
"Version 0.31, October 6 1997", "Version 0.31, October 6 1997",
"<Image>/Filters/Distorts/Map Object", "<Image>/Filters/Map/Map Object",
"RGB*", "RGB*",
PROC_PLUG_IN, PROC_PLUG_IN,
nargs, nreturn_vals, nargs, nreturn_vals,
......
...@@ -128,7 +128,7 @@ query(void) ...@@ -128,7 +128,7 @@ query(void)
"Morten Eriksen", "Morten Eriksen",
"Morten Eriksen", "Morten Eriksen",
"1997", "1997",
"<Image>/Filters/Distorts/Apply lens", "<Image>/Filters/Glass Effects/Apply Lens",
"RGB*, GRAY*, INDEXED*", "RGB*, GRAY*, INDEXED*",
PROC_PLUG_IN, PROC_PLUG_IN,
nargs, nreturn_vals, nargs, nreturn_vals,
......
...@@ -55,7 +55,7 @@ static void query() ...@@ -55,7 +55,7 @@ static void query()
"Tim Newsome", "Tim Newsome",
"Tim Newsome", "Tim Newsome",
"1997", "1997",
"<Image>/Filters/Transforms/Autocrop", "<Image>/Image/Transforms/Autocrop",
"RGB*, GRAY*, INDEXED*", "RGB*, GRAY*, INDEXED*",
PROC_PLUG_IN,