summaryrefslogtreecommitdiff
path: root/UCore.pas
diff options
context:
space:
mode:
authorTomas Bzatek <tbzatek@users.sourceforge.net>2008-06-15 13:24:51 +0200
committerTomas Bzatek <tbzatek@users.sourceforge.net>2008-06-15 13:24:51 +0200
commitb7fd5bef05041b4993070d96dd280e815ade89c3 (patch)
tree1c56759ae2b95109eba85beacbd65a6c484f94d5 /UCore.pas
parent25c58a81ca9202af54d28888d2b068ebeb2a376f (diff)
downloadtuxcmd-b7fd5bef05041b4993070d96dd280e815ade89c3.tar.xz
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.
Diffstat (limited to 'UCore.pas')
-rw-r--r--UCore.pas6
1 files changed, 4 insertions, 2 deletions
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;