mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-28 10:02:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

ADD: Delete directly capability if can not delete to trash

Browse source
This commit is contained in:
Alexander Koblov 2010-02-23 19:50:48 +00:00
commit 91c8a24185
2 changed files with 49 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

52
src/newdesign/ufilesystemdeleteoperation.pas
View file

@ -27,7 +27,8 @@ type
FSymLinkOption: TFileSourceOperationOptionSymLink;
FSkipErrors: Boolean;
FRecycle: Boolean;
FDeleteReadOnly: TFileSourceOperationOptionGeneral;
FDeleteReadOnly,
FDeleteDirectly: TFileSourceOperationOptionGeneral;
protected
function ProcessFile(aFile: TFileSystemFile): Boolean;
@ -54,7 +55,7 @@ type
implementation
uses
uOSUtils, uLng, uFileSystemUtil;
uOSUtils, uLng, uFileProcs, uFileSystemUtil;
constructor TFileSystemDeleteOperation.Create(aTargetFileSource: IFileSource;
var theFilesToDelete: TFiles);
@ -63,6 +64,7 @@ begin
FSkipErrors := gSkipFileOpError;
FRecycle := False;
FDeleteReadOnly := fsoogNone;
FDeleteDirectly:= fsoogNone;
FFullFilesTreeToDelete := nil;
if gProcessComments then
@ -146,6 +148,7 @@ function TFileSystemDeleteOperation.ProcessFile(aFile: TFileSystemFile): Boolean
var
FileName: String;
bRetry: Boolean;
RemoveDirectly: TFileSourceOperationOptionGeneral = fsoogNone;
sMessage, sQuestion: String;
logOptions: TLogOptions;
begin
@ -195,7 +198,48 @@ begin
else
begin
// Delete to trash (one function for file and folder)
Result := mbDeleteToTrash(FileName);
if not mbDeleteToTrash(FileName) then
begin
case FDeleteDirectly of
fsoogNone:
case AskQuestion(Format(rsMsgDelToTrashForce, [FileName]), '',
[fsourYes, fsourAll, fsourSkip, fsourSkipAll, fsourAbort],
fsourYes, fsourSkip) of
fsourYes:
RemoveDirectly:= fsoogYes;
fsourAll:
begin
FDeleteDirectly := fsoogYes;
RemoveDirectly:= fsoogYes;
end;
fsourSkip:
RemoveDirectly:= fsoogNo;
fsourSkipAll:
begin
FDeleteDirectly := fsoogNo;
RemoveDirectly:= fsoogNo;
end;
fsourAbort:
RaiseAbortOperation;
end;
fsoogYes:
RemoveDirectly:= fsoogYes;
fsoogNo:
RemoveDirectly:= fsoogNo;
end;
if RemoveDirectly = fsoogYes then
begin
if aFile.IsDirectory then // directory
begin
DelTree(FileName);
Result := True;
end
else // files and other stuff
begin
Result := mbDeleteFile(FileName);
end;
end;
end;
end;
if Result then
@ -228,7 +272,7 @@ begin
sQuestion := Format(rsMsgNotDelete, [FileName]);
end;
if FSkipErrors then
if FSkipErrors or (RemoveDirectly <> fsoogYes) then
LogMessage(sMessage, logOptions, lmtError)
else
begin

1
src/ulng.pas
View file

@ -42,6 +42,7 @@ resourcestring
// 12.05.2009 - another message, when deleting to trash
rsMsgDelFlDrT = 'Delete %d selected files/directories into trash can?';
rsMsgDelSelT = 'Delete selected "%s" into trash can?';
rsMsgDelToTrashForce = 'Can not delete "%s" to trash! Delete directly?';
// ---
rsMsgWipeFlDr = 'Wipe %d selected files/directories?';
rsMsgWipeSel = 'Wipe selected "%s"?';