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

ide: Diff ignore indent refactored to support all comparison modes

Browse source
This commit is contained in:
Mirek Fidler 2026-04-16 11:15:56 +02:00
parent 70657d2923
commit fd0edd3076
6 changed files with 70 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

60
uppsrc/TextDiffCtrl/DirDiff.cpp
View file

@ -11,12 +11,11 @@ DirDiffDlg::DirDiffDlg()
hidden.SetLabel(t_("Hidden"));
split_lines.SetLabel(t_("Split long lines"));
ignore_indentation.SetLabel(t_("Ignore indentation"));
added.SetColor(Green()).SetLabel(t_("New"));
modified.SetLabel(t_("Modified"));
removed.SetColor(Red()).SetLabel(t_("Removed"));
recent <<= Null;
recent.Add(Null, "All");
recent.Add(1, "1 Day");
@ -27,22 +26,21 @@ DirDiffDlg::DirDiffDlg()
recent.Add(60, "3 Months");
recent.Add(180, "6 Months");
recent.Add(365, "1 Year");
compare.SetLabel(t_("Compare"));
int bcy = max(cy, compare.GetStdSize().cy);
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).LeftPos(0, bcx));
files_pane.Add(split_lines.TopPos(2 * cy + 2 * div, bcy).LeftPosZ(55, 100));
files_pane.Add(ignore_indentation.TopPos(2 * cy + 2 * div, bcy).LeftPosZ(152, 120));
files_pane.Add(split_lines.TopPos(2 * cy + 2 * div, bcy).LeftPosZ(52, 100));
files_pane.Add(added.TopPos(3 * cy + 3 * div, bcy).LeftPosZ(2, 60));
files_pane.Add(modified.TopPos(3 * cy + 3 * div, bcy).LeftPosZ(52, 70));
files_pane.Add(removed.TopPos(3 * cy + 3 * div, bcy).LeftPosZ(128, 80));
files_pane.Add(recent.TopPos(3 * cy + 3 * div, bcy).RightPos(0, bcx + Zx(8)));
files_pane.Add(extension.TopPos(3 * cy + 3 * div, bcy).RightPos(bcx + Zx(8) + DPI(8), bcx));
removed = 1;
added = 1;
modified = 1;
@ -50,7 +48,7 @@ DirDiffDlg::DirDiffDlg()
clearFind.SetLabel("X");
clearFind.RightPosZ(1, 16).VSizePosZ(1, 1);
find.AddChild(&clearFind);
files_pane.Add(compare.TopPos(2 * cy + 2 * div, bcy).RightPos(0, bcx));
files_pane.Add(files.VSizePos(3 * cy + bcy + 4 * div, Zy(24)).HSizePos());
files_pane.Add(find.BottomPosZ(4, 19).HSizePosZ());
@ -59,19 +57,19 @@ DirDiffDlg::DirDiffDlg()
files_diff.Set(files_pane, diff);
files_diff.SetPos(2000);
files_diff.SetMinPixels(0, Zx(256));
Sizeable().Zoomable();
seldir1.Attach(dir1);
seldir2.Attach(dir2);
seldir1.Title("First directory to compare");
seldir2.Title("Second directory to compare");
compare <<= THISBACK(Compare);
dir1 <<= THISBACK(ClearFiles);
dir2 <<= THISBACK(ClearFiles);
modified << [=] { ShowResult(); };
removed << [=] { ShowResult(); };
added << [=] { ShowResult(); };
@ -79,7 +77,7 @@ DirDiffDlg::DirDiffDlg()
extension << [=] { ShowResult(); };
recent << [=] { ShowResult(); };
clearFind << [=] { find.Clear(); ShowResult();};
files.WhenSel = THISBACK(File);
diff.InsertFrameLeft(left);
@ -98,7 +96,7 @@ DirDiffDlg::DirDiffDlg()
right.Add(copyleft.VSizePos().LeftPosZ(0, 70));
right.Add(removeright.VSizePos().LeftPosZ(74, 70));
right.Add(revertright.VSizePos().LeftPosZ(148, 70));
auto SetupCopy = [=](Button& copy, bool left) {
copy.SetImage(left ? DiffImg::CopyLeft() : DiffImg::CopyRight());
copy.SetLabel("Copy");
@ -106,7 +104,7 @@ DirDiffDlg::DirDiffDlg()
copy.Disable();
copy << [=] { Copy(left); };
};
SetupCopy(copyleft, true);
SetupCopy(copyright, false);
@ -124,39 +122,39 @@ DirDiffDlg::DirDiffDlg()
}
};
};
SetupRevert(revertleft, &dir1);
SetupRevert(revertright, &dir2);
auto SetupRemove = [=](Button& remove, TextCompareCtrl *text, EditString *dir)
{
remove.SetLabel("Remove");
remove.Tip("F8");
remove.SetImage(CtrlImg::remove());
remove.Disable();
remove << [=] {
String path = AppendFileName(~*dir, files.GetCurrentName());
Backup(path);
SaveFile(path, text->RemoveSelected(HasCrs(path)));
Refresh();
};
text->WhenSel << [=, &remove] {
remove.Enable(text->IsSelection());
};
};
SetupRemove(removeleft, &diff.left, &dir1);
SetupRemove(removeright, &diff.right, &dir2);
split_lines << [=] { File(); };
ignore_indentation << [=] { File(); };
diff.indent << [=] { File(); };
Icon(DiffImg::DirDiff());
WhenIcon = [](const char *path) -> Image { return NativePathIcon(path); };
Title("Compare directories");
};
@ -194,7 +192,7 @@ bool DirDiffDlg::FileEqual(const String& f1, const String& f2, int& kind)
}
else
kind = in1 ? DELETED_FILE : NEW_FILE;
return false;
}
@ -209,12 +207,12 @@ void DirDiffDlg::Compare()
removeleft.Disable();
removeright.Disable();
files.Clear();
SortByKey(fs);
Progress pi(t_("Comparing.."));
pi.SetTotal(fs.GetCount());
list.Clear();
Index<String> exts;
for(int i = 0; i < fs.GetCount(); i++) {
@ -237,13 +235,13 @@ void DirDiffDlg::Compare()
m.kind = kind;
}
}
extension.Clear();
extension.Add(Null, "*.*");
for(int ii : GetSortOrder(exts))
extension.Add(exts[ii], "*" + exts[ii]);
extension.Enable();
ShowResult();
}