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

FIX: Use UTF8StringReplace

Browse source
This commit is contained in:
Alexander Koblov 2024-12-08 12:26:00 +03:00
commit ebed22101e
2 changed files with 6 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/frames/foptionsdirectoryhotlist.pas
View file

@ -793,7 +793,7 @@ var
function ReplaceIfNecessary(sWorkingText: string): string;
begin
Result := StringReplace(sWorkingText, sSearchText, sReplaceText, ReplaceFlags);
Result := UTF8StringReplace(sWorkingText, sSearchText, sReplaceText, ReplaceFlags);
if Result <> sWorkingText then Inc(NbOfReplacement);
end;
@ -801,6 +801,7 @@ var
Index, ActionDispatcher: integer;
EditSearchOptionToOffer: TEditSearchDialogOption;
EditSearchOptionReturned: TEditSearchDialogOption = [];
CaseSensitive: array[Boolean] of TEditSearchDialogOption = ([eswoCaseSensitiveUnchecked], [eswoCaseSensitiveChecked]);
begin
with Sender as TComponent do ActionDispatcher := tag;
@ -809,12 +810,7 @@ begin
else sSearchText := '';
sReplaceText := sSearchText;
EditSearchOptionToOffer := [];
{$IFDEF MSWINDOWS}
EditSearchOptionToOffer := EditSearchOptionToOffer + [eswoCaseSensitiveUnchecked];
{$ELSE}
EditSearchOptionToOffer := EditSearchOptionToOffer + [eswoCaseSensitiveChecked];
{$ENDIF}
EditSearchOptionToOffer := CaseSensitive[FileNameCaseSensitive];
if GetSimpleSearchAndReplaceString(self, EditSearchOptionToOffer, sSearchText, sReplaceText, EditSearchOptionReturned, glsSearchPathHistory, glsReplacePathHistory) then
begin

9
src/frames/foptionstoolbarbase.pas
View file

@ -798,7 +798,7 @@ var
function ReplaceIfNecessary(sWorkingText:string):string;
begin
result := StringReplace(sWorkingText, sSearchText, sReplaceText, ReplaceFlags);
result := UTF8StringReplace(sWorkingText, sSearchText, sReplaceText, ReplaceFlags);
if result<>sWorkingText then inc(NbOfReplacement);
end;
@ -840,6 +840,7 @@ var
Toolbar: TKASToolbar;
EditSearchOptionToOffer: TEditSearchDialogOption = [];
EditSearchOptionReturned: TEditSearchDialogOption = [];
CaseSensitive: array[Boolean] of TEditSearchDialogOption = ([eswoCaseSensitiveUnchecked], [eswoCaseSensitiveChecked]);
begin
with Sender as TComponent do ActionDispatcher:=tag;
@ -854,11 +855,7 @@ begin
sSearchText:='';
sReplaceText:=sSearchText;
{$IFDEF MSWINDOWS}
EditSearchOptionToOffer:=EditSearchOptionToOffer+[eswoCaseSensitiveUnchecked];
{$ELSE}
EditSearchOptionToOffer:=EditSearchOptionToOffer+[eswoCaseSensitiveChecked];
{$ENDIF}
EditSearchOptionToOffer:= CaseSensitive[FileNameCaseSensitive];
if GetSimpleSearchAndReplaceString(self, EditSearchOptionToOffer, sSearchText, sReplaceText, EditSearchOptionReturned, glsSearchPathHistory, glsReplacePathHistory) then
begin