Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added case sensitive and whole words only search

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2000-01-16 15:53:25 +00:00
parent b4b58c41d2
commit c497114770
4 changed files with 70 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/html/helpfrm.cpp
View File

@@ -129,6 +129,9 @@ void wxHtmlHelpFrame::Init(wxHtmlHelpData* data)
m_NavigPan = NULL;
m_HtmlWin = NULL;
m_Bookmarks = NULL;
m_SearchCaseSensitive = NULL;
m_SearchWholeWords = NULL;
m_Config = NULL;
m_ConfigRoot = wxEmptyString;
@@ -331,9 +334,25 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti
b4 -> height.AsIs();
m_SearchChoice -> SetConstraints(b4);
wxLayoutConstraints *b5 = new wxLayoutConstraints;
m_SearchCaseSensitive = new wxCheckBox(dummy, -1, _("Case sensitive"));
b5 -> top.Below (m_SearchButton, 10);
b5 -> left.SameAs (dummy, wxLeft, 10);
b5 -> right.SameAs (dummy, wxRight, 10);
b5 -> height.AsIs ();
m_SearchCaseSensitive -> SetConstraints(b5);
wxLayoutConstraints *b6 = new wxLayoutConstraints;
m_SearchWholeWords = new wxCheckBox(dummy, -1, _("Whole words only"));
b6 -> top.Below (m_SearchCaseSensitive, 0);
b6 -> left.SameAs (dummy, wxLeft, 10);
b6 -> right.SameAs (dummy, wxRight, 10);
b6 -> height.AsIs ();
m_SearchWholeWords -> SetConstraints(b6);
wxLayoutConstraints *b3 = new wxLayoutConstraints;
m_SearchList = new wxListBox(dummy, wxID_HTML_SEARCHLIST, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE | wxLB_ALWAYS_SB);
b3 -> top.Below (m_SearchButton, 10);
b3 -> top.Below (m_SearchWholeWords, 10);
b3 -> left.SameAs (dummy, wxLeft, 0);
b3 -> right.SameAs (dummy, wxRight, 0);
b3 -> bottom.SameAs (dummy, wxBottom, 0);
@@ -434,7 +453,7 @@ bool wxHtmlHelpFrame::KeywordSearch(const wxString& keyword)
if (! (m_SearchList && m_SearchButton && m_SearchText && m_SearchChoice))
return FALSE;
int foundcnt = 0;
int foundcnt = 0, curi;
wxString foundstr;
wxString book = wxEmptyString;
@@ -451,14 +470,17 @@ bool wxHtmlHelpFrame::KeywordSearch(const wxString& keyword)
if (m_SearchChoice->GetSelection() != 0)
book = m_SearchChoice->GetStringSelection();
wxHtmlSearchStatus status(m_Data, keyword, book);
wxHtmlSearchStatus status(m_Data, keyword,
m_SearchCaseSensitive -> GetValue(), m_SearchWholeWords -> GetValue(),
book);
wxProgressDialog progress(_("Searching..."), _("No matching page found yet"),
status.GetMaxIndex(), this,
wxPD_APP_MODAL | wxPD_CAN_ABORT | wxPD_AUTO_HIDE);
while (status.IsActive()) {
if (progress.Update(status.GetCurIndex()) == FALSE)
curi = status.GetCurIndex();
if (curi % 10 == 0 && progress.Update(curi) == FALSE)
break;
if (status.Search()) {
foundstr.Printf(_("Found %i matches"), ++foundcnt);