# HG changeset patch
# User Colin Clark <colin.clark@cclark.uk>
# Date 1502047064 -3600
# Node ID 31c6e3c9163e673d0635c3546a271ed0dc94c227
# Parent  6b6f18504950ef6d5e3f3683ffb7223fb0d3c895
Fix #505: ‘Copy path’ and ‘Delete’ are too close in the drop down menu

https://github.com/BestImageViewer/geeqie/issues/505

This commit attempts to ameliorate this issue by moving the Delete
action to the end of a section and ensuring a divider is immedialtely
below it.

diff -r 6b6f18504950 -r 31c6e3c9163e src/collect-table.c
--- a/src/collect-table.c	Sun Aug 06 19:25:07 2017 +0100
+++ b/src/collect-table.c	Sun Aug 06 20:17:44 2017 +0100
@@ -941,10 +941,10 @@
 			G_CALLBACK(collection_table_popup_move_cb), ct);
 	menu_item_add_sensitive(menu, _("_Rename..."), over_icon,
 			G_CALLBACK(collection_table_popup_rename_cb), ct);
+	menu_item_add_sensitive(menu, _("_Copy path"), over_icon,
+				G_CALLBACK(collection_table_popup_copy_path_cb), ct);
 	menu_item_add_stock_sensitive(menu, _("_Delete..."), GTK_STOCK_DELETE, over_icon,
 			G_CALLBACK(collection_table_popup_delete_cb), ct);
-	menu_item_add_sensitive(menu, _("_Copy path"), over_icon,
-				G_CALLBACK(collection_table_popup_copy_path_cb), ct);
 	menu_item_add_divider(menu);
 
 	submenu = submenu_add_sort(NULL, G_CALLBACK(collection_table_popup_sort_cb), ct, FALSE, TRUE, FALSE, 0);
diff -r 6b6f18504950 -r 31c6e3c9163e src/dupe.c
--- a/src/dupe.c	Sun Aug 06 19:25:07 2017 +0100
+++ b/src/dupe.c	Sun Aug 06 20:17:44 2017 +0100
@@ -2351,10 +2351,10 @@
 				G_CALLBACK(dupe_menu_move_cb), dw);
 	menu_item_add_sensitive(menu, _("_Rename..."), on_row,
 				G_CALLBACK(dupe_menu_rename_cb), dw);
+	menu_item_add_sensitive(menu, _("_Copy path"), on_row,
+				G_CALLBACK(dupe_menu_copy_path_cb), dw);
 	menu_item_add_stock_sensitive(menu, _("_Delete..."), GTK_STOCK_DELETE, on_row,
 				G_CALLBACK(dupe_menu_delete_cb), dw);
-	menu_item_add_sensitive(menu, _("_Copy path"), on_row,
-				G_CALLBACK(dupe_menu_copy_path_cb), dw);
 	menu_item_add_divider(menu);
 	menu_item_add_stock_sensitive(menu, _("Rem_ove"), GTK_STOCK_REMOVE, on_row,
 				G_CALLBACK(dupe_menu_remove_cb), dw);
diff -r 6b6f18504950 -r 31c6e3c9163e src/img-view.c
--- a/src/img-view.c	Sun Aug 06 19:25:07 2017 +0100
+++ b/src/img-view.c	Sun Aug 06 20:17:44 2017 +0100
@@ -1286,8 +1286,8 @@
 	menu_item_add_stock(menu, _("_Copy..."), GTK_STOCK_COPY, G_CALLBACK(view_copy_cb), vw);
 	menu_item_add(menu, _("_Move..."), G_CALLBACK(view_move_cb), vw);
 	menu_item_add(menu, _("_Rename..."), G_CALLBACK(view_rename_cb), vw);
+	menu_item_add(menu, _("_Copy path"), G_CALLBACK(view_copy_path_cb), vw);
 	menu_item_add_stock(menu, _("_Delete..."), GTK_STOCK_DELETE, G_CALLBACK(view_delete_cb), vw);
-	menu_item_add(menu, _("_Copy path"), G_CALLBACK(view_copy_path_cb), vw);
 
 	menu_item_add_divider(menu);
 
diff -r 6b6f18504950 -r 31c6e3c9163e src/layout_image.c
--- a/src/layout_image.c	Sun Aug 06 19:25:07 2017 +0100
+++ b/src/layout_image.c	Sun Aug 06 20:17:44 2017 +0100
@@ -687,10 +687,9 @@
 	if (!path) gtk_widget_set_sensitive(item, FALSE);
 	item = menu_item_add(menu, _("_Rename..."), G_CALLBACK(li_pop_menu_rename_cb), lw);
 	if (!path) gtk_widget_set_sensitive(item, FALSE);
-	item = menu_item_add_stock(menu, _("_Delete..."), GTK_STOCK_DELETE, G_CALLBACK(li_pop_menu_delete_cb), lw);
+	item = menu_item_add(menu, _("_Copy path"), G_CALLBACK(li_pop_menu_copy_path_cb), lw);
 	if (!path) gtk_widget_set_sensitive(item, FALSE);
-
-	item = menu_item_add(menu, _("_Copy path"), G_CALLBACK(li_pop_menu_copy_path_cb), lw);
+	item = menu_item_add_stock(menu, _("_Delete..."), GTK_STOCK_DELETE, G_CALLBACK(li_pop_menu_delete_cb), lw);
 	if (!path) gtk_widget_set_sensitive(item, FALSE);
 
 	menu_item_add_divider(menu);
diff -r 6b6f18504950 -r 31c6e3c9163e src/pan-view/pan-view.c
--- a/src/pan-view/pan-view.c	Sun Aug 06 19:25:07 2017 +0100
+++ b/src/pan-view/pan-view.c	Sun Aug 06 20:17:44 2017 +0100
@@ -2233,10 +2233,10 @@
 				G_CALLBACK(pan_move_cb), pw);
 	menu_item_add_sensitive(menu, _("_Rename..."), active,
 				G_CALLBACK(pan_rename_cb), pw);
+	menu_item_add_sensitive(menu, _("_Copy path"), active,
+				G_CALLBACK(pan_copy_path_cb), pw);
 	menu_item_add_stock_sensitive(menu, _("_Delete..."), GTK_STOCK_DELETE, active,
 				      G_CALLBACK(pan_delete_cb), pw);
-	menu_item_add_sensitive(menu, _("_Copy path"), active,
-				G_CALLBACK(pan_copy_path_cb), pw);
 
 	menu_item_add_divider(menu);
 	item = menu_item_add_check(menu, _("Sort by E_xif date"), pw->exif_date_enable,
diff -r 6b6f18504950 -r 31c6e3c9163e src/search.c
--- a/src/search.c	Sun Aug 06 19:25:07 2017 +0100
+++ b/src/search.c	Sun Aug 06 20:17:44 2017 +0100
@@ -1065,10 +1065,10 @@
 				G_CALLBACK(sr_menu_move_cb), sd);
 	menu_item_add_sensitive(menu, _("_Rename..."), on_row,
 				G_CALLBACK(sr_menu_rename_cb), sd);
+	menu_item_add_sensitive(menu, _("_Copy path"), on_row,
+				G_CALLBACK(sr_menu_copy_path_cb), sd);
 	menu_item_add_stock_sensitive(menu, _("_Delete..."), GTK_STOCK_DELETE, on_row,
 				      G_CALLBACK(sr_menu_delete_cb), sd);
-	menu_item_add_sensitive(menu, _("_Copy path"), on_row,
-				G_CALLBACK(sr_menu_copy_path_cb), sd);
 	menu_item_add_divider(menu);
 	menu_item_add_stock_sensitive(menu, _("Rem_ove"), GTK_STOCK_REMOVE, on_row,
 				      G_CALLBACK(sr_menu_remove_cb), sd);
diff -r 6b6f18504950 -r 31c6e3c9163e src/view_dir.c
--- a/src/view_dir.c	Sun Aug 06 19:25:07 2017 +0100
+++ b/src/view_dir.c	Sun Aug 06 20:17:44 2017 +0100
@@ -673,12 +673,12 @@
 
 	menu_item_add_sensitive(menu, _("_Rename..."), rename_delete_active,
 				G_CALLBACK(vd_pop_menu_rename_cb), vd);
-	menu_item_add_stock_sensitive(menu, _("_Delete..."), GTK_STOCK_DELETE, rename_delete_active,
-				      G_CALLBACK(vd_pop_menu_delete_cb), vd);
 
 	menu_item_add(menu, _("_Copy path"),
 		      G_CALLBACK(vd_pop_menu_copy_path_cb), vd);
 
+	menu_item_add_stock_sensitive(menu, _("_Delete..."), GTK_STOCK_DELETE, rename_delete_active,
+				      G_CALLBACK(vd_pop_menu_delete_cb), vd);
 	menu_item_add_divider(menu);
 
 
diff -r 6b6f18504950 -r 31c6e3c9163e src/view_file/view_file.c
--- a/src/view_file/view_file.c	Sun Aug 06 19:25:07 2017 +0100
+++ b/src/view_file/view_file.c	Sun Aug 06 20:17:44 2017 +0100
@@ -588,10 +588,11 @@
 				G_CALLBACK(vf_pop_menu_move_cb), vf);
 	menu_item_add_sensitive(menu, _("_Rename..."), active,
 				G_CALLBACK(vf_pop_menu_rename_cb), vf);
+	menu_item_add_sensitive(menu, _("_Copy path"), active,
+				G_CALLBACK(vf_pop_menu_copy_path_cb), vf);
 	menu_item_add_stock_sensitive(menu, _("_Delete..."), GTK_STOCK_DELETE, active,
 				      G_CALLBACK(vf_pop_menu_delete_cb), vf);
-	menu_item_add_sensitive(menu, _("_Copy path"), active,
-				G_CALLBACK(vf_pop_menu_copy_path_cb), vf);
+	menu_item_add_divider(menu);
 
 	menu_item_add_sensitive(menu, _("Enable file _grouping"), active,
 				G_CALLBACK(vf_pop_menu_enable_grouping_cb), vf);