IDE: renamed build macros in compiler options frame to IDE macros

git-svn-id: trunk@34636 -

ide/frames/compiler_buildmacro_options.pas

@@ -377,8 +377,7 @@ begin
         // check syntax
         if (S='') or (not IsValidIdent(S)) then begin
           MessageDlg(lisCCOErrorCaption,
-            Format(lisInvalidBuildMacroTheBuildMacroMustBeAPascalIdentifie, ['"',
+            Format(lisInvalidMacroTheMacroMustBeAPascalIdentifie, ['"', S, '"']),
-              S, '"']),
             mtError,[mbCancel],0);
           exit;
         end;
@@ -389,7 +388,7 @@ begin
         then  begin
           BetterName:=GetMacroNamePrefix(cbmpMedium)+S;
           DlgResult:=QuestionDlg(lisCCOWarningCaption,
-            Format(lisTheBuildMacroDoesNotBeginWith, [S, Prefix]),
+            Format(lisTheMacroDoesNotBeginWith, [S, Prefix]),
             mtWarning, [mrCancel, mrYes, Format(lisRenameTo, [BetterName]),
               mrIgnore], 0);
           if DlgResult=mrIgnore then begin
@@ -403,7 +402,7 @@ begin
         // check for keyword
         if WordIsKeyWord.DoItCaseInsensitive(S) then begin
           MessageDlg(lisCCOErrorCaption,
-            Format(lisInvalidBuildMacroTheNameIsAKeyword, [S]),
+            Format(lisInvalidMacroTheNameIsAKeyword, [S]),
             mtError,[mbCancel],0);
           exit;
         end;
@@ -426,7 +425,7 @@ begin
         or (SysUtils.CompareText('LCLWidgetType',S)=0)
         then begin
           MessageDlg(lisCCOErrorCaption,
-            Format(lisThereIsAlreadyABuildMacroWithTheName, ['"', S, '"']),
+            Format(lisThereIsAlreadyAMacroWithTheName, ['"', S, '"']),
             mtError,[mbCancel],0);
           exit;
         end;
@@ -437,7 +436,7 @@ begin
           Vars:=GetBuildMacroValues(TBaseCompilerOptions(BuildMacros.Owner),false);
           if (Vars<>nil) and Vars.IsDefined(PChar(S)) then begin
             DlgResult:=MessageDlg(lisCCOWarningCaption,
-              Format(lisThereIsAlreadyABuildMacroWithTheName, ['"', S, '"']),
+              Format(lisThereIsAlreadyAMacroWithTheName, ['"', S, '"']),
               mtWarning,[mbCancel,mbIgnore],0);
             if DlgResult<>mrIgnore then
               exit;
@@ -540,7 +539,7 @@ begin
     if i>=0 then aBuildMacro.Values.Delete(i);
   end else begin
     if MessageDlg(lisConfirmDelete,
-      Format(lisDeleteBuildMacro, ['"', aBuildMacro.Identifier, '"']),
+      Format(lisDeleteMacro, ['"', aBuildMacro.Identifier, '"']),
       mtConfirmation,[mbYes,mbCancel],0)<>mrYes
     then exit;
     i:=BuildMacros.IndexOfIdentifier(aBuildMacro.Identifier);
@@ -712,7 +711,7 @@ begin
     BuildMacroDescriptionEdit.Text:=aBuildMacro.Description;
     BMAddMacroValueSpeedButton.Hint:=Format(lisAddValueToMacro, [aBuildMacro.Identifier]);
     if NodeType=cbmntBuildMacro then
-      BMDeleteMacroSpeedButton.Hint:=Format(lisDeleteMacro, [aBuildMacro.Identifier])
+      BMDeleteMacroSpeedButton.Hint:=Format(lisDeleteMacro, ['"',aBuildMacro.Identifier,'"'])
     else
       BMDeleteMacroSpeedButton.Hint:=Format(lisDeleteValue2, [BuildMacrosTreeView.
         Selected.Text]);
@@ -964,7 +963,7 @@ begin
   FBuildMacros:=TIDEBuildMacros.Create(nil);
   fEngine:=TCTConfigScriptEngine.Create;
 
-  MacrosGroupBox.Caption:=lisBuildMacros2;
+  MacrosGroupBox.Caption:=lisIDEMacros;
   BuildMacrosTreeView.Images := IDEImages.Images_24;
   fVarImgID:=IDEImages.LoadImage(24,'da_define');
   fValueImgID:=IDEImages.LoadImage(24,'da_define');
@@ -1008,7 +1007,7 @@ end;
 
 function TCompOptBuildMacrosFrame.GetTitle: String;
 begin
-  Result:=lisBuildMacros;
+  Result:=lisIDEMacros;
 end;
 
 procedure TCompOptBuildMacrosFrame.ReadSettings(AOptions: TAbstractIDEOptions);

ide/lazarusidestrconsts.pas

@@ -4935,16 +4935,14 @@ resourcestring
   lisValue = 'Value:';
   lisValues = 'Values';
   lisDefaultValue = 'Default value';
-  lisBuildMacros = 'Build Macros';
+  lisIDEMacros = 'IDE Macros';
-  lisBuildMacros2 = 'Build macros';
-  //lisCustomBuildMacros = 'Custom build macros';
   lisConfirmDelete = 'Confirm delete';
-  lisDeleteBuildMacro = 'Delete build macro %s%s%s?';
+  lisDeleteMacro = 'Delete macro %s%s%s?';
   lisValue2 = 'Value%s';
   lisDeleteValue = 'Delete value %s%s%s';
-  lisInvalidBuildMacroTheBuildMacroMustBeAPascalIdentifie = 'Invalid build '
+  lisInvalidMacroTheMacroMustBeAPascalIdentifie = 'Invalid '
-    +'macro %s%s%s. The build macro must be a pascal identifier.';
+    +'macro %s%s%s. The macro name must be a pascal identifier.';
-  lisThereIsAlreadyABuildMacroWithTheName = 'There is already a build macro '
+  lisThereIsAlreadyAMacroWithTheName = 'There is already a macro '
     +'with the name %s%s%s.';  
   lisDuplicateFoundOfValue = 'Duplicate found of value %s%s%s.';
   lisSetValue = 'Set value';
@@ -5153,12 +5151,11 @@ resourcestring
   synfHideCommentsInSelection   = 'Hide comments in selection';
   lisCanNotCompileProject = 'Cannot compile project';
   lisTheProjectHasNoMainSourceFile = 'The project has no main source file.';
-  lisInvalidBuildMacroTheNameIsAKeyword = 'Invalid build macro "%s". The name '
+  lisInvalidMacroTheNameIsAKeyword = 'Invalid macro name "%s". The name '
     +'is a keyword.';
-  lisTheBuildMacroDoesNotBeginWith = 'The build macro "%s" does not begin with "%s".';
+  lisTheMacroDoesNotBeginWith = 'The macro "%s" does not begin with "%s".';
   lisRenameTo = 'Rename to %s';
   lisAddValueToMacro = 'Add value to macro %s';
-  lisDeleteMacro = 'Delete macro %s';
   lisDeleteValue2 = 'Delete value %s';
   lisNoMacroSelected = 'No macro selected';
   lisMacro = 'Macro %s';

ideintf/compoptsintf.pas

@@ -28,8 +28,8 @@ uses
 type
 
   { TLazBuildMacro
-    Every package/project can define build macros. A build macro has a name,
+    Every package/project can define build macros / ide macros. A build macro
-    a description, a list of possible values and a default value.
+    has a name, a description, a list of possible values and a default value.
     The default value can be an expression using other build macros.
     The IDE defines basic macros like TargetOS and TargetCPU.
     The LCL package defines the macro LCLWidgetType. }