github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-25 14:22:54 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: Compare directories/commits finished

Browse source
This commit is contained in:
Mirek Fidler 2023-08-26 17:04:00 +02:00
parent 9e501ff99e
commit 17757be7a4
8 changed files with 485 additions and 411 deletions
Download patch file Download diff file Expand all files Collapse all files

18
uppsrc/TextDiffCtrl/DirDiff.cpp
View file

@ -125,6 +125,7 @@ DirDiffDlg::DirDiffDlg()
remove.SetLabel("Remove");
remove.Tip("F8");
remove.SetImage(CtrlImg::remove());
remove.Disable();
remove << [=] {
String path = AppendFileName(~*dir, files.GetCurrentName());
@ -197,6 +198,9 @@ void DirDiffDlg::Compare()
copyleft.Disable();
copyright.Disable();
removeleft.Disable();
removeright.Disable();
files.Clear();
Vector<String> f = fs.PickKeys();
@ -315,12 +319,18 @@ void DirDiffDlg::File()
}
if(GetFileLength(p1) < 4 * 1024 * 1024 && GetFileLength(p2) < 4 * 1024 * 1024)
diff.Set(f1, f2);
if(lmid < p1.GetCount())
p1 = p1.Mid(lmid);
lfile <<= p1;
if(rmid < p2.GetCount())
p2 = p2.Mid(rmid);
rfile <<= p2;
copyleft.Enable();
copyright.Enable();
revertleft.Enable(backup.Find(p1) >= 0);
revertright.Enable(backup.Find(p2) >= 0);
copyleft.Enable(editable_left);
copyright.Enable(editable_right);
removeleft.Enable(editable_left);
removeright.Enable(editable_right);
revertleft.Enable(backup.Find(p1) >= 0 && editable_left);
revertright.Enable(backup.Find(p2) >= 0 && editable_right);
}
void DirDiffDlg::Refresh()