mirror of https://github.com/GNOME/gimp.git
app: get rid of gimp_action_(g|s)et_accel_path().
This commit is contained in:
parent
ef645695c2
commit
a98a903976
|
@ -235,7 +235,6 @@ edit_actions_setup (GimpActionGroup *group)
|
||||||
GimpContext *context = gimp_get_user_context (group->gimp);
|
GimpContext *context = gimp_get_user_context (group->gimp);
|
||||||
GimpRGB color;
|
GimpRGB color;
|
||||||
GimpPattern *pattern;
|
GimpPattern *pattern;
|
||||||
GimpAction *action;
|
|
||||||
|
|
||||||
gimp_action_group_add_actions (group, "edit-action",
|
gimp_action_group_add_actions (group, "edit-action",
|
||||||
edit_actions,
|
edit_actions,
|
||||||
|
@ -251,11 +250,6 @@ edit_actions_setup (GimpActionGroup *group)
|
||||||
G_N_ELEMENTS (edit_fill_actions),
|
G_N_ELEMENTS (edit_fill_actions),
|
||||||
edit_fill_cmd_callback);
|
edit_fill_cmd_callback);
|
||||||
|
|
||||||
action = gimp_action_group_get_action (group,
|
|
||||||
"edit-paste-as-new-image-short");
|
|
||||||
gimp_action_set_accel_path (action,
|
|
||||||
"<Actions>/edit/edit-paste-as-new-image");
|
|
||||||
|
|
||||||
g_signal_connect_object (context, "foreground-changed",
|
g_signal_connect_object (context, "foreground-changed",
|
||||||
G_CALLBACK (edit_actions_foreground_changed),
|
G_CALLBACK (edit_actions_foreground_changed),
|
||||||
group, 0);
|
group, 0);
|
||||||
|
|
|
@ -660,8 +660,7 @@ static const GimpEnumActionEntry tools_object_2_actions[] =
|
||||||
void
|
void
|
||||||
tools_actions_setup (GimpActionGroup *group)
|
tools_actions_setup (GimpActionGroup *group)
|
||||||
{
|
{
|
||||||
GimpAction *action;
|
GList *list;
|
||||||
GList *list;
|
|
||||||
|
|
||||||
gimp_action_group_add_actions (group, "tools-action",
|
gimp_action_group_add_actions (group, "tools-action",
|
||||||
tools_actions,
|
tools_actions,
|
||||||
|
@ -672,10 +671,6 @@ tools_actions_setup (GimpActionGroup *group)
|
||||||
G_N_ELEMENTS (tools_alternative_actions),
|
G_N_ELEMENTS (tools_alternative_actions),
|
||||||
tools_select_cmd_callback);
|
tools_select_cmd_callback);
|
||||||
|
|
||||||
action = gimp_action_group_get_action (group,
|
|
||||||
"tools-by-color-select-short");
|
|
||||||
gimp_action_set_accel_path (action, "<Actions>/tools/tools-by-color-select");
|
|
||||||
|
|
||||||
gimp_action_group_add_enum_actions (group, NULL,
|
gimp_action_group_add_enum_actions (group, NULL,
|
||||||
tools_color_average_radius_actions,
|
tools_color_average_radius_actions,
|
||||||
G_N_ELEMENTS (tools_color_average_radius_actions),
|
G_N_ELEMENTS (tools_color_average_radius_actions),
|
||||||
|
|
|
@ -455,19 +455,15 @@ windows_actions_update_display_accels (GimpActionGroup *group)
|
||||||
|
|
||||||
if (action)
|
if (action)
|
||||||
{
|
{
|
||||||
const gchar *accel_path;
|
gchar *accel;
|
||||||
guint accel_key;
|
|
||||||
|
|
||||||
accel_path = gimp_action_get_accel_path (action);
|
|
||||||
|
|
||||||
if (i < 9)
|
if (i < 9)
|
||||||
accel_key = GDK_KEY_1 + i;
|
accel = gtk_accelerator_name (GDK_KEY_1 + i, GDK_MOD1_MASK);
|
||||||
else
|
else
|
||||||
accel_key = GDK_KEY_0;
|
accel = gtk_accelerator_name (GDK_KEY_0 + i, GDK_MOD1_MASK);
|
||||||
|
|
||||||
gtk_accel_map_change_entry (accel_path,
|
gimp_action_set_accels (action, (const gchar*[]) { accel, NULL });
|
||||||
accel_key, GDK_MOD1_MASK,
|
g_free (accel);
|
||||||
TRUE);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -385,19 +385,6 @@ gimp_action_is_sensitive (GimpAction *action,
|
||||||
return sensitive;
|
return sensitive;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
gimp_action_set_accel_path (GimpAction *action,
|
|
||||||
const gchar *accel_path)
|
|
||||||
{
|
|
||||||
gtk_action_set_accel_path ((GtkAction *) action, accel_path);
|
|
||||||
}
|
|
||||||
|
|
||||||
const gchar *
|
|
||||||
gimp_action_get_accel_path (GimpAction *action)
|
|
||||||
{
|
|
||||||
return gtk_action_get_accel_path ((GtkAction *) action);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
gimp_action_set_accel_group (GimpAction *action,
|
gimp_action_set_accel_group (GimpAction *action,
|
||||||
GtkAccelGroup *accel_group)
|
GtkAccelGroup *accel_group)
|
||||||
|
|
|
@ -103,10 +103,6 @@ gboolean gimp_action_get_sensitive (GimpAction *action,
|
||||||
gboolean gimp_action_is_sensitive (GimpAction *action,
|
gboolean gimp_action_is_sensitive (GimpAction *action,
|
||||||
const gchar **reason);
|
const gchar **reason);
|
||||||
|
|
||||||
void gimp_action_set_accel_path (GimpAction *action,
|
|
||||||
const gchar *accel_path);
|
|
||||||
const gchar * gimp_action_get_accel_path (GimpAction *action);
|
|
||||||
|
|
||||||
void gimp_action_set_accel_group (GimpAction *action,
|
void gimp_action_set_accel_group (GimpAction *action,
|
||||||
GtkAccelGroup *accel_group);
|
GtkAccelGroup *accel_group);
|
||||||
void gimp_action_connect_accelerator (GimpAction *action);
|
void gimp_action_connect_accelerator (GimpAction *action);
|
||||||
|
|
Loading…
Reference in New Issue