paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-06 07:58:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Replace #13 with LineEnding in many messages. It didn't show correctly on Linux systems.

Browse Source 
git-svn-id: trunk@38633 -
This commit is contained in:
juha 2012-09-13 06:39:56 +00:00
parent 5b6cb21f1c
commit 672f5bd862
70 changed files with 654 additions and 657 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
components/codetools/ide/codyidentifiersdlg.pas
View File

@ -1088,10 +1088,10 @@ begin
[IntToStr(CodyUnitDictionary.UnitGroupsByFilename.Count),
IntToStr(CodyUnitDictionary.UnitsByFilename.Count),
IntToStr(CodyUnitDictionary.Identifiers.Count),
#13#10,
LineEnding,
CodyUnitDictionary.GetFilename]);
if CodyUnitDictionary.LoadSaveError<>'' then
s:=s+#13#10+Format(crsError, [CodyUnitDictionary.LoadSaveError]);
s:=s+LineEnding+Format(crsError, [CodyUnitDictionary.LoadSaveError]);
InfoLabel.Caption:=s;
end;
@ -1279,7 +1279,7 @@ begin
then begin
// another unit with same name
IDEMessageDialog(crsUnitNameClash,
Format(crsTheTargetUnitHasTheSameNameAsTheCurrentUnitFreePas, [#13]),
Format(crsTheTargetUnitHasTheSameNameAsTheCurrentUnitFreePas, [LineEnding]),
mtError,[mbCancel]);
exit;
end;
@ -1330,14 +1330,14 @@ begin
begin
if Pkg=CurOwner then begin
IDEMessageDialog(crsImpossibleDependency,
Format(crsTheUnitIsPartOfItCanNotUseAnotherPackageWithTheSam, [
CurMainFilename, #13, Pkg.Filename, #13, #13, NewGroupFilename]),
mtError, [mbCancel]);
Format(crsTheUnitIsPartOfItCanNotUseAnotherPackageWithTheSam, [CurMainFilename,
LineEnding, Pkg.Filename, LineEnding, LineEnding, NewGroupFilename]),
mtError, [mbCancel]);
exit;
end;
if IDEQuestionDialog(crsPackageWithSameName,
Format(crsThereIsAlreadyAnotherPackageLoadedWithTheSameNameO, [#13,
Pkg.Filename, #13, NewGroupFilename, #13]),
Format(crsThereIsAlreadyAnotherPackageLoadedWithTheSameNameO, [LineEnding,
Pkg.Filename, LineEnding, NewGroupFilename, LineEnding]),
mtConfirmation, [mrCancel, crsBTNCancel, mrOk,
crsCloseOtherPackageAndOpenNew])<> mrOk
then exit;

4
components/codetools/ide/codyutils.pas
View File

@ -184,7 +184,7 @@ begin
Code.Filename:=Filename;
Code.OnDecodeLoaded:=@Cody.DecodeLoaded;
if not Code.LoadFromFile(Filename) then begin
IDEMessageDialog(crsCWError, Format(crsCUUnableToLoadFile, [Filename, #13
IDEMessageDialog(crsCWError, Format(crsCUUnableToLoadFile, [Filename, LineEnding
, Code.LastError]),
mtError,[mbCancel]);
exit;
@ -595,7 +595,7 @@ begin
if not ReadFromClipboard(AClipBoard,SrcEdit,ALogStartPos,AText) then exit;
except
on E: Exception do begin
IDEMessageDialog('Error','Unable to paste Cody data.'#13+E.Message,
IDEMessageDialog('Error','Unable to paste Cody data.'+LineEnding+E.Message,
mtError,[mbCancel]);
end;
end;

2
components/codetools/ide/declarevardlg.pas
View File

@ -121,7 +121,7 @@ function CheckCreateVarFromIdentifierInSrcEdit(
procedure ErrorNotAtAnIdentifier;
begin
IDEMessageDialog(crsCWError,
Format(crsPleasePlaceTheCursorOfTheSourceEditorAtAnIdentifie, [#13, #13]),
Format(crsPleasePlaceTheCursorOfTheSourceEditorAtAnIdentifie, [LineEnding, LineEnding]),
mtError,[mbCancel]);
end;

8
components/lazreport/source/lr_class.pas
View File

@ -4981,12 +4981,12 @@ begin
ErrorFlag := True;
ErrorStr := sErrorOccured;
for i := 0 to CurView.Memo.Count - 1 do
ErrorStr := ErrorStr + #13 + CurView.Memo[i];
ErrorStr := ErrorStr + #13 +
sDoc + ' ' + CurReport.Name + #13 +
ErrorStr := ErrorStr + LineEnding + CurView.Memo[i];
ErrorStr := ErrorStr + LineEnding +
sDoc + ' ' + CurReport.Name + LineEnding +
sCurMemo + ' ' + CurView.Name;
if Assigned(CurView.Parent) then
ErrorStr := ErrorStr + #13 +
ErrorStr := ErrorStr + LineEnding +
sBand + ' ' + CurView.Parent.Name; //frBandNames[Integer(CurView.Parent.Typ)];
MasterReport.Terminated := True;
end;

2
converter/convcodetool.pas
View File

@ -156,7 +156,7 @@ begin
LazarusIDE.DoJumpToCodeToolBossError;
if fAskAboutError then begin
Result:=QuestionDlg(lisCCOErrorCaption,
Format(CodetoolsFoundError, [ExtractFileName(fCode.Filename), #13, ErrMsg, #13]),
Format(CodetoolsFoundError, [ExtractFileName(fCode.Filename), LineEnding, ErrMsg, LineEnding]),
mtWarning, [mrIgnore, lisIgnoreAndContinue, mrAbort], 0);
if Result=mrIgnore then Result:=mrOK;
end else begin

10
converter/convertdelphi.pas
View File

@ -877,7 +877,7 @@ begin
Result:=PrevResult;
if Result=mrCancel then begin
Result:=QuestionDlg(lisConvDelphiFailedConvertingUnit,
Format(lisConvDelphiFailedToConvertUnit, [#13,fOrigUnitFilename, #13]),
Format(lisConvDelphiFailedToConvertUnit, [LineEnding,fOrigUnitFilename,LineEnding]),
mtWarning, [mrIgnore, lisIgnoreAndContinue, mrAbort], 0);
case Result of
mrIgnore : Result:=mrOK;
@ -1417,7 +1417,7 @@ begin
if CurUnitInfo<>nil then begin
Result:=QuestionDlg(lisConvDelphiUnitnameExistsTwice,
Format(lisConvDelphiThereAreTwoUnitsWithTheSameUnitname,
[#13, CurUnitInfo.Filename, #13, AFileName, #13]),
[LineEnding, CurUnitInfo.Filename, LineEnding, AFileName, LineEnding]),
mtWarning, [mrYes,lisConvDelphiRemoveFirst,mrNo,lisConvDelphiRemoveSecond,
mrIgnore,lisConvDelphiKeepBoth,mrAbort], 0);
case Result of
@ -1670,7 +1670,7 @@ begin
// ... but it is not the package file we want -> stop
MessageDlg(lisConvDelphiPackageNameExists,
Format(lisConvDelphiThereIsAlreadyAPackageWithTheNamePleaseCloseThisPa,
[PkgName, #13]), mtError, [mbAbort], 0);
[PkgName, LineEnding]), mtError, [mbAbort], 0);
PackageEditingInterface.DoOpenPackageFile(LazPackage.Filename,[pofAddToRecent],true);
fErrorMsg:='Stopped because there already is a package with the same name';
exit(mrAbort);
@ -1772,7 +1772,7 @@ begin
if OffendingUnit<>nil then begin
Result:=QuestionDlg(lisConvDelphiUnitnameExistsTwice,
Format(lisConvDelphiThereAreTwoUnitsWithTheSameUnitname,
[#13, OffendingUnit.Filename, #13, CurFilename, #13]),
[LineEnding, OffendingUnit.Filename, LineEnding, CurFilename, LineEnding]),
mtWarning, [mrNo, lisConvDelphiRemoveSecond, mrAbort], 0);
case Result of
mrNo: continue;
@ -1827,7 +1827,7 @@ begin
if not FileExistsCached(DPKFilename) then begin
Result:=MessageDlg(lisFileNotFound,
Format(lisConvDelphiDelphiPackageMainSourceDpkFileNotFoundForPackage,
[#13, LazPackage.Filename]), mtError, [mbAbort], 0);
[LineEnding, LazPackage.Filename]), mtError, [mbAbort], 0);
exit;
end;
Result:=LoadCodeBuffer(fDpkCode,DPKFilename,[],true);

6
converter/missingpropertiesdlg.pas
View File

@ -200,7 +200,7 @@ begin
except
on E: Exception do begin
Result:=QuestionDlg(lisCodeToolsDefsReadError, Format(
lisUnableToReadFileError, ['"', aFilename, '"', #13, E.Message]),
lisUnableToReadFileError, ['"', aFilename, '"', LineEnding, E.Message]),
mtError,[mrIgnore,mrAbort],0);
if Result=mrIgnore then // The caller will continue like nothing happened.
Result:=mrOk;
@ -213,7 +213,7 @@ begin
except
on E: Exception do begin
Result:=QuestionDlg(lisFormatError,
Format(lisUnableToConvertFileError, ['"',aFilename,'"',#13,E.Message]),
Format(lisUnableToConvertFileError, ['"',aFilename,'"',LineEnding,E.Message]),
mtError,[mrIgnore,mrAbort],0);
if Result=mrIgnore then
Result:=mrOk;
@ -226,7 +226,7 @@ begin
except
on E: Exception do begin
Result:=MessageDlg(lisCodeToolsDefsWriteError,
Format(lisUnableToWriteFileError, ['"',aFilename,'"',#13,E.Message]),
Format(lisUnableToWriteFileError, ['"',aFilename,'"',LineEnding,E.Message]),
mtError,[mbIgnore,mbAbort],0);
if Result=mrIgnore then
Result:=mrOk;

3
debugger/breakpointsdlg.pp
View File

@ -936,7 +936,8 @@ begin
begin
CurBreakPoint:=TIDEBreakPoint(Item.Data);
case CurBreakPoint.Kind of
bpkSource: Msg := Format(lisDeleteBreakpointAtLine, [#13, CurBreakPoint.Source, CurBreakPoint.Line]);
bpkSource: Msg := Format(lisDeleteBreakpointAtLine,
[LineEnding, CurBreakPoint.Source, CurBreakPoint.Line]);
bpkAddress: Msg := Format(lisDeleteBreakpointForAddress, ['$' + IntToHex(CurBreakPoint.Address, 8)]);
bpkData: Msg := Format(lisDeleteBreakpointForWatch, [CurBreakPoint.WatchData]);
end;

2
designer/anchoreditor.pas
View File

@ -562,7 +562,7 @@ begin
CurControl.AnchorSide[Kind].Control:=NewSibling;
except
on E: Exception do begin
MessageDlg('Error', lisUnableToSetAnchorSideControl+#13 +E.Message,
MessageDlg('Error', lisUnableToSetAnchorSideControl+LineEnding+E.Message,
mtError,[mbCancel],0);
end;
end;

5
designer/changeclassdialog.pas
View File

@ -123,7 +123,7 @@ var
procedure ShowAbortMessage(const Msg: string);
begin
MessageDlg('Error',
Format(lisUnableToChangeClassOfTo, [Msg, #13, PersistentName,
Format(lisUnableToChangeClassOfTo, [Msg, LineEnding, PersistentName,
NewClass.ClassName]),
mtError,[mbCancel],0);
end;
@ -186,7 +186,8 @@ var
MainIDEInterface.DoJumpToCodeToolBossError
else begin
Msg:=lisErrorParsingLfmComponentStream;
if LFMTree<>nil then Msg:=Msg+#13#13+LFMTree.FirstErrorAsString+#13;
if LFMTree<>nil then
Msg:=Msg+LineEnding+LineEnding+LFMTree.FirstErrorAsString+LineEnding;
ShowAbortMessage(Msg);
end;
exit;

18
designer/designer.pp
View File

@ -977,7 +977,7 @@ begin
on E: Exception do begin
MessageDlg(lisUnableToStreamSelectedComponents,
Format(lisThereWasAnErrorDuringWritingTheSelectedComponent, [
CurComponent.Name, CurComponent.ClassName, #13, E.Message]),
CurComponent.Name, CurComponent.ClassName, LineEnding, E.Message]),
mtError,[mbOk],0);
exit;
end;
@ -990,7 +990,7 @@ begin
on E: Exception do begin
MessageDlg(lisUnableConvertBinaryStreamToText,
Format(lisThereWasAnErrorWhileConvertingTheBinaryStreamOfThe, [
CurComponent.Name, CurComponent.ClassName, #13, E.Message]),
CurComponent.Name, CurComponent.ClassName, LineEnding, E.Message]),
mtError,[mbOk],0);
exit;
end;
@ -1037,8 +1037,8 @@ begin
except
on E: Exception do begin
MessageDlg(lisUnableCopyComponentsToClipboard,
Format(lisThereWasAnErrorWhileCopyingTheComponentStreamToCli, [#13,
E.Message]),
Format(lisThereWasAnErrorWhileCopyingTheComponentStreamToCli,
[LineEnding, E.Message]),
mtError,[mbOk],0);
exit;
end;
@ -1369,7 +1369,7 @@ begin
DebugLn('TDesigner.InvokeComponentEditor ERROR: ',E.Message);
MessageDlg(Format(lisErrorIn, [CompEditor.ClassName]),
Format(lisTheComponentEditorOfClassHasCreatedTheError, ['"',
CompEditor.ClassName, '"', #13, '"', E.Message, '"']),
CompEditor.ClassName, '"', LineEnding, '"', E.Message, '"']),
mtError,[mbOk],0);
end;
end;
@ -1930,7 +1930,7 @@ var
begin
IDEMessageDialog(lisA2PInvalidCircularDependency,
Format(lisIsAThisCircularDependencyIsNotAllowed, [dbgsName(LookupRoot),
dbgsName(NewComponentClass), #13]),
dbgsName(NewComponentClass), LineEnding]),
mtError,[mbOk],'');
exit;
end;
@ -2445,7 +2445,7 @@ begin
if AncestorRoot<>nil then begin
MessageDlg(lisInvalidDelete,
Format(lisTheComponentIsInheritedFromToDeleteAnInheritedComp, [dbgsName(
ControlSelection[i].Persistent), dbgsName(AncestorRoot), #13]),
ControlSelection[i].Persistent), dbgsName(AncestorRoot), LineEnding]),
mtInformation, [mbOk],0);
exit;
end;
@ -2798,8 +2798,8 @@ begin
DebugLn('TDesigner.OnComponentEditorVerbMenuItemClick ERROR: ',E.Message);
MessageDlg(Format(lisErrorIn, [PopupMenuComponentEditor.ClassName]),
Format(lisTheComponentEditorOfClassInvokedWithVerbHasCreated, ['"',
PopupMenuComponentEditor.ClassName, '"', #13, IntToStr(Verb), '"',
VerbCaption, '"', #13, #13, '"', E.Message, '"']),
PopupMenuComponentEditor.ClassName, '"', LineEnding, IntToStr(Verb), '"',
VerbCaption, '"', LineEnding, LineEnding, '"', E.Message, '"']),
mtError,[mbOk],0);
end;
end;

2
designer/jitforms.pp
View File

@ -1195,7 +1195,7 @@ begin
else begin
// then try to give a visible warning
MessageDlg('Read error',
Context+#13
Context+LineEnding
+'Error: '+FCurReadErrorMsg,mtError,[mbCancel],0);
end;
end;

14
examples/idehelp/myidehelp.pas
View File

@ -438,7 +438,7 @@ begin
Msg:='This is a demonstration how to get help for a pascal identifier. See package '+IDEHelpPkgName;
IDEMessageDialog('My pascal source help',
'ToDo: implement me:'#13#13
'ToDo: implement me:'+LineEnding+LineEnding
+Msg,mtInformation,[mbOk]);
Result:=shrSuccess;
end;
@ -483,7 +483,7 @@ begin
Msg:='This is a demonstration how to get help for a class. See package '+IDEHelpPkgName;
IDEMessageDialog('My class help',
'The class "'+ClassQuery.TheClass.ClassName+'":'#13#13
'The class "'+ClassQuery.TheClass.ClassName+'":'+LineEnding+LineEnding
+Msg,mtInformation,[mbOk]);
Result:=shrSuccess;
end;
@ -696,7 +696,7 @@ begin
Msg:=ContextToMessage.Values[IntToStr(Context.Context)];
IDEMessageDialog('My context help',
'The context "'+IntToStr(Context.Context)+'":'#13#13
'The context "'+IntToStr(Context.Context)+'":'+LineEnding+LineEnding
+Msg,mtInformation,[mbOk]);
Result:=shrSuccess;
end;
@ -764,7 +764,7 @@ begin
if Msg.MessageParts.Values['Message']<>'User defined: Test' then exit;
IDEMessageDialog('My message help',
'The message "$'+Msg.WholeMessage+'":'#13#13
'The message "$'+Msg.WholeMessage+'":'+LineEnding+LineEnding
+'Success. Message recognized by TMyMessagesHelpDatabase',mtInformation,[mbOk]);
Result:=shrSuccess;
end;
@ -859,7 +859,7 @@ begin
// directive is now 'mode'
Txt:=FPCDirectiveToText.Values[lowercase(Directive)];
IDEMessageDialog('My fpc directive help',
'Free Pascal compiler directive "$'+Directive+'":'#13#13
'Free Pascal compiler directive "$'+Directive+'":'+LineEnding+LineEnding
+Txt,mtInformation,[mbOk]);
end else if (IDEDirectiveHelpPrefix<>'')
and (LeftStr(Directive,length(IDEDirectiveHelpPrefix))=IDEDirectiveHelpPrefix)
@ -868,7 +868,7 @@ begin
Directive:=copy(Directive,length(IDEDirectiveHelpPrefix)+2,length(Directive));
Txt:=IDEDirectiveToText.Values[lowercase(Directive)];
IDEMessageDialog('My Lazarus IDE directive help',
'Lazarus IDE directive "%'+Directive+'":'#13#13
'Lazarus IDE directive "%'+Directive+'":'+LineEnding+LineEnding
+Txt,mtInformation,[mbOk]);
end;
Result:=shrSuccess;
@ -954,7 +954,7 @@ begin
KeyWord:=copy(KeywordQuery.Keyword,length(FPCKeyWordHelpPrefix)+1,length(KeywordQuery.Keyword));
Txt:=KeywordToText.Values[lowercase(KeyWord)];
IDEMessageDialog('My fpc keyword help',
'The keyword "'+KeyWord+'":'#13#13
'The keyword "'+KeyWord+'":'+LineEnding+LineEnding
+Txt,mtInformation,[mbOk]);
Result:=shrSuccess;
end;

6
examples/turbopower_ipro/mainunit.pas
View File

@ -99,8 +99,8 @@ begin
IpHtmlPanel1.PrintPreview;
{$else}
ShowMessage(
'In order to use this feature, please read instructions'#13+
'contained in the readme file included in this project'#13+
'In order to use this feature, please read instructions'+LineEnding+
'contained in the readme file included in this project'+LineEnding+
'directory');
{$endif}
end;
@ -123,7 +123,7 @@ begin
except
on E: Exception do begin
MessageDlg('Unable to open HTML file',
'HTML File: '+Filename+#13
'HTML File: '+Filename+LineEnding
+'Error: '+E.Message,mtError,[mbCancel],0);
end;
end;

8
ide/abstractsmethodsdlg.pas
View File

@ -146,7 +146,7 @@ begin
CodeToolBoss.FreeListOfPCodeXYPosition(ListOfPCodeXYPosition);
if ErrMsg<>'' then begin
MessageDlg(lisCCOErrorCaption,
lisSAMUnableToShowAbstractMethodsOfTheCurrentClassBecaus+#13
lisSAMUnableToShowAbstractMethodsOfTheCurrentClassBecaus+LineEnding
+ErrMsg,mtError,[mbCancel],0);
end;
end;
@ -383,12 +383,12 @@ begin
// note
NoteStr:='';
if BelongsToStartClassCnt>0 then begin
NoteStr:=Format(lisSAMIsAnAbstractClassItHasAbstractMethods, [
StartClassName, IntToStr(BelongsToStartClassCnt)])+#13;
NoteStr:=Format(lisSAMIsAnAbstractClassItHasAbstractMethods,
[StartClassName, IntToStr(BelongsToStartClassCnt)])+LineEnding;
end;
NoteStr:=NoteStr+
Format(lisSAMThereAreAbstractMethodsToOverrideSelectTheMethodsF,
[IntToStr(FItems.Count-BelongsToStartClassCnt), #13]);
[IntToStr(FItems.Count-BelongsToStartClassCnt), LineEnding]);
NoteLabel.Caption:=NoteStr;
UpdateButtons;

24
ide/addtoprojectdlg.pas
View File

@ -167,8 +167,8 @@ begin
// check packagename
if (NewPkgName='') or (not IsValidIdent(NewPkgName)) then begin
MessageDlg(lisProjAddInvalidPackagename,
Format(lisProjAddThePackageNameIsInvalidPlaseChooseAnExistingPackag, [
'"', NewPkgName, '"', #13]),
Format(lisProjAddThePackageNameIsInvalidPlaseChooseAnExistingPackag,
['"', NewPkgName, '"', LineEnding]),
mtError,[mbCancel],0);
exit;
end;
@ -185,8 +185,8 @@ begin
if not PackageGraph.DependencyExists(NewDependency,fpfSearchAllExisting)
then begin
MessageDlg(lisProjAddPackageNotFound,
Format(lisProjAddTheDependencyWasNotFound, ['"', NewDependency.AsString,
'"', #13]),
Format(lisProjAddTheDependencyWasNotFound,
['"', NewDependency.AsString, '"', LineEnding]),
mtError,[mbCancel],0);
exit;
end;
@ -259,8 +259,8 @@ begin
if not NewDependency.MinVersion.ReadString(DependMinVersionEdit.Text) then
begin
MessageDlg(lisProjAddInvalidVersion,
Format(lisProjAddTheMinimumVersionIsInvalid, ['"',
DependMinVersionEdit.Text, '"', #13, #13]),
Format(lisProjAddTheMinimumVersionIsInvalid,
['"', DependMinVersionEdit.Text, '"', LineEnding, LineEnding]),
mtError,[mbCancel],0);
exit;
end;
@ -271,8 +271,8 @@ begin
if not NewDependency.MaxVersion.ReadString(DependMaxVersionEdit.Text) then
begin
MessageDlg(lisProjAddInvalidVersion,
Format(lisProjAddTheMaximumVersionIsInvalid, ['"',
DependMaxVersionEdit.Text, '"', #13, #13]),
Format(lisProjAddTheMaximumVersionIsInvalid,
['"', DependMaxVersionEdit.Text, '"', LineEnding, LineEnding]),
mtError,[mbCancel],0);
exit;
end;
@ -577,8 +577,8 @@ begin
ConflictFile:=TheProject.UnitWithUnitname(NewUnitName);
if ConflictFile<>nil then begin
MessageDlg(lisProjAddUnitNameAlreadyExists,
Format(lisProjAddTheUnitNameAlreadyExistsInTheProject, ['"',
NewUnitName, '"', #13, '"', ConflictFile.Filename, '"']),
Format(lisProjAddTheUnitNameAlreadyExistsInTheProject,
['"', NewUnitName, '"', LineEnding, '"', ConflictFile.Filename, '"']),
mtWarning, [mbCancel, mbIgnore], 0);
exit;
end;
@ -589,8 +589,8 @@ begin
OtherUnitName:=ExtractFileNameOnly(OtherFile);
if CompareText(OtherUnitName, NewUnitName)=0 then begin
MessageDlg(lisProjAddUnitNameAlreadyExists,
Format(lisProjAddTheUnitNameAlreadyExistsInTheSelection, ['"',
NewUnitName, '"', #13, '"', OtherFile, '"']),
Format(lisProjAddTheUnitNameAlreadyExistsInTheSelection,
['"', NewUnitName, '"', LineEnding, '"', OtherFile, '"']),
mtWarning, [mbCancel], 0);
exit;
end;

6
ide/buildlazdialog.pas
View File

@ -213,7 +213,7 @@ function MakeLazarus(Profile: TBuildLazarusProfile;
Result:=false;
IDEMessageDialog(lisBuildingLazarusFailed,
Format(lisThisSetOfOptionsToBuildLazarusIsNotSupportedByThis,
[#13, '"', Dir, '"', #13]),
[LineEnding, '"', Dir, '"', LineEnding]),
mtError,[mbCancel]);
end;
@ -320,7 +320,7 @@ begin
if (Tool.Filename='') or (not FileExistsUTF8(Tool.Filename)) then begin
IDEMessageDialog(lisMakeNotFound,
Format(lisTheProgramMakeWasNotFoundThisToolIsNeededToBuildLa,
['"', '"', #13, #13]),
['"', '"', LineEnding, LineEnding]),
mtError,[mbCancel]);
exit;
end;
@ -801,7 +801,7 @@ begin
except
on E: Exception do begin
Result:=IDEMessageDialog(lisLazBuildErrorWritingFile,
Format(lisLazBuildUnableToWriteFile, [Filename, #13])
Format(lisLazBuildUnableToWriteFile, [Filename, LineEnding])
+E.Message,
mtError,[mbCancel,mbAbort]);
exit;

27
ide/buildmanager.pas
View File

@ -853,8 +853,8 @@ begin
end else if not FoundSystemPPU then begin
// system.ppu is missing
IDEMessageDialog(lisCCOErrorCaption,
Format(lisTheProjectUsesTargetOSAndCPUTheSystemPpuForThisTar, [
TargetOS, TargetCPU, #13, #13]),
Format(lisTheProjectUsesTargetOSAndCPUTheSystemPpuForThisTar,
[TargetOS, TargetCPU, LineEnding, LineEnding]),
mtError,[mbOk]);
end;
end;
@ -1120,8 +1120,8 @@ function TBuildManager.CheckAmbiguousSources(const AFilename: string;
if not FileProcs.RenameFileUTF8(AmbiguousFilename,NewFilename) then
begin
Result:=IDEMessageDialog(lisErrorRenamingFile,
Format(lisUnableToRenameAmbiguousFileTo, ['"', AmbiguousFilename, '"',
#13, '"', NewFilename, '"']),
Format(lisUnableToRenameAmbiguousFileTo,
['"', AmbiguousFilename, '"', LineEnding, '"', NewFilename, '"']),
mtError,[mbOk,mbAbort]);
end else
Result:=mrOk;
@ -1150,8 +1150,8 @@ function TBuildManager.CheckAmbiguousSources(const AFilename: string;
afaAsk:
begin
Result:=IDEMessageDialog(lisAmbiguousFileFound,
Format(lisThereIsAFileWithTheSameNameAndASimilarExtension, [#13,
AFilename, #13, AmbiguousFilename, #13, #13]),
Format(lisThereIsAFileWithTheSameNameAndASimilarExtension, [LineEnding,
AFilename, LineEnding, AmbiguousFilename, LineEnding, LineEnding]),
mtWarning,[mbYes,mbIgnore,mbAbort]);
case Result of
mrYes: Result:=DeleteAmbiguousFile(AmbiguousFilename);
@ -1234,7 +1234,7 @@ begin
if EnvironmentOptions.AmbiguousFileAction=afaAsk then begin
if IDEMessageDialog(lisDeleteAmbiguousFile,
Format(lisAmbiguousFileFoundThisFileCanBeMistakenWithDelete, ['"',
CurFilename, '"', #13, '"', ShortFilename, '"', #13, #13]),
CurFilename, '"', LineEnding, '"', ShortFilename, '"', LineEnding, LineEnding]),
mtConfirmation,[mbYes,mbNo])=mrNo
then continue;
end;
@ -1317,8 +1317,7 @@ begin
while (EndPos<=length(UnitPath)) and (UnitPath[EndPos]<>';') do
inc(EndPos);
if EndPos>StartPos then begin
CurDir:=AppendPathDelim(TrimFilename(copy(
UnitPath,StartPos,EndPos-StartPos)));
CurDir:=AppendPathDelim(TrimFilename(copy(UnitPath,StartPos,EndPos-StartPos)));
FileInfoNeedClose:=true;
if FindFirstUTF8(CurDir+GetAllFilesMask,faAnyFile,FileInfo)=0 then begin
IgnoreAll:=false;
@ -1345,11 +1344,11 @@ begin
Result:=IDEQuestionDialog(lisAmbiguousUnitFound2,
Format(lisTheUnitExistsTwiceInTheUnitPathOfThe, [CurUnitName,
ContextDescription])
+#13
+#13
+'1. "'+PUnitFile(ANode.Data)^.Filename+'"'#13
+'2. "'+CurFilename+'"'#13
+#13
+LineEnding
+LineEnding
+'1. "'+PUnitFile(ANode.Data)^.Filename+'"'+LineEnding
+'2. "'+CurFilename+'"'+LineEnding
+LineEnding
+lisHintCheckIfTwoPackagesContainAUnitWithTheSameName,
mtWarning, [mrIgnore, mrYesToAll, lisIgnoreAll, mrAbort]);
case Result of

5
ide/buildprojectdlg.pas
View File

@ -524,8 +524,9 @@ begin
end;
if SourceFiles.Count>0 then begin
Result:=IDEMessageDialog(lisCCOWarningCaption,
Format(lisCBPReallyDeleteSourceFiles, [IntToStr(SourceFiles.Count), #13
+#13, copy(SourceFiles.Text, 1, 1000)]), mtWarning, [mbYes, mbNo]);
Format(lisCBPReallyDeleteSourceFiles, [IntToStr(SourceFiles.Count),
LineEnding+LineEnding, copy(SourceFiles.Text, 1, 1000)]),
mtWarning, [mbYes, mbNo]);
if Result<>mrYes then exit(mrCancel);
end;

14
ide/checkcompileropts.pas
View File

@ -270,7 +270,7 @@ begin
except
on e: Exception do begin
Result:=IDEQuestionDialog(lisCCOInvalidCompiler,
Format(lisCCOCompilerNotAnExe,[CompilerFilename,#13,E.Message]),
Format(lisCCOCompilerNotAnExe,[CompilerFilename,LineEnding,E.Message]),
mtError,[mrIgnore,lisCCOSkip,mrAbort]);
exit;
end;
@ -284,7 +284,8 @@ begin
RemoveDoubles(CompilerFiles);
if (CompilerFiles<>nil) and (CompilerFiles.Count>1) then begin
Result:=MessageDlg(lisCCOAmbiguousCompiler,
Format(lisCCOSeveralCompilers,[#13#13,CompilerFiles.Text,#13]),
Format(lisCCOSeveralCompilers,
[LineEnding+LineEnding,CompilerFiles.Text,LineEnding]),
mtWarning,[mbAbort,mbIgnore],0);
if Result<>mrIgnore then exit;
end;
@ -311,7 +312,7 @@ begin
TestDir:=AppendPathDelim(LazarusIDE.GetTestBuildDirectory);
if not DirPathExists(TestDir) then begin
MessageDlg(lisCCOInvalidTestDir,
Format(lisCCOCheckTestDir,[#13]),
Format(lisCCOCheckTestDir,[LineEnding]),
mtError,[mbCancel],0);
Result:=mrCancel;
exit;
@ -493,7 +494,7 @@ function TCheckCompilerOptsDlg.CheckMissingFPCPPUs(
Result:=ord(Severity)>=ord(ccmlError);
if not Result then begin
if MessageDlg(lisCCOMissingUnit,
Format(lisCCOPPUNotFoundDetailed,[TheUnitname, #13]),
Format(lisCCOPPUNotFoundDetailed,[TheUnitname, LineEnding]),
mtError,[mbIgnore,mbAbort],0)=mrIgnore then
Result:=true;
end;
@ -582,7 +583,7 @@ begin
if MaxPPUDate-MinPPUDate>3600 then begin
// the FPC .ppu files dates differ more than one hour
Result:=MessageDlg(lisCCOWarningCaption,
Format(lisCCODatesDiffer,[#13,#13,MinPPU,#13,MaxPPU]),
Format(lisCCODatesDiffer,[LineEnding,LineEnding,MinPPU,LineEnding,MaxPPU]),
mtError,[mbIgnore,mbAbort],0);
if Result<>mrIgnore then
exit;
@ -604,7 +605,8 @@ begin
if MinPPU<>'' then begin
if CompilerDate-MinPPUDate>300 then begin
// the compiler is more than 5 minutes newer than one of the ppu files
Result:=MessageDlg(lisCCOWarningCaption,Format(lisCCOPPUOlderThanCompiler,[#13,MinPPU]),
Result:=MessageDlg(lisCCOWarningCaption,
Format(lisCCOPPUOlderThanCompiler, [LineEnding, MinPPU]),
mtError,[mbIgnore,mbAbort],0);
if Result<>mrIgnore then
exit;

4
ide/checklfmdlg.pas
View File

@ -337,7 +337,7 @@ begin
Continue;
end;
CurMethodName := GlobalDesignHook.GetMethodName(CurMethod, p^.Instance);
s := s + DbgSName(p^.Instance) + ' ' + p^.PropInfo^.Name + '=' + CurMethodName + #13;
s := s + DbgSName(p^.Instance) + ' ' + p^.PropInfo^.Name + '=' + CurMethodName + LineEnding;
end;
//debugln('RemoveDanglingEvents ',s);
@ -346,7 +346,7 @@ begin
MsgResult:=IDEQuestionDialog(lisMissingEvents,
Format(lisTheFollowingMethodsUsedByAreNotInTheSourceRemoveTh, [DbgSName(
RootComponent), #13, PascalBuffer.Filename, #13, #13, s, #13])
RootComponent), LineEnding, PascalBuffer.Filename, LineEnding, LineEnding, s, LineEnding])
,mtConfirmation,
[mrYes, lisRemoveThem, mrIgnore, lisKeepThemAndContinue, mrCancel]);
if MsgResult=mrYes then begin

4
ide/codebrowser.pas
View File

@ -2463,11 +2463,11 @@ begin
end else if NodeData is TCodeBrowserUnit then begin
CurUnit:=TCodeBrowserUnit(NodeData);
if CurUnit.Filename<>'' then
Result:=TVNode.Text+#13+CurUnit.Filename;
Result:=TVNode.Text+LineEnding+CurUnit.Filename;
end else if NodeData is TCodeBrowserNode then begin
Node:=TCodeBrowserNode(NodeData);
if Node.CodePos.Code<>nil then begin
Result:=TVNode.Text+#13+Node.CodePos.Code.Filename;
Result:=TVNode.Text+LineEnding+Node.CodePos.Code.Filename;
Node.CodePos.Code.AbsoluteToLineCol(Node.CodePos.P,Line,Column);
if Line>0 then
Result:=Result+' ('+IntToStr(Line)+','+IntToStr(Column)+')';

9
ide/codehelp.pas
View File

@ -1267,8 +1267,9 @@ begin
, mtError, [mbCancel], 0)
else
MessageDlg(lisLDNoValidFPDocPath,
Format(lisLDDoesNotHaveAnyValidFPDocPathUnableToCreateTheFpdo, [
FPDocPackageName, #13, SrcFilename]), mtError, [mbCancel], 0);
Format(lisLDDoesNotHaveAnyValidFPDocPathUnableToCreateTheFpdo,
[FPDocPackageName, LineEnding, SrcFilename]),
mtError, [mbCancel], 0);
exit;
end;
// fpdoc directory found
@ -1459,8 +1460,8 @@ begin
DebugLn(['TCodeHelpManager.LoadFPDocFile '+ADocFile.DocErrorMsg]);
if not (chofQuiet in Flags) then begin
MessageDlg(lisErrorReadingXML,
Format(lisErrorReadingXmlFile, ['"', CurFilename,
'"', #13, E.Message]), mtError, [mbCancel], 0);
Format(lisErrorReadingXmlFile, ['"', CurFilename, '"', LineEnding, E.Message]),
mtError, [mbCancel], 0);
end;
end;
end;

34
ide/codetoolsdefines.pas
View File

@ -657,7 +657,7 @@ begin
FileTitles[0]:=lisCodeToolsDefscompilerPath;
FileDescs[0]:=Format(
lisCodeToolsDefsThePathToTheFreePascalCompilerForExample, [#13,
lisCodeToolsDefsThePathToTheFreePascalCompilerForExample, [LineEnding,
'"', GetDefaultCompilerFilename, '"', '"', '"']);
FileNames[0]:=DefaultCompiler;
FileFlags[0]:=[iftCmdLine,iftNotEmpty];
@ -706,7 +706,7 @@ begin
FileTitles[1]:=lisCodeToolsDefsCompilerPath;
FileDescs[1]:=Format(
lisCodeToolsDefsThePathToTheFreePascalCompilerForThisSourceUsedToA, [#13]);
lisCodeToolsDefsThePathToTheFreePascalCompilerForThisSourceUsedToA, [LineEnding]);
FileNames[1]:=DefaultCompiler;
FileFlags[1]:=[iftFilename];
@ -779,7 +779,7 @@ begin
FileTitles[0]:=Format(lisCodeToolsDefsdirectory, [DelphiName]);
FileDescs[0]:=Format(lisCodeToolsDefsDelphiMainDirectoryDesc, [DelphiName,
#13, DelphiName, #13, IntToStr(DelphiVersion)]);
LineEnding, DelphiName, LineEnding, IntToStr(DelphiVersion)]);
FileNames[0]:=SetDirSeparators(
'C:/Programme/Borland/Delphi'+IntToStr(DelphiVersion));
FileFlags[0]:=[iftDirectory,iftNotEmpty,iftMustExist];
@ -819,18 +819,15 @@ begin
FileCount:=2;
FileTitles[0]:=Format(lisCodeToolsDefsprojectDirectory2, [DelphiName]);
FileDescs[0]:=Format(lisCodeToolsDefsTheProjectDirectory, [DelphiName, #13]
);
FileDescs[0]:=Format(lisCodeToolsDefsTheProjectDirectory, [DelphiName, LineEnding]);
FileNames[0]:=SetDirSeparators('C:/Programme/Borland/Delphi'
+IntToStr(DelphiVersion)+'/YourProject');
FileFlags[0]:=[iftDirectory,iftNotEmpty,iftMustExist];
FileTitles[1]:=Format(lisCodeToolsDefsdirectory, [DelphiName]);
FileDescs[1]:=Format(lisCodeToolsDefsDelphiMainDirectoryForProject, [
DelphiName, #13, DelphiName, #13, DelphiName, #13, IntToStr(DelphiVersion)
]);
FileNames[1]:=SetDirSeparators('C:/Programme/Borland/Delphi'
+IntToStr(DelphiVersion));
FileDescs[1]:=Format(lisCodeToolsDefsDelphiMainDirectoryForProject, [DelphiName,
LineEnding, DelphiName, LineEnding, DelphiName, LineEnding, IntToStr(DelphiVersion)]);
FileNames[1]:=SetDirSeparators('C:/Programme/Borland/Delphi'+IntToStr(DelphiVersion));
FileFlags[1]:=[iftDirectory,iftNotEmpty,iftMustExist];
EndUpdate;
@ -875,9 +872,8 @@ begin
FileTitles[0]:=Format(lisCodeToolsDefsdirectory, [KylixName]);
FileDescs[0]:=Format(lisCodeToolsDefsKylixMainDirectoryDesc, [KylixName,
#13, KylixName, #13, IntToStr(KylixVersion)]);
FileNames[0]:=SetDirSeparators(
'/home/'+UserName+'/kylix'+IntToStr(KylixVersion));
LineEnding, KylixName, LineEnding, IntToStr(KylixVersion)]);
FileNames[0]:=SetDirSeparators('/home/'+UserName+'/kylix'+IntToStr(KylixVersion));
FileFlags[0]:=[iftDirectory,iftNotEmpty,iftMustExist];
EndUpdate;
@ -913,15 +909,15 @@ begin
FileCount:=2;
FileTitles[0]:=Format(lisCodeToolsDefsprojectDirectory2, [KylixName]);
FileDescs[0]:=Format(lisCodeToolsDefsTheProjectDirectory, [KylixName, #13]
FileDescs[0]:=Format(lisCodeToolsDefsTheProjectDirectory, [KylixName, LineEnding]
);
FileNames[0]:=SetDirSeparators('/home/'+UserName+'/kylix'
+IntToStr(KylixVersion)+'/YourProject');
FileFlags[0]:=[iftDirectory,iftNotEmpty,iftMustExist];
FileTitles[1]:=Format(lisCodeToolsDefsdirectory, [KylixName]);
FileDescs[1]:=Format(lisCodeToolsDefsKylixMainDirectoryForProject, [
KylixName, #13, KylixName, #13, KylixName, #13, IntToStr(KylixVersion)
FileDescs[1]:=Format(lisCodeToolsDefsKylixMainDirectoryForProject, [KylixName,
LineEnding, KylixName, LineEnding, KylixName, LineEnding, IntToStr(KylixVersion)
]);
FileNames[1]:=SetDirSeparators('/home/'+UserName+'/kylix'+IntToStr(KylixVersion));
FileFlags[1]:=[iftDirectory,iftNotEmpty,iftMustExist];
@ -1226,9 +1222,9 @@ begin
end;
if (ParentNode<>nil) and (TDefineTemplate(ParentNode.Data).IsAutoGenerated)
then begin
MessageDlg(lisCodeToolsDefsInvalidParent, Format(
lisCodeToolsDefsAutoCreatedNodesReadOnly, [#13]), mtInformation,
[mbCancel],0);
MessageDlg(lisCodeToolsDefsInvalidParent,
Format(lisCodeToolsDefsAutoCreatedNodesReadOnly, [LineEnding]),
mtInformation, [mbCancel],0);
exit;
end;
if (ParentNode<>nil)

52
ide/customformeditor.pp
View File

@ -351,8 +351,8 @@ Begin
' "'+OldName+':'+OldClassName+'" ',E.Message);
DumpExceptionBackTrace;
MessageDlg(lisCCOErrorCaption,
Format(lisCFEAnExceptionOccuredDuringDeletionOf, [#13, OldName,
OldClassName, #13, E.Message]),
Format(lisCFEAnExceptionOccuredDuringDeletionOf,
[LineEnding, OldName, OldClassName, LineEnding, E.Message]),
mtError,[mbOk],0);
end;
end;
@ -590,8 +590,8 @@ begin
except
on E: Exception do begin
MessageDlg(lisCCOErrorCaption,
Format(lisCFEUnableToClearTheFormEditingSelection, [#13, E.Message]),
mtError, [mbCancel], 0);
Format(lisCFEUnableToClearTheFormEditingSelection, [LineEnding, E.Message]),
mtError, [mbCancel], 0);
end;
end;
ASelection.Free;
@ -990,9 +990,9 @@ begin
DebugLn(['TCustomFormEditor.SaveUnitComponentToBinStream ',E.Message]);
DumpExceptionBackTrace;
Result:=MessageDlg(lisStreamingError,
Format(lisUnableToStreamT, [AnUnitInfo.ComponentName,
AnUnitInfo.ComponentName])+#13
+E.Message,
Format(lisUnableToStreamT,
[AnUnitInfo.ComponentName, AnUnitInfo.ComponentName])+LineEnding
+E.Message,
mtError,[mbAbort, mbRetry, mbIgnore], 0);
if Result=mrAbort then exit;
if Result=mrIgnore then Result:=mrOk;
@ -1188,8 +1188,8 @@ begin
on e: Exception do begin
DumpExceptionBackTrace;
MessageDlg(lisCFEErrorCreatingComponent,
Format(lisCFEErrorCreatingComponent2, [TypeClass.ClassName, #13, E.
Message]),
Format(lisCFEErrorCreatingComponent2,
[TypeClass.ClassName, LineEnding, E.Message]),
mtError,[mbCancel],0);
exit;
end;
@ -1372,8 +1372,8 @@ begin
FreeAndNil(Mediator);
except
on E: Exception do begin
s:=Format(lisCFEErrorDestroyingMediatorOfUnit, [Mediator.ClassName,
AUnitName, #13, E.Message]);
s:=Format(lisCFEErrorDestroyingMediatorOfUnit,
[Mediator.ClassName, AUnitName, LineEnding, E.Message]);
DebugLn(['TCustomFormEditor.CreateComponent ',UTF8ToConsole(s)]);
DumpExceptionBackTrace;
MessageDlg(lisCFEErrorDestroyingMediator, s, mtError, [mbCancel], 0);
@ -1387,8 +1387,8 @@ begin
NewComponent:=nil;
except
on E: Exception do begin
s:=Format(lisCFEErrorDestroyingComponentOfTypeOfUnit, [TypeClass.
ClassName, AUnitName, #13, E.Message]);
s:=Format(lisCFEErrorDestroyingComponentOfTypeOfUnit,
[TypeClass.ClassName, AUnitName, LineEnding, E.Message]);
DebugLn(['TCustomFormEditor.CreateComponent ',UTF8ToConsole(s)]);
DumpExceptionBackTrace;
MessageDlg(lisCFEErrorDestroyingComponent, s, mtError, [mbCancel], 0
@ -1867,16 +1867,16 @@ begin
aMsg:=Format(lisCFERoot, [aMsg, CurReadJITComponent.Name,
CurReadJITComponent.ClassName]);
if CurReadChild<>nil then
aMsg:=Format(lisCFEComponent, [aMsg, #13, CurReadChild.Name, CurReadChild.
ClassName])
aMsg:=Format(lisCFEComponent,
[aMsg, LineEnding, CurReadChild.Name, CurReadChild.ClassName])
else if CurReadChildClass<>nil then
aMsg:=Format(lisCFEComponentClass, [aMsg, #13, CurReadChildClass.ClassName
]);
aMsg:=aMsg+#13+CurReadErrorMsg;
aMsg:=Format(lisCFEComponentClass,
[aMsg, LineEnding, CurReadChildClass.ClassName]);
aMsg:=aMsg+LineEnding+CurReadErrorMsg;
end;
if (Reader<>nil) and (Reader.Driver is TLRSObjectReader) then begin
ErrorBinPos:=TLRSObjectReader(Reader.Driver).Stream.Position;
aMsg:=Format(lisCFEStreamPosition, [aMsg, #13, dbgs(ErrorBinPos)]);
aMsg:=Format(lisCFEStreamPosition, [aMsg, LineEnding, dbgs(ErrorBinPos)]);
end;
case ErrorType of
@ -1886,8 +1886,8 @@ begin
end;
jfeUnknownComponentClass:
begin
aMsg:=Format(lisCFEClassNotFound, [aMsg, #13, JITComponentList.
CurUnknownClass]);
aMsg:=Format(lisCFEClassNotFound,
[aMsg, LineEnding, JITComponentList.CurUnknownClass]);
end;
end;
if Buttons=[mbIgnore,mbCancel] then begin
@ -1937,10 +1937,10 @@ begin
LFMFilename:=ChangeFileExt(TUnitInfo(List.ContextObject).Filename,'.lfm');
end;
if LFMFilename<>'' then
Msg:=Format(lisCFEInFile, [Msg, LFMFilename, #13]);
Msg:=Format(lisCFEInFile, [Msg, LFMFilename, LineEnding]);
if List.CurReadErrorMsg<>'' then
Msg:=Msg+List.CurReadErrorMsg+#13;
Msg:=Msg+List.CurReadErrorMsg+LineEnding;
if E is EReadError then;
MessageDlg(lisCodeToolsDefsReadError, Msg, mtError, [mbCancel], 0);
end;
@ -1964,7 +1964,8 @@ begin
on E: Exception do begin
DebugLn('TCustomFormEditor.OnDesignerMenuItemClick ERROR on CompEditor.Edit: ',E.Message);
MessageDlg(Format(lisErrorIn, [CompClassName]),
Format(lisCFETheComponentEditorOfClassHasCreatedTheError, [CompClassName, #13, E.Message]),
Format(lisCFETheComponentEditorOfClassHasCreatedTheError,
[CompClassName, LineEnding, E.Message]),
mtError,[mbOk],0);
end;
end;
@ -1974,7 +1975,8 @@ begin
on E: Exception do begin
DebugLn('TCustomFormEditor.OnDesignerMenuItemClick ERROR on CompEditor.Free: ',E.Message);
MessageDlg(Format(lisErrorIn, [CompClassName]),
Format(lisCFETheComponentEditorOfClassHasCreatedTheError, [CompClassName, #13, E.Message]),
Format(lisCFETheComponentEditorOfClassHasCreatedTheError,
[CompClassName, LineEnding, E.Message]),
mtError,[mbOk],0);
end;
end;

29
ide/debugmanager.pas
View File

@ -663,8 +663,8 @@ begin
then begin
if MessageDlg(lisFileNotFound,
Format(lisTheFileWasNotFoundDoYouWantToLocateItYourself, ['"',
SrcFile, '"', #13, #13, #13])
Format(lisTheFileWasNotFoundDoYouWantToLocateItYourself,
['"', SrcFile, '"', LineEnding, LineEnding, LineEnding])
,mtConfirmation, [mbYes, mbNo], 0) <> mrYes
then Exit;
@ -2052,7 +2052,7 @@ begin
else
if MessageDlg(lisLaunchingApplicationInvalid,
Format(lisTheLaunchingApplicationBundleDoesNotExists,
[LaunchingCmdLine, #13, #13, #13, #13]),
[LaunchingCmdLine, LineEnding, LineEnding, LineEnding, LineEnding]),
mtError, [mbYes, mbNo, mbCancel], 0) = mrYes then
begin
if not BuildBoss.CreateProjectApplicationBundle then Exit;
@ -2074,8 +2074,8 @@ begin
ClearPathAndExe
else begin
MessageDlg(lisLaunchingApplicationInvalid,
Format(lisTheLaunchingApplicationDoesNotExistsOrIsNotExecuta, ['"',
LaunchingCmdLine, '"', #13, #13, #13]),
Format(lisTheLaunchingApplicationDoesNotExistsOrIsNotExecuta,
['"', LaunchingCmdLine, '"', LineEnding, LineEnding, LineEnding]),
mtError, [mbOK],0);
Exit;
end;
@ -2090,7 +2090,7 @@ begin
else begin
MessageDlg(lisDebuggerInvalid,
Format(lisTheDebuggerDoesNotExistsOrIsNotExecutableSeeEnviro, ['"',
EnvironmentOptions.DebuggerFilename, '"', #13, #13, #13]),
EnvironmentOptions.DebuggerFilename, '"', LineEnding, LineEnding, LineEnding]),
mtError,[mbOK],0);
Exit;
end;
@ -2197,8 +2197,8 @@ begin
(NewWorkingDir<>'') and (not DirectoryExistsUTF8(NewWorkingDir))
then begin
MessageDlg(lisUnableToRun,
Format(lisTheWorkingDirectoryDoesNotExistPleaseCheckTheWorki, ['"',
NewWorkingDir, '"', #13]),
Format(lisTheWorkingDirectoryDoesNotExistPleaseCheckTheWorki,
['"', NewWorkingDir, '"', LineEnding]),
mtError,[mbCancel],0);
exit;
end;
@ -2208,8 +2208,8 @@ begin
(NewWorkingDir<>'') and (not DirectoryExistsUTF8(NewWorkingDir))
then begin
MessageDlg(lisUnableToRun,
Format(lisTheDestinationDirectoryDoesNotExistPleaseCheckTheP, ['"',
NewWorkingDir, '"', #13]),
Format(lisTheDestinationDirectoryDoesNotExistPleaseCheckTheP,
['"', NewWorkingDir, '"', LineEnding]),
mtError,[mbCancel],0);
exit;
end;
@ -2622,7 +2622,8 @@ begin
or (not FileIsExecutableCached(EnvironmentOptions.GetParsedDebuggerFilename)))
then begin
if IDEQuestionDialog(lisDbgMangNoDebuggerSpecified,
Format(lisDbgMangThereIsNoDebuggerSpecifiedSettingBreakpointsHaveNo, [#13]),
Format(lisDbgMangThereIsNoDebuggerSpecifiedSettingBreakpointsHaveNo,
[LineEnding]),
mtWarning, [mrCancel, mrIgnore, lisDbgMangSetTheBreakpointAnyway])
<>mrIgnore
then
@ -2642,9 +2643,9 @@ begin
or (not FileIsExecutableCached(EnvironmentOptions.GetParsedDebuggerFilename)))
then begin
if IDEQuestionDialog(lisDbgMangNoDebuggerSpecified,
Format(lisDbgMangThereIsNoDebuggerSpecifiedSettingBreakpointsHaveNo, [#13]),
mtWarning, [mrCancel, mrIgnore, lisDbgMangSetTheBreakpointAnyway])
<>mrIgnore
Format(lisDbgMangThereIsNoDebuggerSpecifiedSettingBreakpointsHaveNo,
[LineEnding]),
mtWarning, [mrCancel, mrIgnore, lisDbgMangSetTheBreakpointAnyway])<>mrIgnore
then
exit;
end;

44
ide/dialogprocs.pas
View File

@ -138,8 +138,8 @@ begin
end else begin
DlgButtons:=[mbCancel,mbRetry]+ExtraButtons;
Result:=IDEMessageDialog(lisUnableToRenameFile,
Format(lisUnableToRenameFileTo2, ['"', SrcFilename, '"', #13, '"',
DestFilename, '"']),
Format(lisUnableToRenameFileTo2,
['"', SrcFilename, '"', LineEnding, '"', DestFilename, '"']),
mtError,DlgButtons);
if (Result<>mrRetry) then exit;
end;
@ -155,8 +155,8 @@ begin
if CompareFilenames(SrcFilename,DestFilename)=0 then begin
Result:=mrAbort;
IDEMessageDialog(lisUnableToCopyFile,
Format(lisSourceAndDestinationAreTheSame, [#13, SrcFilename]), mtError, [
mbAbort]);
Format(lisSourceAndDestinationAreTheSame, [LineEnding, SrcFilename]),
mtError, [mbAbort]);
exit;
end;
repeat
@ -165,8 +165,8 @@ begin
end else begin
DlgButtons:=[mbCancel,mbRetry]+ExtraButtons;
Result:=IDEMessageDialog(lisUnableToCopyFile,
Format(lisUnableToCopyFileTo2, ['"', SrcFilename, '"', #13, '"',
DestFilename, '"']),
Format(lisUnableToCopyFileTo2,
['"', SrcFilename, '"', LineEnding, '"', DestFilename, '"']),
mtError,DlgButtons);
if (Result<>mrRetry) then exit;
end;
@ -205,8 +205,8 @@ begin
Result:=mrCancel;
end else begin
ACaption:=lisFileNotText;
AText:=Format(lisFileDoesNotLookLikeATextFileOpenItAnyway2, ['"',
AFilename, '"', #13, #13]);
AText:=Format(lisFileDoesNotLookLikeATextFileOpenItAnyway2,
['"', AFilename, '"', LineEnding, LineEnding]);
Result:=IDEMessageDialogAb(ACaption, AText, mtConfirmation,
[mbOk, mbIgnore],ShowAbort);
end;
@ -297,8 +297,10 @@ begin
Result:=mrOk;
except
on E: Exception do begin
IDEMessageDialog(lisCCOErrorCaption, Format(lisErrorLoadingFrom, [
ListTitle, #13, Filename, #13#13, E.Message]), mtError, [mbOk]);
IDEMessageDialog(lisCCOErrorCaption,
Format(lisErrorLoadingFrom,
[ListTitle, LineEnding, Filename, LineEnding+LineEnding, E.Message]),
mtError, [mbOk]);
end;
end;
end;
@ -315,7 +317,7 @@ begin
except
on E: Exception do begin
IDEMessageDialog(lisCCOErrorCaption, Format(lisErrorSavingTo, [ListTitle,
#13, Filename, #13#13, E.Message]), mtError, [mbOk]);
LineEnding, Filename, LineEnding+LineEnding, E.Message]), mtError, [mbOk]);
end;
end;
end;
@ -345,7 +347,7 @@ begin
Result:=mrCancel;
end else begin
Result:=MessageDlg(lisXMLError,
Format(lisXMLParserErrorInFileError, [Filename, #13, E.Message]),
Format(lisXMLParserErrorInFileError, [Filename, LineEnding, E.Message]),
mtError, [mbCancel], 0);
end;
end;
@ -376,7 +378,7 @@ begin
except
on E: Exception do begin
Result:=MessageDlg(lisXMLError,
Format(lisUnableToWriteXmlStreamToError, [Filename, #13, E.Message]),
Format(lisUnableToWriteXmlStreamToError, [Filename, LineEnding, E.Message]),
mtError, [mbCancel], 0);
end;
end;
@ -440,7 +442,7 @@ begin
// file already exists
if WarnOverwrite then begin
Result:=IDEQuestionDialog(lisOverwriteFile,
Format(lisAFileAlreadyExistsReplaceIt, ['"', AFilename, '"', #13]),
Format(lisAFileAlreadyExistsReplaceIt, ['"', AFilename, '"', LineEnding]),
mtConfirmation,
[mrYes, lisOverwriteFileOnDisk, mbCancel]);
if Result=mrCancel then exit;
@ -513,8 +515,8 @@ begin
TargetFilename:=ReadAllLinks(Filename,true);
if TargetFilename<>Filename then begin
case IDEQuestionDialog(lisFileIsSymlink,
Format(lisTheFileIsASymlinkOpenInstead, ['"', Filename, '"', #13, #13,
'"', TargetFilename, '"']),
Format(lisTheFileIsASymlinkOpenInstead,
['"', Filename, '"', LineEnding, LineEnding, '"', TargetFilename, '"']),
mtConfirmation, [mbYes, lisOpenTarget, mbNo, lisOpenSymlink, mbCancel])
of
mrYes: Filename:=TargetFilename;
@ -624,7 +626,7 @@ begin
except
on E: Exception do begin
Result:=IDEMessageDialog(lisCodeToolsDefsWriteError,
Format(lisWriteErrorFile, [E.Message, #13, Filename, #13, Context]),
Format(lisWriteErrorFile, [E.Message, LineEnding, Filename, LineEnding, Context]),
mtError,[mbAbort]+ErrorButtons);
end;
end;
@ -667,7 +669,7 @@ begin
DebugLn('LFMtoLRSstream ',E.Message);
{$ENDIF}
Result:=IDEMessageDialogAb('Error',
'Error while converting '+LFMFilename+' to '+LRSFilename+':'#13
'Error while converting '+LFMFilename+' to '+LRSFilename+':'+LineEnding
+E.Message,mtError,[mbCancel,mbIgnore],ShowAbort);
exit;
end;
@ -709,7 +711,7 @@ begin
LazarusIDE.DoJumpToCodeToolBossError;
if Ask then begin
Result:=IDEQuestionDialog(lisCCOErrorCaption,
Format(lisTheCodetoolsFoundAnError, [#13, ErrMsg, #13]),
Format(lisTheCodetoolsFoundAnError, [LineEnding, ErrMsg, LineEnding]),
mtWarning, [mrIgnore, lisIgnoreAndContinue, mrAbort]);
if Result=mrIgnore then Result:=mrCancel;
end else begin
@ -719,8 +721,8 @@ end;
procedure NotImplementedDialog(const Feature: string);
begin
IDEMessageDialog(lisNotImplemented, Format(lisNotImplementedYet, [#13, Feature]),
mtError, [mbCancel]);
IDEMessageDialog(lisNotImplemented,
Format(lisNotImplementedYet, [LineEnding, Feature]), mtError, [mbCancel]);
end;
end.

4
ide/emptymethodsdlg.pas
View File

@ -142,8 +142,8 @@ begin
CodeToolBoss.FreeListOfPCodeXYPosition(ListOfPCodeXYPosition);
if ErrMsg<>'' then begin
MessageDlg(lisCCOErrorCaption,
Format(lisEMDUnableToShowEmptyMethodsOfTheCurrentClassBecause, [#13,
ErrMsg]), mtError, [mbCancel], 0);
Format(lisEMDUnableToShowEmptyMethodsOfTheCurrentClassBecause,
[LineEnding, ErrMsg]), mtError, [mbCancel], 0);
end;
end;
end;

2
ide/extractprocdlg.pas
View File

@ -129,7 +129,7 @@ begin
then begin
if CodeToolBoss.ErrorMessage='' then begin
MessageDlg(lisInvalidSelection,
Format(lisThisStatementCanNotBeExtractedPleaseSelectSomeCode, [#13]),
Format(lisThisStatementCanNotBeExtractedPleaseSelectSomeCode, [LineEnding]),
mtInformation,[mbCancel],0);
end;
exit;

14
ide/exttooldialog.pas
View File

@ -312,10 +312,10 @@ begin
if (WorkingDir<>'')
and (not DirPathExists(WorkingDir)) then begin
Result:=IDEMessageDialogAb(lisExtToolFailedToRunTool,
Format(lisExtToolUnableToRunTheTool, ['"', Title, '"', #13,
Format(lisExtToolUnableToRunTheTool, ['"', Title, '"', LineEnding,
Format(lisWorkingDirectoryNotFound, [WorkingDir])]),
mtError,[mbCancel],ShowAbort);
CompileProgress.Ready(lisExtToolUnableToRunTheTool, ['"', Title, '"', #13,
CompileProgress.Ready(lisExtToolUnableToRunTheTool, ['"', Title, '"', LineEnding,
Format(lisWorkingDirectoryNotFound, [WorkingDir])]);
exit;
end;
@ -325,10 +325,10 @@ begin
NewFilename:=FindProgram(Filename,GetCurrentDirUTF8,false);
if NewFilename='' then begin
Result:=IDEMessageDialogAb(lisExtToolFailedToRunTool,
Format(lisExtToolUnableToRunTheTool, ['"', Title, '"', #13,
Format(lisExtToolUnableToRunTheTool, ['"', Title, '"', LineEnding,
Format(lisProgramNotFound, [Filename])]),
mtError,[mbCancel],ShowAbort);
CompileProgress.Ready(lisExtToolUnableToRunTheTool, ['"', Title, '"', #13,
CompileProgress.Ready(lisExtToolUnableToRunTheTool, ['"', Title, '"', LineEnding,
Format(lisProgramNotFound, [Filename])]);
exit;
end;
@ -422,10 +422,10 @@ begin
DebugLn('TExternalToolList.Run ',lisExtToolFailedToRunTool, ' ', E.Message);
DumpExceptionBackTrace;
Result:=IDEMessageDialogAb(lisExtToolFailedToRunTool,
Format(lisExtToolUnableToRunTheTool, ['"', Title, '"', #13, e.Message]
),
Format(lisExtToolUnableToRunTheTool, ['"', Title, '"', LineEnding, e.Message]),
mtError,[mbCancel],ShowAbort);
CompileProgress.Ready(lisExtToolUnableToRunTheTool, ['"', Title, '"', #13, e.Message]);
CompileProgress.Ready(lisExtToolUnableToRunTheTool,
['"', Title, '"', LineEnding, e.Message]);
end;
end;
end;

9
ide/fpdoceditwindow.pas
View File

@ -507,7 +507,7 @@ begin
// the inherited entry already contains a description.
// ask if it should be really replaced
if IDEQuestionDialog(lisCodeHelpConfirmreplace,
GetContextTitle(Element)+' already contains the help:'+#13
GetContextTitle(Element)+' already contains the help:'+LineEnding
+ShortDescr,
mtConfirmation,[mrYes,lisReplace,mrCancel])<>mrYes then exit;
end;
@ -1410,8 +1410,7 @@ var
else
CurName:=Element.ElementName;
MessageDlg(lisCodeToolsDefsWriteError,
Format(lisFPDocErrorWriting, [CurName, #13, Msg]), mtError, [mbCancel],
0);
Format(lisFPDocErrorWriting, [CurName, LineEnding, Msg]), mtError, [mbCancel], 0);
end;
end;
@ -1433,7 +1432,7 @@ var
JumpToError(Item,E.LineCol);
MessageDlg(lisFPDocFPDocSyntaxError,
Format(lisFPDocThereIsASyntaxErrorInTheFpdocElement, [FPDocItemNames
[Item], #13#13, E.Message]), mtError, [mbOk], '');
[Item], LineEnding+LineEnding, E.Message]), mtError, [mbOk], '');
end;
end;
end;
@ -1595,7 +1594,7 @@ begin
//DebugLn(['TFPDocEditForm.CopyFromInheritedButtonClick ']);
if ShortEdit.Text<>'' then begin
if IDEQuestionDialog('Confirm replace',
GetContextTitle(fChain[0])+' already contains the help:'+#13
GetContextTitle(fChain[0])+' already contains the help:'+LineEnding
+ShortEdit.Text,
mtConfirmation,[mrYes,'Replace',mrCancel])<>mrYes then exit;
end;

2
ide/fpdocselectlink.pas
View File

@ -193,7 +193,7 @@ begin
Caption:=lisChooseAFPDocLink;
LinkLabel.Caption:=lisLinkTarget;
LinkLabel.Hint:=Format(lisExamplesIdentifierTMyEnumEnumUnitnameIdentifierPac,
[#13, #13, #13, #13]);
[LineEnding, LineEnding, LineEnding, LineEnding]);
TitleLabel.Caption:=lisTitleLeaveEmptyForDefault;
LinkEdit.Text:='';

2
ide/frames/compiler_other_options.pas
View File

@ -74,7 +74,7 @@ begin
if MessageDlg(lisCOAmbiguousAdditionalCompilerConfigFile,
Format(lisCOClickOKIfAreSureToDoThat,
[BreakString(lisCOWarningTheAdditionalCompilerConfigFileHasTheSameNa,
60, 0), #13#13]), mtWarning, [mbOK, mbCancel], 0) <> mrOk then
60, 0), LineEnding+LineEnding]), mtWarning, [mbOK, mbCancel], 0) <> mrOk then
begin
Result := False;
exit;

17
ide/frames/compiler_path_options.pas
View File

@ -185,7 +185,7 @@ begin
else
Msg:=Format(lisIWonderHowYouDidThatErrorInThe, [EnumToStr(o)]);
end;
Msg:=Msg+#13+FCompilerOpts.ParsedOpts.ParsedErrorMsg+#13
Msg:=Msg+LineEnding+FCompilerOpts.ParsedOpts.ParsedErrorMsg+LineEnding
+lisValue3+dbgstr(FCompilerOpts.ParsedOpts.Values[o].UnparsedValue);
IDEMessageDialog(lisCCOErrorCaption, Msg, mtError, [mbCancel]);
exit;
@ -315,7 +315,7 @@ begin
if System.Pos('*', ExpandedPath) > 0 then
begin
if MessageDlg(lisHint, Format(
lisTheContainsAStarCharacterLazarusUsesThisAsNormalCh, [Context, #13]),
lisTheContainsAStarCharacterLazarusUsesThisAsNormalCh, [Context, LineEnding]),
mtWarning, [mbOK, mbCancel], 0) <> mrOk then
exit;
end;
@ -334,7 +334,7 @@ begin
if not DirPathExistsCached(CurPath) then
begin
if MessageDlg(lisCCOWarningCaption, Format(
lisTheContainsANotExistingDirectory, [Context, #13, CurPath]),
lisTheContainsANotExistingDirectory, [Context, LineEnding, CurPath]),
mtWarning, [mbIgnore, mbCancel], 0) <> mrIgnore then
Exit;
end;
@ -354,8 +354,8 @@ begin
ErrorMsg := SpecialCharsToStr(HasChars);
if ErrorMsg <> '' then
begin
if MessageDlg(lisCCOWarningCaption, Context + #13 + ErrorMsg, mtWarning,
[mbOK, mbCancel], 0) <> mrOk then
if MessageDlg(lisCCOWarningCaption, Context + LineEnding + ErrorMsg,
mtWarning, [mbOK, mbCancel], 0) <> mrOk then
exit;
end;
end;
@ -408,10 +408,9 @@ begin
Duplicates.Delimiter:=#13;
Duplicates.StrictDelimiter:=true;
if IDEQuestionDialog(lisDuplicateSearchPath,
Format(lisTheOtherSourcesContainsADirectoryWhichIsAlreadyInT, [#13#13,
Duplicates.DelimitedText]),
mtError,
[mrCancel, mrYes, lisRemoveThePathsFromOtherSources, 'IsDefault']
Format(lisTheOtherSourcesContainsADirectoryWhichIsAlreadyInT,
[LineEnding+LineEnding, Duplicates.DelimitedText]),
mtError, [mrCancel, mrYes, lisRemoveThePathsFromOtherSources, 'IsDefault']
)=mrYes
then begin
// remove paths from SrcPath

12
ide/frames/files_options.pas
View File

@ -414,8 +414,8 @@ begin
if Quality<>sddqCompatible then
begin
if IDEMessageDialog(lisCCOWarningCaption,
Format(lisTheLazarusDirectoryDoesNotLookCorrect, [NewLazarusDir, #13, Note
]),
Format(lisTheLazarusDirectoryDoesNotLookCorrect,
[NewLazarusDir, LineEnding, Note]),
mtWarning, Buttons)<>mrIgnore
then
exit;
@ -442,8 +442,8 @@ begin
if Quality<>sddqCompatible then
begin
if IDEMessageDialog(lisCCOWarningCaption,
Format(lisTheFPCSourceDirectoryDoesNotLookCorrect, [NewFPCSrcDir, #13,
Note]),
Format(lisTheFPCSourceDirectoryDoesNotLookCorrect,
[NewFPCSrcDir, LineEnding, Note]),
mtWarning, Buttons)<>mrIgnore
then
exit;
@ -466,8 +466,8 @@ begin
if Quality<>sddqCompatible then
begin
if IDEMessageDialog(lisCCOWarningCaption,
Format(lisTheCompilerFileDoesNotLookCorrect, [NewCompilerFilename, #13,
Note]),
Format(lisTheCompilerFileDoesNotLookCorrect,
[NewCompilerFilename, LineEnding, Note]),
mtWarning, Buttons)<>mrIgnore
then
exit;

8
ide/helpfpcmessages.pas
View File

@ -927,10 +927,10 @@ begin
mtInformation,[mbOk]);
end else begin
if IDEQuestionDialog(lisHFMHelpForFreePascalCompilerMessage, FoundComment
+#13#13'There are additional notes for this message on'#13
+URL,
mtInformation,[mrYes,'Open URL',mrClose,'Close'])
=mrYes then begin
+LineEnding+LineEnding+'There are additional notes for this message on'
+LineEnding+URL,
mtInformation,[mrYes,'Open URL',mrClose,'Close'])=mrYes then
begin
if not OpenURL(URL) then
exit(shrViewerError);
end;

3
ide/idehelpmanager.pas
View File

@ -701,7 +701,8 @@ var
begin
debugln(['InvalidPathError Path="',Path,'" Msg="',Msg,'"']);
IDEMessageDialog('Unable to open fpdoc help',
'The fpdoc path "'+Path+'" is invalid.'#13+Msg,mtError,[mbCancel]);
'The fpdoc path "'+Path+'" is invalid.'+LineEnding+Msg,
mtError,[mbCancel]);
end;
var

4
ide/idewindowhelp.pas
View File

@ -133,7 +133,7 @@ begin
end;
except
on E: Exception do begin
MessageDlg('Read error','Error reading file '+Filename+#13+E.Message,
MessageDlg('Read error','Error reading file '+Filename+LineEnding+E.Message,
mtError,[mbOk],0);
end;
end;
@ -157,7 +157,7 @@ begin
end;
except
on E: Exception do begin
MessageDlg('Write error','Error writing file '+Filename+#13+E.Message,
MessageDlg('Write error','Error writing file '+Filename+LineEnding+E.Message,
mtError,[mbOk],0);
end;
end;

13
ide/imexportcompileropts.pas
View File

@ -112,8 +112,8 @@ begin
on E: Exception do
begin
Result:=MessageDlg(lisIECOErrorLoadingXml,
Format(lisIECOErrorLoadingXmlFile, ['"', Filename, '"', #13, E.Message]
), mtError, [mbCancel], 0);
Format(lisIECOErrorLoadingXmlFile, ['"', Filename, '"', LineEnding, E.Message]),
mtError, [mbCancel], 0);
end;
end;
try
@ -144,8 +144,9 @@ begin
on E: Exception do
begin
Result:=MessageDlg(lisIECOErrorAccessingXml,
Format(lisIECOErrorAccessingXmlFile, ['"', Filename, '"', #13,
E.Message]), mtError, [mbCancel], 0);
Format(lisIECOErrorAccessingXmlFile,
['"', Filename, '"', LineEnding, E.Message]),
mtError, [mbCancel], 0);
end;
end;
end;
@ -344,8 +345,8 @@ begin
Filename:=AFilename;
if FileExistsUTF8(AFilename) then begin
MsgResult:=MessageDlg(lisIECOExportFileExists,
Format(lisIECOExportFileExistsOpenFileAndReplaceOnlyCompilerOpti, ['"',
AFilename, '"', #13, #13]),
Format(lisIECOExportFileExistsOpenFileAndReplaceOnlyCompilerOpti,
['"', AFilename, '"', LineEnding, LineEnding]),
mtConfirmation,[mbYes,mbCancel],0);
if MsgResult<>mrYes then exit;
end;

6
ide/inputfiledialog.pas
View File

@ -135,9 +135,9 @@ begin
CurEdit.Text:=CurEdit.Text;
if not FilenameIsValidForFileIndex(CurEdit.Text,i) then begin
if IDEMessageDialog(lisA2PInvalidFile,
Format(lisCodeToolsDefsValueIsInvalid, [GetGroupBox(i).Caption, #13,
CurEdit.Text]), mtInformation,
[mbCancel,mbAbort])=mrAbort
Format(lisCodeToolsDefsValueIsInvalid,
[GetGroupBox(i).Caption, LineEnding, CurEdit.Text]),
mtInformation, [mbCancel,mbAbort])=mrAbort
then
ModalResult:=mrCancel
else

4
ide/keymapshortcutdlg.pas
View File

@ -364,8 +364,8 @@ begin
+' ('+KeyAndShiftStateToEditorKeyString(ConflictRelation.ShortcutB);
case IDEMessageDialog(lisPEConflictFound,
Format(lisTheKeyIsAlreadyAssignedToRemoveTheOldAssignmentAnd, [
KeyAndShiftStateToEditorKeyString(Key), #13, ConflictName, #13, #13,
#13, CurName]), mtConfirmation, [mbYes, mbNo, mbCancel])
KeyAndShiftStateToEditorKeyString(Key), LineEnding, ConflictName, LineEnding,
LineEnding, LineEnding, CurName]), mtConfirmation, [mbYes, mbNo, mbCancel])
of
mrYes: Result:=mrOK;
mrCancel: Result:=mrCancel;

8
ide/lazarusidestrconsts.pas
View File

@ -3420,8 +3420,8 @@ resourcestring
lisErrorOpeningComponent = 'Error opening component';
lisUnableToOpenAncestorComponent = 'Unable to open ancestor component';
lisNewDlgPleaseSelectAnItemFirst = 'Please select an item first.';
lisNewDlgCreateANewEditorFileChooseAType = 'Create a new editor file.%'
+'sChoose a type.';
lisNewDlgCreateANewEditorFileChooseAType = 'Create a new editor file.%s'
+'Choose a type.';
lisNewDlgCreateANewProjectChooseAType = 'Create a new project.%sChoose a type.';
lisChooseOneOfTheseItemsToCreateANewFile = 'Choose one of these items to '
+'create a new File';
@ -3724,8 +3724,8 @@ resourcestring
lisPkgMangDeleteOldPackageFile2 = 'Delete old package file %s%s%s?';
lisPkgMangDeleteFailed = 'Delete failed';
lisAmbiguousUnitFound = 'Ambiguous Unit found';
lisTheFileWasFoundInOneOfTheSourceDirectoriesOfThePac = 'The file %s%s%s%'
+'swas found in one of the source directories of the package %s and looks '
lisTheFileWasFoundInOneOfTheSourceDirectoriesOfThePac = 'The file %s%s%s%s'
+'was found in one of the source directories of the package %s and looks '
+'like a compiled unit. Compiled units must be in the output directory of '
+'the package, otherwise other packages can get problems using this '
+'package.%s%sDelete ambiguous file?';

28
ide/lazarusmanager.pas
View File

@ -150,14 +150,14 @@ begin
begin
if FileExistsUTF8(BackupFileName) then
if not DeleteFileUTF8(BackupFileName) then begin
MessageDlg(format('Can''t delete "%s"'#13'%s',
MessageDlg(format('Can''t delete "%s"'+LineEnding+'%s',
[BackupFileName, SysErrorMessageUTF8(GetLastOSError)]),
mtError, [mbOK], 0);
Result := mrAbort;
exit;
end;
if not FileProcs.RenameFileUTF8(CurFilename, BackupFileName) then begin
MessageDlg(format('Can''t rename "%s" to "%s"'#13'%s',
MessageDlg(format('Can''t rename "%s" to "%s"'+LineEnding+'%s',
[CurFilename, BackupFileName, SysErrorMessageUTF8(GetLastOSError)]),
mtError, [mbOK], 0);
Result := mrAbort;
@ -166,7 +166,7 @@ begin
InvalidateFileStateCache;
end;
if not FileProcs.RenameFileUTF8(NewFileName, CurFilename) then begin
MessageDlg(format('Can''t rename "%s" to "%s"'#13'%s',
MessageDlg(format('Can''t rename "%s" to "%s"'+LineEnding+'%s',
[NewFileName, CurFilename, SysErrorMessageUTF8(GetLastOSError)]),
mtError, [mbOK], 0);
Result := mrAbort;
@ -306,15 +306,15 @@ begin
// the custom exe is older => let user choose
MsgResult:=QuestionDlg{NOTE: Do not use IDEQuestionDialog!!!}(
'Multiple lazarus found',
'Which Lazarus should be started?'#13
+#13
+'The system default executable'#13
+DefaultExe+#13
+'(date: '+DateTimeToStr(FileDateToDateTimeDef(FileAgeUTF8(DefaultExe)))+')'#13
+#13
+'Or your custom executable'#13
+CustomExe+#13
+'(date: '+DateTimeToStr(FileDateToDateTimeDef(FileAgeUTF8(CustomExe)))+')'#13
'Which Lazarus should be started?'+LineEnding
+LineEnding
+'The system default executable'+LineEnding
+DefaultExe+LineEnding
+'(date: '+DateTimeToStr(FileDateToDateTimeDef(FileAgeUTF8(DefaultExe)))+')'+LineEnding
+LineEnding
+'Or your custom executable'+LineEnding
+CustomExe+LineEnding
+'(date: '+DateTimeToStr(FileDateToDateTimeDef(FileAgeUTF8(CustomExe)))+')'+LineEnding
,mtConfirmation,
[mrYes,'Start system default',mrNo,'Start my custom',mrAbort],'');
case MsgResult of
@ -332,8 +332,8 @@ begin
// only the custom exists => warn user
MessageDlg('System default is missing',
'The system default lazarus executable "'+DefaultExe+'" is missing, but your custom'
+'executable is still there:'#13
+CustomExe+#13
+'executable is still there:'+LineEnding
+CustomExe+LineEnding
+'This will be started ...'
,mtInformation,[mbOk],0);
FLazarusPath:=CustomExe;

218
ide/main.pp
View File

@ -1345,17 +1345,16 @@ begin
IsUpgrade:=CompareLazarusVersion(NowVer,OldVer)>0;
if OldVer='' then
OldVer:=Format(lisPrior, [GetLazarusVersionString]);
s:=Format(lisWelcomeToLazarusThereIsAlreadyAConfigurationFromVe, [
GetLazarusVersionString, #13, #13, OldVer, #13, GetPrimaryConfigPath, #13]
);
s:=Format(lisWelcomeToLazarusThereIsAlreadyAConfigurationFromVe, [GetLazarusVersionString,
LineEnding, LineEnding, OldVer, LineEnding, GetPrimaryConfigPath, LineEnding] );
if IsUpgrade then
s+=lisTheOldConfigurationWillBeUpgraded
else
s+=lisTheConfigurationWillBeDowngradedConverted;
s+=#13
+#13;
s+=Format(lisIfYouWantToUseTwoDifferentLazarusVersionsYouMustSt, [#13, #13,
#13]);
s+=LineEnding
+LineEnding;
s+=Format(lisIfYouWantToUseTwoDifferentLazarusVersionsYouMustSt,
[LineEnding, LineEnding, LineEnding]);
StartFile:=Application.ExeName;
if StartedByStartLazarus then
StartFile:=ExtractFilePath(StartFile)+'startlazarus'+GetExeExt;
@ -2239,10 +2238,10 @@ procedure TMainIDE.SetupStartProject;
begin
debugln(['AskIfLoadLastFailingProject START']);
Result:=IDEQuestionDialog(lisOpenProject2,
Format(lisAnErrorOccuredAtLastStartupWhileLoadingLoadThisPro, [
EnvironmentOptions.LastSavedProjectFile, #13, #13]), mtWarning,
[mrYes, lisOpenProjectAgain, mrNoToAll, lisStartWithANewProject])=
mrYes;
Format(lisAnErrorOccuredAtLastStartupWhileLoadingLoadThisPro,
[EnvironmentOptions.LastSavedProjectFile, LineEnding, LineEnding]),
mtWarning,
[mrYes, lisOpenProjectAgain, mrNoToAll, lisStartWithANewProject])=mrYes;
debugln(['AskIfLoadLastFailingProject END ',dbgs(Result)]);
end;
@ -4327,7 +4326,7 @@ begin
end else begin
if IDEQuestionDialog(lisFileHasNoProject,
Format(lisTheFileIsNotALazarusProjectCreateANewProjectForThi, [
'"', AFilename, '"', #13, '"'+lowercase(SourceType)+'"']),
'"', AFilename, '"', LineEnding, '"'+lowercase(SourceType)+'"']),
mtConfirmation, [mrYes, lisCreateProject, mrCancel])<>mrYes
then
exit;
@ -4530,8 +4529,8 @@ begin
except
on E:EPOFileError do begin
IDEMessageDialog(lisCCOErrorCaption, Format(lisErrorLoadingFrom,
[ 'Update PO file '+E.POFileName, #13, E.ResFileName, #13#13,
E.Message]), mtError, [mbOk]);
[ 'Update PO file '+E.POFileName, LineEnding, E.ResFileName,
LineEnding+LineEnding, E.Message]), mtError, [mbOk]);
end;
end;
finally
@ -5237,7 +5236,7 @@ var
if not CodeToolBoss.SetApplicationTitleStatement(AProject.MainUnitInfo.Source, NewTitle) then
begin
IDEMessageDialog(lisProjOptsError,
Format(lisUnableToChangeProjectTitleInSource, [#13, CodeToolBoss.
Format(lisUnableToChangeProjectTitleInSource, [LineEnding, CodeToolBoss.
ErrorMessage]),
mtWarning, [mbOk]);
Result := False;
@ -5248,7 +5247,7 @@ var
if not CodeToolBoss.RemoveApplicationTitleStatement(AProject.MainUnitInfo.Source) then
begin
IDEMessageDialog(lisProjOptsError,
Format(lisUnableToRemoveProjectTitleFromSource, [#13, CodeToolBoss.
Format(lisUnableToRemoveProjectTitleFromSource, [LineEnding, CodeToolBoss.
ErrorMessage]),
mtWarning, [mbOk]);
Result := False;
@ -5835,8 +5834,8 @@ begin
NewFilePath:=ExtractFilePath(NewFilename);
if not DirPathExists(NewFilePath) then begin
ACaption:=lisEnvOptDlgDirectoryNotFound;
AText:=Format(lisTheDestinationDirectoryDoesNotExist, [#13, '"',
NewFilePath, '"']);
AText:=Format(lisTheDestinationDirectoryDoesNotExist,
[LineEnding, '"', NewFilePath, '"']);
Result:=IDEMessageDialogAb(ACaption, AText, mtConfirmation,[mbCancel],CanAbort);
exit;
end;
@ -5884,8 +5883,8 @@ begin
if lowercase(FileWithoutPath)<>FileWithoutPath
then begin
Result:=IDEQuestionDialogAb(lisRenameFile,
Format(lisThisLooksLikeAPascalFileItIsRecommendedToUseLowerC, [
#13, #13]),
Format(lisThisLooksLikeAPascalFileItIsRecommendedToUseLowerC,
[LineEnding, LineEnding]),
mtWarning, [mrYes, lisRenameToLowercase, mrNoToAll, lisKeepName,
mrAbort, lisAbortAll], not CanAbort);
if Result=mrYes then
@ -5903,7 +5902,7 @@ begin
or (CompareFilenames(NewFilename,AFilename)<>0))
and FileExistsUTF8(NewFilename) then begin
ACaption:=lisOverwriteFile;
AText:=Format(lisAFileAlreadyExistsReplaceIt, ['"', NewFilename, '"', #13]);
AText:=Format(lisAFileAlreadyExistsReplaceIt, ['"', NewFilename, '"', LineEnding]);
Result:=IDEQuestionDialogAb(ACaption, AText, mtConfirmation,
[mrYes, lisOverwriteFileOnDisk, mrCancel,
mrAbort, lisAbortAll], not CanAbort);
@ -6149,7 +6148,7 @@ begin
begin
ACaption:=lisResourceSaveError;
AText:=Format(lisUnableToAddResourceHeaderCommentToResourceFile, [
#13, '"', LRSCode.FileName, '"', #13]);
LineEnding, '"', LRSCode.FileName, '"', LineEnding]);
Result:=IDEMessageDialog(ACaption,AText,mtError,[mbIgnore,mbAbort]);
if Result<>mrIgnore then exit;
end;
@ -6158,11 +6157,9 @@ begin
'T'+AnUnitInfo.ComponentName,CompResourceCode)) then
begin
ACaption:=lisResourceSaveError;
AText:=Format(
lisUnableToAddResourceTFORMDATAToResourceFileProbably, [
AnUnitInfo.ComponentName,
#13, '"', LRSCode.FileName, '"', #13]
);
AText:=Format(lisUnableToAddResourceTFORMDATAToResourceFileProbably,
[AnUnitInfo.ComponentName,
LineEnding, '"', LRSCode.FileName, '"', LineEnding] );
Result:=IDEMessageDialog(ACaption, AText, mtError, [mbIgnore, mbAbort]);
if Result<>mrIgnore then exit;
end else begin
@ -6232,7 +6229,7 @@ begin
AText:=Format(
lisUnableToTransformBinaryComponentStreamOfTIntoText, [
AnUnitInfo.ComponentName, AnUnitInfo.ComponentName])
+#13+E.Message;
+LineEnding+E.Message;
Result:=IDEMessageDialog(ACaption, AText, mtError,
[mbAbort, mbRetry, mbIgnore]);
if Result=mrAbort then exit;
@ -6429,8 +6426,8 @@ begin
if SearchDirectoryInSearchPath(OldUnitPath,NewFilePath,1)<1 then begin
//DebugLn('TMainIDE.DoRenameUnit NewFilePath="',NewFilePath,'" OldUnitPath="',OldUnitPath,'"');
if IDEMessageDialog(lisExtendUnitPath,
Format(lisTheDirectoryIsNotYetInTheUnitPathAddIt, ['"', NewFilePath,
'"', #13]),
Format(lisTheDirectoryIsNotYetInTheUnitPathAddIt,
['"', NewFilePath, '"', LineEnding]),
mtConfirmation,[mbYes,mbNo])=mrYes then
begin
Project1.CompilerOptions.OtherUnitFiles:=
@ -6580,7 +6577,7 @@ begin
else
AmbiguousText:=
Format(lisThereAreOtherFilesInTheDirectoryWithTheSameName,
[#13, #13, AmbiguousFiles.Text, #13]);
[LineEnding, LineEnding, AmbiguousFiles.Text, LineEnding]);
Result:=IDEMessageDialog(lisAmbiguousFilesFound, AmbiguousText,
mtWarning,[mbYes,mbNo,mbAbort]);
if Result=mrAbort then exit;
@ -6617,8 +6614,8 @@ begin
Project1.CompilerOptions.GetUnitPath(false),OldFilePath,1)<1)
then begin
if IDEMessageDialog(lisCleanUpUnitPath,
Format(lisTheDirectoryIsNoLongerNeededInTheUnitPathRemoveIt, ['"',
OldFilePath, '"', #13]),
Format(lisTheDirectoryIsNoLongerNeededInTheUnitPathRemoveIt,
['"', OldFilePath, '"', LineEnding]),
mtConfirmation,[mbYes,mbNo])=mrYes then
begin
Project1.CompilerOptions.OtherUnitFiles:=
@ -6723,8 +6720,8 @@ begin
if ofProjectLoading in Flags then begin
// this is a file, that was loaded last time, but was removed from disk
Result:=IDEQuestionDialog(lisFileNotFound,
Format(lisTheFileWasNotFoundIgnoreWillGoOnLoadingTheProject, ['"',
AFilename, '"', #13, #13, #13]),
Format(lisTheFileWasNotFoundIgnoreWillGoOnLoadingTheProject,
['"', AFilename, '"', LineEnding, LineEnding, LineEnding]),
mtError, [mrIgnore, lisSkipFileAndContinueLoading,
mrAbort, lisAbortLoadingProject]);
exit;
@ -6736,16 +6733,16 @@ begin
if ofOnlyIfExists in Flags
then begin
IDEMessageDialog(lisFileNotFound, Format(lisFileNotFound2, ['"', AFilename, '"',
#13]),
mtInformation,[mbCancel]);
IDEMessageDialog(lisFileNotFound,
Format(lisFileNotFound2, ['"', AFilename, '"', LineEnding]),
mtInformation,[mbCancel]);
// cancel loading file
Exit;
end;
if IDEMessageDialog(lisFileNotFound,
Format(lisFileNotFoundDoYouWantToCreateIt, ['"', AFilename, '"', #13, #13])
,mtInformation,[mbYes,mbNo])=mrYes then
Format(lisFileNotFoundDoYouWantToCreateIt, ['"',AFilename,'"',LineEnding,LineEnding]),
mtInformation,[mbYes,mbNo])=mrYes then
begin
// create new file
NewFlags:=[nfOpenInEditor,nfCreateDefaultSrc];
@ -6809,8 +6806,8 @@ begin
exit;
end;
end else begin
AText:=Format(lisTheFileSeemsToBeAProgramCloseCurrentProject, ['"',
AFilename, '"', #13, #13]);
AText:=Format(lisTheFileSeemsToBeAProgramCloseCurrentProject,
['"', AFilename, '"', LineEnding, LineEnding]);
ACaption:=lisProgramDetected;
if IDEMessageDialog(ACaption, AText, mtConfirmation,
[mbYes, mbNo])=mrYes then
@ -7023,7 +7020,7 @@ begin
DumpExceptionBackTrace;
ACaption:=lisFormatError;
AText:=Format(lisUnableToConvertTextFormDataOfFileIntoBinaryStream,
[#13, '"', LFMBuf.Filename, '"', #13, E.Message]);
[LineEnding, '"', LFMBuf.Filename, '"', LineEnding, E.Message]);
Result:=IDEMessageDialog(ACaption, AText, mtError, [mbOk, mbCancel]);
if Result=mrCancel then Result:=mrAbort;
exit;
@ -7166,9 +7163,9 @@ begin
end else if (DescendantClassName<>'')
and (SysUtils.CompareText(AComponentClassName,'TComponent')=0) then begin
// this is not yet implemented
IDEMessageDialog(lisCodeTemplError, Format(
lisUnableToOpenDesignerTheClassDoesNotDescendFromADes, [#13,
DescendantClassName]),
IDEMessageDialog(lisCodeTemplError,
Format(lisUnableToOpenDesignerTheClassDoesNotDescendFromADes,
[LineEnding, DescendantClassName]),
mtError,[mbCancel]);
Result:=false;
exit;
@ -7604,9 +7601,9 @@ var
UsedFilename:=UnitCode.Filename;
Project1.ConvertToLPIFilename(UsedFilename);
TheModalResult:=IDEQuestionDialog(lisCodeTemplError,
Format(lisClassConflictsWithLfmFileTheUnitUsesTheUnitWhic, [#13,
UsingFilename, #13, UsedFilename, #13, AComponentClassName, #13, #13,
#13, AComponentClassName]),
Format(lisClassConflictsWithLfmFileTheUnitUsesTheUnitWhic,
[LineEnding, UsingFilename, LineEnding, UsedFilename, LineEnding,
AComponentClassName, LineEnding, LineEnding, LineEnding, AComponentClassName]),
mtError,
[mrCancel, lisCancelLoadingThisComponent,
mrAbort, lisAbortWholeLoading,
@ -7819,7 +7816,7 @@ begin
// not found => tell the user
Result:=IDEQuestionDialog(lisCodeTemplError,
Format(lisUnableToFindTheComponentClassItIsNotRegisteredViaR, [
AComponentClassName, #13, #13, #13, AnUnitInfo.Filename]),
AComponentClassName, LineEnding, LineEnding, LineEnding, AnUnitInfo.Filename]),
mtError, [mrCancel, lisCancelLoadingThisComponent,
mrAbort, lisAbortWholeLoading,
mrIgnore, lisIgnoreUseTFormAsAncestor]);
@ -8519,7 +8516,7 @@ begin
if (NewProgramName='') or (not IsValidUnitName(NewProgramName)) then begin
Result:=IDEMessageDialog(lisInvalidProjectFilename,
Format(lisisAnInvalidProjectNamePleaseChooseAnotherEGProject, ['"',
SaveDialog.Filename, '"', #13]),
SaveDialog.Filename, '"', LineEnding]),
mtInformation,[mbRetry,mbAbort]);
if Result=mrAbort then exit;
continue; // try again
@ -8553,7 +8550,7 @@ begin
begin
ACaption:=lisChooseADifferentName;
AText:=Format(lisTheProjectInfoFileIsEqualToTheProjectMainSource, [
'"', NewLPIFilename, '"', #13]);
'"', NewLPIFilename, '"', LineEnding]);
Result:=IDEMessageDialog(ACaption, AText, mtError, [mbAbort,mbRetry]);
if Result=mrAbort then exit;
continue; // try again
@ -8565,7 +8562,7 @@ begin
begin
ACaption:=lisUnitIdentifierExists;
AText:=Format(lisThereIsAUnitWithTheNameInTheProjectPleaseChoose, ['"',
NewProgramName, '"', #13]);
NewProgramName, '"', LineEnding]);
Result:=IDEMessageDialog(ACaption,AText,mtError,[mbRetry,mbAbort]);
if Result=mrAbort then exit;
continue; // try again
@ -8587,7 +8584,7 @@ begin
if FileExistsUTF8(NewLPIFilename) then
begin
ACaption:=lisOverwriteFile;
AText:=Format(lisAFileAlreadyExistsReplaceIt, ['"', NewLPIFilename, '"', #13]);
AText:=Format(lisAFileAlreadyExistsReplaceIt, ['"', NewLPIFilename, '"', LineEnding]);
Result:=IDEMessageDialog(ACaption, AText, mtConfirmation, [mbOk, mbCancel]);
if Result=mrCancel then exit;
end
@ -8596,8 +8593,8 @@ begin
if FileExistsUTF8(NewProgramFilename) then
begin
ACaption:=lisOverwriteFile;
AText:=Format(lisAFileAlreadyExistsReplaceIt, ['"', NewProgramFilename,
'"', #13]);
AText:=Format(lisAFileAlreadyExistsReplaceIt,
['"', NewProgramFilename, '"', LineEnding]);
Result:=IDEMessageDialog(ACaption, AText, mtConfirmation,[mbOk,mbCancel]);
if Result=mrCancel then exit;
end;
@ -8643,7 +8640,7 @@ begin
NewBuf := CodeToolBoss.CreateFile(NewProgramFilename);
if NewBuf=nil then begin
Result:=IDEMessageDialog(lisErrorCreatingFile, Format(lisUnableToCreateFile3, [
#13, '"', NewProgramFilename, '"']), mtError, [mbCancel]);
LineEnding, '"', NewProgramFilename, '"']), mtError, [mbCancel]);
exit;
end;
@ -8805,7 +8802,7 @@ begin
mtError,[mbCancel]);
ceCopyFileError:
IDEMessageDialog(lisCopyError2,
Format(lisUnableToCopyFileTo, ['"', ErrorData.Param1, '"', #13, '"',
Format(lisUnableToCopyFileTo, ['"', ErrorData.Param1, '"', LineEnding, '"',
ErrorData.Param1, '"']),
mtError,[mbCancel]);
end;
@ -11544,8 +11541,8 @@ begin
if (not FileUtil.FileIsText(AFilename,FileReadable)) and FileReadable then
begin
ACaption:=lisFileNotText;
AText:=Format(lisFileDoesNotLookLikeATextFileOpenItAnyway, ['"', AFilename,
'"', #13, #13]);
AText:=Format(lisFileDoesNotLookLikeATextFileOpenItAnyway,
['"', AFilename, '"', LineEnding, LineEnding]);
Result:=IDEMessageDialog(ACaption, AText, mtConfirmation, [mbYes, mbAbort]);
if Result=mrAbort then exit;
end;
@ -12104,16 +12101,16 @@ begin
if (TestDir='')
or (not DirPathExists(TestDir)) then begin
if (TestDir<>'') then begin
IDEMessageDialog(lisCCOErrorCaption, Format(
lisTheTestDirectoryCouldNotBeFoundSeeIDEOpt, [
#13, '"', EnvironmentOptions.TestBuildDirectory, '"', #13]), mtError, [
mbCancel]);
IDEMessageDialog(lisCCOErrorCaption,
Format(lisTheTestDirectoryCouldNotBeFoundSeeIDEOpt,
[LineEnding, '"', EnvironmentOptions.TestBuildDirectory, '"', LineEnding]),
mtError, [mbCancel]);
Result:=mrCancel;
exit;
end;
Result:=IDEMessageDialog(lisBuildNewProject,
Format(lisTheProjectMustBeSavedBeforeBuildingIfYouSetTheTest, [#13, #13,
#13]), mtInformation, [mbYes, mbNo]);
Format(lisTheProjectMustBeSavedBeforeBuildingIfYouSetTheTest,
[LineEnding, LineEnding, LineEnding]), mtInformation, [mbYes, mbNo]);
if Result<>mrYes then exit;
Result:=DoSaveAll([sfCheckAmbiguousFiles]);
exit;
@ -12171,8 +12168,8 @@ begin
if not Silent then
begin
MsgResult:=IDEQuestionDialog(lisCCOWarningCaption,
Format(lisTheProjectDoesNotUseTheLCLUnitInterfacesButItSeems, [#13])
, mtWarning, [mrYes, lisAddUnitInterfaces, mrNo, dlgIgnoreVerb,
Format(lisTheProjectDoesNotUseTheLCLUnitInterfacesButItSeems, [LineEnding]),
mtWarning, [mrYes, lisAddUnitInterfaces, mrNo, dlgIgnoreVerb,
mrNoToAll, lisAlwaysIgnore, mrCancel]);
case MsgResult of
mrNo: exit;
@ -12221,7 +12218,7 @@ begin
// reason is not handled
if Quiet then exit(mrCancel);
Result:=IDEMessageDialog('Nothing to do',
'The project''s compiler options has no compile command.'#13
'The project''s compiler options has no compile command.'+LineEnding
+'See Project / Compiler Options ... / Compilation',mtInformation,
[mbCancel,mbIgnore]);
if Result=mrIgnore then
@ -13404,8 +13401,8 @@ begin
end;
if UnitFilename='' then begin
IDEMessageDialog(lisNoPascalFile,
Format(lisUnableToFindPascalUnitPasPpForLfmFile, [#13, '"',
LFMUnitInfo.Filename, '"']),
Format(lisUnableToFindPascalUnitPasPpForLfmFile,
[LineEnding, '"', LFMUnitInfo.Filename, '"']),
mtError,[mbCancel]);
Result:=mrCancel;
exit;
@ -13775,8 +13772,8 @@ begin
// rename unit
if AskUser then begin
Result:=IDEQuestionDialog(lisFileNotLowercase,
Format(lisTheUnitIsNotLowercaseTheFreePascalCompiler, ['"',
OldFilename, '"', #13, #13, #13]),
Format(lisTheUnitIsNotLowercaseTheFreePascalCompiler,
['"', OldFilename, '"', LineEnding, LineEnding, LineEnding]),
mtConfirmation,[mrYes,mrIgnore,lisNo,mrAbort],'');
if Result<>mrYes then exit;
end;
@ -13816,10 +13813,9 @@ begin
if Project1.HasProjectInfoFileChangedOnDisk then begin
if IDEQuestionDialog(lisProjectChangedOnDisk,
Format(lisTheProjectInformationFileHasChangedOnDisk, ['"',
Project1.ProjectInfoFile, '"', #13]), mtConfirmation, [mrYes,
lisReopenProject, mrIgnore], '')
=mrYes
Format(lisTheProjectInformationFileHasChangedOnDisk,
['"', Project1.ProjectInfoFile, '"', LineEnding]),
mtConfirmation, [mrYes, lisReopenProject, mrIgnore], '')=mrYes
then begin
DoOpenProjectFile(Project1.ProjectInfoFile,[]);
end else begin
@ -13906,9 +13902,9 @@ begin
if CompareFilenames(SrcDir,DestDir)=0
then begin
IDEMessageDialog(lisInvalidPublishingDirectory,
Format(lisSourceDirectoryAndDestinationDirectoryAreTheSameMa, ['"',
SrcDir, '"', #13, '"', DestDir, '"', #13, #13, #13, #13, #13]),
mtError, [mbCancel]);
Format(lisSourceDirectoryAndDestinationDirectoryAreTheSameMa, ['"', SrcDir, '"',
LineEnding, '"', DestDir, '"', LineEnding, LineEnding, LineEnding, LineEnding, LineEnding]),
mtError, [mbCancel]);
Result:=mrCancel;
exit;
end;
@ -13935,8 +13931,8 @@ begin
end;
if not FileIsExecutableCached(CmdAfterExe) then begin
IDEMessageDialog(lisCommandAfterInvalid,
Format(lisTheCommandAfterPublishingIsInvalid, [#13, '"', CmdAfterExe,
'"']), mtError, [mbCancel]);
Format(lisTheCommandAfterPublishingIsInvalid,
[LineEnding, '"', CmdAfterExe, '"']), mtError, [mbCancel]);
Result:=mrCancel;
exit;
end;
@ -13946,16 +13942,16 @@ begin
if DirPathExists(DestDir) then begin
// ask user, if destination can be delete
if IDEMessageDialog(lisClearDirectory,
Format(lisInOrderToCreateACleanCopyOfTheProjectPackageAllFil, [#13, #13,
'"', DestDir, '"']), mtConfirmation,
Format(lisInOrderToCreateACleanCopyOfTheProjectPackageAllFil,
[LineEnding, LineEnding, '"', DestDir, '"']), mtConfirmation,
[mbYes,mbNo])<>mrYes
then
exit(mrCancel);
if (not DeleteDirectory(ChompPathDelim(DestDir),true)) then begin
IDEMessageDialog(lisUnableToCleanUpDestinationDirectory,
Format(lisUnableToCleanUpPleaseCheckPermissions, ['"', DestDir, '"', #13]
),
Format(lisUnableToCleanUpPleaseCheckPermissions,
['"', DestDir, '"', LineEnding] ),
mtError,[mbOk]);
Result:=mrCancel;
exit;
@ -14358,7 +14354,7 @@ begin
end else if Filename<>'' then begin
IDEMessageDialog(lisInformation, Format(
lisUnableToFindFileCheckSearchPathInProjectCompilerOption, ['"',
Filename, '"', #13, #13]),
Filename, '"', LineEnding, LineEnding]),
mtInformation,[mbOk]);
end;
end;
@ -14470,7 +14466,7 @@ begin
end else if AFileName<>'' then begin
IDEMessageDialog(lisInformation, Format(
lisUnableToFindFileCheckSearchPathInProjectCompilerOption, ['"',
AFilename, '"', #13, #13]),
AFilename, '"', LineEnding, LineEnding]),
mtInformation,[mbOk]);
end;
end;
@ -14929,7 +14925,7 @@ begin
if ARegComp=nil then begin
IDEMessageDialog(lisClassNotFound,
Format(lisClassIsNotARegisteredComponentClassUnableToPaste, ['"',
NewClassName, '"', #13]),
NewClassName, '"', LineEnding]),
mtError,[mbCancel]);
exit;
end;
@ -14938,7 +14934,7 @@ begin
if (ParentControl=nil) and ARegComp.IsTControl then begin
IDEMessageDialog(lisControlNeedsParent,
Format(lisTheClassIsATControlAndCanNotBePastedOntoANonContro, ['"',
NewClassName, '"', #13]),
NewClassName, '"', LineEnding]),
mtError,[mbCancel]);
exit;
end;
@ -14954,8 +14950,8 @@ begin
except
on E: Exception do begin
IDEMessageDialog(lisConversionError,
Format(lisUnableToConvertComponentTextIntoBinaryFormat, [#13,
E.Message]),
Format(lisUnableToConvertComponentTextIntoBinaryFormat,
[LineEnding, E.Message]),
mtError,[mbCancel]);
exit;
end;
@ -16521,7 +16517,7 @@ begin
// the codetools have calculated the maximum bounds
if (StartCode=EndCode) and (CompareCaret(StartPos,EndPos)=0) then begin
IDEMessageDialog(lisNoStringConstantFound,
Format(lisHintTheMakeResourcestringFunctionExpectsAStringCon, [#13]),
Format(lisHintTheMakeResourcestringFunctionExpectsAStringCon, [LineEnding]),
mtError,[mbCancel]);
exit;
end;
@ -16535,7 +16531,7 @@ begin
or (EndCode<>ActiveUnitInfo.Source)
then begin
IDEMessageDialog(lisNoStringConstantFound, Format(
lisInvalidExpressionHintTheMakeResourcestringFunction, [#13]),
lisInvalidExpressionHintTheMakeResourcestringFunction, [LineEnding]),
mtError,[mbCancel]);
exit;
end;
@ -16555,7 +16551,7 @@ begin
or (CompareCaret(SelectedEndPos,EndPos)<0)
then begin
IDEMessageDialog(lisSelectionExceedsStringConstant,
Format(lisHintTheMakeResourcestringFunctionExpectsAStringCon2, [#13]),
Format(lisHintTheMakeResourcestringFunctionExpectsAStringCon2, [LineEnding]),
mtError,[mbCancel]);
exit;
end;
@ -17159,7 +17155,7 @@ begin
then begin
case IDEQuestionDialog(lisSaveChanges,
Format(lisSaveFileBeforeClosingForm, ['"',
AnUnitInfo.Filename, '"', #13, '"',
AnUnitInfo.Filename, '"', LineEnding, '"',
ADesigner.LookupRoot.Name, '"']),
mtConfirmation,[mrYes,mrNoToAll,lisNo,mrCancel],'') of
mrYes: begin
@ -17193,8 +17189,8 @@ var
if not BossResult then begin
CodeToolBossErrMsg:=CodeToolBoss.ErrorMessage;
DoJumpToCodeToolBossError;
raise Exception.Create(ErrorMsg+#13#13+lisError+CodeToolBossErrMsg
+#13#13+lisSeeMessages);
raise Exception.Create(ErrorMsg+LineEnding+LineEnding+lisError
+CodeToolBossErrMsg+LineEnding+LineEnding+lisSeeMessages);
end;
end;
@ -17425,7 +17421,7 @@ begin
AncestorRoot:=FormEditor1.GetAncestorLookupRoot(AComponent);
if AncestorRoot<>nil then begin
s:=Format(lisTheComponentIsInheritedFromToRenameAnInheritedComp, [dbgsName
(AComponent), dbgsName(AncestorRoot), #13]);
(AComponent), dbgsName(AncestorRoot), LineEnding]);
raise EComponentError.Create(s);
end;
@ -17439,7 +17435,7 @@ begin
BossResult:=CodeToolBoss.RenameForm(ActiveUnitInfo.Source,
AComponent.Name,AComponent.ClassName,
NewName,NewClassName);
ApplyBossResult(Format(lisUnableToRenameFormInSource, [#13]));
ApplyBossResult(lisUnableToRenameFormInSource);
ActiveUnitInfo.ComponentName:=NewName;
// rename form component class
@ -17460,7 +17456,7 @@ begin
BossResult:=CodeToolBoss.RenamePublishedVariable(ActiveUnitInfo.Source,
ADesigner.LookupRoot.ClassName,
AComponent.Name,NewName,AComponent.ClassName,true);
ApplyBossResult(Format(lisUnableToRenameVariableInSource, [#13]));
ApplyBossResult(lisUnableToRenameVariableInSource);
end else begin
RaiseException('TMainIDE.OnDesignerRenameComponent internal error:'+AComponent.Name+':'+AComponent.ClassName);
end;
@ -18179,8 +18175,8 @@ begin
if (not Project1.IsVirtual) then
ShortDir:=CreateRelativePath(ShortDir,Project1.ProjectDirectory);
if IDEMessageDialog(lisAddToUnitSearchPath,
Format(lisTheNewUnitIsNotYetInTheUnitSearchPathAddDirectory, [
#13, CurDirectory]),
Format(lisTheNewUnitIsNotYetInTheUnitSearchPathAddDirectory,
[LineEnding, CurDirectory]),
mtConfirmation,[mbYes,mbNo])=mrYes
then begin
Project1.CompilerOptions.OtherUnitFiles:=
@ -18232,8 +18228,8 @@ begin
if (not Project1.IsVirtual) then
ShortDir:=CreateRelativePath(ShortDir,Project1.ProjectDirectory);
if IDEMessageDialog(lisAddToIncludeSearchPath,
Format(lisTheNewIncludeFileIsNotYetInTheIncludeSearchPathAdd, [#13,
CurDirectory]),
Format(lisTheNewIncludeFileIsNotYetInTheIncludeSearchPathAdd,
[LineEnding, CurDirectory]),
mtConfirmation,[mbYes,mbNo])=mrYes
then begin
Project1.CompilerOptions.IncludePath:=
@ -18768,7 +18764,7 @@ begin
DoJumpToCodeToolBossError;
raise Exception.Create(
lisUnableToRenameMethodPleaseFixTheErrorShownInTheMessag
+#13#13+lisError+ErrorMsg);
+LineEnding+LineEnding+lisError+ErrorMsg);
end;
finally
OpenEditorsOnCodeToolChange:=OldChange;
@ -18782,8 +18778,8 @@ begin
if (not (AParent is TControl))
and (APersistentClass.InheritsFrom(TControl)) then begin
IDEMessageDialog(lisCodeToolsDefsInvalidParent,
Format(lisACanNotHoldTControlsYouCanOnlyPutNonVisualComponen, [
AParent.ClassName, #13]),
Format(lisACanNotHoldTControlsYouCanOnlyPutNonVisualComponen,
[AParent.ClassName, LineEnding]),
mtError,[mbCancel]);
UpdateIDEComponentPalette;
exit;
@ -19420,9 +19416,9 @@ begin
if (PascalReferences<>nil) and (PascalReferences.Count>0) then begin
if Confirm then begin
MsgResult:=IDEQuestionDialog(lisUpdateReferences,
Format(lisTheUnitIsUsedByOtherFilesUpdateReferencesAutomatic, [
OldUnitName, #13]), mtConfirmation,
[mrYes,mrNo,mrYesToAll,mrNoToAll],'');
Format(lisTheUnitIsUsedByOtherFilesUpdateReferencesAutomatic,
[OldUnitName, LineEnding]),
mtConfirmation, [mrYes,mrNo,mrYesToAll,mrNoToAll],'');
case MsgResult of
mrYes: ;
mrYesToAll: EnvironmentOptions.UnitRenameReferencesAction:=urraAlways;

27
ide/mainintf.pas
View File

@ -506,26 +506,23 @@ end;
function TFileDescSimplePascalProgram.GetLocalizedDescription: string;
begin
Result:=Format(lisASimplePascalProgramFileThisCanBeUsedForQuickAndDi, [#13,
#13]);
Result:=Format(lisASimplePascalProgramFileThisCanBeUsedForQuickAndDi,
[LineEnding, LineEnding]);
end;
function TFileDescSimplePascalProgram.CreateSource(const Filename, SourceName,
ResourceName: string): string;
var
LE: String;
begin
LE:=LineEnding;
Result:='program '+SourceName+';'+LE
+LE
+'{$mode objfpc}{$H+}'+LE
+LE
+'uses'+LE
+' Classes, SysUtils;'+LE
+LE
+'begin'+LE
+'end.'+LE
+LE;
Result:='program '+SourceName+';'+LineEnding
+LineEnding
+'{$mode objfpc}{$H+}'+LineEnding
+LineEnding
+'uses'+LineEnding
+' Classes, SysUtils;'+LineEnding
+LineEnding
+'begin'+LineEnding
+'end.'+LineEnding
+LineEnding;
end;
{ TFileDescPascalUnitWithFrame }

14
ide/msgquickfixes.pas
View File

@ -227,7 +227,7 @@ begin
DebugLn('GetMsgLineFilename Msg.Parts=nil');
if not Quiet then begin
MessageDlg(lisCCOErrorCaption,
Format(lisMessageContainsNoFilePositionInformation, [#13, Msg.Msg]),
Format(lisMessageContainsNoFilePositionInformation, [LineEnding, Msg.Msg]),
mtError, [mbCancel], 0);
end;
exit;
@ -246,7 +246,7 @@ begin
DebugLn('GetMsgLineFilename Filename "',Filename,'" not found.');
if not Quiet then begin
MessageDlg(lisCCOErrorCaption,
Format(lisUnableToLoadFile, [#13, Filename]), mtError, [mbCancel], 0);
Format(lisUnableToLoadFile, [LineEnding, Filename]), mtError, [mbCancel], 0);
end;
exit;
end;
@ -936,8 +936,8 @@ begin
if not IsIdentifierInCode(CodeXY.Code,CodeXY.X,CodeXY.Y,Identifier,
Identifier+' not found in '+CodeBuf.Filename
+' at line '+IntToStr(Caret.Y)+', column '+IntToStr(Caret.X)+'.'#13
+'Maybe the message is outdated.')
+' at line '+IntToStr(Caret.Y)+', column '+IntToStr(Caret.X)+'.'
+LineEnding+'Maybe the message is outdated.')
then exit;
if not CodeToolBoss.CreateVariableForIdentifier(CodeXY.Code,CodeXY.X,CodeXY.Y,-1,
@ -1089,7 +1089,7 @@ begin
// check if the variable is at that position
if not IsIdentifierInCode(CodeBuf,Caret.X,Caret.Y,Variable,
Variable+' not found in '+CodeBuf.Filename
+' at line '+IntToStr(Caret.Y)+', column '+IntToStr(Caret.X)+'.'#13
+' at line '+IntToStr(Caret.Y)+', column '+IntToStr(Caret.X)+'.'+LineEnding
+'Maybe the message is outdated.')
then exit;
@ -1150,8 +1150,8 @@ begin
if p<1 then begin
DebugLn(['TQuickFixHint_Hide.Execute failed because invalid line, column']);
MessageDlg(lisCCOErrorCaption,
Format(lisInvalidLineColumnInMessage, [#13, Msg.Msg]), mtError, [
mbCancel], 0);
Format(lisInvalidLineColumnInMessage, [LineEnding, Msg.Msg]),
mtError, [mbCancel], 0);
exit;
end;

4
ide/newdialog.pas
View File

@ -417,9 +417,9 @@ end;
function TNewLazIDEItemCategory.Description: string;
begin
if Name = 'File' then
Result := Format(lisNewDlgCreateANewEditorFileChooseAType, [#13])
Result := Format(lisNewDlgCreateANewEditorFileChooseAType, [LineEnding])
else if Name = 'Project' then
Result := Format(lisNewDlgCreateANewProjectChooseAType, [#13])
Result := Format(lisNewDlgCreateANewProjectChooseAType, [LineEnding])
else
Result := '';
end;

2
ide/outputfilter.pas
View File

@ -1569,7 +1569,7 @@ begin
except
on E: Exception do begin
MsgResult:=IDEMessageDialog('Scanner creation failed',
'Failed to create scanner "'+ScannerName+'":'#13
'Failed to create scanner "'+ScannerName+'":'+LineEnding
+E.Message,
mtError,[mbCancel]);
end;

36
ide/project.pp
View File

@ -2839,8 +2839,8 @@ begin
on E: Exception do begin
DebugLn('Error: ', E.Message);
IDEMessageDialog(lisCodeToolsDefsWriteError,
Format(lisUnableToWriteTheProjectInfoFileError, [#13, '"',
ProjectInfoFile, '"', #13, E.Message])
Format(lisUnableToWriteTheProjectInfoFileError,
[LineEnding, '"', ProjectInfoFile, '"', LineEnding, E.Message])
,mtError,[mbOk]);
Result:=mrCancel;
exit;
@ -2964,8 +2964,8 @@ begin
on E: Exception do begin
DebugLn('ERROR: ',E.Message);
IDEMessageDialog(lisCodeToolsDefsWriteError,
Format(lisUnableToWriteTheProjectSessionFileError, [#13,
ProjectSessionFile, #13, E.Message])
Format(lisUnableToWriteTheProjectSessionFileError,
[LineEnding, ProjectSessionFile, LineEnding, E.Message])
,mtError,[mbOk]);
Result:=mrCancel;
exit;
@ -3361,9 +3361,9 @@ begin
except
on E: Exception do begin
IDEMessageDialog(lisUnableToReadLpi,
Format(lisUnableToReadTheProjectInfoFile, [#13, '"',NewProjectInfoFile, '"'])+#13
+E.Message
,mtError,[mbOk]);
Format(lisUnableToReadTheProjectInfoFile,
[LineEnding, '"',NewProjectInfoFile, '"'])+LineEnding
+E.Message, mtError, [mbOk]);
Result:=mrCancel;
exit;
end;
@ -3388,9 +3388,9 @@ begin
except
on E: Exception do begin
IDEMessageDialog(lisUnableToReadLpi,
Format(lisUnableToReadTheProjectInfoFile, [#13, '"',ProjectInfoFile, '"'])+#13
+E.Message
,mtError,[mbOk]);
Format(lisUnableToReadTheProjectInfoFile,
[LineEnding, '"',ProjectInfoFile, '"'])+LineEnding
+E.Message, mtError, [mbOk]);
Result:=mrCancel;
exit;
end;
@ -3540,10 +3540,10 @@ begin
OnLoadProjectInfo(Self,XMLConfig,true);
end;
except
IDEMessageDialog(lisCCOErrorCaption, Format(
lisUnableToReadTheProjectInfoFile2, [#13, '"',
ProjectInfoFile, '"'])
,mtError,[mbOk]);
IDEMessageDialog(lisCCOErrorCaption,
Format(lisUnableToReadTheProjectInfoFile2,
[LineEnding, '"', ProjectInfoFile, '"']),
mtError,[mbOk]);
Result:=mrCancel;
exit;
end;
@ -5017,8 +5017,8 @@ begin
Result:=mrOk;
end else begin
Result:=IDEMessageDialog(lisPkgMangErrorReadingFile,
Format(lisProjMangUnableToReadStateFileOfProjectError, [StateFile,
IDAsString, #13, E.Message]),
Format(lisProjMangUnableToReadStateFileOfProjectError,
[StateFile, IDAsString, LineEnding, E.Message]),
mtError,[mbAbort]);
end;
exit;
@ -5061,8 +5061,8 @@ begin
except
on E: Exception do begin
Result:=IDEMessageDialog(lisPkgMangErrorWritingFile,
Format(lisProjMangUnableToWriteStateFileForProjectError, [IDAsString,
#13, E.Message]),
Format(lisProjMangUnableToWriteStateFileForProjectError,
[IDAsString, LineEnding, E.Message]),
mtError,[mbAbort,mbCancel]);
exit;
end;

144
ide/projectdefs.pas
View File

@ -1271,13 +1271,13 @@ end;
function TProjectApplicationDescriptor.GetLocalizedDescription: string;
begin
Result:=Format(lisApplicationAGraphicalLclFreepascalProgramTheProgra, [#13]);
Result:=Format(lisApplicationAGraphicalLclFreepascalProgramTheProgra,
[LineEnding+LineEnding]);
end;
function TProjectApplicationDescriptor.InitProject(
AProject: TLazProject): TModalResult;
var
le: string;
NewSource: String;
MainFile: TLazProjectFile;
begin
@ -1292,25 +1292,24 @@ begin
AProject.LoadDefaultIcon;
// create program source
le:=LineEnding;
NewSource:='program Project1;'+le
+le
+'{$mode objfpc}{$H+}'+le
+le
+'uses'+le
+' {$IFDEF UNIX}{$IFDEF UseCThreads}'+le
+' cthreads,'+le
+' {$ENDIF}{$ENDIF}'+le
+' Interfaces, // this includes the LCL widgetset'+le
+' Forms'+le
+' { you can add units after this };'+le
+le
+'begin'+le
+' RequireDerivedFormResource := True;'+le
+' Application.Initialize;'+le
+' Application.Run;'+le
+'end.'+le
+le;
NewSource:='program Project1;'+LineEnding
+LineEnding
+'{$mode objfpc}{$H+}'+LineEnding
+LineEnding
+'uses'+LineEnding
+' {$IFDEF UNIX}{$IFDEF UseCThreads}'+LineEnding
+' cthreads,'+LineEnding
+' {$ENDIF}{$ENDIF}'+LineEnding
+' Interfaces, // this includes the LCL widgetset'+LineEnding
+' Forms'+LineEnding
+' { you can add units after this };'+LineEnding
+LineEnding
+'begin'+LineEnding
+' RequireDerivedFormResource := True;'+LineEnding
+' Application.Initialize;'+LineEnding
+' Application.Run;'+LineEnding
+'end.'+LineEnding
+LineEnding;
AProject.MainFile.SetSourceText(NewSource);
// add lcl pp/pas dirs to source search path
@ -1344,12 +1343,11 @@ end;
function TProjectSimpleProgramDescriptor.GetLocalizedDescription: string;
begin
Result:=Format(lisProgramAFreepascalSimpleProgram, [#13]);
Result:=Format(lisProgramAFreepascalSimpleProgram, [LineEnding+LineEnding]);
end;
function TProjectSimpleProgramDescriptor.InitProject(AProject: TLazProject): TModalResult;
var
le: String;
NewSource: String;
MainFile: TLazProjectFile;
begin
@ -1361,12 +1359,11 @@ begin
AProject.MainFileID:=0;
// create program source
le:=LineEnding;
NewSource:='program Project1;'+le
+le
+'begin'+le
+'end.'+le
+le;
NewSource:='program Project1;'+LineEnding
+LineEnding
+'begin'+LineEnding
+'end.'+LineEnding
+LineEnding;
AProject.MainFile.SetSourceText(NewSource);
AProject.LazCompilerOptions.UnitOutputDirectory:='lib'+PathDelim+'$(TargetCPU)-$(TargetOS)';
@ -1396,12 +1393,12 @@ end;
function TProjectProgramDescriptor.GetLocalizedDescription: string;
begin
Result:=Format(lisProgramAFreepascalProgramTheProgramFileIsAutomatic, [#13]);
Result:=Format(lisProgramAFreepascalProgramTheProgramFileIsAutomatic,
[LineEnding+LineEnding]);
end;
function TProjectProgramDescriptor.InitProject(AProject: TLazProject): TModalResult;
var
le: String;
NewSource: String;
MainFile: TLazProjectFile;
begin
@ -1413,21 +1410,20 @@ begin
AProject.MainFileID:=0;
// create program source
le:=LineEnding;
NewSource:='program Project1;'+le
+le
+'{$mode objfpc}{$H+}'+le
+le
+'uses'+le
+' {$IFDEF UNIX}{$IFDEF UseCThreads}'+le
+' cthreads,'+le
+' {$ENDIF}{$ENDIF}'+le
+' Classes'+le
+' { you can add units after this };'+le
+le
+'begin'+le
+'end.'+le
+le;
NewSource:='program Project1;'+LineEnding
+LineEnding
+'{$mode objfpc}{$H+}'+LineEnding
+LineEnding
+'uses'+LineEnding
+' {$IFDEF UNIX}{$IFDEF UseCThreads}'+LineEnding
+' cthreads,'+LineEnding
+' {$ENDIF}{$ENDIF}'+LineEnding
+' Classes'+LineEnding
+' { you can add units after this };'+LineEnding
+LineEnding
+'begin'+LineEnding
+'end.'+LineEnding
+LineEnding;
AProject.MainFile.SetSourceText(NewSource);
AProject.LazCompilerOptions.UnitOutputDirectory:='lib'+PathDelim+'$(TargetCPU)-$(TargetOS)';
@ -1461,13 +1457,12 @@ end;
function TProjectManualProgramDescriptor.GetLocalizedDescription: string;
begin
Result:=Format(lisCustomProgramAFreepascalProgram, [#13]);
Result:=Format(lisCustomProgramAFreepascalProgram, [LineEnding+LineEnding]);
end;
function TProjectManualProgramDescriptor.InitProject(AProject: TLazProject
): TModalResult;
var
le: string;
NewSource: String;
MainFile: TLazProjectFile;
begin
@ -1480,18 +1475,17 @@ begin
AProject.MainFileID:=0;
// create program source
le:=LineEnding;
NewSource:='program Project1;'+le
+le
+'{$mode objfpc}{$H+}'+le
+le
+'uses'+le
+' Classes, SysUtils'+le
+' { you can add units after this };'+le
+le
+'begin'+le
+'end.'+le
+le;
NewSource:='program Project1;'+LineEnding
+LineEnding
+'{$mode objfpc}{$H+}'+LineEnding
+LineEnding
+'uses'+LineEnding
+' Classes, SysUtils'+LineEnding
+' { you can add units after this };'+LineEnding
+LineEnding
+'begin'+LineEnding
+'end.'+LineEnding
+LineEnding;
AProject.MainFile.SetSourceText(NewSource);
AProject.LazCompilerOptions.Win32GraphicApp:=false;
end;
@ -1530,7 +1524,8 @@ end;
function TProjectConsoleApplicationDescriptor.GetLocalizedDescription: string;
begin
Result:=GetLocalizedName+#13+lisFreepascalProgramUsingTCustomApplicationToEasilyCh;
Result:=GetLocalizedName+LineEnding+LineEnding+
lisFreepascalProgramUsingTCustomApplicationToEasilyCh;
end;
function TProjectConsoleApplicationDescriptor.InitProject(AProject: TLazProject
@ -1700,13 +1695,13 @@ end;
function TProjectLibraryDescriptor.GetLocalizedDescription: string;
begin
Result:= Format(lisLibraryAFreepascalLibraryDllUnderWindowsSoUnderLin, [#13]);
Result:= Format(lisLibraryAFreepascalLibraryDllUnderWindowsSoUnderLin,
[LineEnding+LineEnding]);
end;
function TProjectLibraryDescriptor.InitProject(AProject: TLazProject
): TModalResult;
var
le: String;
NewSource: String;
MainFile: TLazProjectFile;
begin
@ -1719,18 +1714,17 @@ begin
AProject.LazCompilerOptions.ExecutableType:=cetLibrary;
// create program source
le:=LineEnding;
NewSource:='library Project1;'+le
+le
+'{$mode objfpc}{$H+}'+le
+le
+'uses'+le
+' Classes'+le
+' { you can add units after this };'+le
+le
+'begin'+le
+'end.'+le
+le;
NewSource:='library Project1;'+LineEnding
+LineEnding
+'{$mode objfpc}{$H+}'+LineEnding
+LineEnding
+'uses'+LineEnding
+' Classes'+LineEnding
+' { you can add units after this };'+LineEnding
+LineEnding
+'begin'+LineEnding
+'end.'+LineEnding
+LineEnding;
AProject.MainFile.SetSourceText(NewSource);
AProject.LazCompilerOptions.UnitOutputDirectory:='lib'+PathDelim+'$(TargetCPU)-$(TargetOS)';

16
ide/sourceeditor.pp
View File

@ -2863,8 +2863,8 @@ begin
CenterCursor(True);
CenterCursorHoriz(hcmSoftKeepEOL);
AText:=Format(lisUEReplaceThisOccurrenceOfWith, ['"', ASearch, '"', #13, '"',
AReplace, '"']);
AText:=Format(lisUEReplaceThisOccurrenceOfWith,
['"', ASearch, '"', LineEnding, '"', AReplace, '"']);
GetDialogPosition(300,150,X,Y);
a:=MessageDlgPos(AText,mtconfirmation,
@ -5478,18 +5478,18 @@ begin
else
CurResult:=IDEQuestionDialog(lisChangeEncoding,
Format(lisEncodingOfFileOnDiskIsNewEncodingIs, ['"',
SrcEdit.CodeBuffer.Filename, '"', #13, OldEncoding, NewEncoding]),
SrcEdit.CodeBuffer.Filename, '"', LineEnding, OldEncoding, NewEncoding]),
mtConfirmation, [mrOk, lisReopenWithAnotherEncoding, mrCancel], '');
end else begin
if SrcEdit.CodeBuffer.IsVirtual then
CurResult:=IDEQuestionDialog(lisChangeEncoding,
Format(lisEncodingOfFileOnDiskIsNewEncodingIs, ['"',
SrcEdit.CodeBuffer.Filename, '"', #13, OldEncoding, NewEncoding]),
SrcEdit.CodeBuffer.Filename, '"', LineEnding, OldEncoding, NewEncoding]),
mtConfirmation, [mrYes, lisChangeFile, mrCancel], '')
else
CurResult:=IDEQuestionDialog(lisChangeEncoding,
Format(lisEncodingOfFileOnDiskIsNewEncodingIs2, ['"',
SrcEdit.CodeBuffer.Filename, '"', #13, OldEncoding, NewEncoding]),
SrcEdit.CodeBuffer.Filename, '"', LineEnding, OldEncoding, NewEncoding]),
mtConfirmation, [mrYes, lisChangeFile, mrOk,
lisReopenWithAnotherEncoding, mrCancel], '');
end;
@ -5509,8 +5509,8 @@ begin
// reopen with another encoding
if SrcEdit.Modified then begin
if IDEQuestionDialog(lisAbandonChanges,
Format(lisAllYourModificationsToWillBeLostAndTheFileReopened, [
'"', SrcEdit.CodeBuffer.Filename, '"', #13]),
Format(lisAllYourModificationsToWillBeLostAndTheFileReopened,
['"', SrcEdit.CodeBuffer.Filename, '"', LineEnding]),
mtConfirmation,[mbOk,mbAbort],'')<>mrOk
then begin
exit;
@ -7796,7 +7796,7 @@ begin
then begin
{$IFDEF HasMonoSpaceFonts}
DummyResult:=IDEQuestionDialog(lisUEFontWith,
Format(lisUETheCurre, [#13, #13]),
Format(lisUETheCurre, [LineEnding, LineEnding]),
mtWarning, [mrIgnore, mrYesToAll, lisUEDoNotSho]);
{$ELSE}
DummyResult:=mrYesToAll;

4
ideintf/actionseditor.pas
View File

@ -809,8 +809,8 @@ begin
except
on E: Exception do begin
MessageDlg(oisErrorDeletingAction,
Format(oisErrorWhileDeletingAction, [#13, E.Message]), mtError, [mbOk
], 0);
Format(oisErrorWhileDeletingAction, [LineEnding, E.Message]), mtError,
[mbOk], 0);
end;
end;
end;

2
ideintf/componenttreeview.pas
View File

@ -311,7 +311,7 @@ begin
on E: Exception do
MessageDlg(oisError,
Format(oisUnableToChangeParentOfControlToNewParent, ['"',
DbgSName(AControl), '"', '"', DbgSName(AContainer), '"', #13,
DbgSName(AControl), '"', '"', DbgSName(AContainer), '"', LineEnding,
E.Message]), mtError, [mbOk], 0);
end;
if not ok then break;

2
ideintf/graphicpropedit.pas
View File

@ -136,7 +136,7 @@ begin
except
on E: Exception do begin
MessageDlg(oisErrorLoadingImage,
Format(oisErrorLoadingImage2, ['"', FileName, '"', #13, E.Message]),
Format(oisErrorLoadingImage2, ['"', FileName, '"', LineEnding, E.Message]),
mtError, [mbOk], 0);
exit;
end;

2
ideintf/objectinspector.pp
View File

@ -1143,7 +1143,7 @@ begin
TOIHintWindow(FHintWindow).OnMouseDown := @HintMouseDown;
FHIntWindow.Visible := False;
FHintWindow.Caption := 'This is a hint window'#13#10'Neat huh?';
FHintWindow.Caption := 'This is a hint window'+LineEnding+'Neat huh?';
FHintWindow.HideInterval := 4000;
FHintWindow.AutoHide := True;
end

25
ideintf/propedits.pp
View File

@ -2522,12 +2522,11 @@ begin
Result:=oisUnknown;
end;
function TPropertyEditor.GetHint(HintType: TPropEditHint; x, y: integer
): string;
function TPropertyEditor.GetHint(HintType: TPropEditHint; x, y: integer): string;
var
TypeHint: String;
begin
Result := GetName + #13 + oisValue + ' ' + GetVisualValue;
Result := GetName + LineEnding + oisValue + ' ' + GetVisualValue;
case GetPropType^.Kind of
tkInteger : TypeHint:=oisInteger;
tkInt64 : TypeHint:=oisInt64;
@ -2550,7 +2549,7 @@ begin
TypeHint:='';
end;
if TypeHint<>'' then
Result:=Result+#13+TypeHint;
Result:=Result+LineEnding+TypeHint;
end;
function TPropertyEditor.GetDefaultValue: ansistring;
@ -4068,27 +4067,27 @@ begin
if not NewIdentIsMethod then
begin
if MessageDlg(oisIncompatibleIdentifier,
Format(oisTheIdentifierIsNotAMethodPressCancelToUndoPressIgn, ['"',
NewValue, '"', #13, #13]), mtWarning, [mbCancel, mbIgnore], 0)<>
mrIgnore
Format(oisTheIdentifierIsNotAMethodPressCancelToUndoPressIgn,
['"', NewValue, '"', LineEnding, LineEnding]),
mtWarning, [mbCancel, mbIgnore], 0)<>mrIgnore
then
exit;
end;
if not NewMethodIsPublished then
begin
if MessageDlg(oisIncompatibleMethod,
Format(oisTheMethodIsNotPublishedPressCancelToUndoPressIgnor, ['"',
NewValue, '"', #13, #13]), mtWarning, [mbCancel, mbIgnore], 0)<>
mrIgnore
Format(oisTheMethodIsNotPublishedPressCancelToUndoPressIgnor,
['"', NewValue, '"', LineEnding, LineEnding]),
mtWarning, [mbCancel, mbIgnore], 0)<>mrIgnore
then
exit;
end;
if not NewMethodIsCompatible then
begin
if MessageDlg(oisIncompatibleMethod,
Format(oisTheMethodIsIncompatibleToThisEventPressCancelToUnd, ['"',
NewValue, '"', GetName, #13, #13]), mtWarning, [mbCancel, mbIgnore], 0
)<>mrIgnore
Format(oisTheMethodIsIncompatibleToThisEventPressCancelToUnd,
['"', NewValue, '"', GetName, LineEnding, LineEnding]),
mtWarning, [mbCancel, mbIgnore], 0)<>mrIgnore
then
exit;
end;

8
lcl/include/application.inc
View File

@ -1568,10 +1568,10 @@ begin
begin
DisableIdleHandler;
try
MsgResult:=MessageBox(PChar(Format(
rsPressOkToIgnoreAndRiskDataCorruptionPressCancelToK, [Msg, #13#13, #13]
)), PChar(GetTitle),
MB_OKCANCEL + MB_ICONERROR);
MsgResult:=MessageBox(PChar(
Format(rsPressOkToIgnoreAndRiskDataCorruptionPressCancelToK,
[Msg, LineEnding+LineEnding, LineEnding])),
PChar(GetTitle), MB_OKCANCEL + MB_ICONERROR);
finally
EnableIdleHandler;
end;

5
lcl/lazhelphtml.pas
View File

@ -335,8 +335,7 @@ begin
if CommandLine='' then begin
if (HelpDatabases<>nil)
and (CompareText(HelpDatabases.ClassName,'TIDEHelpDatabases')=0) then
ErrMsg:=Format(hhsHelpNoHTMLBrowserFoundPleaseDefineOne,
[ #13])
ErrMsg:=Format(hhsHelpNoHTMLBrowserFoundPleaseDefineOne,[LineEnding])
else
ErrMsg:=hhsHelpNoHTMLBrowserFound;
exit;
@ -380,7 +379,7 @@ begin
Result:=shrSuccess;
except
on E: Exception do begin
ErrMsg:=Format(hhsHelpErrorWhileExecuting, ['"', CommandLine, '"', #13,
ErrMsg:=Format(hhsHelpErrorWhileExecuting, ['"', CommandLine, '"', LineEnding,
E.Message]);
end;
end;

2
lcl/lclrescache.pas
View File

@ -503,7 +503,7 @@ var
Msg: String;
i: Integer;
begin
Msg:='TBlockResourceCache.AddResource Descriptor Already Added '#13;
Msg:='TBlockResourceCache.AddResource Descriptor Already Added '+LineEnding;
for i:=0 to DataSize-1 do
Msg:=Msg+HexStr(ord(PChar(DescPtr)[i]),2);
raise Exception.Create(Msg);

70
packager/adddirtopkgdlg.lfm
View File

@ -14,23 +14,23 @@ object AddDirToPkgDialog: TAddDirToPkgDialog
LCLVersion = '1.1'
object DirGroupBox: TGroupBox
Left = 0
Height = 80
Height = 86
Top = 0
Width = 400
Align = alTop
AutoSize = True
Caption = 'DirGroupBox'
ClientHeight = 62
ClientWidth = 396
ClientHeight = 65
ClientWidth = 392
TabOrder = 0
object DirEdit: TEdit
AnchorSideLeft.Control = DirGroupBox
AnchorSideTop.Control = DirGroupBox
AnchorSideRight.Control = DirButton
Left = 6
Height = 24
Height = 25
Top = 6
Width = 361
Width = 354
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 6
BorderSpacing.Top = 6
@ -42,10 +42,10 @@ object AddDirToPkgDialog: TAddDirToPkgDialog
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = DirGroupBox
AnchorSideRight.Side = asrBottom
Left = 367
Height = 24
Top = 6
Width = 23
Left = 360
Height = 27
Top = 5
Width = 26
Anchors = [akTop, akRight]
AutoSize = True
BorderSpacing.Top = 6
@ -59,9 +59,9 @@ object AddDirToPkgDialog: TAddDirToPkgDialog
AnchorSideTop.Control = DirEdit
AnchorSideTop.Side = asrBottom
Left = 6
Height = 20
Top = 36
Width = 106
Height = 22
Top = 37
Width = 133
BorderSpacing.Around = 6
Caption = 'SubDirCheckBox'
Checked = True
@ -71,20 +71,20 @@ object AddDirToPkgDialog: TAddDirToPkgDialog
end
object IncludeGroupBox: TGroupBox
Left = 0
Height = 106
Top = 80
Height = 118
Top = 86
Width = 400
Align = alTop
AutoSize = True
Caption = 'IncludeGroupBox'
ClientHeight = 88
ClientWidth = 396
ClientHeight = 97
ClientWidth = 392
TabOrder = 1
object IncludeRegExCheckBox: TCheckBox
Left = 6
Height = 20
Top = 36
Width = 384
Height = 22
Top = 41
Width = 380
Align = alClient
BorderSpacing.Around = 6
Caption = 'IncludeRegExCheckBox'
@ -92,9 +92,9 @@ object AddDirToPkgDialog: TAddDirToPkgDialog
end
object IncludeFilterCombobox: TComboBox
Left = 6
Height = 24
Height = 29
Top = 6
Width = 384
Width = 380
Align = alTop
BorderSpacing.Around = 6
ItemHeight = 0
@ -103,9 +103,9 @@ object AddDirToPkgDialog: TAddDirToPkgDialog
end
object OnlyTextCheckBox: TCheckBox
Left = 6
Height = 20
Top = 62
Width = 384
Height = 22
Top = 69
Width = 380
Align = alBottom
BorderSpacing.Around = 6
Caption = 'OnlyTextCheckBox'
@ -116,20 +116,20 @@ object AddDirToPkgDialog: TAddDirToPkgDialog
end
object ExcludeGroupBox: TGroupBox
Left = 0
Height = 80
Top = 186
Height = 90
Top = 204
Width = 400
Align = alTop
AutoSize = True
Caption = 'ExcludeGroupBox'
ClientHeight = 62
ClientWidth = 396
ClientHeight = 69
ClientWidth = 392
TabOrder = 2
object ExcludeRegExCheckBox: TCheckBox
Left = 6
Height = 20
Top = 36
Width = 384
Height = 22
Top = 41
Width = 380
Align = alClient
BorderSpacing.Around = 6
Caption = 'ExcludeRegExCheckBox'
@ -137,9 +137,9 @@ object AddDirToPkgDialog: TAddDirToPkgDialog
end
object ExcludeFilterCombobox: TComboBox
Left = 6
Height = 24
Height = 29
Top = 6
Width = 384
Width = 380
Align = alTop
BorderSpacing.Around = 6
ItemHeight = 0
@ -149,8 +149,8 @@ object AddDirToPkgDialog: TAddDirToPkgDialog
end
object ButtonPanel1: TButtonPanel
Left = 6
Height = 41
Top = 314
Height = 39
Top = 316
Width = 388
OKButton.Name = 'OKButton'
OKButton.DefaultCaption = True

6
packager/adddirtopkgdlg.pas
View File

@ -257,7 +257,7 @@ begin
except
on E: Exception do begin
MessageDlg(lisInvalidFilter,
Format(lisInvalidExpression, [#13, Expr, #13, E.Message]), mtError, [
Format(lisInvalidExpression, [LineEnding, Expr, LineEnding, E.Message]), mtError, [
mbCancel], 0);
end;
end;
@ -274,8 +274,8 @@ begin
except
on E: Exception do begin
MessageDlg(lisInvalidFilter,
Format(lisInvalidExpression, [#13, Expr, #13, E.Message]), mtError, [
mbCancel], 0);
Format(lisInvalidExpression, [LineEnding, Expr, LineEnding, E.Message]),
mtError, [mbCancel], 0);
end;
end;
if not Result then exit;

4
packager/addfiletoapackagedlg.pas
View File

@ -166,8 +166,8 @@ begin
PkgFile:=APackage.FindPkgFile(aFilename,true,false);
if PkgFile<>nil then begin
MessageDlg(lisPkgMangFileIsAlreadyInPackage,
Format(lisAF2PTheFileIsAlreadyInThePackage, ['"', aFilename, '"', #13,
APackage.IDAsString]),
Format(lisAF2PTheFileIsAlreadyInThePackage,
['"', aFilename, '"', LineEnding, APackage.IDAsString]),
mtError,[mbCancel],0);
exit;
end;

34
packager/addtopackagedlg.pas
View File

@ -262,7 +262,7 @@ begin
else begin
IDEMessageDialog(lisA2PInvalidFilename,
Format(lisA2PTheFilenameIsAmbiguousPleaseSpecifiyAFilename,
['"', AFilename, '"', #13]),
['"', AFilename, '"', LineEnding]),
mtError,[mbCancel]);
exit;
end;
@ -300,7 +300,7 @@ begin
if (ifsPartOfProject in IDEFileFlags) then begin
IDEMessageDialog(lisA2PFileIsUsed,
Format(lisA2PTheFileIsPartOfTheCurrentProjectItIsABadIdea,
['"', AFilename, '"', #13]),
['"', AFilename, '"', LineEnding]),
mtError,[mbCancel]);
exit;
end;
@ -340,7 +340,7 @@ begin
// there is already a unit with this name in another package => warn
if IDEMessageDialog(lisA2PUnitnameAlreadyExists,
Format(lisA2PTheUnitnameAlreadyExistsInThePackage,
['"', AnUnitName, '"', #13, PkgFile.LazPackage.IDAsString]),
['"', AnUnitName, '"', LineEnding, PkgFile.LazPackage.IDAsString]),
mtWarning,[mbCancel,mbIgnore])<>mrIgnore then exit;
end;
end;
@ -349,7 +349,7 @@ begin
if IDEComponentPalette.FindComponent(AnUnitName)<>nil then begin
if IDEMessageDialog(lisA2PAmbiguousUnitName,
Format(lisA2PTheUnitNameIsTheSameAsAnRegisteredComponent,
['"', AnUnitName, '"', #13]),
['"', AnUnitName, '"', LineEnding]),
mtWarning,[mbCancel,mbIgnore])<>mrIgnore
then
exit;
@ -390,7 +390,8 @@ begin
if (NewPkgName='') or (not IsValidUnitName(NewPkgName)) then begin
if not Quiet then
IDEMessageDialog(lisProjAddInvalidPackagename,
Format(lisA2PThePackageNameIsInvalidPleaseChooseAnExisting, ['"', NewPkgName, '"', #13]),
Format(lisA2PThePackageNameIsInvalidPleaseChooseAnExisting,
['"', NewPkgName, '"', LineEnding]),
mtError,[mbCancel]);
exit(mrCancel);
end;
@ -413,7 +414,7 @@ begin
if not Quiet then
IDEMessageDialog(lisProjAddPackageNotFound,
Format(lisA2PNoPackageFoundForDependencyPleaseChooseAnExisting,
['"', NewDependency.AsString, '"', #13]),
['"', NewDependency.AsString, '"', LineEnding]),
mtError,[mbCancel]);
exit(mrCancel);
end;
@ -658,8 +659,8 @@ begin
ExtractFileNameOnly(CurParams.UnitFilename))<>0
then begin
if IDEMessageDialog(lisA2PInvalidUnitName,
Format(lisA2PTheUnitNameAndFilenameDiffer, ['"',
CurParams.Unit_Name, '"', #13, '"', CurParams.UnitFilename, '"']),
Format(lisA2PTheUnitNameAndFilenameDiffer, ['"', CurParams.Unit_Name,
'"', LineEnding, '"', CurParams.UnitFilename, '"']),
mtError,[mbIgnore,mbCancel])<>mrIgnore
then begin
FilesListView.Items.Delete(i);
@ -877,7 +878,8 @@ begin
PkgFile:=PackageGraph.FindUnit(LazPackage,Params.AncestorType,true,true);
if PkgFile<>nil then begin
if IDEMessageDialog(lisA2PAmbiguousAncestorType,
Format(lisA2PTheAncestorTypeHasTheSameNameAsTheUnit, ['"',Params.AncestorType, '"', #13, '"', PkgFile.Filename, '"']),
Format(lisA2PTheAncestorTypeHasTheSameNameAsTheUnit, ['"',Params.AncestorType,
'"', LineEnding, '"', PkgFile.Filename, '"']),
mtError,[mbCancel,mbIgnore])<>mrIgnore
then
exit;
@ -887,7 +889,8 @@ begin
PkgFile:=PackageGraph.FindUnit(LazPackage,Params.NewClassName,true,true);
if PkgFile<>nil then begin
if IDEMessageDialog(lisA2PAmbiguousClassName,
Format(lisA2PTheClassNameHasTheSameNameAsTheUnit, ['"',Params.AncestorType, '"', #13, '"', PkgFile.Filename, '"']),
Format(lisA2PTheClassNameHasTheSameNameAsTheUnit, ['"',Params.AncestorType,
'"', LineEnding, '"', PkgFile.Filename, '"']),
mtError,[mbCancel,mbIgnore])<>mrIgnore
then
exit;
@ -897,8 +900,9 @@ begin
PkgComponent:=TPkgComponent(IDEComponentPalette.FindComponent(Params.NewClassname));
if PkgComponent<>nil then begin
if IDEMessageDialog(lisA2PClassNameAlreadyExists,
Format(lisA2PTheClassNameExistsAlreadyInPackageFile, ['"',Params.NewClassName, '"', #13, PkgComponent.PkgFile.LazPackage.IDAsString,
#13, '"', PkgComponent.PkgFile.Filename, '"']),
Format(lisA2PTheClassNameExistsAlreadyInPackageFile, ['"',Params.NewClassName,
'"', LineEnding, PkgComponent.PkgFile.LazPackage.IDAsString,
LineEnding, '"', PkgComponent.PkgFile.Filename, '"']),
mtError,[mbCancel,mbIgnore])<>mrIgnore
then
exit;
@ -951,7 +955,7 @@ begin
begin
IDEMessageDialog(lisProjAddInvalidVersion,
Format(lisA2PTheMinimumVersionIsInvalidPleaseUseTheFormatMajor, ['"',
DependMinVersionEdit.Text, '"', #13, #13]),
DependMinVersionEdit.Text, '"', LineEnding, LineEnding]),
mtError,[mbCancel]);
exit;
end;
@ -963,7 +967,7 @@ begin
begin
IDEMessageDialog(lisProjAddInvalidVersion,
Format(lisA2PTheMaximumVersionIsInvalidPleaseUseTheFormatMajor, ['"',
DependMaxVersionEdit.Text, '"', #13, #13]),
DependMaxVersionEdit.Text, '"', LineEnding, LineEnding]),
mtError,[mbCancel]);
exit;
end;
@ -1345,7 +1349,7 @@ begin
except
on E: Exception do begin
IDEMessageDialog(lisCCOErrorCaption,
Format(lisErrorLoadingFile2, [AFilename, #13, E.Message]), mtError, [
Format(lisErrorLoadingFile2, [AFilename, LineEnding, E.Message]), mtError, [
mbCancel]);
ComponentIconSpeedButton.Glyph.Clear;
FComponentIconFilename:='';

2
packager/brokendependenciesdlg.pas
View File

@ -148,7 +148,7 @@ begin
Parent:=Self;
WordWrap:=true;
Caption:=Format(lisBDDChangingThePackageNameOrVersionBreaksDependencies, [
#13, #13]);
LineEnding, LineEnding]);
end;
DependencyListView:=TListView.Create(Self);

4
packager/frames/package_integration_options.pas
View File

@ -205,8 +205,8 @@ function TPackageIntegrationOptionsFrame.ShowMsgPackageTypeMustBeDesign: boolean
begin
if MessageDlg(lisPckOptsInvalidPackageType,
Format(lisPckOptsThePackageHasTheAutoInstallFlagThisMeans,
['"', FLazPackage.IDAsString, '"', #13, #13]), mtWarning,
[mbIgnore, mbCancel], 0) <> mrIgnore then
['"', FLazPackage.IDAsString, '"', LineEnding, LineEnding]),
mtWarning, [mbIgnore, mbCancel], 0) <> mrIgnore then
begin
Result := True;
PkgTypeRadioGroup.ItemIndex := FStoredPkgType;

10
packager/installpkgsetdlg.pas
View File

@ -1044,8 +1044,9 @@ begin
except
on E: Exception do begin
MessageDlg(lisCodeToolsDefsWriteError,
Format(lisErrorWritingPackageListToFile, [#13, AFilename, #13, E.Message
]), mtError, [mbCancel], 0);
Format(lisErrorWritingPackageListToFile,
[LineEnding, AFilename, LineEnding, E.Message]),
mtError, [mbCancel], 0);
end;
end;
end;
@ -1112,8 +1113,9 @@ begin
except
on E: Exception do begin
MessageDlg(lisCodeToolsDefsReadError,
Format(lisErrorReadingPackageListFromFile, [#13, AFilename, #13,
E.Message]), mtError, [mbCancel], 0);
Format(lisErrorReadingPackageListFromFile,
[LineEnding, AFilename, LineEnding, E.Message]),
mtError, [mbCancel], 0);
end;
end;
end;

21
packager/packageeditor.pas
View File

@ -881,7 +881,8 @@ begin
and (not LazPackage.ReadOnly) and LazPackage.Modified then begin
MsgResult:=MessageDlg(lisPkgMangSavePackage,
Format(lisPckEditPackageHasChangedSavePackage,['"',LazPackage.IDAsString,'"',#13]),
Format(lisPckEditPackageHasChangedSavePackage,
['"',LazPackage.IDAsString,'"',LineEnding]),
mtConfirmation,[mbYes,mbNo,mbAbort],0);
case MsgResult of
mrYes:
@ -959,13 +960,13 @@ begin
s:='';
mt:=mtConfirmation;
if CurFile.FileType=pftMainUnit then begin
s:=Format(lisWarningThisIsTheMainUnitTheNewMainUnitWillBePas, [#13#13,
lowercase(LazPackage.Name)]);
s:=Format(lisWarningThisIsTheMainUnitTheNewMainUnitWillBePas,
[LineEnding+LineEnding, lowercase(LazPackage.Name)]);
mt:=mtWarning;
end;
if MessageDlg(lisPckEditRemoveFile2,
Format(lisPckEditRemoveFileFromPackage, ['"', CurFile.Filename, '"',
#13, '"', LazPackage.IDAsString, '"'])+s,
LineEnding, '"', LazPackage.IDAsString, '"'])+s,
mt,[mbYes,mbNo],0)=mrNo
then
exit;
@ -979,7 +980,7 @@ begin
// confirm deletion
if MessageDlg(lisPckEditRemoveDependency2,
Format(lisPckEditRemoveDependencyFromPackage, ['"',
CurDependency.AsString, '"', #13, '"', LazPackage.IDAsString, '"']),
CurDependency.AsString, '"', LineEnding, '"', LazPackage.IDAsString, '"']),
mtConfirmation,[mbYes,mbNo],0)=mrNo
then
exit;
@ -1122,7 +1123,7 @@ begin
if not NewDependency.MinVersion.ReadString(MinVersionEdit.Text) then begin
MessageDlg(lisPckEditInvalidMinimumVersion,
Format(lisPckEditTheMinimumVersionIsNotAValidPackageVersion, ['"',
MinVersionEdit.Text, '"', #13]),
MinVersionEdit.Text, '"', LineEnding]),
mtError,[mbCancel],0);
exit;
end;
@ -1136,7 +1137,7 @@ begin
if not NewDependency.MaxVersion.ReadString(MaxVersionEdit.Text) then begin
MessageDlg(lisPckEditInvalidMaximumVersion,
Format(lisPckEditTheMaximumVersionIsNotAValidPackageVersion, ['"',
MaxVersionEdit.Text, '"', #13]),
MaxVersionEdit.Text, '"', LineEnding]),
mtError,[mbCancel],0);
exit;
end;
@ -2022,7 +2023,7 @@ begin
then exit;
if MessageDlg(lisPkgEditNewUnitNotInUnitpath,
Format(lisPkgEditTheFileIsCurrentlyNotInTheUnitpathOfThePackage, ['"',
AnUnitFilename, '"', #13, #13, #13, '"', ShortDirectory, '"']),
AnUnitFilename,'"',LineEnding,LineEnding,LineEnding,'"',ShortDirectory,'"']),
mtConfirmation,[mbYes,mbNo],0)<>mrYes
then begin
if IgnoreUnitPaths=nil then
@ -2066,7 +2067,7 @@ begin
then exit;
if MessageDlg(lisPENewFileNotInIncludePath,
Format(lisPETheFileIsCurrentlyNotInTheIncludePathOfThePackageA, [
AnIncludeFile, #13, ShortDirectory]),
AnIncludeFile, LineEnding, ShortDirectory]),
mtConfirmation,[mbYes,mbNo],0)<>mrYes
then begin
if IgnoreIncPaths=nil then
@ -2420,7 +2421,7 @@ begin
if ShouldNotBeInstalled(APackage) then begin
if IDEQuestionDialog(lisNotAnInstallPackage,
Format(lisThePackageDoesNotHaveAnyRegisterProcedureWhichTypi, [APackage.
Name, #13, #13]),
Name, LineEnding, LineEnding]),
mtWarning,
[mrIgnore, lisInstallItILikeTheFat, mrCancel, lisCancel], '')<>mrIgnore
then exit(mrCancel);

37
packager/packagesystem.pas
View File

@ -654,7 +654,7 @@ begin
if Verbose then begin
IDEMessageDialog(lisPkgMangUnableToCreateDirectory,
Format(lisPkgMangUnableToCreateOutputDirectoryForPackage, ['"',
Directory, '"', #13, APackage.IDAsString]),
Directory, '"', LineEnding, APackage.IDAsString]),
mtError,[mbCancel]);
end;
debugln(['TLazPackageGraph.OutputDirectoryIsWritable unable to create directory "',Directory,'"']);
@ -1373,7 +1373,7 @@ begin
if FRegistrationFile=nil then begin
RegistrationError(Format(
lisPkgSysUnitWasNotFoundInTheLpkFileProbablyThisLpkFileWasN, [
FRegistrationUnitName, #13]));
FRegistrationUnitName, LineEnding]));
end else begin
if not (pffReportedAsRemoved in FRegistrationFile.Flags) then begin
RegistrationError(
@ -1469,22 +1469,22 @@ begin
end else begin
ErrorMsg:='Package: "'+FRegistrationPackage.IDAsString+'"';
if FRegistrationPackage.AutoCreated then
ErrorMsg:=Format(lisPkgSysTheLpkFileWasNotFound, [ErrorMsg, #13])
ErrorMsg:=Format(lisPkgSysTheLpkFileWasNotFound, [ErrorMsg, LineEnding])
else
ErrorMsg:=Format(lisPkgSysLPKFilename, [ErrorMsg, #13, '"',
ErrorMsg:=Format(lisPkgSysLPKFilename, [ErrorMsg, LineEnding, '"',
FRegistrationPackage.Filename, '"']);
// current unitname
if FRegistrationUnitName<>'' then
ErrorMsg:=Format(lisPkgSysUnitName, [ErrorMsg, #13, '"',
ErrorMsg:=Format(lisPkgSysUnitName, [ErrorMsg, LineEnding, '"',
FRegistrationUnitName, '"']);
// current file
if FRegistrationFile<>nil then
ErrorMsg:=Format(lisPkgSysFileName, [ErrorMsg, #13, '"',
ErrorMsg:=Format(lisPkgSysFileName, [ErrorMsg, LineEnding, '"',
FRegistrationFile.Filename, '"']);
end;
// append message
if Msg<>'' then
ErrorMsg:=ErrorMsg+#13#13+Msg;
ErrorMsg:=ErrorMsg+LineEnding+LineEnding+Msg;
debugln(['TLazPackageGraph.RegistrationError ',dbgstr(ErrorMsg)]);
if AbortRegistration or QuietRegistration then exit;
@ -1710,7 +1710,7 @@ begin
Dependency.AddToList(FirstAutoInstallDependency,pdlRequires);
if OpenDependency(Dependency,false)<>lprSuccess then begin
IDEMessageDialog(lisPkgMangUnableToLoadPackage,
Format(lisPkgMangUnableToOpenThePackage, ['"', PackageName, '"', #13]),
Format(lisPkgMangUnableToOpenThePackage, ['"', PackageName, '"', LineEnding]),
mtWarning,[mbOk]);
continue;
end;
@ -2684,7 +2684,7 @@ begin
on E: Exception do begin
Result:=IDEMessageDialogAb(lisPkgMangErrorWritingFile,
Format(lisPkgMangUnableToWriteStateFileOfPackageError, ['"', StateFile,
'"', #13, APackage.IDAsString, #13, E.Message]),
'"', LineEnding, APackage.IDAsString, LineEnding, E.Message]),
mtError,[mbCancel],ShowAbort);
exit;
end;
@ -2744,7 +2744,7 @@ begin
end else begin
Result:=IDEMessageDialogAb(lisPkgMangErrorReadingFile,
Format(lisPkgMangUnableToReadStateFileOfPackageError, ['"',
StateFile, '"', #13, APackage.IDAsString, #13, E.Message]),
StateFile, '"', LineEnding, APackage.IDAsString, LineEnding, E.Message]),
mtError,[mbCancel],ShowAbort);
end;
exit;
@ -3437,7 +3437,7 @@ begin
DebugLn(['TLazPackageGraph.CompilePackage ',APackage.IDAsString,' ',e.Message]);
Result:=IDEMessageDialog(lisPkgManginvalidCompilerFilename,
Format(lisPkgMangTheCompilerFileForPackageIsNotAValidExecutable, [
APackage.IDAsString, #13, E.Message]),
APackage.IDAsString, LineEnding, E.Message]),
mtError,[mbCancel,mbAbort]);
exit;
end;
@ -3529,9 +3529,8 @@ begin
// list
MsgResult:=IDEQuestionDialog(lisInstallationFailed,
Format(lisPkgMangThePackageFailedToCompileRemoveItFromTheInstallati,
['"', APackage.IDAsString, '"', #13]), mtConfirmation,
[mrYes, lisRemoveFromInstallList, mrIgnore, lisKeepInInstallList
]);
['"', APackage.IDAsString, '"', LineEnding]), mtConfirmation,
[mrYes, lisRemoveFromInstallList, mrIgnore, lisKeepInInstallList]);
if MsgResult=mrIgnore then
IgnoreQuestions.Add(GetIgnoreIdentifier,iiid24H)
else if MsgResult=mrYes then
@ -3616,7 +3615,7 @@ begin
on E: Exception do begin
Result:=IDEMessageDialog(lisPkgMangErrorWritingFile,
Format(lisPkgMangUnableToWriteStateFileOfPackageError, ['"', TargetCompiledFile,
'"', #13, APackage.IDAsString, #13, E.Message]),
'"', LineEnding, APackage.IDAsString, LineEnding, E.Message]),
mtError,[mbCancel],'');
exit;
end;
@ -4151,7 +4150,7 @@ begin
if FileExistsUTF8(StateFile) and not DeleteFileUTF8(StateFile) then begin
Result:=IDEMessageDialog(lisPkgMangUnableToDeleteFilename,
Format(lisPkgMangUnableToDeleteOldStateFileForPackage, ['"', StateFile,
'"', #13, APackage.IDAsString]),
'"', LineEnding, APackage.IDAsString]),
mtError,[mbCancel,mbAbort]);
exit;
end;
@ -4162,7 +4161,7 @@ begin
if not ForceDirectoriesUTF8(PkgSrcDir) then begin
Result:=IDEMessageDialog(lisPkgMangUnableToCreateDirectory,
Format(lisPkgMangUnableToCreatePackageSourceDirectoryForPackage, ['"',
PkgSrcDir, '"', #13, APackage.IDAsString]),
PkgSrcDir, '"', LineEnding, APackage.IDAsString]),
mtError,[mbCancel,mbAbort]);
exit;
end;
@ -4250,7 +4249,7 @@ var
if not YesToAll then
Result:=IDEMessageDialog(lisAmbiguousUnitFound,
Format(lisTheFileWasFoundInOneOfTheSourceDirectoriesOfThePac, ['"',
AmbiguousFilename, '"', #13, APackage.IDAsString, #13, #13]),
AmbiguousFilename, '"', LineEnding, APackage.IDAsString, LineEnding, LineEnding]),
mtWarning,[mbYes,mbYesToAll,mbNo,mbAbort])
else
Result:=mrYesToAll;
@ -5005,7 +5004,7 @@ begin
// tell the user
CurResult:=IDEQuestionDialog(lisPkgSysPackageFileNotFound,
Format(lisPkgSysThePackageIsInstalledButNoValidPackageFileWasFound, ['"',
BrokenPackage.Name, '"', #13]),
BrokenPackage.Name, '"', LineEnding]),
mtError,[mrOk,mrYesToAll,'Skip these warnings']);
if CurResult=mrYesToAll then
Quiet:=true;

114
packager/pkgmanager.pas
View File

@ -683,8 +683,8 @@ begin
except
on E: Exception do begin
MessageDlg(lisCCOErrorCaption,
Format(lisErrorLoadingFile2, [Params.IconFile, #13, E.Message]), mtError, [
mbCancel], 0);
Format(lisErrorLoadingFile2, [Params.IconFile, LineEnding, E.Message]),
mtError, [mbCancel], 0);
end;
end;
end;
@ -1059,7 +1059,7 @@ begin
if (NewPkgName='') or (not IsValidUnitName(NewPkgName)) then begin
Result:=IDEMessageDialog(lisPkgMangInvalidPackageName,
Format(lisPkgMangThePackageNameIsNotAValidPackageNamePleaseChooseAn, [
'"', NewPkgName, '"', #13]),
'"', NewPkgName, '"', LineEnding]),
mtInformation,[mbRetry,mbAbort]);
if Result=mrAbort then exit;
continue; // try again
@ -1073,8 +1073,8 @@ begin
if EnvironmentOptions.CharcaseFileAction = ccfaAsk then
begin
if IDEMessageDialog(lisPkgMangRenameFileLowercase,
Format(lisPkgMangShouldTheFileRenamedLowercaseTo, [#13, '"',
LowerFilename, '"']),
Format(lisPkgMangShouldTheFileRenamedLowercaseTo,
[LineEnding, '"', LowerFilename, '"']),
mtConfirmation,[mbYes,mbNo])=mrYes
then
NewFileName:=LowerFilename;
@ -1103,7 +1103,7 @@ begin
if ConflictPkg<>nil then begin
Result:=IDEMessageDialog(lisPkgMangPackageNameAlreadyExists,
Format(lisPkgMangThereIsAlreadyAnotherPackageWithTheName, ['"',
NewPkgName, '"', #13, '"', ConflictPkg.IDAsString, '"', #13, '"',
NewPkgName, '"', LineEnding, '"', ConflictPkg.IDAsString, '"', LineEnding, '"',
ConflictPkg.Filename, '"']),
mtInformation,[mbRetry,mbAbort,mbIgnore]);
if Result=mrAbort then exit;
@ -1115,7 +1115,7 @@ begin
and (Project1.ProjectUnitWithFilename(NewMainUnitFileName)<>nil) then begin
Result:=IDEMessageDialog(lisPkgMangFilenameIsUsedByProject,
Format(lisPkgMangTheFileNameIsPartOfTheCurrentProject, ['"',
NewFilename, '"', #13]),
NewFilename, '"', LineEnding]),
mtInformation,[mbRetry,mbAbort]);
if Result=mrAbort then exit;
continue; // try again
@ -1128,8 +1128,8 @@ begin
if PkgFile<>nil then begin
Result:=IDEMessageDialog(lisPkgMangFilenameIsUsedByOtherPackage,
Format(lisPkgMangTheFileNameIsUsedByThePackageInFile, ['"',
NewFilename, '"', #13, '"', PkgFile.LazPackage.IDAsString, '"',
#13, '"', PkgFile.LazPackage.Filename, '"']),
NewFilename, '"', LineEnding, '"', PkgFile.LazPackage.IDAsString, '"',
LineEnding, '"', PkgFile.LazPackage.Filename, '"']),
mtWarning,[mbRetry,mbAbort]);
if Result=mrAbort then exit;
continue; // try again
@ -1250,8 +1250,8 @@ begin
if Dependency.Owner is TProject then begin
MainIDE.DoShowProjectInspector(true);
Result:=IDEMessageDialogAb(lisPkgMangBrokenDependency,
Format(lisPkgMangTheProjectRequiresThePackageButItWasNotFound, [
'"', Dependency.AsString, '"', #13]),
Format(lisPkgMangTheProjectRequiresThePackageButItWasNotFound,
['"', Dependency.AsString, '"', LineEnding]),
mtError,Btns,ShowAbort);
if not ShowAbort then
Result := mrCancel; // User confirmed error, implicitly cancel the action
@ -1287,8 +1287,8 @@ begin
DoShowPackageGraphPathList(PathList);
Result:=IDEMessageDialogAb(lisPkgMangCircularDependencies,
Format(lisPkgMangThePackageIsCompiledAutomaticallyAndItsOutputDirec, [
ConflictPkg.Name, ConflictPkg.GetOutputDirectory, #13#13, #13, #13,
#13]),
ConflictPkg.Name, ConflictPkg.GetOutputDirectory, LineEnding+LineEnding,
LineEnding, LineEnding, LineEnding]),
mtError,Btns,ShowAbort);
if not ShowAbort then
Result := mrCancel; // User confirmed error, implicitly cancel the action
@ -1300,17 +1300,17 @@ begin
PkgFile1,PkgFile2,ConflictPkg)
then begin
if (PkgFile1<>nil) and (PkgFile2<>nil) then begin
s:=Format(lisPkgMangThereAreTwoUnitsWithTheSameName1From2From, [#13,
#13, '"', PkgFile1.Filename, '"', PkgFile1.LazPackage.IDAsString,
#13, '"', PkgFile2.Filename, '"', PkgFile2.LazPackage.IDAsString,
#13, #13]);
s:=Format(lisPkgMangThereAreTwoUnitsWithTheSameName1From2From, [LineEnding,
LineEnding, '"', PkgFile1.Filename, '"', PkgFile1.LazPackage.IDAsString,
LineEnding, '"', PkgFile2.Filename, '"', PkgFile2.LazPackage.IDAsString,
LineEnding, LineEnding]);
end else if (PkgFile1<>nil) and (ConflictPkg<>nil) then begin
s:=Format(lisPkgMangThereIsAUnitWithTheSameNameAsAPackage1From2, [#13,
#13, '"', PkgFile1.Filename, '"', PkgFile1.LazPackage.IDAsString,
#13, '"', ConflictPkg.IDAsString, #13, #13]);
s:=Format(lisPkgMangThereIsAUnitWithTheSameNameAsAPackage1From2, [LineEnding,
LineEnding, '"', PkgFile1.Filename, '"', PkgFile1.LazPackage.IDAsString,
LineEnding, '"', ConflictPkg.IDAsString, LineEnding, LineEnding]);
end else
s:='Internal inconsistency FindAmbiguousUnits: '
+'Please report this bug and how you got here.'#13;
+'Please report this bug and how you got here.'+LineEnding;
Result:=IDEMessageDialogAb(lisPkgMangAmbiguousUnitsFound, Format(
lisPkgMangBothPackagesAreConnectedThisMeansEitherOnePackageU, [s]),
mtError,Btns,ShowAbort);
@ -1324,14 +1324,14 @@ begin
@PackageGraphFindFPCUnit,PkgFile1,ConflictPkg)
then begin
if (ConflictPkg<>nil) then begin
s:=Format(lisPkgMangThereIsAFPCUnitWithTheSameNameAsAPackage, [#13,
#13, '"', ConflictPkg.IDAsString, #13, #13]);
s:=Format(lisPkgMangThereIsAFPCUnitWithTheSameNameAsAPackage, [LineEnding,
LineEnding, '"', ConflictPkg.IDAsString, LineEnding, LineEnding]);
end else if (PkgFile1<>nil) then begin
s:=Format(lisPkgMangThereIsAFPCUnitWithTheSameNameFrom, [#13, #13, '"',
PkgFile1.Filename, '"', PkgFile1.LazPackage.IDAsString, #13, #13]);
s:=Format(lisPkgMangThereIsAFPCUnitWithTheSameNameFrom, [LineEnding, LineEnding, '"',
PkgFile1.Filename, '"', PkgFile1.LazPackage.IDAsString, LineEnding, LineEnding]);
end else
s:='Internal inconsistency FindFPCConflictUnits: '
+'Please report this bug and how you got here.'#13;
+'Please report this bug and how you got here.'+LineEnding;
Result:=IDEMessageDialogAb(lisPkgMangAmbiguousUnitsFound, s,
mtError,Btns,ShowAbort);
if not ShowAbort then
@ -1858,7 +1858,7 @@ begin
if (APackage.Name='') or (not IsValidUnitName(APackage.Name)) then begin
Result:=IDEMessageDialog(lisPkgMangInvalidPackageName2,
Format(lisPkgMangThePackageNameOfTheFileIsInvalid, ['"', APackage.Name,
'"', #13, '"', APackage.Filename, '"']),
'"', LineEnding, '"', APackage.Filename, '"']),
mtError,[mbCancel,mbAbort]);
exit;
end;
@ -1869,8 +1869,8 @@ begin
if not PackageGraph.PackageCanBeReplaced(ConflictPkg,APackage) then begin
Result:=IDEMessageDialog(lisPkgMangPackageConflicts,
Format(lisPkgMangThereIsAlreadyAPackageLoadedFromFile, ['"',
ConflictPkg.IDAsString, '"', #13, '"', ConflictPkg.Filename, '"',
#13, #13]),
ConflictPkg.IDAsString, '"', LineEnding, '"', ConflictPkg.Filename, '"',
LineEnding, LineEnding]),
mtError,[mbCancel,mbAbort]);
exit;
end;
@ -1878,8 +1878,8 @@ begin
if ConflictPkg.Modified and (not ConflictPkg.ReadOnly) then begin
Result:=IDEMessageDialog(lisPkgMangSavePackage,
Format(lisPkgMangLoadingPackageWillReplacePackage, [
APackage.IDAsString, ConflictPkg.IDAsString, #13,
ConflictPkg.Filename, #13, #13, #13, ConflictPkg.Filename]),
APackage.IDAsString, ConflictPkg.IDAsString, LineEnding,
ConflictPkg.Filename, LineEnding, LineEnding, LineEnding, ConflictPkg.Filename]),
mtConfirmation,[mbYes,mbNo,mbCancel,mbAbort]);
if Result=mrNo then Result:=mrOk;
if Result=mrYes then begin
@ -2040,8 +2040,8 @@ begin
AProject.FirstRequiredDependency);
if MissingUnits<>nil then begin
if Interactive then begin
Msg:=Format(lisProbablyYouNeedToInstallSomePackagesForBeforeConti, [#13,
#13, #13, #13, #13, #13, #13, #13, #13]);
Msg:=Format(lisProbablyYouNeedToInstallSomePackagesForBeforeConti, [LineEnding,
LineEnding, LineEnding, LineEnding, LineEnding, LineEnding, LineEnding]);
PkgList:=TObjectList.Create(false);
try
for i:=0 to MissingUnits.Count-1 do begin
@ -2049,7 +2049,7 @@ begin
if PkgList.IndexOf(PkgFile.LazPackage)<0 then
PkgList.Add(PkgFile.LazPackage);
Msg:=Format(lisUnitInPackage, [Msg, PkgFile.Unit_Name,
PkgFile.LazPackage.IDAsString, #13]);
PkgFile.LazPackage.IDAsString, LineEnding]);
end;
Result:=IDEQuestionDialog(lisPackageNeedsInstallation,
Msg,mtWarning,[mrIgnore,'Continue without install',mrYes,'Install these packages',mrCancel,'Cancel','IsDefault']);
@ -2203,7 +2203,7 @@ begin
then begin
DoQuestionDlg(lisPkgMangInvalidPackageFilename,
Format(lisPkgMangThePackageFileNameInIsNotAValidLazarusPackageName, ['"',
AlternativePkgName, '"', #13, '"', AFilename, '"']));
AlternativePkgName, '"', LineEnding, '"', AFilename, '"']));
RemoveFromRecentList(AFilename,EnvironmentOptions.RecentPackageFiles,rltFile);
SetRecentPackagesMenu;
exit;
@ -2259,7 +2259,7 @@ begin
on E: Exception do begin
DoQuestionDlg(lisPkgMangErrorReadingPackage,
Format(lisPkgUnableToReadPackageFileError, ['"', AFilename, '"',
#13, E.Message]));
LineEnding, E.Message]));
exit;
end;
end;
@ -2271,7 +2271,7 @@ begin
if (SysUtils.CompareText(AlternativePkgName,APackage.Name)<>0) then begin
Result:=IDEMessageDialog(lisPkgMangFilenameDiffersFromPackagename,
Format(lisPkgMangTheFilenameDoesNotCorrespondToThePackage, ['"',
ExtractFileName(AFilename), '"', '"', APackage.Name, '"', #13, '"',
ExtractFileName(AFilename), '"', '"', APackage.Name, '"', LineEnding, '"',
AlternativePkgName, '"']),
mtConfirmation,[mbYes,mbCancel,mbAbort]);
if Result<>mrYes then exit;
@ -2384,7 +2384,7 @@ begin
on E: Exception do begin
Result:=IDEMessageDialog(lisPkgMangErrorWritingPackage,
Format(lisPkgMangUnableToWritePackageToFileError, ['"',
APackage.IDAsString, '"', #13, '"', APackage.Filename, '"', #13,
APackage.IDAsString, '"', LineEnding, '"', APackage.Filename, '"', LineEnding,
E.Message]),
mtError,[mbAbort,mbCancel]);
exit;
@ -2445,10 +2445,10 @@ begin
Msg:=lisPkgMangTheFollowingPackageFailedToLoad
else
Msg:=lisPkgMangTheFollowingPackagesFailedToLoad;
Msg:=Msg+#13#13;
Msg:=Msg+LineEnding+LineEnding;
for i:=0 to Dependencies.Count-1 do begin
ADependency:=TPkgDependency(Dependencies[i]);
Msg:=Msg+ADependency.AsString+#13;
Msg:=Msg+ADependency.AsString+LineEnding;
end;
// give some hints
@ -2855,11 +2855,11 @@ var
if UnitOwner is TProject then begin
PackageAdditions:=Format(
lisPkgMangAddingNewDependencyForProjectPackage, [PackageAdditions,
TProject(UnitOwner).GetTitle, RequiredPackage.Name, #13#13]);
TProject(UnitOwner).GetTitle, RequiredPackage.Name, LineEnding+LineEnding]);
end else if UnitOwner is TLazPackage then begin
PackageAdditions:=Format(
lisPkgMangAddingNewDependencyForPackagePackage, [PackageAdditions,
TLazPackage(UnitOwner).Name, RequiredPackage.Name, #13#13]);
TLazPackage(UnitOwner).Name, RequiredPackage.Name, LineEnding+LineEnding]);
end;
end;
end;
@ -2867,7 +2867,7 @@ var
Msg:='';
if UsesAdditions<>'' then begin
Msg:=Format(lisPkgMangTheFollowingUnitsWillBeAddedToTheUsesSectionOf, [
Msg, #13, UnitFilename, #13, UsesAdditions, #13#13]);
Msg, LineEnding, UnitFilename, LineEnding, UsesAdditions, LineEnding+LineEnding]);
end;
if PackageAdditions<>'' then begin
Msg:=Msg+PackageAdditions;
@ -3465,7 +3465,7 @@ begin
if ActiveUnitInfo.IsPartOfProject then begin
Result:=IDEMessageDialog(lisPkgMangFileIsInProject,
Format(lisPkgMangWarningTheFileBelongsToTheCurrentProject,
['"', Filename, '"', #13])
['"', Filename, '"', LineEnding])
,mtWarning,[mbIgnore,mbCancel]);
if Result<>mrIgnore then exit;
end;
@ -3475,7 +3475,7 @@ begin
if PkgFile<>nil then begin
Result:=IDEMessageDialog(lisPkgMangFileIsAlreadyInPackage,
Format(lisPkgMangTheFileIsAlreadyInThePackage,
['"', Filename, '"', #13, PkgFile.LazPackage.IDAsString]),
['"', Filename, '"', LineEnding, PkgFile.LazPackage.IDAsString]),
mtWarning,[mbIgnore,mbCancel]);
if Result<>mrIgnore then exit;
end;
@ -3649,7 +3649,7 @@ var
begin
Result:=IDEQuestionDialog(lisSuspiciousIncludePath,
Format(lisThePackageAddsThePathToTheIncludePathOfTheIDEThisI, [
APackage.IDAsString, dbgstr(APackage.UsageOptions.IncludePath), #13]
APackage.IDAsString, dbgstr(APackage.UsageOptions.IncludePath), LineEnding]
),
mtWarning, [mrYes, lisContinue, mrYesToAll, lisContinueAndDoNotAskAgain, mrCancel]);
case Result of
@ -3674,7 +3674,7 @@ var
begin
Result:=IDEQuestionDialog(lisSuspiciousUnitPath,
Format(lisThePackageAddsThePathToTheUnitPathOfTheIDEThisIsPr, [
APackage.IDAsString, dbgstr(APackage.UsageOptions.UnitPath), #13]),
APackage.IDAsString, dbgstr(APackage.UsageOptions.UnitPath), LineEnding]),
mtWarning, [mrYes, lisContinue, mrYesToAll, lisContinueAndDoNotAskAgain, mrCancel]);
case Result of
mrYes: ;
@ -3711,7 +3711,7 @@ begin
Include(Btns,mbIgnore);
Result:=IDEMessageDialog(lisPkgMangPackageIsNoDesigntimePackage,
Format(lisPkgMangThePackageIsARuntimeOnlyPackageRuntimeOnlyPackages,
[APackage.IDAsString, #13]),
[APackage.IDAsString, LineEnding]),
mtError,Btns);
if Result<>mrIgnore then exit;
end;
@ -3757,7 +3757,7 @@ begin
s:='';
for i:=0 to PkgList.Count-1 do begin
RequiredPackage:=TLazPackage(PkgList[i]);
s:=s+RequiredPackage.IDAsString+#13;
s:=s+RequiredPackage.IDAsString+LineEnding;
end;
if PkgList.Count=0 then
Msg:=Format(lisPkgMangInstallingThePackageWillAutomaticallyInstallThePac,
@ -3766,7 +3766,7 @@ begin
Msg:=Format(lisPkgMangInstallingThePackageWillAutomaticallyInstallThePac2,
[APackage.IDAsString]);
Result:=IDEMessageDialog(lisPkgMangAutomaticallyInstalledPackages,
Msg+#13+s,mtConfirmation,[mbOk,mbCancel]);
Msg+LineEnding+s,mtConfirmation,[mbOk,mbCancel]);
if Result<>mrOk then exit;
end;
@ -3811,7 +3811,7 @@ begin
// ask user to rebuild Lazarus now
Result:=IDEMessageDialog(lisPkgMangRebuildLazarus,
Format(lisPkgMangThePackageWasMarkedForInstallationCurrentlyLazarus,
['"', APackage.IDAsString, '"', #13, #13, #13]),
['"', APackage.IDAsString, '"', LineEnding, LineEnding, LineEnding]),
mtConfirmation,[mbYes,mbNo]);
if Result<>mrYes then begin
Result:=mrOk;
@ -3842,7 +3842,7 @@ begin
ParentPackage:=TLazPackage(DependencyPath[0]);
Result:=IDEMessageDialogAb(lisPkgMangPackageIsRequired,
Format(lisPkgMangThePackageIsRequiredByWhichIsMarkedForInstallation,
[APackage.IDAsString, ParentPackage.IDAsString, #13]),
[APackage.IDAsString, ParentPackage.IDAsString, LineEnding]),
mtError,[mbCancel],ShowAbort);
exit;
end;
@ -3893,7 +3893,7 @@ begin
// ask user to rebuilt Lazarus now
Result:=IDEMessageDialog(lisPkgMangRebuildLazarus,
Format(lisPkgMangThePackageWasMarkedCurrentlyLazarus,
['"', APackage.IDAsString, '"', #13, #13, #13]),
['"', APackage.IDAsString, '"', LineEnding, LineEnding, LineEnding]),
mtConfirmation,[mbYes,mbNo]);
if Result=mrNo then begin
Result:=mrOk;
@ -4246,7 +4246,7 @@ begin
if not AutoRemove then begin
Result:=IDEMessageDialog(lisProjAddPackageNotFound,
Format(lisPkgMangThePackageIsMarkedForInstallationButCanNotBeFound, [
'"', OldDependency.AsString, '"', #13]),
'"', OldDependency.AsString, '"', LineEnding]),
mtError,[mbYes,mbYesToAll,mbAbort]);
case Result of
mrYes: ;
@ -4299,8 +4299,8 @@ begin
TargetDir:=TrimFilename(TargetDir);
if not ForceDirectory(TargetDir) then begin
Result:=IDEMessageDialog(lisPkgMangUnableToCreateDirectory,
Format(lisPkgMangUnableToCreateTargetDirectoryForLazarus, [#13, '"',
TargetDir, '"', #13]),
Format(lisPkgMangUnableToCreateTargetDirectoryForLazarus, [LineEnding, '"',
TargetDir, '"', LineEnding]),
mtError,[mbCancel,mbAbort]);
exit;
end;
@ -4804,7 +4804,7 @@ end;
function TPackageDescriptorStd.GetLocalizedDescription: string;
begin
Result:=Format(lisNewDlgCreateANewStandardPackageAPackageIsACollectionOfUn,
[#13]);
[LineEnding]);
end;
end.

4
packager/pkgvirtualuniteditor.pas
View File

@ -110,7 +110,7 @@ begin
NewFilenameOnly:=ExtractFilenameOnly(NewFilename);
if CompareText(NewUnitName,NewFilenameOnly)<>0 then begin
MessageDlg(lisPEInvalidUnitname,
Format(lisPVUUnitnameAndFilenameDoNotMatchExampleUnit1PasAndUni, [#13]),
Format(lisPVUUnitnameAndFilenameDoNotMatchExampleUnit1PasAndUni, [LineEnding]),
mtError,[mbCancel],0);
exit;
end;
@ -125,7 +125,7 @@ begin
ConflictUnit:=LazPackage.FindUnit(NewUnitName,true,PkgFile);
if ConflictUnit<>nil then begin
MessageDlg(lisPEConflictFound,
Format(lisPVUThereIsAlreadyAnUnitWithThisNameFile, [#13,
Format(lisPVUThereIsAlreadyAnUnitWithThisNameFile, [LineEnding,
ConflictUnit.Filename]),
mtError,[mbCancel],0);
exit;