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

UPD: Find files - enable case sensitive option with regular expression text search (fixes #2620)

Browse source
This commit is contained in:
Alexander Koblov 2025-11-20 23:35:12 +03:00
commit 5e5652faa4
3 changed files with 3 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/fFindDlg.lfm
View file

@ -383,7 +383,6 @@ object frmFindDlg: TfrmFindDlg
BorderSpacing.Top = 4
BorderSpacing.Bottom = 8
Caption = 'Case sens&itive'
OnChange = cbCaseSensChange
TabOrder = 4
end
object cbNotContainingText: TCheckBox

22
src/fFindDlg.pas
View file

@ -211,7 +211,6 @@ type
procedure btnSearchLoadClick(Sender: TObject);
procedure btnSearchSaveWithStartingPathClick(Sender: TObject);
procedure btnSearchSaveClick(Sender: TObject);
procedure cbCaseSensChange(Sender: TObject);
procedure cbDateFromChange(Sender: TObject);
procedure cbDateToChange(Sender: TObject);
procedure cbFindInArchiveChange(Sender: TObject);
@ -1035,12 +1034,6 @@ begin
SaveTemplate(False);
end;
{ TfrmFindDlg.cbCaseSensChange }
procedure TfrmFindDlg.cbCaseSensChange(Sender: TObject);
begin
if cbCaseSens.Checked then cbTextRegExp.Checked := False;
end;
{ TfrmFindDlg.cbDateFromChange }
procedure TfrmFindDlg.cbDateFromChange(Sender: TObject);
begin
@ -1097,17 +1090,6 @@ end;
{ TfrmFindDlg.cbTextRegExpChange }
procedure TfrmFindDlg.cbTextRegExpChange(Sender: TObject);
begin
if cbTextRegExp.Checked then
begin
if cbCaseSens.Enabled then
begin
cbCaseSens.Tag := Integer(cbCaseSens.Checked);
end;
end
else if not cbCaseSens.Enabled then
begin
cbCaseSens.Checked := Boolean(cbCaseSens.Tag);
end;
UpdateEncodings;
end;
@ -1445,8 +1427,8 @@ begin
cbTextRegExp.Enabled := cbFindText.Checked and SupportedEncoding and (not chkHex.Checked);
if not cbTextRegExp.Enabled then cbTextRegExp.Checked := False;
cbCaseSens.Enabled:= cbFindText.Checked and (not cbReplaceText.Checked) and (not chkHex.Checked) and (not cbTextRegExp.Checked);
if cbFindText.Checked and (not cbCaseSens.Enabled) then cbCaseSens.Checked := not cbTextRegExp.Checked;
cbCaseSens.Enabled:= cbFindText.Checked and (not cbReplaceText.Checked) and (not chkHex.Checked);
if cbFindText.Checked and (not cbCaseSens.Enabled) then cbCaseSens.Checked := (chkHex.Checked or cbReplaceText.Checked);
end;
function TfrmFindDlg.GetEncodings(AList: TCustomComboBox): String;

1
src/ufindthread.pas
View file

@ -206,6 +206,7 @@ begin
if TextRegExp then
begin
AEncoding.FRegExpr := TRegExprEx.Create(ATextEncoding, True);
AEncoding.FRegExpr.ModifierI := not CaseSensitive;
AEncoding.FRegExpr.Expression := FSearchText;
end;
end;