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

UPD: When comparing files if there is no selection in the opposite panel select the file with the same name to compare, if it exists. Issue [0000174].

Browse source
This commit is contained in:
cobines 2012-05-08 15:34:55 +00:00
commit 7abbfa7947
1 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/umaincommands.pas
View file

@ -1759,9 +1759,9 @@ var
procedure AddItem(const aFile: TFile);
begin
if not aFile.IsDirectory then
FilesToCompare.Add(aFile.Path + aFile.Name)
FilesToCompare.Add(aFile.FullPath)
else
DirsToCompare.Add(aFile.Path + aFile.Name);
DirsToCompare.Add(aFile.FullPath);
end;
procedure RunExtDiffer(CompareList: TStringList);
@ -1793,10 +1793,6 @@ var
NotActiveSelectedFiles: TFiles = nil;
Param: String;
begin
//Maybe this will not be dependant on file view but file source.
//But will work only for non-virtual file sources.
//frmMain.ActiveFrame.ExecuteCommand('cm_CompareContents', param);
with frmMain do
begin
// For now work only for filesystem.
@ -1826,7 +1822,21 @@ begin
if ActiveSelectedFiles.Count = 1 then
begin
NotActiveSelectedFiles := NotActiveFrame.CloneSelectedFiles;
// If no files selected in the opposite panel then try to get file
// with the same name.
if not NotActiveFrame.HasSelectedFiles then
begin
for i := 0 to NotActiveFrame.DisplayFiles.Count - 1 do
if NotActiveFrame.DisplayFiles[i].FSFile.Name = ActiveSelectedFiles[0].Name then
begin
NotActiveSelectedFiles := TFiles.Create(NotActiveFrame.CurrentPath);
NotActiveSelectedFiles.Add(NotActiveFrame.DisplayFiles[i].FSFile.Clone);
Break;
end;
end;
if not Assigned(NotActiveSelectedFiles) then
NotActiveSelectedFiles := NotActiveFrame.CloneSelectedFiles;
if NotActiveSelectedFiles.Count = 1 then
begin