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 --git a/src/collect-table.c b/src/collect-table.c
index 757fa9f..8d05360 100644 (file)
--- a/src/collect-table.c
+++ b/src/collect-table.c
@@ -941,10 +941,10 @@ static GtkWidget *collection_table_popup_menu(CollectTable *ct, gboolean over_ic
                        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_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_stock_sensitive(menu, _("_Delete..."), GTK_STOCK_DELETE, over_icon,
+                       G_CALLBACK(collection_table_popup_delete_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 --git a/src/dupe.c b/src/dupe.c
index 932606e..6b3722b 100644 (file)
--- a/src/dupe.c
+++ b/src/dupe.c
@@ -2351,10 +2351,10 @@ static GtkWidget *dupe_menu_popup_main(DupeWindow *dw, DupeItem *di)
                                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_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_stock_sensitive(menu, _("_Delete..."), GTK_STOCK_DELETE, on_row,
+                               G_CALLBACK(dupe_menu_delete_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 --git a/src/img-view.c b/src/img-view.c
index 31b3170..5b7663c 100644 (file)
--- a/src/img-view.c
+++ b/src/img-view.c
@@ -1286,8 +1286,8 @@ static GtkWidget *view_popup_menu(ViewWindow *vw)
        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_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_stock(menu, _("_Delete..."), GTK_STOCK_DELETE, G_CALLBACK(view_delete_cb), vw);
 
        menu_item_add_divider(menu);
 

diff --git a/src/layout_image.c b/src/layout_image.c
index 4b0f3cd..fdfccb7 100644 (file)
--- a/src/layout_image.c
+++ b/src/layout_image.c
@@ -687,11 +687,10 @@ static GtkWidget *layout_image_pop_menu(LayoutWindow *lw)
        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);
-       if (!path) gtk_widget_set_sensitive(item, FALSE);
-
        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_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 --git a/src/pan-view/pan-view.c b/src/pan-view/pan-view.c
index 59c4cc0..6b4f842 100644 (file)
--- a/src/pan-view/pan-view.c
+++ b/src/pan-view/pan-view.c
@@ -2233,10 +2233,10 @@ static GtkWidget *pan_popup_menu(PanWindow *pw)
                                G_CALLBACK(pan_move_cb), pw);
        menu_item_add_sensitive(menu, _("_Rename..."), active,
                                G_CALLBACK(pan_rename_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_stock_sensitive(menu, _("_Delete..."), GTK_STOCK_DELETE, active,
+                                     G_CALLBACK(pan_delete_cb), pw);
 
        menu_item_add_divider(menu);
        item = menu_item_add_check(menu, _("Sort by E_xif date"), pw->exif_date_enable,

diff --git a/src/search.c b/src/search.c
index 1399735..361e03e 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -1065,10 +1065,10 @@ static GtkWidget *search_result_menu(SearchData *sd, gboolean on_row, gboolean e
                                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_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_stock_sensitive(menu, _("_Delete..."), GTK_STOCK_DELETE, on_row,
+                                     G_CALLBACK(sr_menu_delete_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 --git a/src/view_dir.c b/src/view_dir.c
index fe0dd28..d349d7e 100644 (file)
--- a/src/view_dir.c
+++ b/src/view_dir.c
@@ -673,12 +673,12 @@ GtkWidget *vd_pop_menu(ViewDir *vd, FileData *fd)
 
        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 --git a/src/view_file/view_file.c b/src/view_file/view_file.c
index c9dbdef..dbba21a 100644 (file)
--- a/src/view_file/view_file.c
+++ b/src/view_file/view_file.c
@@ -588,10 +588,11 @@ GtkWidget *vf_pop_menu(ViewFile *vf)
                                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_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_stock_sensitive(menu, _("_Delete..."), GTK_STOCK_DELETE, active,
+                                     G_CALLBACK(vf_pop_menu_delete_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);