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

Merged revision(s) 59543-59544 #24d3c9d127-#24d3c9d127 from trunk:

Browse Source 
Packager: Add BorderSpacing values for controls in IDE package graph dialog (issue #34553).
........
IDE: Improve layout of Publish Project dialog. Issue #34547, patch from AlexeyT.
........

git-svn-id: branches/fixes_2_0@59549 -
This commit is contained in:
maxim 2018-11-15 22:17:28 +00:00
parent 75e107f774
commit 7a5a1c0024
2 changed files with 64 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
ide/publishmoduledlg.lfm
View File

@ -10,7 +10,7 @@ object PublishModuleDialog: TPublishModuleDialog
OnClose = FormClose OnClose = FormClose
OnCreate = FormCreate OnCreate = FormCreate
Position = poScreenCenter Position = poScreenCenter
LCLVersion = '1.9.0.0' LCLVersion = '2.1.0.0'
object DestDirGroupBox: TGroupBox object DestDirGroupBox: TGroupBox
Left = 6 Left = 6
Height = 66 Height = 66
@ -21,17 +21,17 @@ object PublishModuleDialog: TPublishModuleDialog
Caption = 'Destination directory' Caption = 'Destination directory'
ChildSizing.LeftRightSpacing = 6 ChildSizing.LeftRightSpacing = 6
ChildSizing.TopBottomSpacing = 6 ChildSizing.TopBottomSpacing = 6
ClientHeight = 46 ClientHeight = 47
ClientWidth = 626 ClientWidth = 626
TabOrder = 0 TabOrder = 0
object DestDirComboBox: TComboBox object DestDirComboBox: TComboBox
AnchorSideRight.Control = BrowseDestDirBitBtn AnchorSideRight.Control = BrowseDestDirBitBtn
Left = 6 Left = 6
Height = 23 Height = 29
Top = 6 Top = 6
Width = 589 Width = 564
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
ItemHeight = 15 ItemHeight = 0
TabOrder = 0 TabOrder = 0
Text = 'DestDirComboBox' Text = 'DestDirComboBox'
end end
@ -40,10 +40,10 @@ object PublishModuleDialog: TPublishModuleDialog
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
AnchorSideBottom.Control = DestDirComboBox AnchorSideBottom.Control = DestDirComboBox
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 595 Left = 570
Height = 23 Height = 29
Top = 6 Top = 6
Width = 25 Width = 50
Anchors = [akTop, akRight, akBottom] Anchors = [akTop, akRight, akBottom]
BorderSpacing.Right = 6 BorderSpacing.Right = 6
Caption = '...' Caption = '...'
@ -55,24 +55,24 @@ object PublishModuleDialog: TPublishModuleDialog
AnchorSideTop.Control = FilterCombobox AnchorSideTop.Control = FilterCombobox
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 6 Left = 6
Height = 51 Height = 55
Top = 189 Top = 166
Width = 628 Width = 628
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
AutoSize = True AutoSize = True
BorderSpacing.Around = 18 BorderSpacing.Around = 6
Caption = 'Options' Caption = 'Options'
ChildSizing.TopBottomSpacing = 6 ChildSizing.TopBottomSpacing = 6
ClientHeight = 31 ClientHeight = 36
ClientWidth = 624 ClientWidth = 624
TabOrder = 1 TabOrder = 4
object CompressCheckbox: TCheckBox object CompressCheckbox: TCheckBox
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 6 Left = 6
Height = 19 Height = 24
Hint = 'Compress the whole directory into a ZIP file.' Hint = 'Compress the whole directory into a ZIP file.'
Top = 6 Top = 6
Width = 73 Width = 94
BorderSpacing.Around = 6 BorderSpacing.Around = 6
Caption = 'Compress' Caption = 'Compress'
ParentShowHint = False ParentShowHint = False
@ -82,10 +82,10 @@ object PublishModuleDialog: TPublishModuleDialog
object OpenInFileManCheckbox: TCheckBox object OpenInFileManCheckbox: TCheckBox
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 108 Left = 108
Height = 19 Height = 24
Hint = 'Open destination directory in file manager' Hint = 'Open destination directory in file manager'
Top = 6 Top = 6
Width = 131 Width = 163
BorderSpacing.Around = 6 BorderSpacing.Around = 6
Caption = 'Open in file manager' Caption = 'Open in file manager'
ParentShowHint = False ParentShowHint = False
@ -95,8 +95,8 @@ object PublishModuleDialog: TPublishModuleDialog
end end
object ButtonPanel1: TButtonPanel object ButtonPanel1: TButtonPanel
Left = 6 Left = 6
Height = 26 Height = 29
Top = 288 Top = 285
Width = 630 Width = 630
OKButton.Name = 'OKButton' OKButton.Name = 'OKButton'
OKButton.DefaultCaption = True OKButton.DefaultCaption = True
@ -106,28 +106,28 @@ object PublishModuleDialog: TPublishModuleDialog
CloseButton.DefaultCaption = True CloseButton.DefaultCaption = True
CancelButton.Name = 'CancelButton' CancelButton.Name = 'CancelButton'
CancelButton.DefaultCaption = True CancelButton.DefaultCaption = True
TabOrder = 2 TabOrder = 5
ShowBevel = False ShowBevel = False
end end
object UseFiltersCheckbox: TCheckBox object UseFiltersCheckbox: TCheckBox
AnchorSideTop.Control = NoteLabel AnchorSideTop.Control = NoteLabel
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 6 Left = 6
Height = 19 Height = 24
Top = 111 Top = 101
Width = 136 Width = 181
BorderSpacing.Around = 18 BorderSpacing.Around = 6
Caption = 'Use filter for extra files' Caption = 'Use filter for extra files'
OnClick = UseFiltersCheckboxClick OnClick = UseFiltersCheckboxClick
TabOrder = 3 TabOrder = 1
end end
object NoteLabel: TLabel object NoteLabel: TLabel
AnchorSideTop.Control = DestDirGroupBox AnchorSideTop.Control = DestDirGroupBox
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 6 Left = 6
Height = 15 Height = 17
Top = 78 Top = 78
Width = 350 Width = 431
BorderSpacing.Around = 6 BorderSpacing.Around = 6
Caption = 'Files belonging to project / package will be included automatically.' Caption = 'Files belonging to project / package will be included automatically.'
Font.Color = clMaroon Font.Color = clMaroon
@ -141,29 +141,28 @@ object PublishModuleDialog: TPublishModuleDialog
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = FilterSimpleSyntaxCheckbox AnchorSideRight.Control = FilterSimpleSyntaxCheckbox
Left = 24 Left = 24
Height = 23 Height = 29
Top = 148 Top = 131
Width = 480 Width = 460
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
AutoSize = False
BorderSpacing.Left = 18 BorderSpacing.Left = 18
ItemHeight = 15 ItemHeight = 0
TabOrder = 4 TabOrder = 2
Text = 'FilterCombobox' Text = 'FilterCombobox'
end end
object FilterSimpleSyntaxCheckbox: TCheckBox object FilterSimpleSyntaxCheckbox: TCheckBox
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = FilterCombobox AnchorSideTop.Control = FilterCombobox
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
Left = 517 Left = 490
Height = 19 Height = 24
Top = 150 Top = 133
Width = 93 Width = 120
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
BorderSpacing.Around = 13 BorderSpacing.Around = 6
Caption = 'Simple Syntax' Caption = 'Simple Syntax'
ParentShowHint = False ParentShowHint = False
ShowHint = True ShowHint = True
TabOrder = 5 TabOrder = 3
end end
end end

46
packager/pkggraphexplorer.lfm
View File

@ -9,13 +9,15 @@ object PkgGraphExplorerDlg: TPkgGraphExplorerDlg
KeyPreview = True KeyPreview = True
OnCreate = FormCreate OnCreate = FormCreate
OnShow = PkgGraphExplorerShow OnShow = PkgGraphExplorerShow
LCLVersion = '1.5' LCLVersion = '2.1.0.0'
object InfoMemo: TMemo object InfoMemo: TMemo
Left = 0 Left = 6
Height = 144 Height = 144
Top = 329 Top = 332
Width = 675 Width = 663
Align = alBottom Align = alBottom
BorderSpacing.Left = 6
BorderSpacing.Right = 6
Lines.Strings = ( Lines.Strings = (
'InfoMemo' 'InfoMemo'
) )
@ -26,29 +28,31 @@ object PkgGraphExplorerDlg: TPkgGraphExplorerDlg
object VerticalSplitter: TSplitter object VerticalSplitter: TSplitter
Cursor = crVSplit Cursor = crVSplit
Left = 0 Left = 0
Height = 5 Height = 6
Top = 324 Top = 326
Width = 675 Width = 675
Align = alBottom Align = alBottom
ResizeAnchor = akBottom ResizeAnchor = akBottom
end end
object Panel1: TPanel object Panel1: TPanel
Left = 0 Left = 0
Height = 324 Height = 326
Top = 0 Top = 0
Width = 675 Width = 675
Align = alClient Align = alClient
BevelOuter = bvNone BevelOuter = bvNone
Caption = 'Panel1' Caption = 'Panel1'
ClientHeight = 324 ClientHeight = 326
ClientWidth = 675 ClientWidth = 675
TabOrder = 0 TabOrder = 0
object LvlGraphControl1: TLvlGraphControl object LvlGraphControl1: TLvlGraphControl
Left = 199 Left = 206
Height = 324 Height = 320
Top = 0 Top = 6
Width = 476 Width = 463
Align = alClient Align = alClient
BorderSpacing.Top = 6
BorderSpacing.Right = 6
NodeStyle.Shape = lgnsNone NodeStyle.Shape = lgnsNone
NodeStyle.GapTop = 2 NodeStyle.GapTop = 2
NodeStyle.GapBottom = 6 NodeStyle.GapBottom = 6
@ -63,11 +67,13 @@ object PkgGraphExplorerDlg: TPkgGraphExplorerDlg
TabStop = False TabStop = False
end end
object PkgTreeView: TTreeView object PkgTreeView: TTreeView
Left = 0 Left = 6
Height = 324 Height = 320
Top = 0 Top = 6
Width = 194 Width = 194
Align = alLeft Align = alLeft
BorderSpacing.Left = 6
BorderSpacing.Top = 6
PopupMenu = PkgPopupMenu PopupMenu = PkgPopupMenu
ReadOnly = True ReadOnly = True
TabOrder = 0 TabOrder = 0
@ -77,16 +83,16 @@ object PkgGraphExplorerDlg: TPkgGraphExplorerDlg
Options = [tvoAutoItemHeight, tvoHideSelection, tvoKeepCollapsedNodes, tvoReadOnly, tvoShowButtons, tvoShowLines, tvoShowRoot, tvoToolTips, tvoThemedDraw] Options = [tvoAutoItemHeight, tvoHideSelection, tvoKeepCollapsedNodes, tvoReadOnly, tvoShowButtons, tvoShowLines, tvoShowRoot, tvoToolTips, tvoThemedDraw]
end end
object Splitter1: TSplitter object Splitter1: TSplitter
Left = 194 Left = 200
Height = 324 Height = 326
Top = 0 Top = 0
Width = 5 Width = 6
end end
end end
object ButtonPanel1: TButtonPanel object ButtonPanel1: TButtonPanel
Left = 6 Left = 6
Height = 29 Height = 26
Top = 479 Top = 482
Width = 663 Width = 663
OKButton.Name = 'OKButton' OKButton.Name = 'OKButton'
OKButton.DefaultCaption = True OKButton.DefaultCaption = True