Differential D4316

virtualRemove of files and directories
ClosedPublic
Actions

Authored by abika on Jan 27 2017, 6:19 PM.

Details

Reviewers

martinkostolny

Group Reviewers

Krusader

Commits

R167:37c2fcf0621b: Merge branch 'my-delete_rework'

Summary

Behaviour changes:

"Move to trash" option in context menu only if trashing is possible
DEL_Key, F11 or "Move to trash" option now moves files to trash on virtual

FS (if possible for all selected files)

Panel: rework of ListPanelFunc::deleteFiles()
And vfs::deleteFiles() expects the final decision for "moveToTrash" argument now!

Panel: Move files to trash if this is possible and activated in user settings
Else, fallback to real deletion.
It is now possible to move virtual files to trash.

Moved code for deciding if files can be moved to trash to VFS

Panel: show trash option in right-click popup menu only if trashing is supported

VFS: separate virtual deletion and real/trash deletion in virtual vfs.
And call appropriate method in panel.

VFS: merged common code for deleting/trashing files in vfs subclasses into superclass

Panel: split code for deleting/trashing files and removing virtual files

Test Plan

Tested all (possible) operations on {local FS, virtual FS, remote FS (FTP)}

Diff Detail

Repository

R167 Krusader

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

abika updated this revision to Diff 10632.Jan 27 2017, 6:19 PM

abika retitled this revision from to Panel/VFS: Rework of deletion/moveToTrash/virtualRemove of files and directories.

abika updated this object.

abika edited the test plan for this revision. (Show Details)

abika added a reviewer: Krusader.

Good improvement, thanks, Alex!

Just a question: by F11 you meant F8 for delete key, right? Or maybe I'm missing something.

This revision is now accepted and ready to land.Jan 28 2017, 4:09 PM

Closed by commit R167:37c2fcf0621b: Merge branch 'my-delete_rework' (authored by Alexander Bikadorov <alex.bikadorov@kdemail.net>). · Explain WhyJan 28 2017, 5:41 PM

This revision was automatically updated to reflect the committed changes.

Thanks! Merged with master.

In D4316#80938, @martinkostolny wrote:

Just a question: by F11 you meant F8 for delete key, right? Or maybe I'm missing something.

Oh, yes. I changed the key to F11 because it was too close to "new dir" and "open terminal" .)

Thank you very much!

About that F11 subject: Is it a change in the user interface of Krusader? :-?

About that F11 subject: Is it a change in the user interface of Krusader? :-?

I was also wondering that for a moment :-) but I believe Alex was talking about his own key bindings. It's still F8 by default in the code.

In D4316#81044, @asensi wrote:

About that F11 subject: Is it a change in the user interface of Krusader? :-?

Oh, no. Only in my settings. Sorry for the confusion

Revision Contents
Changeset List

			Path	Packages
M			krusader/Panel/krpopupmenu.cpp (5 lines)
M			krusader/Panel/panelfunc.h (2 lines)
M			krusader/Panel/panelfunc.cpp (119 lines)
M			krusader/VFS/default_vfs.h (4 lines)
M			krusader/VFS/default_vfs.cpp (30 lines)
M			krusader/VFS/vfs.h (8 lines)
M			krusader/VFS/vfs.cpp (29 lines)
M			krusader/VFS/virt_vfs.h (10 lines)
M			krusader/VFS/virt_vfs.cpp (56 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	10632	a6b64fc		Jan 27 2017, 6:19 PM	★	★
Diff 2	10659	2aaba3e	R167:37c2fcf0621bd300172eba417fa43635ee396d8f	Jan 28 2017, 5:35 PM	★	★

Commit	Tree	Parents	Author	Summary	Date
07108f6be7b9	552017577f57	a0db6eeec8c9	Alexander Bikadorov	Panel: split code for deleting/trashing files and removing virtual files	Jan 24 2017, 3:24 PM
a0db6eeec8c9	b65a421c6c37	3db435d85d75	Alexander Bikadorov	VFS: merged common code for deleting/trashing files in vfs subclasses into… (Show More…)	Jan 24 2017, 2:41 PM
3db435d85d75	0f9585ec36d0	3e9d309babb1	Alexander Bikadorov	VFS: separate virtual deletion and real/trash deletion in virtual vfs. (Show More…)	Jan 24 2017, 2:08 PM
3e9d309babb1	518d0c33b893	3072cf8d7489	Alexander Bikadorov	Panel: show trash option in right-click popup menu only if trashing is supported	Jan 19 2017, 5:18 PM
3072cf8d7489	3d60e1e51b3a	5e7e372b645f	Alexander Bikadorov	Moved code for deciding if files can be moved to trash to VFS	Jan 18 2017, 6:22 PM
5e7e372b645f	36ab6687bf17	d2456b13e3db	Alexander Bikadorov	Panel: Move files to trash if this is possible and activated in user settings (Show More…)	Jan 18 2017, 3:05 PM
d2456b13e3db	91c76255c3e1	a6b64fc32097	Alexander Bikadorov	Panel: rework of ListPanelFunc::deleteFiles() (Show More…)	Jan 17 2017, 9:03 PM