mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-11-08 06:29:36 +01:00
Packager: Put Description first in info box of Install/Uninstall Packages. Improve anchors and size. Issue #36107.
git-svn-id: trunk@62640 -
This commit is contained in:
juha
parent
0961a5797a
commit
b70c8ac8e7
@ -1,12 +1,12 @@
|
||||
object InstallPkgSetDialog: TInstallPkgSetDialog
|
||||
Left = 378
|
||||
Height = 578
|
||||
Height = 638
|
||||
Top = 219
|
||||
Width = 607
|
||||
ActiveControl = AvailableFilterEdit
|
||||
BorderStyle = bsSizeToolWin
|
||||
Caption = 'InstallPkgSetDialog'
|
||||
ClientHeight = 578
|
||||
ClientHeight = 638
|
||||
ClientWidth = 607
|
||||
Constraints.MinHeight = 400
|
||||
Constraints.MinWidth = 450
|
||||
@ -20,23 +20,23 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
|
||||
object PkgInfoGroupBox: TGroupBox
|
||||
AnchorSideBottom.Control = BtnPanel
|
||||
Left = 6
|
||||
Height = 135
|
||||
Top = 405
|
||||
Height = 160
|
||||
Top = 437
|
||||
Width = 595
|
||||
Align = alBottom
|
||||
BorderSpacing.Left = 6
|
||||
BorderSpacing.Right = 6
|
||||
Caption = 'PkgInfoGroupBox'
|
||||
ClientHeight = 115
|
||||
ClientHeight = 130
|
||||
ClientWidth = 591
|
||||
Constraints.MinHeight = 70
|
||||
TabOrder = 0
|
||||
object PkgInfoMemo: TMemo
|
||||
Left = 6
|
||||
Height = 65
|
||||
Height = 80
|
||||
Top = 6
|
||||
Width = 579
|
||||
Align = alTop
|
||||
Align = alClient
|
||||
BorderSpacing.Left = 6
|
||||
BorderSpacing.Top = 6
|
||||
BorderSpacing.Right = 6
|
||||
@ -49,19 +49,19 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
|
||||
Cursor = crVSplit
|
||||
Left = 0
|
||||
Height = 5
|
||||
Top = 72
|
||||
Top = 87
|
||||
Width = 591
|
||||
Align = alTop
|
||||
Align = alBottom
|
||||
Constraints.MinHeight = 3
|
||||
MinSize = 20
|
||||
ResizeAnchor = akTop
|
||||
ResizeAnchor = akBottom
|
||||
end
|
||||
object PkgInfoMemoLicense: TMemo
|
||||
Left = 6
|
||||
Height = 31
|
||||
Top = 78
|
||||
Top = 93
|
||||
Width = 579
|
||||
Align = alClient
|
||||
Align = alBottom
|
||||
BorderSpacing.Left = 6
|
||||
BorderSpacing.Top = 1
|
||||
BorderSpacing.Right = 6
|
||||
@ -73,18 +73,18 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
|
||||
end
|
||||
object BtnPanel: TPanel
|
||||
Left = 0
|
||||
Height = 38
|
||||
Top = 540
|
||||
Height = 41
|
||||
Top = 597
|
||||
Width = 607
|
||||
Align = alBottom
|
||||
AutoSize = True
|
||||
BevelOuter = bvNone
|
||||
ClientHeight = 38
|
||||
ClientHeight = 41
|
||||
ClientWidth = 607
|
||||
TabOrder = 1
|
||||
object HelpButton: TBitBtn
|
||||
Left = 6
|
||||
Height = 26
|
||||
Height = 29
|
||||
Top = 6
|
||||
Width = 75
|
||||
Align = alLeft
|
||||
@ -97,10 +97,10 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
|
||||
TabOrder = 0
|
||||
end
|
||||
object CancelButton: TBitBtn
|
||||
Left = 192
|
||||
Height = 26
|
||||
Left = 164
|
||||
Height = 29
|
||||
Top = 6
|
||||
Width = 82
|
||||
Width = 83
|
||||
Align = alRight
|
||||
AutoSize = True
|
||||
BorderSpacing.Around = 6
|
||||
@ -112,10 +112,10 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
|
||||
TabOrder = 1
|
||||
end
|
||||
object SaveAndExitButton: TBitBtn
|
||||
Left = 454
|
||||
Height = 26
|
||||
Left = 442
|
||||
Height = 29
|
||||
Top = 6
|
||||
Width = 147
|
||||
Width = 159
|
||||
Align = alRight
|
||||
AutoSize = True
|
||||
BorderSpacing.Around = 6
|
||||
@ -161,10 +161,10 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
|
||||
TabOrder = 3
|
||||
end
|
||||
object SaveAndRebuildButton: TBitBtn
|
||||
Left = 280
|
||||
Height = 26
|
||||
Left = 253
|
||||
Height = 29
|
||||
Top = 6
|
||||
Width = 168
|
||||
Width = 183
|
||||
Align = alRight
|
||||
AutoSize = True
|
||||
BorderSpacing.Around = 6
|
||||
@ -214,7 +214,7 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
|
||||
Cursor = crVSplit
|
||||
Left = 0
|
||||
Height = 5
|
||||
Top = 400
|
||||
Top = 432
|
||||
Width = 607
|
||||
Align = alBottom
|
||||
Constraints.MinHeight = 3
|
||||
@ -222,7 +222,7 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
|
||||
end
|
||||
object Panel1: TPanel
|
||||
Left = 6
|
||||
Height = 390
|
||||
Height = 422
|
||||
Top = 6
|
||||
Width = 595
|
||||
Align = alClient
|
||||
@ -231,13 +231,13 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
|
||||
BorderSpacing.Right = 6
|
||||
BorderSpacing.Bottom = 4
|
||||
BevelOuter = bvNone
|
||||
ClientHeight = 390
|
||||
ClientHeight = 422
|
||||
ClientWidth = 595
|
||||
Constraints.MinHeight = 210
|
||||
TabOrder = 3
|
||||
object NoteLabel: TLabel
|
||||
Left = 0
|
||||
Height = 15
|
||||
Height = 18
|
||||
Top = 0
|
||||
Width = 595
|
||||
Align = alTop
|
||||
@ -252,7 +252,7 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
|
||||
AnchorSideTop.Side = asrCenter
|
||||
Left = 294
|
||||
Height = 100
|
||||
Top = 145
|
||||
Top = 161
|
||||
Width = 6
|
||||
Shape = bsSpacer
|
||||
end
|
||||
@ -264,13 +264,13 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
|
||||
AnchorSideBottom.Control = Panel1
|
||||
AnchorSideBottom.Side = asrBottom
|
||||
Left = 0
|
||||
Height = 369
|
||||
Top = 21
|
||||
Height = 398
|
||||
Top = 24
|
||||
Width = 294
|
||||
Anchors = [akTop, akLeft, akRight, akBottom]
|
||||
AutoSize = True
|
||||
Caption = 'InstallPkgGroupBox'
|
||||
ClientHeight = 349
|
||||
ClientHeight = 368
|
||||
ClientWidth = 290
|
||||
Constraints.MinWidth = 200
|
||||
TabOrder = 0
|
||||
@ -282,8 +282,8 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
|
||||
AnchorSideRight.Side = asrBottom
|
||||
AnchorSideBottom.Control = UninstallButton
|
||||
Left = 6
|
||||
Height = 250
|
||||
Top = 31
|
||||
Height = 247
|
||||
Top = 40
|
||||
Width = 278
|
||||
Anchors = [akTop, akLeft, akRight, akBottom]
|
||||
MultiSelect = True
|
||||
@ -302,10 +302,10 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
|
||||
AnchorSideLeft.Control = InstallTreeView
|
||||
AnchorSideLeft.Side = asrCenter
|
||||
AnchorSideBottom.Control = Panel2
|
||||
Left = 91
|
||||
Height = 25
|
||||
Top = 287
|
||||
Width = 108
|
||||
Left = 90
|
||||
Height = 29
|
||||
Top = 293
|
||||
Width = 110
|
||||
Anchors = [akLeft, akBottom]
|
||||
AutoSize = True
|
||||
BorderSpacing.Top = 6
|
||||
@ -321,7 +321,7 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
|
||||
AnchorSideRight.Control = InstallPkgGroupBox
|
||||
AnchorSideRight.Side = asrBottom
|
||||
Left = 6
|
||||
Height = 23
|
||||
Height = 32
|
||||
Top = 2
|
||||
Width = 278
|
||||
ButtonWidth = 23
|
||||
@ -345,8 +345,8 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
|
||||
AnchorSideBottom.Control = InstallPkgGroupBox
|
||||
AnchorSideBottom.Side = asrBottom
|
||||
Left = 0
|
||||
Height = 25
|
||||
Top = 318
|
||||
Height = 34
|
||||
Top = 328
|
||||
Width = 290
|
||||
Anchors = [akLeft, akRight, akBottom]
|
||||
AutoSize = True
|
||||
@ -359,15 +359,15 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
|
||||
ChildSizing.ShrinkHorizontal = crsHomogenousChildResize
|
||||
ChildSizing.Layout = cclLeftToRightThenTopToBottom
|
||||
ChildSizing.ControlsPerLine = 2
|
||||
ClientHeight = 25
|
||||
ClientHeight = 34
|
||||
ClientWidth = 290
|
||||
TabOrder = 3
|
||||
object ImportButton: TButton
|
||||
AnchorSideLeft.Side = asrCenter
|
||||
Left = 32
|
||||
Height = 25
|
||||
Left = 31
|
||||
Height = 34
|
||||
Top = 0
|
||||
Width = 98
|
||||
Width = 101
|
||||
Caption = 'ImportButton'
|
||||
OnClick = ImportButtonClick
|
||||
TabOrder = 0
|
||||
@ -375,10 +375,10 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
|
||||
object ExportButton: TButton
|
||||
AnchorSideLeft.Side = asrCenter
|
||||
AnchorSideBottom.Side = asrBottom
|
||||
Left = 162
|
||||
Height = 25
|
||||
Left = 163
|
||||
Height = 34
|
||||
Top = 0
|
||||
Width = 96
|
||||
Width = 98
|
||||
Caption = 'ExportButton'
|
||||
OnClick = ExportButtonClick
|
||||
TabOrder = 1
|
||||
@ -395,12 +395,12 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
|
||||
AnchorSideBottom.Control = Panel1
|
||||
AnchorSideBottom.Side = asrBottom
|
||||
Left = 300
|
||||
Height = 369
|
||||
Top = 21
|
||||
Height = 398
|
||||
Top = 24
|
||||
Width = 295
|
||||
Anchors = [akTop, akLeft, akRight, akBottom]
|
||||
Caption = 'AvailablePkgGroupBox'
|
||||
ClientHeight = 349
|
||||
ClientHeight = 368
|
||||
ClientWidth = 291
|
||||
TabOrder = 1
|
||||
object AvailableTreeView: TTreeView
|
||||
@ -411,8 +411,8 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
|
||||
AnchorSideRight.Side = asrBottom
|
||||
AnchorSideBottom.Control = AddToInstallButton
|
||||
Left = 6
|
||||
Height = 281
|
||||
Top = 31
|
||||
Height = 287
|
||||
Top = 40
|
||||
Width = 279
|
||||
Anchors = [akTop, akLeft, akRight, akBottom]
|
||||
MultiSelect = True
|
||||
@ -432,10 +432,10 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
|
||||
AnchorSideLeft.Side = asrCenter
|
||||
AnchorSideBottom.Control = AvailablePkgGroupBox
|
||||
AnchorSideBottom.Side = asrBottom
|
||||
Left = 81
|
||||
Height = 25
|
||||
Top = 318
|
||||
Width = 128
|
||||
Left = 79
|
||||
Height = 29
|
||||
Top = 333
|
||||
Width = 132
|
||||
Anchors = [akLeft, akBottom]
|
||||
AutoSize = True
|
||||
BorderSpacing.Top = 6
|
||||
@ -450,7 +450,7 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
|
||||
AnchorSideRight.Control = AvailablePkgGroupBox
|
||||
AnchorSideRight.Side = asrBottom
|
||||
Left = 6
|
||||
Height = 23
|
||||
Height = 32
|
||||
Top = 2
|
||||
Width = 279
|
||||
ButtonWidth = 23
|
||||
|
||||
@ -807,25 +807,25 @@ begin
|
||||
if PackageLink = nil then
|
||||
begin
|
||||
Author := Info.Author;
|
||||
Description := Info.Description;
|
||||
Description := Trim(Info.Description);
|
||||
License := Info.License;
|
||||
end
|
||||
else
|
||||
begin
|
||||
Author := PackageLink.Author;
|
||||
Description := PackageLink.Description;
|
||||
Description := Trim(PackageLink.Description);
|
||||
License := PackageLink.License;
|
||||
end;
|
||||
|
||||
if Author<>'' then
|
||||
PkgInfoMemo.Lines.Add(lisPckOptsAuthor + ': ' + Author);
|
||||
if Description<>'' then
|
||||
PkgInfoMemo.Lines.Add(lisPckOptsDescriptionAbstract + ': ' + Description);
|
||||
if License<>'' then
|
||||
PkgInfoMemoLicense.Lines.Add(lisPckOptsLicense + ': ' + License);
|
||||
|
||||
if Description<>'' then // Description is the most interesting piece.
|
||||
PkgInfoMemo.Lines.Add(Description); // Put it first.
|
||||
PkgInfoMemo.Lines.Add('');
|
||||
PkgInfoMemo.Lines.Add(Format(lisOIPFilename, [Info.LPKFilename]));
|
||||
if Author<>'' then
|
||||
PkgInfoMemo.Lines.Add(lisPckOptsAuthor + ': ' + Author); // Author
|
||||
PkgInfoMemo.Lines.Add(Format(lisOIPFilename, [Info.LPKFilename])); // Pkg name
|
||||
|
||||
if License<>'' then // License has its own memo.
|
||||
PkgInfoMemoLicense.Lines.Add(lisPckOptsLicense + ': ' + License);
|
||||
|
||||
InfoStr:=lisCurrentState;
|
||||
if Info.Installed<>pitNope then
|
||||
|
||||
Loading…
Reference in New Issue
Block a user