diff --git a/ChangeLog b/ChangeLog index 2e64a808d1..e0cb938f58 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1999-12-19 Michael Natterer + + * app/menus.c: move /Dialogs after /Tools and add a + separator after it. + Sun Dec 19 17:42:32 CET 1999 Sven Neumann * app/menus.c diff --git a/app/gui/menus.c b/app/gui/menus.c index 541df7099e..d13dbc491b 100644 --- a/app/gui/menus.c +++ b/app/gui/menus.c @@ -546,6 +546,47 @@ static GimpItemFactoryEntry image_entries[] = { { "/Tools/---", NULL, NULL, 0, "" }, NULL, NULL }, + /* /Dialogs */ + + { { N_("/Dialogs"), NULL, NULL, 0, "" }, + NULL, NULL }, + { { N_("/Dialogs/Layers & Channels..."), "L", dialogs_lc_cmd_callback, 0 }, + "dialogs/layers_and_channels.html", NULL }, + { { N_("/Dialogs/Tool Options..."), NULL, dialogs_tool_options_cmd_callback, 0 }, + "dialogs/tool_options.html", NULL }, + + { { "/Dialogs/---", NULL, NULL, 0, "" }, + NULL, NULL }, + { { N_("/Dialogs/Brushes..."), "B", dialogs_brushes_cmd_callback, 0 }, + "dialogs/brush_selection.html", NULL }, + { { N_("/Dialogs/Patterns..."), "P", dialogs_patterns_cmd_callback, 0 }, + "dialogs/pattern_selection.html", NULL }, + { { N_("/Dialogs/Gradients..."), "G", dialogs_gradients_cmd_callback, 0 }, + "dialogs/gradient_selection.html", NULL }, + { { N_("/Dialogs/Palette..."), "P", dialogs_palette_cmd_callback, 0 }, + "dialogs/palette_selection.html", NULL }, + { { N_("/Dialogs/Indexed Palette..."), NULL, dialogs_indexed_palette_cmd_callback, 0 }, + "dialogs/indexed_palette.html", NULL }, + + { { "/Dialogs/---", NULL, NULL, 0, "" }, + NULL, NULL }, + { { N_("/Dialogs/Input Devices..."), NULL, dialogs_input_devices_cmd_callback, 0 }, + "dialogs/input_devices.html", NULL }, + { { N_("/Dialogs/Device Status..."), NULL, dialogs_device_status_cmd_callback, 0 }, + "dialogs/device_status.html", NULL }, + + { { "/Dialogs/---", NULL, NULL, 0, "" }, + NULL, NULL }, + { { N_("/Dialogs/Document Index..."), NULL, raise_idea_callback, 0 }, + "dialogs/document_index.html", NULL }, + { { N_("/Dialogs/Error Console..."), NULL, dialogs_error_console_cmd_callback, 0 }, + "dialogs/error_console.html", NULL }, + { { N_("/Dialogs/Display Filters..."), NULL, dialogs_display_filters_cmd_callback, 0 }, + "dialogs/display_filters/display_filters.html", NULL }, + + { { "/---", NULL, NULL, 0, "" }, + NULL, NULL }, + /* /Filters */ { { N_("/Filters"), NULL, NULL, 0, "" }, @@ -603,49 +644,11 @@ static GimpItemFactoryEntry image_entries[] = NULL, NULL }, { { N_("/Filters/Toys"), NULL, NULL, 0, "" }, NULL, NULL }, - + /* /Script-Fu */ { { N_("/Script-Fu"), NULL, NULL, 0, "" }, NULL, NULL }, - - /* /Dialogs */ - - { { N_("/Dialogs"), NULL, NULL, 0, "" }, - NULL, NULL }, - { { N_("/Dialogs/Layers & Channels..."), "L", dialogs_lc_cmd_callback, 0 }, - "dialogs/layers_and_channels.html", NULL }, - { { N_("/Dialogs/Tool Options..."), NULL, dialogs_tool_options_cmd_callback, 0 }, - "dialogs/tool_options.html", NULL }, - - { { "/Dialogs/---", NULL, NULL, 0, "" }, - NULL, NULL }, - { { N_("/Dialogs/Brushes..."), "B", dialogs_brushes_cmd_callback, 0 }, - "dialogs/brush_selection.html", NULL }, - { { N_("/Dialogs/Patterns..."), "P", dialogs_patterns_cmd_callback, 0 }, - "dialogs/pattern_selection.html", NULL }, - { { N_("/Dialogs/Gradients..."), "G", dialogs_gradients_cmd_callback, 0 }, - "dialogs/gradient_selection.html", NULL }, - { { N_("/Dialogs/Palette..."), "P", dialogs_palette_cmd_callback, 0 }, - "dialogs/palette_selection.html", NULL }, - { { N_("/Dialogs/Indexed Palette..."), NULL, dialogs_indexed_palette_cmd_callback, 0 }, - "dialogs/indexed_palette.html", NULL }, - - { { "/Dialogs/---", NULL, NULL, 0, "" }, - NULL, NULL }, - { { N_("/Dialogs/Input Devices..."), NULL, dialogs_input_devices_cmd_callback, 0 }, - "dialogs/input_devices.html", NULL }, - { { N_("/Dialogs/Device Status..."), NULL, dialogs_device_status_cmd_callback, 0 }, - "dialogs/device_status.html", NULL }, - - { { "/Dialogs/---", NULL, NULL, 0, "" }, - NULL, NULL }, - { { N_("/Dialogs/Document Index..."), NULL, raise_idea_callback, 0 }, - "dialogs/document_index.html", NULL }, - { { N_("/Dialogs/Error Console..."), NULL, dialogs_error_console_cmd_callback, 0 }, - "dialogs/error_console.html", NULL }, - { { N_("/Dialogs/Display Filters..."), NULL, dialogs_display_filters_cmd_callback, 0 }, - "dialogs/display_filters/display_filters.html", NULL }, }; static guint n_image_entries = (sizeof (image_entries) / sizeof (image_entries[0])); diff --git a/app/menus.c b/app/menus.c index 541df7099e..d13dbc491b 100644 --- a/app/menus.c +++ b/app/menus.c @@ -546,6 +546,47 @@ static GimpItemFactoryEntry image_entries[] = { { "/Tools/---", NULL, NULL, 0, "" }, NULL, NULL }, + /* /Dialogs */ + + { { N_("/Dialogs"), NULL, NULL, 0, "" }, + NULL, NULL }, + { { N_("/Dialogs/Layers & Channels..."), "L", dialogs_lc_cmd_callback, 0 }, + "dialogs/layers_and_channels.html", NULL }, + { { N_("/Dialogs/Tool Options..."), NULL, dialogs_tool_options_cmd_callback, 0 }, + "dialogs/tool_options.html", NULL }, + + { { "/Dialogs/---", NULL, NULL, 0, "" }, + NULL, NULL }, + { { N_("/Dialogs/Brushes..."), "B", dialogs_brushes_cmd_callback, 0 }, + "dialogs/brush_selection.html", NULL }, + { { N_("/Dialogs/Patterns..."), "P", dialogs_patterns_cmd_callback, 0 }, + "dialogs/pattern_selection.html", NULL }, + { { N_("/Dialogs/Gradients..."), "G", dialogs_gradients_cmd_callback, 0 }, + "dialogs/gradient_selection.html", NULL }, + { { N_("/Dialogs/Palette..."), "P", dialogs_palette_cmd_callback, 0 }, + "dialogs/palette_selection.html", NULL }, + { { N_("/Dialogs/Indexed Palette..."), NULL, dialogs_indexed_palette_cmd_callback, 0 }, + "dialogs/indexed_palette.html", NULL }, + + { { "/Dialogs/---", NULL, NULL, 0, "" }, + NULL, NULL }, + { { N_("/Dialogs/Input Devices..."), NULL, dialogs_input_devices_cmd_callback, 0 }, + "dialogs/input_devices.html", NULL }, + { { N_("/Dialogs/Device Status..."), NULL, dialogs_device_status_cmd_callback, 0 }, + "dialogs/device_status.html", NULL }, + + { { "/Dialogs/---", NULL, NULL, 0, "" }, + NULL, NULL }, + { { N_("/Dialogs/Document Index..."), NULL, raise_idea_callback, 0 }, + "dialogs/document_index.html", NULL }, + { { N_("/Dialogs/Error Console..."), NULL, dialogs_error_console_cmd_callback, 0 }, + "dialogs/error_console.html", NULL }, + { { N_("/Dialogs/Display Filters..."), NULL, dialogs_display_filters_cmd_callback, 0 }, + "dialogs/display_filters/display_filters.html", NULL }, + + { { "/---", NULL, NULL, 0, "" }, + NULL, NULL }, + /* /Filters */ { { N_("/Filters"), NULL, NULL, 0, "" }, @@ -603,49 +644,11 @@ static GimpItemFactoryEntry image_entries[] = NULL, NULL }, { { N_("/Filters/Toys"), NULL, NULL, 0, "" }, NULL, NULL }, - + /* /Script-Fu */ { { N_("/Script-Fu"), NULL, NULL, 0, "" }, NULL, NULL }, - - /* /Dialogs */ - - { { N_("/Dialogs"), NULL, NULL, 0, "" }, - NULL, NULL }, - { { N_("/Dialogs/Layers & Channels..."), "L", dialogs_lc_cmd_callback, 0 }, - "dialogs/layers_and_channels.html", NULL }, - { { N_("/Dialogs/Tool Options..."), NULL, dialogs_tool_options_cmd_callback, 0 }, - "dialogs/tool_options.html", NULL }, - - { { "/Dialogs/---", NULL, NULL, 0, "" }, - NULL, NULL }, - { { N_("/Dialogs/Brushes..."), "B", dialogs_brushes_cmd_callback, 0 }, - "dialogs/brush_selection.html", NULL }, - { { N_("/Dialogs/Patterns..."), "P", dialogs_patterns_cmd_callback, 0 }, - "dialogs/pattern_selection.html", NULL }, - { { N_("/Dialogs/Gradients..."), "G", dialogs_gradients_cmd_callback, 0 }, - "dialogs/gradient_selection.html", NULL }, - { { N_("/Dialogs/Palette..."), "P", dialogs_palette_cmd_callback, 0 }, - "dialogs/palette_selection.html", NULL }, - { { N_("/Dialogs/Indexed Palette..."), NULL, dialogs_indexed_palette_cmd_callback, 0 }, - "dialogs/indexed_palette.html", NULL }, - - { { "/Dialogs/---", NULL, NULL, 0, "" }, - NULL, NULL }, - { { N_("/Dialogs/Input Devices..."), NULL, dialogs_input_devices_cmd_callback, 0 }, - "dialogs/input_devices.html", NULL }, - { { N_("/Dialogs/Device Status..."), NULL, dialogs_device_status_cmd_callback, 0 }, - "dialogs/device_status.html", NULL }, - - { { "/Dialogs/---", NULL, NULL, 0, "" }, - NULL, NULL }, - { { N_("/Dialogs/Document Index..."), NULL, raise_idea_callback, 0 }, - "dialogs/document_index.html", NULL }, - { { N_("/Dialogs/Error Console..."), NULL, dialogs_error_console_cmd_callback, 0 }, - "dialogs/error_console.html", NULL }, - { { N_("/Dialogs/Display Filters..."), NULL, dialogs_display_filters_cmd_callback, 0 }, - "dialogs/display_filters/display_filters.html", NULL }, }; static guint n_image_entries = (sizeof (image_entries) / sizeof (image_entries[0])); diff --git a/app/menus/menus.c b/app/menus/menus.c index 541df7099e..d13dbc491b 100644 --- a/app/menus/menus.c +++ b/app/menus/menus.c @@ -546,6 +546,47 @@ static GimpItemFactoryEntry image_entries[] = { { "/Tools/---", NULL, NULL, 0, "" }, NULL, NULL }, + /* /Dialogs */ + + { { N_("/Dialogs"), NULL, NULL, 0, "" }, + NULL, NULL }, + { { N_("/Dialogs/Layers & Channels..."), "L", dialogs_lc_cmd_callback, 0 }, + "dialogs/layers_and_channels.html", NULL }, + { { N_("/Dialogs/Tool Options..."), NULL, dialogs_tool_options_cmd_callback, 0 }, + "dialogs/tool_options.html", NULL }, + + { { "/Dialogs/---", NULL, NULL, 0, "" }, + NULL, NULL }, + { { N_("/Dialogs/Brushes..."), "B", dialogs_brushes_cmd_callback, 0 }, + "dialogs/brush_selection.html", NULL }, + { { N_("/Dialogs/Patterns..."), "P", dialogs_patterns_cmd_callback, 0 }, + "dialogs/pattern_selection.html", NULL }, + { { N_("/Dialogs/Gradients..."), "G", dialogs_gradients_cmd_callback, 0 }, + "dialogs/gradient_selection.html", NULL }, + { { N_("/Dialogs/Palette..."), "P", dialogs_palette_cmd_callback, 0 }, + "dialogs/palette_selection.html", NULL }, + { { N_("/Dialogs/Indexed Palette..."), NULL, dialogs_indexed_palette_cmd_callback, 0 }, + "dialogs/indexed_palette.html", NULL }, + + { { "/Dialogs/---", NULL, NULL, 0, "" }, + NULL, NULL }, + { { N_("/Dialogs/Input Devices..."), NULL, dialogs_input_devices_cmd_callback, 0 }, + "dialogs/input_devices.html", NULL }, + { { N_("/Dialogs/Device Status..."), NULL, dialogs_device_status_cmd_callback, 0 }, + "dialogs/device_status.html", NULL }, + + { { "/Dialogs/---", NULL, NULL, 0, "" }, + NULL, NULL }, + { { N_("/Dialogs/Document Index..."), NULL, raise_idea_callback, 0 }, + "dialogs/document_index.html", NULL }, + { { N_("/Dialogs/Error Console..."), NULL, dialogs_error_console_cmd_callback, 0 }, + "dialogs/error_console.html", NULL }, + { { N_("/Dialogs/Display Filters..."), NULL, dialogs_display_filters_cmd_callback, 0 }, + "dialogs/display_filters/display_filters.html", NULL }, + + { { "/---", NULL, NULL, 0, "" }, + NULL, NULL }, + /* /Filters */ { { N_("/Filters"), NULL, NULL, 0, "" }, @@ -603,49 +644,11 @@ static GimpItemFactoryEntry image_entries[] = NULL, NULL }, { { N_("/Filters/Toys"), NULL, NULL, 0, "" }, NULL, NULL }, - + /* /Script-Fu */ { { N_("/Script-Fu"), NULL, NULL, 0, "" }, NULL, NULL }, - - /* /Dialogs */ - - { { N_("/Dialogs"), NULL, NULL, 0, "" }, - NULL, NULL }, - { { N_("/Dialogs/Layers & Channels..."), "L", dialogs_lc_cmd_callback, 0 }, - "dialogs/layers_and_channels.html", NULL }, - { { N_("/Dialogs/Tool Options..."), NULL, dialogs_tool_options_cmd_callback, 0 }, - "dialogs/tool_options.html", NULL }, - - { { "/Dialogs/---", NULL, NULL, 0, "" }, - NULL, NULL }, - { { N_("/Dialogs/Brushes..."), "B", dialogs_brushes_cmd_callback, 0 }, - "dialogs/brush_selection.html", NULL }, - { { N_("/Dialogs/Patterns..."), "P", dialogs_patterns_cmd_callback, 0 }, - "dialogs/pattern_selection.html", NULL }, - { { N_("/Dialogs/Gradients..."), "G", dialogs_gradients_cmd_callback, 0 }, - "dialogs/gradient_selection.html", NULL }, - { { N_("/Dialogs/Palette..."), "P", dialogs_palette_cmd_callback, 0 }, - "dialogs/palette_selection.html", NULL }, - { { N_("/Dialogs/Indexed Palette..."), NULL, dialogs_indexed_palette_cmd_callback, 0 }, - "dialogs/indexed_palette.html", NULL }, - - { { "/Dialogs/---", NULL, NULL, 0, "" }, - NULL, NULL }, - { { N_("/Dialogs/Input Devices..."), NULL, dialogs_input_devices_cmd_callback, 0 }, - "dialogs/input_devices.html", NULL }, - { { N_("/Dialogs/Device Status..."), NULL, dialogs_device_status_cmd_callback, 0 }, - "dialogs/device_status.html", NULL }, - - { { "/Dialogs/---", NULL, NULL, 0, "" }, - NULL, NULL }, - { { N_("/Dialogs/Document Index..."), NULL, raise_idea_callback, 0 }, - "dialogs/document_index.html", NULL }, - { { N_("/Dialogs/Error Console..."), NULL, dialogs_error_console_cmd_callback, 0 }, - "dialogs/error_console.html", NULL }, - { { N_("/Dialogs/Display Filters..."), NULL, dialogs_display_filters_cmd_callback, 0 }, - "dialogs/display_filters/display_filters.html", NULL }, }; static guint n_image_entries = (sizeof (image_entries) / sizeof (image_entries[0])); diff --git a/app/widgets/gimpitemfactory.c b/app/widgets/gimpitemfactory.c index 541df7099e..d13dbc491b 100644 --- a/app/widgets/gimpitemfactory.c +++ b/app/widgets/gimpitemfactory.c @@ -546,6 +546,47 @@ static GimpItemFactoryEntry image_entries[] = { { "/Tools/---", NULL, NULL, 0, "" }, NULL, NULL }, + /* /Dialogs */ + + { { N_("/Dialogs"), NULL, NULL, 0, "" }, + NULL, NULL }, + { { N_("/Dialogs/Layers & Channels..."), "L", dialogs_lc_cmd_callback, 0 }, + "dialogs/layers_and_channels.html", NULL }, + { { N_("/Dialogs/Tool Options..."), NULL, dialogs_tool_options_cmd_callback, 0 }, + "dialogs/tool_options.html", NULL }, + + { { "/Dialogs/---", NULL, NULL, 0, "" }, + NULL, NULL }, + { { N_("/Dialogs/Brushes..."), "B", dialogs_brushes_cmd_callback, 0 }, + "dialogs/brush_selection.html", NULL }, + { { N_("/Dialogs/Patterns..."), "P", dialogs_patterns_cmd_callback, 0 }, + "dialogs/pattern_selection.html", NULL }, + { { N_("/Dialogs/Gradients..."), "G", dialogs_gradients_cmd_callback, 0 }, + "dialogs/gradient_selection.html", NULL }, + { { N_("/Dialogs/Palette..."), "P", dialogs_palette_cmd_callback, 0 }, + "dialogs/palette_selection.html", NULL }, + { { N_("/Dialogs/Indexed Palette..."), NULL, dialogs_indexed_palette_cmd_callback, 0 }, + "dialogs/indexed_palette.html", NULL }, + + { { "/Dialogs/---", NULL, NULL, 0, "" }, + NULL, NULL }, + { { N_("/Dialogs/Input Devices..."), NULL, dialogs_input_devices_cmd_callback, 0 }, + "dialogs/input_devices.html", NULL }, + { { N_("/Dialogs/Device Status..."), NULL, dialogs_device_status_cmd_callback, 0 }, + "dialogs/device_status.html", NULL }, + + { { "/Dialogs/---", NULL, NULL, 0, "" }, + NULL, NULL }, + { { N_("/Dialogs/Document Index..."), NULL, raise_idea_callback, 0 }, + "dialogs/document_index.html", NULL }, + { { N_("/Dialogs/Error Console..."), NULL, dialogs_error_console_cmd_callback, 0 }, + "dialogs/error_console.html", NULL }, + { { N_("/Dialogs/Display Filters..."), NULL, dialogs_display_filters_cmd_callback, 0 }, + "dialogs/display_filters/display_filters.html", NULL }, + + { { "/---", NULL, NULL, 0, "" }, + NULL, NULL }, + /* /Filters */ { { N_("/Filters"), NULL, NULL, 0, "" }, @@ -603,49 +644,11 @@ static GimpItemFactoryEntry image_entries[] = NULL, NULL }, { { N_("/Filters/Toys"), NULL, NULL, 0, "" }, NULL, NULL }, - + /* /Script-Fu */ { { N_("/Script-Fu"), NULL, NULL, 0, "" }, NULL, NULL }, - - /* /Dialogs */ - - { { N_("/Dialogs"), NULL, NULL, 0, "" }, - NULL, NULL }, - { { N_("/Dialogs/Layers & Channels..."), "L", dialogs_lc_cmd_callback, 0 }, - "dialogs/layers_and_channels.html", NULL }, - { { N_("/Dialogs/Tool Options..."), NULL, dialogs_tool_options_cmd_callback, 0 }, - "dialogs/tool_options.html", NULL }, - - { { "/Dialogs/---", NULL, NULL, 0, "" }, - NULL, NULL }, - { { N_("/Dialogs/Brushes..."), "B", dialogs_brushes_cmd_callback, 0 }, - "dialogs/brush_selection.html", NULL }, - { { N_("/Dialogs/Patterns..."), "P", dialogs_patterns_cmd_callback, 0 }, - "dialogs/pattern_selection.html", NULL }, - { { N_("/Dialogs/Gradients..."), "G", dialogs_gradients_cmd_callback, 0 }, - "dialogs/gradient_selection.html", NULL }, - { { N_("/Dialogs/Palette..."), "P", dialogs_palette_cmd_callback, 0 }, - "dialogs/palette_selection.html", NULL }, - { { N_("/Dialogs/Indexed Palette..."), NULL, dialogs_indexed_palette_cmd_callback, 0 }, - "dialogs/indexed_palette.html", NULL }, - - { { "/Dialogs/---", NULL, NULL, 0, "" }, - NULL, NULL }, - { { N_("/Dialogs/Input Devices..."), NULL, dialogs_input_devices_cmd_callback, 0 }, - "dialogs/input_devices.html", NULL }, - { { N_("/Dialogs/Device Status..."), NULL, dialogs_device_status_cmd_callback, 0 }, - "dialogs/device_status.html", NULL }, - - { { "/Dialogs/---", NULL, NULL, 0, "" }, - NULL, NULL }, - { { N_("/Dialogs/Document Index..."), NULL, raise_idea_callback, 0 }, - "dialogs/document_index.html", NULL }, - { { N_("/Dialogs/Error Console..."), NULL, dialogs_error_console_cmd_callback, 0 }, - "dialogs/error_console.html", NULL }, - { { N_("/Dialogs/Display Filters..."), NULL, dialogs_display_filters_cmd_callback, 0 }, - "dialogs/display_filters/display_filters.html", NULL }, }; static guint n_image_entries = (sizeof (image_entries) / sizeof (image_entries[0]));