X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6bfd5671b06140b7db400c80d18a54eeb5cdb6d2..cfd885695ef3adf16de2a7c9bc7b85f33c80ffbe:/src/html/helpfrm.cpp

diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp
index 573121b725..b4cccd4092 100644
--- a/src/html/helpfrm.cpp
+++ b/src/html/helpfrm.cpp
@@ -62,6 +62,10 @@
 // is updated.
 #define PROGRESS_STEP 40
 
+// what is considered "small index"?
+#define INDEX_IS_SMALL 100
+
+
 //--------------------------------------------------------------------------
 // wxHtmlHelpTreeItemData (private)
 //--------------------------------------------------------------------------
@@ -112,15 +116,22 @@ void wxHtmlHelpFrame::Init(wxHtmlHelpData* data)
     m_ContentsImageList -> Add(wxICON(whlproot));
 
     m_ContentsBox = NULL;
-    m_IndexBox = NULL;
+    m_IndexList = NULL;
+    m_IndexButton = NULL;
+    m_IndexButtonAll = NULL;
+    m_IndexText = NULL;
     m_SearchList = NULL;
     m_SearchButton = NULL;
     m_SearchText = NULL;
     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;
 
@@ -133,14 +144,13 @@ void wxHtmlHelpFrame::Init(wxHtmlHelpData* data)
     m_NormalFonts = m_FixedFonts = NULL;
     m_FontSize = 1;
     m_NormalFace = m_FixedFace = wxEmptyString;
-    m_NormalItalic =  m_FixedItalic = wxSLANT;
 }
 
 // Create: builds the GUI components.
 // with the style flag it's possible to toggle the toolbar, contents, index and search
 // controls.
 // m_HtmlWin will *always* be created, but it's important to realize that
-// m_ContentsBox, m_IndexBox, m_SearchList, m_SearchButton, m_SearchText and
+// m_ContentsBox, m_IndexList, m_SearchList, m_SearchButton, m_SearchText and
 // m_SearchButton may be NULL.
 // moreover, if no contents, index or searchpage is needed, m_Splitter and
 // m_NavigPan will be NULL too (with m_HtmlWin directly connected to the frame)
@@ -153,7 +163,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti
     if (m_Config)
         ReadCustomization(m_Config, m_ConfigRoot);
 
-    wxFrame::Create(parent, id, _("Help"), wxPoint(m_Cfg.x, m_Cfg.y), wxSize(m_Cfg.w, m_Cfg.h));
+    wxFrame::Create(parent, id, _("Help"), wxPoint(m_Cfg.x, m_Cfg.y), wxSize(m_Cfg.w, m_Cfg.h), wxDEFAULT_FRAME_STYLE, "wxHtmlHelp");
 
     GetPosition(&m_Cfg.x, &m_Cfg.y);
 
@@ -167,43 +177,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti
     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();
     }
 
@@ -237,15 +211,57 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti
     // index listbox panel?
     if (style & wxHF_INDEX) {
         wxWindow *dummy = new wxPanel(m_NavigPan, wxID_HTML_INDEXPAGE);
+
         wxLayoutConstraints *b1 = new wxLayoutConstraints;
-        b1 -> top.SameAs (dummy, wxTop, 0);
-        b1 -> left.SameAs (dummy, wxLeft, 0);
-        b1 -> width.PercentOf (dummy, wxWidth, 100);
-        b1 -> bottom.SameAs (dummy, wxBottom, 0);
-        m_IndexBox = new wxListBox(dummy, wxID_HTML_INDEXLIST, wxDefaultPosition,
-                                   wxDefaultSize, 0, NULL, wxLB_SINGLE | wxLB_ALWAYS_SB);
-        m_IndexBox -> SetConstraints(b1);
+        m_IndexText = new wxTextCtrl(dummy, wxID_HTML_INDEXTEXT, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER);
+        b1 -> top.SameAs (dummy, wxTop, 10);
+        b1 -> left.SameAs (dummy, wxLeft, 10);
+        b1 -> right.SameAs (dummy, wxRight, 10);
+        b1 -> height.AsIs();
+        m_IndexText -> SetConstraints(b1);
+
+        wxLayoutConstraints *b4 = new wxLayoutConstraints;
+        m_IndexButtonAll = new wxButton(dummy, wxID_HTML_INDEXBUTTONALL, _("Show all"));
+
+        b4 -> top.Below (m_IndexText, 10);
+        b4 -> right.SameAs (dummy, wxRight, 10);
+        b4 -> width.AsIs();
+        b4 -> height.AsIs();
+        m_IndexButtonAll -> SetConstraints(b4);
+
+        wxLayoutConstraints *b2 = new wxLayoutConstraints;
+        m_IndexButton = new wxButton(dummy, wxID_HTML_INDEXBUTTON, _("Find"));
+        b2 -> top.Below (m_IndexText, 10);
+        b2 -> right.LeftOf (m_IndexButtonAll, 10);
+        b2 -> width.AsIs();
+        b2 -> height.AsIs();
+        m_IndexButton -> SetConstraints(b2);
+
+        wxLayoutConstraints *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_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();
+
         m_NavigPan -> AddPage(dummy, _("Index"));
         m_IndexPage = notebook_page++;
     }
@@ -255,7 +271,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti
         wxWindow *dummy = new wxPanel(m_NavigPan, wxID_HTML_SEARCHPAGE);
 
         wxLayoutConstraints *b1 = new wxLayoutConstraints;
-        m_SearchText = new wxTextCtrl(dummy, wxID_HTML_SEARCHTEXT);
+        m_SearchText = new wxTextCtrl(dummy, wxID_HTML_SEARCHTEXT, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER);
         b1 -> top.SameAs (dummy, wxTop, 10);
         b1 -> left.SameAs (dummy, wxLeft, 10);
         b1 -> right.SameAs (dummy, wxRight, 10);
@@ -264,6 +280,9 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti
 
         wxLayoutConstraints *b2 = new wxLayoutConstraints;
         m_SearchButton = new wxButton(dummy, wxID_HTML_SEARCHBUTTON, _("Search"));
+#if wxUSE_TOOLTIPS
+        m_SearchButton -> SetToolTip(_("Search contents of help book(s) for all occurences of the text you typed above"));
+#endif //wxUSE_TOOLTIPS
         b2 -> top.Below (m_SearchText, 10);
         b2 -> left.SameAs (dummy, wxLeft, 10);
         b2 -> width.AsIs();
@@ -279,9 +298,25 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti
         b4 -> height.AsIs();
         m_SearchChoice -> SetConstraints(b4);
 
+        wxLayoutConstraints *b5 = new wxLayoutConstraints;
+        m_SearchCaseSensitive = new wxCheckBox(dummy, -1, _("Case sensitive"));
+        b5 -> top.Below (m_SearchButton, 10);
+        b5 -> left.SameAs (dummy, wxLeft, 10);
+        b5 -> right.SameAs (dummy, wxRight, 10);
+        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 -> right.SameAs (dummy, wxRight, 10);
+        b6 -> height.AsIs ();
+        m_SearchWholeWords -> SetConstraints(b6);
+
         wxLayoutConstraints *b3 = new wxLayoutConstraints;
-        m_SearchList = new wxListBox(dummy, wxID_HTML_SEARCHLIST, wxDefaultPosition, wxDefaultSize, 0);
-        b3 -> top.Below (m_SearchButton, 10);
+        m_SearchList = new wxListBox(dummy, wxID_HTML_SEARCHLIST, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE | wxLB_ALWAYS_SB);
+        b3 -> top.Below (m_SearchWholeWords, 10);
         b3 -> left.SameAs (dummy, wxLeft, 0);
         b3 -> right.SameAs (dummy, wxRight, 0);
         b3 -> bottom.SameAs (dummy, wxBottom, 0);
@@ -294,7 +329,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti
     }
     m_HtmlWin -> Show(TRUE);
 
-    //RefreshLists();
+    RefreshLists();
 
     // showtime
     if (m_NavigPan && m_Splitter) {
@@ -319,6 +354,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti
 
 wxHtmlHelpFrame::~wxHtmlHelpFrame()
 {
+    PopEventHandler(); // wxhtmlhelpcontroller
     delete m_ContentsImageList;
     if (m_DataCreated)
         delete m_Data;
@@ -326,6 +362,48 @@ wxHtmlHelpFrame::~wxHtmlHelpFrame()
     if (m_FixedFonts) delete m_FixedFonts;
 }
 
+
+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 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"));
+}
+
+
+
 bool wxHtmlHelpFrame::Display(const wxString& x)
 {
     wxString url = m_Data->FindPageByName(x);
@@ -366,7 +444,7 @@ bool wxHtmlHelpFrame::DisplayContents()
 
 bool wxHtmlHelpFrame::DisplayIndex()
 {
-    if (! m_IndexBox)
+    if (! m_IndexList)
         return FALSE;
     if (!m_Splitter -> IsSplit()) {
         m_NavigPan -> Show(TRUE);
@@ -377,12 +455,14 @@ bool wxHtmlHelpFrame::DisplayIndex()
     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;
 
@@ -399,21 +479,23 @@ bool wxHtmlHelpFrame::KeywordSearch(const wxString& keyword)
     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);
+                              wxPD_APP_MODAL | wxPD_CAN_ABORT | wxPD_AUTO_HIDE | wxGA_SMOOTH);
 
     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);
@@ -428,27 +510,18 @@ bool wxHtmlHelpFrame::KeywordSearch(const wxString& keyword)
 
 #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();
 
     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];
 
@@ -459,12 +532,6 @@ void wxHtmlHelpFrame::CreateContents(bool show_progress)
     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));
@@ -482,43 +549,29 @@ void wxHtmlHelpFrame::CreateContents(bool show_progress)
             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_IndexBox)
+    if (! m_IndexList)
         return ;
 
-    wxProgressDialog *progress = NULL;
-    wxString proginfo;
-
-    m_IndexBox->Clear();
+    m_IndexList->Clear();
 
     int cnt = m_Data->GetIndexCnt();
-    int div = (cnt / PROGRESS_STEP) + 1;
-
+    
+    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;
+    
     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();
-        }
-        m_IndexBox -> Append(index[i].m_Name, (char*)(index + i));
-    }
-
-    if (show_progress)
-        delete progress;
+    for (int i = 0; i < cnt; i++) 
+        m_IndexList -> Append(index[i].m_Name, (char*)(index + i));
 }
 
 void wxHtmlHelpFrame::CreateSearch()
@@ -536,10 +589,10 @@ void wxHtmlHelpFrame::CreateSearch()
 }
 
 
-void wxHtmlHelpFrame::RefreshLists(bool show_progress)
+void wxHtmlHelpFrame::RefreshLists()
 {
-    CreateContents(show_progress);
-    CreateIndex(show_progress);
+    CreateContents();
+    CreateIndex();
     CreateSearch();
 }
 
@@ -550,7 +603,7 @@ void wxHtmlHelpFrame::ReadCustomization(wxConfigBase *cfg, const wxString& path)
 
     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;
@@ -563,8 +616,6 @@ void wxHtmlHelpFrame::ReadCustomization(wxConfigBase *cfg, const wxString& path)
     m_FixedFace = cfg -> Read("hcFixedFace", m_FixedFace);
     m_NormalFace = cfg -> Read("hcNormalFace", m_NormalFace);
     m_FontSize = cfg -> Read("hcFontSize", m_FontSize);
-    m_NormalItalic = cfg -> Read("hcNormalItalic", m_NormalItalic);
-    m_FixedItalic = cfg -> Read("hcFixedItalic", m_FixedItalic);
 
     {
         int i;
@@ -581,11 +632,11 @@ void wxHtmlHelpFrame::ReadCustomization(wxConfigBase *cfg, const wxString& path)
             }
                     
             for (i = 0; i < cnt; i++) {
-                val.Printf("hcBookmark_%i", i);
+                val.Printf(wxT("hcBookmark_%i"), i);
                 s = cfg -> Read(val);
                 m_BookmarksNames.Add(s);
                 if (m_Bookmarks) m_Bookmarks -> Append(s);
-                val.Printf("hcBookmark_%i_url", i);
+                val.Printf(wxT("hcBookmark_%i_url"), i);
                 s = cfg -> Read(val);
                 m_BookmarksPages.Add(s);
             }
@@ -593,7 +644,7 @@ void wxHtmlHelpFrame::ReadCustomization(wxConfigBase *cfg, const wxString& path)
     }
 
     if (m_HtmlWin)
-        m_HtmlWin->ReadCustomization(cfg, path);
+        m_HtmlWin->ReadCustomization(cfg);
 
     if (path != wxEmptyString)
         cfg -> SetPath(oldpath);
@@ -606,7 +657,7 @@ void wxHtmlHelpFrame::WriteCustomization(wxConfigBase *cfg, const wxString& path
 
     if (path != wxEmptyString) {
         oldpath = cfg -> GetPath();
-        cfg -> SetPath(path);
+        cfg -> SetPath(_T("/") + path);
     }
 
     cfg -> Write("hcNavigPanel", m_Cfg.navig_on);
@@ -618,8 +669,6 @@ void wxHtmlHelpFrame::WriteCustomization(wxConfigBase *cfg, const wxString& path
     cfg -> Write("hcFixedFace", m_FixedFace);
     cfg -> Write("hcNormalFace", m_NormalFace);
     cfg -> Write("hcFontSize", (long)m_FontSize);
-    cfg -> Write("hcNormalItalic", (long)m_NormalItalic);
-    cfg -> Write("hcFixedItalic", (long)m_FixedItalic);
     
     if (m_Bookmarks) {
         int i;
@@ -628,15 +677,15 @@ void wxHtmlHelpFrame::WriteCustomization(wxConfigBase *cfg, const wxString& path
         
         cfg -> Write("hcBookmarksCnt", (long)cnt);
         for (i = 0; i < cnt; i++) {
-            val.Printf("hcBookmark_%i", i);
+            val.Printf(wxT("hcBookmark_%i"), i);
             cfg -> Write(val, m_BookmarksNames[i]);
-            val.Printf("hcBookmark_%i_url", i);
+            val.Printf(wxT("hcBookmark_%i_url"), i);
             cfg -> Write(val, m_BookmarksPages[i]);
         }
     }
 
     if (m_HtmlWin)
-        m_HtmlWin->WriteCustomization(cfg, path);
+        m_HtmlWin->WriteCustomization(cfg);
 
     if (path != wxEmptyString)
         cfg -> SetPath(oldpath);
@@ -646,7 +695,7 @@ void wxHtmlHelpFrame::WriteCustomization(wxConfigBase *cfg, const wxString& path
 
 
 
-static void SetFontsToHtmlWin(wxHtmlWindow *win, wxString scalf, int scalit, wxString fixf, int fixit, int size)
+static void SetFontsToHtmlWin(wxHtmlWindow *win, wxString scalf, wxString fixf, int size)
 {
     static int f_sizes[3][7] = 
         {
@@ -655,7 +704,7 @@ static void SetFontsToHtmlWin(wxHtmlWindow *win, wxString scalf, int scalit, wxS
             {14, 16, 18, 24, 32, 38, 45}
         };
 
-    win -> SetFonts(scalf, scalit, fixf, fixit, f_sizes[size]);
+    win -> SetFonts(scalf, fixf, f_sizes[size]);
 }
 
 
@@ -663,64 +712,44 @@ class wxHtmlHelpFrameOptionsDialog : public wxDialog
 {
     public:
         wxComboBox *NormalFont, *FixedFont;
-        wxRadioButton *SFI_i, *SFI_s, *FFI_i, *FFI_s;
         wxRadioBox *RadioBox;
         wxHtmlWindow *TestWin;
 
         wxHtmlHelpFrameOptionsDialog(wxWindow *parent) : wxDialog(parent, -1, wxString(_("Help Browser Options")))
             {
                 wxString choices[3] = {_("small"), _("medium"), _("large")};
-                wxString choices2[2] = {_("italic"), _("slant")};
-                wxBoxSizer *topsizer, *sizer, *sizer2, *sizer3;
+                wxBoxSizer *topsizer, *sizer, *sizer2;
 
                 topsizer = new wxBoxSizer(wxVERTICAL);
 
                 sizer = new wxBoxSizer(wxHORIZONTAL);
 
-                sizer2 = new wxBoxSizer(wxVERTICAL);
-                sizer2 -> Add(new wxStaticText(this, -1, _("Normal font:")), 
-                              0, wxLEFT | wxTOP, 10);
+                sizer2 = new wxStaticBoxSizer( new wxStaticBox(this, -1, _("Normal font:")), wxVERTICAL);
                 sizer2 -> Add(NormalFont = new wxComboBox(this, -1, wxEmptyString, wxDefaultPosition, 
                               wxSize(200, 200), 
                               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);
+                sizer -> Add(sizer2, 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10);
 
-                sizer2 = new wxBoxSizer(wxVERTICAL);
-                sizer2 -> Add(new wxStaticText(this, -1, _("Fixed font:")), 
-                              0, wxLEFT | wxTOP, 10);
+                sizer2 = new wxStaticBoxSizer( new wxStaticBox(this, -1, _("Fixed font:")), wxVERTICAL);
                 sizer2 -> Add(FixedFont = new wxComboBox(this, -1, wxEmptyString, wxDefaultPosition, 
                               wxSize(200, 200), 
                               0, NULL, wxCB_DROPDOWN | wxCB_READONLY), 
                               1, wxEXPAND | wxLEFT | wxRIGHT, 10);
 
-                sizer3 = new wxBoxSizer(wxHORIZONTAL);
-                sizer3 -> Add(FFI_i = new wxRadioButton(this, -1, _("use italic"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP), 
-                              1, wxEXPAND, 0);
-                sizer3 -> Add(FFI_s = new wxRadioButton(this, -1, _("use slant"), wxDefaultPosition, wxDefaultSize, 0), 
-                              1, wxEXPAND, 0);
-                sizer2 -> Add(sizer3, 0, wxEXPAND | wxLEFT | wxRIGHT, 10);
-
-                sizer -> Add(sizer2, 0, wxEXPAND | wxLEFT | wxRIGHT, 10);
+                sizer -> Add(sizer2, 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10);
 
                 topsizer -> Add(sizer);
 
                 topsizer -> Add(RadioBox = new wxRadioBox(this, -1, _("Font size:"), 
                                                           wxDefaultPosition, wxDefaultSize, 3, choices, 3), 
-                                0, wxEXPAND | wxLEFT | wxRIGHT, 10);
+                                0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10);
                                 
                 topsizer -> Add(new wxStaticText(this, -1, _("Preview:")), 
                                 0, wxLEFT | wxTOP, 10);
                 topsizer -> Add(TestWin = new wxHtmlWindow(this, -1, wxDefaultPosition, wxSize(-1, 150)), 
-                                1, wxEXPAND | wxLEFT | wxTOP, 10);
+                                1, wxEXPAND | wxLEFT|wxTOP|wxRIGHT, 10);
 
                 sizer = new wxBoxSizer(wxHORIZONTAL);
                 sizer -> Add(new wxButton(this, wxID_OK, _("OK")), 0, wxALL, 10);
@@ -738,8 +767,8 @@ class wxHtmlHelpFrameOptionsDialog : public wxDialog
             {
                 wxBusyCursor bcur;
                 SetFontsToHtmlWin(TestWin, 
-                                  NormalFont -> GetStringSelection(), SFI_i -> GetValue() ? wxITALIC : wxSLANT,
-                                  FixedFont -> GetStringSelection(), FFI_i -> GetValue() ? wxITALIC : wxSLANT,
+                                  NormalFont -> GetStringSelection(),
+                                  FixedFont -> GetStringSelection(),
                                   RadioBox -> GetSelection());
                 TestWin -> SetPage(_("<html><body>"
                                    "Normal face<br>(and <u>underlined</u>. <i>Italic face.</i> "
@@ -753,14 +782,14 @@ class wxHtmlHelpFrameOptionsDialog : public wxDialog
                                    "<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>"));
             }
 
@@ -775,7 +804,6 @@ class wxHtmlHelpFrameOptionsDialog : public wxDialog
 BEGIN_EVENT_TABLE(wxHtmlHelpFrameOptionsDialog, wxDialog)
     EVT_COMBOBOX(-1, wxHtmlHelpFrameOptionsDialog::OnUpdate)
     EVT_RADIOBOX(-1, wxHtmlHelpFrameOptionsDialog::OnUpdate)
-    EVT_RADIOBUTTON(-1, wxHtmlHelpFrameOptionsDialog::OnUpdate)
 END_EVENT_TABLE()
 
 
@@ -808,19 +836,13 @@ void wxHtmlHelpFrame::OptionsDialog()
     if (!m_FixedFace.IsEmpty()) dlg.FixedFont -> SetStringSelection(m_FixedFace);
     else dlg.FixedFont -> SetSelection(0);
     dlg.RadioBox -> SetSelection(m_FontSize);
-    dlg.SFI_i -> SetValue(m_NormalItalic == wxITALIC);
-    dlg.SFI_s -> SetValue(m_NormalItalic == wxSLANT);
-    dlg.FFI_i -> SetValue(m_FixedItalic == wxITALIC);
-    dlg.FFI_s -> SetValue(m_FixedItalic == wxSLANT);
     dlg.UpdateTestWin();
     
     if (dlg.ShowModal() == wxID_OK) {
         m_NormalFace = dlg.NormalFont -> GetStringSelection();
         m_FixedFace = dlg.FixedFont -> GetStringSelection();
         m_FontSize = dlg.RadioBox -> GetSelection();
-        m_NormalItalic = dlg.SFI_i -> GetValue() ? wxITALIC : wxSLANT;
-        m_FixedItalic = dlg.FFI_i -> GetValue() ? wxITALIC : wxSLANT;
-        SetFontsToHtmlWin(m_HtmlWin, m_NormalFace, m_NormalItalic, m_FixedFace, m_FixedItalic, m_FontSize);
+        SetFontsToHtmlWin(m_HtmlWin, m_NormalFace, m_FixedFace, m_FontSize);
     }
 }
 
@@ -911,11 +933,76 @@ void wxHtmlHelpFrame::OnContentsSel(wxTreeEvent& event)
 
 void wxHtmlHelpFrame::OnIndexSel(wxCommandEvent& WXUNUSED(event))
 {
-    wxHtmlContentsItem *it = (wxHtmlContentsItem*) m_IndexBox -> GetClientData(m_IndexBox -> GetSelection());
+    wxHtmlContentsItem *it = (wxHtmlContentsItem*) m_IndexList -> GetClientData(m_IndexList -> GetSelection());
     m_HtmlWin -> LoadPage(it -> m_Book -> GetBasePath() + it -> m_Page);
 }
 
 
+void wxHtmlHelpFrame::OnIndexFind(wxCommandEvent& event)
+{
+    wxString sr = m_IndexText -> GetLineText(0);
+    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++)
+        {
+            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);
+                    first = FALSE;
+                }
+            }
+        }
+
+        wxString cnttext;
+        cnttext.Printf(_("%i of %i"), displ, cnt);
+        m_IndexCountInfo -> SetLabel(cnttext);
+
+        m_IndexText -> SetSelection(0, sr.Length());
+        m_IndexText -> SetFocus();
+    }
+}
+
+void wxHtmlHelpFrame::OnIndexAll(wxCommandEvent& WXUNUSED(event))
+{
+    wxBusyCursor bcur;
+    
+    m_IndexList->Clear();
+    int cnt = m_Data->GetIndexCnt();
+    bool first = TRUE;
+    wxHtmlContentsItem* index = m_Data->GetIndex();
+
+    for (int i = 0; i < cnt; i++) {
+        m_IndexList -> Append(index[i].m_Name, (char*)(index + i));
+        if (first) {
+            m_HtmlWin -> LoadPage(index[i].m_Book -> GetBasePath() + index[i].m_Page);
+            first = FALSE;
+        }
+    }
+
+    wxString cnttext;
+    cnttext.Printf(_("%i of %i"), cnt, cnt);
+    m_IndexCountInfo -> SetLabel(cnttext);
+}
+
 
 void wxHtmlHelpFrame::OnSearchSel(wxCommandEvent& WXUNUSED(event))
 {
@@ -958,6 +1045,9 @@ BEGIN_EVENT_TABLE(wxHtmlHelpFrame, wxFrame)
     EVT_LISTBOX(wxID_HTML_SEARCHLIST, wxHtmlHelpFrame::OnSearchSel)
     EVT_BUTTON(wxID_HTML_SEARCHBUTTON, wxHtmlHelpFrame::OnSearch)
     EVT_TEXT_ENTER(wxID_HTML_SEARCHTEXT, wxHtmlHelpFrame::OnSearch)
+    EVT_BUTTON(wxID_HTML_INDEXBUTTON, wxHtmlHelpFrame::OnIndexFind)
+    EVT_TEXT_ENTER(wxID_HTML_INDEXTEXT, wxHtmlHelpFrame::OnIndexFind)
+    EVT_BUTTON(wxID_HTML_INDEXBUTTONALL, wxHtmlHelpFrame::OnIndexAll)
     EVT_COMBOBOX(wxID_HTML_BOOKMARKSLIST, wxHtmlHelpFrame::OnBookmarksSel)
     EVT_CLOSE(wxHtmlHelpFrame::OnCloseWindow)    
 END_EVENT_TABLE()