From 0d4c216e27910695bec22796e28d8beb526be4a3 Mon Sep 17 00:00:00 2001
From: Basile Burg <basile.burg@gmx.com>
Date: Tue, 24 Feb 2015 07:10:45 +0100
Subject: [PATCH] added option to set if regexes are handled

---
 src/ce_search.lfm | 52 +++++++++++++++++++++++++++++------------------
 src/ce_search.pas | 17 ++++++++++------
 2 files changed, 43 insertions(+), 26 deletions(-)

diff --git a/src/ce_search.lfm b/src/ce_search.lfm
index 2c29be6a..905222f3 100644
--- a/src/ce_search.lfm
+++ b/src/ce_search.lfm
@@ -128,50 +128,62 @@ inherited CESearchWidget: TCESearchWidget
         Align = alClient
         BorderSpacing.Around = 4
         Caption = 'Options'
-        ClientHeight = 79
+        ClientHeight = 77
         ClientWidth = 382
         TabOrder = 3
         object chkWWord: TCheckBox
           Left = 8
-          Height = 19
+          Height = 21
           Top = 0
-          Width = 82
+          Width = 84
           Caption = 'whole word'
+          Checked = True
+          State = cbChecked
           TabOrder = 0
         end
         object chkBack: TCheckBox
           Left = 8
-          Height = 19
+          Height = 21
           Top = 24
-          Width = 71
+          Width = 73
           Caption = 'backward'
-          TabOrder = 1
+          TabOrder = 2
         end
         object chkFromCur: TCheckBox
           Left = 8
-          Height = 19
+          Height = 21
           Top = 48
-          Width = 82
+          Width = 84
           Caption = 'from cursor'
           Checked = True
           State = cbChecked
-          TabOrder = 2
+          TabOrder = 3
         end
         object chkCaseSens: TCheckBox
           Left = 128
-          Height = 19
+          Height = 21
           Top = 0
-          Width = 91
+          Width = 93
           Caption = 'case sensitive'
-          TabOrder = 3
+          TabOrder = 4
         end
         object chkPrompt: TCheckBox
           Left = 128
-          Height = 19
+          Height = 21
           Top = 24
-          Width = 60
+          Width = 62
           Caption = 'prompt'
-          TabOrder = 4
+          TabOrder = 1
+        end
+        object chkRegex: TCheckBox
+          Left = 128
+          Height = 21
+          Top = 48
+          Width = 117
+          Caption = 'regular expression'
+          Checked = True
+          State = cbChecked
+          TabOrder = 5
         end
       end
       object btnReplaceAll: TBitBtn[4]
@@ -232,25 +244,25 @@ inherited CESearchWidget: TCESearchWidget
         ClientWidth = 386
         TabOrder = 5
         object cbReplaceWth: TComboBox
-          Left = 90
+          Left = 92
           Height = 23
           Top = 0
-          Width = 296
+          Width = 294
           Align = alClient
           Anchors = [akTop, akLeft, akBottom]
           ItemHeight = 15
           OnChange = cbReplaceWthChange
-          TabOrder = 0
+          TabOrder = 1
         end
         object chkEnableRep: TCheckBox
           Left = 0
           Height = 23
           Top = 0
-          Width = 90
+          Width = 92
           Align = alLeft
           Caption = 'Replace with '
           OnChange = chkEnableRepChange
-          TabOrder = 1
+          TabOrder = 0
         end
       end
     end
diff --git a/src/ce_search.pas b/src/ce_search.pas
index 4e37deae..78f2efdc 100644
--- a/src/ce_search.pas
+++ b/src/ce_search.pas
@@ -7,9 +7,12 @@ interface
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls,
   Menus, StdCtrls, actnList, Buttons, SynEdit, SynEditSearch, SynEditTypes, ce_common,
-  ce_widget, ce_synmemo, ce_interfaces, ce_observer;
+  ce_widget, ce_synmemo, ce_interfaces, ce_observer, SynEditHighlighter;
 
 type
+
+  { TCESearchWidget }
+
   TCESearchWidget = class(TCEWidget, ICEMultiDocObserver)
     btnFind: TBitBtn;
     btnReplace: TBitBtn;
@@ -18,6 +21,7 @@ type
     cbReplaceWth: TComboBox;
     chkEnableRep: TCheckBox;
     chkPrompt: TCheckBox;
+    chkRegex: TCheckBox;
     chkWWord: TCheckBox;
     chkBack: TCheckBox;
     chkFromCur: TCheckBox;
@@ -156,11 +160,12 @@ end;
 
 function TCESearchWidget.getOptions: TSynSearchOptions;
 begin
-  result := [ssoRegExpr];
-  if chkWWord.Checked then result += [ssoWholeWord];
-  if chkBack.Checked then result += [ssoBackwards];
-  if chkCaseSens.Checked then result += [ssoMatchCase];
-  if chkPrompt.Checked then result += [ssoPrompt];
+  result := [];
+  if chkRegex.Checked     then result += [ssoRegExpr];
+  if chkWWord.Checked     then result += [ssoWholeWord];
+  if chkBack.Checked      then result += [ssoBackwards];
+  if chkCaseSens.Checked  then result += [ssoMatchCase];
+  if chkPrompt.Checked    then result += [ssoPrompt];
 end;
 
 function dlgReplaceAll: TModalResult;