github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-18 06:06:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: Dir diff now displays number of files #1055

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@8485 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2015-05-29 11:05:47 +00:00
parent 540c7947c2
commit 733b6db251
3 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
uppsrc/TextDiffCtrl/DirDiff.cpp
View file

@ -55,6 +55,7 @@ void DirDiffDlg::Compare()
String p2 = AppendFileName(~dir2, f[i]);
if(!FileEqual(p1, p2))
files.Add(f[i], NativePathIcon(FileExists(p1) ? p1 : p2));
info = AsString(files.GetCount()) + " files";
}
}
@ -105,7 +106,8 @@ DirDiffDlg::DirDiffDlg()
files_pane.Add(dir1.TopPos(0, cy).HSizePos());
files_pane.Add(dir2.TopPos(cy + div, cy).HSizePos());
files_pane.Add(hidden.TopPos(2 * cy + 2 * div, bcy).HSizePos(0, bcx));
files_pane.Add(hidden.TopPos(2 * cy + 2 * div, bcy).LeftPos(0, bcx));
files_pane.Add(info.TopPos(2 * cy + 2 * div, bcy).HSizePos(bcx + 2 * div, bcx + div));
files_pane.Add(compare.TopPos(2 * cy + 2 * div, bcy).RightPos(0, bcx));
files_pane.Add(files.VSizePos(2 * cy + bcy + 3 * div, 0).HSizePos());