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

ide: Replacing wildcards improved ($ -> $ $)

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@7552 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2014-07-29 11:46:18 +00:00
parent 791b333539
commit dc44797248
4 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
uppsrc/CodeEditor/FindReplace.cpp
View file

@ -364,10 +364,15 @@ bool CodeEditor::Find(bool back, bool blockreplace, bool replace)
WString CodeEditor::GetWild(int type, int& i)
{
for(;;) {
if(i >= foundwild.GetCount()) return WString();
if(i >= foundwild.GetCount()) break;
Found& f = foundwild[i++];
if(f.type == type) return f.text;
}
for(int j = 0; j < foundwild.GetCount(); j++) {
Found& f = foundwild[j++];
if(f.type == type) return f.text;
}
return WString();
}
WString CodeEditor::GetReplaceText()

2
uppsrc/Core/Http.cpp
View file

@ -608,7 +608,7 @@ bool HttpRequest::SendingData()
}
for(;;) {
Buffer<byte> buffer(2048);
int n = poststream->Get(buffer, min((int64)2048, postlen + data.GetLength() - (int)count));
int n = poststream->Get(buffer, (int)min((int64)2048, postlen + data.GetLength() - count));
if(n < 0) {
HttpError("error reading input stream");
return false;

5
uppsrc/ide/app.tpp/special$en-us.tpp
View file

@ -12,4 +12,7 @@ results etc...)&]
[s0;i150;O2; You can copy files (Ctrl`+C in system file manager,
Ctrl`+V in TheIDE) into text directly. If more than single file
is on clipboard, all text is copied.&]
[s0;i150;O2; Dragging file onto TheIDE opens it (as `"temp`" file).]]
[s0;i150;O2; Dragging file onto TheIDE opens it (as `"temp`" file).&]
[s0;i150;O2; Use Ctrl`+/ to hide project overview `- useful e.g.
when editing wide layouts.&]
[s0;i150;O2; Use Ctrl`+`-, Ctrl`+`| to split editor vertically/horizontally.]]

4
uppsrc/ide/app.tpp/special$en-us.tppi
View file

@ -1,5 +1,5 @@
TITLE("Rectangular blocks are activated by pressing ALT key.")
COMPRESSED
120,156,133,145,79,107,220,48,16,197,191,202,228,79,203,154,108,133,27,232,165,123,10,217,61,4,66,11,233,38,16,150,165,59,150,199,182,136,44,9,105,156,173,41,253,238,29,217,133,150,205,161,198,7,219,35,191,247,123,111,118,112,121,89,46,203,139,242,63,215,231,53,53,56,88,222,239,126,126,255,245,110,243,229,195,227,55,216,165,114,101,62,126,42,87,95,175,87,240,152,8,110,57,218,195,213,22,43,96,15,122,212,150,128,187,232,135,182,99,104,140,165,164,96,219,153,4,114,7,138,29,134,36,115,130,222,39,134,33,81,13,47,52,130,113,249,163,169,233,236,253,254,141,195,141,229,195,213,61,53,156,29,14,231,145,120,136,238,112,158,223,76,31,124,100,116,12,193,162,166,4,11,82,173,130,99,71,145,96,244,3,116,248,74,112,140,134,153,28,36,223,19,119,198,181,133,250,43,252,96,50,233,63,236,25,116,22,107,124,60,98,172,213,9,211,38,233,9,90,91,159,178,37,186,26,34,249,64,46,21,83,182,202,51,251,30,2,58,130,197,209,112,7,218,247,193,
88,100,227,157,28,77,210,105,2,98,173,148,42,78,196,31,72,75,158,118,176,24,161,178,94,191,36,64,201,130,154,205,43,178,212,85,141,16,68,34,73,12,184,185,223,102,146,83,192,103,9,174,209,137,107,24,231,29,192,98,94,211,109,110,58,141,137,169,159,6,208,163,195,150,226,242,207,26,159,242,124,219,209,221,122,83,200,163,180,194,244,131,161,54,81,176,236,168,224,174,145,205,197,92,147,232,103,6,209,152,132,164,53,201,166,173,9,149,151,206,150,128,214,206,63,203,68,64,12,189,233,113,29,177,109,115,140,73,192,103,183,217,26,166,46,193,176,116,155,100,227,66,27,100,223,249,88,161,246,251,223,107,114,232,95,
120,156,133,82,95,111,211,48,16,255,42,199,24,168,213,186,172,32,241,66,159,166,181,15,147,38,144,70,135,132,170,138,184,206,37,54,115,108,203,119,105,8,131,239,206,57,101,26,234,132,136,242,16,199,246,239,239,109,224,244,116,62,155,191,156,255,231,121,191,196,90,117,142,183,155,135,175,191,94,173,62,156,223,125,130,13,205,23,246,205,187,249,226,227,219,5,220,17,194,21,39,87,158,173,213,14,56,128,30,180,67,96,147,66,215,24,134,218,58,164,2,214,198,18,200,27,49,25,21,73,246,17,218,64,12,29,97,5,247,56,128,245,249,167,173,240,197,235,237,51,134,75,199,229,217,13,214,156,25,202,147,132,220,37,95,158,228,149,109,99,72,172,60,67,116,74,35,193,4,139,166,128,222,96,66,24,66,7,70,237,17,250,100,153,209,3,133,22,217,88,223,76,139,39,224,91,155,149,254,165,61,11,61,128,213,33,245,42,85,197,145,166,21,233,81,180,118,129,50,165,242,21,36,12,17,61,77,71,111,187,192,28,90,136,202,35,76,122,203,6,116,104,163,117,138,109,
240,114,148,36,83,2,100,93,20,197,244,8,252,22,181,248,105,58,167,18,236,92,208,247,4,74,188,40,205,118,175,88,226,218,13,16,5,130,196,6,92,222,172,179,146,99,129,95,196,184,86,94,88,227,112,232,0,38,135,154,174,114,210,52,16,99,59,110,64,171,188,106,48,205,254,212,248,57,239,175,13,94,47,87,83,249,148,84,24,191,51,84,54,137,44,55,20,112,93,75,115,41,199,36,248,89,131,96,140,64,146,154,120,211,206,198,93,144,204,102,160,156,59,92,150,29,17,98,241,89,142,203,164,154,38,219,24,1,66,102,59,80,195,152,37,88,150,108,73,26,23,181,81,250,206,199,166,199,32,79,35,120,145,75,52,50,67,146,79,248,38,122,33,236,49,237,45,246,80,158,231,81,171,59,7,143,227,225,1,43,203,153,188,207,55,156,146,97,97,250,55,120,121,254,24,81,249,51,243,80,116,34,47,99,132,4,66,195,86,139,225,225,194,132,100,127,136,149,188,40,182,219,223,143,92,34,227,