X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/00655497da3542fb363c136c929b31fb9c7a67d9..c6e62f74fcac5b62889b59e7ce7a41d0ce884d7b:/src/html/helpfrm.cpp diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp index 08bf9f3de7..aa742ebb45 100644 --- a/src/html/helpfrm.cpp +++ b/src/html/helpfrm.cpp @@ -62,6 +62,10 @@ // is updated. #define PROGRESS_STEP 40 +// what is considered "small index"? +#define INDEX_IS_SMALL 100 + + //-------------------------------------------------------------------------- // wxHtmlHelpTreeItemData (private) //-------------------------------------------------------------------------- @@ -112,7 +116,10 @@ void wxHtmlHelpFrame::Init(wxHtmlHelpData* data) 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; @@ -133,14 +140,13 @@ void wxHtmlHelpFrame::Init(wxHtmlHelpData* data) m_NormalFonts = m_FixedFonts = NULL; m_FontSize = 1; m_NormalFace = m_FixedFace = wxEmptyString; - m_NormalItalic = m_FixedItalic = wxSLANT; } // Create: builds the GUI components. // 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) @@ -153,7 +159,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti if (m_Config) ReadCustomization(m_Config, m_ConfigRoot); - wxFrame::Create(parent, id, _("Help"), wxPoint(m_Cfg.x, m_Cfg.y), wxSize(m_Cfg.w, m_Cfg.h)); + wxFrame::Create(parent, id, _("Help"), wxPoint(m_Cfg.x, m_Cfg.y), wxSize(m_Cfg.w, m_Cfg.h), wxDEFAULT_FRAME_STYLE, "wxHtmlHelp"); GetPosition(&m_Cfg.x, &m_Cfg.y); @@ -237,15 +243,48 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti // 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++; } @@ -255,7 +294,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti 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); @@ -264,6 +303,9 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti 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(); @@ -280,7 +322,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti 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); @@ -366,7 +408,7 @@ bool wxHtmlHelpFrame::DisplayContents() bool wxHtmlHelpFrame::DisplayIndex() { - if (! m_IndexBox) + if (! m_IndexList) return FALSE; if (!m_Splitter -> IsSplit()) { m_NavigPan -> Show(TRUE); @@ -490,15 +532,18 @@ void wxHtmlHelpFrame::CreateContents(bool show_progress) 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(); @@ -514,7 +559,7 @@ void wxHtmlHelpFrame::CreateIndex(bool show_progress) 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) @@ -563,8 +608,6 @@ void wxHtmlHelpFrame::ReadCustomization(wxConfigBase *cfg, const wxString& path) m_FixedFace = cfg -> Read("hcFixedFace", m_FixedFace); m_NormalFace = cfg -> Read("hcNormalFace", m_NormalFace); m_FontSize = cfg -> Read("hcFontSize", m_FontSize); - m_NormalItalic = cfg -> Read("hcNormalItalic", m_NormalItalic); - m_FixedItalic = cfg -> Read("hcFixedItalic", m_FixedItalic); { int i; @@ -581,11 +624,11 @@ void wxHtmlHelpFrame::ReadCustomization(wxConfigBase *cfg, const wxString& path) } for (i = 0; i < cnt; i++) { - val.Printf("hcBookmark_%i", i); + val.Printf(wxT("hcBookmark_%i"), i); s = cfg -> Read(val); m_BookmarksNames.Add(s); if (m_Bookmarks) m_Bookmarks -> Append(s); - val.Printf("hcBookmark_%i_url", i); + val.Printf(wxT("hcBookmark_%i_url"), i); s = cfg -> Read(val); m_BookmarksPages.Add(s); } @@ -618,8 +661,6 @@ void wxHtmlHelpFrame::WriteCustomization(wxConfigBase *cfg, const wxString& path cfg -> Write("hcFixedFace", m_FixedFace); cfg -> Write("hcNormalFace", m_NormalFace); cfg -> Write("hcFontSize", (long)m_FontSize); - cfg -> Write("hcNormalItalic", (long)m_NormalItalic); - cfg -> Write("hcFixedItalic", (long)m_FixedItalic); if (m_Bookmarks) { int i; @@ -628,9 +669,9 @@ void wxHtmlHelpFrame::WriteCustomization(wxConfigBase *cfg, const wxString& path cfg -> Write("hcBookmarksCnt", (long)cnt); for (i = 0; i < cnt; i++) { - val.Printf("hcBookmark_%i", i); + val.Printf(wxT("hcBookmark_%i"), i); cfg -> Write(val, m_BookmarksNames[i]); - val.Printf("hcBookmark_%i_url", i); + val.Printf(wxT("hcBookmark_%i_url"), i); cfg -> Write(val, m_BookmarksPages[i]); } } @@ -646,7 +687,7 @@ void wxHtmlHelpFrame::WriteCustomization(wxConfigBase *cfg, const wxString& path -static void SetFontsToHtmlWin(wxHtmlWindow *win, wxString scalf, int scalit, wxString fixf, int fixit, int size) +static void SetFontsToHtmlWin(wxHtmlWindow *win, wxString scalf, wxString fixf, int size) { static int f_sizes[3][7] = { @@ -655,7 +696,7 @@ static void SetFontsToHtmlWin(wxHtmlWindow *win, wxString scalf, int scalit, wxS {14, 16, 18, 24, 32, 38, 45} }; - win -> SetFonts(scalf, scalit, fixf, fixit, f_sizes[size]); + win -> SetFonts(scalf, fixf, f_sizes[size]); } @@ -663,72 +704,44 @@ class wxHtmlHelpFrameOptionsDialog : public wxDialog { public: wxComboBox *NormalFont, *FixedFont; - wxRadioButton *SFI_i, *SFI_s, *FFI_i, *FFI_s; wxRadioBox *RadioBox; wxHtmlWindow *TestWin; wxHtmlHelpFrameOptionsDialog(wxWindow *parent) : wxDialog(parent, -1, wxString(_("Help Browser Options"))) { wxString choices[3] = {_("small"), _("medium"), _("large")}; - wxString choices2[2] = {_("italic"), _("slant")}; - wxBoxSizer *topsizer, *sizer, *sizer2, *sizer3; + wxBoxSizer *topsizer, *sizer, *sizer2; topsizer = new wxBoxSizer(wxVERTICAL); 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); - sizer3 = new wxBoxSizer(wxHORIZONTAL); - sizer3 -> Add(SFI_i = new wxRadioButton(this, -1, _("use italic"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP), - 1, wxEXPAND, 0); - sizer3 -> Add(SFI_s = new wxRadioButton(this, -1, _("use slant"), wxDefaultPosition, wxDefaultSize, 0), - 1, wxEXPAND, 0); - sizer2 -> Add(sizer3, 0, wxEXPAND | wxLEFT | wxRIGHT, 10); + sizer -> Add(sizer2, 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10); - sizer -> Add(sizer2, 0, wxEXPAND | wxLEFT | wxRIGHT, 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); - sizer3 = new wxBoxSizer(wxHORIZONTAL); - sizer3 -> Add(FFI_i = new wxRadioButton(this, -1, _("use italic"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP), - 1, wxEXPAND, 0); - sizer3 -> Add(FFI_s = new wxRadioButton(this, -1, _("use slant"), wxDefaultPosition, wxDefaultSize, 0), - 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); @@ -746,8 +759,8 @@ class wxHtmlHelpFrameOptionsDialog : public wxDialog { wxBusyCursor bcur; SetFontsToHtmlWin(TestWin, - NormalFont -> GetStringSelection(), SFI_i -> GetValue() ? wxITALIC : wxSLANT, - FixedFont -> GetStringSelection(), FFI_i -> GetValue() ? wxITALIC : wxSLANT, + NormalFont -> GetStringSelection(), + FixedFont -> GetStringSelection(), RadioBox -> GetSelection()); TestWin -> SetPage(_("" "Normal face
(and underlined. Italic face. " @@ -761,14 +774,14 @@ class wxHtmlHelpFrameOptionsDialog : public wxDialog "font size +4
" "

Fixed size face.
bold italic " - "bold italic underlined
" + "bold italic underlined
" "font size -2
" "font size -1
" "font size +0
" "font size +1
" "font size +2
" "font size +3
" - "font size +4" + "font size +4" "")); } @@ -783,7 +796,6 @@ class wxHtmlHelpFrameOptionsDialog : public wxDialog BEGIN_EVENT_TABLE(wxHtmlHelpFrameOptionsDialog, wxDialog) EVT_COMBOBOX(-1, wxHtmlHelpFrameOptionsDialog::OnUpdate) EVT_RADIOBOX(-1, wxHtmlHelpFrameOptionsDialog::OnUpdate) - EVT_RADIOBUTTON(-1, wxHtmlHelpFrameOptionsDialog::OnUpdate) END_EVENT_TABLE() @@ -816,19 +828,13 @@ void wxHtmlHelpFrame::OptionsDialog() if (!m_FixedFace.IsEmpty()) dlg.FixedFont -> SetStringSelection(m_FixedFace); else dlg.FixedFont -> SetSelection(0); dlg.RadioBox -> SetSelection(m_FontSize); - dlg.SFI_i -> SetValue(m_NormalItalic == wxITALIC); - dlg.SFI_s -> SetValue(m_NormalItalic == wxSLANT); - dlg.FFI_i -> SetValue(m_FixedItalic == wxITALIC); - dlg.FFI_s -> SetValue(m_FixedItalic == wxSLANT); dlg.UpdateTestWin(); if (dlg.ShowModal() == wxID_OK) { m_NormalFace = dlg.NormalFont -> GetStringSelection(); m_FixedFace = dlg.FixedFont -> GetStringSelection(); m_FontSize = dlg.RadioBox -> GetSelection(); - m_NormalItalic = dlg.SFI_i -> GetValue() ? wxITALIC : wxSLANT; - m_FixedItalic = dlg.FFI_i -> GetValue() ? wxITALIC : wxSLANT; - SetFontsToHtmlWin(m_HtmlWin, m_NormalFace, m_NormalItalic, m_FixedFace, m_FixedItalic, m_FontSize); + SetFontsToHtmlWin(m_HtmlWin, m_NormalFace, m_FixedFace, m_FontSize); } } @@ -919,11 +925,58 @@ void wxHtmlHelpFrame::OnContentsSel(wxTreeEvent& event) 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)) { @@ -966,6 +1019,9 @@ BEGIN_EVENT_TABLE(wxHtmlHelpFrame, wxFrame) 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()