Opkman: Improved CreateRepositoryPackage form. Issue #31498, patch from AlexeyT.

git-svn-id: trunk@54476 -
This commit is contained in:
balazs 2017-03-24 09:18:07 +00:00
parent 0b5b2b361c
commit 347279cda5
3 changed files with 235 additions and 136 deletions

View File

@ -12,8 +12,8 @@ object CreateRepositoryPackagefr: TCreateRepositoryPackagefr
DesignTop = 213
object pnMessage: TPanel
Left = 247
Height = 400
Top = 65
Height = 408
Top = 57
Width = 503
Align = alClient
BevelOuter = bvNone
@ -31,8 +31,8 @@ object CreateRepositoryPackagefr: TCreateRepositoryPackagefr
end
object pnPackages: TPanel
Left = 0
Height = 400
Top = 65
Height = 408
Top = 57
Width = 245
Align = alLeft
BevelOuter = bvNone
@ -40,40 +40,52 @@ object CreateRepositoryPackagefr: TCreateRepositoryPackagefr
end
object pnBrowse: TPanel
Left = 0
Height = 65
Height = 57
Top = 0
Width = 750
Align = alTop
BevelOuter = bvNone
ClientHeight = 65
ClientHeight = 57
ClientWidth = 750
TabOrder = 0
OnResize = pnBrowseResize
object lbPackagedir: TLabel
Left = 32
Height = 15
Top = 12
Width = 68
AnchorSideLeft.Control = pnBrowse
AnchorSideTop.Control = pnBrowse
AnchorSideTop.Side = asrCenter
Left = 6
Height = 17
Top = 20
Width = 88
Alignment = taRightJustify
BorderSpacing.Left = 6
Caption = 'lbPackagedir'
ParentColor = False
end
object Bevel1: TBevel
Left = 0
Height = 2
Top = 63
Top = 55
Width = 750
Align = alBottom
end
object edPackageDir: TDirectoryEdit
Left = 109
Height = 23
Top = 9
Width = 615
AnchorSideLeft.Control = lbPackagedir
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = lbPackagedir
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = pnBrowse
AnchorSideRight.Side = asrBottom
Left = 100
Height = 27
Top = 15
Width = 644
OnAcceptDirectory = edPackageDirAcceptDirectory
ShowHidden = False
ButtonWidth = 23
ButtonWidth = 50
NumGlyphs = 1
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Around = 6
MaxLength = 0
TabOrder = 0
OnButtonClick = edPackageDirButtonClick
@ -81,79 +93,79 @@ object CreateRepositoryPackagefr: TCreateRepositoryPackagefr
end
object pnData: TPanel
Left = 247
Height = 400
Top = 65
Height = 408
Top = 57
Width = 503
Align = alClient
BevelOuter = bvNone
ClientHeight = 400
ClientHeight = 408
ClientWidth = 503
TabOrder = 2
object pnPackageData: TPanel
Left = 0
Height = 211
Height = 219
Top = 189
Width = 503
Align = alClient
BevelOuter = bvNone
BorderStyle = bsSingle
ClientHeight = 207
ClientWidth = 499
TabOrder = 0
ClientHeight = 217
ClientWidth = 501
TabOrder = 1
Visible = False
object edSupportedWidgetset: TEdit
Left = 170
Height = 23
Height = 27
Top = 80
Width = 300
Width = 302
Anchors = [akTop, akLeft, akRight]
TabOrder = 0
TabOrder = 2
end
object lbLazCompatibility: TLabel
Left = 9
Height = 15
Height = 17
Top = 14
Width = 99
Width = 128
Caption = 'lbLazCompatibility'
ParentColor = False
end
object lbFPCCompatibility: TLabel
Left = 9
Height = 15
Height = 17
Top = 50
Width = 103
Width = 131
Caption = 'lbFPCCompatibility'
ParentColor = False
end
object edLazCompatibility: TEdit
Left = 170
Height = 23
Height = 27
Top = 8
Width = 300
Width = 302
Anchors = [akTop, akLeft, akRight]
TabOrder = 1
TabOrder = 0
end
object edFPCCompatibility: TEdit
Left = 170
Height = 23
Height = 27
Top = 45
Width = 300
Width = 302
Anchors = [akTop, akLeft, akRight]
TabOrder = 2
TabOrder = 1
end
object lbSupportedWidgetSet: TLabel
Left = 9
Height = 15
Height = 17
Top = 85
Width = 119
Width = 156
Caption = 'lbSupportedWidgetSet'
ParentColor = False
end
object lbOF1: TLabel
Left = 474
Height = 15
Height = 17
Top = 14
Width = 5
Width = 7
Anchors = [akTop, akRight]
Caption = '*'
Font.Color = clRed
@ -163,9 +175,9 @@ object CreateRepositoryPackagefr: TCreateRepositoryPackagefr
end
object lbOF3: TLabel
Left = 474
Height = 15
Height = 17
Top = 50
Width = 5
Width = 7
Anchors = [akTop, akRight]
Caption = '*'
Font.Color = clRed
@ -175,9 +187,9 @@ object CreateRepositoryPackagefr: TCreateRepositoryPackagefr
end
object lbOF4: TLabel
Left = 474
Height = 15
Height = 17
Top = 85
Width = 5
Width = 7
Anchors = [akTop, akRight]
Caption = '*'
Font.Color = clRed
@ -194,23 +206,23 @@ object CreateRepositoryPackagefr: TCreateRepositoryPackagefr
Align = alTop
BevelOuter = bvNone
BorderStyle = bsSingle
ClientHeight = 185
ClientWidth = 499
TabOrder = 1
ClientHeight = 187
ClientWidth = 501
TabOrder = 0
Visible = False
object lbCategory: TLabel
Left = 9
Height = 15
Height = 17
Top = 14
Width = 58
Width = 74
Caption = 'lbCategory'
ParentColor = False
end
object lbOF2: TLabel
Left = 474
Height = 15
Height = 17
Top = 14
Width = 5
Width = 7
Anchors = [akTop, akRight]
Caption = '*'
Font.Color = clRed
@ -220,87 +232,87 @@ object CreateRepositoryPackagefr: TCreateRepositoryPackagefr
end
object lbHomePageURL: TLabel
Left = 9
Height = 15
Height = 17
Top = 87
Width = 90
Width = 113
Caption = 'lbHomePageURL'
ParentColor = False
end
object lbDownloadURL: TLabel
Left = 9
Height = 15
Height = 17
Top = 123
Width = 85
Width = 108
Caption = 'lbDownloadURL'
ParentColor = False
end
object edHomePageURL: TEdit
Left = 170
Height = 23
Height = 27
Top = 83
Width = 300
Width = 302
Anchors = [akTop, akLeft, akRight]
TabOrder = 0
TabOrder = 2
end
object edDownloadURL: TEdit
Left = 170
Height = 23
Height = 27
Top = 118
Width = 300
Width = 302
Anchors = [akTop, akLeft, akRight]
TabOrder = 1
TabOrder = 3
end
object lbSVNURL: TLabel
Left = 9
Height = 15
Height = 17
Top = 154
Width = 53
Width = 69
Caption = 'lbSVNURL'
ParentColor = False
Visible = False
end
object edSVNURL: TEdit
Left = 170
Height = 23
Height = 27
Top = 152
Width = 300
Width = 302
Anchors = [akTop, akLeft, akRight]
TabOrder = 2
TabOrder = 4
Visible = False
end
object lbDisplayName: TLabel
Left = 9
Height = 15
Height = 17
Top = 53
Width = 80
Width = 102
Caption = 'lbDisplayName'
ParentColor = False
end
object edDisplayName: TEdit
Left = 170
Height = 23
Height = 27
Top = 48
Width = 300
Width = 302
Anchors = [akTop, akLeft, akRight]
TabOrder = 3
TabOrder = 1
end
object pnCategories: TPanel
Left = 170
Height = 23
Height = 27
Top = 9
Width = 301
Width = 303
Anchors = [akTop, akLeft, akRight]
AutoSize = True
BevelOuter = bvNone
ClientHeight = 23
ClientWidth = 301
ClientHeight = 27
ClientWidth = 303
ParentColor = False
TabOrder = 4
TabOrder = 0
object spCategories: TSpeedButton
Left = 271
Height = 23
Left = 253
Height = 27
Top = 0
Width = 30
Width = 50
Align = alRight
Caption = '...'
OnClick = spCategoriesClick
@ -309,9 +321,9 @@ object CreateRepositoryPackagefr: TCreateRepositoryPackagefr
end
object edCategories: TEdit
Left = 0
Height = 23
Height = 27
Top = 0
Width = 271
Width = 253
Align = alClient
AutoSize = False
ParentShowHint = False
@ -324,8 +336,8 @@ object CreateRepositoryPackagefr: TCreateRepositoryPackagefr
end
object spMain: TSplitter
Left = 245
Height = 400
Top = 65
Height = 408
Top = 57
Width = 2
AutoSnap = False
Color = 14671839
@ -340,99 +352,119 @@ object CreateRepositoryPackagefr: TCreateRepositoryPackagefr
Align = alBottom
BevelOuter = bvNone
BorderStyle = bsSingle
ClientHeight = 37
ClientWidth = 746
ClientHeight = 39
ClientWidth = 748
TabOrder = 5
object cbJSONForUpdates: TCheckBox
Left = 10
Height = 19
Top = 9
Width = 148
AnchorSideLeft.Control = pnButtons
AnchorSideTop.Control = pnButtons
AnchorSideTop.Side = asrCenter
Left = 6
Height = 24
Top = 7
Width = 193
BorderSpacing.Left = 6
Caption = 'Create JSON for updates'
TabOrder = 0
end
object pnB: TPanel
Left = 322
Height = 29
Top = 2
Width = 400
AnchorSideTop.Control = pnButtons
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = pnButtons
AnchorSideRight.Side = asrBottom
Left = 334
Height = 33
Top = 3
Width = 408
Anchors = [akTop, akRight]
AutoSize = True
BorderSpacing.Around = 6
BorderSpacing.InnerBorder = 1
BevelOuter = bvNone
ClientHeight = 29
ClientWidth = 400
ClientHeight = 33
ClientWidth = 408
TabOrder = 1
object bCancel: TButton
Left = 324
Height = 27
Left = 327
Height = 31
Top = 1
Width = 75
Width = 80
Align = alRight
AutoSize = True
BorderSpacing.Around = 1
Caption = 'Cancel'
Constraints.MinWidth = 80
Enabled = False
ModalResult = 2
OnClick = bCancelClick
ParentShowHint = False
ShowHint = True
TabOrder = 0
TabOrder = 4
end
object bCreate: TButton
Left = 172
Height = 27
Left = 165
Height = 31
Top = 1
Width = 75
Width = 80
Align = alRight
AutoSize = True
BorderSpacing.Around = 1
Caption = 'Create'
Constraints.MinWidth = 80
Enabled = False
OnClick = bCreateClick
ParentShowHint = False
ShowHint = True
TabOrder = 1
TabOrder = 2
Visible = False
end
object bSubmit: TButton
Left = 248
Height = 27
Left = 246
Height = 31
Top = 1
Width = 75
Width = 80
Align = alRight
AutoSize = True
BorderSpacing.Around = 1
Caption = 'Submit'
Constraints.MinWidth = 80
Enabled = False
OnClick = bSubmitClick
ParentShowHint = False
ShowHint = True
TabOrder = 2
TabOrder = 3
end
object bOptions: TButton
Left = 96
Height = 27
Left = 84
Height = 31
Top = 1
Width = 75
Width = 80
Align = alRight
AutoSize = True
BorderSpacing.Around = 1
Caption = 'Options'
Constraints.MinWidth = 80
Enabled = False
OnClick = bOptionsClick
ParentShowHint = False
ShowHint = True
TabOrder = 3
TabOrder = 1
end
object bHelp: TButton
Left = 20
Height = 27
Left = 3
Height = 31
Top = 1
Width = 75
Width = 80
Align = alRight
AutoSize = True
BorderSpacing.Around = 1
Caption = 'Help'
Constraints.MinWidth = 80
Enabled = False
OnClick = bHelpClick
ParentShowHint = False
ShowHint = True
TabOrder = 4
TabOrder = 0
end
end
end

View File

@ -170,8 +170,6 @@ begin
bCancel.Hint := rsCreateRepositoryPackageFrm_bCancel_Hint;
bSubmit.Visible := ATyp = 0;
cbJSONForUpdates.Visible := ATyp = 0;
pnB.Height := bSubmit.Height + 1;
pnB.Top := (pnButtons.Height - pnB.Height) div 2;
bCreate.Visible := ATyp = 0;
FVSTPackages := TVirtualStringTree.Create(nil);
@ -482,11 +480,11 @@ end;
procedure TCreateRepositoryPackagefr.pnBrowseResize(Sender: TObject);
begin
edPackageDir.Top := (pnBrowse.Height - edPackageDir.Height) div 2;
lbPackageDir.Left := 100;
lbPackageDir.Top := edPackageDir.Top + (edPackageDir.Height - lbPackageDir.Height) div 2;
edPackageDir.Left := lbPackagedir.Left + lbPackagedir.Width + 5;
edPackageDir.Width := pnBrowse.Width - edPackageDir.Left - 120;
//edPackageDir.Top := (pnBrowse.Height - edPackageDir.Height) div 2;
//lbPackageDir.Left := 100;
//lbPackageDir.Top := edPackageDir.Top + (edPackageDir.Height - lbPackageDir.Height) div 2;
//edPackageDir.Left := lbPackagedir.Left + lbPackagedir.Width + 5;
//edPackageDir.Width := pnBrowse.Width - edPackageDir.Left - 120;
end;
procedure TCreateRepositoryPackagefr.spCategoriesClick(Sender: TObject);

View File

@ -1,12 +1,12 @@
object CreateRepositoryPackagesFrm: TCreateRepositoryPackagesFrm
Left = 550
Height = 450
Height = 454
Top = 254
Width = 750
Width = 753
BorderIcons = [biSystemMenu]
Caption = 'CreateRepositoryPackagesFrm'
ClientHeight = 450
ClientWidth = 750
ClientHeight = 454
ClientWidth = 753
Color = clBtnFace
Constraints.MinHeight = 450
Constraints.MinWidth = 650
@ -16,28 +16,97 @@ object CreateRepositoryPackagesFrm: TCreateRepositoryPackagesFrm
Position = poOwnerFormCenter
LCLVersion = '1.7'
inline frCreateRep: TCreateRepositoryPackagefr
Height = 450
Height = 454
Width = 753
Align = alClient
ClientHeight = 450
ClientHeight = 454
ClientWidth = 753
inherited pnMessage: TPanel
Height = 336
Height = 356
Width = 506
end
inherited pnPackages: TPanel
Height = 336
Height = 356
end
inherited pnBrowse: TPanel
Width = 753
ClientWidth = 753
inherited Bevel1: TBevel
Width = 753
end
inherited edPackageDir: TDirectoryEdit
Width = 667
end
end
inherited pnData: TPanel
Height = 336
ClientHeight = 336
Height = 356
Width = 506
ClientHeight = 356
ClientWidth = 506
inherited pnPackageData: TPanel
Height = 147
ClientHeight = 143
Height = 167
Width = 506
ClientHeight = 163
ClientWidth = 502
inherited edSupportedWidgetset: TEdit
Width = 303
end
inherited edLazCompatibility: TEdit
Width = 303
end
inherited edFPCCompatibility: TEdit
Width = 303
end
inherited lbOF1: TLabel
Left = 477
end
inherited lbOF3: TLabel
Left = 477
end
inherited lbOF4: TLabel
Left = 477
end
end
inherited pnCategory: TPanel
Width = 506
ClientWidth = 502
inherited lbOF2: TLabel
Left = 477
end
inherited edHomePageURL: TEdit
Width = 303
end
inherited edDownloadURL: TEdit
Width = 303
end
inherited edSVNURL: TEdit
Width = 303
end
inherited edDisplayName: TEdit
Width = 303
end
inherited pnCategories: TPanel
Width = 304
ClientWidth = 304
inherited spCategories: TSpeedButton
Left = 254
end
inherited edCategories: TEdit
Width = 254
end
end
end
end
inherited spMain: TSplitter
Height = 336
Height = 356
end
inherited pnButtons: TPanel
Top = 401
Top = 413
Width = 753
ClientWidth = 749
inherited pnB: TPanel
Left = 335
end
end
end
end