IDE, Package Install Dlg: Added a memo for License, so it is separated from Author/Description. License is too important to be hidden in all the other data

git-svn-id: trunk@61943 -

packager/installpkgsetdlg.lfm

@@ -20,28 +20,56 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
   object PkgInfoGroupBox: TGroupBox
     AnchorSideBottom.Control = BtnPanel
     Left = 6
-    Height = 127
-    Top = 413
+    Height = 135
+    Top = 405
     Width = 595
     Align = alBottom
     BorderSpacing.Left = 6
     BorderSpacing.Right = 6
     Caption = 'PkgInfoGroupBox'
-    ClientHeight = 107
+    ClientHeight = 115
     ClientWidth = 591
     Constraints.MinHeight = 70
     TabOrder = 0
     object PkgInfoMemo: TMemo
       Left = 6
-      Height = 95
+      Height = 65
       Top = 6
       Width = 579
-      Align = alClient
-      BorderSpacing.Around = 6
+      Align = alTop
+      BorderSpacing.Left = 6
+      BorderSpacing.Top = 6
+      BorderSpacing.Right = 6
+      BorderSpacing.Bottom = 1
       ReadOnly = True
       ScrollBars = ssAutoVertical
       TabOrder = 0
     end
+    object Splitter2: TSplitter
+      Cursor = crVSplit
+      Left = 0
+      Height = 5
+      Top = 72
+      Width = 591
+      Align = alTop
+      Constraints.MinHeight = 3
+      MinSize = 20
+      ResizeAnchor = akTop
+    end
+    object PkgInfoMemoLicense: TMemo
+      Left = 6
+      Height = 31
+      Top = 78
+      Width = 579
+      Align = alClient
+      BorderSpacing.Left = 6
+      BorderSpacing.Top = 1
+      BorderSpacing.Right = 6
+      BorderSpacing.Bottom = 6
+      ReadOnly = True
+      ScrollBars = ssAutoVertical
+      TabOrder = 2
+    end
   end
   object BtnPanel: TPanel
     Left = 0
@@ -69,7 +97,7 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
       TabOrder = 0
     end
     object CancelButton: TBitBtn
-      Left = 193
+      Left = 192
       Height = 26
       Top = 6
       Width = 82
@@ -84,10 +112,10 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
       TabOrder = 1
     end
     object SaveAndExitButton: TBitBtn
-      Left = 455
+      Left = 454
       Height = 26
       Top = 6
-      Width = 146
+      Width = 147
       Align = alRight
       AutoSize = True
       BorderSpacing.Around = 6
@@ -133,7 +161,7 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
       TabOrder = 3
     end
     object SaveAndRebuildButton: TBitBtn
-      Left = 281
+      Left = 280
       Height = 26
       Top = 6
       Width = 168
@@ -186,7 +214,7 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
     Cursor = crVSplit
     Left = 0
     Height = 5
-    Top = 408
+    Top = 400
     Width = 607
     Align = alBottom
     Constraints.MinHeight = 3
@@ -194,7 +222,7 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
   end
   object Panel1: TPanel
     Left = 6
-    Height = 398
+    Height = 390
     Top = 6
     Width = 595
     Align = alClient
@@ -203,7 +231,7 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
     BorderSpacing.Right = 6
     BorderSpacing.Bottom = 4
     BevelOuter = bvNone
-    ClientHeight = 398
+    ClientHeight = 390
     ClientWidth = 595
     Constraints.MinHeight = 210
     TabOrder = 3
@@ -224,7 +252,7 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
       AnchorSideTop.Side = asrCenter
       Left = 294
       Height = 100
-      Top = 149
+      Top = 145
       Width = 6
       Shape = bsSpacer
     end
@@ -236,13 +264,13 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
       AnchorSideBottom.Control = Panel1
       AnchorSideBottom.Side = asrBottom
       Left = 0
-      Height = 377
+      Height = 369
       Top = 21
       Width = 294
       Anchors = [akTop, akLeft, akRight, akBottom]
       AutoSize = True
       Caption = 'InstallPkgGroupBox'
-      ClientHeight = 357
+      ClientHeight = 349
       ClientWidth = 290
       TabOrder = 0
       object ImportButton: TButton
@@ -251,7 +279,7 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
         AnchorSideBottom.Control = ExportButton
         Left = 96
         Height = 25
-        Top = 295
+        Top = 287
         Width = 98
         Anchors = [akLeft, akBottom]
         AutoSize = True
@@ -265,10 +293,10 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
         AnchorSideLeft.Side = asrCenter
         AnchorSideBottom.Control = InstallPkgGroupBox
         AnchorSideBottom.Side = asrBottom
-        Left = 98
+        Left = 97
         Height = 25
-        Top = 326
-        Width = 95
+        Top = 318
+        Width = 96
         Anchors = [akLeft, akBottom]
         AutoSize = True
         BorderSpacing.Bottom = 6
@@ -284,7 +312,7 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
         AnchorSideRight.Side = asrBottom
         AnchorSideBottom.Control = UninstallButton
         Left = 6
-        Height = 227
+        Height = 219
         Top = 31
         Width = 278
         Anchors = [akTop, akLeft, akRight, akBottom]
@@ -306,7 +334,7 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
         AnchorSideBottom.Control = ImportButton
         Left = 91
         Height = 25
-        Top = 264
+        Top = 256
         Width = 108
         Anchors = [akLeft, akBottom]
         AutoSize = True
@@ -351,12 +379,12 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
       AnchorSideBottom.Control = Panel1
       AnchorSideBottom.Side = asrBottom
       Left = 300
-      Height = 377
+      Height = 369
       Top = 21
       Width = 295
       Anchors = [akTop, akLeft, akRight, akBottom]
       Caption = 'AvailablePkgGroupBox'
-      ClientHeight = 357
+      ClientHeight = 349
       ClientWidth = 291
       TabOrder = 1
       object AvailableTreeView: TTreeView
@@ -367,7 +395,7 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
         AnchorSideRight.Side = asrBottom
         AnchorSideBottom.Control = AddToInstallButton
         Left = 6
-        Height = 289
+        Height = 281
         Top = 31
         Width = 279
         Anchors = [akTop, akLeft, akRight, akBottom]
@@ -390,8 +418,8 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
         AnchorSideBottom.Side = asrBottom
         Left = 81
         Height = 25
-        Top = 326
-        Width = 129
+        Top = 318
+        Width = 128
         Anchors = [akLeft, akBottom]
         AutoSize = True
         BorderSpacing.Top = 6

packager/installpkgsetdlg.pas

@@ -75,11 +75,13 @@ type
     PkgInfoMemo: TMemo;
     PkgInfoGroupBox: TGroupBox;
     ImportButton: TButton;
+    PkgInfoMemoLicense: TMemo;
     SaveAndExitButton: TBitBtn;
     InstallPkgGroupBox: TGroupBox;
     SaveAndRebuildButton: TBitBtn;
     InstalledFilterEdit: TTreeFilterEdit;
     Splitter1: TSplitter;
+    Splitter2: TSplitter;
     UninstallButton: TBitBtn;
     procedure AddToInstallButtonClick(Sender: TObject);
     function FilterEditGetImageIndex({%H-}Str: String; {%H-}Data: TObject;
@@ -248,6 +250,7 @@ begin
 
   FNewInstalledPackages:=TObjectList.Create(true);
   PkgInfoMemo.Clear;
+  PkgInfoMemoLicense.Clear;
   LPKInfoCache.AddOnQueueEmpty(@OnAllLPKParsed);
   LPKInfoCache.StartLPKReaderWithAllAvailable;
 
@@ -783,6 +786,7 @@ begin
     then
       exit; // no change
     PkgInfoMemo.Clear;
+    PkgInfoMemoLicense.Clear;
     if (Info=nil) then begin
       FSelectedPkgID:='';
       exit;
@@ -816,8 +820,9 @@ begin
     if Description<>'' then
       PkgInfoMemo.Lines.Add(lisPckOptsDescriptionAbstract + ': ' + Description);
     if License<>'' then
-      PkgInfoMemo.Lines.Add(lisPckOptsLicense + ': ' + License);
+      PkgInfoMemoLicense.Lines.Add(lisPckOptsLicense + ': ' + License);
 
+    PkgInfoMemo.Lines.Add('');
     PkgInfoMemo.Lines.Add(Format(lisOIPFilename, [Info.LPKFilename]));
 
     InfoStr:=lisCurrentState;
@@ -840,6 +845,7 @@ begin
     AddState(LazPackageTypeIdents[Info.PkgType]);
     PkgInfoMemo.Lines.Add(InfoStr);
     PkgInfoMemo.SelStart := 1;
+    PkgInfoMemoLicense.SelStart := 1;
   finally
     LPKInfoCache.LeaveCritSection;
   end;