paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-01 03:41:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Packager: formatting

Browse Source 
git-svn-id: trunk@32630 -
This commit is contained in:
juha 2011-10-02 22:01:55 +00:00
parent 5f518ef46b
commit a924d60190
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packager/addtopackagedlg.pas
View File

@ -287,7 +287,7 @@ begin
if FilenameIsAbsolute(AFilename) then begin if FilenameIsAbsolute(AFilename) then begin
PkgFile:=LazPackage.FindPkgFile(AFilename,true,false); PkgFile:=LazPackage.FindPkgFile(AFilename,true,false);
if PkgFile<>nil then begin if PkgFile<>nil then begin
Msg:=Format(lisA2PFileAlreadyExistsInThePackage, ['"', AFilename, '"']); Msg:=Format(lisA2PFileAlreadyExistsInThePackage, ['"',AFilename,'"']);
if PkgFile.Filename<>AFilename then if PkgFile.Filename<>AFilename then
Msg:=Format(lisA2PExistingFile, [#13, '"', PkgFile.Filename, '"']); Msg:=Format(lisA2PExistingFile, [#13, '"', PkgFile.Filename, '"']);
MessageDlg(lisA2PFileAlreadyExists, Msg, mtError, [mbCancel], 0); MessageDlg(lisA2PFileAlreadyExists, Msg, mtError, [mbCancel], 0);
@ -333,16 +333,14 @@ begin
// check if unitname already exists in package // check if unitname already exists in package
PkgFile:=LazPackage.FindUnit(AnUnitName,true,PkgFile); PkgFile:=LazPackage.FindUnit(AnUnitName,true,PkgFile);
if PkgFile<>nil then begin if PkgFile<>nil then begin
// a unit with this name already exists in the package // a unit with this name already exists in this package => warn
// => warn
if MessageDlg(lisA2PUnitnameAlreadyExists, if MessageDlg(lisA2PUnitnameAlreadyExists,
Format(lisA2PTheUnitnameAlreadyExistsInThisPackage, ['"',AnUnitName,'"']), Format(lisA2PTheUnitnameAlreadyExistsInThisPackage, ['"',AnUnitName,'"']),
mtError,[mbCancel,mbIgnore],0)<>mrIgnore then exit; mtError,[mbCancel,mbIgnore],0)<>mrIgnore then exit;
end else begin end else begin
PkgFile:=PackageGraph.FindUnit(LazPackage,AnUnitName,true,true); PkgFile:=PackageGraph.FindUnit(LazPackage,AnUnitName,true,true);
if (PkgFile<>nil) and (PkgFile.LazPackage<>LazPackage) then begin if (PkgFile<>nil) and (PkgFile.LazPackage<>LazPackage) then begin
// there is already a unit with this name in another package // there is already a unit with this name in another package => warn
// => warn
if MessageDlg(lisA2PUnitnameAlreadyExists, if MessageDlg(lisA2PUnitnameAlreadyExists,
Format(lisA2PTheUnitnameAlreadyExistsInThePackage, Format(lisA2PTheUnitnameAlreadyExistsInThePackage,
['"', AnUnitName, '"', #13, PkgFile.LazPackage.IDAsString]), ['"', AnUnitName, '"', #13, PkgFile.LazPackage.IDAsString]),
@ -390,8 +388,7 @@ begin
// check packagename // check packagename
if (NewPkgName='') or (not IsValidIdent(NewPkgName)) then begin if (NewPkgName='') or (not IsValidIdent(NewPkgName)) then begin
MessageDlg(lisProjAddInvalidPackagename, MessageDlg(lisProjAddInvalidPackagename,
Format(lisA2PThePackageNameIsInvalidPleaseChooseAnExisting, ['"', Format(lisA2PThePackageNameIsInvalidPleaseChooseAnExisting, ['"', NewPkgName, '"', #13]),
NewPkgName, '"', #13]),
mtError,[mbCancel],0); mtError,[mbCancel],0);
exit; exit;
end; end;
@ -399,8 +396,7 @@ begin
// check if package is already required // check if package is already required
if LazPackage.FindDependencyByName(NewPkgName)<>nil then begin if LazPackage.FindDependencyByName(NewPkgName)<>nil then begin
MessageDlg(lisProjAddDependencyAlreadyExists, MessageDlg(lisProjAddDependencyAlreadyExists,
Format(lisA2PThePackageHasAlreadyADependencyForThe, ['"', NewPkgName, '"'] Format(lisA2PThePackageHasAlreadyADependencyForThe, ['"', NewPkgName, '"']),
),
mtError,[mbCancel],0); mtError,[mbCancel],0);
exit; exit;
end; end;
@ -409,8 +405,8 @@ begin
if not PackageGraph.DependencyExists(NewDependency,fpfSearchAllExisting) if not PackageGraph.DependencyExists(NewDependency,fpfSearchAllExisting)
then begin then begin
MessageDlg(lisProjAddPackageNotFound, MessageDlg(lisProjAddPackageNotFound,
Format(lisA2PNoPackageFoundForDependencyPleaseChooseAnExisting, ['"', Format(lisA2PNoPackageFoundForDependencyPleaseChooseAnExisting,
NewDependency.AsString, '"', #13]), ['"', NewDependency.AsString, '"', #13]),
mtError,[mbCancel],0); mtError,[mbCancel],0);
exit; exit;
end; end;