diff --git a/uppsrc/TextDiffCtrl/DirDiff.cpp b/uppsrc/TextDiffCtrl/DirDiff.cpp index a27feece0..19579be2a 100644 --- a/uppsrc/TextDiffCtrl/DirDiff.cpp +++ b/uppsrc/TextDiffCtrl/DirDiff.cpp @@ -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()); diff --git a/uppsrc/TextDiffCtrl/TextDiffCtrl.h b/uppsrc/TextDiffCtrl/TextDiffCtrl.h index 2c5b088ef..9a110c644 100644 --- a/uppsrc/TextDiffCtrl/TextDiffCtrl.h +++ b/uppsrc/TextDiffCtrl/TextDiffCtrl.h @@ -197,6 +197,7 @@ class DirDiffDlg : public TopWindow { WithDropChoice dir2; Option hidden; Button compare; + Label info; FrameTop left, right; EditString lfile, rfile; diff --git a/uppsrc/TextDiffCtrl/TextDiffCtrl.upp b/uppsrc/TextDiffCtrl/TextDiffCtrl.upp index b420fb1f1..68d67fd1f 100644 --- a/uppsrc/TextDiffCtrl/TextDiffCtrl.upp +++ b/uppsrc/TextDiffCtrl/TextDiffCtrl.upp @@ -2,7 +2,7 @@ uses CtrlLib; file - TextDiffCtrl.h options PCH, + TextDiffCtrl.h options(BUILDER_OPTION) PCH, TextDiff.cpp, TextCtrl.cpp, DiffCtrl.cpp,