dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

try to use the menu label with ellipsis instead of the result of 

2008-09-19  Sven Neumann  <sven@gimp.org>

	* app/actions/plug-in-actions.c 
(plug_in_actions_history_changed):
	try to use the menu label with ellipsis instead of the result of
	gimp_plug_in_procedure_get_label() which has ellipsis and
	mnemonics stripped.


svn path=/trunk/; revision=27005
This commit is contained in:
Sven Neumann 2008-09-19 06:43:37 +00:00 committed by Sven Neumann
parent 8cc4583057
commit d986821b36
2 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2008-09-19 Sven Neumann <sven@gimp.org>
* app/actions/plug-in-actions.c (plug_in_actions_history_changed):
try to use the menu label with ellipsis instead of the result of
gimp_plug_in_procedure_get_label() which has ellipsis and
mnemonics stripped.
2008-09-19 Sven Neumann <sven@gimp.org> 2008-09-19 Sven Neumann <sven@gimp.org>
* app/gegl/gimplevelsconfig.c (gimp_levels_config_to_curves_config): * app/gegl/gimplevelsconfig.c (gimp_levels_config_to_curves_config):

26
app/actions/plug-in-actions.c
View File

@ -488,6 +488,8 @@ plug_in_actions_history_changed (GimpPlugInManager *manager,
gchar *reshow; gchar *reshow;
gboolean sensitive = FALSE; gboolean sensitive = FALSE;
label = gimp_plug_in_procedure_get_label (proc);
/* copy the sensitivity of the plug-in procedure's actual action /* copy the sensitivity of the plug-in procedure's actual action
* instead of calling plug_in_actions_update() because doing the * instead of calling plug_in_actions_update() because doing the
* latter would set the sensitivity of this image's action on * latter would set the sensitivity of this image's action on
@ -498,8 +500,6 @@ plug_in_actions_history_changed (GimpPlugInManager *manager,
if (actual_action) if (actual_action)
sensitive = gtk_action_get_sensitive (actual_action); sensitive = gtk_action_get_sensitive (actual_action);
label = gimp_plug_in_procedure_get_label (proc);
repeat = g_strdup_printf (_("Re_peat \"%s\""), label); repeat = g_strdup_printf (_("Re_peat \"%s\""), label);
reshow = g_strdup_printf (_("R_e-Show \"%s\""), label); reshow = g_strdup_printf (_("R_e-Show \"%s\""), label);
@ -527,16 +527,28 @@ plug_in_actions_history_changed (GimpPlugInManager *manager,
for (i = 0; i < gimp_plug_in_manager_history_length (manager); i++) for (i = 0; i < gimp_plug_in_manager_history_length (manager); i++)
{ {
GtkAction *action; GtkAction *action;
GtkAction *actual_action; GtkAction *actual_action;
gchar *name = g_strdup_printf ("plug-in-recent-%02d", i + 1); const gchar *label;
gboolean sensitive = FALSE; gchar *name;
gboolean sensitive = FALSE;
name = g_strdup_printf ("plug-in-recent-%02d", i + 1);
action = gtk_action_group_get_action (GTK_ACTION_GROUP (group), name); action = gtk_action_group_get_action (GTK_ACTION_GROUP (group), name);
g_free (name); g_free (name);
proc = gimp_plug_in_manager_history_nth (manager, i); proc = gimp_plug_in_manager_history_nth (manager, i);
if (proc->menu_label)
{
label = dgettext (gimp_plug_in_procedure_get_locale_domain (proc),
proc->menu_label);
}
else
{
label = gimp_plug_in_procedure_get_label (proc);
}
/* see comment above */ /* see comment above */
actual_action = gtk_action_group_get_action (GTK_ACTION_GROUP (group), actual_action = gtk_action_group_get_action (GTK_ACTION_GROUP (group),
GIMP_OBJECT (proc)->name); GIMP_OBJECT (proc)->name);
@ -547,7 +559,7 @@ plug_in_actions_history_changed (GimpPlugInManager *manager,
"visible", TRUE, "visible", TRUE,
"sensitive", sensitive, "sensitive", sensitive,
"procedure", proc, "procedure", proc,
"label", gimp_plug_in_procedure_get_label (proc), "label", label,
"stock-id", gimp_plug_in_procedure_get_stock_id (proc), "stock-id", gimp_plug_in_procedure_get_stock_id (proc),
"tooltip", gimp_plug_in_procedure_get_blurb (proc), "tooltip", gimp_plug_in_procedure_get_blurb (proc),
NULL); NULL);