paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-10-31 12:01:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

IDE: Improve layout of Diff dialog. Issue #27646, patch from AlexT.

Browse Source 
git-svn-id: trunk@53426 -
This commit is contained in:
juha 2016-11-23 15:06:41 +00:00
parent f68693281e
commit 444927581b
1 changed files with 48 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
ide/diffdialog.lfm
View File

@ -1,20 +1,20 @@
object DiffDlg: TDiffDlg object DiffDlg: TDiffDlg
Left = 220 Left = 220
Height = 522 Height = 576
Top = 72 Top = 72
Width = 598 Width = 598
HelpType = htKeyword HelpType = htKeyword
BorderIcons = [biSystemMenu] BorderIcons = [biSystemMenu]
Caption = 'Compare files' Caption = 'Compare files'
ClientHeight = 522 ClientHeight = 576
ClientWidth = 598 ClientWidth = 598
Position = poScreenCenter Position = poScreenCenter
LCLVersion = '1.5' LCLVersion = '1.7'
object Text1GroupBox: TGroupBox object Text1GroupBox: TGroupBox
AnchorSideLeft.Control = Owner AnchorSideLeft.Control = Owner
AnchorSideTop.Control = Owner AnchorSideTop.Control = Owner
Left = 6 Left = 6
Height = 49 Height = 57
Top = 6 Top = 6
Width = 586 Width = 586
Align = alTop Align = alTop
@ -22,7 +22,7 @@ object DiffDlg: TDiffDlg
AutoSize = True AutoSize = True
BorderSpacing.Around = 6 BorderSpacing.Around = 6
Caption = 'Text1GroupBox' Caption = 'Text1GroupBox'
ClientHeight = 31 ClientHeight = 38
ClientWidth = 582 ClientWidth = 582
TabOrder = 0 TabOrder = 0
object Text1Combobox: TComboBox object Text1Combobox: TComboBox
@ -30,14 +30,14 @@ object DiffDlg: TDiffDlg
AnchorSideTop.Control = Text1GroupBox AnchorSideTop.Control = Text1GroupBox
AnchorSideRight.Control = Text1FileOpenButton AnchorSideRight.Control = Text1FileOpenButton
Left = 6 Left = 6
Height = 21 Height = 29
Top = 6 Top = 6
Width = 362 Width = 299
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 6 BorderSpacing.Left = 6
BorderSpacing.Top = 6 BorderSpacing.Top = 6
BorderSpacing.Right = 6 BorderSpacing.Right = 6
ItemHeight = 13 ItemHeight = 0
OnChange = Text1ComboboxChange OnChange = Text1ComboboxChange
TabOrder = 0 TabOrder = 0
Text = 'Text1Combobox' Text = 'Text1Combobox'
@ -47,10 +47,10 @@ object DiffDlg: TDiffDlg
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = Text1GroupBox AnchorSideRight.Control = Text1GroupBox
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 418 Left = 355
Height = 17 Height = 24
Top = 8 Top = 8
Width = 158 Width = 221
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
BorderSpacing.Top = 6 BorderSpacing.Top = 6
BorderSpacing.Right = 6 BorderSpacing.Right = 6
@ -64,8 +64,8 @@ object DiffDlg: TDiffDlg
AnchorSideRight.Control = Text1OnlySelectionCheckBox AnchorSideRight.Control = Text1OnlySelectionCheckBox
AnchorSideBottom.Control = Text1Combobox AnchorSideBottom.Control = Text1Combobox
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 374 Left = 311
Height = 21 Height = 29
Top = 6 Top = 6
Width = 32 Width = 32
Anchors = [akTop, akRight, akBottom] Anchors = [akTop, akRight, akBottom]
@ -78,14 +78,14 @@ object DiffDlg: TDiffDlg
object Text2GroupBox: TGroupBox object Text2GroupBox: TGroupBox
AnchorSideTop.Control = Text1GroupBox AnchorSideTop.Control = Text1GroupBox
Left = 6 Left = 6
Height = 49 Height = 57
Top = 61 Top = 69
Width = 586 Width = 586
Align = alTop Align = alTop
AutoSize = True AutoSize = True
BorderSpacing.Around = 6 BorderSpacing.Around = 6
Caption = 'Text2GroupBox' Caption = 'Text2GroupBox'
ClientHeight = 31 ClientHeight = 38
ClientWidth = 582 ClientWidth = 582
TabOrder = 1 TabOrder = 1
object Text2Combobox: TComboBox object Text2Combobox: TComboBox
@ -93,14 +93,14 @@ object DiffDlg: TDiffDlg
AnchorSideTop.Control = Text2GroupBox AnchorSideTop.Control = Text2GroupBox
AnchorSideRight.Control = Text2FileOpenButton AnchorSideRight.Control = Text2FileOpenButton
Left = 6 Left = 6
Height = 21 Height = 29
Top = 6 Top = 6
Width = 362 Width = 299
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 6 BorderSpacing.Left = 6
BorderSpacing.Top = 6 BorderSpacing.Top = 6
BorderSpacing.Right = 6 BorderSpacing.Right = 6
ItemHeight = 13 ItemHeight = 0
OnChange = Text2ComboboxChange OnChange = Text2ComboboxChange
TabOrder = 0 TabOrder = 0
Text = 'Text2Combobox' Text = 'Text2Combobox'
@ -110,10 +110,10 @@ object DiffDlg: TDiffDlg
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = Text2GroupBox AnchorSideRight.Control = Text2GroupBox
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 418 Left = 355
Height = 17 Height = 24
Top = 8 Top = 8
Width = 158 Width = 221
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
BorderSpacing.Top = 6 BorderSpacing.Top = 6
BorderSpacing.Right = 6 BorderSpacing.Right = 6
@ -127,8 +127,8 @@ object DiffDlg: TDiffDlg
AnchorSideRight.Control = Text2OnlySelectionCheckBox AnchorSideRight.Control = Text2OnlySelectionCheckBox
AnchorSideBottom.Control = Text2Combobox AnchorSideBottom.Control = Text2Combobox
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 374 Left = 311
Height = 21 Height = 29
Top = 6 Top = 6
Width = 32 Width = 32
Anchors = [akTop, akRight, akBottom] Anchors = [akTop, akRight, akBottom]
@ -146,8 +146,8 @@ object DiffDlg: TDiffDlg
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
AnchorSideBottom.Control = ProgressBar1 AnchorSideBottom.Control = ProgressBar1
Left = 6 Left = 6
Height = 109 Height = 197
Top = 345 Top = 308
Width = 586 Width = 586
Anchors = [akLeft, akRight, akBottom] Anchors = [akLeft, akRight, akBottom]
AutoFill = True AutoFill = True
@ -160,8 +160,7 @@ object DiffDlg: TDiffDlg
ChildSizing.ShrinkHorizontal = crsScaleChilds ChildSizing.ShrinkHorizontal = crsScaleChilds
ChildSizing.ShrinkVertical = crsScaleChilds ChildSizing.ShrinkVertical = crsScaleChilds
ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.Layout = cclLeftToRightThenTopToBottom
ChildSizing.ControlsPerLine = 2 ChildSizing.ControlsPerLine = 1
Columns = 2
TabOrder = 2 TabOrder = 2
end end
inline DiffSynEdit: TSynEdit inline DiffSynEdit: TSynEdit
@ -170,8 +169,8 @@ object DiffDlg: TDiffDlg
AnchorSideRight.Control = Owner AnchorSideRight.Control = Owner
AnchorSideBottom.Control = OptionsGroupBox AnchorSideBottom.Control = OptionsGroupBox
Left = 6 Left = 6
Height = 223 Height = 170
Top = 116 Top = 132
Width = 586 Width = 586
Align = alTop Align = alTop
BorderSpacing.Around = 6 BorderSpacing.Around = 6
@ -186,7 +185,7 @@ object DiffDlg: TDiffDlg
TabOrder = 3 TabOrder = 3
BookMarkOptions.Xoffset = -18 BookMarkOptions.Xoffset = -18
Gutter.Visible = False Gutter.Visible = False
Gutter.Width = 59 Gutter.Width = 55
Gutter.MouseActions = < Gutter.MouseActions = <
item item
ClickCount = ccAny ClickCount = ccAny
@ -603,7 +602,6 @@ object DiffDlg: TDiffDlg
'DiffSynEdit' 'DiffSynEdit'
) )
VisibleSpecialChars = [vscSpace, vscTabAtLast] VisibleSpecialChars = [vscSpace, vscTabAtLast]
SelectedColor.FrameEdges = sfeAround
SelectedColor.BackPriority = 50 SelectedColor.BackPriority = 50
SelectedColor.ForePriority = 50 SelectedColor.ForePriority = 50
SelectedColor.FramePriority = 50 SelectedColor.FramePriority = 50
@ -611,34 +609,27 @@ object DiffDlg: TDiffDlg
SelectedColor.ItalicPriority = 50 SelectedColor.ItalicPriority = 50
SelectedColor.UnderlinePriority = 50 SelectedColor.UnderlinePriority = 50
SelectedColor.StrikeOutPriority = 50 SelectedColor.StrikeOutPriority = 50
IncrementColor.FrameEdges = sfeAround
HighlightAllColor.FrameEdges = sfeAround
BracketHighlightStyle = sbhsBoth BracketHighlightStyle = sbhsBoth
BracketMatchColor.Background = clNone BracketMatchColor.Background = clNone
BracketMatchColor.Foreground = clNone BracketMatchColor.Foreground = clNone
BracketMatchColor.FrameEdges = sfeAround
BracketMatchColor.Style = [fsBold] BracketMatchColor.Style = [fsBold]
FoldedCodeColor.Background = clNone FoldedCodeColor.Background = clNone
FoldedCodeColor.Foreground = clGray FoldedCodeColor.Foreground = clGray
FoldedCodeColor.FrameColor = clGray FoldedCodeColor.FrameColor = clGray
FoldedCodeColor.FrameEdges = sfeAround
MouseLinkColor.Background = clNone MouseLinkColor.Background = clNone
MouseLinkColor.Foreground = clBlue MouseLinkColor.Foreground = clBlue
MouseLinkColor.FrameEdges = sfeAround
LineHighlightColor.Background = clNone LineHighlightColor.Background = clNone
LineHighlightColor.Foreground = clNone LineHighlightColor.Foreground = clNone
LineHighlightColor.FrameEdges = sfeAround
inline TSynGutterPartList inline TSynGutterPartList
object TSynGutterMarks object TSynGutterMarks
Width = 24 Width = 24
MouseActions = <> MouseActions = <>
end end
object TSynGutterLineNumber object TSynGutterLineNumber
Width = 19 Width = 15
MouseActions = <> MouseActions = <>
MarkupInfo.Background = clBtnFace MarkupInfo.Background = clBtnFace
MarkupInfo.Foreground = clNone MarkupInfo.Foreground = clNone
MarkupInfo.FrameEdges = sfeAround
DigitCount = 2 DigitCount = 2
ShowOnlyLineNumbersMultiplesOf = 1 ShowOnlyLineNumbersMultiplesOf = 1
ZeroStart = False ZeroStart = False
@ -655,7 +646,6 @@ object DiffDlg: TDiffDlg
MouseActions = <> MouseActions = <>
MarkupInfo.Background = clWhite MarkupInfo.Background = clWhite
MarkupInfo.Foreground = clGray MarkupInfo.Foreground = clGray
MarkupInfo.FrameEdges = sfeAround
end end
object TSynGutterCodeFolding object TSynGutterCodeFolding
MouseActions = < MouseActions = <
@ -686,7 +676,6 @@ object DiffDlg: TDiffDlg
end> end>
MarkupInfo.Background = clNone MarkupInfo.Background = clNone
MarkupInfo.Foreground = clGray MarkupInfo.Foreground = clGray
MarkupInfo.FrameEdges = sfeAround
MouseActionsExpanded = < MouseActionsExpanded = <
item item
ClickCount = ccAny ClickCount = ccAny
@ -715,10 +704,10 @@ object DiffDlg: TDiffDlg
AnchorSideRight.Control = CloseButton AnchorSideRight.Control = CloseButton
AnchorSideBottom.Control = Owner AnchorSideBottom.Control = Owner
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 392 Left = 369
Height = 23 Height = 29
Top = 493 Top = 541
Width = 122 Width = 148
Anchors = [akRight, akBottom] Anchors = [akRight, akBottom]
AutoSize = True AutoSize = True
BorderSpacing.Around = 6 BorderSpacing.Around = 6
@ -731,10 +720,10 @@ object DiffDlg: TDiffDlg
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
AnchorSideBottom.Control = Owner AnchorSideBottom.Control = Owner
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 520 Left = 523
Height = 26 Height = 29
Top = 490 Top = 541
Width = 72 Width = 69
Anchors = [akRight, akBottom] Anchors = [akRight, akBottom]
AutoSize = True AutoSize = True
BorderSpacing.Around = 6 BorderSpacing.Around = 6
@ -749,9 +738,9 @@ object DiffDlg: TDiffDlg
AnchorSideBottom.Control = Owner AnchorSideBottom.Control = Owner
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 6 Left = 6
Height = 26 Height = 29
Top = 490 Top = 541
Width = 67 Width = 63
Anchors = [akLeft, akBottom] Anchors = [akLeft, akBottom]
AutoSize = True AutoSize = True
BorderSpacing.Around = 6 BorderSpacing.Around = 6
@ -767,8 +756,8 @@ object DiffDlg: TDiffDlg
AnchorSideBottom.Control = CloseButton AnchorSideBottom.Control = CloseButton
Left = 6 Left = 6
Height = 24 Height = 24
Top = 460 Top = 511
Width = 476 Width = 462
Anchors = [akLeft, akRight, akBottom] Anchors = [akLeft, akRight, akBottom]
BorderSpacing.Around = 6 BorderSpacing.Around = 6
Step = 0 Step = 0
@ -779,10 +768,10 @@ object DiffDlg: TDiffDlg
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = Owner AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 488 Left = 474
Height = 23 Height = 29
Top = 461 Top = 509
Width = 104 Width = 118
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
AutoSize = True AutoSize = True
BorderSpacing.Around = 6 BorderSpacing.Around = 6
@ -802,18 +791,6 @@ object DiffDlg: TDiffDlg
end end
object SynDiffSyn1: TSynDiffSyn object SynDiffSyn1: TSynDiffSyn
Enabled = False Enabled = False
UnknownAttri.FrameEdges = sfeAround
SpaceAttri.FrameEdges = sfeAround
OrigFileAttri.FrameEdges = sfeAround
NewFileAttri.FrameEdges = sfeAround
ChunkMarkerAttri.FrameEdges = sfeAround
ChunkNewAttri.FrameEdges = sfeAround
ChunkOldAttri.FrameEdges = sfeAround
ChunkMixedAttri.FrameEdges = sfeAround
LineAddedAttri.FrameEdges = sfeAround
LineRemovedAttri.FrameEdges = sfeAround
LineChangedAttri.FrameEdges = sfeAround
LineContextAttri.FrameEdges = sfeAround
left = 104 left = 104
top = 240 top = 240
end end