Mercurial > hg > forks > geeqie

comparison src/icons/Makefile.am @ 2860:b20a96b979a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix #437: Delete to standard Trash directory https://github.com/BestImageViewer/geeqie/issues/437 The method of file deletion is changed. The Preferences/Behaviour option "Safe delete" is removed. The user has the option to choose Geeqie-defined trash bin or system-defined trash bin as the normal mode - set in Preferences/Behaviour. Menus have two entries: Move to trash and Permanent delete. The Delete key moves to trash; shift-Delete deletes permanently. Both Move to trash and Permanent delete have user-selectable confirmation, set in Preferences/Behaviour. This means the function of the Delete key is changed from Permanent delete to Move to trash, which is a fail-safe change.
author Colin Clark <colin.clark@cclark.uk>
date Sat, 03 Nov 2018 17:53:31 +0000
parents e88128f85953
children
comparison
equal deleted inserted replaced
2859:1656d2341e2f 2860:b20a96b979a3
44 icon_rotate_clockwise.png \ 44 icon_rotate_clockwise.png \
45 icon_rotate_counter_clockwise.png \ 45 icon_rotate_counter_clockwise.png \
46 icon_rotate_180.png \ 46 icon_rotate_180.png \
47 icon_mirror.png \ 47 icon_mirror.png \
48 icon_flip.png \ 48 icon_flip.png \
49 icon_original.png 49 icon_original.png \
50 icon_trash.png
50 51
51 ICONS_INLINE_PAIRS = \ 52 ICONS_INLINE_PAIRS = \
52 folder_closed $(srcdir)/folder_closed.png \ 53 folder_closed $(srcdir)/folder_closed.png \
53 folder_locked $(srcdir)/folder_locked.png \ 54 folder_locked $(srcdir)/folder_locked.png \
54 folder_open $(srcdir)/folder_open.png \ 55 folder_open $(srcdir)/folder_open.png \
89 icon_rotate_clockwise $(srcdir)/icon_rotate_clockwise.png \ 90 icon_rotate_clockwise $(srcdir)/icon_rotate_clockwise.png \
90 icon_rotate_counter_clockwise $(srcdir)/icon_rotate_counter_clockwise.png \ 91 icon_rotate_counter_clockwise $(srcdir)/icon_rotate_counter_clockwise.png \
91 icon_rotate_180 $(srcdir)/icon_rotate_180.png \ 92 icon_rotate_180 $(srcdir)/icon_rotate_180.png \
92 icon_mirror $(srcdir)/icon_mirror.png \ 93 icon_mirror $(srcdir)/icon_mirror.png \
93 icon_flip $(srcdir)/icon_flip.png \ 94 icon_flip $(srcdir)/icon_flip.png \
94 icon_original $(srcdir)/icon_original.png 95 icon_original $(srcdir)/icon_original.png \
96 icon_trash $(srcdir)/icon_trash.png
95 97
96 icons_inline.h: $(ICONS_INLINE) Makefile.in 98 icons_inline.h: $(ICONS_INLINE) Makefile.in
97 @sh -ec "echo '/* Auto generated file, do not edit */'; echo; \ 99 @sh -ec "echo '/* Auto generated file, do not edit */'; echo; \
98 echo '#ifndef ICONS_INLINE_H'; \ 100 echo '#ifndef ICONS_INLINE_H'; \
99 echo '#define ICONS_INLINE_H'; echo; \ 101 echo '#define ICONS_INLINE_H'; echo; \