mirror of
https://github.com/ultimatepp/ultimatepp.git
synced 2026-05-21 06:45:39 -06:00
TheIDE: Help system now higlights search words and allows navigating them up/down
git-svn-id: svn://ultimatepp.org/upp/trunk@1916 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl
parent
64e426e240
commit
d53a5e5e9e
8 changed files with 179 additions and 58 deletions
|
|
@ -332,9 +332,11 @@ struct HighlightWords : RichText::Iterator {
|
|||
|
||||
void TopicCtrl::FinishText(RichText& text)
|
||||
{
|
||||
spos.Clear();
|
||||
if(!showwords)
|
||||
return;
|
||||
Vector<String> ss = Split((String)~search, ' ');
|
||||
|
||||
if(ss.GetCount() == 0)
|
||||
return;
|
||||
HighlightWords hw;
|
||||
|
|
@ -345,8 +347,10 @@ void TopicCtrl::FinishText(RichText& text)
|
|||
fi.paravalid = 0;
|
||||
fi.paper = SColorHighlight();
|
||||
fi.ink = SColorHighlightText();
|
||||
for(int i = 0; i < hw.pos.GetCount(); i++)
|
||||
for(int i = 0; i < hw.pos.GetCount(); i++) {
|
||||
text.ApplyFormatInfo(hw.pos[i].pos, fi, hw.pos[i].len);
|
||||
spos.Add(hw.pos[i].pos);
|
||||
}
|
||||
}
|
||||
|
||||
void TopicCtrl::OpenTopic()
|
||||
|
|
@ -489,6 +493,18 @@ void TopicCtrl::FocusSearch()
|
|||
search.SetFocus();
|
||||
}
|
||||
|
||||
void TopicCtrl::Prev()
|
||||
{
|
||||
if(!Up(spos))
|
||||
HelpWindow::Prev();
|
||||
}
|
||||
|
||||
void TopicCtrl::Next()
|
||||
{
|
||||
if(!Down(spos))
|
||||
HelpWindow::Next();
|
||||
}
|
||||
|
||||
void TopicCtrl::BarEx(Bar& bar)
|
||||
{
|
||||
bar.Gap();
|
||||
|
|
@ -497,6 +513,9 @@ void TopicCtrl::BarEx(Bar& bar)
|
|||
.Check(all);
|
||||
bar.Gap(HorzLayoutZoom(30));
|
||||
bar.Add(search, HorzLayoutZoom(300));
|
||||
bar.Add(search.GetLength(), "Prev", IdeImg::GoPrev(), THISBACK(Prev));
|
||||
bar.Add(search.GetLength(), "Next", IdeImg::GoNext(), THISBACK(Next));
|
||||
|
||||
bar.AddKey(K_CTRL_F, THISBACK(FocusSearch));
|
||||
/* bar.Add("Highlight search keywords in topic", IdeImg::ShowWords(), THISBACK(ShowWords))
|
||||
.Check(showwords);*/
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 2.8 KiB |
|
|
@ -179,7 +179,8 @@ private:
|
|||
bool showwords, all;
|
||||
|
||||
VectorMap<String, VectorMap<String, Index<String> > > map;
|
||||
Index<String> lang_list;
|
||||
Index<String> lang_list;
|
||||
Vector<int> spos;
|
||||
|
||||
static Index<String> idelink;
|
||||
|
||||
|
|
@ -193,6 +194,8 @@ private:
|
|||
Index<String>& lang_list);
|
||||
void LoadMap();
|
||||
void FocusSearch();
|
||||
void Prev();
|
||||
void Next();
|
||||
|
||||
public:
|
||||
Callback WhenTopic;
|
||||
|
|
|
|||
|
|
@ -73,6 +73,8 @@ IMAGE_ID(svn_dir)
|
|||
IMAGE_ID(Diff)
|
||||
IMAGE_ID(SvnDiff)
|
||||
IMAGE_ID(Patch)
|
||||
IMAGE_ID(GoPrev)
|
||||
IMAGE_ID(GoNext)
|
||||
|
||||
IMAGE_BEGIN_DATA
|
||||
IMAGE_DATA(120,156,237,152,77,210,155,48,12,134,125,129,206,124,187,206,116,213,235,244,84,229,68,61,67,206,145,35,116,217,46,187)
|
||||
|
|
@ -2191,35 +2193,38 @@ IMAGE_DATA(88,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
|
|||
IMAGE_END_DATA(5664, 21)
|
||||
|
||||
IMAGE_BEGIN_DATA
|
||||
IMAGE_DATA(120,156,237,152,79,72,20,81,28,199,191,41,91,254,201,88,21,130,194,204,46,74,22,27,180,30,178,14,42,69,18,185)
|
||||
IMAGE_DATA(221,2,69,8,202,127,171,216,138,30,76,17,115,49,20,133,22,188,181,130,130,151,12,246,26,29,58,181,144,183,57,8)
|
||||
IMAGE_DATA(118,242,182,122,241,80,151,200,131,158,166,247,102,118,118,223,236,190,55,111,118,102,183,77,241,183,124,97,231,241,251,252)
|
||||
IMAGE_DATA(126,239,253,102,126,63,118,7,94,120,145,79,27,95,222,84,157,136,229,85,21,38,197,98,49,213,202,184,252,1,209,18)
|
||||
IMAGE_DATA(209,120,154,159,155,155,75,201,184,230,242,148,237,33,106,54,243,57,229,167,185,59,178,121,222,30,184,249,105,238,13,135)
|
||||
IMAGE_DATA(231,95,74,242,116,31,219,14,206,223,140,180,54,28,228,239,208,243,106,252,65,54,159,185,143,44,126,155,169,159,211,251)
|
||||
IMAGE_DATA(223,145,140,161,58,188,255,205,201,51,56,201,191,193,212,159,147,63,179,14,153,188,155,254,113,101,249,30,6,196,84,135)
|
||||
IMAGE_DATA(74,241,185,26,143,71,242,67,205,239,247,11,101,135,119,155,95,247,9,167,100,135,119,123,126,195,172,206,253,47,242,59)
|
||||
IMAGE_DATA(225,93,62,63,153,38,138,111,215,220,240,34,95,187,49,220,242,185,217,197,252,15,131,98,219,83,11,241,253,91,90,210)
|
||||
IMAGE_DATA(242,251,117,89,249,27,62,172,78,179,127,110,245,44,17,172,255,255,118,10,155,33,6,254,228,140,9,252,85,223,236,172)
|
||||
IMAGE_DATA(210,31,141,42,109,11,11,138,55,20,82,74,135,134,20,136,39,143,74,125,63,199,227,202,235,245,117,229,54,97,203,70)
|
||||
IMAGE_DATA(70,44,253,219,23,23,53,223,174,72,68,105,154,158,86,202,37,254,213,100,15,119,72,220,155,51,51,202,149,137,9,229)
|
||||
IMAGE_DATA(252,240,176,165,191,39,24,84,40,83,51,54,166,84,142,142,74,247,143,193,65,205,135,170,132,250,146,107,11,255,92,235)
|
||||
IMAGE_DATA(121,114,205,139,75,220,245,235,192,175,126,122,227,137,2,250,225,95,2,253,253,186,124,62,89,220,103,132,87,233,79,6)
|
||||
IMAGE_DATA(162,239,41,126,103,7,216,221,5,246,246,128,104,20,168,170,202,141,167,86,93,13,132,66,192,225,33,176,185,41,226,75)
|
||||
IMAGE_DATA(129,213,10,224,35,85,25,17,89,106,51,123,180,182,2,251,251,192,252,188,105,185,4,30,212,226,6,206,217,153,112,107)
|
||||
IMAGE_DATA(107,64,34,1,212,213,165,150,30,97,26,43,100,191,173,24,144,243,181,181,250,17,27,27,181,203,0,150,17,193,177,198)
|
||||
IMAGE_DATA(191,199,17,30,98,82,204,118,118,2,189,189,58,31,12,18,56,128,91,232,194,3,4,53,254,46,122,208,132,199,98,126)
|
||||
IMAGE_DATA(146,196,62,58,210,249,227,99,96,105,73,91,190,76,40,202,87,160,70,190,255,129,1,157,159,154,74,45,121,113,13,111)
|
||||
IMAGE_DATA(145,64,55,214,228,124,9,169,113,67,3,224,241,152,150,159,224,29,194,216,71,3,238,103,0,237,40,47,223,68,101,165)
|
||||
IMAGE_DATA(174,210,210,85,97,232,23,248,68,170,249,135,220,245,49,148,167,38,254,43,108,109,165,223,70,4,2,63,133,252,5,84)
|
||||
IMAGE_DATA(225,57,62,96,14,123,152,193,46,222,224,71,78,188,97,87,225,195,61,244,105,162,124,87,151,138,190,62,93,245,245,102)
|
||||
IMAGE_DATA(254,172,25,229,205,24,14,67,165,202,206,34,111,70,202,25,127,228,141,56,233,88,242,102,100,25,54,142,221,102,100,57)
|
||||
IMAGE_DATA(51,111,175,25,197,60,53,123,205,200,158,193,92,199,179,102,52,249,22,224,5,138,27,147,252,73,14,75,4,53,145,72)
|
||||
IMAGE_DATA(112,101,240,145,149,111,92,21,130,103,175,89,158,126,151,241,188,88,108,254,204,24,44,47,175,99,90,133,200,159,143,243)
|
||||
IMAGE_DATA(103,231,22,215,63,253,108,100,243,116,45,30,143,11,121,186,254,229,235,111,225,254,41,43,226,13,150,229,93,62,191,197)
|
||||
IMAGE_DATA(181,147,52,12,188,221,94,75,65,210,204,154,143,224,83,8,158,189,54,241,144,243,188,88,166,252,16,243,178,58,154,84)
|
||||
IMAGE_DATA(128,252,249,56,63,111,24,8,235,15,49,15,102,24,112,121,232,111,127,69,251,103,135,65,22,143,244,155,99,131,119,249)
|
||||
IMAGE_DATA(252,22,215,78,210,48,8,75,4,73,51,83,31,85,160,66,240,236,53,203,195,6,207,139,197,230,207,140,193,242,178,58)
|
||||
IMAGE_DATA(178,42,68,254,124,156,159,55,12,68,245,135,5,15,102,24,240,120,109,61,28,22,238,159,29,6,153,124,138,101,120,151)
|
||||
IMAGE_DATA(207,111,81,237,47,216,243,53,46,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
|
||||
IMAGE_END_DATA(992, 9)
|
||||
IMAGE_DATA(120,156,237,154,79,72,20,81,28,199,191,41,91,174,102,172,10,65,97,101,151,34,11,131,214,67,214,193,164,72,34,183)
|
||||
IMAGE_DATA(91,80,4,65,249,111,141,82,244,96,138,152,139,97,40,36,116,107,3,3,47,109,176,215,232,208,169,133,188,205,65,176)
|
||||
IMAGE_DATA(147,183,213,75,135,186,68,29,244,52,189,55,227,204,190,217,125,111,222,204,188,89,77,241,55,124,193,247,248,125,126,191)
|
||||
IMAGE_DATA(247,126,51,239,199,238,172,136,33,134,48,109,120,46,163,7,17,203,235,58,28,202,102,179,186,155,113,249,31,68,179,68)
|
||||
IMAGE_DATA(195,5,126,106,106,202,150,53,230,242,148,189,79,212,236,228,125,229,167,185,59,74,121,222,26,184,249,105,238,197,128,251)
|
||||
IMAGE_DATA(159,221,226,233,58,150,3,236,191,25,5,45,6,200,223,97,230,53,248,31,165,124,241,58,74,248,101,166,126,65,239,127)
|
||||
IMAGE_DATA(199,86,12,61,224,253,111,222,218,67,144,252,139,76,253,57,249,139,235,80,204,171,156,31,37,11,187,25,16,211,3,202)
|
||||
IMAGE_DATA(230,253,26,143,199,214,69,45,30,143,11,229,133,87,205,111,250,164,108,121,225,85,247,111,153,219,190,183,35,127,16,94)
|
||||
IMAGE_DATA(241,249,41,54,81,124,175,166,194,139,124,189,198,80,229,253,217,225,240,155,193,78,219,109,23,241,253,91,91,11,138,199)
|
||||
IMAGE_DATA(77,185,249,91,62,172,246,178,191,191,122,86,8,230,255,127,219,131,135,33,11,126,231,204,10,252,245,150,201,73,173,39)
|
||||
IMAGE_DATA(157,214,218,103,102,180,216,224,160,86,217,223,175,65,220,121,116,234,251,41,151,211,158,189,127,175,93,32,108,213,147,39)
|
||||
IMAGE_DATA(174,254,215,94,189,50,124,187,230,231,181,179,227,227,90,84,226,95,71,214,112,145,196,61,55,49,161,29,27,25,209,14)
|
||||
IMAGE_DATA(14,12,184,250,71,146,73,141,50,245,67,67,90,205,211,167,210,245,163,175,207,240,161,170,160,190,100,236,226,239,183,158)
|
||||
IMAGE_DATA(187,215,98,56,194,157,63,5,252,234,161,55,158,40,97,110,254,17,208,211,99,170,165,69,22,247,14,225,117,250,145,129)
|
||||
IMAGE_DATA(232,155,205,175,172,0,171,171,192,218,26,144,78,3,181,181,254,120,106,117,117,192,224,32,240,247,47,144,201,136,248,74)
|
||||
IMAGE_DATA(224,93,53,240,129,170,138,136,76,181,59,61,218,218,128,245,117,96,122,218,49,93,129,8,26,112,26,7,188,116,184,133)
|
||||
IMAGE_DATA(5,32,159,7,26,27,237,169,27,24,199,27,178,222,54,244,202,249,134,6,115,139,103,206,24,195,4,230,48,143,77,131)
|
||||
IMAGE_DATA(127,141,13,92,199,168,152,237,236,4,30,60,48,249,100,146,192,9,156,71,23,174,34,105,240,151,112,31,103,113,83,204)
|
||||
IMAGE_DATA(143,146,216,27,27,38,191,185,9,204,206,26,211,71,9,69,249,106,212,203,215,223,219,107,242,99,99,246,84,12,39,240)
|
||||
IMAGE_DATA(2,121,220,195,130,156,175,32,53,110,106,2,34,17,199,244,45,188,68,10,235,104,194,149,34,224,26,162,209,12,106,106)
|
||||
IMAGE_DATA(76,85,86,190,19,134,126,136,143,164,154,127,200,93,31,66,212,238,248,143,177,180,84,120,27,145,72,252,20,242,135,80)
|
||||
IMAGE_DATA(139,187,120,139,41,172,97,2,171,120,142,239,190,120,203,142,163,5,151,209,109,136,242,93,93,58,186,187,77,157,60,233)
|
||||
IMAGE_DATA(228,247,15,163,252,48,166,82,208,169,74,179,200,15,35,229,172,47,242,86,156,66,44,249,97,100,25,54,142,215,195,200)
|
||||
IMAGE_DATA(114,78,222,219,97,20,243,212,188,29,70,118,15,206,58,238,31,70,135,111,25,94,160,168,152,228,75,114,74,34,232,249)
|
||||
IMAGE_DATA(124,158,43,139,159,127,243,149,171,114,240,236,152,229,233,223,50,158,23,139,205,95,28,131,229,229,117,44,168,28,249,195)
|
||||
IMAGE_DATA(216,127,105,110,113,253,11,207,70,41,79,231,114,185,156,144,167,243,159,191,252,22,174,159,178,34,222,98,89,94,241,249)
|
||||
IMAGE_DATA(221,89,219,77,205,32,118,47,230,42,72,14,179,225,35,184,202,193,179,99,7,15,57,207,139,229,200,15,49,47,171,163)
|
||||
IMAGE_DATA(67,101,200,31,198,254,121,205,64,88,127,136,121,48,205,128,203,195,124,251,43,90,63,219,12,74,120,20,222,28,91,188)
|
||||
IMAGE_DATA(226,243,187,179,182,155,154,65,74,34,72,14,51,245,209,5,42,7,207,142,89,30,30,120,94,44,54,127,113,12,150,151)
|
||||
IMAGE_DATA(213,145,85,57,242,135,177,127,94,51,16,213,31,46,60,152,102,192,227,141,249,84,74,184,126,182,25,20,243,54,203,240)
|
||||
IMAGE_DATA(138,207,239,206,218,54,54,3,213,205,170,240,188,223,243,182,139,55,89,157,253,184,186,109,188,205,90,151,207,24,42,124)
|
||||
IMAGE_DATA(9,235,51,134,10,47,100,61,198,80,225,13,214,110,18,18,113,98,248,106,230,30,234,232,221,254,147,127,186,112,240,10)
|
||||
IMAGE_DATA(63,216,219,49,140,155,229,114,9,110,68,88,188,107,12,15,108,24,60,55,134,15,54,12,222,17,35,0,27,6,111,196)
|
||||
IMAGE_DATA(80,96,195,224,161,200,134,193,75,237,31,151,244,188,55,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
|
||||
IMAGE_END_DATA(1088, 11)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue