#include "wx/filedlg.h"
#include "wx/artprov.h"
#include "wx/spinctrl.h"
+#include "wx/dynarray.h"
+#include "wx/choicdlg.h"
// what is considered "small index"?
#define INDEX_IS_SMALL 100
};
+//---------------------------------------------------------------------------
+// wxHtmlHelpFrame::m_mergedIndex
+//---------------------------------------------------------------------------
+
+WX_DEFINE_ARRAY_PTR(const wxHtmlHelpDataItem*, wxHtmlHelpDataItemPtrArray);
+
+struct wxHtmlHelpMergedIndexItem
+{
+ wxHtmlHelpMergedIndexItem *parent;
+ wxString name;
+ wxHtmlHelpDataItemPtrArray items;
+};
+
+WX_DECLARE_OBJARRAY(wxHtmlHelpMergedIndexItem, wxHtmlHelpMergedIndex);
+#include "wx/arrimpl.cpp"
+WX_DEFINE_OBJARRAY(wxHtmlHelpMergedIndex)
+
+void wxHtmlHelpFrame::UpdateMergedIndex()
+{
+ delete m_mergedIndex;
+ m_mergedIndex = new wxHtmlHelpMergedIndex;
+ wxHtmlHelpMergedIndex& merged = *m_mergedIndex;
+
+ const wxHtmlHelpDataItems& items = m_Data->GetIndexArray();
+ size_t len = items.size();
+
+ wxHtmlHelpMergedIndexItem *history[128] = {NULL};
+
+ for (size_t i = 0; i < len; i++)
+ {
+ const wxHtmlHelpDataItem& item = items[i];
+ wxASSERT_MSG( item.level < 128, _T("nested index entries too deep") );
+
+ if (history[item.level] &&
+ history[item.level]->items[0]->name == item.name)
+ {
+ // same index entry as previous one, update list of items
+ history[item.level]->items.Add(&item);
+ }
+ else
+ {
+ // new index entry
+ wxHtmlHelpMergedIndexItem *mi = new wxHtmlHelpMergedIndexItem();
+ mi->name = item.GetIndentedName();
+ mi->items.Add(&item);
+ mi->parent = (item.level == 0) ? NULL : history[item.level - 1];
+ history[item.level] = mi;
+ merged.Add(mi);
+ }
+ }
+}
+
//---------------------------------------------------------------------------
// wxHtmlHelpFrame
if (data)
{
m_Data = data;
- m_DataCreated = FALSE;
+ m_DataCreated = false;
} else
{
m_Data = new wxHtmlHelpData();
- m_DataCreated = TRUE;
+ m_DataCreated = true;
}
m_ContentsBox = NULL;
m_SearchCaseSensitive = NULL;
m_SearchWholeWords = NULL;
+ m_mergedIndex = NULL;
+
m_Config = NULL;
m_ConfigRoot = wxEmptyString;
m_Cfg.w = 700;
m_Cfg.h = 480;
m_Cfg.sashpos = 240;
- m_Cfg.navig_on = TRUE;
+ m_Cfg.navig_on = true;
m_NormalFonts = m_FixedFonts = NULL;
m_NormalFace = m_FixedFace = wxEmptyString;
#endif
m_PagesHash = NULL;
- m_UpdateContents = TRUE;
+ m_UpdateContents = true;
m_helpController = (wxHelpControllerBase*) NULL;
}
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, wxT("wxHtmlHelp"));
GetPosition(&m_Cfg.x, &m_Cfg.y);
wxMenu* helpMenu = new wxMenu;
helpMenu->Append(wxID_ABOUT, _("&About..."));
+ // Ensures we don't get an empty help menu
+ helpMenu->Append(wxID_HELP_CONTENTS, _("&About..."));
menuBar->Append(fileMenu,_("&File"));
menuBar->Append(helpMenu,_("&Help"));
int notebook_page = 0;
+#if wxUSE_STATUSBAR
CreateStatusBar();
+#endif // wxUSE_STATUSBAR
#if wxUSE_TOOLBAR
// toolbar?
m_Splitter = new wxSplitterWindow(this);
m_HtmlWin = new wxHtmlHelpHtmlWindow(this, m_Splitter);
- m_NavigPan = new wxPanel(m_Splitter, -1);
+ m_NavigPan = new wxPanel(m_Splitter, wxID_ANY);
m_NavigNotebook = new wxNotebook(m_NavigPan, wxID_HTML_NOTEBOOK,
wxDefaultPosition, wxDefaultSize);
- wxNotebookSizer *nbs = new wxNotebookSizer(m_NavigNotebook);
-
+
navigSizer = new wxBoxSizer(wxVERTICAL);
- navigSizer->Add(nbs, 1, wxEXPAND);
+ navigSizer->Add(m_NavigNotebook, 1, wxEXPAND);
- m_NavigPan->SetAutoLayout(TRUE);
m_NavigPan->SetSizer(navigSizer);
}
else
}
m_HtmlWin->SetRelatedFrame(this, m_TitleFormat);
+#if wxUSE_STATUSBAR
m_HtmlWin->SetRelatedStatusBar(0);
+#endif // wxUSE_STATUSBAR
if ( m_Config )
m_HtmlWin->ReadCustomization(m_Config, m_ConfigRoot);
{
wxWindow *dummy = new wxPanel(m_NavigNotebook, wxID_HTML_INDEXPAGE);
wxSizer *topsizer = new wxBoxSizer(wxVERTICAL);
-
+
topsizer->Add(0, 10);
-
- dummy->SetAutoLayout(TRUE);
+
dummy->SetSizer(topsizer);
if ( style & wxHF_BOOKMARKS )
{
- m_Bookmarks = new wxComboBox(dummy, wxID_HTML_BOOKMARKSLIST,
+ m_Bookmarks = new wxComboBox(dummy, wxID_HTML_BOOKMARKSLIST,
wxEmptyString,
- wxDefaultPosition, wxDefaultSize,
+ wxDefaultPosition, wxDefaultSize,
0, NULL, wxCB_READONLY | wxCB_SORT);
m_Bookmarks->Append(_("(bookmarks)"));
for (unsigned i = 0; i < m_BookmarksNames.GetCount(); i++)
m_Bookmarks->SetSelection(0);
wxBitmapButton *bmpbt1, *bmpbt2;
- bmpbt1 = new wxBitmapButton(dummy, wxID_HTML_BOOKMARKSADD,
- wxArtProvider::GetBitmap(wxART_ADD_BOOKMARK,
+ bmpbt1 = new wxBitmapButton(dummy, wxID_HTML_BOOKMARKSADD,
+ wxArtProvider::GetBitmap(wxART_ADD_BOOKMARK,
wxART_HELP_BROWSER));
- bmpbt2 = new wxBitmapButton(dummy, wxID_HTML_BOOKMARKSREMOVE,
- wxArtProvider::GetBitmap(wxART_DEL_BOOKMARK,
+ bmpbt2 = new wxBitmapButton(dummy, wxID_HTML_BOOKMARKSREMOVE,
+ wxArtProvider::GetBitmap(wxART_DEL_BOOKMARK,
wxART_HELP_BROWSER));
#if wxUSE_TOOLTIPS
bmpbt1->SetToolTip(_("Add current page to bookmarks"));
#endif // wxUSE_TOOLTIPS
wxSizer *sizer = new wxBoxSizer(wxHORIZONTAL);
-
+
sizer->Add(m_Bookmarks, 1, wxALIGN_CENTRE_VERTICAL | wxRIGHT, 5);
sizer->Add(bmpbt1, 0, wxALIGN_CENTRE_VERTICAL | wxRIGHT, 2);
sizer->Add(bmpbt2, 0, wxALIGN_CENTRE_VERTICAL, 0);
-
+
topsizer->Add(sizer, 0, wxEXPAND | wxLEFT | wxBOTTOM | wxRIGHT, 10);
}
m_ContentsBox = new wxTreeCtrl(dummy, wxID_HTML_TREECTRL,
wxDefaultPosition, wxDefaultSize,
- wxSUNKEN_BORDER |
+ wxSUNKEN_BORDER |
wxTR_HAS_BUTTONS | wxTR_HIDE_ROOT |
wxTR_LINES_AT_ROOT);
m_ContentsBox->AssignImageList(ContentsImageList);
-
+
topsizer->Add(m_ContentsBox, 1,
wxEXPAND | wxLEFT | wxBOTTOM | wxRIGHT,
2);
// index listbox panel?
if ( style & wxHF_INDEX )
{
- wxWindow *dummy = new wxPanel(m_NavigNotebook, wxID_HTML_INDEXPAGE);
+ wxWindow *dummy = new wxPanel(m_NavigNotebook, wxID_HTML_INDEXPAGE);
wxSizer *topsizer = new wxBoxSizer(wxVERTICAL);
- dummy->SetAutoLayout(TRUE);
dummy->SetSizer(topsizer);
- m_IndexText = new wxTextCtrl(dummy, wxID_HTML_INDEXTEXT, wxEmptyString,
- wxDefaultPosition, wxDefaultSize,
+ m_IndexText = new wxTextCtrl(dummy, wxID_HTML_INDEXTEXT, wxEmptyString,
+ wxDefaultPosition, wxDefaultSize,
wxTE_PROCESS_ENTER);
m_IndexButton = new wxButton(dummy, wxID_HTML_INDEXBUTTON, _("Find"));
- m_IndexButtonAll = new wxButton(dummy, wxID_HTML_INDEXBUTTONALL,
+ m_IndexButtonAll = new wxButton(dummy, wxID_HTML_INDEXBUTTONALL,
_("Show all"));
- m_IndexCountInfo = new wxStaticText(dummy, wxID_HTML_COUNTINFO,
+ m_IndexCountInfo = new wxStaticText(dummy, wxID_HTML_COUNTINFO,
wxEmptyString, wxDefaultPosition,
- wxDefaultSize,
+ wxDefaultSize,
wxALIGN_RIGHT | wxST_NO_AUTORESIZE);
- m_IndexList = new wxListBox(dummy, wxID_HTML_INDEXLIST,
- wxDefaultPosition, wxDefaultSize,
+ m_IndexList = new wxListBox(dummy, wxID_HTML_INDEXLIST,
+ wxDefaultPosition, wxDefaultSize,
0, NULL, wxLB_SINGLE);
#if wxUSE_TOOLTIPS
wxSizer *btsizer = new wxBoxSizer(wxHORIZONTAL);
btsizer->Add(m_IndexButton, 0, wxRIGHT, 2);
btsizer->Add(m_IndexButtonAll);
- topsizer->Add(btsizer, 0,
+ topsizer->Add(btsizer, 0,
wxALIGN_RIGHT | wxLEFT | wxRIGHT | wxBOTTOM, 10);
topsizer->Add(m_IndexCountInfo, 0, wxEXPAND | wxLEFT | wxRIGHT, 2);
topsizer->Add(m_IndexList, 1, wxEXPAND | wxALL, 2);
// search list panel?
if ( style & wxHF_SEARCH )
{
- wxWindow *dummy = new wxPanel(m_NavigNotebook, wxID_HTML_INDEXPAGE);
+ wxWindow *dummy = new wxPanel(m_NavigNotebook, wxID_HTML_INDEXPAGE);
wxSizer *sizer = new wxBoxSizer(wxVERTICAL);
- dummy->SetAutoLayout(TRUE);
dummy->SetSizer(sizer);
- m_SearchText = new wxTextCtrl(dummy, wxID_HTML_SEARCHTEXT,
- wxEmptyString,
- wxDefaultPosition, wxDefaultSize,
+ m_SearchText = new wxTextCtrl(dummy, wxID_HTML_SEARCHTEXT,
+ wxEmptyString,
+ wxDefaultPosition, wxDefaultSize,
wxTE_PROCESS_ENTER);
- m_SearchChoice = new wxChoice(dummy, wxID_HTML_SEARCHCHOICE,
+ m_SearchChoice = new wxChoice(dummy, wxID_HTML_SEARCHCHOICE,
wxDefaultPosition, wxDefaultSize);
- m_SearchCaseSensitive = new wxCheckBox(dummy, -1, _("Case sensitive"));
- m_SearchWholeWords = new wxCheckBox(dummy, -1, _("Whole words only"));
+ m_SearchCaseSensitive = new wxCheckBox(dummy, wxID_ANY, _("Case sensitive"));
+ m_SearchWholeWords = new wxCheckBox(dummy, wxID_ANY, _("Whole words only"));
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
- m_SearchList = new wxListBox(dummy, wxID_HTML_SEARCHLIST,
- wxDefaultPosition, wxDefaultSize,
+ m_SearchList = new wxListBox(dummy, wxID_HTML_SEARCHLIST,
+ wxDefaultPosition, wxDefaultSize,
0, NULL, wxLB_SINGLE);
-
+
sizer->Add(m_SearchText, 0, wxEXPAND | wxALL, 10);
sizer->Add(m_SearchChoice, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 10);
sizer->Add(m_SearchCaseSensitive, 0, wxLEFT | wxRIGHT, 10);
m_SearchPage = notebook_page;
}
- m_HtmlWin->Show(TRUE);
+ m_HtmlWin->Show();
RefreshLists();
if ( m_Cfg.navig_on )
{
- m_NavigPan->Show(TRUE);
+ m_NavigPan->Show();
m_Splitter->SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos);
}
else
{
- m_NavigPan->Show(FALSE);
+ m_NavigPan->Show(false);
m_Splitter->Initialize(m_HtmlWin);
}
}
-
+
// Reduce flicker by updating the splitter pane sizes before the
// frame is shown
wxSizeEvent sizeEvent(GetSize(), GetId());
ProcessEvent(sizeEvent);
-
+
m_Splitter->UpdateSize();
-
- return TRUE;
+
+ return true;
}
wxHtmlHelpFrame::~wxHtmlHelpFrame()
{
+ delete m_mergedIndex;
+
// PopEventHandler(); // wxhtmlhelpcontroller (not any more!)
if (m_DataCreated)
delete m_Data;
if (m_NormalFonts) delete m_NormalFonts;
if (m_FixedFonts) delete m_FixedFonts;
- if (m_PagesHash)
+ if (m_PagesHash)
{
WX_CLEAR_HASH_TABLE(*m_PagesHash);
delete m_PagesHash;
#if wxUSE_TOOLBAR
void wxHtmlHelpFrame::AddToolbarButtons(wxToolBar *toolBar, int style)
{
- wxBitmap wpanelBitmap =
+ wxBitmap wpanelBitmap =
wxArtProvider::GetBitmap(wxART_HELP_SIDE_PANEL, wxART_HELP_BROWSER);
- wxBitmap wbackBitmap =
+ wxBitmap wbackBitmap =
wxArtProvider::GetBitmap(wxART_GO_BACK, wxART_HELP_BROWSER);
- wxBitmap wforwardBitmap =
+ wxBitmap wforwardBitmap =
wxArtProvider::GetBitmap(wxART_GO_FORWARD, wxART_HELP_BROWSER);
- wxBitmap wupnodeBitmap =
+ wxBitmap wupnodeBitmap =
wxArtProvider::GetBitmap(wxART_GO_TO_PARENT, wxART_HELP_BROWSER);
- wxBitmap wupBitmap =
+ wxBitmap wupBitmap =
wxArtProvider::GetBitmap(wxART_GO_UP, wxART_HELP_BROWSER);
- wxBitmap wdownBitmap =
+ wxBitmap wdownBitmap =
wxArtProvider::GetBitmap(wxART_GO_DOWN, wxART_HELP_BROWSER);
- wxBitmap wopenBitmap =
+ wxBitmap wopenBitmap =
wxArtProvider::GetBitmap(wxART_FILE_OPEN, wxART_HELP_BROWSER);
- wxBitmap wprintBitmap =
+ wxBitmap wprintBitmap =
wxArtProvider::GetBitmap(wxART_PRINT, wxART_HELP_BROWSER);
- wxBitmap woptionsBitmap =
+ wxBitmap woptionsBitmap =
wxArtProvider::GetBitmap(wxART_HELP_SETTINGS, wxART_HELP_BROWSER);
wxASSERT_MSG( (wpanelBitmap.Ok() && wbackBitmap.Ok() &&
toolBar->AddTool(wxID_HTML_PANEL, wpanelBitmap, wxNullBitmap,
- FALSE, -1, -1, (wxObject *) NULL,
+ false, -1, -1, (wxObject *) NULL,
_("Show/hide navigation panel"));
toolBar->AddSeparator();
toolBar->AddTool(wxID_HTML_BACK, wbackBitmap, wxNullBitmap,
- FALSE, -1, -1, (wxObject *) NULL,
+ false, -1, -1, (wxObject *) NULL,
_("Go back"));
toolBar->AddTool(wxID_HTML_FORWARD, wforwardBitmap, wxNullBitmap,
- FALSE, -1, -1, (wxObject *) NULL,
+ false, -1, -1, (wxObject *) NULL,
_("Go forward"));
toolBar->AddSeparator();
toolBar->AddTool(wxID_HTML_UPNODE, wupnodeBitmap, wxNullBitmap,
- FALSE, -1, -1, (wxObject *) NULL,
+ false, -1, -1, (wxObject *) NULL,
_("Go one level up in document hierarchy"));
toolBar->AddTool(wxID_HTML_UP, wupBitmap, wxNullBitmap,
- FALSE, -1, -1, (wxObject *) NULL,
+ false, -1, -1, (wxObject *) NULL,
_("Previous page"));
toolBar->AddTool(wxID_HTML_DOWN, wdownBitmap, wxNullBitmap,
- FALSE, -1, -1, (wxObject *) NULL,
+ false, -1, -1, (wxObject *) NULL,
_("Next page"));
if ((style & wxHF_PRINT) || (style & wxHF_OPEN_FILES))
if (style & wxHF_OPEN_FILES)
toolBar->AddTool(wxID_HTML_OPENFILE, wopenBitmap, wxNullBitmap,
- FALSE, -1, -1, (wxObject *) NULL,
+ false, -1, -1, (wxObject *) NULL,
_("Open HTML document"));
#if wxUSE_PRINTING_ARCHITECTURE
if (style & wxHF_PRINT)
toolBar->AddTool(wxID_HTML_PRINT, wprintBitmap, wxNullBitmap,
- FALSE, -1, -1, (wxObject *) NULL,
+ false, -1, -1, (wxObject *) NULL,
_("Print this page"));
#endif
toolBar->AddSeparator();
toolBar->AddTool(wxID_HTML_OPTIONS, woptionsBitmap, wxNullBitmap,
- FALSE, -1, -1, (wxObject *) NULL,
+ false, -1, -1, (wxObject *) NULL,
_("Display options dialog"));
}
#endif //wxUSE_TOOLBAR
{
m_HtmlWin->LoadPage(url);
NotifyPageChanged();
- return TRUE;
+ return true;
}
- return FALSE;
+
+ return false;
}
bool wxHtmlHelpFrame::Display(const int id)
{
m_HtmlWin->LoadPage(url);
NotifyPageChanged();
- return TRUE;
+ return true;
}
- return FALSE;
+
+ return false;
}
bool wxHtmlHelpFrame::DisplayContents()
{
if (! m_ContentsBox)
- return FALSE;
+ return false;
+
if (!m_Splitter->IsSplit())
{
- m_NavigPan->Show(TRUE);
- m_HtmlWin->Show(TRUE);
+ m_NavigPan->Show();
+ m_HtmlWin->Show();
m_Splitter->SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos);
- m_Cfg.navig_on = TRUE;
+ m_Cfg.navig_on = true;
}
+
m_NavigNotebook->SetSelection(0);
+
if (m_Data->GetBookRecArray().GetCount() > 0)
{
wxHtmlBookRecord& book = m_Data->GetBookRecArray()[0];
if (!book.GetStart().IsEmpty())
m_HtmlWin->LoadPage(book.GetFullPath(book.GetStart()));
}
- return TRUE;
+
+ return true;
}
bool wxHtmlHelpFrame::DisplayIndex()
{
if (! m_IndexList)
- return FALSE;
+ return false;
+
if (!m_Splitter->IsSplit())
{
- m_NavigPan->Show(TRUE);
- m_HtmlWin->Show(TRUE);
+ m_NavigPan->Show();
+ m_HtmlWin->Show();
m_Splitter->SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos);
}
+
m_NavigNotebook->SetSelection(1);
+
if (m_Data->GetBookRecArray().GetCount() > 0)
{
wxHtmlBookRecord& book = m_Data->GetBookRecArray()[0];
if (!book.GetStart().IsEmpty())
m_HtmlWin->LoadPage(book.GetFullPath(book.GetStart()));
}
- return TRUE;
+
+ return true;
}
+void wxHtmlHelpFrame::DisplayIndexItem(const wxHtmlHelpMergedIndexItem *it)
+{
+ if (it->items.size() == 1)
+ {
+ if (!it->items[0]->page.empty())
+ {
+ m_HtmlWin->LoadPage(it->items[0]->GetFullPath());
+ NotifyPageChanged();
+ }
+ }
+ else
+ {
+ wxBusyCursor busy_cursor;
+
+ // more pages associated with this index item -- let the user choose
+ // which one she/he wants from a list:
+ wxArrayString arr;
+ size_t len = it->items.size();
+ for (size_t i = 0; i < len; i++)
+ {
+ wxString page = it->items[i]->page;
+ // try to find page's title in contents:
+ const wxHtmlHelpDataItems& contents = m_Data->GetContentsArray();
+ size_t clen = contents.size();
+ for (size_t j = 0; j < clen; j++)
+ {
+ if (contents[j].page == page)
+ {
+ page = contents[j].name;
+ break;
+ }
+ }
+ arr.push_back(page);
+ }
+
+ wxSingleChoiceDialog dlg(this,
+ _("Please choose the page to display:"),
+ _("Help Topics"),
+ arr, NULL, wxCHOICEDLG_STYLE & ~wxCENTRE);
+ if (dlg.ShowModal() == wxID_OK)
+ {
+ m_HtmlWin->LoadPage(it->items[dlg.GetSelection()]->GetFullPath());
+ NotifyPageChanged();
+ }
+ }
+}
bool wxHtmlHelpFrame::KeywordSearch(const wxString& keyword,
if (!m_Splitter->IsSplit())
{
- m_NavigPan->Show(TRUE);
- m_HtmlWin->Show(TRUE);
+ m_NavigPan->Show();
+ m_HtmlWin->Show();
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);
+ m_SearchButton->Disable();
if (m_SearchChoice->GetSelection() != 0)
book = m_SearchChoice->GetStringSelection();
m_SearchWholeWords->GetValue(),
book);
+#if wxUSE_PROGRESSDLG
wxProgressDialog progress(_("Searching..."),
_("No matching page found yet"),
status.GetMaxIndex(), this,
wxPD_APP_MODAL | wxPD_CAN_ABORT | wxPD_AUTO_HIDE);
+#endif
int curi;
while (status.IsActive())
{
curi = status.GetCurIndex();
- if (curi % 32 == 0 && progress.Update(curi) == FALSE)
+ if (curi % 32 == 0
+#if wxUSE_PROGRESSDLG
+ && !progress.Update(curi)
+#endif
+ )
break;
if (status.Search())
{
foundstr.Printf(_("Found %i matches"), ++foundcnt);
+#if wxUSE_PROGRESSDLG
progress.Update(status.GetCurIndex(), foundstr);
- m_SearchList->Append(status.GetName(), status.GetContentsItem());
+#endif
+ m_SearchList->Append(status.GetName(), (void*)status.GetCurItem());
}
}
- m_SearchButton->Enable(TRUE);
+ m_SearchButton->Enable();
m_SearchText->SetSelection(0, keyword.Length());
m_SearchText->SetFocus();
}
{
m_NavigNotebook->SetSelection(m_IndexPage);
m_IndexList->Clear();
- m_IndexButton->Enable(false);
- m_IndexButtonAll->Enable(false);
+ m_IndexButton->Disable();
+ m_IndexButtonAll->Disable();
m_IndexText->SetValue(keyword);
wxCommandEvent dummy;
OnIndexFind(dummy); // what a hack...
- m_IndexButton->Enable(true);
- m_IndexButtonAll->Enable(true);
+ m_IndexButton->Enable();
+ m_IndexButtonAll->Enable();
foundcnt = m_IndexList->GetCount();
}
if (foundcnt)
{
- wxHtmlContentsItem *it;
switch ( mode )
{
default:
// fall back
case wxHELP_SEARCH_ALL:
- it = (wxHtmlContentsItem*) m_SearchList->GetClientData(0);
+ {
+ wxHtmlHelpDataItem *it =
+ (wxHtmlHelpDataItem*) m_SearchList->GetClientData(0);
+ if (it)
+ {
+ m_HtmlWin->LoadPage(it->GetFullPath());
+ NotifyPageChanged();
+ }
break;
+ }
case wxHELP_SEARCH_INDEX:
- it = (wxHtmlContentsItem*) m_IndexList->GetClientData(0);
+ {
+ wxHtmlHelpMergedIndexItem* it =
+ (wxHtmlHelpMergedIndexItem*) m_IndexList->GetClientData(0);
+ if (it)
+ DisplayIndexItem(it);
break;
+ }
}
- if (it)
- {
- m_HtmlWin->LoadPage(it->GetFullPath());
- NotifyPageChanged();
- }
}
return foundcnt > 0;
WX_CLEAR_HASH_TABLE(*m_PagesHash);
delete m_PagesHash;
}
- m_PagesHash = new wxHashTable(wxKEY_STRING, 2 * m_Data->GetContentsCnt());
-
- int cnt = m_Data->GetContentsCnt();
- int i;
+
+ const wxHtmlHelpDataItems& contents = m_Data->GetContentsArray();
+
+ size_t cnt = contents.size();
- wxHtmlContentsItem *it;
+ m_PagesHash = new wxHashTable(wxKEY_STRING, 2 * cnt);
const int MAX_ROOTS = 64;
wxTreeItemId roots[MAX_ROOTS];
// set its icon accordingly
bool imaged[MAX_ROOTS];
m_ContentsBox->DeleteAllItems();
-
+
roots[0] = m_ContentsBox->AddRoot(_("(Help)"));
- imaged[0] = TRUE;
+ imaged[0] = true;
- for (it = m_Data->GetContents(), i = 0; i < cnt; i++, it++)
+ for (size_t i = 0; i < cnt; i++)
{
+ wxHtmlHelpDataItem *it = &contents[i];
// Handle books:
- if (it->m_Level == 0)
+ if (it->level == 0)
{
if (m_hfStyle & wxHF_MERGE_BOOKS)
// VS: we don't want book nodes, books' content should
else
{
roots[1] = m_ContentsBox->AppendItem(roots[0],
- it->m_Name, IMG_Book, -1,
+ it->name, IMG_Book, -1,
new wxHtmlHelpTreeItemData(i));
- m_ContentsBox->SetItemBold(roots[1], TRUE);
+ m_ContentsBox->SetItemBold(roots[1], true);
}
- imaged[1] = TRUE;
+ imaged[1] = true;
}
// ...and their contents:
else
{
- roots[it->m_Level + 1] = m_ContentsBox->AppendItem(
- roots[it->m_Level], it->m_Name, IMG_Page,
+ roots[it->level + 1] = m_ContentsBox->AppendItem(
+ roots[it->level], it->name, IMG_Page,
-1, new wxHtmlHelpTreeItemData(i));
- imaged[it->m_Level + 1] = FALSE;
+ imaged[it->level + 1] = false;
}
m_PagesHash->Put(it->GetFullPath(),
- new wxHtmlHelpHashData(i, roots[it->m_Level + 1]));
+ new wxHtmlHelpHashData(i, roots[it->level + 1]));
// Set the icon for the node one level up in the hiearachy,
// unless already done (see comment above imaged[] declaration)
- if (!imaged[it->m_Level])
+ if (!imaged[it->level])
{
int image = IMG_Folder;
if (m_hfStyle & wxHF_ICONS_BOOK)
image = IMG_Book;
else if (m_hfStyle & wxHF_ICONS_BOOK_CHAPTER)
- image = (it->m_Level == 1) ? IMG_Book : IMG_Folder;
- m_ContentsBox->SetItemImage(roots[it->m_Level], image);
- m_ContentsBox->SetItemImage(roots[it->m_Level], image,
+ image = (it->level == 1) ? IMG_Book : IMG_Folder;
+ m_ContentsBox->SetItemImage(roots[it->level], image);
+ m_ContentsBox->SetItemImage(roots[it->level], image,
wxTreeItemIcon_Selected);
- imaged[it->m_Level] = TRUE;
+ imaged[it->level] = true;
}
}
}
m_IndexList->Clear();
- int cnt = m_Data->GetIndexCnt();
+ size_t cnt = m_mergedIndex->size();
wxString cnttext;
- if (cnt > INDEX_IS_SMALL) cnttext.Printf(_("%i of %i"), 0, cnt);
- else cnttext.Printf(_("%i of %i"), cnt, cnt);
+ if (cnt > INDEX_IS_SMALL)
+ cnttext.Printf(_("%i of %i"), 0, cnt);
+ else
+ cnttext.Printf(_("%i of %i"), cnt, cnt);
m_IndexCountInfo->SetLabel(cnttext);
- if (cnt > INDEX_IS_SMALL) return;
+ if (cnt > INDEX_IS_SMALL)
+ return;
- wxHtmlContentsItem* index = m_Data->GetIndex();
-
- for (int i = 0; i < cnt; i++)
- m_IndexList->Append(index[i].m_Name, (char*)(index + i));
+ for (size_t i = 0; i < cnt; i++)
+ m_IndexList->Append((*m_mergedIndex)[i].name,
+ (char*)(&(*m_mergedIndex)[i]));
}
void wxHtmlHelpFrame::CreateSearch()
void wxHtmlHelpFrame::RefreshLists()
{
+ // Update m_mergedIndex:
+ UpdateMergedIndex();
+ // Update the controls
CreateContents();
CreateIndex();
CreateSearch();
wxSpinCtrl *FontSize;
wxHtmlWindow *TestWin;
- wxHtmlHelpFrameOptionsDialog(wxWindow *parent)
- : wxDialog(parent, -1, wxString(_("Help Browser Options")))
+ wxHtmlHelpFrameOptionsDialog(wxWindow *parent)
+ : wxDialog(parent, wxID_ANY, wxString(_("Help Browser Options")))
{
wxBoxSizer *topsizer = new wxBoxSizer(wxVERTICAL);
wxFlexGridSizer *sizer = new wxFlexGridSizer(2, 3, 2, 5);
- sizer->Add(new wxStaticText(this, -1, _("Normal font:")));
- sizer->Add(new wxStaticText(this, -1, _("Fixed font:")));
- sizer->Add(new wxStaticText(this, -1, _("Font size:")));
+ sizer->Add(new wxStaticText(this, wxID_ANY, _("Normal font:")));
+ sizer->Add(new wxStaticText(this, wxID_ANY, _("Fixed font:")));
+ sizer->Add(new wxStaticText(this, wxID_ANY, _("Font size:")));
- sizer->Add(NormalFont = new wxComboBox(this, -1, wxEmptyString, wxDefaultPosition,
- wxSize(200, 200),
+ sizer->Add(NormalFont = new wxComboBox(this, wxID_ANY, wxEmptyString, wxDefaultPosition,
+ wxSize(200, -1),
0, NULL, wxCB_DROPDOWN | wxCB_READONLY));
- sizer->Add(FixedFont = new wxComboBox(this, -1, wxEmptyString, wxDefaultPosition,
- wxSize(200, 200),
+ sizer->Add(FixedFont = new wxComboBox(this, wxID_ANY, wxEmptyString, wxDefaultPosition,
+ wxSize(200, -1),
0, NULL, wxCB_DROPDOWN | wxCB_READONLY));
- sizer->Add(FontSize = new wxSpinCtrl(this, -1));
+ sizer->Add(FontSize = new wxSpinCtrl(this, wxID_ANY));
FontSize->SetRange(2, 100);
topsizer->Add(sizer, 0, wxLEFT|wxRIGHT|wxTOP, 10);
- topsizer->Add(new wxStaticText(this, -1, _("Preview:")),
+ topsizer->Add(new wxStaticText(this, wxID_ANY, _("Preview:")),
0, wxLEFT | wxTOP, 10);
- topsizer->Add(TestWin = new wxHtmlWindow(this, -1, wxDefaultPosition, wxSize(20, 150),
+ topsizer->Add(TestWin = new wxHtmlWindow(this, wxID_ANY, wxDefaultPosition, wxSize(20, 150),
wxHW_SCROLLBAR_AUTO | wxSUNKEN_BORDER),
1, wxEXPAND | wxLEFT|wxTOP|wxRIGHT, 10);
sizer2->Add(new wxButton(this, wxID_CANCEL, _("Cancel")), 0, wxALL, 10);
topsizer->Add(sizer2, 0, wxALIGN_RIGHT);
- SetAutoLayout(TRUE);
SetSizer(topsizer);
topsizer->Fit(this);
Centre(wxBOTH);
};
BEGIN_EVENT_TABLE(wxHtmlHelpFrameOptionsDialog, wxDialog)
- EVT_COMBOBOX(-1, wxHtmlHelpFrameOptionsDialog::OnUpdate)
- EVT_SPINCTRL(-1, wxHtmlHelpFrameOptionsDialog::OnUpdateSpin)
+ EVT_COMBOBOX(wxID_ANY, wxHtmlHelpFrameOptionsDialog::OnUpdate)
+ EVT_SPINCTRL(wxID_ANY, wxHtmlHelpFrameOptionsDialog::OnUpdateSpin)
END_EVENT_TABLE()
void wxHtmlHelpFrame::OptionsDialog()
enu.EnumerateFacenames();
m_NormalFonts = new wxArrayString;
*m_NormalFonts = *enu.GetFacenames();
- m_NormalFonts->Sort(wxStringSortAscending);
+ m_NormalFonts->Sort(); // ascending sort
}
if (m_FixedFonts == NULL)
{
wxFontEnumerator enu;
- enu.EnumerateFacenames(wxFONTENCODING_SYSTEM, TRUE);
+ enu.EnumerateFacenames(wxFONTENCODING_SYSTEM, true /*enum fixed width only*/);
m_FixedFonts = new wxArrayString;
*m_FixedFonts = *enu.GetFacenames();
- m_FixedFonts->Sort(wxStringSortAscending);
+ m_FixedFonts->Sort(); // ascending sort
}
-
+
// VS: We want to show the font that is actually used by wxHtmlWindow.
// If customization dialog wasn't used yet, facenames are empty and
// wxHtmlWindow uses default fonts -- let's find out what they
// are so that we can pass them to the dialog:
if (m_NormalFace.empty())
{
- wxFont fnt(m_FontSize, wxSWISS, wxNORMAL, wxNORMAL, FALSE);
+ wxFont fnt(m_FontSize, wxSWISS, wxNORMAL, wxNORMAL, false);
m_NormalFace = fnt.GetFaceName();
}
if (m_FixedFace.empty())
{
- wxFont fnt(m_FontSize, wxMODERN, wxNORMAL, wxNORMAL, FALSE);
+ wxFont fnt(m_FontSize, wxMODERN, wxNORMAL, wxNORMAL, false);
m_FixedFace = fnt.GetFaceName();
}
if (ha)
{
bool olduc = m_UpdateContents;
- m_UpdateContents = FALSE;
+ m_UpdateContents = false;
m_ContentsBox->SelectItem(ha->m_Id);
m_ContentsBox->EnsureVisible(ha->m_Id);
m_UpdateContents = olduc;
ha = (wxHtmlHelpHashData*) m_PagesHash->Get(m_HtmlWin->GetOpenedPage() + wxT("#") + an);
if (ha && ha->m_Index > 0)
{
- wxHtmlContentsItem *it = m_Data->GetContents() + (ha->m_Index - 1);
- if (it->m_Page[0] != 0)
+ const wxHtmlHelpDataItem& it = m_Data->GetContentsArray()[ha->m_Index - 1];
+ if (!it.page.empty())
{
- m_HtmlWin->LoadPage(it->GetFullPath());
+ m_HtmlWin->LoadPage(it.GetFullPath());
NotifyPageChanged();
}
}
ha = (wxHtmlHelpHashData*) m_PagesHash->Get(m_HtmlWin->GetOpenedPage() + wxT("#") + an);
if (ha && ha->m_Index > 0)
{
- int level = m_Data->GetContents()[ha->m_Index].m_Level - 1;
- wxHtmlContentsItem *it;
+ int level =
+ m_Data->GetContentsArray()[ha->m_Index].level - 1;
int ind = ha->m_Index - 1;
- it = m_Data->GetContents() + ind;
- while (ind >= 0 && it->m_Level != level) ind--, it--;
+ const wxHtmlHelpDataItem *it =
+ &m_Data->GetContentsArray()[ind];
+ while (ind >= 0 && it->level != level)
+ {
+ ind--;
+ it = &m_Data->GetContentsArray()[ind];
+ }
if (ind >= 0)
{
- if (it->m_Page[0] != 0)
+ if (!it->page.empty())
{
m_HtmlWin->LoadPage(it->GetFullPath());
NotifyPageChanged();
ha = (wxHtmlHelpHashData*) m_PagesHash->Get(adr);
- if (ha && ha->m_Index < m_Data->GetContentsCnt() - 1)
+ const wxHtmlHelpDataItems& contents = m_Data->GetContentsArray();
+ if (ha && ha->m_Index < (int)contents.size() - 1)
{
- wxHtmlContentsItem *it = m_Data->GetContents() + (ha->m_Index + 1);
+ size_t idx = ha->m_Index + 1;
- while (it->GetFullPath() == adr) it++;
+ while (contents[idx].GetFullPath() == adr) idx++;
- if (it->m_Page[0] != 0)
+ if (!contents[idx].page.empty())
{
- m_HtmlWin->LoadPage(it->GetFullPath());
+ m_HtmlWin->LoadPage(contents[idx].GetFullPath());
NotifyPageChanged();
}
}
{
m_Cfg.sashpos = m_Splitter->GetSashPosition();
m_Splitter->Unsplit(m_NavigPan);
- m_Cfg.navig_on = FALSE;
+ m_Cfg.navig_on = false;
}
else
{
- m_NavigPan->Show(TRUE);
- m_HtmlWin->Show(TRUE);
+ m_NavigPan->Show();
+ m_HtmlWin->Show();
m_Splitter->SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos);
- m_Cfg.navig_on = TRUE;
+ m_Cfg.navig_on = true;
}
}
break;
void wxHtmlHelpFrame::OnContentsSel(wxTreeEvent& event)
{
wxHtmlHelpTreeItemData *pg;
- wxHtmlContentsItem *it;
pg = (wxHtmlHelpTreeItemData*) m_ContentsBox->GetItemData(event.GetItem());
if (pg && m_UpdateContents)
{
- it = m_Data->GetContents() + (pg->m_Id);
- m_UpdateContents = FALSE;
- if (it->m_Page[0] != 0)
- m_HtmlWin->LoadPage(it->GetFullPath());
- m_UpdateContents = TRUE;
+ const wxHtmlHelpDataItems& contents = m_Data->GetContentsArray();
+ m_UpdateContents = false;
+ if (!contents[pg->m_Id].page.empty())
+ m_HtmlWin->LoadPage(contents[pg->m_Id].GetFullPath());
+ m_UpdateContents = true;
}
}
void wxHtmlHelpFrame::OnIndexSel(wxCommandEvent& WXUNUSED(event))
{
- wxHtmlContentsItem *it = (wxHtmlContentsItem*) m_IndexList->GetClientData(m_IndexList->GetSelection());
- if (it->m_Page[0] != 0)
- m_HtmlWin->LoadPage(it->GetFullPath());
- NotifyPageChanged();
+ wxHtmlHelpMergedIndexItem *it = (wxHtmlHelpMergedIndexItem*)
+ m_IndexList->GetClientData(m_IndexList->GetSelection());
+ if (it)
+ DisplayIndexItem(it);
}
else
{
wxBusyCursor bcur;
- const wxChar *cstr = sr.c_str();
- wxChar mybuff[512];
- wxChar *ptr;
- bool first = TRUE;
m_IndexList->Clear();
- int cnt = m_Data->GetIndexCnt();
- wxHtmlContentsItem* index = m_Data->GetIndex();
+ const wxHtmlHelpMergedIndex& index = *m_mergedIndex;
+ size_t cnt = index.size();
int displ = 0;
- for (int i = 0; i < cnt; i++)
+ for (size_t i = 0; i < cnt; i++)
{
- wxStrncpy(mybuff, index[i].m_Name, 512);
- mybuff[511] = _T('\0');
- for (ptr = mybuff; *ptr != 0; ptr++)
- if (*ptr >= _T('A') && *ptr <= _T('Z'))
- *ptr -= (wxChar)(_T('A') - _T('a'));
- if (wxStrstr(mybuff, cstr) != NULL)
+ if (index[i].name.Lower().find(sr) != wxString::npos)
{
- m_IndexList->Append(index[i].m_Name, (char*)(index + i));
- displ++;
- if (first)
+ int pos = m_IndexList->Append(index[i].name,
+ (char*)(&index[i]));
+
+ if (displ++ == 0)
{
- if (index[i].m_Page[0] != 0)
- m_HtmlWin->LoadPage(index[i].GetFullPath());
- NotifyPageChanged();
- first = FALSE;
+ // don't automatically show topic selector if this
+ // item points to multiple pages:
+ if (index[i].items.size() == 1)
+ {
+ m_IndexList->SetSelection(0);
+ DisplayIndexItem(&index[i]);
+ }
+ }
+
+ // if this is nested item of the index, show its parent(s)
+ // as well, otherwise it would not be clear what entry is
+ // shown:
+ wxHtmlHelpMergedIndexItem *parent = index[i].parent;
+ while (parent)
+ {
+ if (pos == 0 ||
+ (index.Index(*(wxHtmlHelpMergedIndexItem*)m_IndexList->GetClientData(pos-1))) < index.Index(*parent))
+ {
+ m_IndexList->Insert(parent->name,
+ pos, (char*)parent);
+ parent = parent->parent;
+ }
+ else break;
}
}
}
wxBusyCursor bcur;
m_IndexList->Clear();
- int cnt = m_Data->GetIndexCnt();
- bool first = TRUE;
- wxHtmlContentsItem* index = m_Data->GetIndex();
+ const wxHtmlHelpMergedIndex& index = *m_mergedIndex;
+ size_t cnt = index.size();
+ bool first = true;
- for (int i = 0; i < cnt; i++)
+ for (size_t i = 0; i < cnt; i++)
{
- m_IndexList->Append(index[i].m_Name, (char*)(index + i));
+ m_IndexList->Append(index[i].name, (char*)(&index[i]));
if (first)
{
- if (index[i].m_Page[0] != 0)
- m_HtmlWin->LoadPage(index[i].GetFullPath());
- NotifyPageChanged();
- first = FALSE;
+ // don't automatically show topic selector if this
+ // item points to multiple pages:
+ if (index[i].items.size() == 1)
+ {
+ DisplayIndexItem(&index[i]);
+ }
+ first = false;
}
}
void wxHtmlHelpFrame::OnSearchSel(wxCommandEvent& WXUNUSED(event))
{
- wxHtmlContentsItem *it = (wxHtmlContentsItem*) m_SearchList->GetClientData(m_SearchList->GetSelection());
+ wxHtmlHelpDataItem *it = (wxHtmlHelpDataItem*) m_SearchList->GetClientData(m_SearchList->GetSelection());
if (it)
{
- if (it->m_Page[0] != 0)
+ if (!it->page.empty())
m_HtmlWin->LoadPage(it->GetFullPath());
NotifyPageChanged();
}
RemoveGrab();
}
#endif
-
+
if (m_Splitter && m_Cfg.navig_on) m_Cfg.sashpos = m_Splitter->GetSashPosition();
if (m_Config)
#ifdef __WXMAC__
void wxHtmlHelpFrame::OnClose(wxCommandEvent& event)
{
- Close(TRUE);
+ Close(true);
}
void wxHtmlHelpFrame::OnAbout(wxCommandEvent& event)
{
- wxMessageBox(wxT("wxWindows HTML Help Viewer (c) 1998-2003, Vaclav Slavik et al"), wxT("HelpView"),
+ wxMessageBox(wxT("wxWidgets HTML Help Viewer (c) 1998-2004, Vaclav Slavik et al"), wxT("HelpView"),
wxICON_INFORMATION|wxOK, this);
}
#endif
#ifdef __WXMAC__
EVT_MENU(wxID_CLOSE, wxHtmlHelpFrame::OnClose)
EVT_MENU(wxID_ABOUT, wxHtmlHelpFrame::OnAbout)
+ EVT_MENU(wxID_HELP_CONTENTS, wxHtmlHelpFrame::OnAbout)
#endif
END_EVENT_TABLE()
projects / wxWidgets.git / blobdiff