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

Reorganized the core menu items (everything except <Image>/Filters).

1999-11-20  Michael Natterer  <mitch@gimp.org>

	Reorganized the core menu items (everything except
	<Image>/Filters). Everything is of course trivial to change again,
	so please comment on the new "menu feeling" ;-)

	* app/menus.[ch]:

	- Applied the suggestions collected by Olof.
	- Added "..." to all items which open a dialog.
	- Introduced some additional separators (e.g. in "Dialogs").
	- Reorder some plugins and the color correct tools after
	  initialisation.
	- A menu entry to invoke the tooltips inspector.
	- A debugging menu entry which dumps the menu paths and their help
	  pages (will of course go away when the help sys is consistent).

	There are currently two identical "Help" menus because
	<Toolbox>/Help trashes the menu bar if the toolbox is too narrow
	(gtk doesn't seem to support multi-line menubars, any idea?)

	* app/app_procs.c: call menus_reorder_plugins() after loading the
	plugins to beautify the "Xtns" menu.

	* app/commands.[ch]: reordered some functions to match the new
	menu structure (for easier source navigation) and renamed some to
	be consistent (e.g. all help functions are now called help_*).

	Show/Hide the rulers with ordinary gtk_widget_[show|hide]()
	commands. I've tested it several times and it looks exactly the
	same as the old code which used internal gtk knowledge.

	* app/gdisplay.c: applied the menu changes to
	gdisplay_set_menu_sensitivity().

	* app/gimphelp.[ch]: new public function gimp_context_help() which
	invokes the tooltips inspector. Code cleanup.

	* app/resize.c: changed the dialogs' titles to match the menu entries.

	* app/session.c: renamed the gradient selection cmd callback to be
	consistent with brushes/patterns.

	* app/tools.c: added "..." to the menu paths of the tools which
	have dialogs.

	* app/fileops.c
	* app/channels_dialog.c
	* app/layers_dialog.c
	* app/paths_dialog.c: added some "...".

	* plug-ins/common/align_layers.c
	* plug-ins/common/autostretch_hsv.c
	* plug-ins/common/c_astretch.c
	* plug-ins/common/color_enhance.c
	* plug-ins/common/compose.c
	* plug-ins/common/decompose.c
	* plug-ins/common/mail.c
	* plug-ins/common/normalize.c
	* plug-ins/common/threshold_alpha.c
	* plug-ins/dbbrowser/dbbrowser.c
	* plug-ins/fp/fp.c
	* plug-ins/print/print.c
	* plug-ins/rcm/rcm.c: changed the menu paths and added "...".
parent 84f0e162
1999-11-20 Michael Natterer <mitch@gimp.org>
Reorganized the core menu items (everything except
<Image>/Filters). Everything is of course trivial to change again,
so please comment on the new "menu feeling" ;-)
* app/menus.[ch]:
- Applied the suggestions collected by Olof.
- Added "..." to all items which open a dialog.
- Introduced some additional separators (e.g. in "Dialogs").
- Reorder some plugins and the color correct tools after
initialisation.
- A menu entry to invoke the tooltips inspector.
- A debugging menu entry which dumps the menu paths and their help
pages (will of course go away when the help sys is consistent).
There are currently two identical "Help" menus because
<Toolbox>/Help trashes the menu bar if the toolbox is too narrow
(gtk doesn't seem to support multi-line menubars, any idea?)
* app/app_procs.c: call menus_reorder_plugins() after loading the
plugins to beautify the "Xtns" menu.
* app/commands.[ch]: reordered some functions to match the new
menu structure (for easier source navigation) and renamed some to
be consistent (e.g. all help functions are now called help_*).
Show/Hide the rulers with ordinary gtk_widget_[show|hide]()
commands. I've tested it several times and it looks exactly the
same as the old code which used internal gtk knowledge.
* app/gdisplay.c: applied the menu changes to
gdisplay_set_menu_sensitivity().
* app/gimphelp.[ch]: new public function gimp_context_help() which
invokes the tooltips inspector. Code cleanup.
* app/resize.c: changed the dialogs' titles to match the menu entries.
* app/session.c: renamed the gradient selection cmd callback to be
consistent with brushes/patterns.
* app/tools.c: added "..." to the menu paths of the tools which
have dialogs.
* app/fileops.c
* app/channels_dialog.c
* app/layers_dialog.c
* app/paths_dialog.c: added some "...".
* plug-ins/common/align_layers.c
* plug-ins/common/autostretch_hsv.c
* plug-ins/common/c_astretch.c
* plug-ins/common/color_enhance.c
* plug-ins/common/compose.c
* plug-ins/common/decompose.c
* plug-ins/common/mail.c
* plug-ins/common/normalize.c
* plug-ins/common/threshold_alpha.c
* plug-ins/dbbrowser/dbbrowser.c
* plug-ins/fp/fp.c
* plug-ins/print/print.c
* plug-ins/rcm/rcm.c: changed the menu paths and added "...".
Fri Nov 19 18:47:30 PST 1999 Manish Singh <yosh@gimp.org>
* po and po-plug-ins dirs: moved the libgimp translations to
......
This diff is collapsed.
/* The GIMP -- an image manipulation program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __COMMANDS_H__
#define __COMMANDS_H__
......@@ -12,66 +29,64 @@ void file_pref_cmd_callback (GtkWidget *, gpointer);
void file_close_cmd_callback (GtkWidget *, gpointer);
void file_quit_cmd_callback (GtkWidget *, gpointer);
void edit_undo_cmd_callback (GtkWidget *, gpointer);
void edit_redo_cmd_callback (GtkWidget *, gpointer);
void edit_cut_cmd_callback (GtkWidget *, gpointer);
void edit_copy_cmd_callback (GtkWidget *, gpointer);
void edit_paste_cmd_callback (GtkWidget *, gpointer);
void edit_paste_into_cmd_callback (GtkWidget *, gpointer);
void edit_paste_as_new_cmd_callback (GtkWidget *, gpointer);
void edit_clear_cmd_callback (GtkWidget *, gpointer);
void edit_fill_cmd_callback (GtkWidget *, gpointer);
void edit_stroke_cmd_callback (GtkWidget *, gpointer);
void edit_undo_cmd_callback (GtkWidget *, gpointer);
void edit_redo_cmd_callback (GtkWidget *, gpointer);
void edit_show_undo_history_cmd_callback (GtkWidget *, gpointer);
void edit_named_cut_cmd_callback (GtkWidget *, gpointer);
void edit_named_copy_cmd_callback (GtkWidget *, gpointer);
void edit_named_paste_cmd_callback (GtkWidget *, gpointer);
void edit_clear_cmd_callback (GtkWidget *, gpointer);
void edit_fill_cmd_callback (GtkWidget *, gpointer);
void edit_stroke_cmd_callback (GtkWidget *, gpointer);
void select_invert_cmd_callback (GtkWidget *, gpointer);
void select_all_cmd_callback (GtkWidget *, gpointer);
void select_none_cmd_callback (GtkWidget *, gpointer);
void select_float_cmd_callback (GtkWidget *, gpointer);
void select_feather_cmd_callback (GtkWidget *, gpointer);
void select_sharpen_cmd_callback (GtkWidget *, gpointer);
void select_shrink_cmd_callback (GtkWidget *, gpointer);
void select_border_cmd_callback (GtkWidget *, gpointer);
void select_feather_cmd_callback (GtkWidget *, gpointer);
void select_grow_cmd_callback (GtkWidget *, gpointer);
void select_shrink_cmd_callback (GtkWidget *, gpointer);
void select_by_color_cmd_callback (GtkWidget *, gpointer);
void select_save_cmd_callback (GtkWidget *, gpointer);
void view_dot_for_dot_callback (GtkWidget *, gpointer);
void view_zoomin_cmd_callback (GtkWidget *, gpointer);
void view_zoomout_cmd_callback (GtkWidget *, gpointer);
void view_zoom_16_1_callback (GtkWidget *, gpointer);
void view_zoom_8_1_callback (GtkWidget *, gpointer);
void view_zoom_4_1_callback (GtkWidget *, gpointer);
void view_zoom_2_1_callback (GtkWidget *, gpointer);
void view_zoom_1_1_callback (GtkWidget *, gpointer);
void view_zoom_1_2_callback (GtkWidget *, gpointer);
void view_zoom_1_4_callback (GtkWidget *, gpointer);
void view_zoom_1_8_callback (GtkWidget *, gpointer);
void view_zoom_1_16_callback (GtkWidget *, gpointer);
void view_window_info_cmd_callback (GtkWidget *, gpointer);
void view_window_nav_cmd_callback (GtkWidget *, gpointer);
void view_toggle_selection_cmd_callback (GtkWidget *, gpointer);
void view_toggle_rulers_cmd_callback (GtkWidget *, gpointer);
void view_toggle_guides_cmd_callback (GtkWidget *, gpointer);
void view_toggle_statusbar_cmd_callback (GtkWidget *, gpointer);
void view_snap_to_guides_cmd_callback (GtkWidget *, gpointer);
void view_new_view_cmd_callback (GtkWidget *, gpointer);
void view_shrink_wrap_cmd_callback (GtkWidget *, gpointer);
void view_zoomin_cmd_callback (GtkWidget *, gpointer);
void view_zoomout_cmd_callback (GtkWidget *, gpointer);
void view_zoom_16_1_cmd_callback (GtkWidget *, gpointer);
void view_zoom_8_1_cmd_callback (GtkWidget *, gpointer);
void view_zoom_4_1_cmd_callback (GtkWidget *, gpointer);
void view_zoom_2_1_cmd_callback (GtkWidget *, gpointer);
void view_zoom_1_1_cmd_callback (GtkWidget *, gpointer);
void view_zoom_1_2_cmd_callback (GtkWidget *, gpointer);
void view_zoom_1_4_cmd_callback (GtkWidget *, gpointer);
void view_zoom_1_8_cmd_callback (GtkWidget *, gpointer);
void view_zoom_1_16_cmd_callback (GtkWidget *, gpointer);
void view_dot_for_dot_cmd_callback (GtkWidget *, gpointer);
void view_info_window_cmd_callback (GtkWidget *, gpointer);
void view_nav_window_cmd_callback (GtkWidget *, gpointer);
void view_undo_history_cmd_callback (GtkWidget *, gpointer);
void view_toggle_selection_cmd_callback (GtkWidget *, gpointer);
void view_toggle_rulers_cmd_callback (GtkWidget *, gpointer);
void view_toggle_statusbar_cmd_callback (GtkWidget *, gpointer);
void view_toggle_guides_cmd_callback (GtkWidget *, gpointer);
void view_snap_to_guides_cmd_callback (GtkWidget *, gpointer);
void view_new_view_cmd_callback (GtkWidget *, gpointer);
void view_shrink_wrap_cmd_callback (GtkWidget *, gpointer);
void image_equalize_cmd_callback (GtkWidget *, gpointer);
void image_invert_cmd_callback (GtkWidget *, gpointer);
void image_desaturate_cmd_callback (GtkWidget *, gpointer);
void image_convert_rgb_cmd_callback (GtkWidget *, gpointer);
void image_convert_grayscale_cmd_callback (GtkWidget *, gpointer);
void image_convert_indexed_cmd_callback (GtkWidget *, gpointer);
void image_desaturate_cmd_callback (GtkWidget *, gpointer);
void image_invert_cmd_callback (GtkWidget *, gpointer);
void image_equalize_cmd_callback (GtkWidget *, gpointer);
void image_offset_cmd_callback (GtkWidget *, gpointer);
void image_resize_cmd_callback (GtkWidget *, gpointer);
void image_scale_cmd_callback (GtkWidget *, gpointer);
void channel_ops_duplicate_cmd_callback (GtkWidget *, gpointer);
void channel_ops_offset_cmd_callback (GtkWidget *, gpointer);
void image_duplicate_cmd_callback (GtkWidget *, gpointer);
void layers_previous_cmd_callback (GtkWidget *, gpointer);
void layers_next_cmd_callback (GtkWidget *, gpointer);
......@@ -82,9 +97,9 @@ void layers_lower_to_bottom_cmd_callback (GtkWidget *, gpointer);
void layers_anchor_cmd_callback (GtkWidget *, gpointer);
void layers_merge_cmd_callback (GtkWidget *, gpointer);
void layers_flatten_cmd_callback (GtkWidget *, gpointer);
void layers_alpha_select_cmd_callback (GtkWidget *, gpointer);
void layers_mask_select_cmd_callback (GtkWidget *, gpointer);
void layers_add_alpha_channel_cmd_callback (GtkWidget *, gpointer);
void layers_alpha_select_cmd_callback (GtkWidget *, gpointer);
void tools_default_colors_cmd_callback (GtkWidget *, gpointer);
void tools_swap_colors_cmd_callback (GtkWidget *, gpointer);
......@@ -96,21 +111,23 @@ void filters_repeat_cmd_callback (GtkWidget *widget,
gpointer callback_data,
guint callback_action);
void dialogs_lc_cmd_callback (GtkWidget *, gpointer);
void dialogs_tool_options_cmd_callback (GtkWidget *, gpointer);
void dialogs_brushes_cmd_callback (GtkWidget *, gpointer);
void dialogs_patterns_cmd_callback (GtkWidget *, gpointer);
void dialogs_gradients_cmd_callback (GtkWidget *, gpointer);
void dialogs_palette_cmd_callback (GtkWidget *, gpointer);
void dialogs_gradient_cmd_callback (GtkWidget *, gpointer);
void dialogs_lc_cmd_callback (GtkWidget *, gpointer);
void dialogs_indexed_palette_cmd_callback (GtkWidget *, gpointer);
void dialogs_tool_options_cmd_callback (GtkWidget *, gpointer);
void dialogs_input_devices_cmd_callback (GtkWidget *, gpointer);
void dialogs_device_status_cmd_callback (GtkWidget *, gpointer);
void dialogs_error_console_cmd_callback (GtkWidget *, gpointer);
void dialogs_module_browser_cmd_callback (GtkWidget *, gpointer);
void dialogs_display_filters_cmd_callback (GtkWidget *, gpointer);
void dialogs_about_cmd_callback (GtkWidget *, gpointer);
void dialogs_tips_cmd_callback (GtkWidget *, gpointer);
void gimp_help_cmd_callback (GtkWidget *, gpointer);
void dialogs_module_browser_cmd_callback (GtkWidget *, gpointer);
void help_help_cmd_callback (GtkWidget *, gpointer);
void help_context_help_cmd_callback (GtkWidget *, gpointer);
void help_tips_cmd_callback (GtkWidget *, gpointer);
void help_about_cmd_callback (GtkWidget *, gpointer);
#endif /* __COMMANDS_H__ */
......@@ -546,10 +546,12 @@ app_init (void)
gradients_init (no_data); /* initialize the list of gimp gradients */
app_init_update_status (NULL, NULL, 1.00);
plug_in_init (); /* initialize the plug in structures */
module_db_init (); /* load any modules we need */
plug_in_init (); /* initialize the plug in structures */
module_db_init (); /* load any modules we need */
RESET_BAR();
file_ops_post_init (); /* post-initialize the file types */
file_ops_post_init (); /* post-initialize the file types */
menus_reorder_plugins (); /* beautify some menus */
/* Add the swap file */
if (swap_path == NULL)
......
......@@ -627,7 +627,7 @@ channels_dialog_set_menu_sensitivity (void)
gtk_widget_set_sensitive (channels_ops_buttons[(button)].widget, \
(condition) != 0)
SET_SENSITIVE (N_("/New Channel"), !fs_sens);
SET_SENSITIVE (N_("/New Channel..."), !fs_sens);
SET_OPS_SENSITIVE (0, !fs_sens);
SET_SENSITIVE (N_("/Raise Channel"), !fs_sens && aux_sens);
......@@ -904,7 +904,7 @@ channel_list_events (GtkWidget *widget,
case GDK_BUTTON_PRESS:
bevent = (GdkEventButton *) event;
if (bevent->button == 3 || bevent->button == 2)
if (bevent->button == 3)
{
gtk_menu_popup (GTK_MENU (channelsD->ops_menu),
NULL, NULL, NULL, NULL,
......
This diff is collapsed.
/* The GIMP -- an image manipulation program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __COMMANDS_H__
#define __COMMANDS_H__
......@@ -12,66 +29,64 @@ void file_pref_cmd_callback (GtkWidget *, gpointer);
void file_close_cmd_callback (GtkWidget *, gpointer);
void file_quit_cmd_callback (GtkWidget *, gpointer);
void edit_undo_cmd_callback (GtkWidget *, gpointer);
void edit_redo_cmd_callback (GtkWidget *, gpointer);
void edit_cut_cmd_callback (GtkWidget *, gpointer);
void edit_copy_cmd_callback (GtkWidget *, gpointer);
void edit_paste_cmd_callback (GtkWidget *, gpointer);
void edit_paste_into_cmd_callback (GtkWidget *, gpointer);
void edit_paste_as_new_cmd_callback (GtkWidget *, gpointer);
void edit_clear_cmd_callback (GtkWidget *, gpointer);
void edit_fill_cmd_callback (GtkWidget *, gpointer);
void edit_stroke_cmd_callback (GtkWidget *, gpointer);
void edit_undo_cmd_callback (GtkWidget *, gpointer);
void edit_redo_cmd_callback (GtkWidget *, gpointer);
void edit_show_undo_history_cmd_callback (GtkWidget *, gpointer);
void edit_named_cut_cmd_callback (GtkWidget *, gpointer);
void edit_named_copy_cmd_callback (GtkWidget *, gpointer);
void edit_named_paste_cmd_callback (GtkWidget *, gpointer);
void edit_clear_cmd_callback (GtkWidget *, gpointer);
void edit_fill_cmd_callback (GtkWidget *, gpointer);
void edit_stroke_cmd_callback (GtkWidget *, gpointer);
void select_invert_cmd_callback (GtkWidget *, gpointer);
void select_all_cmd_callback (GtkWidget *, gpointer);
void select_none_cmd_callback (GtkWidget *, gpointer);
void select_float_cmd_callback (GtkWidget *, gpointer);
void select_feather_cmd_callback (GtkWidget *, gpointer);
void select_sharpen_cmd_callback (GtkWidget *, gpointer);
void select_shrink_cmd_callback (GtkWidget *, gpointer);
void select_border_cmd_callback (GtkWidget *, gpointer);
void select_feather_cmd_callback (GtkWidget *, gpointer);
void select_grow_cmd_callback (GtkWidget *, gpointer);
void select_shrink_cmd_callback (GtkWidget *, gpointer);
void select_by_color_cmd_callback (GtkWidget *, gpointer);
void select_save_cmd_callback (GtkWidget *, gpointer);
void view_dot_for_dot_callback (GtkWidget *, gpointer);
void view_zoomin_cmd_callback (GtkWidget *, gpointer);
void view_zoomout_cmd_callback (GtkWidget *, gpointer);
void view_zoom_16_1_callback (GtkWidget *, gpointer);
void view_zoom_8_1_callback (GtkWidget *, gpointer);
void view_zoom_4_1_callback (GtkWidget *, gpointer);
void view_zoom_2_1_callback (GtkWidget *, gpointer);
void view_zoom_1_1_callback (GtkWidget *, gpointer);
void view_zoom_1_2_callback (GtkWidget *, gpointer);
void view_zoom_1_4_callback (GtkWidget *, gpointer);
void view_zoom_1_8_callback (GtkWidget *, gpointer);
void view_zoom_1_16_callback (GtkWidget *, gpointer);
void view_window_info_cmd_callback (GtkWidget *, gpointer);
void view_window_nav_cmd_callback (GtkWidget *, gpointer);
void view_toggle_selection_cmd_callback (GtkWidget *, gpointer);
void view_toggle_rulers_cmd_callback (GtkWidget *, gpointer);
void view_toggle_guides_cmd_callback (GtkWidget *, gpointer);
void view_toggle_statusbar_cmd_callback (GtkWidget *, gpointer);
void view_snap_to_guides_cmd_callback (GtkWidget *, gpointer);
void view_new_view_cmd_callback (GtkWidget *, gpointer);
void view_shrink_wrap_cmd_callback (GtkWidget *, gpointer);
void view_zoomin_cmd_callback (GtkWidget *, gpointer);
void view_zoomout_cmd_callback (GtkWidget *, gpointer);
void view_zoom_16_1_cmd_callback (GtkWidget *, gpointer);
void view_zoom_8_1_cmd_callback (GtkWidget *, gpointer);
void view_zoom_4_1_cmd_callback (GtkWidget *, gpointer);
void view_zoom_2_1_cmd_callback (GtkWidget *, gpointer);
void view_zoom_1_1_cmd_callback (GtkWidget *, gpointer);
void view_zoom_1_2_cmd_callback (GtkWidget *, gpointer);
void view_zoom_1_4_cmd_callback (GtkWidget *, gpointer);
void view_zoom_1_8_cmd_callback (GtkWidget *, gpointer);
void view_zoom_1_16_cmd_callback (GtkWidget *, gpointer);
void view_dot_for_dot_cmd_callback (GtkWidget *, gpointer);
void view_info_window_cmd_callback (GtkWidget *, gpointer);
void view_nav_window_cmd_callback (GtkWidget *, gpointer);
void view_undo_history_cmd_callback (GtkWidget *, gpointer);
void view_toggle_selection_cmd_callback (GtkWidget *, gpointer);
void view_toggle_rulers_cmd_callback (GtkWidget *, gpointer);
void view_toggle_statusbar_cmd_callback (GtkWidget *, gpointer);
void view_toggle_guides_cmd_callback (GtkWidget *, gpointer);
void view_snap_to_guides_cmd_callback (GtkWidget *, gpointer);
void view_new_view_cmd_callback (GtkWidget *, gpointer);
void view_shrink_wrap_cmd_callback (GtkWidget *, gpointer);
void image_equalize_cmd_callback (GtkWidget *, gpointer);
void image_invert_cmd_callback (GtkWidget *, gpointer);
void image_desaturate_cmd_callback (GtkWidget *, gpointer);
void image_convert_rgb_cmd_callback (GtkWidget *, gpointer);
void image_convert_grayscale_cmd_callback (GtkWidget *, gpointer);
void image_convert_indexed_cmd_callback (GtkWidget *, gpointer);
void image_desaturate_cmd_callback (GtkWidget *, gpointer);
void image_invert_cmd_callback (GtkWidget *, gpointer);
void image_equalize_cmd_callback (GtkWidget *, gpointer);
void image_offset_cmd_callback (GtkWidget *, gpointer);
void image_resize_cmd_callback (GtkWidget *, gpointer);
void image_scale_cmd_callback (GtkWidget *, gpointer);
void channel_ops_duplicate_cmd_callback (GtkWidget *, gpointer);
void channel_ops_offset_cmd_callback (GtkWidget *, gpointer);
void image_duplicate_cmd_callback (GtkWidget *, gpointer);
void layers_previous_cmd_callback (GtkWidget *, gpointer);
void layers_next_cmd_callback (GtkWidget *, gpointer);
......@@ -82,9 +97,9 @@ void layers_lower_to_bottom_cmd_callback (GtkWidget *, gpointer);
void layers_anchor_cmd_callback (GtkWidget *, gpointer);
void layers_merge_cmd_callback (GtkWidget *, gpointer);
void layers_flatten_cmd_callback (GtkWidget *, gpointer);
void layers_alpha_select_cmd_callback (GtkWidget *, gpointer);
void layers_mask_select_cmd_callback (GtkWidget *, gpointer);
void layers_add_alpha_channel_cmd_callback (GtkWidget *, gpointer);
void layers_alpha_select_cmd_callback (GtkWidget *, gpointer);
void tools_default_colors_cmd_callback (GtkWidget *, gpointer);
void tools_swap_colors_cmd_callback (GtkWidget *, gpointer);
......@@ -96,21 +111,23 @@ void filters_repeat_cmd_callback (GtkWidget *widget,
gpointer callback_data,
guint callback_action);
void dialogs_lc_cmd_callback (GtkWidget *, gpointer);
void dialogs_tool_options_cmd_callback (GtkWidget *, gpointer);
void dialogs_brushes_cmd_callback (GtkWidget *, gpointer);
void dialogs_patterns_cmd_callback (GtkWidget *, gpointer);
void dialogs_gradients_cmd_callback (GtkWidget *, gpointer);
void dialogs_palette_cmd_callback (GtkWidget *, gpointer);
void dialogs_gradient_cmd_callback (GtkWidget *, gpointer);
void dialogs_lc_cmd_callback (GtkWidget *, gpointer);
void dialogs_indexed_palette_cmd_callback (GtkWidget *, gpointer);
void dialogs_tool_options_cmd_callback (GtkWidget *, gpointer);
void dialogs_input_devices_cmd_callback (GtkWidget *, gpointer);
void dialogs_device_status_cmd_callback (GtkWidget *, gpointer);
void dialogs_error_console_cmd_callback (GtkWidget *, gpointer);
void dialogs_module_browser_cmd_callback (GtkWidget *, gpointer);
void dialogs_display_filters_cmd_callback (GtkWidget *, gpointer);
void dialogs_about_cmd_callback (GtkWidget *, gpointer);
void dialogs_tips_cmd_callback (GtkWidget *, gpointer);
void gimp_help_cmd_callback (GtkWidget *, gpointer);
void dialogs_module_browser_cmd_callback (GtkWidget *, gpointer);
void help_help_cmd_callback (GtkWidget *, gpointer);
void help_context_help_cmd_callback (GtkWidget *, gpointer);
void help_tips_cmd_callback (GtkWidget *, gpointer);
void help_about_cmd_callback (GtkWidget *, gpointer);
#endif /* __COMMANDS_H__ */
......@@ -1637,32 +1637,34 @@ gdisplay_set_menu_sensitivity (GDisplay *gdisp)
menus_set_state_glue ("<Image>", (menu), (condition) != 0)
SET_SENSITIVE (N_("/File/Save"), gdisp);
SET_SENSITIVE (N_("/File/Save as"), gdisp);
SET_SENSITIVE (N_("/File/Save as..."), gdisp);
SET_SENSITIVE (N_("/File/Revert"), gdisp);
SET_SENSITIVE (N_("/File/Close"), gdisp);
SET_SENSITIVE (N_("/Edit"), gdisp);
SET_SENSITIVE (N_("/Edit/Buffer"), gdisp);
if (gdisp)
{
SET_SENSITIVE (N_("/Edit/Undo"), undo_get_undo_name (gdisp->gimage));
SET_SENSITIVE (N_("/Edit/Redo"), undo_get_redo_name (gdisp->gimage));
SET_SENSITIVE (N_("/Edit/Cut"), lp);
SET_SENSITIVE (N_("/Edit/Copy"), lp);
SET_SENSITIVE (N_("/Edit/Paste"), lp);
SET_SENSITIVE (N_("/Edit/Paste Into"), lp);
SET_SENSITIVE (N_("/Edit/Paste As New"), lp);
SET_SENSITIVE (N_("/Edit/Buffer/Cut Named..."), lp);
SET_SENSITIVE (N_("/Edit/Buffer/Copy Named..."), lp);
SET_SENSITIVE (N_("/Edit/Buffer/Paste Named..."), lp);
SET_SENSITIVE (N_("/Edit/Clear"), lp);
SET_SENSITIVE (N_("/Edit/Fill"), lp);
SET_SENSITIVE (N_("/Edit/Stroke"), lp);
SET_SENSITIVE (N_("/Edit/Undo"), undo_get_undo_name (gdisp->gimage));
SET_SENSITIVE (N_("/Edit/Redo"), undo_get_redo_name (gdisp->gimage));
SET_SENSITIVE (N_("/Edit/Cut Named"), lp);
SET_SENSITIVE (N_("/Edit/Copy Named"), lp);
SET_SENSITIVE (N_("/Edit/Paste Named"), lp);
}
SET_SENSITIVE (N_("/Select"), gdisp && lp);
SET_SENSITIVE (N_("/Select/Save To Channel"), !fs);
SET_SENSITIVE (N_("/View"), gdisp);
SET_SENSITIVE (N_("/View/Zoom"), gdisp);
if (gdisp)
{
SET_STATE (N_("/View/Toggle Selection"), !gdisp->select->hidden);
......@@ -1676,37 +1678,39 @@ gdisplay_set_menu_sensitivity (GDisplay *gdisp)
}
SET_SENSITIVE (N_("/Image"), gdisp);
SET_SENSITIVE (N_("/Image/Mode"), gdisp);
SET_SENSITIVE (N_("/Image/Colors"), gdisp);
SET_SENSITIVE (N_("/Image/Channels"), gdisp);
SET_SENSITIVE (N_("/Image/Colors/Auto"), gdisp);
SET_SENSITIVE (N_("/Image/Alpha"), gdisp);
SET_SENSITIVE (N_("/Image/Transforms"), gdisp);
SET_SENSITIVE (N_("/Image/Transforms/Rotate"), gdisp);
if (gdisp)
{
SET_SENSITIVE (N_("/Image/RGB"), (base_type != RGB));
SET_SENSITIVE (N_("/Image/Grayscale"), (base_type != GRAY));
SET_SENSITIVE (N_("/Image/Indexed"), (base_type != INDEXED));
SET_SENSITIVE (N_("/Image/Histogram"), lp);
SET_SENSITIVE (N_("/Image/Mode/RGB"), (base_type != RGB));
SET_SENSITIVE (N_("/Image/Mode/Grayscale"), (base_type != GRAY));
SET_SENSITIVE (N_("/Image/Mode/Indexed..."), (base_type != INDEXED));
SET_SENSITIVE (N_("/Image/Histogram..."), lp);
SET_SENSITIVE (N_("/Image/Colors"), lp);
SET_SENSITIVE (N_("/Image/Colors/Threshold"), (base_type != INDEXED));
SET_SENSITIVE (N_("/Image/Colors/Posterize"), (base_type != INDEXED));
SET_SENSITIVE (N_("/Image/Colors/Equalize"), (base_type != INDEXED));
SET_SENSITIVE (N_("/Image/Colors/Invert"), (base_type != INDEXED));
SET_SENSITIVE (N_("/Image/Colors/Color Balance"), (base_type == RGB));
SET_SENSITIVE (N_("/Image/Colors/Brightness-Contrast"),
(base_type != INDEXED));
SET_SENSITIVE (N_("/Image/Colors/Hue-Saturation"), (base_type == RGB));
SET_SENSITIVE (N_("/Image/Colors/Curves"), (base_type != INDEXED));
SET_SENSITIVE (N_("/Image/Colors/Levels"), (base_type != INDEXED));
SET_SENSITIVE (N_("/Image/Colors/Color Balance..."), (base_type == RGB));
SET_SENSITIVE (N_("/Image/Colors/Hue-Saturation..."), (base_type == RGB));
SET_SENSITIVE (N_("/Image/Colors/Brightness-Contrast..."), (base_type != INDEXED));
SET_SENSITIVE (N_("/Image/Colors/Threshold..."), (base_type != INDEXED));
SET_SENSITIVE (N_("/Image/Colors/Levels..."), (base_type != INDEXED));
SET_SENSITIVE (N_("/Image/Colors/Curves..."), (base_type != INDEXED));
SET_SENSITIVE (N_("/Image/Colors/Desaturate"), (base_type == RGB));
SET_SENSITIVE (N_("/Image/Colors/Posterize..."), (base_type != INDEXED));
SET_SENSITIVE (N_("/Image/Colors/Invert"), (base_type != INDEXED));
SET_SENSITIVE (N_("/Image/Colors/Auto/Equalize"), (base_type != INDEXED));
SET_SENSITIVE (N_("/Image/Alpha/Add Alpha Channel"),
!fs && !aux && lp && !lm && !alpha);
SET_SENSITIVE (N_("/Image/Transforms/Offset"), lp);
SET_SENSITIVE (N_("/Image/Transforms/Offset..."), lp);
}
SET_SENSITIVE (N_("/Layers/Stack"), gdisp);
SET_SENSITIVE (N_("/Layers/Rotate"), gdisp);
if (gdisp)
{
SET_SENSITIVE (N_("/Layers/Stack/Previous Layer"),
......@@ -1724,7 +1728,7 @@ gdisplay_set_menu_sensitivity (GDisplay *gdisp)
}
SET_SENSITIVE (N_("/Layers/Anchor Layer"), gdisp && fs && !aux && lp);
SET_SENSITIVE (N_("/Layers/Merge Visible Layers"), gdisp && !fs && !aux && lp);
SET_SENSITIVE (N_("/Layers/Merge Visible Layers..."), gdisp && !fs && !aux && lp);
SET_SENSITIVE (N_("/Layers/Flatten Image"), gdisp && !fs && !aux && lp);
SET_SENSITIVE (N_("/Layers/Alpha To Selection"), gdisp && !aux && lp && alpha);
SET_SENSITIVE (N_("/Layers/Mask To Selection"), gdisp && !aux && lm && lp);
......
......@@ -156,8 +156,8 @@ resize_widget_new (ResizeType type,
frame = gtk_frame_new (_("Size"));
break;
case ResizeImage:
wmclass = "image_scale";
window_title = _("Image Scale");
wmclass = "scale_image";
window_title = _("Scale Image");
help_page = "dialogs/scale_image.html";
frame = gtk_frame_new (_("Pixel Dimensions"));
break;
......@@ -169,12 +169,12 @@ resize_widget_new (ResizeType type,
{
case ResizeLayer:
wmclass = "resize_layer";
window_title = _("Resize Layer");
window_title = _("Set Layer Boundary Size");
help_page = "layers/dialogs/resize_layer.html";
break;
case ResizeImage:
wmclass = "image_resize";
window_title = _("Image Resize");
wmclass = "resize_image";
window_title = _("Set Canvas Size");
help_page = "dialogs/resize_image.html";
break;
}
......
......@@ -1637,32 +1637,34 @@ gdisplay_set_menu_sensitivity (GDisplay *gdisp)
menus_set_state_glue ("<Image>", (menu), (condition) != 0)
SET_SENSITIVE (N_("/File/Save"), gdisp);
SET_SENSITIVE (N_("/File/Save as"), gdisp);
SET_SENSITIVE (N_("/File/Save as..."), gdisp);
SET_SENSITIVE (N_("/File/Revert"), gdisp);
SET_SENSITIVE (N_("/File/Close"), gdisp);
SET_SENSITIVE (N_("/Edit"), gdisp);
SET_SENSITIVE (N_("/Edit/Buffer"), gdisp);
if (gdisp)
{
SET_SENSITIVE (N_("/Edit/Undo"), undo_get_undo_name (gdisp->gimage));
SET_SENSITIVE (N_("/Edit/Redo"), undo_get_redo_name (gdisp->gimage));
SET_SENSITIVE (N_("/Edit/Cut"), lp);
SET_SENSITIVE (N_("/Edit/Copy"), lp);
SET_SENSITIVE (N_("/Edit/Paste"), lp);
SET_SENSITIVE (N_("/Edit/Paste Into"), lp);
SET_SENSITIVE (N_("/Edit/Paste As New"), lp);
SET_SENSITIVE (N_("/Edit/Buffer/Cut Named..."), lp);
SET_SENSITIVE (N_("/Edit/Buffer/Copy Named..."), lp);
SET_SENSITIVE (N_("/Edit/Buffer/Paste Named..."), lp);
SET_SENSITIVE (N_("/Edit/Clear"), lp);
SET_SENSITIVE (N_("/Edit/Fill"), lp);
SET_SENSITIVE (N_("/Edit/Stroke"), lp);
SET_SENSITIVE (N_("/Edit/Undo"), undo_get_undo_name (gdisp->gimage));
SET_SENSITIVE (N_("/Edit/Redo"), undo_get_redo_name (gdisp->gimage));
SET_SENSITIVE (N_("/Edit/Cut Named"), lp);
SET_SENSITIVE (N_("/Edit/Copy Named"), lp);
SET_SENSITIVE (N_("/Edit/Paste Named"), lp);
}
SET_SENSITIVE (N_("/Select"), gdisp && lp);
SET_SENSITIVE (N_("/Select/Save To Channel"), !fs);
SET_SENSITIVE (N_("/View"), gdisp);
SET_SENSITIVE (N_("/View/Zoom"), gdisp);
if (gdisp)
{
SET_STATE (N_("/View/Toggle Selection"), !gdisp->select->hidden);
......@@ -1676,37 +1678,39 @@ gdisplay_set_menu_sensitivity (GDisplay *gdisp)
}
SET_SENSITIVE (N_("/Image"), gdisp);
SET_SENSITIVE (N_("/Image/Mode"), gdisp);
SET_SENSITIVE (N_("/Image/Colors"), gdisp);
SET_SENSITIVE (N_("/Image/Channels"), gdisp);
SET_SENSITIVE (N_("/Image/Colors/Auto"), gdisp);
SET_SENSITIVE (N_("/Image/Alpha"), gdisp);
SET_SENSITIVE (N_("/Image/Transforms"), gdisp);
SET_SENSITIVE (N_("/Image/Transforms/Rotate"), gdisp);
if (gdisp)
{
SET_SENSITIVE (N_("/Image/RGB"), (base_type != RGB));
SET_SENSITIVE (N_("/Image/Grayscale"), (base_type != GRAY));
SET_SENSITIVE (N_("/Image/Indexed"), (base_type != INDEXED));
SET_SENSITIVE (N_("/Image/Histogram"), lp);
SET_SENSITIVE (N_("/Image/Mode/RGB"), (base_type != RGB));
SET_SENSITIVE (N_("/Image/Mode/Grayscale"), (base_type != GRAY));
SET_SENSITIVE (N_("/Image/Mode/Indexed..."), (base_type != INDEXED));
SET_SENSITIVE (N_("/Image/Histogram..."), lp);
SET_SENSITIVE (N_("/Image/Colors"), lp);
SET_SENSITIVE (N_("/Image/Colors/Threshold"), (base_type != INDEXED));
SET_SENSITIVE (N_("/Image/Colors/Posterize"), (base_type != INDEXED));
SET_SENSITIVE (N_("/Image/Colors/Equalize"), (base_type != INDEXED));
SET_SENSITIVE (N_("/Image/Colors/Invert"), (base_type != INDEXED));
SET_SENSITIVE (N_("/Image/Colors/Color Balance"), (base_type == RGB));
SET_SENSITIVE (N_("/Image/Colors/Brightness-Contrast"),
(base_type != INDEXED));
SET_SENSITIVE (N_("/Image/Colors/Hue-Saturation"), (base_type == RGB));
SET_SENSITIVE (N_("/Image/Colors/Curves"), (base_type != INDEXED));
SET_SENSITIVE (N_("/Image/Colors/Levels"), (base_type != INDEXED));
SET_SENSITIVE (N_("/Image/Colors/Color Balance..."), (base_type == RGB));
SET_SENSITIVE (N_("/Image/Colors/Hue-Saturation..."), (base_type == RGB));
SET_SENSITIVE (N_("/Image/Colors/Brightness-Contrast..."), (base_type != INDEXED));
SET_SENSITIVE (N_("/Image/Colors/Threshold..."), (base_type != INDEXED));
SET_SENSITIVE (N_("/Image/Colors/Levels..."), (base_type != INDEXED));
SET_SENSITIVE (N_("/Image/Colors/Curves..."), (base_type != INDEXED));
SET_SENSITIVE (N_("/Image/Colors/Desaturate"), (base_type == RGB));
SET_SENSITIVE (N_("/Image/Colors/Posterize..."), (base_type != INDEXED));
SET_SENSITIVE (N_("/Image/Colors/Invert"), (base_type != INDEXED));
SET_SENSITIVE (N_("/Image/Colors/Auto/Equalize"), (base_type != INDEXED));
SET_SENSITIVE (N_("/Image/Alpha/Add Alpha Channel"),
!fs && !aux && lp && !lm && !alpha);
SET_SENSITIVE (N_("/Image/Transforms/Offset"), lp);
SET_SENSITIVE (N_("/Image/Transforms/Offset..."), lp);
}
SET_SENSITIVE (N_("/Layers/Stack"), gdisp);
SET_SENSITIVE (N_("/Layers/Rotate"), gdisp);
if (gdisp)
{
SET_SENSITIVE (N_("/Layers/Stack/Previous Layer"),
......@@ -1724,7 +1728,7 @@ gdisplay_set_menu_sensitivity (GDisplay *gdisp)
}
SET_SENSITIVE (N_("/Layers/Anchor Layer"), gdisp && fs && !aux && lp);
SET_SENSITIVE (N_("/Layers/Merge Visible Layers"), gdisp && !fs && !aux && lp);
SET_SENSITIVE (N_("/Layers/Merge Visible Layers..."), gdisp && !fs && !aux && lp);
SET_SENSITIVE (N_("/Layers/Flatten Image"), gdisp && !fs && !aux && lp);
SET_SENSITIVE (N_("/Layers/Alpha To Selection"), gdisp && !aux && lp && alpha);
SET_SENSITIVE (N_("/Layers/Mask To Selection"), gdisp && !aux && lm && lp);
......
......@@ -71,13 +71,13 @@ struct _OverwriteBox
};
static void file_overwrite (char *filename,
char* raw_filename);
char *raw_filename);
static void file_overwrite_yes_callback (GtkWidget *, gpointer);
static void file_overwrite_no_callback (GtkWidget *, gpointer);
static GimpImage* file_open_image (char *filename,
char *raw_filename,
RunModeType runmode);
static GimpImage * file_open_image (char *filename,
char *raw_filename,
RunModeType runmode);