// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma implementation "helpfrm.h"
#endif
// For compilers that support precompilation, includes "wx.h"
#include "wx/radiobox.h"
#endif // WXPRECOMP
+#ifdef __WXMAC__
+ #include "wx/menu.h"
+ #include "wx/msgdlg.h"
+#endif
+
#include "wx/html/helpfrm.h"
#include "wx/html/helpctrl.h"
#include "wx/textctrl.h"
#include "wx/fontenum.h"
#include "wx/stream.h"
#include "wx/filedlg.h"
-
-// Bitmaps:
-
-#ifndef __WXMSW__
- // XPM hack: make the arrays const
- #define static static const
-
- #include "bitmaps/wpanel.xpm"
- #include "bitmaps/wback.xpm"
- #include "bitmaps/wforward.xpm"
- #include "bitmaps/wbook.xpm"
- #include "bitmaps/woptions.xpm"
- #include "bitmaps/wfolder.xpm"
- #include "bitmaps/wpage.xpm"
- #include "bitmaps/whelp.xpm"
- #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"
-
- #undef static
-#endif // __WXMSW__
+#include "wx/artprov.h"
+#include "wx/spinctrl.h"
// what is considered "small index"?
#define INDEX_IS_SMALL 100
virtual void OnLinkClicked(const wxHtmlLinkInfo& link)
{
wxHtmlWindow::OnLinkClicked(link);
- m_Frame->NotifyPageChanged();
+ const wxMouseEvent *e = link.GetEvent();
+ if (e == NULL || e->LeftUp())
+ m_Frame->NotifyPageChanged();
}
private:
wxHtmlHelpFrame *m_Frame;
+
+ DECLARE_NO_COPY_CLASS(wxHtmlHelpHtmlWindow)
};
m_NormalFonts = m_FixedFonts = NULL;
m_NormalFace = m_FixedFace = wxEmptyString;
- m_FontSize = 1;
+#ifdef __WXMSW__
+ m_FontSize = 10;
+#else
+ m_FontSize = 14;
+#endif
#if wxUSE_PRINTING_ARCHITECTURE
m_Printer = NULL;
m_hfStyle = style;
wxImageList *ContentsImageList = new wxImageList(16, 16);
- ContentsImageList->Add(wxICON(wbook));
- ContentsImageList->Add(wxICON(wfolder));
- ContentsImageList->Add(wxICON(wpage));
- ContentsImageList->Add(wxICON(whlproot));
+ ContentsImageList->Add(wxArtProvider::GetIcon(wxART_HELP_BOOK, wxART_HELP_BROWSER));
+ ContentsImageList->Add(wxArtProvider::GetIcon(wxART_HELP_FOLDER, wxART_HELP_BROWSER));
+ ContentsImageList->Add(wxArtProvider::GetIcon(wxART_HELP_PAGE, wxART_HELP_BROWSER));
// Do the config in two steps. We read the HtmlWindow customization after we
// create the window.
GetPosition(&m_Cfg.x, &m_Cfg.y);
- SetIcon(wxICON(whelp));
+ SetIcon(wxArtProvider::GetIcon(wxART_HELP, wxART_HELP_BROWSER));
+
+ // On the Mac, each modeless frame must have a menubar.
+ // TODO: add more menu items, and perhaps add a style to show
+ // the menubar: compulsory on the Mac, optional elsewhere.
+#ifdef __WXMAC__
+ wxMenuBar* menuBar = new wxMenuBar;
+
+ wxMenu* fileMenu = new wxMenu;
+ fileMenu->Append(wxID_HTML_OPENFILE, _("&Open..."));
+ fileMenu->AppendSeparator();
+ fileMenu->Append(wxID_CLOSE, _("&Close"));
+
+ wxMenu* helpMenu = new wxMenu;
+ helpMenu->Append(wxID_ABOUT, _("&About..."));
+
+ menuBar->Append(fileMenu,_("&File"));
+ menuBar->Append(helpMenu,_("&Help"));
+ SetMenuBar(menuBar);
+#endif
int notebook_page = 0;
CreateStatusBar();
+#if wxUSE_TOOLBAR
// toolbar?
if (style & (wxHF_TOOLBAR | wxHF_FLAT_TOOLBAR))
{
AddToolbarButtons(toolBar, style);
toolBar->Realize();
}
+#endif //wxUSE_TOOLBAR
wxSizer *navigSizer = NULL;
dummy->SetAutoLayout(TRUE);
dummy->SetSizer(topsizer);
- long treeStyle = wxSUNKEN_BORDER | wxTR_HAS_BUTTONS;
- #ifndef __WXMSW__ // FIXME - temporary, till MSW supports wxTR_HIDE_ROOT
- treeStyle |= wxTR_HIDE_ROOT;
- #endif
-
if ( style & wxHF_BOOKMARKS )
{
m_Bookmarks = new wxComboBox(dummy, wxID_HTML_BOOKMARKSLIST,
wxBitmapButton *bmpbt1, *bmpbt2;
bmpbt1 = new wxBitmapButton(dummy, wxID_HTML_BOOKMARKSADD,
- wxBITMAP(wbkadd),
- wxDefaultPosition, wxSize(20,20));
+ wxArtProvider::GetBitmap(wxART_ADD_BOOKMARK,
+ wxART_HELP_BROWSER));
bmpbt2 = new wxBitmapButton(dummy, wxID_HTML_BOOKMARKSREMOVE,
- wxBITMAP(wbkdel),
- wxDefaultPosition, wxSize(20,20));
+ wxArtProvider::GetBitmap(wxART_DEL_BOOKMARK,
+ wxART_HELP_BROWSER));
#if wxUSE_TOOLTIPS
bmpbt1->SetToolTip(_("Add current page to bookmarks"));
bmpbt2->SetToolTip(_("Remove current page from bookmarks"));
wxSizer *sizer = new wxBoxSizer(wxHORIZONTAL);
- sizer->Add(m_Bookmarks, 1, wxRIGHT, 5);
- sizer->Add(bmpbt1, 0, wxRIGHT, 2);
- sizer->Add(bmpbt2, 0, 0, 0);
+ 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,
- treeStyle);
+ 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);
+ topsizer->Add(m_ContentsBox, 1,
+ wxEXPAND | wxLEFT | wxBOTTOM | wxRIGHT,
+ 2);
m_NavigNotebook->AddPage(dummy, _("Contents"));
m_ContentsPage = notebook_page++;
sizer->Add(m_SearchList, 1, wxALL | wxEXPAND, 2);
m_NavigNotebook->AddPage(dummy, _("Search"));
- m_SearchPage = notebook_page++;
+ m_SearchPage = notebook_page;
}
m_HtmlWin->Show(TRUE);
m_Splitter->SetMinimumPaneSize(20);
if ( m_Cfg.navig_on )
m_Splitter->SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos);
- else
- {
- m_Splitter->SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos);
- m_Splitter->Unsplit();
- }
if ( m_Cfg.navig_on )
{
}
}
+ // Reduce flicker by updating the splitter pane sizes before the
+ // frame is shown
+ wxSizeEvent sizeEvent(GetSize(), GetId());
+ ProcessEvent(sizeEvent);
+
+ m_Splitter->UpdateSize();
+
return TRUE;
}
delete m_Data;
if (m_NormalFonts) delete m_NormalFonts;
if (m_FixedFonts) delete m_FixedFonts;
- if (m_PagesHash) delete m_PagesHash;
+ if (m_PagesHash)
+ {
+ WX_CLEAR_HASH_TABLE(*m_PagesHash);
+ delete m_PagesHash;
+ }
+#if wxUSE_PRINTING_ARCHITECTURE
+ if (m_Printer) delete m_Printer;
+#endif
}
+#if wxUSE_TOOLBAR
void wxHtmlHelpFrame::AddToolbarButtons(wxToolBar *toolBar, int style)
{
- wxBitmap wpanelBitmap = wxBITMAP(wpanel);
- wxBitmap wbackBitmap = wxBITMAP(wback);
- wxBitmap wforwardBitmap = wxBITMAP(wforward);
- wxBitmap wupnodeBitmap = wxBITMAP(wupnode);
- wxBitmap wupBitmap = wxBITMAP(wup);
- wxBitmap wdownBitmap = wxBITMAP(wdown);
- wxBitmap wopenBitmap = wxBITMAP(wopen);
- wxBitmap wprintBitmap = wxBITMAP(wprint);
- wxBitmap woptionsBitmap = wxBITMAP(woptions);
+ wxBitmap wpanelBitmap =
+ wxArtProvider::GetBitmap(wxART_HELP_SIDE_PANEL, wxART_HELP_BROWSER);
+ wxBitmap wbackBitmap =
+ wxArtProvider::GetBitmap(wxART_GO_BACK, wxART_HELP_BROWSER);
+ wxBitmap wforwardBitmap =
+ wxArtProvider::GetBitmap(wxART_GO_FORWARD, wxART_HELP_BROWSER);
+ wxBitmap wupnodeBitmap =
+ wxArtProvider::GetBitmap(wxART_GO_TO_PARENT, wxART_HELP_BROWSER);
+ wxBitmap wupBitmap =
+ wxArtProvider::GetBitmap(wxART_GO_UP, wxART_HELP_BROWSER);
+ wxBitmap wdownBitmap =
+ wxArtProvider::GetBitmap(wxART_GO_DOWN, wxART_HELP_BROWSER);
+ wxBitmap wopenBitmap =
+ wxArtProvider::GetBitmap(wxART_FILE_OPEN, wxART_HELP_BROWSER);
+ wxBitmap wprintBitmap =
+ wxArtProvider::GetBitmap(wxART_PRINT, wxART_HELP_BROWSER);
+ wxBitmap woptionsBitmap =
+ wxArtProvider::GetBitmap(wxART_HELP_SETTINGS, wxART_HELP_BROWSER);
wxASSERT_MSG( (wpanelBitmap.Ok() && wbackBitmap.Ok() &&
wforwardBitmap.Ok() && wupnodeBitmap.Ok() &&
FALSE, -1, -1, (wxObject *) NULL,
_("Display options dialog"));
}
+#endif //wxUSE_TOOLBAR
void wxHtmlHelpFrame::SetTitleFormat(const wxString& format)
-bool wxHtmlHelpFrame::KeywordSearch(const wxString& keyword)
+bool wxHtmlHelpFrame::KeywordSearch(const wxString& keyword,
+ wxHelpSearchMode mode)
{
- if (! (m_SearchList && m_SearchButton && m_SearchText && m_SearchChoice))
- return FALSE;
+ if (mode == wxHELP_SEARCH_ALL)
+ {
+ if ( !(m_SearchList &&
+ m_SearchButton && m_SearchText && m_SearchChoice) )
+ return false;
+ }
+ else if (mode == wxHELP_SEARCH_INDEX)
+ {
+ if ( !(m_IndexList &&
+ m_IndexButton && m_IndexButtonAll && m_IndexText) )
+ return false;
+ }
- int foundcnt = 0, curi;
+ int foundcnt = 0;
wxString foundstr;
wxString book = wxEmptyString;
m_HtmlWin->Show(TRUE);
m_Splitter->SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos);
}
- m_NavigNotebook->SetSelection(m_SearchPage);
- m_SearchList->Clear();
- m_SearchText->SetValue(keyword);
- m_SearchButton->Enable(FALSE);
-
- if (m_SearchChoice->GetSelection() != 0)
- book = m_SearchChoice->GetStringSelection();
- wxHtmlSearchStatus status(m_Data, keyword,
- m_SearchCaseSensitive->GetValue(), m_SearchWholeWords->GetValue(),
- book);
-
- wxProgressDialog progress(_("Searching..."), _("No matching page found yet"),
- status.GetMaxIndex(), this,
- wxPD_APP_MODAL | wxPD_CAN_ABORT | wxPD_AUTO_HIDE);
-
- while (status.IsActive())
+ if (mode == wxHELP_SEARCH_ALL)
{
- curi = status.GetCurIndex();
- if (curi % 32 == 0 && progress.Update(curi) == FALSE)
- break;
- if (status.Search())
+ m_NavigNotebook->SetSelection(m_SearchPage);
+ m_SearchList->Clear();
+ m_SearchText->SetValue(keyword);
+ m_SearchButton->Enable(false);
+
+ if (m_SearchChoice->GetSelection() != 0)
+ book = m_SearchChoice->GetStringSelection();
+
+ wxHtmlSearchStatus status(m_Data, keyword,
+ m_SearchCaseSensitive->GetValue(),
+ m_SearchWholeWords->GetValue(),
+ book);
+
+ wxProgressDialog progress(_("Searching..."),
+ _("No matching page found yet"),
+ status.GetMaxIndex(), this,
+ wxPD_APP_MODAL | wxPD_CAN_ABORT | wxPD_AUTO_HIDE);
+
+ int curi;
+ while (status.IsActive())
{
- foundstr.Printf(_("Found %i matches"), ++foundcnt);
- progress.Update(status.GetCurIndex(), foundstr);
- m_SearchList->Append(status.GetName(), status.GetContentsItem());
+ curi = status.GetCurIndex();
+ if (curi % 32 == 0 && progress.Update(curi) == FALSE)
+ break;
+ if (status.Search())
+ {
+ foundstr.Printf(_("Found %i matches"), ++foundcnt);
+ progress.Update(status.GetCurIndex(), foundstr);
+ m_SearchList->Append(status.GetName(), status.GetContentsItem());
+ }
}
+
+ m_SearchButton->Enable(TRUE);
+ m_SearchText->SetSelection(0, keyword.Length());
+ m_SearchText->SetFocus();
+ }
+ else if (mode == wxHELP_SEARCH_INDEX)
+ {
+ m_NavigNotebook->SetSelection(m_IndexPage);
+ m_IndexList->Clear();
+ m_IndexButton->Enable(false);
+ m_IndexButtonAll->Enable(false);
+ m_IndexText->SetValue(keyword);
+
+ wxCommandEvent dummy;
+ OnIndexFind(dummy); // what a hack...
+ m_IndexButton->Enable(true);
+ m_IndexButtonAll->Enable(true);
+ foundcnt = m_IndexList->GetCount();
}
- m_SearchButton->Enable(TRUE);
- m_SearchText->SetSelection(0, keyword.Length());
- m_SearchText->SetFocus();
if (foundcnt)
{
- wxHtmlContentsItem *it = (wxHtmlContentsItem*) m_SearchList->GetClientData(0);
+ wxHtmlContentsItem *it;
+ switch ( mode )
+ {
+ default:
+ wxFAIL_MSG( _T("unknown help search mode") );
+ // fall back
+
+ case wxHELP_SEARCH_ALL:
+ it = (wxHtmlContentsItem*) m_SearchList->GetClientData(0);
+ break;
+
+ case wxHELP_SEARCH_INDEX:
+ it = (wxHtmlContentsItem*) m_IndexList->GetClientData(0);
+ break;
+ }
+
if (it)
{
m_HtmlWin->LoadPage(it->GetFullPath());
NotifyPageChanged();
}
}
- return (foundcnt > 0);
+
+ return foundcnt > 0;
}
void wxHtmlHelpFrame::CreateContents()
if (! m_ContentsBox)
return ;
- m_ContentsBox->Clear();
-
- if (m_PagesHash) delete m_PagesHash;
+ if (m_PagesHash)
+ {
+ WX_CLEAR_HASH_TABLE(*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 i;
- size_t booksCnt = m_Data->GetBookRecArray().GetCount();
wxHtmlContentsItem *it;
bool imaged[MAX_ROOTS];
m_ContentsBox->DeleteAllItems();
- // FIXME - will go away when wxMSW's wxTreeCtrl supports wxTR_HIDE_ROOT!
- bool hasSuperRoot = (booksCnt > 1) ||
- (m_ContentsBox->GetWindowStyle() & wxTR_HIDE_ROOT);
-
- // Don't show (Help) root if there's only one boook
- if (hasSuperRoot)
- {
- roots[0] = m_ContentsBox->AddRoot(_("(Help)"));
- m_ContentsBox->SetItemImage(roots[0], IMG_RootFolder);
- m_ContentsBox->SetItemSelectedImage(roots[0], IMG_RootFolder);
- imaged[0] = TRUE;
- }
+ roots[0] = m_ContentsBox->AddRoot(_("(Help)"));
+ imaged[0] = TRUE;
for (it = m_Data->GetContents(), i = 0; i < cnt; i++, it++)
{
// Handle books:
if (it->m_Level == 0)
{
- // special case, only one book, make it tree's root:
- if (!hasSuperRoot)
+ if (m_hfStyle & wxHF_MERGE_BOOKS)
+ // VS: we don't want book nodes, books' content should
+ // appear under tree's root. This line will create "fake"
+ // record about book node so that the rest of this look
+ // will believe there really _is_ book node and will
+ // behave correctly.
+ roots[1] = roots[0];
+ else
{
- roots[0] = roots[1] = m_ContentsBox->AddRoot(
+ roots[1] = m_ContentsBox->AppendItem(roots[0],
it->m_Name, IMG_Book, -1,
new wxHtmlHelpTreeItemData(i));
- imaged[0] = imaged[1] = TRUE;
m_ContentsBox->SetItemBold(roots[1], TRUE);
}
- // multiple books:
- else
- {
- if (m_hfStyle & wxHF_MERGE_BOOKS)
- // VS: we don't want book nodes, books' content should
- // appear under tree's root. This line will create "fake"
- // record about book node so that the rest of this look
- // will believe there really _is_ book node and will
- // behave correctly.
- roots[1] = roots[0];
- else
- {
- roots[1] = m_ContentsBox->AppendItem(roots[0],
- it->m_Name, IMG_Book, -1,
- new wxHtmlHelpTreeItemData(i));
- m_ContentsBox->SetItemBold(roots[1], TRUE);
- }
- imaged[1] = TRUE;
- }
+ imaged[1] = TRUE;
}
// ...and their contents:
else
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->SetItemSelectedImage(roots[it->m_Level], image);
+ m_ContentsBox->SetItemImage(roots[it->m_Level], image,
+ wxTreeItemIcon_Selected);
imaged[it->m_Level] = TRUE;
}
}
-
- m_ContentsBox->Expand(roots[0]);
}
m_FixedFace = cfg->Read(wxT("hcFixedFace"), m_FixedFace);
m_NormalFace = cfg->Read(wxT("hcNormalFace"), m_NormalFace);
- m_FontSize = cfg->Read(wxT("hcFontSize"), m_FontSize);
+ m_FontSize = cfg->Read(wxT("hcBaseFontSize"), m_FontSize);
{
int i;
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);
+ if ( !IsIconized() )
+ {
+ // Don't write if iconized as this would make the window
+ // disappear next time it is shown!
+ 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);
+ cfg->Write(wxT("hcBaseFontSize"), (long)m_FontSize);
if (m_Bookmarks)
{
static void SetFontsToHtmlWin(wxHtmlWindow *win, wxString scalf, wxString fixf, int size)
{
- 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},
- {16, 20, 24, 32, 38, 45, 50}
- };
-
- win->SetFonts(scalf, fixf, f_sizes[size]);
+ int f_sizes[7];
+ f_sizes[0] = int(size * 0.6);
+ f_sizes[1] = int(size * 0.8);
+ f_sizes[2] = size;
+ f_sizes[3] = int(size * 1.2);
+ f_sizes[4] = int(size * 1.4);
+ f_sizes[5] = int(size * 1.6);
+ f_sizes[6] = int(size * 1.8);
+
+ win->SetFonts(scalf, fixf, f_sizes);
}
class wxHtmlHelpFrameOptionsDialog : public wxDialog
{
- public:
- wxComboBox *NormalFont, *FixedFont;
- wxRadioBox *RadioBox;
- wxHtmlWindow *TestWin;
-
- wxHtmlHelpFrameOptionsDialog(wxWindow *parent) : wxDialog(parent, -1, wxString(_("Help Browser Options")))
- {
- wxString choices[5] = {_("very small"), _("small"), _("medium"), _("large"), _("very large")};
- wxBoxSizer *topsizer, *sizer, *sizer2;
-
- topsizer = new wxBoxSizer(wxVERTICAL);
-
- sizer = new wxBoxSizer(wxHORIZONTAL);
-
- sizer2 = new wxStaticBoxSizer( new wxStaticBox(this, -1, _("Normal font:")), wxVERTICAL);
- sizer2->Add(NormalFont = new wxComboBox(this, -1, wxEmptyString, wxDefaultPosition,
- wxSize(200, 200),
- 0, NULL, wxCB_DROPDOWN | wxCB_READONLY),
- 1, wxEXPAND | wxLEFT | wxRIGHT, 10);
-
- sizer->Add(sizer2, 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10);
-
- sizer2 = new wxStaticBoxSizer( new wxStaticBox(this, -1, _("Fixed font:")), wxVERTICAL);
- sizer2->Add(FixedFont = new wxComboBox(this, -1, wxEmptyString, wxDefaultPosition,
- wxSize(200, 200),
- 0, NULL, wxCB_DROPDOWN | wxCB_READONLY),
- 1, 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, 5, choices, 5),
- 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),
- wxHW_SCROLLBAR_AUTO | wxSUNKEN_BORDER),
- 1, wxEXPAND | wxLEFT|wxTOP|wxRIGHT, 10);
+public:
+ wxComboBox *NormalFont, *FixedFont;
+ wxSpinCtrl *FontSize;
+ wxHtmlWindow *TestWin;
- sizer = new wxBoxSizer(wxHORIZONTAL);
- sizer->Add(new wxButton(this, wxID_OK, _("OK")), 0, wxALL, 10);
- sizer->Add(new wxButton(this, wxID_CANCEL, _("Cancel")), 0, wxALL, 10);
- topsizer->Add(sizer, 0, wxALIGN_RIGHT);
-
- SetAutoLayout(TRUE);
- SetSizer(topsizer);
- topsizer->Fit(this);
- Centre(wxBOTH);
- }
+ wxHtmlHelpFrameOptionsDialog(wxWindow *parent)
+ : wxDialog(parent, -1, 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(NormalFont = new wxComboBox(this, -1, wxEmptyString, wxDefaultPosition,
+ wxSize(200, 200),
+ 0, NULL, wxCB_DROPDOWN | wxCB_READONLY));
+
+ sizer->Add(FixedFont = new wxComboBox(this, -1, wxEmptyString, wxDefaultPosition,
+ wxSize(200, 200),
+ 0, NULL, wxCB_DROPDOWN | wxCB_READONLY));
+
+ sizer->Add(FontSize = new wxSpinCtrl(this, -1));
+ FontSize->SetRange(2, 100);
+
+ topsizer->Add(sizer, 0, wxLEFT|wxRIGHT|wxTOP, 10);
+
+ topsizer->Add(new wxStaticText(this, -1, _("Preview:")),
+ 0, wxLEFT | wxTOP, 10);
+ topsizer->Add(TestWin = new wxHtmlWindow(this, -1, wxDefaultPosition, wxSize(20, 150),
+ wxHW_SCROLLBAR_AUTO | wxSUNKEN_BORDER),
+ 1, wxEXPAND | wxLEFT|wxTOP|wxRIGHT, 10);
+
+ wxBoxSizer *sizer2 = new wxBoxSizer(wxHORIZONTAL);
+ wxButton *ok;
+ sizer2->Add(ok = new wxButton(this, wxID_OK, _("OK")), 0, wxALL, 10);
+ ok->SetDefault();
+ 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);
+ }
- void UpdateTestWin()
- {
- wxBusyCursor bcur;
- SetFontsToHtmlWin(TestWin,
- NormalFont->GetStringSelection(),
- FixedFont->GetStringSelection(),
- RadioBox->GetSelection());
- TestWin->SetPage(_(
-"<html><body>\
-Normal face<br>(and <u>underlined</u>. <i>Italic face.</i> \
-<b>Bold face.</b> <b><i>Bold italic face.</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><br>\
-\
-<p><tt>Fixed size face.<br> <b>bold</b> <i>italic</i> \
-<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></tt>\
-</body></html>"
- ));
- }
+ void UpdateTestWin()
+ {
+ wxBusyCursor bcur;
+ SetFontsToHtmlWin(TestWin,
+ NormalFont->GetStringSelection(),
+ FixedFont->GetStringSelection(),
+ FontSize->GetValue());
+
+ wxString content(_("font size"));
+
+ content = _T("<font size=-2>") + content + _T(" -2</font><br>")
+ _T("<font size=-1>") + content + _T(" -1</font><br>")
+ _T("<font size=+0>") + content + _T(" +0</font><br>")
+ _T("<font size=+1>") + content + _T(" +1</font><br>")
+ _T("<font size=+2>") + content + _T(" +2</font><br>")
+ _T("<font size=+3>") + content + _T(" +3</font><br>")
+ _T("<font size=+4>") + content + _T(" +4</font><br>") ;
+
+ content = wxString( _T("<html><body><table><tr><td>") ) +
+ _("Normal face<br>and <u>underlined</u>. ") +
+ _("<i>Italic face.</i> ") +
+ _("<b>Bold face.</b> ") +
+ _("<b><i>Bold italic face.</i></b><br>") +
+ content +
+ wxString( _T("</td><td><tt>") ) +
+ _("Fixed size face.<br> <b>bold</b> <i>italic</i> ") +
+ _("<b><i>bold italic <u>underlined</u></i></b><br>") +
+ content +
+ _T("</tt></td></tr></table></body></html>");
+
+ TestWin->SetPage( content );
+ }
- void OnUpdate(wxCommandEvent& WXUNUSED(event))
- {
- UpdateTestWin();
- }
+ void OnUpdate(wxCommandEvent& WXUNUSED(event))
+ {
+ UpdateTestWin();
+ }
+ void OnUpdateSpin(wxSpinEvent& WXUNUSED(event))
+ {
+ UpdateTestWin();
+ }
- DECLARE_EVENT_TABLE()
+ DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxHtmlHelpFrameOptionsDialog)
};
BEGIN_EVENT_TABLE(wxHtmlHelpFrameOptionsDialog, wxDialog)
EVT_COMBOBOX(-1, wxHtmlHelpFrameOptionsDialog::OnUpdate)
- EVT_RADIOBOX(-1, wxHtmlHelpFrameOptionsDialog::OnUpdate)
+ EVT_SPINCTRL(-1, wxHtmlHelpFrameOptionsDialog::OnUpdateSpin)
END_EVENT_TABLE()
-
void wxHtmlHelpFrame::OptionsDialog()
{
wxHtmlHelpFrameOptionsDialog dlg(this);
enu.EnumerateFacenames();
m_NormalFonts = new wxArrayString;
*m_NormalFonts = *enu.GetFacenames();
- m_NormalFonts->Sort();
+ m_NormalFonts->Sort(wxStringSortAscending);
}
if (m_FixedFonts == NULL)
{
enu.EnumerateFacenames(wxFONTENCODING_SYSTEM, TRUE);
m_FixedFonts = new wxArrayString;
*m_FixedFonts = *enu.GetFacenames();
- m_FixedFonts->Sort();
+ m_FixedFonts->Sort(wxStringSortAscending);
+ }
+
+ // 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);
+ m_NormalFace = fnt.GetFaceName();
+ }
+ if (m_FixedFace.empty())
+ {
+ wxFont fnt(m_FontSize, wxMODERN, wxNORMAL, wxNORMAL, FALSE);
+ m_FixedFace = fnt.GetFaceName();
}
for (i = 0; i < m_NormalFonts->GetCount(); i++)
dlg.NormalFont->Append((*m_NormalFonts)[i]);
for (i = 0; i < m_FixedFonts->GetCount(); i++)
dlg.FixedFont->Append((*m_FixedFonts)[i]);
- if (!m_NormalFace.IsEmpty()) dlg.NormalFont->SetStringSelection(m_NormalFace);
- else dlg.NormalFont->SetSelection(0);
- if (!m_FixedFace.IsEmpty()) dlg.FixedFont->SetStringSelection(m_FixedFace);
- else dlg.FixedFont->SetSelection(0);
- dlg.RadioBox->SetSelection(m_FontSize);
+ if (!m_NormalFace.empty())
+ dlg.NormalFont->SetStringSelection(m_NormalFace);
+ else
+ dlg.NormalFont->SetSelection(0);
+ if (!m_FixedFace.empty())
+ dlg.FixedFont->SetStringSelection(m_FixedFace);
+ else
+ dlg.FixedFont->SetSelection(0);
+ dlg.FontSize->SetValue(m_FontSize);
dlg.UpdateTestWin();
if (dlg.ShowModal() == wxID_OK)
{
m_NormalFace = dlg.NormalFont->GetStringSelection();
m_FixedFace = dlg.FixedFont->GetStringSelection();
- m_FontSize = dlg.RadioBox->GetSelection();
+ m_FontSize = dlg.FontSize->GetValue();
SetFontsToHtmlWin(m_HtmlWin, m_NormalFace, m_FixedFace, m_FontSize);
}
}
*/
+void wxHtmlHelpFrame::OnActivate(wxActivateEvent& event)
+{
+ // This saves one mouse click when using the
+ // wxHTML for context sensitive help systems
+#ifndef __WXGTK__
+ // NB: wxActivateEvent is a bit broken in wxGTK
+ // and is sometimes sent when it should not be
+ if (event.GetActive() && m_HtmlWin)
+ m_HtmlWin->SetFocus();
+#endif
+
+ event.Skip();
+}
+
void wxHtmlHelpFrame::OnToolbar(wxCommandEvent& event)
{
switch (event.GetId())
pos = m_BookmarksNames.Index(item);
if (pos != wxNOT_FOUND)
{
- m_BookmarksNames.Remove(pos);
- m_BookmarksPages.Remove(pos);
+ m_BookmarksNames.RemoveAt(pos);
+ m_BookmarksPages.RemoveAt(pos);
m_Bookmarks->Delete(m_Bookmarks->GetSelection());
}
}
case wxID_HTML_OPENFILE :
{
+ wxString filemask = wxString(
+ _("HTML files (*.html;*.htm)|*.html;*.htm|")) +
+ _("Help books (*.htb)|*.htb|Help books (*.zip)|*.zip|") +
+ _("HTML Help Project (*.hhp)|*.hhp|") +
+#if wxUSE_LIBMSPACK
+ _("Compressed HTML Help file (*.chm)|*.chm|") +
+#endif
+ _("All files (*.*)|*");
wxString s = wxFileSelector(_("Open HTML document"),
wxEmptyString,
wxEmptyString,
wxEmptyString,
- _(
-"HTML files (*.htm)|*.htm|HTML files (*.html)|*.html|\
-Help books (*.htb)|*.htb|Help books (*.zip)|*.zip|\
-HTML Help Project (*.hhp)|*.hhp|\
-All files (*.*)|*"
- ),
+ filemask,
wxOPEN | wxFILE_MUST_EXIST,
this);
if (!s.IsEmpty())
{
wxString ext = s.Right(4).Lower();
- if (ext == _T(".zip") || ext == _T(".htb") || ext == _T(".hhp"))
+ if (ext == _T(".zip") || ext == _T(".htb") ||
+#if wxUSE_LIBMSPACK
+ ext == _T(".chm") ||
+#endif
+ ext == _T(".hhp"))
{
wxBusyCursor bcur;
m_Data->AddBook(s);
{
wxString sr = m_SearchText->GetLineText(0);
- if (sr != wxEmptyString) KeywordSearch(sr);
+ if (!sr.empty())
+ KeywordSearch(sr, wxHELP_SEARCH_ALL);
}
void wxHtmlHelpFrame::OnBookmarksSel(wxCommandEvent& WXUNUSED(event))
GetSize(&m_Cfg.w, &m_Cfg.h);
GetPosition(&m_Cfg.x, &m_Cfg.y);
+#ifdef __WXGTK__
+ if (IsGrabbed())
+ {
+ RemoveGrab();
+ }
+#endif
+
if (m_Splitter && m_Cfg.navig_on) m_Cfg.sashpos = m_Splitter->GetSashPosition();
if (m_Config)
evt.Skip();
}
+#ifdef __WXMAC__
+void wxHtmlHelpFrame::OnClose(wxCommandEvent& event)
+{
+ Close(TRUE);
+}
+
+void wxHtmlHelpFrame::OnAbout(wxCommandEvent& event)
+{
+ wxMessageBox(wxT("wxWindows HTML Help Viewer (c) 1998-2003, Vaclav Slavik et al"), wxT("HelpView"),
+ wxICON_INFORMATION|wxOK, this);
+}
+#endif
+
BEGIN_EVENT_TABLE(wxHtmlHelpFrame, wxFrame)
+ EVT_ACTIVATE(wxHtmlHelpFrame::OnActivate)
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_BUTTON(wxID_HTML_INDEXBUTTONALL, wxHtmlHelpFrame::OnIndexAll)
EVT_COMBOBOX(wxID_HTML_BOOKMARKSLIST, wxHtmlHelpFrame::OnBookmarksSel)
EVT_CLOSE(wxHtmlHelpFrame::OnCloseWindow)
+#ifdef __WXMAC__
+ EVT_MENU(wxID_CLOSE, wxHtmlHelpFrame::OnClose)
+ EVT_MENU(wxID_ABOUT, wxHtmlHelpFrame::OnAbout)
+#endif
+
END_EVENT_TABLE()
#endif // wxUSE_WXHTML_HELP
projects / wxWidgets.git / blobdiff