From b7fd5bef05041b4993070d96dd280e815ade89c3 Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Sun, 15 Jun 2008 13:24:51 +0200 Subject: Get rid of engine targetting by '#' mark This changes default copy/move behaviour - target engine is always set from opposite panel, user cannot change to local path anymore. --- UCore.pas | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'UCore.pas') diff --git a/UCore.pas b/UCore.pas index dea0016..4001007 100644 --- a/UCore.pas +++ b/UCore.pas @@ -1102,8 +1102,10 @@ begin PDataItemSL(List[i])^.IsDir and (not PDataItemSL(List[i])^.IsLnk)); // DebugMsg(['s2 = ', Copy(PDataItemSL(List[i])^.AName, Length(CurrPath) + 1, Length(PDataItemSL(List[i])^.AName) - Length(CurrPath)), ', s = ', s]); end; - UpdateCaption1(Format(LANGFromS, [string(PDataItemSL(List[i])^.FDisplayName)])); - UpdateCaption2(Format(LANGToS, [StrToUTF8(s)])); + if SrcEngine is TVFSEngine then UpdateCaption1(Format(LANGFromS, [Format(ConstFullPathFormatStr, [SrcEngine.GetPrefix, string(PDataItemSL(List[i])^.FDisplayName)])])) + else UpdateCaption1(Format(LANGFromS, [string(PDataItemSL(List[i])^.FDisplayName)])); + if DestEngine is TVFSEngine then UpdateCaption2(Format(LANGToS, [Format(ConstFullPathFormatStr, [DestEngine.GetPrefix, StrToUTF8(s)])])) + else UpdateCaption2(Format(LANGToS, [StrToUTF8(s)])); CommitGUIUpdate; if TwoSameFiles(s, string(PDataItemSL(List[i])^.FName), ParamBool3) and (not PDataItemSL(List[i])^.IsDir) then begin FCancelMessage := LANGCannotCopyFileToItself; -- cgit v1.2.3