#endif
#include "wx/html/helpfrm.h"
+#include "wx/html/helpctrl.h"
#include "wx/notebook.h"
#include "wx/imaglist.h"
#include "wx/treectrl.h"
#include "wx/progdlg.h"
#include "wx/toolbar.h"
#include "wx/fontenum.h"
+#include "wx/stream.h"
+#include "wx/filedlg.h"
// Bitmaps:
#include "bitmaps/whlproot.xpm"
#include "bitmaps/wbkadd.xpm"
#include "bitmaps/wbkdel.xpm"
+#include "bitmaps/wup.xpm"
+#include "bitmaps/wupnode.xpm"
+#include "bitmaps/wdown.xpm"
+#include "bitmaps/wopen.xpm"
+#include "bitmaps/wprint.xpm"
#endif
-#include "wx/stream.h"
-
-// number of times that the contents/index creation progress dialog
-// is updated.
-#define PROGRESS_STEP 40
// what is considered "small index"?
#define INDEX_IS_SMALL 100
class wxHtmlHelpTreeItemData : public wxTreeItemData
{
- private:
- wxString m_Page;
+ public:
+ wxHtmlHelpTreeItemData(int id) : wxTreeItemData()
+ { m_Id = id;}
+
+ int m_Id;
+};
+
+//--------------------------------------------------------------------------
+// wxHtmlHelpHashData (private)
+//--------------------------------------------------------------------------
+
+class wxHtmlHelpHashData : public wxObject
+{
public:
- wxHtmlHelpTreeItemData(wxHtmlContentsItem *it) : wxTreeItemData()
- {
- m_Page = it -> m_Book -> GetBasePath() + it -> m_Page;
- }
- const wxString& GetPage() { return m_Page; }
+ wxHtmlHelpHashData(int index, wxTreeItemId id) : wxObject()
+ { m_Index = index; m_Id = id;}
+
+ int m_Index;
+ wxTreeItemId m_Id;
};
+//--------------------------------------------------------------------------
+// wxHtmlHelpHtmlWindow (private)
+//--------------------------------------------------------------------------
+
+class wxHtmlHelpHtmlWindow : public wxHtmlWindow
+{
+ public:
+ wxHtmlHelpHtmlWindow(wxHtmlHelpFrame *fr, wxWindow *parent) : wxHtmlWindow(parent), m_Frame(fr) {}
+
+ virtual void OnLinkClicked(const wxHtmlLinkInfo& link)
+ {
+ wxHtmlWindow::OnLinkClicked(link);
+ m_Frame -> NotifyPageChanged();
+ }
+
+ private:
+ wxHtmlHelpFrame *m_Frame;
+};
+
//---------------------------------------------------------------------------
m_SearchButton = NULL;
m_SearchText = NULL;
m_SearchChoice = NULL;
+ m_IndexCountInfo = NULL;
m_Splitter = NULL;
m_NavigPan = NULL;
m_HtmlWin = NULL;
m_Bookmarks = NULL;
+ m_SearchCaseSensitive = NULL;
+ m_SearchWholeWords = NULL;
+
m_Config = NULL;
m_ConfigRoot = wxEmptyString;
m_Cfg.navig_on = TRUE;
m_NormalFonts = m_FixedFonts = NULL;
- m_FontSize = 1;
m_NormalFace = m_FixedFace = wxEmptyString;
- m_NormalItalic = m_FixedItalic = wxSLANT;
+ m_FontSize = 1;
+
+#if wxUSE_PRINTING_ARCHITECTURE
+ m_Printer = NULL;
+#endif
+
+ m_PagesHash = NULL;
+ m_UpdateContents = TRUE;
+ m_helpController = (wxHelpControllerBase*) NULL;
}
// Create: builds the GUI components.
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);
if (style & wxHF_TOOLBAR) {
wxToolBar *toolBar = CreateToolBar(wxNO_BORDER | wxTB_HORIZONTAL | wxTB_DOCKABLE);
toolBar->SetMargins( 2, 2 );
-
- toolBar -> AddTool(wxID_HTML_PANEL, wxBITMAP(wpanel), wxNullBitmap,
- FALSE, -1, -1, (wxObject *) NULL,
- _("Show/hide navigation panel"));
- toolBar -> AddSeparator();
- toolBar -> AddTool(wxID_HTML_BACK, wxBITMAP(wback), wxNullBitmap,
- FALSE, -1, -1, (wxObject *) NULL,
- _("Go back to the previous HTML page"));
- toolBar -> AddTool(wxID_HTML_FORWARD, wxBITMAP(wforward), wxNullBitmap,
- FALSE, -1, -1, (wxObject *) NULL,
- _("Go forward to the next HTML page"));
- toolBar -> AddSeparator();
-
- if (style & wxHF_BOOKMARKS) {
- m_Bookmarks = new wxComboBox(toolBar, wxID_HTML_BOOKMARKSLIST, wxEmptyString,
- wxDefaultPosition, wxSize(300,-1), 0, NULL, wxCB_READONLY | wxCB_SORT);
- m_Bookmarks -> Append(_("<bookmarks>"));
- for (unsigned i = 0; i < m_BookmarksNames.GetCount(); i++)
- m_Bookmarks -> Append(m_BookmarksNames[i]);
- m_Bookmarks -> SetSelection(0);
- toolBar -> AddControl(m_Bookmarks);
-#ifdef __WXGTK__
- toolBar -> AddSeparator();
-#endif
- toolBar -> AddTool(wxID_HTML_BOOKMARKSADD, wxBITMAP(wbkadd), wxNullBitmap,
- FALSE, -1, -1, (wxObject *) NULL,
- _("Add current page to bookmarks"));
- toolBar -> AddTool(wxID_HTML_BOOKMARKSREMOVE, wxBITMAP(wbkdel), wxNullBitmap,
- FALSE, -1, -1, (wxObject *) NULL,
- _("Remove current page from bookmarks"));
- }
-
- toolBar -> AddSeparator();
- toolBar -> AddTool(wxID_HTML_OPTIONS, wxBITMAP(woptions), wxNullBitmap,
- FALSE, -1, -1, (wxObject *) NULL,
- _("Display options dialog"));
-
+ AddToolbarButtons(toolBar, style);
toolBar -> Realize();
}
// right and a notebook containing various pages on the left
m_Splitter = new wxSplitterWindow(this);
- m_HtmlWin = new wxHtmlWindow(m_Splitter);
+ m_HtmlWin = new wxHtmlHelpHtmlWindow(this, m_Splitter);
m_NavigPan = new wxNotebook(m_Splitter, wxID_HTML_NOTEBOOK,
wxDefaultPosition, wxDefaultSize);
} else { // only html window, no notebook with index,contents etc
// contents tree panel?
if (style & wxHF_CONTENTS) {
- m_ContentsBox = new wxTreeCtrl(m_NavigPan, wxID_HTML_TREECTRL,
- wxDefaultPosition, wxDefaultSize,
- wxTR_HAS_BUTTONS | wxSUNKEN_BORDER);
- m_ContentsBox -> SetImageList(m_ContentsImageList);
- m_NavigPan -> AddPage(m_ContentsBox, _("Contents"));
+ wxWindow *dummy = new wxPanel(m_NavigPan, wxID_HTML_INDEXPAGE);
+
+ if (style & wxHF_BOOKMARKS) {
+ wxLayoutConstraints *b1 = new wxLayoutConstraints;
+ wxBitmapButton *bmpbt = new wxBitmapButton(dummy, wxID_HTML_BOOKMARKSREMOVE, wxBITMAP(wbkdel), wxDefaultPosition, wxSize(20,20));
+
+ b1 -> top.SameAs (dummy, wxTop, 10);
+ b1 -> right.SameAs (dummy, wxRight, 10);
+ b1 -> height.AsIs();
+ b1 -> width.AsIs();
+ bmpbt -> SetConstraints(b1);
+
+ wxLayoutConstraints *b2 = new wxLayoutConstraints;
+ wxBitmapButton *bmpbt2 = new wxBitmapButton(dummy, wxID_HTML_BOOKMARKSADD, wxBITMAP(wbkadd), wxDefaultPosition, wxSize(20,20));
+
+ b2 -> top.SameAs (dummy, wxTop, 10);
+ b2 -> right.LeftOf (bmpbt, 2);
+ b2 -> height.AsIs();
+ b2 -> width.AsIs();
+ bmpbt2 -> SetConstraints(b2);
+
+#if wxUSE_TOOLTIPS
+ bmpbt -> SetToolTip(_("Remove current page from bookmarks"));
+ bmpbt2 -> SetToolTip(_("Add current page to bookmarks"));
+#endif //wxUSE_TOOLTIPS
+
+ wxLayoutConstraints *b3 = new wxLayoutConstraints;
+ m_Bookmarks = new wxComboBox(dummy, wxID_HTML_BOOKMARKSLIST, wxEmptyString,
+ wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY | wxCB_SORT);
+ m_Bookmarks -> Append(_("(bookmarks)"));
+ for (unsigned i = 0; i < m_BookmarksNames.GetCount(); i++)
+ m_Bookmarks -> Append(m_BookmarksNames[i]);
+ m_Bookmarks -> SetSelection(0);
+
+ b3 -> centreY.SameAs (bmpbt2, wxCentreY);
+ b3 -> left.SameAs (dummy, wxLeft, 10);
+ b3 -> right.LeftOf (bmpbt2, 5);
+ b3 -> height.AsIs();
+ m_Bookmarks -> SetConstraints(b3);
+
+
+ wxLayoutConstraints *b4 = new wxLayoutConstraints;
+ m_ContentsBox = new wxTreeCtrl(dummy, wxID_HTML_TREECTRL,
+ wxDefaultPosition, wxDefaultSize,
+ wxTR_HAS_BUTTONS | wxSUNKEN_BORDER);
+ m_ContentsBox -> SetImageList(m_ContentsImageList);
+
+ b4 -> top.Below (m_Bookmarks, 10);
+ b4 -> left.SameAs (dummy, wxLeft, 0);
+ b4 -> right.SameAs (dummy, wxRight, 0);
+ b4 -> bottom.SameAs (dummy, wxBottom, 0);
+ m_ContentsBox -> SetConstraints(b4);
+
+ dummy -> SetAutoLayout(TRUE);
+ dummy -> Layout();
+
+ m_NavigPan -> AddPage(dummy, _("Contents"));
+ }
+
+ else
+ {
+ m_ContentsBox = new wxTreeCtrl(m_NavigPan, wxID_HTML_TREECTRL,
+ wxDefaultPosition, wxDefaultSize,
+ wxTR_HAS_BUTTONS | wxSUNKEN_BORDER);
+ m_ContentsBox -> SetImageList(m_ContentsImageList);
+ m_NavigPan -> AddPage(m_ContentsBox, _("Contents"));
+ }
+
m_ContentsPage = notebook_page++;
}
wxLayoutConstraints *b4 = new wxLayoutConstraints;
m_IndexButtonAll = new wxButton(dummy, wxID_HTML_INDEXBUTTONALL, _("Show all"));
- m_IndexButtonAll -> SetToolTip(_("Show all items in index"));
+
b4 -> top.Below (m_IndexText, 10);
b4 -> right.SameAs (dummy, wxRight, 10);
b4 -> width.AsIs();
wxLayoutConstraints *b2 = new wxLayoutConstraints;
m_IndexButton = new wxButton(dummy, wxID_HTML_INDEXBUTTON, _("Find"));
- m_IndexButton -> SetToolTip(_("Display all index items that contain given substring. Note that this is case sensitive, so 'window' and 'Window' is something else!"));
b2 -> top.Below (m_IndexText, 10);
b2 -> right.LeftOf (m_IndexButtonAll, 10);
b2 -> width.AsIs();
b2 -> height.AsIs();
m_IndexButton -> SetConstraints(b2);
+ wxLayoutConstraints *b5 = new wxLayoutConstraints;
+ m_IndexCountInfo = new wxStaticText(dummy, wxID_HTML_COUNTINFO, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT | wxST_NO_AUTORESIZE);
+
+ b5 -> top.Below (m_IndexButton, 5);
+ b5 -> right.SameAs (dummy, wxRight, 10);
+ b5 -> left.SameAs (dummy, wxLeft, 10);
+ b5 -> height.AsIs();
+ m_IndexCountInfo -> SetConstraints(b5);
+
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);
+ m_IndexList = new wxListBox(dummy, wxID_HTML_INDEXLIST, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE);
+ b3 -> top.Below (m_IndexCountInfo, 5);
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. Search is case insensitive."));
+#endif //wxUSE_TOOLTIPS
+
dummy -> SetAutoLayout(TRUE);
dummy -> Layout();
b1 -> height.AsIs();
m_SearchText -> SetConstraints(b1);
- wxLayoutConstraints *b2 = new wxLayoutConstraints;
- m_SearchButton = new wxButton(dummy, wxID_HTML_SEARCHBUTTON, _("Search"));
- m_SearchButton -> SetToolTip(_("Search contents of help book(s) for all occurences of the text you typed above"));
- b2 -> top.Below (m_SearchText, 10);
- b2 -> left.SameAs (dummy, wxLeft, 10);
- b2 -> width.AsIs();
- b2 -> height.AsIs();
- m_SearchButton -> SetConstraints(b2);
-
wxLayoutConstraints *b4 = new wxLayoutConstraints;
m_SearchChoice = new wxChoice(dummy, wxID_HTML_SEARCHCHOICE, wxDefaultPosition,
wxDefaultSize);
b4 -> top.Below (m_SearchText, 10);
- b4 -> left.SameAs (m_SearchButton, wxRight, 10);
+ b4 -> left.SameAs (dummy, wxLeft, 10);
b4 -> right.SameAs (dummy, wxRight, 10);
b4 -> height.AsIs();
m_SearchChoice -> SetConstraints(b4);
+ wxLayoutConstraints *b5 = new wxLayoutConstraints;
+ m_SearchCaseSensitive = new wxCheckBox(dummy, -1, _("Case sensitive"));
+ b5 -> top.Below (m_SearchChoice, 10);
+ b5 -> left.SameAs (dummy, wxLeft, 10);
+ b5 -> width.AsIs();
+ 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 -> width.AsIs();
+ b6 -> height.AsIs ();
+ m_SearchWholeWords -> SetConstraints(b6);
+
+ 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_SearchWholeWords, 0);
+ b2 -> right.SameAs (dummy, wxRight, 10);
+ b2 -> width.AsIs();
+ b2 -> height.AsIs();
+ m_SearchButton -> SetConstraints(b2);
+
wxLayoutConstraints *b3 = new wxLayoutConstraints;
- m_SearchList = new wxListBox(dummy, wxID_HTML_SEARCHLIST, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE | wxLB_ALWAYS_SB);
+ m_SearchList = new wxListBox(dummy, wxID_HTML_SEARCHLIST, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE);
b3 -> top.Below (m_SearchButton, 10);
b3 -> left.SameAs (dummy, wxLeft, 0);
b3 -> right.SameAs (dummy, wxRight, 0);
m_SearchPage = notebook_page++;
}
m_HtmlWin -> Show(TRUE);
-
- //RefreshLists();
+
+ RefreshLists();
// showtime
if (m_NavigPan && m_Splitter) {
wxHtmlHelpFrame::~wxHtmlHelpFrame()
{
+ // PopEventHandler(); // wxhtmlhelpcontroller (not any more!)
delete m_ContentsImageList;
if (m_DataCreated)
delete m_Data;
if (m_NormalFonts) delete m_NormalFonts;
if (m_FixedFonts) delete m_FixedFonts;
+ if (m_PagesHash) delete m_PagesHash;
}
+
+void wxHtmlHelpFrame::AddToolbarButtons(wxToolBar *toolBar, int style)
+{
+ toolBar -> AddTool(wxID_HTML_PANEL, wxBITMAP(wpanel), wxNullBitmap,
+ FALSE, -1, -1, (wxObject *) NULL,
+ _("Show/hide navigation panel"));
+
+ toolBar -> AddSeparator();
+ toolBar -> AddTool(wxID_HTML_BACK, wxBITMAP(wback), wxNullBitmap,
+ FALSE, -1, -1, (wxObject *) NULL,
+ _("Go back"));
+ toolBar -> AddTool(wxID_HTML_FORWARD, wxBITMAP(wforward), wxNullBitmap,
+ FALSE, -1, -1, (wxObject *) NULL,
+ _("Go forward"));
+ toolBar -> AddSeparator();
+
+ toolBar -> AddTool(wxID_HTML_UPNODE, wxBITMAP(wupnode), wxNullBitmap,
+ FALSE, -1, -1, (wxObject *) NULL,
+ _("Go one level up in document hierarchy"));
+ toolBar -> AddTool(wxID_HTML_UP, wxBITMAP(wup), wxNullBitmap,
+ FALSE, -1, -1, (wxObject *) NULL,
+ _("Previous page"));
+ toolBar -> AddTool(wxID_HTML_DOWN, wxBITMAP(wdown), wxNullBitmap,
+ FALSE, -1, -1, (wxObject *) NULL,
+ _("Next page"));
+
+ if ((style & wxHF_PRINT) || (style & wxHF_OPENFILES))
+ toolBar -> AddSeparator();
+
+ if (style & wxHF_OPENFILES)
+ toolBar -> AddTool(wxID_HTML_OPENFILE, wxBITMAP(wopen), wxNullBitmap,
+ FALSE, -1, -1, (wxObject *) NULL,
+ _("Open HTML document"));
+
+#if wxUSE_PRINTING_ARCHITECTURE
+ if (style & wxHF_PRINT)
+ toolBar -> AddTool(wxID_HTML_PRINT, wxBITMAP(wprint), wxNullBitmap,
+ FALSE, -1, -1, (wxObject *) NULL,
+ _("Print this page"));
+#endif
+
+ toolBar -> AddSeparator();
+ toolBar -> AddTool(wxID_HTML_OPTIONS, wxBITMAP(woptions), wxNullBitmap,
+ FALSE, -1, -1, (wxObject *) NULL,
+ _("Display options dialog"));
+}
+
+
+void wxHtmlHelpFrame::SetTitleFormat(const wxString& format)
+{
+ if (m_HtmlWin)
+ m_HtmlWin->SetRelatedFrame(this, format);
+ m_TitleFormat = format;
+}
+
+
bool wxHtmlHelpFrame::Display(const wxString& x)
{
wxString url = m_Data->FindPageByName(x);
if (! url.IsEmpty()) {
m_HtmlWin->LoadPage(url);
+ NotifyPageChanged();
return TRUE;
}
return FALSE;
wxString url = m_Data->FindPageById(id);
if (! url.IsEmpty()) {
m_HtmlWin->LoadPage(url);
+ NotifyPageChanged();
return TRUE;
}
return FALSE;
return TRUE;
}
+
+
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;
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 % 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());
}
- wxYield();
}
m_SearchButton -> Enable(TRUE);
m_SearchText -> SetFocus();
if (foundcnt) {
wxHtmlContentsItem *it = (wxHtmlContentsItem*) m_SearchList -> GetClientData(0);
- if (it) m_HtmlWin -> LoadPage(it -> m_Book -> GetBasePath() + it -> m_Page);
+ if (it)
+ {
+ m_HtmlWin -> LoadPage(it -> m_Book -> GetBasePath() + it -> m_Page);
+ NotifyPageChanged();
+ }
}
return (foundcnt > 0);
}
#define MAX_ROOTS 64
-void wxHtmlHelpFrame::CreateContents(bool show_progress)
+void wxHtmlHelpFrame::CreateContents()
{
if (! m_ContentsBox)
return ;
- wxProgressDialog *progress = NULL;
- wxString proginfo;
-
m_ContentsBox->Clear();
+
+ if (m_PagesHash) delete m_PagesHash;
+ m_PagesHash = new wxHashTable(wxKEY_STRING, 2 * m_Data -> GetContentsCnt());
+ m_PagesHash -> DeleteContents(TRUE);
int cnt = m_Data->GetContentsCnt();
- int div = (cnt / PROGRESS_STEP) + 1;
int i;
wxHtmlContentsItem *it;
- if (show_progress)
- progress = new wxProgressDialog(_("Building contents tree..."), wxEmptyString,
- cnt, this, wxPD_APP_MODAL | wxPD_CAN_ABORT |
- wxPD_AUTO_HIDE);
-
wxTreeItemId roots[MAX_ROOTS];
bool imaged[MAX_ROOTS];
imaged[0] = TRUE;
for (it = m_Data->GetContents(), i = 0; i < cnt; i++, it++) {
- if (show_progress && ((i % div) == 0)) {
- proginfo.Printf(_("Added %d/%d items"), i, cnt);
- if (! progress->Update(i, proginfo))
- break;
- wxYield();
- }
roots[it -> m_Level + 1] = m_ContentsBox -> AppendItem(
roots[it -> m_Level], it -> m_Name, IMG_Page, -1,
- new wxHtmlHelpTreeItemData(it));
+ new wxHtmlHelpTreeItemData(i));
+ m_PagesHash -> Put(it -> m_Book -> GetBasePath() + it -> m_Page,
+ new wxHtmlHelpHashData(i, roots[it -> m_Level + 1]));
if (it -> m_Level == 0) {
m_ContentsBox -> SetItemBold(roots[1], TRUE);
imaged[it -> m_Level] = TRUE;
}
}
- if (show_progress)
- delete progress;
m_ContentsBox -> Expand(roots[0]);
}
-void wxHtmlHelpFrame::CreateIndex(bool show_progress)
+void wxHtmlHelpFrame::CreateIndex()
{
if (! m_IndexList)
return ;
- wxProgressDialog *progress = NULL;
- wxString proginfo;
-
m_IndexList->Clear();
int cnt = m_Data->GetIndexCnt();
+ wxString cnttext;
+ 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;
- int div = (cnt / PROGRESS_STEP) + 1;
-
wxHtmlContentsItem* index = m_Data->GetIndex();
- if (show_progress)
- progress = new wxProgressDialog(_("Building index list..."), wxEmptyString,
- cnt, this, wxPD_APP_MODAL | wxPD_CAN_ABORT |
- wxPD_AUTO_HIDE);
- for (int i = 0; i < cnt; i++) {
- if (show_progress && ((i % div) == 0)) {
- proginfo.Printf(_("Added %d/%d items"), i, cnt);
- if (! progress->Update(i, proginfo))
- break;
- wxYield();
- }
+ for (int i = 0; i < cnt; i++)
m_IndexList -> Append(index[i].m_Name, (char*)(index + i));
- }
-
- if (show_progress)
- delete progress;
}
void wxHtmlHelpFrame::CreateSearch()
return ;
m_SearchList -> Clear();
m_SearchChoice -> Clear();
- m_SearchChoice -> Append(_("all books"));
+ m_SearchChoice -> Append(_("Search in all books"));
const wxHtmlBookRecArray& bookrec = m_Data->GetBookRecArray();
int i, cnt = bookrec.GetCount();
for (i = 0; i < cnt; i++)
}
-void wxHtmlHelpFrame::RefreshLists(bool show_progress)
+void wxHtmlHelpFrame::RefreshLists()
{
- CreateContents(show_progress);
- CreateIndex(show_progress);
+ CreateContents();
+ CreateIndex();
CreateSearch();
}
if (path != wxEmptyString) {
oldpath = cfg -> GetPath();
- cfg -> SetPath(path);
+ cfg -> SetPath(_T("/") + path);
}
- m_Cfg.navig_on = cfg -> Read("hcNavigPanel", m_Cfg.navig_on) != 0;
- m_Cfg.sashpos = cfg -> Read("hcSashPos", m_Cfg.sashpos);
- m_Cfg.x = cfg -> Read("hcX", m_Cfg.x);
- m_Cfg.y = cfg -> Read("hcY", m_Cfg.y);
- m_Cfg.w = cfg -> Read("hcW", m_Cfg.w);
- m_Cfg.h = cfg -> Read("hcH", m_Cfg.h);
+ m_Cfg.navig_on = cfg -> Read(wxT("hcNavigPanel"), m_Cfg.navig_on) != 0;
+ m_Cfg.sashpos = cfg -> Read(wxT("hcSashPos"), m_Cfg.sashpos);
+ m_Cfg.x = cfg -> Read(wxT("hcX"), m_Cfg.x);
+ m_Cfg.y = cfg -> Read(wxT("hcY"), m_Cfg.y);
+ m_Cfg.w = cfg -> Read(wxT("hcW"), m_Cfg.w);
+ m_Cfg.h = cfg -> Read(wxT("hcH"), m_Cfg.h);
- 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);
+ m_FixedFace = cfg -> Read(wxT("hcFixedFace"), m_FixedFace);
+ m_NormalFace = cfg -> Read(wxT("hcNormalFace"), m_NormalFace);
+ m_FontSize = cfg -> Read(wxT("hcFontSize"), m_FontSize);
{
int i;
int cnt;
wxString val, s;
- cnt = cfg -> Read("hcBookmarksCnt", 0L);
+ cnt = cfg -> Read(wxT("hcBookmarksCnt"), 0L);
if (cnt != 0) {
m_BookmarksNames.Clear();
m_BookmarksPages.Clear();
if (m_Bookmarks) {
m_Bookmarks -> Clear();
- m_Bookmarks -> Append(_("<bookmarks>"));
+ m_Bookmarks -> Append(_("(bookmarks)"));
}
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);
}
}
if (m_HtmlWin)
- m_HtmlWin->ReadCustomization(cfg, path);
+ m_HtmlWin->ReadCustomization(cfg);
if (path != wxEmptyString)
cfg -> SetPath(oldpath);
if (path != wxEmptyString) {
oldpath = cfg -> GetPath();
- cfg -> SetPath(path);
+ cfg -> SetPath(_T("/") + path);
}
- cfg -> Write("hcNavigPanel", m_Cfg.navig_on);
- cfg -> Write("hcSashPos", (long)m_Cfg.sashpos);
- cfg -> Write("hcX", (long)m_Cfg.x);
- cfg -> Write("hcY", (long)m_Cfg.y);
- cfg -> Write("hcW", (long)m_Cfg.w);
- cfg -> Write("hcH", (long)m_Cfg.h);
- 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);
+ cfg -> Write(wxT("hcNavigPanel"), m_Cfg.navig_on);
+ cfg -> Write(wxT("hcSashPos"), (long)m_Cfg.sashpos);
+ cfg -> Write(wxT("hcX"), (long)m_Cfg.x);
+ cfg -> Write(wxT("hcY"), (long)m_Cfg.y);
+ cfg -> Write(wxT("hcW"), (long)m_Cfg.w);
+ cfg -> Write(wxT("hcH"), (long)m_Cfg.h);
+ cfg -> Write(wxT("hcFixedFace"), m_FixedFace);
+ cfg -> Write(wxT("hcNormalFace"), m_NormalFace);
+ cfg -> Write(wxT("hcFontSize"), (long)m_FontSize);
if (m_Bookmarks) {
int i;
int cnt = m_BookmarksNames.GetCount();
wxString val;
- cfg -> Write("hcBookmarksCnt", (long)cnt);
+ cfg -> Write(wxT("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]);
}
}
if (m_HtmlWin)
- m_HtmlWin->WriteCustomization(cfg, path);
+ m_HtmlWin->WriteCustomization(cfg);
if (path != wxEmptyString)
cfg -> SetPath(oldpath);
-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] =
+ static int f_sizes[5][7] =
{
+ { 6, 7, 9, 12, 14, 16, 19},
{ 8, 9, 12, 14, 16, 19, 22},
{10, 12, 14, 16, 19, 24, 32},
- {14, 16, 18, 24, 32, 38, 45}
+ {14, 16, 18, 24, 32, 38, 45},
+ {16, 20, 24, 32, 38, 45, 50}
};
- win -> SetFonts(scalf, scalit, fixf, fixit, f_sizes[size]);
+ win -> SetFonts(scalf, fixf, f_sizes[size]);
}
{
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;
+ wxString choices[5] = {_("very small"), _("small"), _("medium"), _("large"), _("very large")};
+ wxBoxSizer *topsizer, *sizer, *sizer2;
topsizer = new wxBoxSizer(wxVERTICAL);
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);
sizer2 = new wxStaticBoxSizer( new wxStaticBox(this, -1, _("Fixed font:")), wxVERTICAL);
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|wxTOP, 10);
topsizer -> Add(sizer);
topsizer -> Add(RadioBox = new wxRadioBox(this, -1, _("Font size:"),
- wxDefaultPosition, wxDefaultSize, 3, choices, 3),
+ wxDefaultPosition, wxDefaultSize, 5, choices, 5),
0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10);
topsizer -> Add(new wxStaticText(this, -1, _("Preview:")),
{
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(_("<html><body>"
"Normal face<br>(and <u>underlined</u>. <i>Italic face.</i> "
"<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 OnUpdate(wxCloseEvent& event)
+ void OnUpdate(wxCommandEvent& event)
{
UpdateTestWin();
}
BEGIN_EVENT_TABLE(wxHtmlHelpFrameOptionsDialog, wxDialog)
EVT_COMBOBOX(-1, wxHtmlHelpFrameOptionsDialog::OnUpdate)
EVT_RADIOBOX(-1, wxHtmlHelpFrameOptionsDialog::OnUpdate)
- EVT_RADIOBUTTON(-1, wxHtmlHelpFrameOptionsDialog::OnUpdate)
END_EVENT_TABLE()
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);
}
}
+void wxHtmlHelpFrame::NotifyPageChanged()
+{
+ if (m_UpdateContents && m_PagesHash)
+ {
+ wxString an = m_HtmlWin -> GetOpenedAnchor();
+ wxHtmlHelpHashData *ha;
+ if (an.IsEmpty())
+ ha = (wxHtmlHelpHashData*) m_PagesHash -> Get(m_HtmlWin -> GetOpenedPage());
+ else
+ ha = (wxHtmlHelpHashData*) m_PagesHash -> Get(m_HtmlWin -> GetOpenedPage() + wxT("#") + an);
+ if (ha)
+ {
+ bool olduc = m_UpdateContents;
+ m_UpdateContents = FALSE;
+ m_ContentsBox -> SelectItem(ha -> m_Id);
+ m_ContentsBox -> EnsureVisible(ha -> m_Id);
+ m_UpdateContents = olduc;
+ }
+ }
+}
+
/*
case wxID_HTML_BACK :
m_HtmlWin -> HistoryBack();
+ NotifyPageChanged();
break;
case wxID_HTML_FORWARD :
m_HtmlWin -> HistoryForward();
+ NotifyPageChanged();
+ break;
+
+ case wxID_HTML_UP :
+ if (m_PagesHash)
+ {
+ wxString an = m_HtmlWin -> GetOpenedAnchor();
+ wxHtmlHelpHashData *ha;
+ if (an.IsEmpty())
+ ha = (wxHtmlHelpHashData*) m_PagesHash -> Get(m_HtmlWin -> GetOpenedPage());
+ else
+ 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);
+ m_HtmlWin -> LoadPage(it -> m_Book -> GetBasePath() + it -> m_Page);
+ NotifyPageChanged();
+ }
+ }
+ break;
+
+ case wxID_HTML_UPNODE :
+ if (m_PagesHash)
+ {
+ wxString an = m_HtmlWin -> GetOpenedAnchor();
+ wxHtmlHelpHashData *ha;
+ if (an.IsEmpty())
+ ha = (wxHtmlHelpHashData*) m_PagesHash -> Get(m_HtmlWin -> GetOpenedPage());
+ else
+ 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 ind = ha -> m_Index - 1;
+
+ it = m_Data -> GetContents() + ind;
+ while (ind >= 0 && it -> m_Level != level) ind--, it--;
+ if (ind >= 0)
+ {
+ m_HtmlWin -> LoadPage(it -> m_Book -> GetBasePath() + it -> m_Page);
+ NotifyPageChanged();
+ }
+ }
+ }
+ break;
+
+ case wxID_HTML_DOWN :
+ if (m_PagesHash)
+ {
+ wxString an = m_HtmlWin -> GetOpenedAnchor();
+ wxString adr;
+ wxHtmlHelpHashData *ha;
+
+ if (an.IsEmpty()) adr = m_HtmlWin -> GetOpenedPage();
+ else adr = m_HtmlWin -> GetOpenedPage() + wxT("#") + an;
+
+ ha = (wxHtmlHelpHashData*) m_PagesHash -> Get(adr);
+
+ if (ha && ha -> m_Index < m_Data -> GetContentsCnt() - 1)
+ {
+ wxHtmlContentsItem *it = m_Data -> GetContents() + (ha -> m_Index + 1);
+
+ while (it -> m_Book -> GetBasePath() + it -> m_Page == adr) it++;
+ m_HtmlWin -> LoadPage(it -> m_Book -> GetBasePath() + it -> m_Page);
+ NotifyPageChanged();
+ }
+ }
break;
case wxID_HTML_PANEL :
- if (! (m_Splitter && m_NavigPan))
- return ;
- if (m_Splitter -> IsSplit()) {
- m_Cfg.sashpos = m_Splitter -> GetSashPosition();
- m_Splitter -> Unsplit(m_NavigPan);
- m_Cfg.navig_on = FALSE;
- } else {
- m_NavigPan -> Show(TRUE);
- m_HtmlWin -> Show(TRUE);
- m_Splitter -> SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos);
- m_Cfg.navig_on = TRUE;
+ {
+ if (! (m_Splitter && m_NavigPan))
+ return ;
+ if (m_Splitter -> IsSplit()) {
+ m_Cfg.sashpos = m_Splitter -> GetSashPosition();
+ m_Splitter -> Unsplit(m_NavigPan);
+ m_Cfg.navig_on = FALSE;
+ } else {
+ m_NavigPan -> Show(TRUE);
+ m_HtmlWin -> Show(TRUE);
+ m_Splitter -> SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos);
+ m_Cfg.navig_on = TRUE;
+ }
}
break;
}
}
break;
+
+#if wxUSE_PRINTING_ARCHITECTURE
+ case wxID_HTML_PRINT :
+ {
+ if (m_Printer == NULL)
+ m_Printer = new wxHtmlEasyPrinting(_("Help Printing"), this);
+ m_Printer -> PrintFile(m_HtmlWin -> GetOpenedPage());
+ }
+ break;
+#endif
+
+ case wxID_HTML_OPENFILE :
+ {
+ wxString s = wxFileSelector(_("Open HTML document"), wxEmptyString, wxEmptyString, wxEmptyString,
+ wxT("HTML files (*.htm)|*.htm|HTML files (*.html)|*.html|"
+ "Help books (*.htb)|*.htb|Help books (*.zip)|*.zip|"
+ "HTML Help Project (*.hhp)|*.hhp|"
+ "All files (*.*)|*"),
+ wxOPEN | wxFILE_MUST_EXIST, this);
+ if (!s.IsEmpty())
+ {
+ wxString ext = s.Right(4).Lower();
+ if (ext == _T(".zip") || ext == _T(".htb") || ext == _T(".hhp"))
+ {
+ wxBusyCursor bcur;
+ m_Data -> AddBook(s);
+ RefreshLists();
+ }
+ else
+ m_HtmlWin -> LoadPage(s);
+ }
+ }
+ break;
}
}
void wxHtmlHelpFrame::OnContentsSel(wxTreeEvent& event)
{
wxHtmlHelpTreeItemData *pg;
+ wxHtmlContentsItem *it;
pg = (wxHtmlHelpTreeItemData*) m_ContentsBox -> GetItemData(event.GetItem());
- if (pg) m_HtmlWin -> LoadPage(pg -> GetPage());
+
+ if (pg && m_UpdateContents)
+ {
+ it = m_Data -> GetContents() + (pg -> m_Id);
+ m_UpdateContents = FALSE;
+ m_HtmlWin -> LoadPage(it -> m_Book -> GetBasePath() + it -> m_Page);
+ m_UpdateContents = TRUE;
+ }
}
{
wxHtmlContentsItem *it = (wxHtmlContentsItem*) m_IndexList -> GetClientData(m_IndexList -> GetSelection());
m_HtmlWin -> LoadPage(it -> m_Book -> GetBasePath() + it -> m_Page);
+ NotifyPageChanged();
}
void wxHtmlHelpFrame::OnIndexFind(wxCommandEvent& event)
{
wxString sr = m_IndexText -> GetLineText(0);
+ sr.MakeLower();
if (sr == wxEmptyString)
OnIndexAll(event);
else {
wxBusyCursor bcur;
const wxChar *cstr = sr.c_str();
+ wxChar mybuff[512], *ptr;
bool first = TRUE;
m_IndexList->Clear();
int cnt = m_Data->GetIndexCnt();
wxHtmlContentsItem* index = m_Data->GetIndex();
+ int displ = 0;
for (int i = 0; i < cnt; i++)
- if (wxStrstr(index[i].m_Name, cstr) != NULL) {
+ {
+ wxStrncpy(mybuff, index[i].m_Name, 512);
+ mybuff[511] = 0;
+ for (ptr = mybuff; *ptr != 0; ptr++)
+ if (*ptr >= 'A' && *ptr <= 'Z') *ptr -= 'A' - 'a';
+ if (wxStrstr(mybuff, cstr) != NULL) {
m_IndexList -> Append(index[i].m_Name, (char*)(index + i));
+ displ++;
if (first) {
m_HtmlWin -> LoadPage(index[i].m_Book -> GetBasePath() + index[i].m_Page);
+ NotifyPageChanged();
first = FALSE;
}
}
+ }
+
+ wxString cnttext;
+ cnttext.Printf(_("%i of %i"), displ, cnt);
+ m_IndexCountInfo -> SetLabel(cnttext);
m_IndexText -> SetSelection(0, sr.Length());
m_IndexText -> SetFocus();
m_IndexList -> Append(index[i].m_Name, (char*)(index + i));
if (first) {
m_HtmlWin -> LoadPage(index[i].m_Book -> GetBasePath() + index[i].m_Page);
+ NotifyPageChanged();
first = FALSE;
}
}
+
+ wxString cnttext;
+ cnttext.Printf(_("%i of %i"), cnt, cnt);
+ m_IndexCountInfo -> SetLabel(cnttext);
}
void wxHtmlHelpFrame::OnSearchSel(wxCommandEvent& WXUNUSED(event))
{
wxHtmlContentsItem *it = (wxHtmlContentsItem*) m_SearchList -> GetClientData(m_SearchList -> GetSelection());
- if (it) m_HtmlWin -> LoadPage(it -> m_Book -> GetBasePath() + it -> m_Page);
+ if (it)
+ {
+ m_HtmlWin -> LoadPage(it -> m_Book -> GetBasePath() + it -> m_Page);
+ NotifyPageChanged();
+ }
}
void wxHtmlHelpFrame::OnSearch(wxCommandEvent& WXUNUSED(event))
{
wxString sr = m_Bookmarks -> GetStringSelection();
- if (sr != wxEmptyString && sr != _("<bookmarks>"))
- m_HtmlWin -> LoadPage(m_BookmarksPages[m_BookmarksNames.Index(sr)]);
+ if (sr != wxEmptyString && sr != _("(bookmarks)"))
+ {
+ m_HtmlWin -> LoadPage(m_BookmarksPages[m_BookmarksNames.Index(sr)]);
+ NotifyPageChanged();
+ }
}
void wxHtmlHelpFrame::OnCloseWindow(wxCloseEvent& evt)
if (m_Config)
WriteCustomization(m_Config, m_ConfigRoot);
+ if (m_helpController && m_helpController->IsKindOf(CLASSINFO(wxHtmlHelpController)))
+ {
+ ((wxHtmlHelpController*) m_helpController)->OnCloseFrame(evt);
+ }
+
evt.Skip();
}
BEGIN_EVENT_TABLE(wxHtmlHelpFrame, wxFrame)
- EVT_TOOL_RANGE(wxID_HTML_PANEL, wxID_HTML_BOOKMARKSREMOVE, wxHtmlHelpFrame::OnToolbar)
+ EVT_TOOL_RANGE(wxID_HTML_PANEL, wxID_HTML_OPTIONS, wxHtmlHelpFrame::OnToolbar)
+ EVT_BUTTON(wxID_HTML_BOOKMARKSREMOVE, wxHtmlHelpFrame::OnToolbar)
+ EVT_BUTTON(wxID_HTML_BOOKMARKSADD, wxHtmlHelpFrame::OnToolbar)
EVT_TREE_SEL_CHANGED(wxID_HTML_TREECTRL, wxHtmlHelpFrame::OnContentsSel)
EVT_LISTBOX(wxID_HTML_INDEXLIST, wxHtmlHelpFrame::OnIndexSel)
EVT_LISTBOX(wxID_HTML_SEARCHLIST, wxHtmlHelpFrame::OnSearchSel)
projects / wxWidgets.git / blobdiff