paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-30 19:50:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: improved layout disk changes dlg

Browse Source 
git-svn-id: trunk@23084 -
This commit is contained in:
mattias 2009-12-11 18:59:35 +00:00
parent 4dec15ed37
commit 73cd49e50b
3 changed files with 534 additions and 248 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

505
ide/diskdiffsdialog.lfm
View File

@ -1,41 +1,16 @@
object DiskDiffsDlg: TDiskDiffsDlg object DiskDiffsDlg: TDiskDiffsDlg
Left = 314 Left = 314
Height = 300 Height = 354
Top = 379 Top = 379
Width = 600 Width = 600
ActiveControl = FilesListBox ActiveControl = FilesListBox
Caption = 'DiskDiffsDlg' Caption = 'DiskDiffsDlg'
ClientHeight = 300 ClientHeight = 354
ClientWidth = 600 ClientWidth = 600
OnClose = FormClose OnClose = FormClose
OnKeyDown = DiskDiffsDlgKeyDown OnKeyDown = DiskDiffsDlgKeyDown
Position = poScreenCenter Position = poScreenCenter
LCLVersion = '0.9.25' LCLVersion = '0.9.29'
object IgnoreDiskChangesButton: TButton
AnchorSideRight.Control = RevertAllButton
Left = 300
Height = 29
Top = 264
Width = 178
Anchors = [akRight, akBottom]
AutoSize = True
BorderSpacing.Right = 6
Caption = 'IgnoreDiskChangesButton'
ModalResult = 5
TabOrder = 0
end
object RevertAllButton: TButton
Left = 484
Height = 29
Top = 264
Width = 110
Anchors = [akRight, akBottom]
AutoSize = True
Caption = 'RevertAllButton'
Default = True
ModalResult = 10
TabOrder = 1
end
object FilesListBox: TListBox object FilesListBox: TListBox
Left = 6 Left = 6
Height = 86 Height = 86
@ -44,13 +19,15 @@ object DiskDiffsDlg: TDiskDiffsDlg
Align = alTop Align = alTop
BorderSpacing.Left = 6 BorderSpacing.Left = 6
BorderSpacing.Top = 6 BorderSpacing.Top = 6
ItemHeight = 0
OnMouseUp = FilesListBoxMouseUp OnMouseUp = FilesListBoxMouseUp
TabOrder = 2 TabOrder = 0
TopIndex = -1 TopIndex = -1
end end
object DiffSynEdit: TSynEdit inline DiffSynEdit: TSynEdit
AnchorSideBottom.Control = CheckDiskChangesWithLoadingCheckBox
Left = 6 Left = 6
Height = 159 Height = 182
Top = 97 Top = 97
Width = 588 Width = 588
Align = alTop Align = alTop
@ -59,339 +36,597 @@ object DiskDiffsDlg: TDiskDiffsDlg
Anchors = [akTop, akLeft, akRight, akBottom] Anchors = [akTop, akLeft, akRight, akBottom]
Font.Height = -12 Font.Height = -12
Font.Name = 'courier' Font.Name = 'courier'
Font.Pitch = fpFixed
Font.Quality = fqNonAntialiased
ParentColor = False ParentColor = False
TabOrder = 3 ParentFont = False
TabOrder = 1
BookMarkOptions.Xoffset = -18 BookMarkOptions.Xoffset = -18
Gutter.Visible = False Gutter.Visible = False
Gutter.CodeFoldingWidth = 14 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>
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'
) )
ReadOnly = True ReadOnly = True
BracketHighlightStyle = sbhsBoth
inline SynGutterPartList1: TSynGutterPartList
object SynGutterMarks1: TSynGutterMarks
Width = 23
end
object SynGutterLineNumber1: TSynGutterLineNumber
Width = 15
MouseActions = <>
MarkupInfo.Background = clBtnFace
MarkupInfo.Foreground = clNone
DigitCount = 2
ShowOnlyLineNumbersMultiplesOf = 1
ZeroStart = False
LeadingZeros = False
end
object SynGutterChanges1: TSynGutterChanges
Width = 4
ModifiedColor = 59900
SavedColor = clGreen
end
object SynGutterSeparator1: TSynGutterSeparator
Width = 2
end
object SynGutterCodeFolding1: 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.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
object Splitter: TSplitter object Splitter: TSplitter
Cursor = crVSplit Cursor = crVSplit
Left = 0
Height = 5 Height = 5
Top = 92 Top = 92
Width = 600 Width = 600
@ -399,12 +634,52 @@ object DiskDiffsDlg: TDiskDiffsDlg
ResizeAnchor = akTop ResizeAnchor = akTop
end end
object CheckDiskChangesWithLoadingCheckBox: TCheckBox object CheckDiskChangesWithLoadingCheckBox: TCheckBox
Left = 10 AnchorSideLeft.Control = Owner
AnchorSideBottom.Control = BtnPanel
Left = 6
Height = 22 Height = 22
Top = 269 Top = 285
Width = 286 Width = 286
Anchors = [akLeft, akBottom] Anchors = [akLeft, akBottom]
BorderSpacing.Around = 6
Caption = 'CheckDiskChangesWithLoadingCheckBox' Caption = 'CheckDiskChangesWithLoadingCheckBox'
TabOrder = 2
end
object BtnPanel: TPanel
Left = 0
Height = 41
Top = 313
Width = 600
Align = alBottom
AutoSize = True
BevelOuter = bvNone
ClientHeight = 41
ClientWidth = 600
TabOrder = 4 TabOrder = 4
object RevertAllButton: TButton
Left = 484
Height = 29
Top = 6
Width = 110
Align = alRight
AutoSize = True
BorderSpacing.Around = 6
Caption = 'RevertAllButton'
Default = True
ModalResult = 10
TabOrder = 0
end
object IgnoreDiskChangesButton: TButton
Left = 300
Height = 29
Top = 6
Width = 178
Align = alRight
AutoSize = True
BorderSpacing.Around = 6
Caption = 'IgnoreDiskChangesButton'
ModalResult = 5
TabOrder = 1
end
end end
end end

276
ide/diskdiffsdialog.lrs
View File

@ -1,139 +1,149 @@
{ This is an automatically generated lazarus resource file } { This is an automatically generated lazarus resource file }
LazarusResources.Add('TDiskDiffsDlg','FORMDATA',[ LazarusResources.Add('TDiskDiffsDlg','FORMDATA',[
'TPF0'#13'TDiskDiffsDlg'#12'DiskDiffsDlg'#4'Left'#3':'#1#6'Height'#3','#1#3'T' 'TPF0'#13'TDiskDiffsDlg'#12'DiskDiffsDlg'#4'Left'#3':'#1#6'Height'#3'b'#1#3'T'
+'op'#3'{'#1#5'Width'#3'X'#2#13'ActiveControl'#7#12'FilesListBox'#7'Caption'#6 +'op'#3'{'#1#5'Width'#3'X'#2#13'ActiveControl'#7#12'FilesListBox'#7'Caption'#6
+#12'DiskDiffsDlg'#12'ClientHeight'#3','#1#11'ClientWidth'#3'X'#2#7'OnClose'#7 +#12'DiskDiffsDlg'#12'ClientHeight'#3'b'#1#11'ClientWidth'#3'X'#2#7'OnClose'#7
+#9'FormClose'#9'OnKeyDown'#7#19'DiskDiffsDlgKeyDown'#8'Position'#7#14'poScre' +#9'FormClose'#9'OnKeyDown'#7#19'DiskDiffsDlgKeyDown'#8'Position'#7#14'poScre'
+'enCenter'#10'LCLVersion'#6#6'0.9.25'#0#7'TButton'#23'IgnoreDiskChangesButto' +'enCenter'#10'LCLVersion'#6#6'0.9.29'#0#8'TListBox'#12'FilesListBox'#4'Left'
+'n'#23'AnchorSideRight.Control'#7#15'RevertAllButton'#4'Left'#3','#1#6'Heigh' +#2#6#6'Height'#2'V'#3'Top'#2#6#5'Width'#3'R'#2#5'Align'#7#5'alTop'#18'Border'
+'t'#2#29#3'Top'#3#8#1#5'Width'#3#178#0#7'Anchors'#11#7'akRight'#8'akBottom'#0 +'Spacing.Left'#2#6#17'BorderSpacing.Top'#2#6#10'ItemHeight'#2#0#9'OnMouseUp'
+#8'AutoSize'#9#19'BorderSpacing.Right'#2#6#7'Caption'#6#23'IgnoreDiskChanges' +#7#19'FilesListBoxMouseUp'#8'TabOrder'#2#0#8'TopIndex'#2#255#0#0#244#8'TSynE'
+'Button'#11'ModalResult'#2#5#8'TabOrder'#2#0#0#0#7'TButton'#15'RevertAllButt' +'dit'#11'DiffSynEdit'#24'AnchorSideBottom.Control'#7'#CheckDiskChangesWithLo'
+'on'#4'Left'#3#228#1#6'Height'#2#29#3'Top'#3#8#1#5'Width'#2'n'#7'Anchors'#11 +'adingCheckBox'#4'Left'#2#6#6'Height'#3#182#0#3'Top'#2'a'#5'Width'#3'L'#2#5
+#7'akRight'#8'akBottom'#0#8'AutoSize'#9#7'Caption'#6#15'RevertAllButton'#7'D' +'Align'#7#5'alTop'#18'BorderSpacing.Left'#2#6#19'BorderSpacing.Right'#2#6#7
+'efault'#9#11'ModalResult'#2#10#8'TabOrder'#2#1#0#0#8'TListBox'#12'FilesList' +'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#11'Font.Height'#2
+'Box'#4'Left'#2#6#6'Height'#2'V'#3'Top'#2#6#5'Width'#3'R'#2#5'Align'#7#5'alT' +#244#9'Font.Name'#6#7'courier'#10'Font.Pitch'#7#7'fpFixed'#12'Font.Quality'#7
+'op'#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#9'OnMouseUp'#7#19 +#16'fqNonAntialiased'#11'ParentColor'#8#10'ParentFont'#8#8'TabOrder'#2#1#23
+'FilesListBoxMouseUp'#8'TabOrder'#2#2#8'TopIndex'#2#255#0#0#8'TSynEdit'#11'D' +'BookMarkOptions.Xoffset'#2#238#14'Gutter.Visible'#8#12'Gutter.Width'#2#0#19
+'iffSynEdit'#4'Left'#2#6#6'Height'#3#159#0#3'Top'#2'a'#5'Width'#3'L'#2#5'Ali' +'Gutter.MouseActions'#14#1#5'Shift'#11#0#9'ShiftMask'#11#0#6'Button'#7#6'mbL'
+'gn'#7#5'alTop'#18'BorderSpacing.Left'#2#6#19'BorderSpacing.Right'#2#6#7'Anc' +'eft'#10'ClickCount'#7#5'ccAny'#8'ClickDir'#7#6'cdDown'#7'Command'#2#13#9'Mo'
+'hors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#11'Font.Height'#2#244#9 +'veCaret'#8#6'Option'#2#0#8'Priority'#2#0#0#1#5'Shift'#11#0#9'ShiftMask'#11#0
+'Font.Name'#6#7'courier'#11'ParentColor'#8#8'TabOrder'#2#3#23'BookMarkOption' +#6'Button'#7#7'mbRight'#10'ClickCount'#7#8'ccSingle'#8'ClickDir'#7#4'cdUp'#7
+'s.Xoffset'#2#238#14'Gutter.Visible'#8#23'Gutter.CodeFoldingWidth'#2#14#10'K' +'Command'#2#12#9'MoveCaret'#8#6'Option'#2#0#8'Priority'#2#0#0#0#10'Keystroke'
+'eystrokes'#14#1#7'Command'#2#3#8'ShortCut'#2'&'#0#1#7'Command'#2'g'#8'Short' +'s'#14#1#7'Command'#7#4'ecUp'#8'ShortCut'#2'&'#0#1#7'Command'#7#7'ecSelUp'#8
+'Cut'#3'& '#0#1#7'Command'#3#211#0#8'ShortCut'#3'&@'#0#1#7'Command'#2#4#8'Sh' +'ShortCut'#3'& '#0#1#7'Command'#7#10'ecScrollUp'#8'ShortCut'#3'&@'#0#1#7'Com'
+'ortCut'#2'('#0#1#7'Command'#2'h'#8'ShortCut'#3'( '#0#1#7'Command'#3#212#0#8 +'mand'#7#6'ecDown'#8'ShortCut'#2'('#0#1#7'Command'#7#9'ecSelDown'#8'ShortCut'
+'ShortCut'#3'(@'#0#1#7'Command'#2#1#8'ShortCut'#2'%'#0#1#7'Command'#2'e'#8'S' +#3'( '#0#1#7'Command'#7#12'ecScrollDown'#8'ShortCut'#3'(@'#0#1#7'Command'#7#6
+'hortCut'#3'% '#0#1#7'Command'#2#5#8'ShortCut'#3'%@'#0#1#7'Command'#2'i'#8'S' +'ecLeft'#8'ShortCut'#2'%'#0#1#7'Command'#7#9'ecSelLeft'#8'ShortCut'#3'% '#0#1
+'hortCut'#3'%`'#0#1#7'Command'#2#2#8'ShortCut'#2''''#0#1#7'Command'#2'f'#8'S' +#7'Command'#7#10'ecWordLeft'#8'ShortCut'#3'%@'#0#1#7'Command'#7#13'ecSelWord'
+'hortCut'#3''' '#0#1#7'Command'#2#6#8'ShortCut'#3'''@'#0#1#7'Command'#2'j'#8 +'Left'#8'ShortCut'#3'%`'#0#1#7'Command'#7#7'ecRight'#8'ShortCut'#2''''#0#1#7
+'ShortCut'#3'''`'#0#1#7'Command'#2#10#8'ShortCut'#2'"'#0#1#7'Command'#2'n'#8 +'Command'#7#10'ecSelRight'#8'ShortCut'#3''' '#0#1#7'Command'#7#11'ecWordRigh'
+'ShortCut'#3'" '#0#1#7'Command'#2#14#8'ShortCut'#3'"@'#0#1#7'Command'#2'r'#8 +'t'#8'ShortCut'#3'''@'#0#1#7'Command'#7#14'ecSelWordRight'#8'ShortCut'#3'''`'
+'ShortCut'#3'"`'#0#1#7'Command'#2#9#8'ShortCut'#2'!'#0#1#7'Command'#2'm'#8'S' +#0#1#7'Command'#7#10'ecPageDown'#8'ShortCut'#2'"'#0#1#7'Command'#7#13'ecSelP'
+'hortCut'#3'! '#0#1#7'Command'#2#13#8'ShortCut'#3'!@'#0#1#7'Command'#2'q'#8 +'ageDown'#8'ShortCut'#3'" '#0#1#7'Command'#7#12'ecPageBottom'#8'ShortCut'#3
+'ShortCut'#3'!`'#0#1#7'Command'#2#7#8'ShortCut'#2'$'#0#1#7'Command'#2'k'#8'S' +'"@'#0#1#7'Command'#7#15'ecSelPageBottom'#8'ShortCut'#3'"`'#0#1#7'Command'#7
+'hortCut'#3'$ '#0#1#7'Command'#2#15#8'ShortCut'#3'$@'#0#1#7'Command'#2's'#8 +#8'ecPageUp'#8'ShortCut'#2'!'#0#1#7'Command'#7#11'ecSelPageUp'#8'ShortCut'#3
+'ShortCut'#3'$`'#0#1#7'Command'#2#8#8'ShortCut'#2'#'#0#1#7'Command'#2'l'#8'S' +'! '#0#1#7'Command'#7#9'ecPageTop'#8'ShortCut'#3'!@'#0#1#7'Command'#7#12'ecS'
+'hortCut'#3'# '#0#1#7'Command'#2#16#8'ShortCut'#3'#@'#0#1#7'Command'#2't'#8 +'elPageTop'#8'ShortCut'#3'!`'#0#1#7'Command'#7#11'ecLineStart'#8'ShortCut'#2
+'ShortCut'#3'#`'#0#1#7'Command'#3#223#0#8'ShortCut'#2'-'#0#1#7'Command'#3#201 +'$'#0#1#7'Command'#7#14'ecSelLineStart'#8'ShortCut'#3'$ '#0#1#7'Command'#7#11
+#0#8'ShortCut'#3'-@'#0#1#7'Command'#3'\'#2#8'ShortCut'#3'- '#0#1#7'Command'#3 +'ecEditorTop'#8'ShortCut'#3'$@'#0#1#7'Command'#7#14'ecSelEditorTop'#8'ShortC'
+#246#1#8'ShortCut'#2'.'#0#1#7'Command'#3'['#2#8'ShortCut'#3'. '#0#1#7'Comman' +'ut'#3'$`'#0#1#7'Command'#7#9'ecLineEnd'#8'ShortCut'#2'#'#0#1#7'Command'#7#12
+'d'#3#245#1#8'ShortCut'#2#8#0#1#7'Command'#3#245#1#8'ShortCut'#3#8' '#0#1#7 +'ecSelLineEnd'#8'ShortCut'#3'# '#0#1#7'Command'#7#14'ecEditorBottom'#8'Short'
+'Command'#3#248#1#8'ShortCut'#3#8'@'#0#1#7'Command'#3'Y'#2#8'ShortCut'#4#8 +'Cut'#3'#@'#0#1#7'Command'#7#17'ecSelEditorBottom'#8'ShortCut'#3'#`'#0#1#7'C'
+#128#0#0#0#1#7'Command'#3'Z'#2#8'ShortCut'#4#8#160#0#0#0#1#7'Command'#3#253#1 +'ommand'#7#12'ecToggleMode'#8'ShortCut'#2'-'#0#1#7'Command'#7#6'ecCopy'#8'Sh'
+#8'ShortCut'#2#13#0#1#7'Command'#3#199#0#8'ShortCut'#3'A@'#0#1#7'Command'#3 +'ortCut'#3'-@'#0#1#7'Command'#7#7'ecPaste'#8'ShortCut'#3'- '#0#1#7'Command'#7
+#201#0#8'ShortCut'#3'C@'#0#1#7'Command'#3'b'#2#8'ShortCut'#3'I`'#0#1#7'Comma' +#12'ecDeleteChar'#8'ShortCut'#2'.'#0#1#7'Command'#7#5'ecCut'#8'ShortCut'#3'.'
+'nd'#3#253#1#8'ShortCut'#3'M@'#0#1#7'Command'#3#254#1#8'ShortCut'#3'N@'#0#1#7 +' '#0#1#7'Command'#7#16'ecDeleteLastChar'#8'ShortCut'#2#8#0#1#7'Command'#7#16
+'Command'#3#247#1#8'ShortCut'#3'T@'#0#1#7'Command'#3'c'#2#8'ShortCut'#3'U`'#0 +'ecDeleteLastChar'#8'ShortCut'#3#8' '#0#1#7'Command'#7#16'ecDeleteLastWord'#8
+#1#7'Command'#3'\'#2#8'ShortCut'#3'V@'#0#1#7'Command'#3'['#2#8'ShortCut'#3'X' +'ShortCut'#3#8'@'#0#1#7'Command'#7#6'ecUndo'#8'ShortCut'#4#8#128#0#0#0#1#7'C'
+'@'#0#1#7'Command'#3#251#1#8'ShortCut'#3'Y@'#0#1#7'Command'#3#250#1#8'ShortC' +'ommand'#7#6'ecRedo'#8'ShortCut'#4#8#160#0#0#0#1#7'Command'#7#11'ecLineBreak'
+'ut'#3'Y`'#0#1#7'Command'#3'Y'#2#8'ShortCut'#3'Z@'#0#1#7'Command'#3'Z'#2#8'S' +#8'ShortCut'#2#13#0#1#7'Command'#7#11'ecSelectAll'#8'ShortCut'#3'A@'#0#1#7'C'
+'hortCut'#3'Z`'#0#1#7'Command'#3'-'#1#8'ShortCut'#3'0@'#0#1#7'Command'#3'.'#1 +'ommand'#7#6'ecCopy'#8'ShortCut'#3'C@'#0#1#7'Command'#7#13'ecBlockIndent'#8
+#8'ShortCut'#3'1@'#0#1#7'Command'#3'/'#1#8'ShortCut'#3'2@'#0#1#7'Command'#3 +'ShortCut'#3'I`'#0#1#7'Command'#7#11'ecLineBreak'#8'ShortCut'#3'M@'#0#1#7'Co'
+'0'#1#8'ShortCut'#3'3@'#0#1#7'Command'#3'1'#1#8'ShortCut'#3'4@'#0#1#7'Comman' +'mmand'#7#12'ecInsertLine'#8'ShortCut'#3'N@'#0#1#7'Command'#7#12'ecDeleteWor'
+'d'#3'2'#1#8'ShortCut'#3'5@'#0#1#7'Command'#3'3'#1#8'ShortCut'#3'6@'#0#1#7'C' +'d'#8'ShortCut'#3'T@'#0#1#7'Command'#7#15'ecBlockUnindent'#8'ShortCut'#3'U`'
+'ommand'#3'4'#1#8'ShortCut'#3'7@'#0#1#7'Command'#3'5'#1#8'ShortCut'#3'8@'#0#1 +#0#1#7'Command'#7#7'ecPaste'#8'ShortCut'#3'V@'#0#1#7'Command'#7#5'ecCut'#8'S'
+#7'Command'#3'6'#1#8'ShortCut'#3'9@'#0#1#7'Command'#3'_'#1#8'ShortCut'#3'0`' +'hortCut'#3'X@'#0#1#7'Command'#7#12'ecDeleteLine'#8'ShortCut'#3'Y@'#0#1#7'Co'
+#0#1#7'Command'#3'`'#1#8'ShortCut'#3'1`'#0#1#7'Command'#3'a'#1#8'ShortCut'#3 +'mmand'#7#11'ecDeleteEOL'#8'ShortCut'#3'Y`'#0#1#7'Command'#7#6'ecUndo'#8'Sho'
+'2`'#0#1#7'Command'#3'b'#1#8'ShortCut'#3'3`'#0#1#7'Command'#3'c'#1#8'ShortCu' +'rtCut'#3'Z@'#0#1#7'Command'#7#6'ecRedo'#8'ShortCut'#3'Z`'#0#1#7'Command'#7
+'t'#3'4`'#0#1#7'Command'#3'd'#1#8'ShortCut'#3'5`'#0#1#7'Command'#3'e'#1#8'Sh' +#13'ecGotoMarker0'#8'ShortCut'#3'0@'#0#1#7'Command'#7#13'ecGotoMarker1'#8'Sh'
+'ortCut'#3'6`'#0#1#7'Command'#3'f'#1#8'ShortCut'#3'7`'#0#1#7'Command'#3'g'#1 +'ortCut'#3'1@'#0#1#7'Command'#7#13'ecGotoMarker2'#8'ShortCut'#3'2@'#0#1#7'Co'
+#8'ShortCut'#3'8`'#0#1#7'Command'#3'h'#1#8'ShortCut'#3'9`'#0#1#7'Command'#3 +'mmand'#7#13'ecGotoMarker3'#8'ShortCut'#3'3@'#0#1#7'Command'#7#13'ecGotoMark'
+#231#0#8'ShortCut'#3'N`'#0#1#7'Command'#3#232#0#8'ShortCut'#3'C`'#0#1#7'Comm' +'er4'#8'ShortCut'#3'4@'#0#1#7'Command'#7#13'ecGotoMarker5'#8'ShortCut'#3'5@'
+'and'#3#233#0#8'ShortCut'#3'L`'#0#1#7'Command'#3'd'#2#8'ShortCut'#2#9#0#1#7 +#0#1#7'Command'#7#13'ecGotoMarker6'#8'ShortCut'#3'6@'#0#1#7'Command'#7#13'ec'
+'Command'#3'e'#2#8'ShortCut'#3#9' '#0#1#7'Command'#3#250#0#8'ShortCut'#3'B`' +'GotoMarker7'#8'ShortCut'#3'7@'#0#1#7'Command'#7#13'ecGotoMarker8'#8'ShortCu'
+#0#0#13'Lines.Strings'#1#6#11'DiffSynEdit'#0#8'ReadOnly'#9#0#0#9'TSplitter'#8 +'t'#3'8@'#0#1#7'Command'#7#13'ecGotoMarker9'#8'ShortCut'#3'9@'#0#1#7'Command'
+'Splitter'#6'Cursor'#7#8'crVSplit'#6'Height'#2#5#3'Top'#2'\'#5'Width'#3'X'#2 +#7#12'ecSetMarker0'#8'ShortCut'#3'0`'#0#1#7'Command'#7#12'ecSetMarker1'#8'Sh'
,#5'Align'#7#5'alTop'#12'ResizeAnchor'#7#5'akTop'#0#0#9'TCheckBox#CheckDiskCh' ,'ortCut'#3'1`'#0#1#7'Command'#7#12'ecSetMarker2'#8'ShortCut'#3'2`'#0#1#7'Com'
+'angesWithLoadingCheckBox'#4'Left'#2#10#6'Height'#2#22#3'Top'#3#13#1#5'Width' +'mand'#7#12'ecSetMarker3'#8'ShortCut'#3'3`'#0#1#7'Command'#7#12'ecSetMarker4'
+#3#30#1#7'Anchors'#11#6'akLeft'#8'akBottom'#0#7'Caption'#6'#CheckDiskChanges' +#8'ShortCut'#3'4`'#0#1#7'Command'#7#12'ecSetMarker5'#8'ShortCut'#3'5`'#0#1#7
+'WithLoadingCheckBox'#8'TabOrder'#2#4#0#0#0#13'TDiskDiffsDlg'#12'DiskDiffsDl' +'Command'#7#12'ecSetMarker6'#8'ShortCut'#3'6`'#0#1#7'Command'#7#12'ecSetMark'
+'g'#4'Left'#3':'#1#6'Height'#3','#1#3'Top'#3'{'#1#5'Width'#3'X'#2#13'ActiveC' +'er7'#8'ShortCut'#3'7`'#0#1#7'Command'#7#12'ecSetMarker8'#8'ShortCut'#3'8`'#0
+'ontrol'#7#12'FilesListBox'#7'Caption'#6#12'DiskDiffsDlg'#12'ClientHeight'#3 +#1#7'Command'#7#12'ecSetMarker9'#8'ShortCut'#3'9`'#0#1#7'Command'#7#14'ecNor'
+','#1#11'ClientWidth'#3'X'#2#7'OnClose'#7#9'FormClose'#9'OnKeyDown'#7#19'Dis' +'malSelect'#8'ShortCut'#3'N`'#0#1#7'Command'#7#14'ecColumnSelect'#8'ShortCut'
+'kDiffsDlgKeyDown'#8'Position'#7#14'poScreenCenter'#10'LCLVersion'#6#6'0.9.2' +#3'C`'#0#1#7'Command'#7#12'ecLineSelect'#8'ShortCut'#3'L`'#0#1#7'Command'#7#5
+'5'#0#7'TButton'#23'IgnoreDiskChangesButton'#23'AnchorSideRight.Control'#7#15 +'ecTab'#8'ShortCut'#2#9#0#1#7'Command'#7#10'ecShiftTab'#8'ShortCut'#3#9' '#0
+'RevertAllButton'#4'Left'#3','#1#6'Height'#2#29#3'Top'#3#8#1#5'Width'#3#178#0 +#1#7'Command'#7#14'ecMatchBracket'#8'ShortCut'#3'B`'#0#0#12'MouseActions'#14
+#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#19'BorderSpacing.Right' +#1#5'Shift'#11#0#9'ShiftMask'#11#7'ssShift'#5'ssAlt'#0#6'Button'#7#6'mbLeft'
+#2#6#7'Caption'#6#23'IgnoreDiskChangesButton'#11'ModalResult'#2#5#8'TabOrder' +#10'ClickCount'#7#8'ccSingle'#8'ClickDir'#7#6'cdDown'#7'Command'#2#1#9'MoveC'
+#2#0#0#0#7'TButton'#15'RevertAllButton'#4'Left'#3#228#1#6'Height'#2#29#3'Top' +'aret'#9#6'Option'#2#0#8'Priority'#2#0#0#1#5'Shift'#11#7'ssShift'#0#9'ShiftM'
+#3#8#1#5'Width'#2'n'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#7 +'ask'#11#7'ssShift'#5'ssAlt'#0#6'Button'#7#6'mbLeft'#10'ClickCount'#7#8'ccSi'
+'Caption'#6#15'RevertAllButton'#7'Default'#9#11'ModalResult'#2#10#8'TabOrder' +'ngle'#8'ClickDir'#7#6'cdDown'#7'Command'#2#1#9'MoveCaret'#9#6'Option'#2#1#8
+#2#1#0#0#8'TListBox'#12'FilesListBox'#4'Left'#2#6#6'Height'#2'V'#3'Top'#2#6#5 +'Priority'#2#0#0#1#5'Shift'#11#5'ssAlt'#0#9'ShiftMask'#11#7'ssShift'#5'ssAlt'
+'Width'#3'R'#2#5'Align'#7#5'alTop'#18'BorderSpacing.Left'#2#6#17'BorderSpaci' +#0#6'Button'#7#6'mbLeft'#10'ClickCount'#7#8'ccSingle'#8'ClickDir'#7#6'cdDown'
+'ng.Top'#2#6#9'OnMouseUp'#7#19'FilesListBoxMouseUp'#8'TabOrder'#2#2#8'TopInd' +#7'Command'#2#3#9'MoveCaret'#9#6'Option'#2#0#8'Priority'#2#0#0#1#5'Shift'#11
+'ex'#2#255#0#0#8'TSynEdit'#11'DiffSynEdit'#4'Left'#2#6#6'Height'#3#159#0#3'T' +#7'ssShift'#5'ssAlt'#0#9'ShiftMask'#11#7'ssShift'#5'ssAlt'#0#6'Button'#7#6'm'
+'op'#2'a'#5'Width'#3'L'#2#5'Align'#7#5'alTop'#18'BorderSpacing.Left'#2#6#19 +'bLeft'#10'ClickCount'#7#8'ccSingle'#8'ClickDir'#7#6'cdDown'#7'Command'#2#3#9
+'BorderSpacing.Right'#2#6#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBo' +'MoveCaret'#9#6'Option'#2#1#8'Priority'#2#0#0#1#5'Shift'#11#0#9'ShiftMask'#11
+'ttom'#0#11'Font.Height'#2#244#9'Font.Name'#6#7'courier'#11'ParentColor'#8#8 +#0#6'Button'#7#7'mbRight'#10'ClickCount'#7#8'ccSingle'#8'ClickDir'#7#4'cdUp'
+'TabOrder'#2#3#23'BookMarkOptions.Xoffset'#2#238#14'Gutter.Visible'#8#23'Gut' +#7'Command'#2#12#9'MoveCaret'#8#6'Option'#2#0#8'Priority'#2#0#0#1#5'Shift'#11
+'ter.CodeFoldingWidth'#2#14#10'Keystrokes'#14#1#7'Command'#2#3#8'ShortCut'#2 +#0#9'ShiftMask'#11#0#6'Button'#7#6'mbLeft'#10'ClickCount'#7#8'ccDouble'#8'Cl'
+'&'#0#1#7'Command'#2'g'#8'ShortCut'#3'& '#0#1#7'Command'#3#211#0#8'ShortCut' +'ickDir'#7#6'cdDown'#7'Command'#2#6#9'MoveCaret'#9#6'Option'#2#0#8'Priority'
+#3'&@'#0#1#7'Command'#2#4#8'ShortCut'#2'('#0#1#7'Command'#2'h'#8'ShortCut'#3 +#2#0#0#1#5'Shift'#11#0#9'ShiftMask'#11#0#6'Button'#7#6'mbLeft'#10'ClickCount'
+'( '#0#1#7'Command'#3#212#0#8'ShortCut'#3'(@'#0#1#7'Command'#2#1#8'ShortCut' +#7#8'ccTriple'#8'ClickDir'#7#6'cdDown'#7'Command'#2#7#9'MoveCaret'#9#6'Optio'
+#2'%'#0#1#7'Command'#2'e'#8'ShortCut'#3'% '#0#1#7'Command'#2#5#8'ShortCut'#3 +'n'#2#0#8'Priority'#2#0#0#1#5'Shift'#11#0#9'ShiftMask'#11#0#6'Button'#7#6'mb'
+'%@'#0#1#7'Command'#2'i'#8'ShortCut'#3'%`'#0#1#7'Command'#2#2#8'ShortCut'#2 +'Left'#10'ClickCount'#7#6'ccQuad'#8'ClickDir'#7#6'cdDown'#7'Command'#2#8#9'M'
+''''#0#1#7'Command'#2'f'#8'ShortCut'#3''' '#0#1#7'Command'#2#6#8'ShortCut'#3 +'oveCaret'#9#6'Option'#2#0#8'Priority'#2#0#0#1#5'Shift'#11#0#9'ShiftMask'#11
+'''@'#0#1#7'Command'#2'j'#8'ShortCut'#3'''`'#0#1#7'Command'#2#10#8'ShortCut' +#0#6'Button'#7#8'mbMiddle'#10'ClickCount'#7#8'ccSingle'#8'ClickDir'#7#6'cdDo'
+#2'"'#0#1#7'Command'#2'n'#8'ShortCut'#3'" '#0#1#7'Command'#2#14#8'ShortCut'#3 +'wn'#7'Command'#2#10#9'MoveCaret'#9#6'Option'#2#0#8'Priority'#2#0#0#1#5'Shif'
+'"@'#0#1#7'Command'#2'r'#8'ShortCut'#3'"`'#0#1#7'Command'#2#9#8'ShortCut'#2 +'t'#11#6'ssCtrl'#0#9'ShiftMask'#11#7'ssShift'#5'ssAlt'#6'ssCtrl'#0#6'Button'
+'!'#0#1#7'Command'#2'm'#8'ShortCut'#3'! '#0#1#7'Command'#2#13#8'ShortCut'#3 +#7#6'mbLeft'#10'ClickCount'#7#8'ccSingle'#8'ClickDir'#7#4'cdUp'#7'Command'#2
+'!@'#0#1#7'Command'#2'q'#8'ShortCut'#3'!`'#0#1#7'Command'#2#7#8'ShortCut'#2 +#11#9'MoveCaret'#8#6'Option'#2#0#8'Priority'#2#0#0#0#15'MouseSelActions'#14#1
+'$'#0#1#7'Command'#2'k'#8'ShortCut'#3'$ '#0#1#7'Command'#2#15#8'ShortCut'#3 +#5'Shift'#11#0#9'ShiftMask'#11#0#6'Button'#7#6'mbLeft'#10'ClickCount'#7#8'cc'
+'$@'#0#1#7'Command'#2's'#8'ShortCut'#3'$`'#0#1#7'Command'#2#8#8'ShortCut'#2 +'Single'#8'ClickDir'#7#6'cdDown'#7'Command'#2#9#9'MoveCaret'#8#6'Option'#2#0
+'#'#0#1#7'Command'#2'l'#8'ShortCut'#3'# '#0#1#7'Command'#2#16#8'ShortCut'#3 +#8'Priority'#2#0#0#0#13'Lines.Strings'#1#6#11'DiffSynEdit'#0#8'ReadOnly'#9#21
+'#@'#0#1#7'Command'#2't'#8'ShortCut'#3'#`'#0#1#7'Command'#3#223#0#8'ShortCut' +'BracketHighlightStyle'#7#8'sbhsBoth'#0#244#18'TSynGutterPartList'#18'SynGut'
+#2'-'#0#1#7'Command'#3#201#0#8'ShortCut'#3'-@'#0#1#7'Command'#3'\'#2#8'Short' +'terPartList1'#0#15'TSynGutterMarks'#15'SynGutterMarks1'#5'Width'#2#23#0#0#20
+'Cut'#3'- '#0#1#7'Command'#3#246#1#8'ShortCut'#2'.'#0#1#7'Command'#3'['#2#8 +'TSynGutterLineNumber'#20'SynGutterLineNumber1'#5'Width'#2#15#12'MouseAction'
+'ShortCut'#3'. '#0#1#7'Command'#3#245#1#8'ShortCut'#2#8#0#1#7'Command'#3#245 +'s'#14#0#21'MarkupInfo.Background'#7#9'clBtnFace'#21'MarkupInfo.Foreground'#7
+#1#8'ShortCut'#3#8' '#0#1#7'Command'#3#248#1#8'ShortCut'#3#8'@'#0#1#7'Comman' +#6'clNone'#10'DigitCount'#2#2#30'ShowOnlyLineNumbersMultiplesOf'#2#1#9'ZeroS'
+'d'#3'Y'#2#8'ShortCut'#4#8#128#0#0#0#1#7'Command'#3'Z'#2#8'ShortCut'#4#8#160 +'tart'#8#12'LeadingZeros'#8#0#0#17'TSynGutterChanges'#17'SynGutterChanges1'#5
+#0#0#0#1#7'Command'#3#253#1#8'ShortCut'#2#13#0#1#7'Command'#3#199#0#8'ShortC' +'Width'#2#4#13'ModifiedColor'#4#252#233#0#0#10'SavedColor'#7#7'clGreen'#0#0
+'ut'#3'A@'#0#1#7'Command'#3#201#0#8'ShortCut'#3'C@'#0#1#7'Command'#3'b'#2#8 +#19'TSynGutterSeparator'#19'SynGutterSeparator1'#5'Width'#2#2#0#0#21'TSynGut'
+'ShortCut'#3'I`'#0#1#7'Command'#3#253#1#8'ShortCut'#3'M@'#0#1#7'Command'#3 +'terCodeFolding'#21'SynGutterCodeFolding1'#12'MouseActions'#14#1#5'Shift'#11
+#254#1#8'ShortCut'#3'N@'#0#1#7'Command'#3#247#1#8'ShortCut'#3'T@'#0#1#7'Comm' +#0#9'ShiftMask'#11#0#6'Button'#7#7'mbRight'#10'ClickCount'#7#8'ccSingle'#8'C'
+'and'#3'c'#2#8'ShortCut'#3'U`'#0#1#7'Command'#3'\'#2#8'ShortCut'#3'V@'#0#1#7 +'lickDir'#7#4'cdUp'#7'Command'#2#16#9'MoveCaret'#8#6'Option'#2#0#8'Priority'
+'Command'#3'['#2#8'ShortCut'#3'X@'#0#1#7'Command'#3#251#1#8'ShortCut'#3'Y@'#0 +#2#0#0#1#5'Shift'#11#0#9'ShiftMask'#11#7'ssShift'#0#6'Button'#7#8'mbMiddle'
+#1#7'Command'#3#250#1#8'ShortCut'#3'Y`'#0#1#7'Command'#3'Y'#2#8'ShortCut'#3 +#10'ClickCount'#7#5'ccAny'#8'ClickDir'#7#6'cdDown'#7'Command'#2#14#9'MoveCar'
+'Z@'#0#1#7'Command'#3'Z'#2#8'ShortCut'#3'Z`'#0#1#7'Command'#3'-'#1#8'ShortCu' +'et'#8#6'Option'#2#0#8'Priority'#2#0#0#1#5'Shift'#11#7'ssShift'#0#9'ShiftMas'
+'t'#3'0@'#0#1#7'Command'#3'.'#1#8'ShortCut'#3'1@'#0#1#7'Command'#3'/'#1#8'Sh' +'k'#11#7'ssShift'#0#6'Button'#7#8'mbMiddle'#10'ClickCount'#7#5'ccAny'#8'Clic'
+'ortCut'#3'2@'#0#1#7'Command'#3'0'#1#8'ShortCut'#3'3@'#0#1#7'Command'#3'1'#1 +'kDir'#7#6'cdDown'#7'Command'#2#14#9'MoveCaret'#8#6'Option'#2#1#8'Priority'#2
+#8'ShortCut'#3'4@'#0#1#7'Command'#3'2'#1#8'ShortCut'#3'5@'#0#1#7'Command'#3 +#0#0#1#5'Shift'#11#0#9'ShiftMask'#11#0#6'Button'#7#6'mbLeft'#10'ClickCount'#7
+'3'#1#8'ShortCut'#3'6@'#0#1#7'Command'#3'4'#1#8'ShortCut'#3'7@'#0#1#7'Comman' +#5'ccAny'#8'ClickDir'#7#6'cdDown'#7'Command'#2#0#9'MoveCaret'#8#6'Option'#2#0
+'d'#3'5'#1#8'ShortCut'#3'8@'#0#1#7'Command'#3'6'#1#8'ShortCut'#3'9@'#0#1#7'C' +#8'Priority'#2#0#0#0#21'MarkupInfo.Background'#7#6'clNone'#21'MarkupInfo.For'
+'ommand'#3'_'#1#8'ShortCut'#3'0`'#0#1#7'Command'#3'`'#1#8'ShortCut'#3'1`'#0#1 +'eground'#7#6'clGray'#20'MouseActionsExpanded'#14#1#5'Shift'#11#0#9'ShiftMas'
+#7'Command'#3'a'#1#8'ShortCut'#3'2`'#0#1#7'Command'#3'b'#1#8'ShortCut'#3'3`' +'k'#11#0#6'Button'#7#6'mbLeft'#10'ClickCount'#7#5'ccAny'#8'ClickDir'#7#6'cdD'
+#0#1#7'Command'#3'c'#1#8'ShortCut'#3'4`'#0#1#7'Command'#3'd'#1#8'ShortCut'#3 +'own'#7'Command'#2#14#9'MoveCaret'#8#6'Option'#2#0#8'Priority'#2#0#0#0#21'Mo'
+'5`'#0#1#7'Command'#3'e'#1#8'ShortCut'#3'6`'#0#1#7'Command'#3'f'#1#8'ShortCu' +'useActionsCollapsed'#14#1#5'Shift'#11#6'ssCtrl'#0#9'ShiftMask'#11#6'ssCtrl'
+'t'#3'7`'#0#1#7'Command'#3'g'#1#8'ShortCut'#3'8`'#0#1#7'Command'#3'h'#1#8'Sh' +#0#6'Button'#7#6'mbLeft'#10'ClickCount'#7#5'ccAny'#8'ClickDir'#7#6'cdDown'#7
+'ortCut'#3'9`'#0#1#7'Command'#3#231#0#8'ShortCut'#3'N`'#0#1#7'Command'#3#232 +'Command'#2#15#9'MoveCaret'#8#6'Option'#2#0#8'Priority'#2#0#0#1#5'Shift'#11#0
+#0#8'ShortCut'#3'C`'#0#1#7'Command'#3#233#0#8'ShortCut'#3'L`'#0#1#7'Command' +#9'ShiftMask'#11#6'ssCtrl'#0#6'Button'#7#6'mbLeft'#10'ClickCount'#7#5'ccAny'
,#3'd'#2#8'ShortCut'#2#9#0#1#7'Command'#3'e'#2#8'ShortCut'#3#9' '#0#1#7'Comma' ,#8'ClickDir'#7#6'cdDown'#7'Command'#2#15#9'MoveCaret'#8#6'Option'#2#1#8'Prio'
+'nd'#3#250#0#8'ShortCut'#3'B`'#0#0#13'Lines.Strings'#1#6#11'DiffSynEdit'#0#8 +'rity'#2#0#0#0#0#0#0#0#9'TSplitter'#8'Splitter'#6'Cursor'#7#8'crVSplit'#4'Le'
+'ReadOnly'#9#0#0#9'TSplitter'#8'Splitter'#6'Cursor'#7#8'crVSplit'#6'Height'#2 +'ft'#2#0#6'Height'#2#5#3'Top'#2'\'#5'Width'#3'X'#2#5'Align'#7#5'alTop'#12'Re'
+#5#3'Top'#2'\'#5'Width'#3'X'#2#5'Align'#7#5'alTop'#12'ResizeAnchor'#7#5'akTo' +'sizeAnchor'#7#5'akTop'#0#0#9'TCheckBox#CheckDiskChangesWithLoadingCheckBox'
+'p'#0#0#9'TCheckBox#CheckDiskChangesWithLoadingCheckBox'#4'Left'#2#10#6'Heig' +#22'AnchorSideLeft.Control'#7#5'Owner'#24'AnchorSideBottom.Control'#7#8'BtnP'
+'ht'#2#22#3'Top'#3#13#1#5'Width'#3#30#1#7'Anchors'#11#6'akLeft'#8'akBottom'#0 +'anel'#4'Left'#2#6#6'Height'#2#22#3'Top'#3#29#1#5'Width'#3#30#1#7'Anchors'#11
+#7'Caption'#6'#CheckDiskChangesWithLoadingCheckBox'#8'TabOrder'#2#4#0#0#0 +#6'akLeft'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6'#CheckDis'
+'kChangesWithLoadingCheckBox'#8'TabOrder'#2#2#0#0#6'TPanel'#8'BtnPanel'#4'Le'
+'ft'#2#0#6'Height'#2')'#3'Top'#3'9'#1#5'Width'#3'X'#2#5'Align'#7#8'alBottom'
+#8'AutoSize'#9#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2')'#11'ClientWid'
+'th'#3'X'#2#8'TabOrder'#2#4#0#7'TButton'#15'RevertAllButton'#4'Left'#3#228#1
+#6'Height'#2#29#3'Top'#2#6#5'Width'#2'n'#5'Align'#7#7'alRight'#8'AutoSize'#9
+#20'BorderSpacing.Around'#2#6#7'Caption'#6#15'RevertAllButton'#7'Default'#9
+#11'ModalResult'#2#10#8'TabOrder'#2#0#0#0#7'TButton'#23'IgnoreDiskChangesBut'
+'ton'#4'Left'#3','#1#6'Height'#2#29#3'Top'#2#6#5'Width'#3#178#0#5'Align'#7#7
+'alRight'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#23'IgnoreD'
+'iskChangesButton'#11'ModalResult'#2#5#8'TabOrder'#2#1#0#0#0#0
]); ]);

1
ide/diskdiffsdialog.pas
View File

@ -52,6 +52,7 @@ type
{ TDiskDiffsDlg } { TDiskDiffsDlg }
TDiskDiffsDlg = class(TForm) TDiskDiffsDlg = class(TForm)
BtnPanel: TPanel;
CheckDiskChangesWithLoadingCheckBox: TCheckBox; CheckDiskChangesWithLoadingCheckBox: TCheckBox;
DiffSynEdit: TSynEdit; DiffSynEdit: TSynEdit;
FilesListBox: TListBox; FilesListBox: TListBox;