Converter: Change package LCLBase to LCL, returned from FindUnitInAllPackages. Improve IDE messages.

git-svn-id: trunk@29395 -

converter/convertdelphi.pas

@@ -958,8 +958,11 @@ var
   begin
     if DelphiPkgName='' then exit;
     if System.Pos(';'+lowercase(DelphiPkgName)+';',
-                  ';'+lowercase(DelphiPkgNames)+';')>0 then
+                  ';'+lowercase(DelphiPkgNames)+';')>0 then begin
       AddPackageDependency(LazarusPkgName);
+      IDEMessagesWindow.AddMsg(
+          Format(lisConvDelphiAddedPackageRequirement, [LazarusPkgName]), '', -1);
+    end;
   end;
 
   procedure ReadDelphiPackages;
@@ -1105,13 +1108,18 @@ function TConvertDelphiPBase.CheckPackageDependency(AUnitName: string): Boolean;
 var
   Pack: TPkgFile;
   Dep: TPkgDependency;
+  s: String;
 begin
   Result:=False;
   Pack:=PackageGraph.FindUnitInAllPackages(AUnitName, True);
   if Assigned(Pack) then begin
     // Found from package: add package to project dependencies and open it.
-    AddPackageDependency(Pack.LazPackage.Name);
-    Dep:=FindDependencyByName(Pack.LazPackage.Name);
+    s:=Pack.LazPackage.Name;
+    if s='LCLBase' then
+      s:='LCL';
+    AddPackageDependency(s);
+    IDEMessagesWindow.AddMsg(Format(lisConvDelphiAddedPackageRequirement, [s]), '', -1);
+    Dep:=FindDependencyByName(s);
     if Assigned(Dep) then
       PackageGraph.OpenDependency(Dep,false);
     Result:=True;

ide/lazarusidestrconsts.pas

@@ -5128,6 +5128,7 @@ resourcestring
     +'should be no missing units!';
   lisConvDelphiConvertingUnitFiles = '*** Converting unit files... ***';
   lisConvDelphiPackageNameExists = 'Package name exists';
+  lisConvDelphiAddedPackageRequirement = 'Added Package %s as a requirement.';
   lisConvDelphiThereIsAlreadyAPackageWithTheNamePleaseCloseThisPa = 'There is '
     +'already a package with the name "%s"%sPlease close this package first.';
   lisConvDelphiUnitsNotFound = 'Units not found';