IDE: improved 'Find in Files' dialog layout. Inspired by patch from Flávio Etrusco (bug #0016033)

git-svn-id: trunk@24493 -
This commit is contained in:
maxim 2010-04-08 00:37:46 +00:00
parent b9546fe6aa
commit 369678389a

View File

@ -1,42 +1,18 @@
object LazFindInFilesDialog: TLazFindInFilesDialog object LazFindInFilesDialog: TLazFindInFilesDialog
Left = 379 Left = 379
Height = 521 Height = 402
Top = 155 Top = 155
Width = 456 Width = 516
ActiveControl = TextToFindComboBox AutoSize = True
Caption = 'Find in files' Caption = 'Find in files'
ClientHeight = 521 ClientHeight = 402
ClientWidth = 456 ClientWidth = 516
Constraints.MinHeight = 400 Constraints.MinHeight = 400
Constraints.MinWidth = 260 Constraints.MinWidth = 260
OnClose = FormClose OnClose = FormClose
OnCreate = FormCreate OnCreate = FormCreate
Position = poScreenCenter Position = poScreenCenter
LCLVersion = '0.9.29' LCLVersion = '0.9.29'
object TextToFindLabel: TLabel
AnchorSideTop.Control = TextToFindComboBox
AnchorSideTop.Side = asrCenter
Left = 6
Height = 18
Top = 11
Width = 76
Caption = 'Text To Find:'
ParentColor = False
end
object TextToFindComboBox: TComboBox
AnchorSideLeft.Control = TextToFindLabel
AnchorSideLeft.Side = asrBottom
Left = 88
Height = 29
Top = 6
Width = 362
Anchors = [akTop, akLeft, akRight]
AutoComplete = True
AutoCompleteText = [cbactEnabled, cbactEndOfLineComplete, cbactRetainPrefixCase, cbactSearchAscending]
BorderSpacing.Left = 6
ItemHeight = 0
TabOrder = 0
end
object OptionsCheckGroupBox: TCheckGroup object OptionsCheckGroupBox: TCheckGroup
AnchorSideLeft.Control = Owner AnchorSideLeft.Control = Owner
AnchorSideTop.Control = ReplaceTextComboBox AnchorSideTop.Control = ReplaceTextComboBox
@ -44,9 +20,9 @@ object LazFindInFilesDialog: TLazFindInFilesDialog
AnchorSideRight.Control = Owner AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 6 Left = 6
Height = 137 Height = 70
Top = 72 Top = 56
Width = 444 Width = 504
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
AutoFill = True AutoFill = True
AutoSize = True AutoSize = True
@ -61,7 +37,8 @@ object LazFindInFilesDialog: TLazFindInFilesDialog
ChildSizing.ShrinkHorizontal = crsScaleChilds ChildSizing.ShrinkHorizontal = crsScaleChilds
ChildSizing.ShrinkVertical = crsScaleChilds ChildSizing.ShrinkVertical = crsScaleChilds
ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.Layout = cclLeftToRightThenTopToBottom
ChildSizing.ControlsPerLine = 1 ChildSizing.ControlsPerLine = 2
Columns = 2
Items.Strings = ( Items.Strings = (
'Case sensitive' 'Case sensitive'
'Whole words only' 'Whole words only'
@ -74,16 +51,15 @@ object LazFindInFilesDialog: TLazFindInFilesDialog
} }
end end
object WhereRadioGroup: TRadioGroup object WhereRadioGroup: TRadioGroup
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = OptionsCheckGroupBox AnchorSideTop.Control = OptionsCheckGroupBox
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 6 Left = 6
Height = 109 Height = 93
Top = 215 Top = 132
Width = 444 Width = 504
Anchors = [akTop, akLeft, akRight] Align = alBottom
Anchors = [akTop, akLeft, akRight, akBottom]
AutoFill = True AutoFill = True
AutoSize = True AutoSize = True
BorderSpacing.Around = 6 BorderSpacing.Around = 6
@ -98,8 +74,8 @@ object LazFindInFilesDialog: TLazFindInFilesDialog
ChildSizing.ShrinkVertical = crsScaleChilds ChildSizing.ShrinkVertical = crsScaleChilds
ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.Layout = cclLeftToRightThenTopToBottom
ChildSizing.ControlsPerLine = 1 ChildSizing.ControlsPerLine = 1
ClientHeight = 90 ClientHeight = 75
ClientWidth = 440 ClientWidth = 500
ItemIndex = 1 ItemIndex = 1
Items.Strings = ( Items.Strings = (
'search all files in project' 'search all files in project'
@ -108,59 +84,76 @@ object LazFindInFilesDialog: TLazFindInFilesDialog
) )
OnClick = WhereRadioGroupClick OnClick = WhereRadioGroupClick
TabOrder = 2 TabOrder = 2
TabStop = True
end end
object DirectoryOptionsGroupBox: TGroupBox object DirectoryOptionsGroupBox: TGroupBox
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = WhereRadioGroup AnchorSideTop.Control = WhereRadioGroup
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
AnchorSideBottom.Control = ButtonPanel1
Left = 6 Left = 6
Height = 147 Height = 133
Top = 330 Top = 231
Width = 444 Width = 504
Anchors = [akTop, akLeft, akRight, akBottom] Align = alBottom
AutoSize = True
BorderSpacing.Around = 6 BorderSpacing.Around = 6
Caption = 'Directory Options' Caption = 'Directory Options'
ClientHeight = 128 ClientHeight = 115
ClientWidth = 440 ClientWidth = 500
Enabled = False Enabled = False
TabOrder = 3 TabOrder = 3
object DirectoryLabel: TLabel object DirectoryLabel: TLabel
AnchorSideLeft.Control = DirectoryOptionsGroupBox
AnchorSideTop.Control = DirectoryComboBox
AnchorSideTop.Side = asrCenter
Left = 6 Left = 6
Height = 18 Height = 14
Top = 8 Top = 9
Width = 62 Width = 49
BorderSpacing.Left = 6
Caption = 'Directory:' Caption = 'Directory:'
ParentColor = False ParentColor = False
end end
object FileMaskLabel: TLabel object FileMaskLabel: TLabel
AnchorSideLeft.Control = DirectoryOptionsGroupBox
AnchorSideTop.Control = DirectoryComboBox
AnchorSideTop.Side = asrBottom
Left = 6 Left = 6
Height = 18 Height = 14
Top = 38 Top = 39
Width = 152 Width = 121
BorderSpacing.Left = 6
BorderSpacing.Top = 12
Caption = 'File mask (*;*.*;*.bak?):' Caption = 'File mask (*;*.*;*.bak?):'
ParentColor = False ParentColor = False
end end
object DirectoryComboBox: TComboBox object DirectoryComboBox: TComboBox
AnchorSideLeft.Control = DirectoryLabel AnchorSideLeft.Control = DirectoryLabel
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
Left = 68 AnchorSideTop.Control = DirectoryOptionsGroupBox
Height = 29 AnchorSideRight.Control = DirectoryBrowse
Left = 61
Height = 21
Top = 6 Top = 6
Width = 308 Width = 389
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
ItemHeight = 0 BorderSpacing.Left = 6
BorderSpacing.Top = 6
BorderSpacing.Right = 6
ItemHeight = 13
TabOrder = 0 TabOrder = 0
end end
object DirectoryBrowse: TBitBtn object DirectoryBrowse: TBitBtn
Left = 382 AnchorSideLeft.Side = asrBottom
Height = 25 AnchorSideTop.Control = DirectoryComboBox
AnchorSideRight.Control = DirectoryOptionsGroupBox
AnchorSideRight.Side = asrBottom
Left = 456
Height = 23
Top = 6 Top = 6
Width = 25 Width = 38
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
AutoSize = True
BorderSpacing.Right = 6
Caption = '...' Caption = '...'
Layout = blGlyphTop Layout = blGlyphTop
NumGlyphs = 0 NumGlyphs = 0
@ -168,62 +161,112 @@ object LazFindInFilesDialog: TLazFindInFilesDialog
TabOrder = 1 TabOrder = 1
end end
object FileMaskComboBox: TComboBox object FileMaskComboBox: TComboBox
AnchorSideLeft.Control = DirectoryOptionsGroupBox
AnchorSideTop.Control = FileMaskLabel
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = DirectoryComboBox
AnchorSideRight.Side = asrBottom
Left = 6 Left = 6
Height = 29 Height = 21
Top = 56 Top = 59
Width = 370 Width = 444
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
ItemHeight = 0 BorderSpacing.Left = 6
BorderSpacing.Top = 6
ItemHeight = 13
TabOrder = 2 TabOrder = 2
Text = '*.pas;*.pp;*.inc' Text = '*.pas;*.pp;*.inc'
end end
object IncludeSubDirsCheckBox: TCheckBox object IncludeSubDirsCheckBox: TCheckBox
AnchorSideLeft.Control = DirectoryOptionsGroupBox
AnchorSideTop.Control = FileMaskComboBox
AnchorSideTop.Side = asrBottom
Left = 6 Left = 6
Height = 22 Height = 17
Top = 92 Top = 92
Width = 167 Width = 126
BorderSpacing.Left = 6
BorderSpacing.Top = 12
BorderSpacing.Bottom = 6
Caption = 'Include sub directories' Caption = 'Include sub directories'
TabOrder = 3 TabOrder = 3
end end
end end
object ButtonPanel1: TButtonPanel
Left = 6
Height = 26
Top = 370
Width = 504
TabOrder = 6
ShowButtons = [pbOK, pbCancel, pbHelp]
ShowBevel = False
end
object ReplaceTextComboBox: TComboBox object ReplaceTextComboBox: TComboBox
AnchorSideLeft.Control = ReplaceCheckBox AnchorSideLeft.Control = ReplaceCheckBox
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = TextToFindComboBox AnchorSideTop.Control = TextToFindComboBox
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 84 AnchorSideRight.Control = Owner
Height = 29 AnchorSideRight.Side = asrBottom
Top = 37 Left = 68
Width = 366 Height = 21
Top = 29
Width = 442
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
AutoComplete = True AutoComplete = True
AutoCompleteText = [cbactEnabled, cbactEndOfLineComplete, cbactRetainPrefixCase, cbactSearchAscending] AutoCompleteText = [cbactEnabled, cbactEndOfLineComplete, cbactRetainPrefixCase, cbactSearchAscending]
BorderSpacing.Left = 6 BorderSpacing.Left = 6
BorderSpacing.Top = 2 BorderSpacing.Top = 2
BorderSpacing.Right = 6
BorderSpacing.Bottom = 6
Enabled = False Enabled = False
ItemHeight = 0 ItemHeight = 13
TabOrder = 4 TabOrder = 5
end end
object ReplaceCheckBox: TCheckBox object ReplaceCheckBox: TCheckBox
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = ReplaceTextComboBox AnchorSideTop.Control = ReplaceTextComboBox
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
Left = 5 Left = 6
Height = 22 Height = 17
Top = 40 Top = 31
Width = 73 Width = 56
BorderSpacing.Left = 6
Caption = 'Replace' Caption = 'Replace'
Enabled = False Enabled = False
OnChange = ReplaceCheckBoxChange OnChange = ReplaceCheckBoxChange
TabOrder = 5 TabOrder = 4
end end
object ButtonPanel1: TButtonPanel object TextToFindLabel: TLabel
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = TextToFindComboBox
AnchorSideTop.Side = asrCenter
Left = 6 Left = 6
Height = 32 Height = 14
Top = 483 Top = 9
Width = 444 Width = 65
TabOrder = 6 BorderSpacing.Left = 6
ShowButtons = [pbOK, pbCancel, pbHelp] Caption = 'Text To Find:'
ShowBevel = False ParentColor = False
end
object TextToFindComboBox: TComboBox
AnchorSideLeft.Control = TextToFindLabel
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = Owner
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 77
Height = 21
Top = 6
Width = 433
Anchors = [akTop, akLeft, akRight]
AutoComplete = True
AutoCompleteText = [cbactEnabled, cbactEndOfLineComplete, cbactRetainPrefixCase, cbactSearchAscending]
BorderSpacing.Left = 6
BorderSpacing.Top = 6
BorderSpacing.Right = 6
ItemHeight = 13
TabOrder = 0
end end
object SelectDirectoryDialog: TSelectDirectoryDialog object SelectDirectoryDialog: TSelectDirectoryDialog
FilterIndex = 0 FilterIndex = 0