X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/23c386ba20f310b1e9916bde1a5f0668ea8fb6e1..17b1d76b4add82305463d10b9f65668d06169363:/samples/richtext/richtext.cpp diff --git a/samples/richtext/richtext.cpp b/samples/richtext/richtext.cpp index 5b9d31f672..c0f12931b9 100644 --- a/samples/richtext/richtext.cpp +++ b/samples/richtext/richtext.cpp @@ -71,6 +71,7 @@ #include "wx/richtext/richtexthtml.h" #include "wx/richtext/richtextformatdlg.h" #include "wx/richtext/richtextsymboldlg.h" +#include "wx/richtext/richtextstyledlg.h" // ---------------------------------------------------------------------------- // resources @@ -149,9 +150,18 @@ public: void OnParagraphSpacingMore(wxCommandEvent& event); void OnParagraphSpacingLess(wxCommandEvent& event); + void OnNumberList(wxCommandEvent& event); + void OnBulletsAndNumbering(wxCommandEvent& event); + void OnItemizeList(wxCommandEvent& event); + void OnRenumberList(wxCommandEvent& event); + void OnPromoteList(wxCommandEvent& event); + void OnDemoteList(wxCommandEvent& event); + void OnClearList(wxCommandEvent& event); + void OnViewHTML(wxCommandEvent& event); void OnSwitchStyleSheets(wxCommandEvent& event); + void OnManageStyles(wxCommandEvent& event); // Forward command events to the current rich text control, if any bool ProcessEvent(wxEvent& event); @@ -197,8 +207,17 @@ enum ID_FORMAT_LINE_SPACING_DOUBLE, ID_FORMAT_LINE_SPACING_SINGLE, + ID_FORMAT_NUMBER_LIST, + ID_FORMAT_BULLETS_AND_NUMBERING, + ID_FORMAT_ITEMIZE_LIST, + ID_FORMAT_RENUMBER_LIST, + ID_FORMAT_PROMOTE_LIST, + ID_FORMAT_DEMOTE_LIST, + ID_FORMAT_CLEAR_LIST, + ID_VIEW_HTML, ID_SWITCH_STYLE_SHEETS, + ID_MANAGE_STYLES, ID_RICHTEXT_CTRL, ID_RICHTEXT_STYLE_LIST, @@ -254,8 +273,17 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(ID_INSERT_SYMBOL, MyFrame::OnInsertSymbol) + EVT_MENU(ID_FORMAT_NUMBER_LIST, MyFrame::OnNumberList) + EVT_MENU(ID_FORMAT_BULLETS_AND_NUMBERING, MyFrame::OnBulletsAndNumbering) + EVT_MENU(ID_FORMAT_ITEMIZE_LIST, MyFrame::OnItemizeList) + EVT_MENU(ID_FORMAT_RENUMBER_LIST, MyFrame::OnRenumberList) + EVT_MENU(ID_FORMAT_PROMOTE_LIST, MyFrame::OnPromoteList) + EVT_MENU(ID_FORMAT_DEMOTE_LIST, MyFrame::OnDemoteList) + EVT_MENU(ID_FORMAT_CLEAR_LIST, MyFrame::OnClearList) + EVT_MENU(ID_VIEW_HTML, MyFrame::OnViewHTML) EVT_MENU(ID_SWITCH_STYLE_SHEETS, MyFrame::OnSwitchStyleSheets) + EVT_MENU(ID_MANAGE_STYLES, MyFrame::OnManageStyles) END_EVENT_TABLE() // Create a new application object: this macro will allow wxWidgets to create @@ -410,6 +438,47 @@ void MyApp::CreateStyles() redDef->SetStyle(redAttr); m_styleSheet->AddCharacterStyle(redDef); + + wxRichTextListStyleDefinition* bulletList = new wxRichTextListStyleDefinition(wxT("Bullet List 1")); + int i; + for (i = 0; i < 10; i++) + { + wxString bulletSymbol; + if (i == 0) + bulletSymbol = wxT("*"); + else if (i == 1) + bulletSymbol = wxT("-"); + else if (i == 2) + bulletSymbol = wxT("*"); + else if (i == 3) + bulletSymbol = wxT("-"); + else + bulletSymbol = wxT("*"); + + bulletList->SetAttributes(i, (i+1)*60, 60, wxTEXT_ATTR_BULLET_STYLE_SYMBOL, bulletSymbol); + } + + m_styleSheet->AddListStyle(bulletList); + + wxRichTextListStyleDefinition* numberedList = new wxRichTextListStyleDefinition(wxT("Numbered List 1")); + for (i = 0; i < 10; i++) + { + long numberStyle; + if (i == 0) + numberStyle = wxTEXT_ATTR_BULLET_STYLE_ARABIC|wxTEXT_ATTR_BULLET_STYLE_PERIOD; + else if (i == 1) + numberStyle = wxTEXT_ATTR_BULLET_STYLE_LETTERS_LOWER|wxTEXT_ATTR_BULLET_STYLE_PARENTHESES; + else if (i == 2) + numberStyle = wxTEXT_ATTR_BULLET_STYLE_ROMAN_LOWER|wxTEXT_ATTR_BULLET_STYLE_PARENTHESES; + else if (i == 3) + numberStyle = wxTEXT_ATTR_BULLET_STYLE_ROMAN_UPPER|wxTEXT_ATTR_BULLET_STYLE_PARENTHESES; + else + numberStyle = wxTEXT_ATTR_BULLET_STYLE_ARABIC|wxTEXT_ATTR_BULLET_STYLE_PERIOD; + + numberedList->SetAttributes(i, (i+1)*60, 60, numberStyle); + } + + m_styleSheet->AddListStyle(numberedList); } // ---------------------------------------------------------------------------- @@ -481,6 +550,17 @@ MyFrame::MyFrame(const wxString& title, wxWindowID id, const wxPoint& pos, formatMenu->Append(ID_FORMAT_CONTENT, _("Font and Pa&ragraph...\tShift+Ctrl+F")); formatMenu->AppendSeparator(); formatMenu->Append(ID_SWITCH_STYLE_SHEETS, _("&Switch Style Sheets")); + formatMenu->Append(ID_MANAGE_STYLES, _("&Manage Styles")); + + wxMenu* listsMenu = new wxMenu; + listsMenu->Append(ID_FORMAT_BULLETS_AND_NUMBERING, _("Bullets and &Numbering...")); + listsMenu->AppendSeparator(); + listsMenu->Append(ID_FORMAT_NUMBER_LIST, _("Number List")); + listsMenu->Append(ID_FORMAT_ITEMIZE_LIST, _("Itemize List")); + listsMenu->Append(ID_FORMAT_RENUMBER_LIST, _("Renumber List")); + listsMenu->Append(ID_FORMAT_PROMOTE_LIST, _("Promote List Items")); + listsMenu->Append(ID_FORMAT_DEMOTE_LIST, _("Demote List Items")); + listsMenu->Append(ID_FORMAT_CLEAR_LIST, _("Clear List Formatting")); wxMenu* insertMenu = new wxMenu; insertMenu->Append(ID_INSERT_SYMBOL, _("&Symbol...\tCtrl+I")); @@ -490,6 +570,7 @@ MyFrame::MyFrame(const wxString& title, wxWindowID id, const wxPoint& pos, menuBar->Append(fileMenu, _T("&File")); menuBar->Append(editMenu, _T("&Edit")); menuBar->Append(formatMenu, _T("F&ormat")); + menuBar->Append(listsMenu, _T("&Lists")); menuBar->Append(insertMenu, _T("&Insert")); menuBar->Append(helpMenu, _T("&Help")); @@ -555,42 +636,26 @@ MyFrame::MyFrame(const wxString& title, wxWindowID id, const wxPoint& pos, combo->SetRichTextCtrl(m_richTextCtrl); combo->UpdateStyles(); - wxRichTextStyleListBox* styleListBox = new wxRichTextStyleListBox(splitter, ID_RICHTEXT_STYLE_LIST); + wxRichTextStyleListCtrl* styleListCtrl = new wxRichTextStyleListCtrl(splitter, ID_RICHTEXT_STYLE_LIST); wxSize display = wxGetDisplaySize(); if ( is_pda && ( display.GetWidth() < display.GetHeight() ) ) { - splitter->SplitHorizontally(m_richTextCtrl, styleListBox); + splitter->SplitHorizontally(m_richTextCtrl, styleListCtrl); } else { - splitter->SplitVertically(m_richTextCtrl, styleListBox, 500); + splitter->SplitVertically(m_richTextCtrl, styleListCtrl, 500); } splitter->UpdateSize(); - styleListBox->SetStyleSheet(wxGetApp().GetStyleSheet()); - styleListBox->SetRichTextCtrl(m_richTextCtrl); - styleListBox->UpdateStyles(); + styleListCtrl->SetStyleSheet(wxGetApp().GetStyleSheet()); + styleListCtrl->SetRichTextCtrl(m_richTextCtrl); + styleListCtrl->UpdateStyles(); wxRichTextCtrl& r = *m_richTextCtrl; -#if 0 - r.WriteText(wxT("One\nTwo\nThree\n")); -#if 0 - int i; - for (i = 0; i < 3; i++) - { - - wxRichTextParagraph* para = r.GetBuffer().GetParagraphAtLine(i); - if (para) - { - wxLogDebug(wxT("Range for paragraph %d: %d -> %d"), i, para->GetRange().GetStart(), para->GetRange().GetEnd()); - } - } -#endif -#else - r.BeginSuppressUndo(); r.BeginParagraphSpacing(0, 20); @@ -669,7 +734,7 @@ MyFrame::MyFrame(const wxString& title, wxWindowID id, const wxPoint& pos, r.BeginNumberedBullet(1, 100, 60); r.Newline(); - r.WriteText(wxT("This is my first item. Note that wxRichTextCtrl doesn't automatically do numbering, but this will be added later.")); + r.WriteText(wxT("This is my first item. Note that wxRichTextCtrl can apply numbering and bullets automatically based on list styles, but this list is formatted explicitly by setting indents.")); r.EndNumberedBullet(); r.BeginNumberedBullet(2, 100, 60); @@ -758,7 +823,6 @@ MyFrame::MyFrame(const wxString& title, wxWindowID id, const wxPoint& pos, r.EndParagraphSpacing(); r.EndSuppressUndo(); -#endif } @@ -1206,7 +1270,7 @@ void MyFrame::OnSwitchStyleSheets(wxCommandEvent& WXUNUSED(event)) static wxRichTextStyleSheet* gs_AlternateStyleSheet = NULL; wxRichTextCtrl* ctrl = (wxRichTextCtrl*) FindWindow(ID_RICHTEXT_CTRL); - wxRichTextStyleListBox* styleList = (wxRichTextStyleListBox*) FindWindow(ID_RICHTEXT_STYLE_LIST); + wxRichTextStyleListCtrl *styleList = (wxRichTextStyleListCtrl*) FindWindow(ID_RICHTEXT_STYLE_LIST); wxRichTextStyleComboCtrl* styleCombo = (wxRichTextStyleComboCtrl*) FindWindow(ID_RICHTEXT_STYLE_COMBO); wxRichTextStyleSheet* sheet = ctrl->GetStyleSheet(); @@ -1253,6 +1317,17 @@ void MyFrame::OnSwitchStyleSheets(wxCommandEvent& WXUNUSED(event)) styleCombo->UpdateStyles(); } +void MyFrame::OnManageStyles(wxCommandEvent& WXUNUSED(event)) +{ + wxRichTextCtrl* ctrl = (wxRichTextCtrl*) FindWindow(ID_RICHTEXT_CTRL); + wxRichTextStyleSheet* sheet = ctrl->GetStyleSheet(); + + int flags = wxRICHTEXT_ORGANISER_CREATE_STYLES|wxRICHTEXT_ORGANISER_EDIT_STYLES; + + wxRichTextStyleOrganiserDialog dlg(flags, sheet, NULL, this, wxID_ANY, _("Style Manager")); + dlg.ShowModal(); +} + void MyFrame::OnInsertSymbol(wxCommandEvent& WXUNUSED(event)) { wxRichTextCtrl* ctrl = (wxRichTextCtrl*) FindWindow(ID_RICHTEXT_CTRL); @@ -1289,3 +1364,85 @@ void MyFrame::OnInsertSymbol(wxCommandEvent& WXUNUSED(event)) } } } + +void MyFrame::OnNumberList(wxCommandEvent& WXUNUSED(event)) +{ + wxRichTextCtrl* ctrl = (wxRichTextCtrl*) FindWindow(ID_RICHTEXT_CTRL); + + if (ctrl->HasSelection()) + { + wxRichTextRange range = ctrl->GetSelectionRange(); + ctrl->SetListStyle(range, wxT("Numbered List 1"), wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_RENUMBER); + } +} + +void MyFrame::OnBulletsAndNumbering(wxCommandEvent& WXUNUSED(event)) +{ + wxRichTextCtrl* ctrl = (wxRichTextCtrl*) FindWindow(ID_RICHTEXT_CTRL); + wxRichTextStyleSheet* sheet = ctrl->GetStyleSheet(); + + int flags = wxRICHTEXT_ORGANISER_BROWSE_NUMBERING; + + wxRichTextStyleOrganiserDialog dlg(flags, sheet, ctrl, this, wxID_ANY, _("Bullets and Numbering")); + if (dlg.ShowModal() == wxID_OK) + { + if (dlg.GetSelectedStyleDefinition()) + dlg.ApplyStyle(); + } +} + +void MyFrame::OnItemizeList(wxCommandEvent& WXUNUSED(event)) +{ + wxRichTextCtrl* ctrl = (wxRichTextCtrl*) FindWindow(ID_RICHTEXT_CTRL); + + if (ctrl->HasSelection()) + { + wxRichTextRange range = ctrl->GetSelectionRange(); + ctrl->SetListStyle(range, wxT("Bullet List 1")); + } +} + +void MyFrame::OnRenumberList(wxCommandEvent& WXUNUSED(event)) +{ + wxRichTextCtrl* ctrl = (wxRichTextCtrl*) FindWindow(ID_RICHTEXT_CTRL); + + if (ctrl->HasSelection()) + { + wxRichTextRange range = ctrl->GetSelectionRange(); + ctrl->NumberList(range, NULL, wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_RENUMBER); + } +} + +void MyFrame::OnPromoteList(wxCommandEvent& WXUNUSED(event)) +{ + wxRichTextCtrl* ctrl = (wxRichTextCtrl*) FindWindow(ID_RICHTEXT_CTRL); + + if (ctrl->HasSelection()) + { + wxRichTextRange range = ctrl->GetSelectionRange(); + ctrl->PromoteList(1, range, NULL); + } +} + +void MyFrame::OnDemoteList(wxCommandEvent& WXUNUSED(event)) +{ + wxRichTextCtrl* ctrl = (wxRichTextCtrl*) FindWindow(ID_RICHTEXT_CTRL); + + if (ctrl->HasSelection()) + { + wxRichTextRange range = ctrl->GetSelectionRange(); + ctrl->PromoteList(-1, range, NULL); + } +} + +void MyFrame::OnClearList(wxCommandEvent& WXUNUSED(event)) +{ + wxRichTextCtrl* ctrl = (wxRichTextCtrl*) FindWindow(ID_RICHTEXT_CTRL); + + if (ctrl->HasSelection()) + { + wxRichTextRange range = ctrl->GetSelectionRange(); + ctrl->ClearListStyle(range); + } +} +