Skip to content

Commit ff1b432

Browse files
committed
eel-editable-label.c: avoid gtk_image_menu_item_new_from_stock
and add icon to "Select All"
1 parent cff14d0 commit ff1b432

File tree

1 file changed

+34
-7
lines changed

1 file changed

+34
-7
lines changed

eel/eel-editable-label.c

+34-7
Original file line numberDiff line numberDiff line change
@@ -3003,14 +3003,39 @@ activate_cb (GtkWidget *menuitem,
30033003
g_signal_emit_by_name (label, signal);
30043004
}
30053005

3006+
static GtkWidget
3007+
*mate_image_menu_item_new_from_icon (const gchar *icon_name,
3008+
const gchar *label_name)
3009+
{
3010+
GtkWidget *icon;
3011+
GtkWidget *box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
3012+
3013+
if (icon_name)
3014+
icon = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
3015+
else
3016+
icon = gtk_image_new ();
3017+
3018+
GtkWidget *label_menu = gtk_label_new_with_mnemonic (g_strconcat (label_name, " ", NULL));
3019+
GtkWidget *menuitem = gtk_menu_item_new ();
3020+
3021+
gtk_container_add (GTK_CONTAINER (box), icon);
3022+
gtk_container_add (GTK_CONTAINER (box), label_menu);
3023+
3024+
gtk_container_add (GTK_CONTAINER (menuitem), box);
3025+
gtk_widget_show_all (menuitem);
3026+
3027+
return menuitem;
3028+
}
3029+
30063030
static void
30073031
append_action_signal (EelEditableLabel *label,
30083032
GtkWidget *menu,
3009-
const gchar *stock_id,
3033+
const gchar *icon_name,
3034+
const gchar *label_name,
30103035
const gchar *signal,
30113036
gboolean sensitive)
30123037
{
3013-
GtkWidget *menuitem = gtk_image_menu_item_new_from_stock (stock_id, NULL);
3038+
GtkWidget *menuitem = mate_image_menu_item_new_from_icon (icon_name, label_name);
30143039

30153040
g_object_set_data (G_OBJECT (menuitem), "gtk-signal", (char *)signal);
30163041
g_signal_connect (menuitem, "activate",
@@ -3096,6 +3121,8 @@ popup_targets_received (GtkClipboard *clipboard,
30963121

30973122
label->popup_menu = gtk_menu_new ();
30983123

3124+
gtk_menu_set_reserve_toggle_size (GTK_MENU (label->popup_menu), FALSE);
3125+
30993126
gtk_menu_attach_to_widget (GTK_MENU (label->popup_menu),
31003127
GTK_WIDGET (label),
31013128
popup_menu_detach);
@@ -3105,14 +3132,14 @@ popup_targets_received (GtkClipboard *clipboard,
31053132

31063133
clipboard_contains_text = gtk_selection_data_targets_include_text (data);
31073134

3108-
append_action_signal (label, label->popup_menu, "gtk-cut", "cut_clipboard",
3135+
append_action_signal (label, label->popup_menu, "gtk-cut", _("Cu_t"), "cut_clipboard",
31093136
have_selection);
3110-
append_action_signal (label, label->popup_menu, "gtk-copy", "copy_clipboard",
3137+
append_action_signal (label, label->popup_menu, "gtk-copy", _("_Copy"), "copy_clipboard",
31113138
have_selection);
3112-
append_action_signal (label, label->popup_menu, "gtk-paste", "paste_clipboard",
3139+
append_action_signal (label, label->popup_menu, "gtk-paste", _("_Paste"), "paste_clipboard",
31133140
clipboard_contains_text);
31143141

3115-
menuitem = gtk_menu_item_new_with_label (_("Select All"));
3142+
menuitem = mate_image_menu_item_new_from_icon ("edit-select-all", _("Select All"));
31163143
g_signal_connect_object (menuitem, "activate",
31173144
G_CALLBACK (eel_editable_label_select_all), label,
31183145
G_CONNECT_SWAPPED);
@@ -3123,7 +3150,7 @@ popup_targets_received (GtkClipboard *clipboard,
31233150
gtk_widget_show (menuitem);
31243151
gtk_menu_shell_append (GTK_MENU_SHELL (label->popup_menu), menuitem);
31253152

3126-
menuitem = gtk_menu_item_new_with_label (_("Input Methods"));
3153+
menuitem = mate_image_menu_item_new_from_icon (NULL, _("Input Methods"));
31273154
gtk_widget_show (menuitem);
31283155
submenu = gtk_menu_new ();
31293156
gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu);

0 commit comments

Comments
 (0)