@@ -3003,14 +3003,39 @@ activate_cb (GtkWidget *menuitem,
3003
3003
g_signal_emit_by_name (label , signal );
3004
3004
}
3005
3005
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
+
3006
3030
static void
3007
3031
append_action_signal (EelEditableLabel * label ,
3008
3032
GtkWidget * menu ,
3009
- const gchar * stock_id ,
3033
+ const gchar * icon_name ,
3034
+ const gchar * label_name ,
3010
3035
const gchar * signal ,
3011
3036
gboolean sensitive )
3012
3037
{
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 );
3014
3039
3015
3040
g_object_set_data (G_OBJECT (menuitem ), "gtk-signal" , (char * )signal );
3016
3041
g_signal_connect (menuitem , "activate" ,
@@ -3096,6 +3121,8 @@ popup_targets_received (GtkClipboard *clipboard,
3096
3121
3097
3122
label -> popup_menu = gtk_menu_new ();
3098
3123
3124
+ gtk_menu_set_reserve_toggle_size (GTK_MENU (label -> popup_menu ), FALSE);
3125
+
3099
3126
gtk_menu_attach_to_widget (GTK_MENU (label -> popup_menu ),
3100
3127
GTK_WIDGET (label ),
3101
3128
popup_menu_detach );
@@ -3105,14 +3132,14 @@ popup_targets_received (GtkClipboard *clipboard,
3105
3132
3106
3133
clipboard_contains_text = gtk_selection_data_targets_include_text (data );
3107
3134
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" ,
3109
3136
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" ,
3111
3138
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" ,
3113
3140
clipboard_contains_text );
3114
3141
3115
- menuitem = gtk_menu_item_new_with_label ( _ ("Select All" ));
3142
+ menuitem = mate_image_menu_item_new_from_icon ( "edit-select-all" , _ ("Select All" ));
3116
3143
g_signal_connect_object (menuitem , "activate" ,
3117
3144
G_CALLBACK (eel_editable_label_select_all ), label ,
3118
3145
G_CONNECT_SWAPPED );
@@ -3123,7 +3150,7 @@ popup_targets_received (GtkClipboard *clipboard,
3123
3150
gtk_widget_show (menuitem );
3124
3151
gtk_menu_shell_append (GTK_MENU_SHELL (label -> popup_menu ), menuitem );
3125
3152
3126
- menuitem = gtk_menu_item_new_with_label ( _ ("Input Methods" ));
3153
+ menuitem = mate_image_menu_item_new_from_icon ( NULL , _ ("Input Methods" ));
3127
3154
gtk_widget_show (menuitem );
3128
3155
submenu = gtk_menu_new ();
3129
3156
gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem ), submenu );
0 commit comments