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

Issue #12021: Text editor Open and Clear buttons disabled and without icons. 

Also remove "text-editor-toolbar" which was one of these fake actions
only used to represent submenus in the old action implementation.
This commit is contained in:
Jehan 2024-09-11 15:24:20 +02:00
parent 0c484ddcd3
commit 41a2596d29
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/actions/text-editor-actions.c
View File

@ -36,11 +36,6 @@
static const GimpActionEntry text_editor_actions[] = static const GimpActionEntry text_editor_actions[] =
{ {
{ "text-editor-toolbar", GIMP_ICON_EDIT,
NC_("text-editor-action", "Text Editor Toolbar"),
NULL, { NULL }, NULL, NULL,
GIMP_HELP_TEXT_EDITOR_DIALOG },
{ "text-editor-load", GIMP_ICON_DOCUMENT_OPEN, { "text-editor-load", GIMP_ICON_DOCUMENT_OPEN,
NC_("text-editor-action", "Open"), NULL, { NULL }, NC_("text-editor-action", "Open"), NULL, { NULL },
NC_("text-editor-action", "Load text from file"), NC_("text-editor-action", "Load text from file"),

12
app/widgets/gimptoolbar.c
View File

@ -265,8 +265,6 @@ gimp_toolbar_add_action (GimpToolbar *toolbar,
} }
gtk_tool_button_set_label (GTK_TOOL_BUTTON (item), action_label); gtk_tool_button_set_label (GTK_TOOL_BUTTON (item), action_label);
gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item),
gimp_action_get_icon_name (GIMP_ACTION (action)));
gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (item), gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (item),
gimp_toggle_action_get_active (GIMP_TOGGLE_ACTION (action))); gimp_toggle_action_get_active (GIMP_TOGGLE_ACTION (action)));
@ -277,8 +275,7 @@ gimp_toolbar_add_action (GimpToolbar *toolbar,
G_CALLBACK (gimp_toolbar_toggle_action_toggled), G_CALLBACK (gimp_toolbar_toggle_action_toggled),
item, 0); item, 0);
} }
else if (GIMP_IS_PROCEDURE_ACTION (action) || else
GIMP_IS_ENUM_ACTION (action))
{ {
item = gtk_tool_button_new (NULL, action_label); item = gtk_tool_button_new (NULL, action_label);
@ -286,12 +283,9 @@ gimp_toolbar_add_action (GimpToolbar *toolbar,
G_CALLBACK (gimp_action_activate), G_CALLBACK (gimp_action_activate),
action); action);
} }
else
{
item = gtk_tool_button_new (NULL, action_label);
gtk_actionable_set_action_name (GTK_ACTIONABLE (item), action_name); gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item),
} gimp_action_get_icon_name (GIMP_ACTION (action)));
g_object_set_data (G_OBJECT (item), GIMP_TOOLBAR_ACTION_KEY, action); g_object_set_data (G_OBJECT (item), GIMP_TOOLBAR_ACTION_KEY, action);