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

FIX: Delete operation - too long question dialog

Browse source
This commit is contained in:
Alexander Koblov 2019-03-03 12:22:34 +00:00
commit 2ef910216b
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/doublecmd/dcstrutils.pas
View file

@ -328,7 +328,7 @@ procedure SetValue(var anArray: TDynamicStringArray; Key, NewValue: String);
procedure SetValue(var anArray: TDynamicStringArray; Key: String; NewValue: Boolean);
function ShortcutsToText(const Shortcuts: TDynamicStringArray): String;
function GetDateTimeInStrEZSortable(DateTime:TDateTime):string;
function WrapTextSimple(const S: String; MaxCol: Integer): String;
function WrapTextSimple(const S: String; MaxCol: Integer = 100): String;
{en
Escapes characters to be inserted between single quotes (')

6
src/filesources/filesystem/ufilesystemdeleteoperation.pas
View file

@ -59,7 +59,7 @@ type
implementation
uses
DCOSUtils, uLng, uFileSystemUtil, uTrash, uAdministrator, uOSUtils
DCOSUtils, DCStrUtils, uLng, uFileSystemUtil, uTrash, uAdministrator, uOSUtils
{$IF DEFINED(MSWINDOWS)}
, Windows, uFileUnlock, fFileUnlock
{$ENDIF}
@ -185,7 +185,7 @@ begin
begin
case FDeleteReadOnly of
fsoogNone:
case AskQuestion(Format(rsMsgFileReadOnly, [FileName]), '',
case AskQuestion(Format(rsMsgFileReadOnly, [WrapTextSimple(FileName)]), '',
[fsourYes, fsourSkip, fsourAbort, fsourAll, fsourSkipAll],
fsourYes, fsourAbort) of
fsourAll:
@ -242,7 +242,7 @@ begin
Move(ResponsesTrash[0], PossibleResponses[0], SizeOf(ResponsesTrash));
PossibleResponses[High(PossibleResponses)]:= fsourRetryAdmin;
end;
case AskQuestion(Format(rsMsgDelToTrashForce, [FileName]), '',
case AskQuestion(Format(rsMsgDelToTrashForce, [WrapTextSimple(FileName)]), '',
PossibleResponses,
fsourYes, fsourAbort) of
fsourYes: