Initial revision

[wxWidgets.git] / src / html / helpfrm.cpp

diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp
index 5998ff58929fa864e9fea4dc0e27f5bea414ec9b..aa742ebb450288af7d1aa29fe9dfd5b49c29fbe7 100644 (file)
--- a/src/html/helpfrm.cpp
+++ b/src/html/helpfrm.cpp
@@ -140,7 +140,6 @@ void wxHtmlHelpFrame::Init(wxHtmlHelpData* data)
     m_NormalFonts = m_FixedFonts = NULL;
     m_FontSize = 1;
     m_NormalFace = m_FixedFace = wxEmptyString;
     m_NormalFonts = m_FixedFonts = NULL;
     m_FontSize = 1;
     m_NormalFace = m_FixedFace = wxEmptyString;

-    m_NormalItalic =  m_FixedItalic = wxSLANT;

 }
 
 // Create: builds the GUI components.
 }
 
 // Create: builds the GUI components.


@@ -160,7 +159,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti
     if (m_Config)
         ReadCustomization(m_Config, m_ConfigRoot);
 
     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);
 
 
     GetPosition(&m_Cfg.x, &m_Cfg.y);
 


@@ -255,7 +254,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti
 
         wxLayoutConstraints *b4 = new wxLayoutConstraints;
         m_IndexButtonAll = new wxButton(dummy, wxID_HTML_INDEXBUTTONALL, _("Show all"));
 
         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();
         b4 -> top.Below (m_IndexText, 10);
         b4 -> right.SameAs (dummy, wxRight, 10);
         b4 -> width.AsIs();


@@ -264,7 +263,6 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti
 
         wxLayoutConstraints *b2 = new wxLayoutConstraints;
         m_IndexButton = new wxButton(dummy, wxID_HTML_INDEXBUTTON, _("Find"));
 
         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 -> top.Below (m_IndexText, 10);
         b2 -> right.LeftOf (m_IndexButtonAll, 10);
         b2 -> width.AsIs();


@@ -279,6 +277,11 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti
         b3 -> bottom.SameAs (dummy, wxBottom, 0);
         m_IndexList -> SetConstraints(b3);
 
         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. Note that this is case sensitive, so 'window' and 'Window' is something else!"));
+#endif //wxUSE_TOOLTIPS
+

         dummy -> SetAutoLayout(TRUE);
         dummy -> Layout();
 
         dummy -> SetAutoLayout(TRUE);
         dummy -> Layout();
 


@@ -300,7 +303,9 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti
 
         wxLayoutConstraints *b2 = new wxLayoutConstraints;
         m_SearchButton = new wxButton(dummy, wxID_HTML_SEARCHBUTTON, _("Search"));
 
         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"));
         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();
         b2 -> top.Below (m_SearchText, 10);
         b2 -> left.SameAs (dummy, wxLeft, 10);
         b2 -> width.AsIs();


@@ -603,8 +608,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_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;
 
     {
         int i;


@@ -621,11 +624,11 @@ void wxHtmlHelpFrame::ReadCustomization(wxConfigBase *cfg, const wxString& path)
             }
                     
             for (i = 0; i < cnt; i++) {
             }
                     
             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);
                 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);
             }
                 s = cfg -> Read(val);
                 m_BookmarksPages.Add(s);
             }


@@ -658,8 +661,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("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;
     
     if (m_Bookmarks) {
         int i;


@@ -668,9 +669,9 @@ void wxHtmlHelpFrame::WriteCustomization(wxConfigBase *cfg, const wxString& path
         
         cfg -> Write("hcBookmarksCnt", (long)cnt);
         for (i = 0; i < cnt; i++) {
         
         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]);
             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]);
         }
     }
             cfg -> Write(val, m_BookmarksPages[i]);
         }
     }


@@ -686,7 +687,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] = 
         {
 {
     static int f_sizes[3][7] = 
         {


@@ -695,7 +696,7 @@ static void SetFontsToHtmlWin(wxHtmlWindow *win, wxString scalf, int scalit, wxS
             {14, 16, 18, 24, 32, 38, 45}
         };
 
             {14, 16, 18, 24, 32, 38, 45}
         };
 

-    win -> SetFonts(scalf, scalit, fixf, fixit, f_sizes[size]);
+    win -> SetFonts(scalf, fixf, f_sizes[size]);

 }
 
 
 }
 
 


@@ -703,64 +704,44 @@ class wxHtmlHelpFrameOptionsDialog : public wxDialog
 {
     public:
         wxComboBox *NormalFont, *FixedFont;
 {
     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")};
         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);
 
 
                 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);
 
                 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|wxTOP, 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 = 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);
 
                 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), 
 
                 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)), 
                                 
                 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);
 
                 sizer = new wxBoxSizer(wxHORIZONTAL);
                 sizer -> Add(new wxButton(this, wxID_OK, _("OK")), 0, wxALL, 10);


@@ -778,8 +759,8 @@ class wxHtmlHelpFrameOptionsDialog : public wxDialog
             {
                 wxBusyCursor bcur;
                 SetFontsToHtmlWin(TestWin, 
             {
                 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> "
                                   RadioBox -> GetSelection());
                 TestWin -> SetPage(_("<html><body>"
                                    "Normal face<br>(and <u>underlined</u>. <i>Italic face.</i> "


@@ -793,14 +774,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> "
                                    "<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=-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>"));
             }
 
                                    "</body></html>"));
             }
 


@@ -815,7 +796,6 @@ class wxHtmlHelpFrameOptionsDialog : public wxDialog
 BEGIN_EVENT_TABLE(wxHtmlHelpFrameOptionsDialog, wxDialog)
     EVT_COMBOBOX(-1, wxHtmlHelpFrameOptionsDialog::OnUpdate)
     EVT_RADIOBOX(-1, wxHtmlHelpFrameOptionsDialog::OnUpdate)
 BEGIN_EVENT_TABLE(wxHtmlHelpFrameOptionsDialog, wxDialog)
     EVT_COMBOBOX(-1, wxHtmlHelpFrameOptionsDialog::OnUpdate)
     EVT_RADIOBOX(-1, wxHtmlHelpFrameOptionsDialog::OnUpdate)

-    EVT_RADIOBUTTON(-1, wxHtmlHelpFrameOptionsDialog::OnUpdate)

 END_EVENT_TABLE()
 
 
 END_EVENT_TABLE()
 
 


@@ -848,19 +828,13 @@ void wxHtmlHelpFrame::OptionsDialog()
     if (!m_FixedFace.IsEmpty()) dlg.FixedFont -> SetStringSelection(m_FixedFace);
     else dlg.FixedFont -> SetSelection(0);
     dlg.RadioBox -> SetSelection(m_FontSize);
     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();
     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);

     }
 }
 
     }
 }