callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fallback from stock ids to icon names like the old GtkAction code did

Browse Source 
svn path=/trunk/; revision=22210
This commit is contained in:
Matthias Clasen
2009-01-24 22:00:07 +00:00
parent a8c2a3eb9f
commit 1db176de7f
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2009-01-24 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktoolbutton.c (gtk_tool_button_activatable_reset):
Fall back from stock ids to icon names like the old code
did. Patch by Tristan van Berkom.
2009-01-24 Matthias Clasen <mclasen@redhat.com> 2009-01-24 Matthias Clasen <mclasen@redhat.com>
* tests/testactions.c: Add a testcase for toolitems using * tests/testactions.c: Add a testcase for toolitems using

17
gtk/gtktoolbutton.c
View File

@ -772,6 +772,7 @@ gtk_tool_button_activatable_update (GtkActivatable *activatable,
gtk_tool_button_set_label (button, NULL); gtk_tool_button_set_label (button, NULL);
gtk_tool_button_set_icon_name (button, NULL); gtk_tool_button_set_icon_name (button, NULL);
} }
gtk_tool_button_set_icon_widget (button, NULL);
gtk_tool_button_set_stock_id (button, gtk_action_get_stock_id (action)); gtk_tool_button_set_stock_id (button, gtk_action_get_stock_id (action));
} }
else if (strcmp (property_name, "gicon") == 0) else if (strcmp (property_name, "gicon") == 0)
@ -812,6 +813,7 @@ gtk_tool_button_activatable_reset (GtkActivatable *activatable,
{ {
GtkToolButton *button; GtkToolButton *button;
GIcon *icon; GIcon *icon;
const gchar *stock_id;
parent_activatable_iface->reset (activatable, action); parent_activatable_iface->reset (activatable, action);
@ -822,14 +824,15 @@ gtk_tool_button_activatable_reset (GtkActivatable *activatable,
return; return;
button = GTK_TOOL_BUTTON (activatable); button = GTK_TOOL_BUTTON (activatable);
stock_id = gtk_action_get_stock_id (action);
gtk_tool_button_set_label (button, NULL);
gtk_tool_button_set_stock_id (button, NULL); gtk_tool_button_set_label (button, gtk_action_get_short_label (action));
gtk_tool_button_set_icon_name (button, NULL);
gtk_tool_button_set_use_underline (button, TRUE); gtk_tool_button_set_use_underline (button, TRUE);
gtk_tool_button_set_stock_id (button, stock_id);
if (gtk_action_get_stock_id (action)) gtk_tool_button_set_icon_name (button, gtk_action_get_icon_name (action));
gtk_tool_button_set_stock_id (button, gtk_action_get_stock_id (action));
if (stock_id && gtk_icon_factory_lookup_default (stock_id))
gtk_tool_button_set_icon_widget (button, NULL);
else if ((icon = gtk_action_get_gicon (action)) != NULL) else if ((icon = gtk_action_get_gicon (action)) != NULL)
{ {
GtkIconSize icon_size = gtk_tool_item_get_icon_size (GTK_TOOL_ITEM (button)); GtkIconSize icon_size = gtk_tool_item_get_icon_size (GTK_TOOL_ITEM (button));