// is updated.
#define PROGRESS_STEP 40
+// what is considered "small index"?
+#define INDEX_IS_SMALL 100
+
+
//--------------------------------------------------------------------------
// wxHtmlHelpTreeItemData (private)
//--------------------------------------------------------------------------
m_ContentsImageList -> Add(wxICON(whlproot));
m_ContentsBox = NULL;
- m_IndexBox = NULL;
+ m_IndexList = NULL;
+ m_IndexButton = NULL;
+ m_IndexButtonAll = NULL;
+ m_IndexText = NULL;
m_SearchList = NULL;
m_SearchButton = NULL;
m_SearchText = NULL;
// with the style flag it's possible to toggle the toolbar, contents, index and search
// controls.
// m_HtmlWin will *always* be created, but it's important to realize that
-// m_ContentsBox, m_IndexBox, m_SearchList, m_SearchButton, m_SearchText and
+// m_ContentsBox, m_IndexList, m_SearchList, m_SearchButton, m_SearchText and
// m_SearchButton may be NULL.
// moreover, if no contents, index or searchpage is needed, m_Splitter and
// m_NavigPan will be NULL too (with m_HtmlWin directly connected to the frame)
// index listbox panel?
if (style & wxHF_INDEX) {
wxWindow *dummy = new wxPanel(m_NavigPan, wxID_HTML_INDEXPAGE);
+
wxLayoutConstraints *b1 = new wxLayoutConstraints;
- b1 -> top.SameAs (dummy, wxTop, 0);
- b1 -> left.SameAs (dummy, wxLeft, 0);
- b1 -> width.PercentOf (dummy, wxWidth, 100);
- b1 -> bottom.SameAs (dummy, wxBottom, 0);
- m_IndexBox = new wxListBox(dummy, wxID_HTML_INDEXLIST, wxDefaultPosition,
- wxDefaultSize, 0, NULL, wxLB_SINGLE | wxLB_ALWAYS_SB);
- m_IndexBox -> SetConstraints(b1);
+ m_IndexText = new wxTextCtrl(dummy, wxID_HTML_INDEXTEXT, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER);
+ b1 -> top.SameAs (dummy, wxTop, 10);
+ b1 -> left.SameAs (dummy, wxLeft, 10);
+ b1 -> right.SameAs (dummy, wxRight, 10);
+ b1 -> height.AsIs();
+ m_IndexText -> SetConstraints(b1);
+
+ wxLayoutConstraints *b4 = new wxLayoutConstraints;
+ m_IndexButtonAll = new wxButton(dummy, wxID_HTML_INDEXBUTTONALL, _("Show all"));
+
+ b4 -> top.Below (m_IndexText, 10);
+ b4 -> right.SameAs (dummy, wxRight, 10);
+ b4 -> width.AsIs();
+ b4 -> height.AsIs();
+ m_IndexButtonAll -> SetConstraints(b4);
+
+ wxLayoutConstraints *b2 = new wxLayoutConstraints;
+ m_IndexButton = new wxButton(dummy, wxID_HTML_INDEXBUTTON, _("Find"));
+ b2 -> top.Below (m_IndexText, 10);
+ b2 -> right.LeftOf (m_IndexButtonAll, 10);
+ b2 -> width.AsIs();
+ b2 -> height.AsIs();
+ m_IndexButton -> SetConstraints(b2);
+
+ wxLayoutConstraints *b3 = new wxLayoutConstraints;
+ m_IndexList = new wxListBox(dummy, wxID_HTML_INDEXLIST, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE | wxLB_ALWAYS_SB);
+ b3 -> top.Below (m_IndexButton, 10);
+ b3 -> left.SameAs (dummy, wxLeft, 0);
+ b3 -> right.SameAs (dummy, wxRight, 0);
+ b3 -> bottom.SameAs (dummy, wxBottom, 0);
+ m_IndexList -> SetConstraints(b3);
+
+#if wxUSE_TOOLTIPS
+ m_IndexButtonAll -> SetToolTip(_("Show all items in index"));
+ m_IndexButton -> SetToolTip(_("Display all index items that contain given substring. Note that this is case sensitive, so 'window' and 'Window' is something else!"));
+#endif //wxUSE_TOOLTIPS
+
dummy -> SetAutoLayout(TRUE);
+ dummy -> Layout();
+
m_NavigPan -> AddPage(dummy, _("Index"));
m_IndexPage = notebook_page++;
}
wxWindow *dummy = new wxPanel(m_NavigPan, wxID_HTML_SEARCHPAGE);
wxLayoutConstraints *b1 = new wxLayoutConstraints;
- m_SearchText = new wxTextCtrl(dummy, wxID_HTML_SEARCHTEXT);
+ m_SearchText = new wxTextCtrl(dummy, wxID_HTML_SEARCHTEXT, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER);
b1 -> top.SameAs (dummy, wxTop, 10);
b1 -> left.SameAs (dummy, wxLeft, 10);
b1 -> right.SameAs (dummy, wxRight, 10);
wxLayoutConstraints *b2 = new wxLayoutConstraints;
m_SearchButton = new wxButton(dummy, wxID_HTML_SEARCHBUTTON, _("Search"));
+#if wxUSE_TOOLTIPS
+ m_SearchButton -> SetToolTip(_("Search contents of help book(s) for all occurences of the text you typed above"));
+#endif //wxUSE_TOOLTIPS
b2 -> top.Below (m_SearchText, 10);
b2 -> left.SameAs (dummy, wxLeft, 10);
b2 -> width.AsIs();
m_SearchChoice -> SetConstraints(b4);
wxLayoutConstraints *b3 = new wxLayoutConstraints;
- m_SearchList = new wxListBox(dummy, wxID_HTML_SEARCHLIST, wxDefaultPosition, wxDefaultSize, 0);
+ m_SearchList = new wxListBox(dummy, wxID_HTML_SEARCHLIST, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE | wxLB_ALWAYS_SB);
b3 -> top.Below (m_SearchButton, 10);
b3 -> left.SameAs (dummy, wxLeft, 0);
b3 -> right.SameAs (dummy, wxRight, 0);
bool wxHtmlHelpFrame::DisplayIndex()
{
- if (! m_IndexBox)
+ if (! m_IndexList)
return FALSE;
if (!m_Splitter -> IsSplit()) {
m_NavigPan -> Show(TRUE);
void wxHtmlHelpFrame::CreateIndex(bool show_progress)
{
- if (! m_IndexBox)
+ if (! m_IndexList)
return ;
wxProgressDialog *progress = NULL;
wxString proginfo;
- m_IndexBox->Clear();
+ m_IndexList->Clear();
int cnt = m_Data->GetIndexCnt();
+
+ if (cnt > INDEX_IS_SMALL) return;
+
int div = (cnt / PROGRESS_STEP) + 1;
wxHtmlContentsItem* index = m_Data->GetIndex();
break;
wxYield();
}
- m_IndexBox -> Append(index[i].m_Name, (char*)(index + i));
+ m_IndexList -> Append(index[i].m_Name, (char*)(index + i));
}
if (show_progress)
sizer = new wxBoxSizer(wxHORIZONTAL);
- sizer2 = new wxBoxSizer(wxVERTICAL);
- sizer2 -> Add(new wxStaticText(this, -1, _("Normal font:")),
- 0, wxLEFT | wxTOP, 10);
+ sizer2 = new wxStaticBoxSizer( new wxStaticBox(this, -1, _("Normal font:")), wxVERTICAL);
sizer2 -> Add(NormalFont = new wxComboBox(this, -1, wxEmptyString, wxDefaultPosition,
-//#ifdef __WXMSW__
wxSize(200, 200),
-//#else
-// wxSize(200, -1),
-//#endif // FIXME: temporarily commented by VS to demonstrate the problem
0, NULL, wxCB_DROPDOWN | wxCB_READONLY),
1, wxEXPAND | wxLEFT | wxRIGHT, 10);
1, wxEXPAND, 0);
sizer2 -> Add(sizer3, 0, wxEXPAND | wxLEFT | wxRIGHT, 10);
- sizer -> Add(sizer2, 0, wxEXPAND | wxLEFT | wxRIGHT, 10);
+ sizer -> Add(sizer2, 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10);
- sizer2 = new wxBoxSizer(wxVERTICAL);
- sizer2 -> Add(new wxStaticText(this, -1, _("Fixed font:")),
- 0, wxLEFT | wxTOP, 10);
+ sizer2 = new wxStaticBoxSizer( new wxStaticBox(this, -1, _("Fixed font:")), wxVERTICAL);
sizer2 -> Add(FixedFont = new wxComboBox(this, -1, wxEmptyString, wxDefaultPosition,
-//#ifdef __WXMSW__
wxSize(200, 200),
-//#else
-// wxSize(200, -1),
-//#endif // FIXME: temporarily commented by VS to demonstrate the problem
0, NULL, wxCB_DROPDOWN | wxCB_READONLY),
1, wxEXPAND | wxLEFT | wxRIGHT, 10);
1, wxEXPAND, 0);
sizer2 -> Add(sizer3, 0, wxEXPAND | wxLEFT | wxRIGHT, 10);
- sizer -> Add(sizer2, 0, wxEXPAND | wxLEFT | wxRIGHT, 10);
+ sizer -> Add(sizer2, 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10);
topsizer -> Add(sizer);
topsizer -> Add(RadioBox = new wxRadioBox(this, -1, _("Font size:"),
wxDefaultPosition, wxDefaultSize, 3, choices, 3),
- 0, wxEXPAND | wxLEFT | wxRIGHT, 10);
+ 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10);
topsizer -> Add(new wxStaticText(this, -1, _("Preview:")),
0, wxLEFT | wxTOP, 10);
topsizer -> Add(TestWin = new wxHtmlWindow(this, -1, wxDefaultPosition, wxSize(-1, 150)),
- 1, wxEXPAND | wxLEFT | wxTOP, 10);
+ 1, wxEXPAND | wxLEFT|wxTOP|wxRIGHT, 10);
sizer = new wxBoxSizer(wxHORIZONTAL);
sizer -> Add(new wxButton(this, wxID_OK, _("OK")), 0, wxALL, 10);
"<font size=+4>font size +4</font><br>"
"<p><tt>Fixed size face.<br> <b>bold</b> <i>italic</i> "
- "<b><i>bold italic <u>underlined</u></i></b></tt><br>"
+ "<b><i>bold italic <u>underlined</u></i></b><br>"
"<font size=-2>font size -2</font><br>"
"<font size=-1>font size -1</font><br>"
"<font size=+0>font size +0</font><br>"
"<font size=+1>font size +1</font><br>"
"<font size=+2>font size +2</font><br>"
"<font size=+3>font size +3</font><br>"
- "<font size=+4>font size +4</font>"
+ "<font size=+4>font size +4</font></tt>"
"</body></html>"));
}
void wxHtmlHelpFrame::OnIndexSel(wxCommandEvent& WXUNUSED(event))
{
- wxHtmlContentsItem *it = (wxHtmlContentsItem*) m_IndexBox -> GetClientData(m_IndexBox -> GetSelection());
+ wxHtmlContentsItem *it = (wxHtmlContentsItem*) m_IndexList -> GetClientData(m_IndexList -> GetSelection());
m_HtmlWin -> LoadPage(it -> m_Book -> GetBasePath() + it -> m_Page);
}
+void wxHtmlHelpFrame::OnIndexFind(wxCommandEvent& event)
+{
+ wxString sr = m_IndexText -> GetLineText(0);
+ if (sr == wxEmptyString)
+ OnIndexAll(event);
+
+ else {
+ wxBusyCursor bcur;
+ const wxChar *cstr = sr.c_str();
+ bool first = TRUE;
+
+ m_IndexList->Clear();
+ int cnt = m_Data->GetIndexCnt();
+ wxHtmlContentsItem* index = m_Data->GetIndex();
+
+ for (int i = 0; i < cnt; i++)
+ if (wxStrstr(index[i].m_Name, cstr) != NULL) {
+ m_IndexList -> Append(index[i].m_Name, (char*)(index + i));
+ if (first) {
+ m_HtmlWin -> LoadPage(index[i].m_Book -> GetBasePath() + index[i].m_Page);
+ first = FALSE;
+ }
+ }
+
+ m_IndexText -> SetSelection(0, sr.Length());
+ m_IndexText -> SetFocus();
+ }
+}
+
+void wxHtmlHelpFrame::OnIndexAll(wxCommandEvent& WXUNUSED(event))
+{
+ wxBusyCursor bcur;
+
+ m_IndexList->Clear();
+ int cnt = m_Data->GetIndexCnt();
+ bool first = TRUE;
+ wxHtmlContentsItem* index = m_Data->GetIndex();
+
+ for (int i = 0; i < cnt; i++) {
+ m_IndexList -> Append(index[i].m_Name, (char*)(index + i));
+ if (first) {
+ m_HtmlWin -> LoadPage(index[i].m_Book -> GetBasePath() + index[i].m_Page);
+ first = FALSE;
+ }
+ }
+}
+
void wxHtmlHelpFrame::OnSearchSel(wxCommandEvent& WXUNUSED(event))
{
EVT_LISTBOX(wxID_HTML_SEARCHLIST, wxHtmlHelpFrame::OnSearchSel)
EVT_BUTTON(wxID_HTML_SEARCHBUTTON, wxHtmlHelpFrame::OnSearch)
EVT_TEXT_ENTER(wxID_HTML_SEARCHTEXT, wxHtmlHelpFrame::OnSearch)
+ EVT_BUTTON(wxID_HTML_INDEXBUTTON, wxHtmlHelpFrame::OnIndexFind)
+ EVT_TEXT_ENTER(wxID_HTML_INDEXTEXT, wxHtmlHelpFrame::OnIndexFind)
+ EVT_BUTTON(wxID_HTML_INDEXBUTTONALL, wxHtmlHelpFrame::OnIndexAll)
EVT_COMBOBOX(wxID_HTML_BOOKMARKSLIST, wxHtmlHelpFrame::OnBookmarksSel)
EVT_CLOSE(wxHtmlHelpFrame::OnCloseWindow)
END_EVENT_TABLE()
projects / wxWidgets.git / blobdiff