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

Opkman: Add a new node("External dependencies") to the package tree. The node provides information about any external libraries/files required by the package.

Browse Source 
git-svn-id: trunk@62962 -
This commit is contained in:
balazs 2020-04-14 08:16:49 +00:00
parent 48e5d6068e
commit 742ffadced
6 changed files with 116 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/onlinepackagemanager/opkman_const.pas
View File

@ -88,6 +88,7 @@ resourcestring
rsMainFrm_VSTText_PackageInfo = 'Package info'; rsMainFrm_VSTText_PackageInfo = 'Package info';
rsMainFrm_VSTText_Category = 'Category'; rsMainFrm_VSTText_Category = 'Category';
rsMainFrm_VSTText_CommunityDescription = 'Community description'; rsMainFrm_VSTText_CommunityDescription = 'Community description';
rsMainFrm_VSTText_ExternalDependecies = 'External dependencies';
rsMainFrm_VSTText_RepositoryFilename = 'Repository filename'; rsMainFrm_VSTText_RepositoryFilename = 'Repository filename';
rsMainFrm_VSTText_RepositoryFileSize = 'Repository filesize'; rsMainFrm_VSTText_RepositoryFileSize = 'Repository filesize';
rsMainFrm_VSTText_RepositoryFileHash = 'Repository filehash'; rsMainFrm_VSTText_RepositoryFileHash = 'Repository filehash';
@ -143,6 +144,7 @@ resourcestring
rsMainFrm_VSTText_Open_Notfound = 'Package file not found.'; rsMainFrm_VSTText_Open_Notfound = 'Package file not found.';
rsMainFrm_VSTText_Open_Error = 'Cannot open package file.'; rsMainFrm_VSTText_Open_Error = 'Cannot open package file.';
rsMainFrm_VSTText_ComDesc = 'Community description for metapackage'; rsMainFrm_VSTText_ComDesc = 'Community description for metapackage';
rsMainFrm_VSTText_ExternalDependencies = 'External dependencies for metapackage';
rsMainFrm_cbAll_Caption = 'All/None'; rsMainFrm_cbAll_Caption = 'All/None';
rsMainFrm_cbAll_Hint = 'Check/Uncheck packages'; rsMainFrm_cbAll_Hint = 'Check/Uncheck packages';
rsMainFrm_lbFilter_Caption = 'Filter by:'; rsMainFrm_lbFilter_Caption = 'Filter by:';

127
components/onlinepackagemanager/opkman_createrepositorypackagefrm.lfm
View File

@ -1,12 +1,12 @@
object CreateRepositoryPackagesFrm: TCreateRepositoryPackagesFrm object CreateRepositoryPackagesFrm: TCreateRepositoryPackagesFrm
Left = 511 Left = 429
Height = 600 Height = 687
Top = 198 Top = 173
Width = 800 Width = 904
BorderIcons = [biSystemMenu] BorderIcons = [biSystemMenu]
Caption = 'CreateRepositoryPackagesFrm' Caption = 'CreateRepositoryPackagesFrm'
ClientHeight = 600 ClientHeight = 687
ClientWidth = 800 ClientWidth = 904
Constraints.MinHeight = 450 Constraints.MinHeight = 450
Constraints.MinWidth = 650 Constraints.MinWidth = 650
OnCreate = FormCreate OnCreate = FormCreate
@ -16,9 +16,9 @@ object CreateRepositoryPackagesFrm: TCreateRepositoryPackagesFrm
LCLVersion = '2.1.0.0' LCLVersion = '2.1.0.0'
object pnMessage: TPanel object pnMessage: TPanel
Left = 247 Left = 247
Height = 502 Height = 589
Top = 57 Top = 57
Width = 553 Width = 657
Align = alClient Align = alClient
BevelOuter = bvNone BevelOuter = bvNone
Caption = 'No items to show' Caption = 'No items to show'
@ -35,7 +35,7 @@ object CreateRepositoryPackagesFrm: TCreateRepositoryPackagesFrm
end end
object pnPackages: TPanel object pnPackages: TPanel
Left = 0 Left = 0
Height = 502 Height = 589
Top = 57 Top = 57
Width = 245 Width = 245
Align = alLeft Align = alLeft
@ -46,11 +46,11 @@ object CreateRepositoryPackagesFrm: TCreateRepositoryPackagesFrm
Left = 0 Left = 0
Height = 57 Height = 57
Top = 0 Top = 0
Width = 800 Width = 904
Align = alTop Align = alTop
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 57 ClientHeight = 57
ClientWidth = 800 ClientWidth = 904
TabOrder = 2 TabOrder = 2
object lbPackagedir: TLabel object lbPackagedir: TLabel
AnchorSideLeft.Control = pnBrowse AnchorSideLeft.Control = pnBrowse
@ -69,7 +69,7 @@ object CreateRepositoryPackagesFrm: TCreateRepositoryPackagesFrm
Left = 0 Left = 0
Height = 2 Height = 2
Top = 55 Top = 55
Width = 800 Width = 904
Align = alBottom Align = alBottom
end end
object edPackageDir: TDirectoryEdit object edPackageDir: TDirectoryEdit
@ -82,7 +82,7 @@ object CreateRepositoryPackagesFrm: TCreateRepositoryPackagesFrm
Left = 80 Left = 80
Height = 23 Height = 23
Top = 17 Top = 17
Width = 714 Width = 818
OnAcceptDirectory = edPackageDirAcceptDirectory OnAcceptDirectory = edPackageDirAcceptDirectory
ShowHidden = False ShowHidden = False
ButtonWidth = 23 ButtonWidth = 23
@ -96,24 +96,24 @@ object CreateRepositoryPackagesFrm: TCreateRepositoryPackagesFrm
end end
object pnData: TPanel object pnData: TPanel
Left = 247 Left = 247
Height = 502 Height = 589
Top = 57 Top = 57
Width = 553 Width = 657
Align = alClient Align = alClient
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 502 ClientHeight = 589
ClientWidth = 553 ClientWidth = 657
TabOrder = 3 TabOrder = 3
object pnPackageData: TPanel object pnPackageData: TPanel
Left = 0 Left = 0
Height = 187 Height = 110
Top = 315 Top = 479
Width = 553 Width = 657
Align = alClient Align = alClient
BevelOuter = bvNone BevelOuter = bvNone
BorderStyle = bsSingle BorderStyle = bsSingle
ClientHeight = 183 ClientHeight = 106
ClientWidth = 549 ClientWidth = 653
TabOrder = 1 TabOrder = 1
Visible = False Visible = False
object lbLazCompatibility: TLabel object lbLazCompatibility: TLabel
@ -141,7 +141,7 @@ object CreateRepositoryPackagesFrm: TCreateRepositoryPackagesFrm
ParentColor = False ParentColor = False
end end
object lbOF1: TLabel object lbOF1: TLabel
Left = 524 Left = 628
Height = 15 Height = 15
Top = 14 Top = 14
Width = 5 Width = 5
@ -153,7 +153,7 @@ object CreateRepositoryPackagesFrm: TCreateRepositoryPackagesFrm
ParentFont = False ParentFont = False
end end
object lbOF3: TLabel object lbOF3: TLabel
Left = 524 Left = 628
Height = 15 Height = 15
Top = 50 Top = 50
Width = 5 Width = 5
@ -165,7 +165,7 @@ object CreateRepositoryPackagesFrm: TCreateRepositoryPackagesFrm
ParentFont = False ParentFont = False
end end
object lbOF4: TLabel object lbOF4: TLabel
Left = 524 Left = 628
Height = 15 Height = 15
Top = 85 Top = 85
Width = 5 Width = 5
@ -180,17 +180,17 @@ object CreateRepositoryPackagesFrm: TCreateRepositoryPackagesFrm
Left = 170 Left = 170
Height = 23 Height = 23
Top = 9 Top = 9
Width = 351 Width = 455
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
AutoSize = True AutoSize = True
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 23 ClientHeight = 23
ClientWidth = 351 ClientWidth = 455
ParentColor = False ParentColor = False
TabOrder = 0 TabOrder = 0
object spLazCompatibility: TSpeedButton object spLazCompatibility: TSpeedButton
Tag = 2 Tag = 2
Left = 328 Left = 432
Height = 23 Height = 23
Top = 0 Top = 0
Width = 23 Width = 23
@ -204,7 +204,7 @@ object CreateRepositoryPackagesFrm: TCreateRepositoryPackagesFrm
Left = 0 Left = 0
Height = 23 Height = 23
Top = 0 Top = 0
Width = 328 Width = 432
Align = alClient Align = alClient
AutoSize = False AutoSize = False
ParentShowHint = False ParentShowHint = False
@ -217,17 +217,17 @@ object CreateRepositoryPackagesFrm: TCreateRepositoryPackagesFrm
Left = 170 Left = 170
Height = 23 Height = 23
Top = 45 Top = 45
Width = 351 Width = 455
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
AutoSize = True AutoSize = True
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 23 ClientHeight = 23
ClientWidth = 351 ClientWidth = 455
ParentColor = False ParentColor = False
TabOrder = 1 TabOrder = 1
object spFPCCompatibility: TSpeedButton object spFPCCompatibility: TSpeedButton
Tag = 3 Tag = 3
Left = 328 Left = 432
Height = 23 Height = 23
Top = 0 Top = 0
Width = 23 Width = 23
@ -241,7 +241,7 @@ object CreateRepositoryPackagesFrm: TCreateRepositoryPackagesFrm
Left = 0 Left = 0
Height = 23 Height = 23
Top = 0 Top = 0
Width = 328 Width = 432
Align = alClient Align = alClient
AutoSize = False AutoSize = False
ParentShowHint = False ParentShowHint = False
@ -254,17 +254,17 @@ object CreateRepositoryPackagesFrm: TCreateRepositoryPackagesFrm
Left = 170 Left = 170
Height = 23 Height = 23
Top = 79 Top = 79
Width = 351 Width = 455
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
AutoSize = True AutoSize = True
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 23 ClientHeight = 23
ClientWidth = 351 ClientWidth = 455
ParentColor = False ParentColor = False
TabOrder = 2 TabOrder = 2
object spSupportedWidgetset: TSpeedButton object spSupportedWidgetset: TSpeedButton
Tag = 4 Tag = 4
Left = 328 Left = 432
Height = 23 Height = 23
Top = 0 Top = 0
Width = 23 Width = 23
@ -278,7 +278,7 @@ object CreateRepositoryPackagesFrm: TCreateRepositoryPackagesFrm
Left = 0 Left = 0
Height = 23 Height = 23
Top = 0 Top = 0
Width = 328 Width = 432
Align = alClient Align = alClient
AutoSize = False AutoSize = False
ParentShowHint = False ParentShowHint = False
@ -290,14 +290,14 @@ object CreateRepositoryPackagesFrm: TCreateRepositoryPackagesFrm
end end
object pnCategory: TPanel object pnCategory: TPanel
Left = 0 Left = 0
Height = 315 Height = 479
Top = 0 Top = 0
Width = 553 Width = 657
Align = alTop Align = alTop
BevelOuter = bvNone BevelOuter = bvNone
BorderStyle = bsSingle BorderStyle = bsSingle
ClientHeight = 311 ClientHeight = 475
ClientWidth = 549 ClientWidth = 653
TabOrder = 0 TabOrder = 0
Visible = False Visible = False
object lbCategory: TLabel object lbCategory: TLabel
@ -309,7 +309,7 @@ object CreateRepositoryPackagesFrm: TCreateRepositoryPackagesFrm
ParentColor = False ParentColor = False
end end
object lbOF2: TLabel object lbOF2: TLabel
Left = 524 Left = 628
Height = 15 Height = 15
Top = 14 Top = 14
Width = 5 Width = 5
@ -340,7 +340,7 @@ object CreateRepositoryPackagesFrm: TCreateRepositoryPackagesFrm
Left = 170 Left = 170
Height = 23 Height = 23
Top = 83 Top = 83
Width = 350 Width = 454
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
TabOrder = 2 TabOrder = 2
end end
@ -348,7 +348,7 @@ object CreateRepositoryPackagesFrm: TCreateRepositoryPackagesFrm
Left = 170 Left = 170
Height = 23 Height = 23
Top = 118 Top = 118
Width = 350 Width = 454
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
TabOrder = 3 TabOrder = 3
end end
@ -365,7 +365,7 @@ object CreateRepositoryPackagesFrm: TCreateRepositoryPackagesFrm
Left = 170 Left = 170
Height = 23 Height = 23
Top = 152 Top = 152
Width = 350 Width = 454
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
TabOrder = 4 TabOrder = 4
Visible = False Visible = False
@ -382,7 +382,7 @@ object CreateRepositoryPackagesFrm: TCreateRepositoryPackagesFrm
Left = 170 Left = 170
Height = 23 Height = 23
Top = 48 Top = 48
Width = 350 Width = 454
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
OnKeyPress = edDisplayNameKeyPress OnKeyPress = edDisplayNameKeyPress
TabOrder = 1 TabOrder = 1
@ -391,17 +391,17 @@ object CreateRepositoryPackagesFrm: TCreateRepositoryPackagesFrm
Left = 170 Left = 170
Height = 23 Height = 23
Top = 9 Top = 9
Width = 351 Width = 455
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
AutoSize = True AutoSize = True
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 23 ClientHeight = 23
ClientWidth = 351 ClientWidth = 455
ParentColor = False ParentColor = False
TabOrder = 0 TabOrder = 0
object spCategories: TSpeedButton object spCategories: TSpeedButton
Tag = 1 Tag = 1
Left = 328 Left = 432
Height = 23 Height = 23
Top = 0 Top = 0
Width = 23 Width = 23
@ -415,7 +415,7 @@ object CreateRepositoryPackagesFrm: TCreateRepositoryPackagesFrm
Left = 0 Left = 0
Height = 23 Height = 23
Top = 0 Top = 0
Width = 328 Width = 432
Align = alClient Align = alClient
AutoSize = False AutoSize = False
ParentShowHint = False ParentShowHint = False
@ -428,7 +428,7 @@ object CreateRepositoryPackagesFrm: TCreateRepositoryPackagesFrm
Left = 170 Left = 170
Height = 152 Height = 152
Top = 152 Top = 152
Width = 350 Width = 454
TabOrder = 5 TabOrder = 5
end end
object lbComDescr: TLabel object lbComDescr: TLabel
@ -439,11 +439,26 @@ object CreateRepositoryPackagesFrm: TCreateRepositoryPackagesFrm
Caption = 'lbComDescr' Caption = 'lbComDescr'
ParentColor = False ParentColor = False
end end
object lbExternalDependencies: TLabel
Left = 9
Height = 15
Top = 314
Width = 125
Caption = 'lbExternalDependencies'
ParentColor = False
end
object mExternalDependencies: TMemo
Left = 170
Height = 152
Top = 314
Width = 454
TabOrder = 6
end
end end
end end
object spMain: TSplitter object spMain: TSplitter
Left = 245 Left = 245
Height = 502 Height = 589
Top = 57 Top = 57
Width = 2 Width = 2
AutoSnap = False AutoSnap = False
@ -454,13 +469,13 @@ object CreateRepositoryPackagesFrm: TCreateRepositoryPackagesFrm
object pnButtons: TPanel object pnButtons: TPanel
Left = 0 Left = 0
Height = 41 Height = 41
Top = 559 Top = 646
Width = 800 Width = 904
Align = alBottom Align = alBottom
BevelOuter = bvNone BevelOuter = bvNone
BorderStyle = bsSingle BorderStyle = bsSingle
ClientHeight = 37 ClientHeight = 37
ClientWidth = 796 ClientWidth = 900
TabOrder = 5 TabOrder = 5
object cbJSONForUpdates: TCheckBox object cbJSONForUpdates: TCheckBox
AnchorSideLeft.Control = pnButtons AnchorSideLeft.Control = pnButtons
@ -479,7 +494,7 @@ object CreateRepositoryPackagesFrm: TCreateRepositoryPackagesFrm
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = pnButtons AnchorSideRight.Control = pnButtons
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 375 Left = 479
Height = 29 Height = 29
Top = 4 Top = 4
Width = 415 Width = 415

8
components/onlinepackagemanager/opkman_createrepositorypackagefrm.pas
View File

@ -60,6 +60,7 @@ type
edSVNURL: TEdit; edSVNURL: TEdit;
edHomePageURL: TEdit; edHomePageURL: TEdit;
lbCategory: TLabel; lbCategory: TLabel;
lbExternalDependencies: TLabel;
lbDownloadURL: TLabel; lbDownloadURL: TLabel;
lbDisplayName: TLabel; lbDisplayName: TLabel;
lbSVNURL: TLabel; lbSVNURL: TLabel;
@ -74,6 +75,7 @@ type
lbSupportedWidgetSet: TLabel; lbSupportedWidgetSet: TLabel;
lbComDescr: TLabel; lbComDescr: TLabel;
mComDescr: TMemo; mComDescr: TMemo;
mExternalDependencies: TMemo;
pnB: TPanel; pnB: TPanel;
pnButtons: TPanel; pnButtons: TPanel;
pnCategories: TPanel; pnCategories: TPanel;
@ -194,6 +196,7 @@ type
FDownloadURL: String; FDownloadURL: String;
FSVNURL: String; FSVNURL: String;
FCommunityDescription: String; FCommunityDescription: String;
FExternalDependencies: String;
end; end;
procedure TCreateRepositoryPackagesFrm.FormCreate(Sender: TObject); procedure TCreateRepositoryPackagesFrm.FormCreate(Sender: TObject);
@ -211,6 +214,7 @@ begin
lbDownloadURL.Caption := rsCreateRepositoryPackageFrm_lbDownloadURL_Caption; lbDownloadURL.Caption := rsCreateRepositoryPackageFrm_lbDownloadURL_Caption;
lbSVNURL.Caption := rsCreateRepositoryPackageFrm_lbSVNURL_Caption; lbSVNURL.Caption := rsCreateRepositoryPackageFrm_lbSVNURL_Caption;
lbComDescr.Caption := rsMainFrm_VSTText_CommunityDescription + ':'; lbComDescr.Caption := rsMainFrm_VSTText_CommunityDescription + ':';
lbExternalDependencies.Caption := rsMainFrm_VSTText_ExternalDependecies + ':';
bHelp.Caption := rsCreateRepositoryPackageFrm_bHelp_Caption; bHelp.Caption := rsCreateRepositoryPackageFrm_bHelp_Caption;
bHelp.Hint := rsCreateRepositoryPackageFrm_bHelp_Hint; bHelp.Hint := rsCreateRepositoryPackageFrm_bHelp_Hint;
@ -476,6 +480,7 @@ begin
RootData^.FDownloadURL := ''; RootData^.FDownloadURL := '';
RootData^.FSVNURL := ''; RootData^.FSVNURL := '';
RootData^.FCommunityDescription := ''; RootData^.FCommunityDescription := '';
RootData^.FExternalDependencies := '';
RootData^.FDataType := 0; RootData^.FDataType := 0;
FPackageName := RootData^.FName; FPackageName := RootData^.FName;
for I := 0 to PackageList.Count - 1 do for I := 0 to PackageList.Count - 1 do
@ -748,6 +753,7 @@ begin
Data^.FDownloadURL := edDownloadURL.Text; Data^.FDownloadURL := edDownloadURL.Text;
Data^.FSVNURL := edSVNURL.Text; Data^.FSVNURL := edSVNURL.Text;
Data^.FCommunityDescription := mComDescr.Text; Data^.FCommunityDescription := mComDescr.Text;
Data^.FExternalDependencies := mExternalDependencies.Text;
end; end;
1: begin 1: begin
Data^.FLazCompatibility := edLazCompatibility.Text; Data^.FLazCompatibility := edLazCompatibility.Text;
@ -797,6 +803,7 @@ begin
edDownloadURL.Text := Data^.FDownloadURL; edDownloadURL.Text := Data^.FDownloadURL;
edSVNURL.Text := Data^.FSVNURL; edSVNURL.Text := Data^.FSVNURL;
mComDescr.Text := Data^.FCommunityDescription; mComDescr.Text := Data^.FCommunityDescription;
mExternalDependencies.Text := Data^.FExternalDependencies;
end end
else if Level = 1 then else if Level = 1 then
begin begin
@ -1076,6 +1083,7 @@ begin
MetaPkg.DownloadURL := RootData^.FDownloadURL; MetaPkg.DownloadURL := RootData^.FDownloadURL;
MetaPkg.SVNURL := RootData^.FSVNURL; MetaPkg.SVNURL := RootData^.FSVNURL;
MetaPkg.CommunityDescription := RootData^.FCommunityDescription; MetaPkg.CommunityDescription := RootData^.FCommunityDescription;
MetaPkg.ExternalDependecies := RootData^.FExternalDependencies;
Node := FVSTPackages.GetFirstChild(RootNode); Node := FVSTPackages.GetFirstChild(RootNode);
while Assigned(Node) do while Assigned(Node) do
begin begin

2
components/onlinepackagemanager/opkman_intf_packagelistfrm.pas
View File

@ -7,7 +7,7 @@ interface
uses uses
SysUtils, Classes, laz.VirtualTrees, SysUtils, Classes, laz.VirtualTrees,
// LCL // LCL
Forms, Controls, Buttons, Graphics, ExtCtrls, StdCtrls, LCLType, ButtonPanel, Forms, Controls, Buttons, Graphics, ExtCtrls, LCLType, ButtonPanel,
Menus, Menus,
//IDEIntf //IDEIntf
PackageIntf, PackageIntf,

6
components/onlinepackagemanager/opkman_serializablepackages.pas
View File

@ -172,6 +172,7 @@ type
FDisplayName: String; FDisplayName: String;
FCategory: String; FCategory: String;
FCommunityDescription: String; FCommunityDescription: String;
FExternalDependencies: String;
FRepositoryFileName: String; FRepositoryFileName: String;
FRepositoryFileSize: Int64; FRepositoryFileSize: Int64;
FRepositoryFileHash: String; FRepositoryFileHash: String;
@ -214,7 +215,8 @@ type
property Name: String read FName write FName; property Name: String read FName write FName;
property DisplayName: String read FDisplayName write FDisplayName; property DisplayName: String read FDisplayName write FDisplayName;
property Category: String read FCategory write FCategory; property Category: String read FCategory write FCategory;
property CommunityDescription: string read FCommunityDescription write FCommunityDescription; property CommunityDescription: String read FCommunityDescription write FCommunityDescription;
property ExternalDependecies: String read FExternalDependencies write FExternalDependencies;
property Checked: Boolean read FChecked write FChecked; property Checked: Boolean read FChecked write FChecked;
property RepositoryFileName: String read FRepositoryFileName write FRepositoryFileName; property RepositoryFileName: String read FRepositoryFileName write FRepositoryFileName;
property RepositoryFileSize: int64 read FRepositoryFileSize write FRepositoryFileSize; property RepositoryFileSize: int64 read FRepositoryFileSize write FRepositoryFileSize;
@ -856,6 +858,7 @@ begin
AMetaPackage.DisplayName := PackageData.Get('DisplayName'); AMetaPackage.DisplayName := PackageData.Get('DisplayName');
AMetaPackage.Category := PackageData.Get('Category'); AMetaPackage.Category := PackageData.Get('Category');
AMetaPackage.CommunityDescription := PackageData.Get('CommunityDescription'); AMetaPackage.CommunityDescription := PackageData.Get('CommunityDescription');
AMetaPackage.ExternalDependecies := PackageData.Get('ExternalDependecies');
AMetaPackage.RepositoryFileName := PackageData.Get('RepositoryFileName'); AMetaPackage.RepositoryFileName := PackageData.Get('RepositoryFileName');
AMetaPackage.RepositoryFileSize := PackageData.Get('RepositoryFileSize'); AMetaPackage.RepositoryFileSize := PackageData.Get('RepositoryFileSize');
AMetaPackage.RepositoryFileHash := PackageData.Get('RepositoryFileHash'); AMetaPackage.RepositoryFileHash := PackageData.Get('RepositoryFileHash');
@ -1311,6 +1314,7 @@ begin
APackageData.Add('DisplayName', AMetaPackage.DisplayName); APackageData.Add('DisplayName', AMetaPackage.DisplayName);
APackageData.Add('Category', AMetaPackage.Category); APackageData.Add('Category', AMetaPackage.Category);
APackageData.Add('CommunityDescription', AMetaPackage.CommunityDescription); APackageData.Add('CommunityDescription', AMetaPackage.CommunityDescription);
APackageData.Add('ExternalDependecies', AMetaPackage.ExternalDependecies);
APackageData.Add('RepositoryFileName', AMetaPackage.RepositoryFileName); APackageData.Add('RepositoryFileName', AMetaPackage.RepositoryFileName);
APackageData.Add('RepositoryFileSize', AMetaPackage.RepositoryFileSize); APackageData.Add('RepositoryFileSize', AMetaPackage.RepositoryFileSize);
APackageData.Add('RepositoryFileHash', AMetaPackage.RepositoryFileHash); APackageData.Add('RepositoryFileHash', AMetaPackage.RepositoryFileHash);

33
components/onlinepackagemanager/opkman_visualtree.pas
View File

@ -75,6 +75,7 @@ type
IsUpdated: Boolean; IsUpdated: Boolean;
SVNURL: String; SVNURL: String;
CommunityDescription: String; CommunityDescription: String;
ExternalDependencies: String;
InstallState: Integer; InstallState: Integer;
ButtonID: Integer; ButtonID: Integer;
Button: TSpeedButton; Button: TSpeedButton;
@ -490,7 +491,17 @@ begin
GrandChildData^.DataType := 19; GrandChildData^.DataType := 19;
Inc(UniqueID); Inc(UniqueID);
GrandChildData^.ButtonID := UniqueID; GrandChildData^.ButtonID := UniqueID;
Data^.CommunityDescription := SerializablePackages.Items[I].CommunityDescription;; Data^.CommunityDescription := SerializablePackages.Items[I].CommunityDescription;
//add external dependecies(DataType = 20) - added 2020.04.14
GrandChildNode := FVST.AddChild(ChildNode);
FVST.IsDisabled[GrandChildNode] := FVST.IsDisabled[GrandChildNode^.Parent];
GrandChildData := FVST.GetNodeData(GrandChildNode);
GrandChildData^.ExternalDependencies := SerializablePackages.Items[I].ExternalDependecies;
GrandChildData^.DataType := 20;
Inc(UniqueID);
GrandChildData^.ButtonID := UniqueID;
Data^.ExternalDependencies := SerializablePackages.Items[I].ExternalDependecies;
end; end;
FVST.SortTree(0, laz.VirtualTrees.sdAscending); FVST.SortTree(0, laz.VirtualTrees.sdAscending);
ExpandEx; ExpandEx;
@ -559,6 +570,15 @@ begin
FrmCaption := rsMainFrm_VSTText_ComDesc + ' "' + MetaPackageData^.PackageDisplayName + '"'; FrmCaption := rsMainFrm_VSTText_ComDesc + ' "' + MetaPackageData^.PackageDisplayName + '"';
end; end;
end; end;
20: begin
MetaPackageNode := ParentNode^.Parent;
if MetaPackageNode <> nil then
begin
MetaPackageData := VST.GetNodeData(MetaPackageNode);
Text := Data^.ExternalDependencies;
FrmCaption := rsMainFrm_VSTText_ExternalDependencies + ' "' + MetaPackageData^.PackageDisplayName + '"';
end;
end;
end; end;
Break; Break;
end; end;
@ -1209,7 +1229,7 @@ begin
FVST.RepaintNode(Node); FVST.RepaintNode(Node);
end; end;
end; end;
if Data^.DataType in [3..19] then if Data^.DataType in [3..20] then
begin begin
FVST.IsDisabled[Node] := FVST.IsDisabled[Node^.Parent]; FVST.IsDisabled[Node] := FVST.IsDisabled[Node^.Parent];
ParentData := FVST.GetNodeData(Node^.Parent); ParentData := FVST.GetNodeData(Node^.Parent);
@ -1457,7 +1477,8 @@ begin
ImageIndex := 25 ImageIndex := 25
else else
ImageIndex := 1; ImageIndex := 1;
else 20: ImageIndex := 9
else
ImageIndex := Data^.DataType ImageIndex := Data^.DataType
end; end;
end; end;
@ -1529,6 +1550,7 @@ begin
17: CellText := rsMainFrm_VSTText_HomePageURL; 17: CellText := rsMainFrm_VSTText_HomePageURL;
18: CellText := rsMainFrm_VSTText_DownloadURL; 18: CellText := rsMainFrm_VSTText_DownloadURL;
19: CellText := rsMainFrm_VSTText_CommunityDescription; 19: CellText := rsMainFrm_VSTText_CommunityDescription;
20: CellText := rsMainFrm_VSTText_ExternalDependecies
end; end;
end end
else if Column = 1 then else if Column = 1 then
@ -1631,6 +1653,7 @@ begin
17: CellText := Data^.HomePageURL; 17: CellText := Data^.HomePageURL;
18: CellText := Data^.DownloadURL; 18: CellText := Data^.DownloadURL;
19: CellText := GetDisplayString(Data^.CommunityDescription); 19: CellText := GetDisplayString(Data^.CommunityDescription);
20: CellText := GetDisplayString(Data^.ExternalDependencies);
end; end;
end end
else if Column = 5 then else if Column = 5 then
@ -1840,7 +1863,8 @@ begin
((Data^.DataType = 2) and (Data^.PackageState in [psExtracted, psInstalled])) or ((Data^.DataType = 2) and (Data^.PackageState in [psExtracted, psInstalled])) or
((Data^.DataType = 3) and (Trim(Data^.Description) <> '')) or ((Data^.DataType = 3) and (Trim(Data^.Description) <> '')) or
((Data^.DataType = 9) and (Trim(Data^.License) <> '')) or ((Data^.DataType = 9) and (Trim(Data^.License) <> '')) or
((Data^.DataType = 19) and (Trim(Data^.CommunityDescription) <> '')) ((Data^.DataType = 19) and (Trim(Data^.CommunityDescription) <> '')) or
((Data^.DataType = 20) and (Trim(Data^.ExternalDependencies) <> ''))
) then ) then
begin begin
Data := FVST.GetNodeData(FHoverNode); Data := FVST.GetNodeData(FHoverNode);
@ -2006,6 +2030,7 @@ begin
17: HintText := Data^.HomePageURL; 17: HintText := Data^.HomePageURL;
18: HintText := Data^.DownloadURL; 18: HintText := Data^.DownloadURL;
19: HintText := Data^.CommunityDescription; 19: HintText := Data^.CommunityDescription;
20: HintText := Data^.ExternalDependencies;
else else
HintText := ''; HintText := '';
end; end;