Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added Page Break control to spacing page

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68517 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2011-08-04 12:31:44 +00:00
parent 5755acd77f
commit 4c7d9d88b7
3 changed files with 86 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/richtext/richtextindentspage.h
View File

@@ -141,6 +141,7 @@ public:
wxTextCtrl* m_spacingBefore; wxTextCtrl* m_spacingBefore;
wxTextCtrl* m_spacingAfter; wxTextCtrl* m_spacingAfter;
wxComboBox* m_spacingLine; wxComboBox* m_spacingLine;
wxCheckBox* m_pageBreakCtrl;
wxRichTextCtrl* m_previewCtrl; wxRichTextCtrl* m_previewCtrl;
/// Control identifiers /// Control identifiers
enum { enum {
@@ -157,6 +158,7 @@ public:
ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_BEFORE = 10114, ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_BEFORE = 10114,
ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_AFTER = 10116, ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_AFTER = 10116,
ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_LINE = 10115, ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_LINE = 10115,
ID_RICHTEXTINDENTSSPACINGPAGE_PAGEBREAK = 10106,
ID_RICHTEXTINDENTSSPACINGPAGE_PREVIEW_CTRL = 10109 ID_RICHTEXTINDENTSSPACINGPAGE_PREVIEW_CTRL = 10109
}; };
////@end wxRichTextIndentsSpacingPage member variables ////@end wxRichTextIndentsSpacingPage member variables

73
src/richtext/richtextdialogs.pjd
View File

@@ -4329,7 +4329,7 @@
<long name="title-mode">0</long> <long name="title-mode">0</long>
<long name="locked">0</long> <long name="locked">0</long>
<string name="proxy-type">"wbComboBoxProxy"</string> <string name="proxy-type">"wbComboBoxProxy"</string>
<string name="event-handler-0">"wxEVT_COMMAND_COMBOBOX_SELECTED|OnSpacingLineSelected"</string> <string name="event-handler-0">"wxEVT_COMMAND_COMBOBOX_SELECTED|OnSpacingLineSelected|||wxRichTextIndentsSpacingPage"</string>
<string name="proxy-Id name">"ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_LINE"</string> <string name="proxy-Id name">"ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_LINE"</string>
<long name="proxy-Id value">10115</long> <long name="proxy-Id value">10115</long>
<string name="proxy-Name">""</string> <string name="proxy-Name">""</string>
@@ -4386,6 +4386,69 @@
</document> </document>
</document> </document>
</document> </document>
<document>
<string name="title">"wxCheckBox: ID_RICHTEXTINDENTSSPACINGPAGE_PAGEBREAK"</string>
<string name="type">"dialog-control-document"</string>
<string name="filename">""</string>
<string name="icon-name">"checkbox"</string>
<long name="is-transient">0</long>
<long name="owns-file">1</long>
<long name="title-mode">0</long>
<long name="locked">0</long>
<string name="proxy-type">"wbCheckBoxProxy"</string>
<string name="proxy-Id name">"ID_RICHTEXTINDENTSSPACINGPAGE_PAGEBREAK"</string>
<long name="proxy-Id value">10106</long>
<string name="proxy-Name">""</string>
<string name="proxy-Class">"wxCheckBox"</string>
<string name="proxy-Base class">"wxCheckBox"</string>
<bool name="proxy-External implementation">1</bool>
<bool name="proxy-Separate files">0</bool>
<string name="proxy-Implementation filename">""</string>
<string name="proxy-Header filename">""</string>
<string name="proxy-Member variable name">"m_pageBreakCtrl"</string>
<string name="proxy-Label">"&amp;Page Break"</string>
<bool name="proxy-Initial value">0</bool>
<string name="proxy-Help text">"Inserts a page break before the paragraph."</string>
<string name="proxy-Tooltip text">""</string>
<string name="proxy-Data variable">""</string>
<string name="proxy-Data validator">""</string>
<string name="proxy-Data source">""</string>
<string name="proxy-Data class name">""</string>
<string name="proxy-Data class implementation filename">""</string>
<string name="proxy-Data class header filename">""</string>
<string name="proxy-Data class manager window">""</string>
<string name="proxy-Background colour">""</string>
<string name="proxy-Foreground colour">""</string>
<string name="proxy-Font">""</string>
<bool name="proxy-Hidden">0</bool>
<bool name="proxy-Enabled">1</bool>
<string name="proxy-Platform">"&lt;Any platform&gt;"</string>
<bool name="proxy-wxALIGN_RIGHT">0</bool>
<bool name="proxy-wxCHK_2STATE">0</bool>
<bool name="proxy-wxCHK_3STATE">0</bool>
<bool name="proxy-wxCHK_ALLOW_3RD_STATE_FOR_USER">0</bool>
<bool name="proxy-wxWANTS_CHARS">0</bool>
<bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
<bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
<string name="proxy-Custom styles">""</string>
<long name="proxy-X">-1</long>
<long name="proxy-Y">-1</long>
<long name="proxy-Width">-1</long>
<long name="proxy-Height">-1</long>
<string name="proxy-AlignH">"Left"</string>
<string name="proxy-AlignV">"Centre"</string>
<long name="proxy-Stretch factor">0</long>
<long name="proxy-Border">5</long>
<bool name="proxy-wxLEFT">1</bool>
<bool name="proxy-wxRIGHT">1</bool>
<bool name="proxy-wxTOP">1</bool>
<bool name="proxy-wxBOTTOM">1</bool>
<bool name="proxy-wxSHAPED">0</bool>
<bool name="proxy-wxADJUST_MINSIZE">0</bool>
<bool name="proxy-wxFIXED_MINSIZE">0</bool>
<string name="proxy-Custom arguments">""</string>
<string name="proxy-Custom ctor arguments">""</string>
</document>
</document> </document>
</document> </document>
<document> <document>
@@ -10382,6 +10445,14 @@
<string name="proxy-type">"wbBoxSizerProxy"</string> <string name="proxy-type">"wbBoxSizerProxy"</string>
<string name="proxy-Orientation">"Vertical"</string> <string name="proxy-Orientation">"Vertical"</string>
<string name="proxy-Member variable name">""</string> <string name="proxy-Member variable name">""</string>
<string name="proxy-AlignH">"Centre"</string>
<string name="proxy-AlignV">"Centre"</string>
<long name="proxy-Stretch factor">0</long>
<long name="proxy-Border">5</long>
<bool name="proxy-wxLEFT">1</bool>
<bool name="proxy-wxRIGHT">1</bool>
<bool name="proxy-wxTOP">1</bool>
<bool name="proxy-wxBOTTOM">1</bool>
<bool name="proxy-wxSHAPED">0</bool> <bool name="proxy-wxSHAPED">0</bool>
<bool name="proxy-wxADJUST_MINSIZE">0</bool> <bool name="proxy-wxADJUST_MINSIZE">0</bool>
<bool name="proxy-wxFIXED_MINSIZE">0</bool> <bool name="proxy-wxFIXED_MINSIZE">0</bool>

12
src/richtext/richtextindentspage.cpp
View File

@@ -92,6 +92,7 @@ void wxRichTextIndentsSpacingPage::Init()
m_spacingBefore = NULL; m_spacingBefore = NULL;
m_spacingAfter = NULL; m_spacingAfter = NULL;
m_spacingLine = NULL; m_spacingLine = NULL;
m_pageBreakCtrl = NULL;
m_previewCtrl = NULL; m_previewCtrl = NULL;
////@end wxRichTextIndentsSpacingPage member initialisation ////@end wxRichTextIndentsSpacingPage member initialisation
@@ -314,6 +315,13 @@ void wxRichTextIndentsSpacingPage::CreateControls()
m_spacingLine->SetToolTip(_("The line spacing.")); m_spacingLine->SetToolTip(_("The line spacing."));
itemFlexGridSizer38->Add(m_spacingLine, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); itemFlexGridSizer38->Add(m_spacingLine, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5);
m_pageBreakCtrl = new wxCheckBox( itemRichTextDialogPage1, ID_RICHTEXTINDENTSSPACINGPAGE_PAGEBREAK, _("&Page Break"), wxDefaultPosition, wxDefaultSize, 0 );
m_pageBreakCtrl->SetValue(false);
m_pageBreakCtrl->SetHelpText(_("Inserts a page break before the paragraph."));
if (wxRichTextIndentsSpacingPage::ShowToolTips())
m_pageBreakCtrl->SetToolTip(_("Inserts a page break before the paragraph."));
itemBoxSizer34->Add(m_pageBreakCtrl, 0, wxALIGN_LEFT|wxALL, 5);
itemBoxSizer3->Add(5, 5, 0, wxALIGN_CENTER_HORIZONTAL, 5); itemBoxSizer3->Add(5, 5, 0, wxALIGN_CENTER_HORIZONTAL, 5);
m_previewCtrl = new wxRichTextCtrl( itemRichTextDialogPage1, ID_RICHTEXTINDENTSSPACINGPAGE_PREVIEW_CTRL, wxEmptyString, wxDefaultPosition, wxSize(350, 100), wxVSCROLL|wxTE_READONLY ); m_previewCtrl = new wxRichTextCtrl( itemRichTextDialogPage1, ID_RICHTEXTINDENTSSPACINGPAGE_PREVIEW_CTRL, wxEmptyString, wxDefaultPosition, wxSize(350, 100), wxVSCROLL|wxTE_READONLY );
@@ -450,6 +458,8 @@ bool wxRichTextIndentsSpacingPage::TransferDataFromWindow()
else else
attr->SetOutlineLevel(outlineLevel-1); attr->SetOutlineLevel(outlineLevel-1);
attr->SetPageBreak(m_pageBreakCtrl->GetValue());
return true; return true;
} }
@@ -546,6 +556,8 @@ bool wxRichTextIndentsSpacingPage::TransferDataToWindow()
else else
m_outlineLevelCtrl->SetSelection(0); m_outlineLevelCtrl->SetSelection(0);
m_pageBreakCtrl->SetValue(attr->HasPageBreak());
UpdatePreview(); UpdatePreview();
m_dontUpdate = false; m_dontUpdate = false;