patch from Darek Mazur

git-svn-id: trunk@5380 -

ide/inputhistory.pas

@@ -161,6 +161,8 @@ type
     FReplaceHistory: TStringList;
     FFindInFilesPathHistory: TStringList;
     FFindInFilesMaskHistory: TStringList;
+    FFindInFilesWhere : Integer;
+    FFindInFilesSubDirs : boolean;
     FMaxFindHistory: Integer;
     
     // Unit dependencies
@@ -210,6 +212,8 @@ type
     property FindInFilesMaskHistory: TStringList read FFindInFilesMaskHistory
                                                  write FFindInFilesMaskHistory;
     property MaxFindHistory: Integer read FMaxFindHistory write FMaxFindHistory;
+    property FindInFilesWhere: Integer read FFindInFilesWhere write FFindInFilesWhere;
+    property FindInFilesSubDirs: Boolean read FFindInFilesSubDirs write FFindInFilesSubDirs;
     property Filename: string read FFilename write SetFilename;
 
     // Unit dependencies
@@ -326,6 +330,9 @@ begin
                                             'FindInFiles/History/Paths/');
   LoadRecentList(XMLConfig,FFindInFilesMaskHistory,Path+
                                             'FindInFiles/History/Masks/');
+  FFindInFilesWhere:=XMLConfig.GetValue(Path+'FindInFiles/Where',FFindInFilesWhere);
+  FFIndInFilesSubDirs:=
+    XMLConfig.GetValue(Path+'FindInFiles/SubDirs',false);
   // unit dependencies
   LoadRecentList(XMLConfig,FUnitDependenciesHistory,Path+'UnitDependencies/History/');
   // fpc config cache
@@ -367,6 +374,9 @@ begin
                                             'FindInFiles/History/Paths/');
   SaveRecentList(XMLConfig,FFindInFilesMaskHistory,Path+
                                             'FindInFiles/History/Masks/');
+  XMLConfig.SetDeleteValue(Path+'FindInFiles/Where',FFindInFilesWhere,0);
+  XMLConfig.SetDeleteValue(Path+'FindInFiles/SubDirs',
+                           FFindInFilesSubDirs,false);
   // unit dependencies
   SaveRecentList(XMLConfig,FUnitDependenciesHistory,Path+'UnitDependencies/History/');
   // fpc config cache

ide/lazarusidestrconsts.pas

@@ -407,8 +407,8 @@ resourcestring
   liscompiling = '%s (compiling ...)';
   lisdebugging = '%s (debugging ...)';
   lisUnableToFindFile = 'Unable to find file %s%s%s.';
-  lisUnableToFindFileCheckSearchPathInRunCompilerOption = 'Unable to find '
-    +'file %s%s%s.%sCheck search path in%sRun->Compiler Options...->Search '
+  lisUnableToFindFileCheckSearchPathInProjectCompilerOption = 'Unable to find '
+    +'file %s%s%s.%sCheck search path in%sProject->Compiler Options...->Search '
     +'Paths->Other Unit Files';
   lisNOTECouldNotCreateDefineTemplateForFreePascal = 'NOTE: Could not create '
     +'Define Template for Free Pascal Sources';

ide/main.pp

@@ -7520,7 +7520,7 @@ begin
            mtInformation,[mbOk],0)
       end else begin
         MessageDlg(Format(
-          lisUnableToFindFileCheckSearchPathInRunCompilerOption, ['"',
+          lisUnableToFindFileCheckSearchPathInProjectCompilerOption, ['"',
           Filename, '"', #13, #13]),
            mtInformation,[mbOk],0);
       end;
@@ -7581,7 +7581,7 @@ begin
            mtInformation,[mbOk],0)
       end else begin
         MessageDlg(Format(
-          lisUnableToFindFileCheckSearchPathInRunCompilerOption, ['"',
+          lisUnableToFindFileCheckSearchPathInProjectCompilerOption, ['"',
           AFilename, '"', #13, #13]),
            mtInformation,[mbOk],0);
       end;
@@ -10281,6 +10281,9 @@ end.
 
 { =============================================================================
   $Log$
+  Revision 1.720  2004/04/08 19:50:06  marc
+  patch from Darek Mazur
+
   Revision 1.719  2004/04/03 18:16:39  mattias
   Save SpeedButton is now disabled after save
 

ide/uniteditor.pp

@@ -3429,6 +3429,9 @@ begin
       TextToFindComboBox.Items.Assign(InputHistories.FindHistory);
       DirectoryComboBox.Items.Assign(InputHistories.FindInFilesPathHistory);
       FileMaskComboBox.Items.Assign(InputHistories.FindInFilesMaskHistory);
+      WhereRadioGroup.ItemIndex:=InputHistories.FindInFilesWhere;
+      IncludeSubDirsCheckBox.Checked:=InputHistories.FindInFilesSubDirs;
+      DirectoryOptionsGroupBox.Enabled:= (WhereRadioGroup.ItemIndex = 2);
     end;//With
   end;//if
 end;//LoadFindInFilesHistory
@@ -3442,6 +3445,8 @@ begin
       InputHistories.AddToFindHistory(FindText);
       InputHistories.AddToFindInFilesPathHistory(DirectoryComboBox.Text);
       InputHistories.AddToFindInFilesMaskHistory(FileMaskComboBox.Text);
+      InputHistories.FindInFilesWhere:=WhereRadioGroup.ItemIndex;
+      InputHistories.FindInFilesSubDirs:=IncludeSubDirsCheckBox.Checked;
     end;//with
     InputHistories.Save;
   end;//if