added some fpc src paths and changed auto create project for program a Yes/No question

git-svn-id: trunk@6246 -

components/codetools/codetoolsstrconsts.pas

@@ -183,6 +183,7 @@ ResourceString
   ctsIncludeDirectoriesPlusDirs = 'include directories: %s';
   ctsPackageDirectories = 'Package directories';
   ctsUtilsDirectories = 'Utils directories';
+  ctsInstallerDirectories = 'Installer directories';
   ctsDefsForLazarusSources = 'Definitions for the Lazarus Sources';
   ctsAddsDirToSourcePath = 'adds %s to SrcPath';
   ctsSetsIncPathTo = 'sets IncPath to %s';

components/codetools/definetemplates.pas

@@ -3194,6 +3194,7 @@ var
   FCLDBDir: TDefineTemplate;
   FCLDBInterbaseDir: TDefineTemplate;
   SrcPathMacro: String;
+  InstallerDir: TDefineTemplate;
 begin
   {$IFDEF VerboseFPCSrcScan}
   DebugLn('CreateFPCSrcTemplate ',FPCSrcDir,': length(UnitSearchPath)=',DbgS(length(UnitSearchPath)),' Valid=',DbgS(UnitLinkListValid),' PPUExt=',PPUExt);
@@ -3243,8 +3244,11 @@ begin
   // compiler
   CompilerDir:=TDefineTemplate.Create('Compiler',ctsCompiler,'','compiler',
      da_Directory);
-  MainDir.AddChild(CompilerDir);
   AddProcessorTypeDefine(CompilerDir);
+  CompilerDir.AddChild(TDefineTemplate.Create('SrcPath','SrcPath addition',
+    ExternalMacroStart+'SrcPath',
+    SrcPathMacro+';'+Dir+TargetProcessor,da_Define));
+  MainDir.AddChild(CompilerDir);
 
   // rtl
   RTLDir:=TDefineTemplate.Create('RTL',ctsRuntimeLibrary,'','rtl',da_Directory);
@@ -3345,6 +3349,14 @@ begin
     Format(ctsAddsDirToSourcePath,['..']),ExternalMacroStart+'SrcPath',
     '..;'+ExternalMacroStart+'SrcPath',da_DefineRecurse));
 
+  // packages
+  InstallerDir:=TDefineTemplate.Create('Installer',ctsInstallerDirectories,'',
+     'installer',da_Directory);
+  InstallerDir.AddChild(TDefineTemplate.Create('SrcPath','SrcPath addition',
+    ExternalMacroStart+'SrcPath',
+    SrcPathMacro+';'+Dir+'ide;'+Dir+'fv',da_Define));
+  MainDir.AddChild(InstallerDir);
+
   // clean up
   if UnitTree<>nil then begin
     UnitTree.FreeAndClear;

ide/lazarusidestrconsts.pas

@@ -334,7 +334,7 @@ resourcestring
   lisProjectInfoFileDetected = 'Project info file detected';
   lisTheFileSeemsToBeAProgramCloseCurrentProject = 'The file %s%s%s%sseems to '
     +'be a program. Close current project and create a new lazarus project '
-    +'for this program?%sCancel will load the file as normal source.';
+    +'for this program?%s"No" will load the file as normal source.';
   lisProgramDetected = 'Program detected';
   lisUnableToConvertTextFormDataOfFileIntoBinaryStream = 'Unable to convert '
     +'text form data of file %s%s%s%s%sinto binary stream. (%s)';

ide/main.pp

@@ -3809,7 +3809,7 @@ begin
           AFilename, '"', #13, #13]);
         ACaption:=lisProgramDetected;
         if MessageDlg(ACaption, AText, mtConfirmation,
-            [mbOk, mbCancel], 0)=mrOk then
+            [mbYes, mbNo], 0)=mrYes then
         begin
           Result:=DoCreateProjectForProgram(PreReadBuf);
           Handled:=true;
@@ -10968,6 +10968,9 @@ end.
 
 { =============================================================================
   $Log$
+  Revision 1.790  2004/11/15 12:25:00  mattias
+  added some fpc src paths and changed auto create project for program a Yes/No question
+
   Revision 1.789  2004/11/06 19:49:11  mattias
   renamed avl_tree.pas to oldavltree.pas for new fpc 1.9.5