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

Ide: DirDiff now can copy files #919

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@7882 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2014-11-10 19:33:16 +00:00
parent 00fe9f80fe
commit b8a2bae848
3 changed files with 60 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

46
uppsrc/TextDiffCtrl/DirDiff.cpp
View file

@ -39,6 +39,9 @@ void DirDiffDlg::Compare()
Index<String> fs;
GatherFilesDeep(fs, ~dir1, Null);
GatherFilesDeep(fs, ~dir2, Null);
copyleft.Disable();
copyright.Disable();
files.Clear();
Vector<String> f = fs.PickKeys();
@ -71,6 +74,23 @@ void DirDiffDlg::File()
diff.Set(LoadFile(p1), LoadFile(p2));
lfile <<= p1;
rfile <<= p2;
copyleft.Enable();
copyright.Enable();
}
void DirDiffDlg::Copy(bool left)
{
String src = ~lfile;
String dst = ~rfile;
if(left)
Swap(src, dst);
if(PromptYesNo("Copy [* \1" + src + "\1]&to [* \1" + dst + "\1] ?")) {
FileIn in(src);
FileOut out(dst);
CopyStream(out, in);
out.Close();
File();
}
}
DirDiffDlg::DirDiffDlg()
@ -104,13 +124,29 @@ DirDiffDlg::DirDiffDlg()
files.WhenSel = THISBACK(File);
lfile.Height(EditField::GetStdHeight());
lfile.SetReadOnly();
diff.InsertFrameLeft(lfile);
diff.InsertFrameLeft(left);
diff.InsertFrameRight(right);
rfile.Height(EditField::GetStdHeight());
bcx = GetTextSize(t_("Copy"), StdFont()).cx + HorzLayoutZoom(40);
left.Height(EditField::GetStdHeight());
lfile.SetReadOnly();
left.Add(lfile.VSizePos().HSizePos(0, bcx));
left.Add(copyright.VSizePos().RightPos(0, bcx));
copyright.SetImage(DiffImg::CopyRight());
copyright.SetLabel("Copy");
copyright <<= THISBACK1(Copy, false);
right.Height(EditField::GetStdHeight());
rfile.SetReadOnly();
diff.InsertFrameRight(rfile);
right.Add(rfile.VSizePos().HSizePos(bcx, 0));
right.Add(copyleft.VSizePos().LeftPos(0, bcx));
copyleft.SetImage(DiffImg::CopyLeft());
copyleft.SetLabel("Copy");
copyleft <<= THISBACK1(Copy, true);
copyleft.Disable();
copyright.Disable();
Icon(DiffImg::DirDiff());
}