IDE: install/uninstall package dialog: fixed icons, added info about current state

git-svn-id: trunk@36518 -

ide/lazarusidestrconsts.pas

@@ -4015,6 +4015,10 @@ resourcestring
   
   // open installed packages dialog
   lisOIPFilename = 'Filename:  %s';
+  lisCurrentState = 'Current state: ';
+  lisInstalled = 'installed';
+  lisNotInstalled = 'not installed';
+  lisState = 'State: ';
   lisOIPThisPackageWasAutomaticallyCreated = '%sThis package was automatically created';
   lisOIPThisPackageIsInstalledButTheLpkFileWasNotFound = '%sThis package is '
     +'installed, but the lpk file was not found';

packager/installpkgsetdlg.pas

@@ -101,7 +101,8 @@ type
     procedure SetOldInstalledPackages(const AValue: TPkgDependency);
     procedure AssignOldInstalledPackagesToList;
     function PackageInInstallList(PkgName: string): boolean;
-    function ChooseImageIndex(Str: String; Data: TObject; var AIsEnabled: Boolean): Integer;
+    function GetPkgImgIndex(APackage: TLazPackage; InInstallList: boolean): integer;
+    function GetAvailablePkgImageIndex(Str: String; Data: TObject; var AIsEnabled: Boolean): Integer;
     procedure UpdateAvailablePackages(Immediately: boolean = false);
     procedure UpdateNewInstalledPackages;
     procedure OnIteratePackages(APackageID: TLazPackageID);
@@ -176,7 +177,7 @@ begin
   NoteLabel.Caption:=lisToInstallYouMustCompileAndRestartTheIDE;
 
   AvailablePkgGroupBox.Caption:=lisDoNotInstall;
-  AvailableFilterEdit.OnGetImageIndex:=@ChooseImageIndex;
+  AvailableFilterEdit.OnGetImageIndex:=@GetAvailablePkgImageIndex;
 
   ExportButton.Caption:=lisExportList;
   ImportButton.Caption:=lisImportList;
@@ -360,21 +361,40 @@ begin
   Result:=false;
 end;
 
-function TInstallPkgSetDialog.ChooseImageIndex(Str: String; Data: TObject;
+function TInstallPkgSetDialog.GetPkgImgIndex(APackage: TLazPackage;
-                                               var AIsEnabled: Boolean): Integer;
+  InInstallList: boolean): integer;
-var
-  Pkg: TLazPackageID;
-  APackage: TLazPackage;
 begin
-  Pkg:=TLazPackageID(Data);
+  if APackage.Installed<>pitNope then begin
-  Result:=ImgIndexPackage;
+    // is not currently installed
-  if (Pkg is TLazPackage) then begin
+    if InInstallList then begin
-    APackage:=TLazPackage(Pkg);
+      // is installed and will be installed
-    if APackage.Installed<>pitNope then
+      Result:=ImgIndexPackage;
-      Result:=ImgIndexUninstallPackage; // is installed and will be uninstalled
+    end
+    else begin
+      // is installed and will be uninstalled
+      Result:=ImgIndexUninstallPackage;
+    end;
+  end else begin
+    // is currently installed
+    if InInstallList then begin
+      // is not installed and will be installed
+      Result:=ImgIndexInstallPackage;
+    end
+    else begin
+      // is not installed and will be not be installed
+      Result:=ImgIndexPackage;
+    end;
   end;
 end;
 
+function TInstallPkgSetDialog.GetAvailablePkgImageIndex(Str: String; Data: TObject;
+                                               var AIsEnabled: Boolean): Integer;
+begin
+  Result:=ImgIndexPackage;
+  if (Data is TLazPackage) then
+    Result:=GetPkgImgIndex(TLazPackage(Data),false);
+end;
+
 procedure TInstallPkgSetDialog.UpdateAvailablePackages(Immediately: boolean);
 var
   ANode: TAVLTreeNode;
@@ -438,8 +458,7 @@ begin
     ImgIndex:=ImgIndexInstallPackage;
     if NewPackageID is TLazPackage then begin
       APackage:=TLazPackage(NewPackageID);
-      if APackage.Installed<>pitNope then
+      ImgIndex:=GetPkgImgIndex(APackage,true);
-        ImgIndex:=ImgIndexInstalledPackage;    // stay installed
     end;
     TVNode.ImageIndex:=ImgIndex;
     TVNode.SelectedIndex:=ImgIndex;
@@ -506,6 +525,16 @@ begin
 end;
 
 procedure TInstallPkgSetDialog.UpdatePackageInfo(Tree: TTreeView);
+var
+  InfoStr: string;
+
+  procedure AddState(const NewState: string);
+  begin
+    if (InfoStr<>'') and (InfoStr[length(InfoStr)]<>' ') then
+      InfoStr:=InfoStr+', ';
+    InfoStr:=InfoStr+NewState;
+  end;
+
 var
   PkgName: String;
   PkgID: TLazPackageID;
@@ -554,10 +583,22 @@ begin
       end;
     end;
     if Author<>'' then
-      PkgInfoMemo.Lines.Add(lisPckOptsAuthor + ' ' + Author);
+      PkgInfoMemo.Lines.Add(lisPckOptsAuthor + ': ' + Author);
     if Description<>'' then
       PkgInfoMemo.Lines.Add(lisPckOptsDescriptionAbstract
                             + ': ' + Description);
+    if FSelectedPkg<>nil then
+    begin
+      PkgInfoMemo.Lines.Add(Format(lisOIPFilename, [FSelectedPkg.Filename]));
+      InfoStr:=lisCurrentState;
+      if FSelectedPkg.Installed<>pitNope then
+        AddState(lisInstalled)
+      else
+        AddState(lisNotInstalled);
+      if FSelectedPkg.AutoCreated then
+        AddState(lisPckExplAutoCreated);
+      PkgInfoMemo.Lines.Add(InfoStr);
+    end;
   finally
     PkgId.Free;
   end;