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

Author: alexx2000

src/fFindDlg.lfm

@@ -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

src/fFindDlg.pas

@@ -211,7 +211,6 @@   TfrmFindDlg = class(TModalForm, IFormCommands)
     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 @@ procedure TfrmFindDlg.btnSearchSaveClick(Sender: TObject);
   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 @@ procedure TfrmFindDlg.cbRegExpChange(Sender: TObject);
 { 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 @@ procedure TfrmFindDlg.UpdateEncodings;
   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;

src/ufindthread.pas

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