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

applied Otto Wyss' patch to extend wxHelpController::KeywordSearch with mode argument (modified to the point of reimplementation)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-09-09 17:29:11 +00:00
parent 69efd83d47
commit 69b5cec2b0
18 changed files with 126 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/html/helpctrl.cpp
View File

@@ -319,10 +319,11 @@ bool wxHtmlHelpController::DisplayIndex()
return success;
}
bool wxHtmlHelpController::KeywordSearch(const wxString& keyword)
bool wxHtmlHelpController::KeywordSearch(const wxString& keyword,
wxHelpSearchMode mode)
{
CreateHelpWindow();
bool success = m_helpFrame->KeywordSearch(keyword);
bool success = m_helpFrame->KeywordSearch(keyword, mode);
AddGrabIfNeeded();
return success;
}

106
src/html/helpfrm.cpp
View File

@@ -657,12 +657,23 @@ bool wxHtmlHelpFrame::DisplayIndex()
bool wxHtmlHelpFrame::KeywordSearch(const wxString& keyword)
bool wxHtmlHelpFrame::KeywordSearch(const wxString& keyword,
wxHelpSearchMode mode)
{
if (! (m_SearchList && m_SearchButton && m_SearchText && m_SearchChoice))
return FALSE;
if (mode == wxHELP_SEARCH_ALL)
{
if ( !(m_SearchList &&
m_SearchButton && m_SearchText && m_SearchChoice) )
return false;
}
else if (mode == wxHELP_SEARCH_INDEX)
{
if ( !(m_IndexList &&
m_IndexButton && m_IndexButtonAll && m_IndexText) )
return false;
}
int foundcnt = 0, curi;
int foundcnt = 0;
wxString foundstr;
wxString book = wxEmptyString;
@@ -672,41 +683,71 @@ bool wxHtmlHelpFrame::KeywordSearch(const wxString& keyword)
m_HtmlWin->Show(TRUE);
m_Splitter->SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos);
}
m_NavigNotebook->SetSelection(m_SearchPage);
m_SearchList->Clear();
m_SearchText->SetValue(keyword);
m_SearchButton->Enable(FALSE);
if (m_SearchChoice->GetSelection() != 0)
book = m_SearchChoice->GetStringSelection();
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 (mode == wxHELP_SEARCH_ALL)
{
curi = status.GetCurIndex();
if (curi % 32 == 0 && progress.Update(curi) == FALSE)
break;
if (status.Search())
m_NavigNotebook->SetSelection(m_SearchPage);
m_SearchList->Clear();
m_SearchText->SetValue(keyword);
m_SearchButton->Enable(false);
if (m_SearchChoice->GetSelection() != 0)
book = m_SearchChoice->GetStringSelection();
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);
int curi;
while (status.IsActive())
{
foundstr.Printf(_("Found %i matches"), ++foundcnt);
progress.Update(status.GetCurIndex(), foundstr);
m_SearchList->Append(status.GetName(), status.GetContentsItem());
curi = status.GetCurIndex();
if (curi % 32 == 0 && progress.Update(curi) == FALSE)
break;
if (status.Search())
{
foundstr.Printf(_("Found %i matches"), ++foundcnt);
progress.Update(status.GetCurIndex(), foundstr);
m_SearchList->Append(status.GetName(), status.GetContentsItem());
}
}
m_SearchButton->Enable(TRUE);
m_SearchText->SetSelection(0, keyword.Length());
m_SearchText->SetFocus();
}
else if (mode == wxHELP_SEARCH_INDEX)
{
m_NavigNotebook->SetSelection(m_IndexPage);
m_IndexList->Clear();
m_IndexButton->Enable(false);
m_IndexButtonAll->Enable(false);
m_IndexText->SetValue(keyword);
wxCommandEvent dummy;
OnIndexFind(dummy); // what a hack...
m_IndexButton->Enable(true);
m_IndexButtonAll->Enable(true);
foundcnt = m_IndexList->GetCount();
}
m_SearchButton->Enable(TRUE);
m_SearchText->SetSelection(0, keyword.Length());
m_SearchText->SetFocus();
if (foundcnt)
{
wxHtmlContentsItem *it = (wxHtmlContentsItem*) m_SearchList->GetClientData(0);
wxHtmlContentsItem *it;
if (mode == wxHELP_SEARCH_ALL)
{
it = (wxHtmlContentsItem*) m_SearchList->GetClientData(0);
}
else if (mode == wxHELP_SEARCH_INDEX)
{
it = (wxHtmlContentsItem*) m_IndexList->GetClientData(0);
}
if (it)
{
m_HtmlWin->LoadPage(it->GetFullPath());
@@ -1489,7 +1530,8 @@ void wxHtmlHelpFrame::OnSearch(wxCommandEvent& WXUNUSED(event))
{
wxString sr = m_SearchText->GetLineText(0);
if (sr != wxEmptyString) KeywordSearch(sr);
if (!sr.empty())
KeywordSearch(sr, wxHELP_SEARCH_ALL);
}
void wxHtmlHelpFrame::OnBookmarksSel(wxCommandEvent& WXUNUSED(event))

3
src/mac/carbon/helpxxxx.cpp
View File

@@ -62,7 +62,8 @@ bool wxXXXXHelpController::DisplayBlock(long block)
return FALSE;
}
bool wxXXXXHelpController::KeywordSearch(const wxString& k)
bool wxXXXXHelpController::KeywordSearch(const wxString& k,
wxHelpSearchMode WXUNUSED(mode))
{
if (m_helpFile == "") return FALSE;

3
src/mac/helpxxxx.cpp
View File

@@ -62,7 +62,8 @@ bool wxXXXXHelpController::DisplayBlock(long block)
return FALSE;
}
bool wxXXXXHelpController::KeywordSearch(const wxString& k)
bool wxXXXXHelpController::KeywordSearch(const wxString& k,
wxHelpSearchMode WXUNUSED(mode))
{
if (m_helpFile == "") return FALSE;

3
src/msw/helpchm.cpp
View File

@@ -197,7 +197,8 @@ bool wxCHMHelpController::DisplayBlock(long block)
return DisplaySection(block);
}
bool wxCHMHelpController::KeywordSearch(const wxString& k)
bool wxCHMHelpController::KeywordSearch(const wxString& k,
wxHelpSearchMode WXUNUSED(mode))
{
if (m_helpFile.IsEmpty()) return FALSE;

3
src/msw/helpwin.cpp
View File

@@ -98,7 +98,8 @@ bool wxWinHelpController::DisplayBlock(long block)
return TRUE;
}
bool wxWinHelpController::KeywordSearch(const wxString& k)
bool wxWinHelpController::KeywordSearch(const wxString& k,
wxHelpSearchMode WXUNUSED(mode))
{
if (m_helpFile.IsEmpty()) return FALSE;

3
src/os2/helpwin.cpp
View File

@@ -108,7 +108,8 @@ bool wxWinHelpController::DisplayBlock(long block)
return FALSE;
}
bool wxWinHelpController::KeywordSearch(const wxString& k)
bool wxWinHelpController::KeywordSearch(const wxString& k,
wxHelpSearchMode WXUNUSED(mode))
{
if (m_helpFile == "") return FALSE;