Mercurial > hg > forks > geeqie
changeset 2420:b5a4ae35fbbf
Fix #447: Preferences Enable Delete key
https://github.com/BestImageViewer/geeqie/issues/447
The preference "Enable Delete key" is now used in the main window
| author | Colin Clark <cclark@mcb.net> |
|---|---|
| date | Sun, 01 Jan 2017 16:57:42 +0000 |
| parents | 0333d7eefc8c |
| children | fc104edd5652 |
| files | src/layout_util.c |
| diffstat | 1 files changed, 12 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/layout_util.c Fri Dec 30 11:51:15 2016 +0000 +++ b/src/layout_util.c Sun Jan 01 16:57:42 2017 +0000 @@ -308,6 +308,16 @@ file_util_delete(NULL, layout_selection_list(lw), layout_window(lw)); } +static void layout_menu_delete_key_cb(GtkAction *action, gpointer data) +{ + LayoutWindow *lw = data; + + if (options->file_ops.enable_delete_key) + { + file_util_delete(NULL, layout_selection_list(lw), layout_window(lw)); + } +} + static void layout_menu_disable_grouping_cb(GtkAction *action, gpointer data) { LayoutWindow *lw = data; @@ -1480,8 +1490,8 @@ { "Move", NULL, N_("_Move..."), "<control>M", N_("Move..."), CB(layout_menu_move_cb) }, { "Rename", NULL, N_("_Rename..."), "<control>R", N_("Rename..."), CB(layout_menu_rename_cb) }, { "Delete", GTK_STOCK_DELETE, N_("_Delete..."), "<control>D", N_("Delete..."), CB(layout_menu_delete_cb) }, - { "DeleteAlt1", GTK_STOCK_DELETE, N_("_Delete..."), "Delete", N_("Delete..."), CB(layout_menu_delete_cb) }, - { "DeleteAlt2", GTK_STOCK_DELETE, N_("_Delete..."), "KP_Delete", N_("Delete..."), CB(layout_menu_delete_cb) }, + { "DeleteAlt1", GTK_STOCK_DELETE, N_("_Delete..."), "Delete", N_("Delete..."), CB(layout_menu_delete_key_cb) }, + { "DeleteAlt2", GTK_STOCK_DELETE, N_("_Delete..."), "KP_Delete", N_("Delete..."), CB(layout_menu_delete_key_cb) }, { "EnableGrouping", NULL, N_("Enable file _grouping"), NULL, N_("Enable file grouping"), CB(layout_menu_enable_grouping_cb) }, { "DisableGrouping", NULL, N_("Disable file groupi_ng"), NULL, N_("Disable file grouping"), CB(layout_menu_disable_grouping_cb) }, { "CopyPath", NULL, N_("_Copy path to clipboard"), NULL, N_("Copy path to clipboard"), CB(layout_menu_copy_path_cb) },