added "name" attributes to all submenus.

2004-05-13  Michael Natterer  <mitch@gimp.org>

	* menus/tool-options-menu.xml: added "name" attributes to all
	submenus.

	* app/menus/tool-options-menu.c: use the menu names instead of the
	overly long action names.

	* app/actions/colormap-editor-commands.c
	* app/actions/tool-options-commands.c: added some callback
	implementations.

	* app/widgets/gimpcolormapeditor.c
	* app/widgets/gimptooloptionseditor.c: removed the callbacks here
	and use action buttons.

	* app/actions/actions.c
	* app/actions/colormap-editor-actions.c
	* app/actions/edit-actions.c: code review / cleanup.
This commit is contained in:
Michael Natterer
2004-05-13 15:50:55 +00:00
committed by Michael Natterer
parent b5ebbaaf36
commit b8739d5901
12 changed files with 296 additions and 277 deletions

View File

@ -47,7 +47,7 @@ static void tool_options_menu_update_presets (GimpUIManager *manager,
guint merge_id,
const gchar *ui_path,
const gchar *menu_path,
const gchar *action_prefix,
const gchar *which_action,
GimpContainer *presets);
@ -110,23 +110,19 @@ tool_options_menu_update_after (GimpUIManager *manager,
GUINT_TO_POINTER (merge_id));
tool_options_menu_update_presets (manager, merge_id, ui_path,
"tool-options-save-menu",
"tool-options-save-",
"Save", "save",
tool_info->options_presets);
tool_options_menu_update_presets (manager, merge_id, ui_path,
"tool-options-restore-menu",
"tool-options-restore-",
"Restore", "restore",
tool_info->options_presets);
tool_options_menu_update_presets (manager, merge_id, ui_path,
"tool-options-rename-menu",
"tool-options-rename-",
"Rename", "rename",
tool_info->options_presets);
tool_options_menu_update_presets (manager, merge_id, ui_path,
"tool-options-delete-menu",
"tool-options-delete-",
"Delete", "delete",
tool_info->options_presets);
gtk_ui_manager_ensure_update (GTK_UI_MANAGER (manager));
@ -137,11 +133,11 @@ tool_options_menu_update_presets (GimpUIManager *manager,
guint merge_id,
const gchar *ui_path,
const gchar *menu_path,
const gchar *action_prefix,
const gchar *which_action,
GimpContainer *presets)
{
gint n_children;
gint i;
gint n_children;
gint i;
n_children = gimp_container_num_children (presets);
@ -150,8 +146,8 @@ tool_options_menu_update_presets (GimpUIManager *manager,
gchar *action_name;
gchar *path;
action_name = g_strdup_printf ("tool-options-%s-%03d", which_action, i);
path = g_strdup_printf ("%s/%s", ui_path, menu_path);
action_name = g_strdup_printf ("%s%03d", action_prefix, i);
gtk_ui_manager_add_ui (GTK_UI_MANAGER (manager), merge_id,
path, action_name, action_name,