[GExperts-CVS] gexperts/unstable/Src/Grep GX_GrepExpert.pas, 1.28, 1.29 GX_GrepOptions.dfm, 1.6, 1.7 GX_GrepOptions.pas, 1.7, 1.8 GX_GrepSearch.pas, 1.42, 1.43

[Erik B. <eb...@us...>]

Update of /cvsroot/gexperts/gexperts/unstable/Src/Grep
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv7404/Src/Grep

Modified Files:
	GX_GrepExpert.pas GX_GrepOptions.dfm GX_GrepOptions.pas 
	GX_GrepSearch.pas 
Log Message:
Remove strange ability to not save grep settings

Index: GX_GrepOptions.dfm
===================================================================
RCS file: /cvsroot/gexperts/gexperts/unstable/Src/Grep/GX_GrepOptions.dfm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- GX_GrepOptions.dfm	27 May 2003 08:23:17 -0000	1.6
+++ GX_GrepOptions.dfm	9 Aug 2006 06:10:16 -0000	1.7
@@ -3,7 +3,7 @@
   Top = 263
   BorderStyle = bsDialog
   Caption = 'Grep Search Options'
-  ClientHeight = 139
+  ClientHeight = 123
   ClientWidth = 335
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
@@ -14,43 +14,38 @@
   OldCreateOrder = True
   Position = poScreenCenter
   Scaled = False
+  DesignSize = (
+    335
+    123)
   PixelsPerInch = 96
   TextHeight = 13
   object gbxOptions: TGroupBox
     Left = 8
     Top = 8
     Width = 318
-    Height = 89
+    Height = 75
     Caption = 'Grep Options'
     TabOrder = 0
-    object chkGrepSave: TCheckBox
-      Left = 12
-      Top = 20
-      Width = 301
-      Height = 17
-      Caption = '&Save grep settings between sessions'
-      TabOrder = 0
-    end
     object chkGrepANSI: TCheckBox
       Left = 12
-      Top = 39
+      Top = 21
       Width = 301
       Height = 17
       Caption = '&ANSI compatible grep (slower)'
-      TabOrder = 1
+      TabOrder = 0
     end
     object chkGrepUseCurrentIdent: TCheckBox
       Left = 12
-      Top = 60
+      Top = 44
       Width = 301
       Height = 17
       Caption = 'Use &current identifier as the default search string'
-      TabOrder = 2
+      TabOrder = 1
     end
   end
   object btnOK: TButton
     Left = 168
-    Top = 107
+    Top = 91
     Width = 75
     Height = 25
     Anchors = [akRight, akBottom]
@@ -61,7 +56,7 @@
   end
   object btnCancel: TButton
     Left = 251
-    Top = 107
+    Top = 91
     Width = 75
     Height = 25
     Anchors = [akRight, akBottom]

Index: GX_GrepOptions.pas
===================================================================
RCS file: /cvsroot/gexperts/gexperts/unstable/Src/Grep/GX_GrepOptions.pas,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- GX_GrepOptions.pas	27 May 2003 08:23:17 -0000	1.7
+++ GX_GrepOptions.pas	9 Aug 2006 06:10:16 -0000	1.8
@@ -8,7 +8,6 @@
 type
   TfmGrepOptions = class(TForm)
     gbxOptions: TGroupBox;
-    chkGrepSave: TCheckBox;
     btnOK: TButton;
     btnCancel: TButton;
     chkGrepANSI: TCheckBox;

Index: GX_GrepSearch.pas
===================================================================
RCS file: /cvsroot/gexperts/gexperts/unstable/Src/Grep/GX_GrepSearch.pas,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- GX_GrepSearch.pas	16 May 2006 02:06:13 -0000	1.42
+++ GX_GrepSearch.pas	9 Aug 2006 06:10:16 -0000	1.43
@@ -175,12 +175,10 @@
 
   Dialog := TfmGrepOptions.Create(nil);
   try
-    Dialog.chkGrepSave.Checked := GrepExpert.GrepSave;
     Dialog.chkGrepANSI.Checked := GrepExpert.GrepANSICompatible;
     Dialog.chkGrepUseCurrentIdent.Checked := GrepExpert.GrepUseCurrentIdent;
     if Dialog.ShowModal = mrOk then
     begin
-      GrepExpert.GrepSave := Dialog.chkGrepSave.Checked;
       GrepExpert.GrepANSICompatible := Dialog.chkGrepANSI.Checked;
       GrepExpert.GrepUseCurrentIdent := Dialog.chkGrepUseCurrentIdent.Checked;
     end;
@@ -307,32 +305,29 @@
   cbDirectory.Items.Assign(FGrepExpert.DirList);
   cbMasks.Items.Assign(FGrepExpert.MaskList);
 
-  if FGrepExpert.GrepSave then
-  begin
-    cbNoCase.Checked := FGrepExpert.GrepNoCase;
-    cbNoComments.Checked := FGrepExpert.GrepNoComments;
-    cbForms.Checked := FGrepExpert.GrepForms;
-    cbInclude.Checked := FGrepExpert.GrepSub;
-    cbWholeWord.Checked := FGrepExpert.GrepWholeWord;
-    cbRegEx.Checked := FGrepExpert.GrepRegEx;
-    case FGrepExpert.GrepSearch of
-      0: rbCurrentOnly.Checked := True;
-      1: rbAllProjFiles.Checked := True;
-      2: rbOpenFiles.Checked := True;
-      3: rbDirectories.Checked := True;
-      4: rbAllProjGroupFiles.Checked := True;
-    else
-      rbAllProjFiles.Checked := True;
-    end;
-
-    if cbText.Items.Count > 0 then
-      cbText.Text := cbText.Items[0];
-    if cbDirectory.Items.Count > 0 then
-      cbDirectory.Text := cbDirectory.Items[0];
-    if cbMasks.Items.Count > 0 then
-      cbMasks.Text := cbMasks.Items[0];
+  cbNoCase.Checked := FGrepExpert.GrepNoCase;
+  cbNoComments.Checked := FGrepExpert.GrepNoComments;
+  cbForms.Checked := FGrepExpert.GrepForms;
+  cbInclude.Checked := FGrepExpert.GrepSub;
+  cbWholeWord.Checked := FGrepExpert.GrepWholeWord;
+  cbRegEx.Checked := FGrepExpert.GrepRegEx;
+  case FGrepExpert.GrepSearch of
+    0: rbCurrentOnly.Checked := True;
+    1: rbAllProjFiles.Checked := True;
+    2: rbOpenFiles.Checked := True;
+    3: rbDirectories.Checked := True;
+    4: rbAllProjGroupFiles.Checked := True;
+  else
+    rbAllProjFiles.Checked := True;
   end;
 
+  if cbText.Items.Count > 0 then
+    cbText.Text := cbText.Items[0];
+  if cbDirectory.Items.Count > 0 then
+    cbDirectory.Text := cbDirectory.Items[0];
+  if cbMasks.Items.Count > 0 then
+    cbMasks.Text := cbMasks.Items[0];
+
   if not IsStandAlone then
   begin
     SetupPattern;

Index: GX_GrepExpert.pas
===================================================================
RCS file: /cvsroot/gexperts/gexperts/unstable/Src/Grep/GX_GrepExpert.pas,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- GX_GrepExpert.pas	22 Jan 2006 20:02:42 -0000	1.28
+++ GX_GrepExpert.pas	9 Aug 2006 06:10:16 -0000	1.29
@@ -10,7 +10,6 @@
   TGrepExpert = class(TGX_Expert)
   private
     FGrepMiddle: Boolean;
-    FGrepSave: Boolean;
     FGrepANSICompatible: Boolean;
     FGrepExpandAll: Boolean;
     FSearchList: TStrings;
@@ -47,7 +46,6 @@
     procedure Click(Sender: TObject); override;
     procedure Configure; override;
     property GrepMiddle: Boolean read FGrepMiddle write FGrepMiddle;
-    property GrepSave: Boolean read FGrepSave write FGrepSave;
     property GrepANSICompatible: Boolean read FGrepANSICompatible write FGrepANSICompatible;
     property GrepExpandAll: Boolean read FGrepExpandAll write FGrepExpandAll;
     property GrepNoCase: Boolean read FGrepNoCase write FGrepNoCase;
@@ -97,7 +95,6 @@
   FContextMatchColor := clHighlight;
   FNumContextLines := 2;
   
-  FGrepSave := True;
   FGrepANSICompatible := False;
   FGrepExpandAll := False;
   FGrepUseCurrentIdent := False;
@@ -188,7 +185,6 @@
   Settings.WriteBool(ConfigurationKey, 'Forms', GrepForms);
   Settings.WriteInteger(ConfigurationKey, 'Search', GrepSearch);
   Settings.WriteBool(ConfigurationKey, 'SubDirectories', GrepSub);
-  Settings.WriteBool(ConfigurationKey, 'Save', GrepSave);
   Settings.WriteBool(ConfigurationKey, 'ANSICompatible', GrepANSICompatible);
   Settings.WriteBool(ConfigurationKey, 'ExpandAll', GrepExpandAll);
   Settings.WriteBool(ConfigurationKey, 'Whole Word', GrepWholeWord);
@@ -249,7 +245,6 @@
   FGrepForms := Settings.ReadBool(ConfigurationKey, 'Forms', False);
   FGrepSearch := Settings.ReadInteger(ConfigurationKey, 'Search', 0);
   FGrepSub := Settings.ReadBool(ConfigurationKey, 'SubDirectories', True);
-  FGrepSave := Settings.ReadBool(ConfigurationKey, 'Save', True);
   FGrepANSICompatible := Settings.ReadBool(ConfigurationKey, 'ANSICompatible', False);
   FGrepExpandAll := Settings.ReadBool(ConfigurationKey, 'ExpandAll', False);
   FGrepWholeWord := Settings.ReadBool(ConfigurationKey, 'Whole Word', False);