Skip to content

Commit e031d4f

Browse files
sc0wsc0w
committed
fm-tree-view.c: avoid deprecated GtkImageMenuItem
avoid deprecated: gtk_image_menu_item_new_from_stock gtk_image_menu_item_new_with_mnemonic gtk_image_menu_item_set_image
1 parent 8bebf06 commit e031d4f

File tree

1 file changed

+14
-32
lines changed

1 file changed

+14
-32
lines changed

‎src/file-manager/fm-tree-view.c‎

Lines changed: 14 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1255,18 +1255,15 @@ create_popup_menu (FMTreeView *view)
12551255

12561256
popup = gtk_menu_new ();
12571257

1258+
gtk_menu_set_reserve_toggle_size (GTK_MENU (popup), FALSE);
1259+
12581260
g_signal_connect (popup, "deactivate",
12591261
G_CALLBACK (popup_menu_deactivated),
12601262
view);
12611263

12621264

12631265
/* add the "open" menu item */
1264-
menu_image = gtk_image_new_from_icon_name ("document-open",
1265-
GTK_ICON_SIZE_MENU);
1266-
gtk_widget_show (menu_image);
1267-
menu_item = gtk_image_menu_item_new_with_mnemonic (_("_Open"));
1268-
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item),
1269-
menu_image);
1266+
menu_item = eel_image_menu_item_new_from_icon ("document-open", _("_Open"));
12701267
g_signal_connect (menu_item, "activate",
12711268
G_CALLBACK (fm_tree_view_open_cb),
12721269
view);
@@ -1275,7 +1272,7 @@ create_popup_menu (FMTreeView *view)
12751272
view->details->popup_open = menu_item;
12761273

12771274
/* add the "open in new tab" menu item */
1278-
menu_item = gtk_menu_item_new_with_mnemonic (_("Open in New _Tab"));
1275+
menu_item = eel_image_menu_item_new_from_icon (NULL, _("Open in New _Tab"));
12791276
g_signal_connect (menu_item, "activate",
12801277
G_CALLBACK (fm_tree_view_open_in_new_tab_cb),
12811278
view);
@@ -1284,7 +1281,7 @@ create_popup_menu (FMTreeView *view)
12841281
view->details->popup_open_in_new_window = menu_item;
12851282

12861283
/* add the "open in new window" menu item */
1287-
menu_item = gtk_menu_item_new_with_mnemonic (_("Open in New _Window"));
1284+
menu_item = eel_image_menu_item_new_from_icon (NULL, _("Open in New _Window"));
12881285
g_signal_connect (menu_item, "activate",
12891286
G_CALLBACK (fm_tree_view_open_in_new_window_cb),
12901287
view);
@@ -1295,7 +1292,7 @@ create_popup_menu (FMTreeView *view)
12951292
eel_gtk_menu_append_separator (GTK_MENU (popup));
12961293

12971294
/* add the "create folder" menu item */
1298-
menu_item = gtk_image_menu_item_new_with_mnemonic (_("Create _Folder"));
1295+
menu_item = eel_image_menu_item_new_from_icon (NULL, _("Create _Folder"));
12991296
g_signal_connect (menu_item, "activate",
13001297
G_CALLBACK (fm_tree_view_create_folder_cb),
13011298
view);
@@ -1306,7 +1303,7 @@ create_popup_menu (FMTreeView *view)
13061303
eel_gtk_menu_append_separator (GTK_MENU (popup));
13071304

13081305
/* add the "cut folder" menu item */
1309-
menu_item = gtk_image_menu_item_new_from_stock ("gtk-cut", NULL);
1306+
menu_item = eel_image_menu_item_new_from_icon ("edit-cut", _("Cu_t"));
13101307
g_signal_connect (menu_item, "activate",
13111308
G_CALLBACK (fm_tree_view_cut_cb),
13121309
view);
@@ -1315,7 +1312,7 @@ create_popup_menu (FMTreeView *view)
13151312
view->details->popup_cut = menu_item;
13161313

13171314
/* add the "copy folder" menu item */
1318-
menu_item = gtk_image_menu_item_new_from_stock ("gtk-copy", NULL);
1315+
menu_item = eel_image_menu_item_new_from_icon ("edit-copy", _("_Copy"));
13191316
g_signal_connect (menu_item, "activate",
13201317
G_CALLBACK (fm_tree_view_copy_cb),
13211318
view);
@@ -1324,12 +1321,7 @@ create_popup_menu (FMTreeView *view)
13241321
view->details->popup_copy = menu_item;
13251322

13261323
/* add the "paste files into folder" menu item */
1327-
menu_image = gtk_image_new_from_icon_name ("edit-paste",
1328-
GTK_ICON_SIZE_MENU);
1329-
gtk_widget_show (menu_image);
1330-
menu_item = gtk_image_menu_item_new_with_mnemonic (_("_Paste Into Folder"));
1331-
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item),
1332-
menu_image);
1324+
menu_item = eel_image_menu_item_new_from_icon ("edit-paste", _("_Paste Into Folder"));
13331325
g_signal_connect (menu_item, "activate",
13341326
G_CALLBACK (fm_tree_view_paste_cb),
13351327
view);
@@ -1340,12 +1332,7 @@ create_popup_menu (FMTreeView *view)
13401332
eel_gtk_menu_append_separator (GTK_MENU (popup));
13411333

13421334
/* add the "move to trash" menu item */
1343-
menu_image = gtk_image_new_from_icon_name (CAJA_ICON_TRASH_FULL,
1344-
GTK_ICON_SIZE_MENU);
1345-
gtk_widget_show (menu_image);
1346-
menu_item = gtk_image_menu_item_new_with_mnemonic (_("Mo_ve to Trash"));
1347-
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item),
1348-
menu_image);
1335+
menu_item = eel_image_menu_item_new_from_icon (CAJA_ICON_TRASH_FULL, _("Mo_ve to Trash"));
13491336
g_signal_connect (menu_item, "activate",
13501337
G_CALLBACK (fm_tree_view_trash_cb),
13511338
view);
@@ -1354,12 +1341,7 @@ create_popup_menu (FMTreeView *view)
13541341
view->details->popup_trash = menu_item;
13551342

13561343
/* add the "delete" menu item */
1357-
menu_image = gtk_image_new_from_icon_name (CAJA_ICON_DELETE,
1358-
GTK_ICON_SIZE_MENU);
1359-
gtk_widget_show (menu_image);
1360-
menu_item = gtk_image_menu_item_new_with_mnemonic (_("_Delete"));
1361-
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item),
1362-
menu_image);
1344+
menu_item = eel_image_menu_item_new_from_icon (CAJA_ICON_DELETE, _("_Delete"));
13631345
g_signal_connect (menu_item, "activate",
13641346
G_CALLBACK (fm_tree_view_delete_cb),
13651347
view);
@@ -1370,7 +1352,7 @@ create_popup_menu (FMTreeView *view)
13701352
eel_gtk_menu_append_separator (GTK_MENU (popup));
13711353

13721354
/* add the "Unmount" menu item */
1373-
menu_item = gtk_image_menu_item_new_with_mnemonic (_("_Unmount"));
1355+
menu_item = eel_image_menu_item_new_from_icon (NULL, _("_Unmount"));
13741356
g_signal_connect (menu_item, "activate",
13751357
G_CALLBACK (fm_tree_view_unmount_cb),
13761358
view);
@@ -1379,7 +1361,7 @@ create_popup_menu (FMTreeView *view)
13791361
view->details->popup_unmount = menu_item;
13801362

13811363
/* add the "Eject" menu item */
1382-
menu_item = gtk_image_menu_item_new_with_mnemonic (_("_Eject"));
1364+
menu_item = eel_image_menu_item_new_from_icon (NULL, _("_Eject"));
13831365
g_signal_connect (menu_item, "activate",
13841366
G_CALLBACK (fm_tree_view_eject_cb),
13851367
view);
@@ -1392,7 +1374,7 @@ create_popup_menu (FMTreeView *view)
13921374
GTK_WIDGET (eel_gtk_menu_append_separator (GTK_MENU (popup)));
13931375

13941376
/* add the "properties" menu item */
1395-
menu_item = gtk_image_menu_item_new_from_stock ("gtk-properties", NULL);
1377+
menu_item = eel_image_menu_item_new_from_icon ("document-properties", _("_Properties"));
13961378
g_signal_connect (menu_item, "activate",
13971379
G_CALLBACK (fm_tree_view_properties_cb),
13981380
view);

0 commit comments

Comments
 (0)