mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

ADD: Feature [0000293] "Auto copy into command"

Browse source
This commit is contained in:
Alexander Koblov 2011-12-25 16:10:43 +00:00
commit bb3d2e34b3
5 changed files with 21 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/newdesign/ufilesourceoperationmessageboxesui.pas
View file

@ -32,12 +32,14 @@ uses
const
ResponseToButton: array[TFileSourceOperationUIResponse] of TMyMsgButton =
(msmbOK, msmbOK, msmbNo, msmbYes, msmbCancel, msmbNone, msmbAppend, msmbResume, msmbCopyInto,
msmbOverwrite, msmbOverwriteAll, msmbSkip, msmbSkipAll, msmbAll, msmbRetry, msmbAbort);
(msmbOK, msmbOK, msmbNo, msmbYes, msmbCancel, msmbNone, msmbAppend, msmbResume,
msmbCopyInto, msmbCopyIntoAll, msmbOverwrite, msmbOverwriteAll, msmbSkip,
msmbSkipAll, msmbAll, msmbRetry, msmbAbort);
ResultToResponse: array[TMyMsgResult] of TFileSourceOperationUIResponse =
(fsourOk, fsourNo, fsourYes, fsourCancel, fsourNone, fsourAppend, fsourResume, fsourCopyInto,
fsourOverwrite, fsourOverwriteAll, fsourSkip, fsourSkipAll, fsourAll, fsourRetry, fsourAbort);
(fsourOk, fsourNo, fsourYes, fsourCancel, fsourNone, fsourAppend, fsourResume,
fsourCopyInto, fsourCopyIntoAll, fsourOverwrite, fsourOverwriteAll, fsourSkip,
fsourSkipAll, fsourAll, fsourRetry, fsourAbort);
constructor TFileSourceOperationMessageBoxesUI.Create;
begin

1
src/newdesign/ufilesourceoperationui.pas
View file

@ -19,6 +19,7 @@ type
fsourAppend, // for files
fsourResume, // for files
fsourCopyInto, // for directories
fsourCopyIntoAll, // for directories
fsourOverwrite,
fsourOverwriteAll,
fsourSkip,

8
src/newdesign/ufilesystemutil.pas
View file

@ -1275,7 +1275,10 @@ begin
if AllowDelete then
AddResponse(fsourOverwrite);
if AllowCopyInto then
begin
AddResponse(fsourCopyInto);
AddResponse(fsourCopyIntoAll);
end;
AddResponse(fsourSkip);
if AllowDelete then
AddResponse(fsourOverwriteAll);
@ -1295,6 +1298,11 @@ begin
Result := fsoodeDelete;
fsourCopyInto:
Result := fsoodeCopyInto;
fsourCopyIntoAll:
begin
FDirExistsOption := fsoodeCopyInto;
Result := fsoodeCopyInto;
end;
fsourSkip:
Result := fsoodeSkip;
fsourOverwriteAll:

9
src/uShowMsg.pas
View file

@ -22,12 +22,12 @@ uses
type
TMyMsgResult=(mmrOK, mmrNo, mmrYes, mmrCancel, mmrNone,
mmrAppend, mmrResume, mmrCopyInto, mmrOverwrite, mmrOverwriteAll,
mmrSkip, mmrSkipAll, mmrAll, mmrRetry, mmrAbort);
mmrAppend, mmrResume, mmrCopyInto, mmrCopyIntoAll, mmrOverwrite,
mmrOverwriteAll, mmrSkip, mmrSkipAll, mmrAll, mmrRetry, mmrAbort);
TMyMsgButton=(msmbOK, msmbNo, msmbYes, msmbCancel, msmbNone,
msmbAppend, msmbResume, msmbCopyInto, msmbOverwrite, msmbOverwriteAll,
msmbSkip, msmbSkipAll, msmbAll, msmbRetry, msmbAbort);
msmbAppend, msmbResume, msmbCopyInto, msmbCopyIntoAll, msmbOverwrite,
msmbOverwriteAll, msmbSkip, msmbSkipAll, msmbAll, msmbRetry, msmbAbort);
{ TDialogMainThread }
@ -488,6 +488,7 @@ begin
cLngButton[msmbAppend] := rsDlgButtonAppend;
cLngButton[msmbResume] := rsDlgButtonResume;
cLngButton[msmbCopyInto] := rsDlgButtonCopyInto;
cLngButton[msmbCopyIntoAll] := rsDlgButtonCopyIntoAll;
cLngButton[msmbOverwrite] := rsDlgButtonOverwrite;
cLngButton[msmbOverwriteAll] := rsDlgButtonOverwriteAll;
cLngButton[msmbSkip] := rsDlgButtonSkip;

1
src/ulng.pas
View file

@ -165,6 +165,7 @@ resourcestring
rsDlgButtonAppend = 'A&ppend';
rsDlgButtonResume = '&Resume';
rsDlgButtonCopyInto = 'Copy &Into';
rsDlgButtonCopyIntoAll = 'Copy Into &All';
rsDlgButtonOverwrite = '&Overwrite';
rsDlgButtonOverwriteAll = 'Overwrite &All';
rsDlgButtonSkip = '&Skip';