mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

ADD: Cancel compare

Browse source
This commit is contained in:
Alexander Koblov 2011-04-17 06:55:34 +00:00
commit 19ef65eaf9
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/fdiffer.lfm
View file

@ -1579,6 +1579,7 @@ object frmDiffer: TfrmDiffer
object actCancelCompare: TAction
Caption = 'Cancel'
ImageIndex = 7
OnExecute = actCancelCompareExecute
end
object actBinaryCompare: TAction
Category = 'Options'

12
src/fdiffer.pas
View file

@ -165,6 +165,7 @@ type
Divider5: TToolButton;
procedure actAboutExecute(Sender: TObject);
procedure actBinaryCompareExecute(Sender: TObject);
procedure actCancelCompareExecute(Sender: TObject);
procedure actCloseExecute(Sender: TObject);
procedure actCopyLeftToRightExecute(Sender: TObject);
procedure actCopyRightToLeftExecute(Sender: TObject);
@ -266,6 +267,7 @@ var
LineNumberRight: PtrInt;
begin
try
Inc(ScrollLock);
Screen.Cursor := crHourGlass;
if actBinaryCompare.Checked then
begin
@ -331,6 +333,7 @@ begin
SynDiffEditRight.Invalidate;
Screen.Cursor := crDefault;
actCancelCompare.Enabled := False;
Dec(ScrollLock);
end;
if actLineDifferences.Checked then
begin
@ -520,6 +523,11 @@ begin
if actAutoCompare.Checked then actStartCompare.Execute;
end;
procedure TfrmDiffer.actCancelCompareExecute(Sender: TObject);
begin
Diff.Cancel;
end;
procedure TfrmDiffer.actAboutExecute(Sender: TObject);
begin
ShowMessage('Internal Differ tool of Double Commander.' + LineEnding + LineEnding +
@ -947,7 +955,7 @@ begin
((scTopLine in Changes) or (scLeftChar in Changes)) then
try
Inc(ScrollLock);
//while (SynDiffEditRight.PaintLock <> 0) do Sleep(1);
while (SynDiffEditRight.PaintLock <> 0) do Sleep(1);
SynDiffEditRight.TopLine:= SynDiffEditLeft.TopLine;
SynDiffEditRight.LeftChar:= SynDiffEditLeft.LeftChar;
finally
@ -962,7 +970,7 @@ begin
((scTopLine in Changes) or (scLeftChar in Changes)) then
try
Inc(ScrollLock);
//while (SynDiffEditLeft.PaintLock <> 0) do Sleep(1);
while (SynDiffEditLeft.PaintLock <> 0) do Sleep(1);
SynDiffEditLeft.TopLine:= SynDiffEditRight.TopLine;
SynDiffEditLeft.LeftChar:= SynDiffEditRight.LeftChar;
finally