X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c32bfc1090c21533a11daf2c293d546d45383b49..d01cc696fca6de1e1fa3ebcd10eefc6596d629f9:/src/html/helpfrm.cpp
diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp
index 45c2efaba1..9d86198bae 100644
--- a/src/html/helpfrm.cpp
+++ b/src/html/helpfrm.cpp
@@ -38,17 +38,20 @@
#include "wx/busyinfo.h"
#include "wx/progdlg.h"
#include "wx/toolbar.h"
+#include "wx/fontenum.h"
// Bitmaps:
#ifndef __WXMSW__
-#include "bitmaps/panel.xpm"
-#include "bitmaps/back.xpm"
-#include "bitmaps/forward.xpm"
-#include "bitmaps/book.xpm"
-#include "bitmaps/folder.xpm"
-#include "bitmaps/page.xpm"
-#include "bitmaps/help.xpm"
+#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"
#endif
#include "wx/stream.h"
@@ -98,9 +101,10 @@ void wxHtmlHelpFrame::Init(wxHtmlHelpData* data)
}
m_ContentsImageList = new wxImageList(16, 16);
- m_ContentsImageList -> Add(wxICON(book));
- m_ContentsImageList -> Add(wxICON(folder));
- m_ContentsImageList -> Add(wxICON(page));
+ m_ContentsImageList -> Add(wxICON(wbook));
+ m_ContentsImageList -> Add(wxICON(wfolder));
+ m_ContentsImageList -> Add(wxICON(wpage));
+ m_ContentsImageList -> Add(wxICON(whlproot));
m_ContentsBox = NULL;
m_IndexBox = NULL;
@@ -119,6 +123,11 @@ void wxHtmlHelpFrame::Init(wxHtmlHelpData* data)
m_Cfg.h = 480;
m_Cfg.sashpos = 240;
m_Cfg.navig_on = TRUE;
+
+ m_NormalFonts = m_FixedFonts = NULL;
+ m_FontSize = 1;
+ m_NormalFace = m_FixedFace = wxEmptyString;
+ m_NormalItalic = m_FixedItalic = wxSLANT;
}
// Create: builds the GUI components.
@@ -140,13 +149,9 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti
wxFrame::Create(parent, id, _("Help"), wxPoint(m_Cfg.x, m_Cfg.y), wxSize(m_Cfg.w, m_Cfg.h));
-#ifdef __WXMSW__
- wxIcon frameIcon("wxhelp", wxBITMAP_TYPE_ICO_RESOURCE, 32, 32);
-#else
- wxIcon frameIcon(help_xpm);
-#endif
- if (frameIcon.Ok())
- SetIcon(frameIcon);
+ GetPosition(&m_Cfg.x, &m_Cfg.y);
+
+ SetIcon(wxICON(whelp));
int notebook_page = 0;
@@ -154,44 +159,26 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti
// toolbar?
if (style & wxHF_TOOLBAR) {
- wxToolBar *toolBar = CreateToolBar(wxNO_BORDER | wxTB_HORIZONTAL | /*wxTB_FLAT | */
- wxTB_DOCKABLE);
+ wxToolBar *toolBar = CreateToolBar(wxNO_BORDER | wxTB_HORIZONTAL | wxTB_DOCKABLE);
toolBar -> SetMargins(2, 2);
- wxBitmap* toolBarBitmaps[3];
-
-#ifdef __WXMSW__
- toolBarBitmaps[0] = new wxBitmap("panel");
- toolBarBitmaps[1] = new wxBitmap("back");
- toolBarBitmaps[2] = new wxBitmap("forward");
- int width = 24;
-#else
- toolBarBitmaps[0] = new wxBitmap(panel_xpm);
- toolBarBitmaps[1] = new wxBitmap(back_xpm);
- toolBarBitmaps[2] = new wxBitmap(forward_xpm);
- int width = 16;
-#endif
-
- int currentX = 5;
- toolBar -> AddTool(wxID_HTML_PANEL, *(toolBarBitmaps[0]), wxNullBitmap,
- FALSE, currentX, -1, (wxObject *) NULL,
+ toolBar -> AddTool(wxID_HTML_PANEL, wxBITMAP(wpanel), wxNullBitmap,
+ FALSE, -1, -1, (wxObject *) NULL,
_("Show/hide navigation panel"));
- currentX += width + 5;
toolBar -> AddSeparator();
- toolBar -> AddTool(wxID_HTML_BACK, *(toolBarBitmaps[1]), wxNullBitmap,
- FALSE, currentX, -1, (wxObject *) NULL,
+ toolBar -> AddTool(wxID_HTML_BACK, wxBITMAP(wback), wxNullBitmap,
+ FALSE, -1, -1, (wxObject *) NULL,
_("Go back to the previous HTML page"));
- currentX += width + 5;
- toolBar -> AddTool(wxID_HTML_FORWARD, *(toolBarBitmaps[2]), wxNullBitmap,
- FALSE, currentX, -1, (wxObject *) NULL,
+ toolBar -> AddTool(wxID_HTML_FORWARD, wxBITMAP(wforward), wxNullBitmap,
+ FALSE, -1, -1, (wxObject *) NULL,
_("Go forward to the next HTML page"));
- currentX += width + 5;
- toolBar -> Realize();
+ toolBar -> AddSeparator();
+ toolBar -> AddTool(wxID_HTML_OPTIONS, wxBITMAP(woptions), wxNullBitmap,
+ FALSE, -1, -1, (wxObject *) NULL,
+ _("Display options dialog"));
- // Can delete the bitmaps since they're reference counted
- for (int i = 0; i < 3; i++)
- delete toolBarBitmaps[i];
+ toolBar -> Realize();
}
if (style & (wxHF_CONTENTS | wxHF_INDEX | wxHF_SEARCH)) {
@@ -257,14 +244,6 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti
b2 -> height.AsIs();
m_SearchButton -> SetConstraints(b2);
- wxLayoutConstraints *b3 = new wxLayoutConstraints;
- m_SearchList = new wxListBox(dummy, wxID_HTML_SEARCHLIST, wxDefaultPosition, wxDefaultSize, 0);
- b3 -> top.Below (m_SearchButton, 10);
- b3 -> left.SameAs (dummy, wxLeft, 0);
- b3 -> right.SameAs (dummy, wxRight, 0);
- b3 -> bottom.SameAs (dummy, wxBottom, 0);
- m_SearchList -> SetConstraints(b3);
-
wxLayoutConstraints *b4 = new wxLayoutConstraints;
m_SearchChoice = new wxChoice(dummy, wxID_HTML_SEARCHCHOICE, wxDefaultPosition,
wxDefaultSize);
@@ -274,6 +253,14 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti
b4 -> height.AsIs();
m_SearchChoice -> SetConstraints(b4);
+ wxLayoutConstraints *b3 = new wxLayoutConstraints;
+ m_SearchList = new wxListBox(dummy, wxID_HTML_SEARCHLIST, wxDefaultPosition, wxDefaultSize, 0);
+ b3 -> top.Below (m_SearchButton, 10);
+ b3 -> left.SameAs (dummy, wxLeft, 0);
+ b3 -> right.SameAs (dummy, wxRight, 0);
+ b3 -> bottom.SameAs (dummy, wxBottom, 0);
+ m_SearchList -> SetConstraints(b3);
+
dummy -> SetAutoLayout(TRUE);
dummy -> Layout();
m_NavigPan -> AddPage(dummy, _("Search"));
@@ -286,6 +273,12 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti
// showtime
if (m_NavigPan && m_Splitter) {
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) {
m_NavigPan -> Show(TRUE);
m_Splitter -> SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos);
@@ -303,6 +296,8 @@ wxHtmlHelpFrame::~wxHtmlHelpFrame()
delete m_ContentsImageList;
if (m_DataCreated)
delete m_Data;
+ if (m_NormalFonts) delete m_NormalFonts;
+ if (m_FixedFonts) delete m_FixedFonts;
}
bool wxHtmlHelpFrame::Display(const wxString& x)
@@ -412,7 +407,7 @@ void wxHtmlHelpFrame::CreateContents(bool show_progress)
if (! m_ContentsBox)
return ;
- wxProgressDialog *progress;
+ wxProgressDialog *progress = NULL;
wxString proginfo;
m_ContentsBox->Clear();
@@ -421,7 +416,7 @@ void wxHtmlHelpFrame::CreateContents(bool show_progress)
int div = (cnt / PROGRESS_STEP) + 1;
int i;
- wxHtmlContentsItem *it = m_Data->GetContents();
+ wxHtmlContentsItem *it;
if (show_progress)
progress = new wxProgressDialog(_("Building contents tree..."), wxEmptyString,
@@ -433,9 +428,11 @@ void wxHtmlHelpFrame::CreateContents(bool show_progress)
m_ContentsBox -> DeleteAllItems();
roots[0] = m_ContentsBox -> AddRoot(_("(Help)"));
+ m_ContentsBox -> SetItemImage(roots[0], IMG_RootFolder);
+ m_ContentsBox -> SetItemSelectedImage(roots[0], IMG_RootFolder);
imaged[0] = TRUE;
- for (i = 0; i < cnt; i++, it++) {
+ 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))
@@ -470,7 +467,7 @@ void wxHtmlHelpFrame::CreateIndex(bool show_progress)
if (! m_IndexBox)
return ;
- wxProgressDialog *progress;
+ wxProgressDialog *progress = NULL;
wxString proginfo;
m_IndexBox->Clear();
@@ -537,6 +534,12 @@ void wxHtmlHelpFrame::ReadCustomization(wxConfigBase *cfg, const wxString& path)
m_Cfg.w = cfg -> Read("hcW", m_Cfg.w);
m_Cfg.h = cfg -> Read("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);
+
if (m_HtmlWin)
m_HtmlWin->ReadCustomization(cfg, path);
@@ -560,6 +563,11 @@ void wxHtmlHelpFrame::WriteCustomization(wxConfigBase *cfg, const wxString& path
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);
if (m_HtmlWin)
m_HtmlWin->WriteCustomization(cfg, path);
@@ -569,6 +577,187 @@ void wxHtmlHelpFrame::WriteCustomization(wxConfigBase *cfg, const wxString& path
}
+
+
+
+static void SetFontsToHtmlWin(wxHtmlWindow *win, wxString scalf, int scalit, wxString fixf, int fixit, int size)
+{
+ static int f_sizes[3][7] =
+ {
+ { 8, 9, 12, 14, 16, 19, 22},
+ {10, 12, 14, 16, 19, 24, 32},
+ {14, 16, 18, 24, 32, 38, 45}
+ };
+
+ win -> SetFonts(scalf, scalit, fixf, fixit, f_sizes[size]);
+}
+
+
+class wxHtmlHelpFrameOptionsDialog : public wxDialog
+{
+ public:
+ wxComboBox *NormalFont, *FixedFont;
+ wxRadioButton *SFI_i, *SFI_s, *FFI_i, *FFI_s;
+ wxRadioBox *RadioBox;
+ wxHtmlWindow *TestWin;
+
+ wxHtmlHelpFrameOptionsDialog(wxWindow *parent) : wxDialog(parent, -1, wxString(_("Help Browser Options")))
+ {
+ wxString choices[3] = {_("small"), _("medium"), _("large")};
+ wxString choices2[2] = {_("italic"), _("slant")};
+ wxBoxSizer *topsizer, *sizer, *sizer2, *sizer3;
+
+ topsizer = new wxBoxSizer(wxVERTICAL);
+
+ sizer = new wxBoxSizer(wxHORIZONTAL);
+
+ sizer2 = new wxBoxSizer(wxVERTICAL);
+ sizer2 -> Add(new wxStaticText(this, -1, _("Normal font:")),
+ 0, wxLEFT | wxTOP, 10);
+ sizer2 -> Add(NormalFont = new wxComboBox(this, -1, wxEmptyString, wxDefaultPosition, wxSize(200, -1), 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, 10);
+
+ sizer2 = new wxBoxSizer(wxVERTICAL);
+ sizer2 -> Add(new wxStaticText(this, -1, _("Fixed font:")),
+ 0, wxLEFT | wxTOP, 10);
+ sizer2 -> Add(FixedFont = new wxComboBox(this, -1, wxEmptyString, wxDefaultPosition, wxSize(200, -1), 0, NULL, wxCB_DROPDOWN | wxCB_READONLY),
+ 1, wxEXPAND | wxLEFT | wxRIGHT, 10);
+
+ sizer3 = new wxBoxSizer(wxHORIZONTAL);
+ sizer3 -> Add(FFI_i = new wxRadioButton(this, -1, _("use italic"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP),
+ 1, wxEXPAND, 0);
+ sizer3 -> Add(FFI_s = new wxRadioButton(this, -1, _("use slant"), wxDefaultPosition, wxDefaultSize, 0),
+ 1, wxEXPAND, 0);
+ sizer2 -> Add(sizer3, 0, wxEXPAND | wxLEFT | wxRIGHT, 10);
+
+ sizer -> Add(sizer2, 0, wxEXPAND | wxLEFT | wxRIGHT, 10);
+
+ topsizer -> Add(sizer);
+
+ topsizer -> Add(RadioBox = new wxRadioBox(this, -1, _("Font size:"),
+ wxDefaultPosition, wxDefaultSize, 3, choices, 3),
+ 0, wxEXPAND | wxLEFT | wxRIGHT, 10);
+
+ topsizer -> Add(new wxStaticText(this, -1, _("Preview:")),
+ 0, wxLEFT | wxTOP, 10);
+ topsizer -> Add(TestWin = new wxHtmlWindow(this, -1, wxDefaultPosition, wxSize(-1, 150)),
+ 1, wxEXPAND | wxLEFT | wxTOP, 10);
+
+ 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);
+ }
+
+
+ void UpdateTestWin()
+ {
+ wxBusyCursor bcur;
+ SetFontsToHtmlWin(TestWin,
+ NormalFont -> GetStringSelection(), SFI_i -> GetValue() ? wxITALIC : wxSLANT,
+ FixedFont -> GetStringSelection(), FFI_i -> GetValue() ? wxITALIC : wxSLANT,
+ RadioBox -> GetSelection());
+ TestWin -> SetPage(_(""
+ "Normal face
(and underlined. Italic face. "
+ "Bold face. Bold italic face.
"
+ "font size -2
"
+ "font size -1
"
+ "font size +0
"
+ "font size +1
"
+ "font size +2
"
+ "font size +3
"
+ "font size +4
"
+
+ "Fixed size face.
bold italic "
+ "bold italic underlined
"
+ "font size -2
"
+ "font size -1
"
+ "font size +0
"
+ "font size +1
"
+ "font size +2
"
+ "font size +3
"
+ "font size +4"
+ ""));
+ }
+
+ void OnUpdate(wxCloseEvent& event)
+ {
+ UpdateTestWin();
+ }
+
+ DECLARE_EVENT_TABLE()
+};
+
+BEGIN_EVENT_TABLE(wxHtmlHelpFrameOptionsDialog, wxDialog)
+ EVT_COMBOBOX(-1, wxHtmlHelpFrameOptionsDialog::OnUpdate)
+ EVT_RADIOBOX(-1, wxHtmlHelpFrameOptionsDialog::OnUpdate)
+ EVT_RADIOBUTTON(-1, wxHtmlHelpFrameOptionsDialog::OnUpdate)
+END_EVENT_TABLE()
+
+
+void wxHtmlHelpFrame::OptionsDialog()
+{
+ wxHtmlHelpFrameOptionsDialog dlg(this);
+ unsigned i;
+
+ if (m_NormalFonts == NULL) {
+ wxFontEnumerator enu;
+ enu.EnumerateFacenames();
+ m_NormalFonts = new wxArrayString;
+ *m_NormalFonts = *enu.GetFacenames();
+ m_NormalFonts -> Sort();
+ }
+ if (m_FixedFonts == NULL) {
+ wxFontEnumerator enu;
+ enu.EnumerateFacenames(wxFONTENCODING_SYSTEM, TRUE);
+ m_FixedFonts = new wxArrayString;
+ *m_FixedFonts = *enu.GetFacenames();
+ m_FixedFonts -> Sort();
+ }
+
+ 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);
+ 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);
+ }
+}
+
+
+
+
+
/*
EVENT HANDLING :
*/
@@ -597,6 +786,9 @@ void wxHtmlHelpFrame::OnToolbar(wxCommandEvent& event)
m_Cfg.navig_on = TRUE;
}
break;
+ case wxID_HTML_OPTIONS :
+ OptionsDialog();
+ break;
}
}
@@ -614,7 +806,7 @@ void wxHtmlHelpFrame::OnContentsSel(wxTreeEvent& event)
void wxHtmlHelpFrame::OnIndexSel(wxCommandEvent& WXUNUSED(event))
{
- wxHtmlContentsItem *it = (wxHtmlContentsItem*) m_IndexBox -> GetClientData(m_IndexBox -> GetSelection());
+ wxHtmlContentsItem *it = (wxHtmlContentsItem*) m_IndexBox -> GetClientData(m_IndexBox -> GetSelection());
m_HtmlWin -> LoadPage(it -> m_Book -> GetBasePath() + it -> m_Page);
}
@@ -637,6 +829,7 @@ void wxHtmlHelpFrame::OnCloseWindow(wxCloseEvent& evt)
{
GetSize(&m_Cfg.w, &m_Cfg.h);
GetPosition(&m_Cfg.x, &m_Cfg.y);
+
if (m_Splitter && m_Cfg.navig_on) m_Cfg.sashpos = m_Splitter -> GetSashPosition();
if (m_Config)
@@ -646,7 +839,7 @@ void wxHtmlHelpFrame::OnCloseWindow(wxCloseEvent& evt)
}
BEGIN_EVENT_TABLE(wxHtmlHelpFrame, wxFrame)
- EVT_TOOL_RANGE(wxID_HTML_PANEL, wxID_HTML_FORWARD, wxHtmlHelpFrame::OnToolbar)
+ EVT_TOOL_RANGE(wxID_HTML_PANEL, wxID_HTML_OPTIONS, 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)