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

CtrlCore: X11 key handling improved (thanks Oblivion), ide: patch tool improved

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@15617 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2020-12-22 14:46:15 +00:00
parent acf7cc8ad4
commit 5beff5b389
4 changed files with 42 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

5
uppsrc/TextDiffCtrl/PatchDiff.cpp
View file

@ -96,6 +96,7 @@ bool PatchDiff::Open(const char *patch_path, const Vector<String>& target_dirs0)
}
patch_file <<= patch_path;
if(!patch.MatchFiles(target_dirs, pi)) {
Exclamation("Unable to match the directory structure!");
@ -124,8 +125,8 @@ bool PatchDiff::Open(const char *patch_path, const Vector<String>& target_dirs0)
}
failed.Show(failed_count);
failed.SetInk(SRed()).SetFont(StdFont().Bold().Italic());
failed = String() << failed_count << " file(s) cannot be patched";
failed.SetInk(SRed());
failed = String() << failed_count << " file(s) failed";
ShowResult();

2
uppsrc/TextDiffCtrl/patch.cpp
View file

@ -117,7 +117,7 @@ bool Patch::MatchFiles(const Vector<String>& dir, Progress& pi)
com_path.Replace("\\", "/");
if(dir.GetCount())
for(int pass = 0; pass < 2; pass++) {
while(com_path.GetCount()) {
for(;;) {
for(String d : dir) {
while(d.GetCount() > 3) {
if(pi.StepCanceled())