mirror of
https://github.com/doublecmd/doublecmd.git
synced 2026-06-21 09:58:13 +00:00
ADD: [Differ] "Edit" submenu
This commit is contained in:
parent
2943e02764
commit
dbb3913d8d
3 changed files with 470 additions and 1 deletions
380
src/fdiffer.lfm
380
src/fdiffer.lfm
|
|
@ -849,11 +849,104 @@ object frmDiffer: TfrmDiffer
|
|||
end
|
||||
object miClose: TMenuItem
|
||||
Action = actClose
|
||||
Bitmap.Data = {
|
||||
C6070000424DC607000000000000360000002800000016000000160000000100
|
||||
2000000000009007000064000000640000000000000000000000000000000000
|
||||
0000000000000000000000000000000000000000000000000000000000000000
|
||||
0000000000000000000000000000000000000000000000000000000000000000
|
||||
0000000000000000000000000000000000000000000000000000000000000000
|
||||
0000000000000000000000000000000000000000000000000000000000000000
|
||||
0000000000000000000000000000000000000000000000000000000000000000
|
||||
0000000000000000000000000000000000000000000000000000000000000000
|
||||
0000000000000000000000000000000000000000000000000000000000000000
|
||||
0000000000000000000000000000000000000000000000000000000000000000
|
||||
0000000000000000000000000000000000000000000000000000000000000000
|
||||
0000000000000000000000000000000000000000000000000000000000000000
|
||||
0000000000000000000000000000000000000000000000000000000000000000
|
||||
0000000000000000000000000000000000000000000000000000000000000000
|
||||
0000000000000000000000000000000000000000000000000000000000000000
|
||||
0000000000000000000000000000000000000000000000000000000000000000
|
||||
0000000000000000000000000000000000000000000000000000000000000000
|
||||
0000000000000000000000000000000000000000000000000000000000000000
|
||||
00000000000000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
|
||||
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
|
||||
FF00FFFFFF00FFFFFF0000000000000000000000000000000000000000000000
|
||||
0000FFFFFF00B7B7B7FFAEAEAEFF3071A9FF2C6EA6FF286BA3FF2468A0FF2166
|
||||
9EFF1D639BFF1A6199FF175F97FF145C94FF115B93FF6C6C6CFF6C6C6CFFFFFF
|
||||
FF00000000000000000000000000000000000000000000000000FFFFFF00FFFF
|
||||
FF00FFFFFF003675ADFF86B6D8FF83B3D7FF81B2D6FF7DAFD5FF7BADD4FF79AB
|
||||
D3FF76AAD2FF74A8D1FF155D95FFFFFFFF00FFFFFF00FFFFFF00000000000000
|
||||
000000000000000000000000000000000000FFFFFF00FFFFFF00FFFFFF003C79
|
||||
B1FF8BB9DAFF66A2CEFF62A0CDFF5F9DCBFF5B9AC9FF5897C8FF5495C7FF77AB
|
||||
D3FF196098FFFFFFFF00FFFFFF00FFFFFF000000000000000000000000000000
|
||||
00000000000000000000FFFFFF00FFFFFF00FFFFFF00427DB5FF8FBDDCFF6CA7
|
||||
D0FF67A4CFFF64A1CDFF609ECCFF5C9BCAFF5999C9FF7BADD4FF1E649CFFFFFF
|
||||
FF00FFFFFF00FFFFFF0000000000000000000000000000000000000000000000
|
||||
0000FFFFFF00FFFFFF00FFFFFF004882BAFF93C0DDFF71ABD2FF6DA8D1FF69A5
|
||||
CFFF66A2CEFF629FCCFF5E9CCBFF7FB0D5FF23679FFFFFFFFF00FFFFFF00FFFF
|
||||
FF00000000000000000000000000000000000000000000000000FFFFFF00FFFF
|
||||
FF00FFFFFF004E86BEFF98C3DFFF77AFD5FF73ACD3FF6FA9D2FF6BA7D0FF5BB7
|
||||
E3FF54C2EDFF81B4D7FF286BA3FFFFFFFF00FFFFFF00FFFFFF00000000000000
|
||||
000000000000000000000000000000000000FFFFFF00FFFFFF00FFFFFF00538A
|
||||
C2FF9CC6E1FF7CB3D7FF79B1D5FF75ADD4FF71ABD2FF5FBAE4FF4BD4FFFF7CBB
|
||||
E0FF2E6FA7FFFFFFFF00FFFFFF00FFFFFF000000000000000000000000000000
|
||||
00000000000000000000FFFFFF00FFFFFF00FFFFFF00598EC6FFA0C9E3FF82B8
|
||||
D9FF7EB5D8FF7AB2D6FF77AFD5FF73ACD3FF6DABD4FF8CBADAFF3373ABFFFFFF
|
||||
FF00FFFFFF00FFFFFF0000000000000000000000000000000000000000000000
|
||||
0000FFFFFF00FFFFFF00FFFFFF005E91C9FFA4CCE4FF87BBDBFF84B9DAFF80B6
|
||||
D8FF7CB3D7FF79B0D5FF74ADD4FF8FBDDCFF3977AFFFFFFFFF00FFFFFF00FFFF
|
||||
FF00000000000000000000000000000000000000000000000000FFFFFF00FFFF
|
||||
FF00FFFFFF006395CDFFA8CFE5FF8CBFDDFF88BDDCFF85BADBFF81B7D9FF7EB4
|
||||
D7FF7AB2D6FF94C1DDFF3F7CB4FFFFFFFF00FFFFFF00FFFFFF00000000000000
|
||||
000000000000000000000000000000000000FFFFFF00FFFFFF00FFFFFF006798
|
||||
D0FFABD1E7FF90C2DFFF8DC0DEFF8ABEDCFF87BBDBFF83B8DAFF80B6D8FF99C4
|
||||
E0FF4580B8FFFFFFFF00FFFFFF00FFFFFF000000000000000000000000000000
|
||||
00000000000000000000FFFFFF00FFFFFF00FFFFFF006B9BD3FFAED4E8FFABD3
|
||||
E8FFAAD1E7FFA8CFE5FFA5CDE4FFA2CBE4FFA0C9E2FF9DC7E1FF4B84BCFFFFFF
|
||||
FF00FFFFFF00FFFFFF0000000000000000000000000000000000000000000000
|
||||
0000FFFFFF00FFFFFF00FFFFFF006E9DD5FF6C9BD3FF699AD2FF6697CFFF6395
|
||||
CDFF6093CBFF5C90C8FF598EC6FF558BC3FF5188C0FFFFFFFF00FFFFFF00FFFF
|
||||
FF00000000000000000000000000000000000000000000000000FFFFFF00FFFF
|
||||
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
|
||||
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00000000000000
|
||||
000000000000000000000000000000000000FFFFFF00FFFFFF00FFFFFF00FFFF
|
||||
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
|
||||
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000000000000000000000000000
|
||||
00000000000000000000
|
||||
}
|
||||
OnClick = actCloseExecute
|
||||
end
|
||||
end
|
||||
object mnuEdit: TMenuItem
|
||||
Caption = 'Edit'
|
||||
object miEditUndo: TMenuItem
|
||||
Action = actEditUndo
|
||||
end
|
||||
object miEditRedo: TMenuItem
|
||||
Action = actEditRedo
|
||||
end
|
||||
object miDivider8: TMenuItem
|
||||
Caption = '-'
|
||||
end
|
||||
object miEditCut: TMenuItem
|
||||
Action = actEditCut
|
||||
OnClick = actEditCutExecute
|
||||
end
|
||||
object miEditCopy: TMenuItem
|
||||
Action = actEditCopy
|
||||
end
|
||||
object miEditPaste: TMenuItem
|
||||
Action = actEditPaste
|
||||
end
|
||||
object miEditDelete: TMenuItem
|
||||
Action = actEditDelete
|
||||
end
|
||||
object miDivider9: TMenuItem
|
||||
Caption = '-'
|
||||
end
|
||||
object miEditSelectAll: TMenuItem
|
||||
Action = actEditSelectAll
|
||||
end
|
||||
end
|
||||
object mnuOptions: TMenuItem
|
||||
Caption = '&Options'
|
||||
|
|
@ -1426,11 +1519,46 @@ object frmDiffer: TfrmDiffer
|
|||
ImageIndex = 12
|
||||
OnExecute = actCloseExecute
|
||||
end
|
||||
object actEditCut: TAction
|
||||
Category = 'Edit'
|
||||
Caption = 'Cut'
|
||||
OnExecute = actEditCutExecute
|
||||
end
|
||||
object actEditCopy: TAction
|
||||
Category = 'Edit'
|
||||
Caption = 'Copy'
|
||||
OnExecute = actEditCopyExecute
|
||||
end
|
||||
object actEditPaste: TAction
|
||||
Category = 'Edit'
|
||||
Caption = 'Paste'
|
||||
OnExecute = actEditPasteExecute
|
||||
end
|
||||
object actEditDelete: TAction
|
||||
Category = 'Edit'
|
||||
Caption = 'Delete'
|
||||
OnExecute = actEditDeleteExecute
|
||||
end
|
||||
object actEditSelectAll: TAction
|
||||
Category = 'Edit'
|
||||
Caption = 'Select &All'
|
||||
OnExecute = actEditSelectAllExecute
|
||||
end
|
||||
object actEditRedo: TAction
|
||||
Category = 'Edit'
|
||||
Caption = 'Redo'
|
||||
OnExecute = actEditRedoExecute
|
||||
end
|
||||
object actEditUndo: TAction
|
||||
Category = 'Edit'
|
||||
Caption = 'Undo'
|
||||
OnExecute = actEditUndoExecute
|
||||
end
|
||||
end
|
||||
object ImageList: TImageList
|
||||
Height = 22
|
||||
Width = 22
|
||||
left = 136
|
||||
left = 200
|
||||
top = 136
|
||||
Bitmap = {
|
||||
4C690D000000160000001600000000000000000000000000000077856C9D9179
|
||||
|
|
@ -2222,4 +2350,254 @@ object frmDiffer: TfrmDiffer
|
|||
000000000000000000000000000000000000000000000000000000000000
|
||||
}
|
||||
end
|
||||
object ContextMenu: TPopupMenu
|
||||
left = 136
|
||||
top = 136
|
||||
object miUndoContext: TMenuItem
|
||||
Action = actEditUndo
|
||||
Bitmap.Data = {
|
||||
36040000424D3604000000000000360000002800000010000000100000000100
|
||||
2000000000000004000064000000640000000000000000000000000000000000
|
||||
0000000000000000000000000000000000000000000000000000000000000000
|
||||
0000000000000000000000000000000000000000000000000000000000000000
|
||||
0000000000000000000000000000000000000000000000000000000000000000
|
||||
0000000000000000000066DBEAFF11A6C2FF0000000000000000000000000000
|
||||
0000000000000000000000000000000000000000000000000000000000000000
|
||||
0000000000000000000043C4DBFF43C5D8FF0000000000000000000000000000
|
||||
00000000000000000000000000000000000000A0C4FF00000000000000000000
|
||||
000000000000000000000EAACBFF5DDAE9FF23A6C0FF00000000000000000000
|
||||
000000000000000000000000000000A0C4FF00A0C4FF00000000000000000000
|
||||
0000000000000000000002ACC8FF88E7F2FF11A2C2FF00000000000000000000
|
||||
0000000000000000000000A0C4FF76EDFBFF00A0C4FF00000000000000000000
|
||||
00000000000000A0C4FF6DE6F5FF76E2EFFF19A3C1FF00000000000000000000
|
||||
00000000000000A0C4FF76EDFBFF76EDFBFF00A0C4FF00A0C4FF00A0C4FF00A0
|
||||
C4FF01A9C4FF6EE1EEFF0FC9DFFF69E4F2FF1AA4C0FF00000000000000000000
|
||||
000000A0C4FF76EDFBFF04C3DAFF76EDFBFF69EAF9FF69EAF9FF69EAF9FF69EA
|
||||
F9FF05DDF7FF0AC8DFFF07C2D8FF6FDCEBFF1BA3BFFF000000000000000000A0
|
||||
C4FF79EDFBFF32E2F8FF2CDFF4FF04C0D6FF04C0D6FF04C0D6FF1DD2E8FF1DD2
|
||||
E8FF1DD2E8FF0BC8DFFF6AE5F3FF1BABC5FF15A0BCFF0000000000A0C4FFADF3
|
||||
FBFF2FE0F6FF32E2F8FF32E2F7FF32E2F7FF2FE0F5FF29DBF1FF1DD2E8FF1DD2
|
||||
E8FF1DD2E8FF36D9ECFF40CDE1FF16A1BDFF00000000000000000000000000A0
|
||||
C4FFADF3FBFF2FE0F6FF32E2F7FF29DBF1FF2FE0F5FF29DBF1FF16CDE3FF36D9
|
||||
ECFF69E7F6FF41CEE3FF13A3C1FF000000000000000000000000000000000000
|
||||
000000A0C4FFADF3FBFF31E1F6FF20E3FAFF73ECFAFF6FEBFAFF6EE8F7FF6CE8
|
||||
F7FF14A1BCFF14A3C1FF00000000000000000000000000000000000000000000
|
||||
00000000000000A0C4FFADF3FBFF25E4FBFF00A0C4FF00A0C4FF13A1BEFF159F
|
||||
BBFF1BA1BBFF0000000000000000000000000000000000000000000000000000
|
||||
0000000000000000000000A0C4FFADF3FBFF00A0C4FF00000000000000000000
|
||||
0000000000000000000000000000000000000000000000000000000000000000
|
||||
000000000000000000000000000000A0C4FF00A0C4FF00000000000000000000
|
||||
0000000000000000000000000000000000000000000000000000000000000000
|
||||
00000000000000000000000000000000000000A0C4FF00000000000000000000
|
||||
0000000000000000000000000000000000000000000000000000
|
||||
}
|
||||
OnClick = actEditUndoExecute
|
||||
end
|
||||
object miSeparator1: TMenuItem
|
||||
Caption = '-'
|
||||
end
|
||||
object miCutContext: TMenuItem
|
||||
Action = actEditCut
|
||||
Bitmap.Data = {
|
||||
36040000424D3604000000000000360000002800000010000000100000000100
|
||||
2000000000000004000064000000640000000000000000000000000000000000
|
||||
00000E0EAAFF1010ABFF1616ABFF000000000000000000000000000000000000
|
||||
0000000000000D0DAAFF0B0BAAFF0B0BA9FF0000000000000000000000001313
|
||||
ABFF2727DBFF1F1FD0FF1D1DCEFF0707A8FF0000000000000000000000000000
|
||||
00000808AAFF2222D4FF1D1DCFFF1D1DCEFF1313ABFF00000000000000000D0D
|
||||
ABFF1D1DCFFF000000000B0BB5FF2121D3FF0C0CAAFF00000000000000000909
|
||||
AAFF2323D6FF0D0DB8FF000000001F1FD1FF1111ABFF00000000000000001414
|
||||
ABFF2323D5FF00000000000000001D1DCEFF0A0AA9FF00000000000000000303
|
||||
A8FF1A1BCAFF00000000000000002020D1FF1414ABFF00000000000000000000
|
||||
00000606A8FF1F1FD0FF0303A8FF1415C0FF0101A6FF00000000000000001C1D
|
||||
CDFF1315C0FF0303A8FF1D1DCDFF0606A7FF0000000000000000000000000000
|
||||
0000000000000707A9FF2020D2FF1E1ECEFF0E0FB7FF0205A4FF0304A8FF1A1A
|
||||
C9FF2020D1FF1F1FCBFF0A0AA9FF000000000000000000000000000000000000
|
||||
000000000000000000001818AEFF1616ABFF0606A6FF454AA3FF0202A6FF191A
|
||||
C7FF1717ADFF1818AEFF00000000000000000000000000000000000000000000
|
||||
000000000000000000000000000000000000848989FFC3C6C5FFAFB2B3FF2C2F
|
||||
9CFF000000000000000000000000000000000000000000000000000000000000
|
||||
00000000000000000000000000008A8F8DFFB7BBBAFFE6E8E7FFA7ACAAFF8B90
|
||||
8EFF878C8AFF0000000000000000000000000000000000000000000000000000
|
||||
0000000000000000000000000000888D8BFFDFE1E1FFF5F6F5FF979C9AFFA5A9
|
||||
A8FF888D8BFF0000000000000000000000000000000000000000000000000000
|
||||
000000000000000000008A8F8DFFB2B6B5FFF7F7F7FF888D8BFF9CA09FFFB3B6
|
||||
B5FFB5BAB8FF888D8BFF00000000000000000000000000000000000000000000
|
||||
00000000000000000000888D8BFFD9DCDBFFEFF0EFFF8E9391FF898E8CFFB3B8
|
||||
B6FFCBCECDFF888D8BFF00000000000000000000000000000000000000000000
|
||||
0000000000008A8F8DFFB0B5B3FFF6F7F7FF888D8BFF00000000000000008B90
|
||||
8EFFC9CECCFFABAFAEFF888D8BFF000000000000000000000000000000000000
|
||||
000000000000888D8BFFD0D4D2FFEFF0EFFF8F9492FF00000000000000000000
|
||||
0000A7ACAAFFC3C8C6FF8A8F8DFF000000000000000000000000000000000000
|
||||
0000000000008B908EFFF7F7F7FF888D8BFF0000000000000000000000000000
|
||||
00008D9190FFD0D3D2FF8C918FFF000000000000000000000000000000000000
|
||||
00000000000000000000888D8BFF909593FF0000000000000000000000000000
|
||||
0000888D8BFF8C918FFF00000000000000000000000000000000
|
||||
}
|
||||
OnClick = actEditCutExecute
|
||||
end
|
||||
object miCopyContext: TMenuItem
|
||||
Action = actEditCopy
|
||||
Bitmap.Data = {
|
||||
36040000424D3604000000000000360000002800000010000000100000000100
|
||||
2000000000000004000064000000640000000000000000000000000000000000
|
||||
00000000000000000000898E8CFF868B89FF858A88FF858A88FF858A88FF858A
|
||||
88FF858A88FF858A88FF858A88FF000000000000000000000000000000000000
|
||||
00000000000000000000868B89FFF4F4F4FFF6F7F7FFF5F6F6FFFBFCFCFFFBFB
|
||||
FBFFD4D4D4FF969A98FFE2E4E3FF858A88FF0000000000000000000000000000
|
||||
00000000000000000000868B89FFF9FAFAFFEFF0F0FFEFF0F0FFEFF0F0FFFAFA
|
||||
FAFFFAFAFAFF959A98FFFAFAFAFFE2E3E3FF858A88FF858A88FF000000000000
|
||||
00000000000000000000868B89FFFDFEFEFFEFF0F0FFEFF0F0FFEFF0F0FFEFF0
|
||||
F0FFFAFAFAFF959A98FFFAFAFAFFF7F8F8FFE2E4E3FF858A88FF000000000000
|
||||
00000000000000000000878C8AFFFFFFFFFFEFF0F0FFEFF0F0FFEFF0F0FFEFF0
|
||||
F0FFEFF0F0FF898E8CFF898E8CFF898E8CFF898E8CFF858A88FF000000000000
|
||||
00000000000000000000878C8AFFFFFFFFFFEFF0F0FFC6C7C7FFC6C7C7FFC6C7
|
||||
C7FFC6C7C7FFC6C7C7FFEEEEEEFFF6F7F7FFC3C4C3FF858A88FF000000000000
|
||||
00000000000000000000868B89FFFFFFFFFFEFF0F0FFEFF0F0FFEFF0F0FFEFF0
|
||||
F0FFEFF0F0FFEFF0F0FFEFF0F0FFFAFAFAFFF3F3F3FF858A88FF000000000000
|
||||
00000000000000000000878C8AFFFFFFFFFFEFF0F0FFC6C7C7FFC6C7C7FFC6C7
|
||||
C7FFC6C7C7FFC6C7C7FFEFF0F0FFEFF0F0FFFFFFFFFF858A88FF000000000000
|
||||
00000000000000000000868B89FFFFFFFFFFEFF0F0FFEFF0F0FFEFF0F0FFEFF0
|
||||
F0FFEFF0F0FFEFF0F0FFEFF0F0FFEFF0F0FFFFFFFFFF858A88FF000000000000
|
||||
00000000000000000000878C8AFFFFFFFFFFEFF0F0FFC6C7C7FFC6C7C7FFC6C7
|
||||
C7FFC6C7C7FFC6C7C7FFC6C7C7FFEFF0F0FFFFFFFFFF858A88FF000000000000
|
||||
00000000000000000000868B89FFFFFFFFFFEFF0F0FFEFF0F0FFEFF0F0FFEFF0
|
||||
F0FFEFF0F0FFEFF0F0FFEFF0F0FFEFF0F0FFFFFFFFFF858A88FF000000000000
|
||||
00000000000000000000878C8AFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
|
||||
FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF858A88FF000000000000
|
||||
00000000000000000000979B9AFF858A88FF858A88FF858A88FF858A88FF858A
|
||||
88FF858A88FF858A88FF858A88FF858A88FF858A88FF8A8F8DFF000000000000
|
||||
0000000000000000000000000000000000000000000000000000000000000000
|
||||
0000000000000000000000000000000000000000000000000000000000000000
|
||||
0000000000000000000000000000000000000000000000000000000000000000
|
||||
0000000000000000000000000000000000000000000000000000000000000000
|
||||
0000000000000000000000000000000000000000000000000000000000000000
|
||||
0000000000000000000000000000000000000000000000000000
|
||||
}
|
||||
OnClick = actEditCopyExecute
|
||||
end
|
||||
object miPasteContext: TMenuItem
|
||||
Action = actEditPaste
|
||||
Bitmap.Data = {
|
||||
36040000424D3604000000000000360000002800000010000000100000000100
|
||||
2000000000000004000064000000640000000000000000000000000000000000
|
||||
000001436CFF01446CFF01446CFF01446CFF01446CFF01446CFF01446CFF0144
|
||||
6CFF01446CFF01446CFF01446CFF01436BFF0000000000000000000000000143
|
||||
6CFF237FBAFF3B7DA7FF646F73FF686C6AFF686C6AFF686C6AFF686C6AFF686C
|
||||
6AFF3D7CA3FF3D7CA3FF3D7CA3FF227BB3FF01436BFF00000000000000000245
|
||||
6EFF2687C5FF636D70FFEDEEEDFFFEFEFEFFFEFEFEFFFEFEFEFFEEEFEFFFFDFE
|
||||
FEFF646967FF2787C5FF2787C5FF2787C5FF00426AFF00000000000000000245
|
||||
6EFF2687C5FF646866FFFFFFFFFFE4E7E7FFD5D8D8FFBEC2C1FFB4B7B7FFFFFF
|
||||
FFFFFFFFFFFF646967FF2787C5FF2886C2FF00426AFF00000000000000000245
|
||||
6EFF2687C5FF646866FFFFFFFFFFE7E9E9FFE5E7E7FFD6D9D9FFB6B9B9FFFFFF
|
||||
FFFFFFFFFFFFFFFFFFFF646967FF2886C2FF00426AFF00000000000000000246
|
||||
6EFF2687C5FF646866FFFFFFFFFFEAECECFFE8EAEAFFE6E8E8FFCBCECDFFB6BA
|
||||
B9FFB5B9B8FFFFFFFFFF646967FF2886C2FF00426AFF00000000000000000246
|
||||
6EFF2687C5FF646866FFFFFFFFFFEDEEEEFFEBECECFFE9EBEBFFE7E9E9FFD8DA
|
||||
DAFFCACDCCFFFFFFFFFF646967FF2886C2FF00426AFF00000000000000000246
|
||||
6EFF2687C5FF646866FFFFFFFFFFEFF0F0FFEEEFEFFFECEDEDFFEAEBEBFFE8EA
|
||||
EAFFD9DBDBFFFFFFFFFF646967FF2886C2FF00426AFF00000000000000000246
|
||||
6EFF2687C5FF646866FFFFFFFFFFEFF0F0FFB5B5B3FFB5B5B3FFB4B4B2FFB2B2
|
||||
B1FFE8EAEAFFFFFFFFFF646967FF2886C2FF00426AFF00000000000000000246
|
||||
6FFF2687C5FF646866FFFFFFFFFFEFF0F0FFEFF0F0FFEFF0F0FFEFF0F0FFEDEF
|
||||
EFFFEBEDEDFFFFFFFFFF646967FF2886C2FF00426AFF00000000000000000246
|
||||
6FFF2687C5FF646866FFFFFFFFFFEFF0F0FFB5B5B3FFB5B5B3FFB5B5B3FFB5B5
|
||||
B3FFEEEFEFFFFFFFFFFF646967FF2886C2FF00426AFF00000000000000000246
|
||||
6FFF2788C6FF646866FFFFFFFFFFEFF0F0FFEFF0F0FFEFF0F0FFEFF0F0FFEFF0
|
||||
F0FFEFF0F0FFFFFFFFFF646967FF2886C2FF00426AFF00000000000000000246
|
||||
6FFF2788C6FF646F71FFF1F1F1FFE0E0E0FFBBBBBBFFBBBBBBFFBBBBBBFFBBBB
|
||||
BBFFE0E0E0FFF2F2F2FF646D6EFF2787C5FF00426AFF00000000000000000144
|
||||
6DFF2484C0FF3E7EA4FF646D70FF5E5E5EFF7C7F7FFF7D8080FF7D8080FF7B7E
|
||||
7EFF5E5E5EFF646C6EFF407CA1FF237FB9FF01436CFF00000000000000000000
|
||||
000001446DFF01446CFF03446BFF5B5C5CFF899595FF8A9797FF8A9797FF8995
|
||||
95FF5B5C5CFF03446BFF01446CFF01446CFF0000000000000000000000000000
|
||||
00000000000000000000000000005E5F5FFF5C5C5CFF5C5C5CFF5C5C5CFF5C5C
|
||||
5CFF5E5F5FFF0000000000000000000000000000000000000000
|
||||
}
|
||||
OnClick = actEditPasteExecute
|
||||
end
|
||||
object miDeleteContext: TMenuItem
|
||||
Action = actEditDelete
|
||||
Bitmap.Data = {
|
||||
36040000424D3604000000000000360000002800000010000000100000000100
|
||||
2000000000000004000064000000640000000000000000000000000000008C90
|
||||
8FFF919493FFADB0AFFF0000000000000000909492FF9DA09FFF989C9AFF0000
|
||||
000000000000000000007B7E7DFF989B9AFF0000000000000000000000008C90
|
||||
8FFFFAFAFAFF949897FF999C9BFF999C9BFF969A98FFEDEEEEFF949997FF9B9E
|
||||
9DFF989B9AFF8B8E8DFFFFFFFFFF8F9392FF0000000000000000000000008C90
|
||||
8FFF858988FFF6F6F6FF999C9BFFABADACFF838885FFDEDFDEFF9C9F9EFFCCCE
|
||||
CDFF989B9AFFEBEBEBFF969998FF000000000000000000000000000000000000
|
||||
0000858988FFC9CBCAFF838885FFC4C4C4FF838885FFCACCCBFF9B9D9CFFC0C0
|
||||
C0FF7C807FFFE2E3E3FF8B8E8DFF000000000000000000000000000000000000
|
||||
0000727675FFC7C9C8FF797E7BFF9E9F9EFF8E8F8FFFADAEADFF8C8D8CFFAEAF
|
||||
AEFF7C807FFFB7B8B7FF767978FF000000000000000000000000000000000000
|
||||
00006A6E6DFFCCCDCDFF656968FFAAACABFF6C6F6EFFAEB0AFFF6B6E6DFFB0B2
|
||||
B1FF6E7271FFB2B3B3FF6C706FFF000000000000000000000000874920FF874A
|
||||
20FF874A20FF874A20FF874A20FF874A20FF874A20FF874A20FF874A20FF874A
|
||||
20FF874A20FF874A20FF874A20FF874A20FF874A20FF874920FF874A20FFDDBB
|
||||
9CFFCF9F72FFCF9F72FFCF9F72FFCF9F72FFCF9F72FFCF9F72FFCF9F72FFCF9F
|
||||
72FFCF9F72FFCF9F72FFCF9F72FFCF9F72FFDDBB9CFF874A20FF874A20FFDDBB
|
||||
9CFFDDBB9CFFDDBB9CFFDDBB9CFFDDBB9CFFDDBB9CFFDDBB9CFFDDBB9CFFDDBB
|
||||
9CFFDDBB9CFFDDBB9CFFDDBB9CFFDDBB9CFFDDBB9CFF874A20FF874A20FFDDBB
|
||||
9CFFCA8A58FFCA8A58FFCA8A58FFCA8A58FFCA8A58FFCA8A58FFCA8A58FFCA8A
|
||||
58FFCA8A58FFCA8A58FFCA8A58FFCA8A58FFDDBB9CFF874A20FF874A20FFDDBB
|
||||
9CFF86522CFF86512BFF86512BFF86512BFF86512BFF86512BFF86522CFF8652
|
||||
2CFF86522CFF86522CFF86522CFF86522CFFDDBB9CFF874A20FF874A20FFDDBB
|
||||
9CFF6A5B4EFFC9C9C9FF9C9C9CFF9C9C9CFF9C9C9CFF9B9B9BFF9B9B9BFF9B9B
|
||||
9BFF9B9B9BFF9B9B9BFF9B9B9BFF6A5B4EFFDDBB9CFF874A20FF874A20FFDDBB
|
||||
9CFF777C7AFFD9D9D9FFBDBDBDFFBDBDBDFFBDBDBDFFBDBDBDFFBCBCBCFFBCBC
|
||||
BCFFBCBCBCFFBFBFBFFFC0C0C0FF777C7AFFDDBB9CFF874A20FF00000000874A
|
||||
20FF858A88FFE7E7E7FFD7D7D7FFD6D6D6FFD6D6D6FFD6D6D6FFD6D6D6FFD5D5
|
||||
D5FFD5D5D5FFDADADAFFDCDCDCFF858A88FF874A20FF00000000000000000000
|
||||
0000858A88FFF1F1F1FFEBEBEBFFEBEBEBFFEBEBEBFFEAEAEAFFEAEAEAFFEAEA
|
||||
EAFFEAEAEAFFEAEAEAFFE9E9E9FF858A88FF0000000000000000000000000000
|
||||
00008F9391FF858A88FF858A88FF858A88FF858A88FF858A88FF858A88FF858A
|
||||
88FF858A88FF858A88FF858A88FF8F9391FF0000000000000000
|
||||
}
|
||||
OnClick = actEditDeleteExecute
|
||||
end
|
||||
object miSeparator2: TMenuItem
|
||||
Caption = '-'
|
||||
end
|
||||
object miSelectAllContext: TMenuItem
|
||||
Action = actEditSelectAll
|
||||
Bitmap.Data = {
|
||||
36040000424D3604000000000000360000002800000010000000100000000100
|
||||
200000000000000400006400000064000000000000000000000000000000898E
|
||||
8CFF858A88FF858A88FF858A88FF858A88FF858A88FF858A88FF858A88FF858A
|
||||
88FF858A88FF858A88FF858A88FF858A88FF8A8F8DFF0000000000000000858A
|
||||
88FFF8F8F8FFF8F8F8FFF8F8F8FFF8F8F8FFF8F8F8FFF8F8F8FF000000FFF8F8
|
||||
F8FF000000FFF8F8F8FFF8F8F8FFF8F8F8FF888D8BFF0000000000000000858A
|
||||
88FFF9F9F9FFDBC3ADFFDCC4AEFFDDC5AFFFDEC6B0FFDFC7B1FFE0C8B2FF0000
|
||||
00FFF7F7F7FFF9F9F9FFF8F8F8FFF7F7F7FF888D8BFF0000000000000000858A
|
||||
88FFF9F9F9FFDBC3ADFFB09882FFB09882FFB09882FFB09882FFE0C8B2FF0000
|
||||
00FFF7F7F7FFF8F8F8FFF7F7F7FFF7F7F7FF888D8BFF0000000000000000858A
|
||||
88FFFAFAFAFFDBC3ADFFDCC4AEFFDDC5AFFFDEC6B0FFDFC7B1FFE0C8B2FF0000
|
||||
00FFF5F5F5FFF6F6F6FFF6F6F6FFF7F7F7FF888D8BFF0000000000000000858A
|
||||
88FFFBFBFBFFDBC3ADFFDCC4AEFFDDC5AFFFDEC6B0FFDEC6B0FF000000FFE0C8
|
||||
B2FF000000FFE1C9B3FFF4F4F4FFF7F7F7FF888D8BFF0000000000000000858A
|
||||
88FFFBFBFBFFDAC2ACFFAF9781FFAF9781FFAF9781FFAF9781FFAF9781FFAF97
|
||||
81FFAF9781FFE0C8B2FFF2F2F2FFF7F7F7FF888D8BFF0000000000000000858A
|
||||
88FFFCFCFCFFDAC2ACFFDBC3ADFFDCC4AEFFDDC5AFFFDDC5AFFFDEC6B0FFDEC6
|
||||
B0FFDFC7B1FFDFC7B1FFF0F0F0FFF8F8F8FF888D8BFF0000000000000000858A
|
||||
88FFFCFCFCFFDAC2ACFFDAC2ACFFDBC3ADFFDCC4AEFFDDC5AFFFDDC5AFFFDEC6
|
||||
B0FFDEC6B0FFDEC6B0FFEEEEEEFFF8F8F8FF888D8BFF0000000000000000858A
|
||||
88FFFCFCFCFFD9C1ABFFAF9781FFAF9781FFAF9781FFAF9781FFDCC4AEFFAF97
|
||||
81FFAF9781FFDDC5AFFFECECECFFF8F8F8FF888D8BFF0000000000000000858A
|
||||
88FFFDFDFDFFD8C0AAFFAF9781FFAF9781FFAF9781FFAF9781FFDBC3ADFFDCC4
|
||||
AEFFDCC4AEFFDCC4AEFFEBEBEBFFF8F8F8FF888D8BFF0000000000000000858A
|
||||
88FFFDFDFDFFD8C0AAFFAF9781FFAF9781FFAF9781FFAF9781FFDBC3ADFFDBC3
|
||||
ADFFDBC3ADFFDBC3ADFFDBC3ADFFF8F8F8FF888D8BFF0000000000000000858A
|
||||
88FFFEFEFEFFD7BFA9FFAF9781FFAF9781FFAF9781FFAF9781FFDAC2ACFFAF97
|
||||
81FFAF9781FFAF9781FFDAC2ACFFF8F8F8FF888D8BFF0000000000000000858A
|
||||
88FFFDFDFDFFD6BEA8FFD7BFA9FFD7BFA9FFD8C0AAFFD8C0AAFFD9C1ABFFD9C1
|
||||
ABFFD9C1ABFFD9C1ABFFD9C1ABFFF8F8F8FF888D8BFF0000000000000000858A
|
||||
88FFFDFDFDFFFEFEFEFFFEFEFEFFFDFDFDFFFDFDFDFFFCFCFCFFFCFCFCFFFBFB
|
||||
FBFFFBFBFBFFFAFAFAFFFAFAFAFFF9F9F9FF888D8BFF0000000000000000898D
|
||||
8BFF858A88FF858A88FF858A88FF858A88FF858A88FF858A88FF858A88FF858A
|
||||
88FF858A88FF858A88FF858A88FF858A88FF898E8CFF00000000
|
||||
}
|
||||
OnClick = actEditSelectAllExecute
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@ TFRMDIFFER.MNUFILE.CAPTION=File
|
|||
TFRMDIFFER.MIDIVIDER7.CAPTION=-
|
||||
TFRMDIFFER.MIDIVIDER6.CAPTION=-
|
||||
TFRMDIFFER.MNUEDIT.CAPTION=Edit
|
||||
TFRMDIFFER.MIDIVIDER8.CAPTION=-
|
||||
TFRMDIFFER.MIDIVIDER9.CAPTION=-
|
||||
TFRMDIFFER.MNUOPTIONS.CAPTION=&Options
|
||||
TFRMDIFFER.MIDIVIDER4.CAPTION=-
|
||||
TFRMDIFFER.MIDIVIDER3.CAPTION=-
|
||||
|
|
@ -32,3 +34,12 @@ TFRMDIFFER.ACTRELOAD.CAPTION=Reload
|
|||
TFRMDIFFER.ACTOPENLEFT.CAPTION=Open Left...
|
||||
TFRMDIFFER.ACTOPENRIGHT.CAPTION=Open Right...
|
||||
TFRMDIFFER.ACTCLOSE.CAPTION=Close
|
||||
TFRMDIFFER.ACTEDITCUT.CAPTION=Cut
|
||||
TFRMDIFFER.ACTEDITCOPY.CAPTION=Copy
|
||||
TFRMDIFFER.ACTEDITPASTE.CAPTION=Paste
|
||||
TFRMDIFFER.ACTEDITDELETE.CAPTION=Delete
|
||||
TFRMDIFFER.ACTEDITSELECTALL.CAPTION=Select &All
|
||||
TFRMDIFFER.ACTEDITREDO.CAPTION=Redo
|
||||
TFRMDIFFER.ACTEDITUNDO.CAPTION=Undo
|
||||
TFRMDIFFER.MISEPARATOR1.CAPTION=-
|
||||
TFRMDIFFER.MISEPARATOR2.CAPTION=-
|
||||
|
|
|
|||
|
|
@ -41,6 +41,13 @@ type
|
|||
actCopyLeftToRight: TAction;
|
||||
actCopyRightToLeft: TAction;
|
||||
actClose: TAction;
|
||||
actEditCut: TAction;
|
||||
actEditCopy: TAction;
|
||||
actEditDelete: TAction;
|
||||
actEditUndo: TAction;
|
||||
actEditRedo: TAction;
|
||||
actEditSelectAll: TAction;
|
||||
actEditPaste: TAction;
|
||||
actOpenRight: TAction;
|
||||
actOpenLeft: TAction;
|
||||
actReload: TAction;
|
||||
|
|
@ -63,7 +70,20 @@ type
|
|||
edtFileNameRight: TFileNameEdit;
|
||||
ImageList: TImageList;
|
||||
MainMenu: TMainMenu;
|
||||
miCopyContext: TMenuItem;
|
||||
miCutContext: TMenuItem;
|
||||
miDeleteContext: TMenuItem;
|
||||
miEditSelectAll: TMenuItem;
|
||||
miDivider9: TMenuItem;
|
||||
miEditDelete: TMenuItem;
|
||||
miEditPaste: TMenuItem;
|
||||
miEditCopy: TMenuItem;
|
||||
miEditCut: TMenuItem;
|
||||
miDivider8: TMenuItem;
|
||||
miEditRedo: TMenuItem;
|
||||
miEditUndo: TMenuItem;
|
||||
miDivider7: TMenuItem;
|
||||
miPasteContext: TMenuItem;
|
||||
miReload: TMenuItem;
|
||||
miDivider6: TMenuItem;
|
||||
miClose: TMenuItem;
|
||||
|
|
@ -85,7 +105,11 @@ type
|
|||
miNextDiff: TMenuItem;
|
||||
miDivider1: TMenuItem;
|
||||
miCancelCompare: TMenuItem;
|
||||
miSelectAllContext: TMenuItem;
|
||||
miSeparator1: TMenuItem;
|
||||
miSeparator2: TMenuItem;
|
||||
miStartCompare: TMenuItem;
|
||||
miUndoContext: TMenuItem;
|
||||
mnuActions: TMenuItem;
|
||||
miIgnoreCase: TMenuItem;
|
||||
miIgnoreWhiteSpace: TMenuItem;
|
||||
|
|
@ -93,6 +117,7 @@ type
|
|||
mnuEdit: TMenuItem;
|
||||
miSaveLeft: TMenuItem;
|
||||
mnuFile: TMenuItem;
|
||||
ContextMenu: TPopupMenu;
|
||||
pnlLeftBox: TPanel;
|
||||
pnlRight: TPanel;
|
||||
pnlLeft: TPanel;
|
||||
|
|
@ -123,6 +148,13 @@ type
|
|||
procedure actCloseExecute(Sender: TObject);
|
||||
procedure actCopyLeftToRightExecute(Sender: TObject);
|
||||
procedure actCopyRightToLeftExecute(Sender: TObject);
|
||||
procedure actEditCopyExecute(Sender: TObject);
|
||||
procedure actEditCutExecute(Sender: TObject);
|
||||
procedure actEditDeleteExecute(Sender: TObject);
|
||||
procedure actEditPasteExecute(Sender: TObject);
|
||||
procedure actEditRedoExecute(Sender: TObject);
|
||||
procedure actEditSelectAllExecute(Sender: TObject);
|
||||
procedure actEditUndoExecute(Sender: TObject);
|
||||
procedure actFirstDiffExecute(Sender: TObject);
|
||||
procedure actLastDiffExecute(Sender: TObject);
|
||||
procedure actNextDiffExecute(Sender: TObject);
|
||||
|
|
@ -142,6 +174,7 @@ type
|
|||
procedure FormResize(Sender: TObject);
|
||||
private
|
||||
Diff: TDiff;
|
||||
SynDiffEditActive: TSynDiffEdit;
|
||||
SynDiffEditLeft: TSynDiffEdit;
|
||||
SynDiffEditRight: TSynDiffEdit;
|
||||
HashListLeft,
|
||||
|
|
@ -152,6 +185,7 @@ type
|
|||
procedure SaveToFile(SynDiffEdit: TSynDiffEdit; const FileName: UTF8String);
|
||||
procedure OpenFileLeft(const FileName: UTF8String);
|
||||
procedure OpenFileRight(const FileName: UTF8String);
|
||||
procedure SynDiffEditEnter(Sender: TObject);
|
||||
procedure SynDiffEditLeftStatusChange(Sender: TObject; Changes: TSynStatusChanges);
|
||||
procedure SynDiffEditRightStatusChange(Sender: TObject; Changes: TSynStatusChanges);
|
||||
public
|
||||
|
|
@ -414,6 +448,41 @@ begin
|
|||
SynDiffEditLeft.Lines[I]:= SynDiffEditRight.Lines[I];
|
||||
end;
|
||||
|
||||
procedure TfrmDiffer.actEditCopyExecute(Sender: TObject);
|
||||
begin
|
||||
SynDiffEditActive.CopyToClipboard;
|
||||
end;
|
||||
|
||||
procedure TfrmDiffer.actEditCutExecute(Sender: TObject);
|
||||
begin
|
||||
SynDiffEditActive.CutToClipboard;
|
||||
end;
|
||||
|
||||
procedure TfrmDiffer.actEditDeleteExecute(Sender: TObject);
|
||||
begin
|
||||
SynDiffEditActive.ClearSelection;
|
||||
end;
|
||||
|
||||
procedure TfrmDiffer.actEditPasteExecute(Sender: TObject);
|
||||
begin
|
||||
SynDiffEditActive.PasteFromClipboard;
|
||||
end;
|
||||
|
||||
procedure TfrmDiffer.actEditRedoExecute(Sender: TObject);
|
||||
begin
|
||||
SynDiffEditActive.Redo;
|
||||
end;
|
||||
|
||||
procedure TfrmDiffer.actEditSelectAllExecute(Sender: TObject);
|
||||
begin
|
||||
SynDiffEditActive.SelectAll;
|
||||
end;
|
||||
|
||||
procedure TfrmDiffer.actEditUndoExecute(Sender: TObject);
|
||||
begin
|
||||
SynDiffEditActive.Undo;
|
||||
end;
|
||||
|
||||
procedure TfrmDiffer.actFirstDiffExecute(Sender: TObject);
|
||||
var
|
||||
Line: Integer;
|
||||
|
|
@ -488,9 +557,15 @@ begin
|
|||
SynDiffEditRight.Parent:= pnlRight;
|
||||
SynDiffEditLeft.Align:= alClient;
|
||||
SynDiffEditRight.Align:= alClient;
|
||||
SynDiffEditLeft.PopupMenu:= ContextMenu;
|
||||
SynDiffEditRight.PopupMenu:= ContextMenu;
|
||||
|
||||
SynDiffEditLeft.OnEnter:= @SynDiffEditEnter;
|
||||
SynDiffEditRight.OnEnter:= @SynDiffEditEnter;
|
||||
SynDiffEditLeft.OnStatusChange:= @SynDiffEditLeftStatusChange;
|
||||
SynDiffEditRight.OnStatusChange:= @SynDiffEditRightStatusChange;
|
||||
// Set active editor
|
||||
SynDiffEditActive:= SynDiffEditLeft;
|
||||
// Initialize property storage
|
||||
InitPropStorage(Self);
|
||||
end;
|
||||
|
|
@ -620,6 +695,11 @@ begin
|
|||
end;
|
||||
end;
|
||||
|
||||
procedure TfrmDiffer.SynDiffEditEnter(Sender: TObject);
|
||||
begin
|
||||
SynDiffEditActive:= (Sender as TSynDiffEdit);
|
||||
end;
|
||||
|
||||
procedure TfrmDiffer.SynDiffEditLeftStatusChange(Sender: TObject;
|
||||
Changes: TSynStatusChanges);
|
||||
begin
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue