paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-05 17:39:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

IDE: Diff dialog, use highlighter

Browse Source 
git-svn-id: trunk@24623 -
This commit is contained in:
martin 2010-04-14 20:03:59 +00:00
parent ae416f6a77
commit 2bc158ad52
4 changed files with 370 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

465
ide/diffdialog.lfm
View File

@ -1,21 +1,20 @@
object DiffDlg: TDiffDlg object DiffDlg: TDiffDlg
Left = 298 Left = 300
Height = 505 Height = 505
Top = 132 Top = 147
Width = 598 Width = 598
HelpType = htKeyword HelpType = htKeyword
ActiveControl = Text1Combobox
BorderIcons = [biSystemMenu] BorderIcons = [biSystemMenu]
Caption = 'Diff dialog' Caption = 'Diff dialog'
ClientHeight = 505 ClientHeight = 505
ClientWidth = 598 ClientWidth = 598
Position = poScreenCenter Position = poScreenCenter
LCLVersion = '0.9.27' LCLVersion = '0.9.29'
object Text1GroupBox: TGroupBox object Text1GroupBox: TGroupBox
AnchorSideLeft.Control = Owner AnchorSideLeft.Control = Owner
AnchorSideTop.Control = Owner AnchorSideTop.Control = Owner
Left = 6 Left = 6
Height = 74 Height = 78
Top = 6 Top = 6
Width = 586 Width = 586
Align = alTop Align = alTop
@ -23,7 +22,7 @@ object DiffDlg: TDiffDlg
AutoSize = True AutoSize = True
BorderSpacing.Around = 6 BorderSpacing.Around = 6
Caption = 'Text1GroupBox' Caption = 'Text1GroupBox'
ClientHeight = 56 ClientHeight = 60
ClientWidth = 582 ClientWidth = 582
TabOrder = 0 TabOrder = 0
object Text1Combobox: TComboBox object Text1Combobox: TComboBox
@ -31,16 +30,14 @@ object DiffDlg: TDiffDlg
AnchorSideTop.Control = Text1GroupBox AnchorSideTop.Control = Text1GroupBox
AnchorSideRight.Control = Text1FileOpenButton AnchorSideRight.Control = Text1FileOpenButton
Left = 6 Left = 6
Height = 21 Height = 23
Top = 6 Top = 6
Width = 532 Width = 532
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
AutoComplete = False
BorderSpacing.Left = 6 BorderSpacing.Left = 6
BorderSpacing.Top = 6 BorderSpacing.Top = 6
BorderSpacing.Right = 6 BorderSpacing.Right = 6
ItemHeight = 13 ItemHeight = 15
ItemWidth = 0
OnChange = Text1ComboboxChange OnChange = Text1ComboboxChange
TabOrder = 0 TabOrder = 0
Text = 'Text1Combobox' Text = 'Text1Combobox'
@ -50,8 +47,8 @@ object DiffDlg: TDiffDlg
AnchorSideTop.Control = Text1Combobox AnchorSideTop.Control = Text1Combobox
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 6 Left = 6
Height = 17 Height = 19
Top = 33 Top = 35
Width = 490 Width = 490
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 6 BorderSpacing.Top = 6
@ -67,7 +64,7 @@ object DiffDlg: TDiffDlg
AnchorSideBottom.Control = Text1Combobox AnchorSideBottom.Control = Text1Combobox
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 544 Left = 544
Height = 21 Height = 23
Top = 6 Top = 6
Width = 32 Width = 32
Anchors = [akTop, akRight, akBottom] Anchors = [akTop, akRight, akBottom]
@ -79,14 +76,14 @@ object DiffDlg: TDiffDlg
end end
object Text2GroupBox: TGroupBox object Text2GroupBox: TGroupBox
Left = 6 Left = 6
Height = 74 Height = 78
Top = 86 Top = 90
Width = 586 Width = 586
Align = alTop Align = alTop
AutoSize = True AutoSize = True
BorderSpacing.Around = 6 BorderSpacing.Around = 6
Caption = 'Text2GroupBox' Caption = 'Text2GroupBox'
ClientHeight = 56 ClientHeight = 60
ClientWidth = 582 ClientWidth = 582
TabOrder = 1 TabOrder = 1
object Text2Combobox: TComboBox object Text2Combobox: TComboBox
@ -94,16 +91,14 @@ object DiffDlg: TDiffDlg
AnchorSideTop.Control = Text2GroupBox AnchorSideTop.Control = Text2GroupBox
AnchorSideRight.Control = Text2FileOpenButton AnchorSideRight.Control = Text2FileOpenButton
Left = 6 Left = 6
Height = 21 Height = 23
Top = 6 Top = 6
Width = 532 Width = 532
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
AutoComplete = False
BorderSpacing.Left = 6 BorderSpacing.Left = 6
BorderSpacing.Top = 6 BorderSpacing.Top = 6
BorderSpacing.Right = 6 BorderSpacing.Right = 6
ItemHeight = 13 ItemHeight = 15
ItemWidth = 0
OnChange = Text2ComboboxChange OnChange = Text2ComboboxChange
TabOrder = 0 TabOrder = 0
Text = 'Text2Combobox' Text = 'Text2Combobox'
@ -113,8 +108,8 @@ object DiffDlg: TDiffDlg
AnchorSideTop.Control = Text2Combobox AnchorSideTop.Control = Text2Combobox
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 6 Left = 6
Height = 17 Height = 19
Top = 33 Top = 35
Width = 490 Width = 490
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 6 BorderSpacing.Top = 6
@ -130,7 +125,7 @@ object DiffDlg: TDiffDlg
AnchorSideBottom.Control = Text2Combobox AnchorSideBottom.Control = Text2Combobox
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 544 Left = 544
Height = 21 Height = 23
Top = 6 Top = 6
Width = 32 Width = 32
Anchors = [akTop, akRight, akBottom] Anchors = [akTop, akRight, akBottom]
@ -166,14 +161,14 @@ object DiffDlg: TDiffDlg
Columns = 2 Columns = 2
TabOrder = 2 TabOrder = 2
end end
object DiffSynEdit: TSynEdit inline DiffSynEdit: TSynEdit
AnchorSideLeft.Control = Owner AnchorSideLeft.Control = Owner
AnchorSideTop.Control = Text2GroupBox AnchorSideTop.Control = Text2GroupBox
AnchorSideRight.Control = Owner AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 6 Left = 6
Height = 186 Height = 178
Top = 166 Top = 174
Width = 586 Width = 586
Align = alTop Align = alTop
BorderSpacing.Around = 6 BorderSpacing.Around = 6
@ -187,340 +182,487 @@ object DiffDlg: TDiffDlg
ParentFont = False ParentFont = False
TabOrder = 3 TabOrder = 3
BookMarkOptions.Xoffset = -18 BookMarkOptions.Xoffset = -18
BookMarkOptions.OnChange = nil
Gutter.Visible = False Gutter.Visible = False
Gutter.Width = 0 Gutter.Width = 0
Gutter.MouseActions = <
item
Shift = []
ShiftMask = []
Button = mbLeft
ClickCount = ccAny
ClickDir = cdDown
Command = 13
MoveCaret = False
Option = 0
Priority = 0
end
item
Shift = []
ShiftMask = []
Button = mbRight
ClickCount = ccSingle
ClickDir = cdUp
Command = 12
MoveCaret = False
Option = 0
Priority = 0
end>
Highlighter = SynDiffSyn1
Keystrokes = < Keystrokes = <
item item
Command = 3 Command = ecUp
ShortCut = 38 ShortCut = 38
end end
item item
Command = 103 Command = ecSelUp
ShortCut = 8230 ShortCut = 8230
end end
item item
Command = 211 Command = ecScrollUp
ShortCut = 16422 ShortCut = 16422
end end
item item
Command = 4 Command = ecDown
ShortCut = 40 ShortCut = 40
end end
item item
Command = 104 Command = ecSelDown
ShortCut = 8232 ShortCut = 8232
end end
item item
Command = 212 Command = ecScrollDown
ShortCut = 16424 ShortCut = 16424
end end
item item
Command = 1 Command = ecLeft
ShortCut = 37 ShortCut = 37
end end
item item
Command = 101 Command = ecSelLeft
ShortCut = 8229 ShortCut = 8229
end end
item item
Command = 5 Command = ecWordLeft
ShortCut = 16421 ShortCut = 16421
end end
item item
Command = 105 Command = ecSelWordLeft
ShortCut = 24613 ShortCut = 24613
end end
item item
Command = 2 Command = ecRight
ShortCut = 39 ShortCut = 39
end end
item item
Command = 102 Command = ecSelRight
ShortCut = 8231 ShortCut = 8231
end end
item item
Command = 6 Command = ecWordRight
ShortCut = 16423 ShortCut = 16423
end end
item item
Command = 106 Command = ecSelWordRight
ShortCut = 24615 ShortCut = 24615
end end
item item
Command = 10 Command = ecPageDown
ShortCut = 34 ShortCut = 34
end end
item item
Command = 110 Command = ecSelPageDown
ShortCut = 8226 ShortCut = 8226
end end
item item
Command = 14 Command = ecPageBottom
ShortCut = 16418 ShortCut = 16418
end end
item item
Command = 114 Command = ecSelPageBottom
ShortCut = 24610 ShortCut = 24610
end end
item item
Command = 9 Command = ecPageUp
ShortCut = 33 ShortCut = 33
end end
item item
Command = 109 Command = ecSelPageUp
ShortCut = 8225 ShortCut = 8225
end end
item item
Command = 13 Command = ecPageTop
ShortCut = 16417 ShortCut = 16417
end end
item item
Command = 113 Command = ecSelPageTop
ShortCut = 24609 ShortCut = 24609
end end
item item
Command = 7 Command = ecLineStart
ShortCut = 36 ShortCut = 36
end end
item item
Command = 107 Command = ecSelLineStart
ShortCut = 8228 ShortCut = 8228
end end
item item
Command = 15 Command = ecEditorTop
ShortCut = 16420 ShortCut = 16420
end end
item item
Command = 115 Command = ecSelEditorTop
ShortCut = 24612 ShortCut = 24612
end end
item item
Command = 8 Command = ecLineEnd
ShortCut = 35 ShortCut = 35
end end
item item
Command = 108 Command = ecSelLineEnd
ShortCut = 8227 ShortCut = 8227
end end
item item
Command = 16 Command = ecEditorBottom
ShortCut = 16419 ShortCut = 16419
end end
item item
Command = 116 Command = ecSelEditorBottom
ShortCut = 24611 ShortCut = 24611
end end
item item
Command = 223 Command = ecToggleMode
ShortCut = 45 ShortCut = 45
end end
item item
Command = 201 Command = ecCopy
ShortCut = 16429 ShortCut = 16429
end end
item item
Command = 604 Command = ecPaste
ShortCut = 8237 ShortCut = 8237
end end
item item
Command = 502 Command = ecDeleteChar
ShortCut = 46 ShortCut = 46
end end
item item
Command = 603 Command = ecCut
ShortCut = 8238 ShortCut = 8238
end end
item item
Command = 501 Command = ecDeleteLastChar
ShortCut = 8 ShortCut = 8
end end
item item
Command = 501 Command = ecDeleteLastChar
ShortCut = 8200 ShortCut = 8200
end end
item item
Command = 504 Command = ecDeleteLastWord
ShortCut = 16392 ShortCut = 16392
end end
item item
Command = 601 Command = ecUndo
ShortCut = 32776 ShortCut = 32776
end end
item item
Command = 602 Command = ecRedo
ShortCut = 40968 ShortCut = 40968
end end
item item
Command = 509 Command = ecLineBreak
ShortCut = 13 ShortCut = 13
end end
item item
Command = 199 Command = ecSelectAll
ShortCut = 16449 ShortCut = 16449
end end
item item
Command = 201 Command = ecCopy
ShortCut = 16451 ShortCut = 16451
end end
item item
Command = 610 Command = ecBlockIndent
ShortCut = 24649 ShortCut = 24649
end end
item item
Command = 509 Command = ecLineBreak
ShortCut = 16461 ShortCut = 16461
end end
item item
Command = 510 Command = ecInsertLine
ShortCut = 16462 ShortCut = 16462
end end
item item
Command = 503 Command = ecDeleteWord
ShortCut = 16468 ShortCut = 16468
end end
item item
Command = 611 Command = ecBlockUnindent
ShortCut = 24661 ShortCut = 24661
end end
item item
Command = 604 Command = ecPaste
ShortCut = 16470 ShortCut = 16470
end end
item item
Command = 603 Command = ecCut
ShortCut = 16472 ShortCut = 16472
end end
item item
Command = 507 Command = ecDeleteLine
ShortCut = 16473 ShortCut = 16473
end end
item item
Command = 506 Command = ecDeleteEOL
ShortCut = 24665 ShortCut = 24665
end end
item item
Command = 601 Command = ecUndo
ShortCut = 16474 ShortCut = 16474
end end
item item
Command = 602 Command = ecRedo
ShortCut = 24666 ShortCut = 24666
end end
item item
Command = 301 Command = ecGotoMarker0
ShortCut = 16432 ShortCut = 16432
end end
item item
Command = 302 Command = ecGotoMarker1
ShortCut = 16433 ShortCut = 16433
end end
item item
Command = 303 Command = ecGotoMarker2
ShortCut = 16434 ShortCut = 16434
end end
item item
Command = 304 Command = ecGotoMarker3
ShortCut = 16435 ShortCut = 16435
end end
item item
Command = 305 Command = ecGotoMarker4
ShortCut = 16436 ShortCut = 16436
end end
item item
Command = 306 Command = ecGotoMarker5
ShortCut = 16437 ShortCut = 16437
end end
item item
Command = 307 Command = ecGotoMarker6
ShortCut = 16438 ShortCut = 16438
end end
item item
Command = 308 Command = ecGotoMarker7
ShortCut = 16439 ShortCut = 16439
end end
item item
Command = 309 Command = ecGotoMarker8
ShortCut = 16440 ShortCut = 16440
end end
item item
Command = 310 Command = ecGotoMarker9
ShortCut = 16441 ShortCut = 16441
end end
item item
Command = 351 Command = ecSetMarker0
ShortCut = 24624 ShortCut = 24624
end end
item item
Command = 352 Command = ecSetMarker1
ShortCut = 24625 ShortCut = 24625
end end
item item
Command = 353 Command = ecSetMarker2
ShortCut = 24626 ShortCut = 24626
end end
item item
Command = 354 Command = ecSetMarker3
ShortCut = 24627 ShortCut = 24627
end end
item item
Command = 355 Command = ecSetMarker4
ShortCut = 24628 ShortCut = 24628
end end
item item
Command = 356 Command = ecSetMarker5
ShortCut = 24629 ShortCut = 24629
end end
item item
Command = 357 Command = ecSetMarker6
ShortCut = 24630 ShortCut = 24630
end end
item item
Command = 358 Command = ecSetMarker7
ShortCut = 24631 ShortCut = 24631
end end
item item
Command = 359 Command = ecSetMarker8
ShortCut = 24632 ShortCut = 24632
end end
item item
Command = 360 Command = ecSetMarker9
ShortCut = 24633 ShortCut = 24633
end end
item item
Command = 231 Command = ecNormalSelect
ShortCut = 24654 ShortCut = 24654
end end
item item
Command = 232 Command = ecColumnSelect
ShortCut = 24643 ShortCut = 24643
end end
item item
Command = 233 Command = ecLineSelect
ShortCut = 24652 ShortCut = 24652
end end
item item
Command = 612 Command = ecTab
ShortCut = 9 ShortCut = 9
end end
item item
Command = 613 Command = ecShiftTab
ShortCut = 8201 ShortCut = 8201
end end
item item
Command = 250 Command = ecMatchBracket
ShortCut = 24642 ShortCut = 24642
end> end>
MouseActions = <
item
Shift = []
ShiftMask = [ssShift, ssAlt]
Button = mbLeft
ClickCount = ccSingle
ClickDir = cdDown
Command = 1
MoveCaret = True
Option = 0
Priority = 0
end
item
Shift = [ssShift]
ShiftMask = [ssShift, ssAlt]
Button = mbLeft
ClickCount = ccSingle
ClickDir = cdDown
Command = 1
MoveCaret = True
Option = 1
Priority = 0
end
item
Shift = [ssAlt]
ShiftMask = [ssShift, ssAlt]
Button = mbLeft
ClickCount = ccSingle
ClickDir = cdDown
Command = 3
MoveCaret = True
Option = 0
Priority = 0
end
item
Shift = [ssShift, ssAlt]
ShiftMask = [ssShift, ssAlt]
Button = mbLeft
ClickCount = ccSingle
ClickDir = cdDown
Command = 3
MoveCaret = True
Option = 1
Priority = 0
end
item
Shift = []
ShiftMask = []
Button = mbRight
ClickCount = ccSingle
ClickDir = cdUp
Command = 12
MoveCaret = False
Option = 0
Priority = 0
end
item
Shift = []
ShiftMask = []
Button = mbLeft
ClickCount = ccDouble
ClickDir = cdDown
Command = 6
MoveCaret = True
Option = 0
Priority = 0
end
item
Shift = []
ShiftMask = []
Button = mbLeft
ClickCount = ccTriple
ClickDir = cdDown
Command = 7
MoveCaret = True
Option = 0
Priority = 0
end
item
Shift = []
ShiftMask = []
Button = mbLeft
ClickCount = ccQuad
ClickDir = cdDown
Command = 8
MoveCaret = True
Option = 0
Priority = 0
end
item
Shift = []
ShiftMask = []
Button = mbMiddle
ClickCount = ccSingle
ClickDir = cdDown
Command = 10
MoveCaret = True
Option = 0
Priority = 0
end
item
Shift = [ssCtrl]
ShiftMask = [ssShift, ssAlt, ssCtrl]
Button = mbLeft
ClickCount = ccSingle
ClickDir = cdUp
Command = 11
MoveCaret = False
Option = 0
Priority = 0
end>
MouseSelActions = <
item
Shift = []
ShiftMask = []
Button = mbLeft
ClickCount = ccSingle
ClickDir = cdDown
Command = 9
MoveCaret = False
Option = 0
Priority = 0
end>
Lines.Strings = ( Lines.Strings = (
'DiffSynEdit' 'DiffSynEdit'
) )
BracketHighlightStyle = sbhsBoth BracketHighlightStyle = sbhsBoth
object TSynGutterPartList inline TSynGutterPartList
object TSynGutterMarks object TSynGutterMarks
Width = 23 Width = 23
end end
object TSynGutterLineNumber object TSynGutterLineNumber
Width = 25 Width = 25
MouseActions = <>
MarkupInfo.Background = clBtnFace MarkupInfo.Background = clBtnFace
MarkupInfo.Foreground = clNone MarkupInfo.Foreground = clNone
DigitCount = 2 DigitCount = 2
@ -537,8 +679,88 @@ object DiffDlg: TDiffDlg
Width = 2 Width = 2
end end
object TSynGutterCodeFolding object TSynGutterCodeFolding
MouseActions = <
item
Shift = []
ShiftMask = []
Button = mbRight
ClickCount = ccSingle
ClickDir = cdUp
Command = 16
MoveCaret = False
Option = 0
Priority = 0
end
item
Shift = []
ShiftMask = [ssShift]
Button = mbMiddle
ClickCount = ccAny
ClickDir = cdDown
Command = 14
MoveCaret = False
Option = 0
Priority = 0
end
item
Shift = [ssShift]
ShiftMask = [ssShift]
Button = mbMiddle
ClickCount = ccAny
ClickDir = cdDown
Command = 14
MoveCaret = False
Option = 1
Priority = 0
end
item
Shift = []
ShiftMask = []
Button = mbLeft
ClickCount = ccAny
ClickDir = cdDown
Command = 0
MoveCaret = False
Option = 0
Priority = 0
end>
MarkupInfo.Background = clNone MarkupInfo.Background = clNone
MarkupInfo.Foreground = clGray MarkupInfo.Foreground = clGray
MouseActionsExpanded = <
item
Shift = []
ShiftMask = []
Button = mbLeft
ClickCount = ccAny
ClickDir = cdDown
Command = 14
MoveCaret = False
Option = 0
Priority = 0
end>
MouseActionsCollapsed = <
item
Shift = [ssCtrl]
ShiftMask = [ssCtrl]
Button = mbLeft
ClickCount = ccAny
ClickDir = cdDown
Command = 15
MoveCaret = False
Option = 0
Priority = 0
end
item
Shift = []
ShiftMask = [ssCtrl]
Button = mbLeft
ClickCount = ccAny
ClickDir = cdDown
Command = 15
MoveCaret = False
Option = 1
Priority = 0
end>
end end
end end
end end
@ -546,10 +768,10 @@ object DiffDlg: TDiffDlg
AnchorSideRight.Control = CloseButton AnchorSideRight.Control = CloseButton
AnchorSideBottom.Control = Owner AnchorSideBottom.Control = Owner
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 445 Left = 440
Height = 23 Height = 25
Top = 476 Top = 474
Width = 70 Width = 72
Anchors = [akRight, akBottom] Anchors = [akRight, akBottom]
AutoSize = True AutoSize = True
BorderSpacing.Around = 6 BorderSpacing.Around = 6
@ -562,10 +784,10 @@ object DiffDlg: TDiffDlg
AnchorSideRight.Control = SaveDiffButton AnchorSideRight.Control = SaveDiffButton
AnchorSideBottom.Control = Owner AnchorSideBottom.Control = Owner
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 317 Left = 302
Height = 23 Height = 25
Top = 476 Top = 474
Width = 122 Width = 132
Anchors = [akRight, akBottom] Anchors = [akRight, akBottom]
AutoSize = True AutoSize = True
BorderSpacing.Around = 6 BorderSpacing.Around = 6
@ -579,10 +801,10 @@ object DiffDlg: TDiffDlg
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
AnchorSideBottom.Control = Owner AnchorSideBottom.Control = Owner
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 521 Left = 518
Height = 26 Height = 26
Top = 473 Top = 473
Width = 71 Width = 74
Anchors = [akRight, akBottom] Anchors = [akRight, akBottom]
AutoSize = True AutoSize = True
BorderSpacing.Around = 6 BorderSpacing.Around = 6
@ -600,7 +822,7 @@ object DiffDlg: TDiffDlg
Left = 6 Left = 6
Height = 26 Height = 26
Top = 473 Top = 473
Width = 66 Width = 70
Anchors = [akLeft, akBottom] Anchors = [akLeft, akBottom]
AutoSize = True AutoSize = True
BorderSpacing.Around = 6 BorderSpacing.Around = 6
@ -624,4 +846,9 @@ object DiffDlg: TDiffDlg
left = 459 left = 459
top = 12 top = 12
end end
object SynDiffSyn1: TSynDiffSyn
Enabled = False
left = 104
top = 240
end
end end

3
ide/diffdialog.pas
View File

@ -42,7 +42,7 @@ interface
uses uses
Classes, SysUtils, Math, Forms, Controls, Buttons, StdCtrls, FileUtil, Classes, SysUtils, Math, Forms, Controls, Buttons, StdCtrls, FileUtil,
LazarusIDEStrConsts, EditorOptions, IDEWindowIntf, LCLType, LazarusIDEStrConsts, EditorOptions, IDEWindowIntf, LCLType,
InputHistory, DiffPatch, ExtCtrls, Dialogs, SynEdit, IDEContextHelpEdit, InputHistory, DiffPatch, ExtCtrls, Dialogs, SynEdit, SynHighlighterDiff, IDEContextHelpEdit,
SourceEditor; SourceEditor;
type type
@ -82,6 +82,7 @@ type
DiffSynEdit: TSynEdit; DiffSynEdit: TSynEdit;
OpenInEditorButton: TBitBtn; OpenInEditorButton: TBitBtn;
SaveDiffButton: TBitBtn; SaveDiffButton: TBitBtn;
SynDiffSyn1: TSynDiffSyn;
Text1FileOpenButton: TButton; Text1FileOpenButton: TButton;
dlgSave: TSaveDialog; dlgSave: TSaveDialog;
dlgOpen: TOpenDialog; dlgOpen: TOpenDialog;

36
ide/diskdiffsdialog.lfm
View File

@ -3,7 +3,6 @@ object DiskDiffsDlg: TDiskDiffsDlg
Height = 354 Height = 354
Top = 379 Top = 379
Width = 600 Width = 600
ActiveControl = FilesListBox
Caption = 'DiskDiffsDlg' Caption = 'DiskDiffsDlg'
ClientHeight = 354 ClientHeight = 354
ClientWidth = 600 ClientWidth = 600
@ -22,12 +21,11 @@ object DiskDiffsDlg: TDiskDiffsDlg
ItemHeight = 0 ItemHeight = 0
OnMouseUp = FilesListBoxMouseUp OnMouseUp = FilesListBoxMouseUp
TabOrder = 0 TabOrder = 0
TopIndex = -1
end end
inline DiffSynEdit: TSynEdit inline DiffSynEdit: TSynEdit
AnchorSideBottom.Control = CheckDiskChangesWithLoadingCheckBox AnchorSideBottom.Control = CheckDiskChangesWithLoadingCheckBox
Left = 6 Left = 6
Height = 182 Height = 189
Top = 97 Top = 97
Width = 588 Width = 588
Align = alTop Align = alTop
@ -67,6 +65,7 @@ object DiskDiffsDlg: TDiskDiffsDlg
Option = 0 Option = 0
Priority = 0 Priority = 0
end> end>
Highlighter = SynDiffSyn1
Keystrokes = < Keystrokes = <
item item
Command = ecUp Command = ecUp
@ -521,7 +520,7 @@ object DiskDiffsDlg: TDiskDiffsDlg
Width = 23 Width = 23
end end
object SynGutterLineNumber1: TSynGutterLineNumber object SynGutterLineNumber1: TSynGutterLineNumber
Width = 15 Width = 25
MouseActions = <> MouseActions = <>
MarkupInfo.Background = clBtnFace MarkupInfo.Background = clBtnFace
MarkupInfo.Foreground = clNone MarkupInfo.Foreground = clNone
@ -637,9 +636,9 @@ object DiskDiffsDlg: TDiskDiffsDlg
AnchorSideLeft.Control = Owner AnchorSideLeft.Control = Owner
AnchorSideBottom.Control = BtnPanel AnchorSideBottom.Control = BtnPanel
Left = 6 Left = 6
Height = 22 Height = 19
Top = 285 Top = 292
Width = 286 Width = 241
Anchors = [akLeft, akBottom] Anchors = [akLeft, akBottom]
BorderSpacing.Around = 6 BorderSpacing.Around = 6
Caption = 'CheckDiskChangesWithLoadingCheckBox' Caption = 'CheckDiskChangesWithLoadingCheckBox'
@ -647,20 +646,20 @@ object DiskDiffsDlg: TDiskDiffsDlg
end end
object BtnPanel: TPanel object BtnPanel: TPanel
Left = 0 Left = 0
Height = 41 Height = 37
Top = 313 Top = 317
Width = 600 Width = 600
Align = alBottom Align = alBottom
AutoSize = True AutoSize = True
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 41 ClientHeight = 37
ClientWidth = 600 ClientWidth = 600
TabOrder = 4 TabOrder = 4
object RevertAllButton: TButton object RevertAllButton: TButton
Left = 484 Left = 485
Height = 29 Height = 25
Top = 6 Top = 6
Width = 110 Width = 109
Align = alRight Align = alRight
AutoSize = True AutoSize = True
BorderSpacing.Around = 6 BorderSpacing.Around = 6
@ -670,10 +669,10 @@ object DiskDiffsDlg: TDiskDiffsDlg
TabOrder = 0 TabOrder = 0
end end
object IgnoreDiskChangesButton: TButton object IgnoreDiskChangesButton: TButton
Left = 300 Left = 315
Height = 29 Height = 25
Top = 6 Top = 6
Width = 178 Width = 164
Align = alRight Align = alRight
AutoSize = True AutoSize = True
BorderSpacing.Around = 6 BorderSpacing.Around = 6
@ -682,4 +681,9 @@ object DiskDiffsDlg: TDiskDiffsDlg
TabOrder = 1 TabOrder = 1
end end
end end
object SynDiffSyn1: TSynDiffSyn
Enabled = False
left = 135
top = 138
end
end end

3
ide/diskdiffsdialog.pas
View File

@ -34,7 +34,7 @@ interface
uses uses
Classes, SysUtils, LCLProc, Forms, Controls, Buttons, StdCtrls, Classes, SysUtils, LCLProc, Forms, Controls, Buttons, StdCtrls,
SynEdit, LCLType, ComCtrls, ExtCtrls, SynEdit, SynHighlighterDiff, LCLType, ComCtrls, ExtCtrls,
FileProcs, CodeToolManager, CodeCache, Laz_XMLCfg, Laz_XMLWrite, FileProcs, CodeToolManager, CodeCache, Laz_XMLCfg, Laz_XMLWrite,
Project, DiffPatch, LazarusIDEStrConsts, EnvironmentOpts, EditorOptions, Project, DiffPatch, LazarusIDEStrConsts, EnvironmentOpts, EditorOptions,
PackageDefs; PackageDefs;
@ -59,6 +59,7 @@ type
RevertAllButton: TButton; RevertAllButton: TButton;
IgnoreDiskChangesButton: TButton; IgnoreDiskChangesButton: TButton;
Splitter: TSplitter; Splitter: TSplitter;
SynDiffSyn1: TSynDiffSyn;
procedure DiskDiffsDlgKeyDown(Sender: TObject; var Key: Word; procedure DiskDiffsDlgKeyDown(Sender: TObject; var Key: Word;
Shift: TShiftState); Shift: TShiftState);
procedure FilesListBoxMouseUp(Sender: TOBject; Button: TMouseButton; procedure FilesListBoxMouseUp(Sender: TOBject; Button: TMouseButton;