summaryrefslogtreecommitdiff
path: root/UCore.pas
diff options
context:
space:
mode:
Diffstat (limited to 'UCore.pas')
-rw-r--r--UCore.pas13
1 files changed, 9 insertions, 4 deletions
diff --git a/UCore.pas b/UCore.pas
index 447392a..374045f 100644
--- a/UCore.pas
+++ b/UCore.pas
@@ -833,6 +833,7 @@ var DefResponse: integer; // Global variables for this function
var Res, Response, ErrorKind, r: integer;
Item: PDataItemSL;
s, s1, s3, cap: string;
+ FromInfoLabel, ToInfoLabel, InfoLabelFormat: string;
begin
Result := True;
try
@@ -881,10 +882,14 @@ var DefResponse: integer; // Global variables for this function
Response := DefResponse;
Item := DestEngine.GetFileInfoSL(NewFilePath);
if Response = 0 then begin
- Response := ShowOverwriteDialog(1 + Ord(ParamBool3), Format(LANGOverwriteS, [StrToUTF8(NewFilePath)]),
- Format(LANGOvewriteSBytesS, [FormatSize(Item^.Size, 0), FormatDateTime('ddddd t', Item^.ModifyTime)]),
- Format(LANGWithFileS, [AFileRec^.FDisplayName]),
- Format(LANGOvewriteSBytesS, [FormatSize(AFileRec^.Size, 0), FormatDateTime('ddddd t', AFileRec^.ModifyTime)]),
+ case ConfSizeFormat of
+ 5: InfoLabelFormat := '%s, %s';
+ else InfoLabelFormat := LANGOvewriteSBytesS;
+ end;
+ FromInfoLabel := Format(InfoLabelFormat, [FormatSize(Item^.Size, 0), FormatDate(Item^.ModifyTime, True, True)]);
+ ToInfoLabel := Format(InfoLabelFormat, [FormatSize(AFileRec^.Size, 0), FormatDate(AFileRec^.ModifyTime, True, True)]);
+ Response := ShowOverwriteDialog(1 + Ord(ParamBool3), Format(LANGOverwriteS, [StrToUTF8(NewFilePath)]), FromInfoLabel,
+ Format(LANGWithFileS, [AFileRec^.FDisplayName]), ToInfoLabel,
ExtractFileName(StrToUTF8(NewFilePath)), ExtractFileName(AFileRec^.FDisplayName), ExtractFileName(StrToUTF8(NewFilePath)));
s := FOverwriteRenameStr;
case Response of