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

Implemented editing all 4 borders at once in wxRTC borders page

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2013-10-22 18:44:29 +00:00
parent 4068836657
commit 830a43c468
3 changed files with 720 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
include/wx/richtext/richtextborderspage.h
View File

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: wx/richtext/richtextborderspage.h // Name: wx/richtext/richtextborderspage.h
// Purpose: // Purpose: A border editing page for the wxRTC formatting dialog.
// Author: Julian Smart // Author: Julian Smart
// Modified by: // Modified by:
// Created: 21/10/2010 11:34:24 // Created: 21/10/2010 11:34:24
@@ -12,7 +12,6 @@
#ifndef _RICHTEXTBORDERSPAGE_H_ #ifndef _RICHTEXTBORDERSPAGE_H_
#define _RICHTEXTBORDERSPAGE_H_ #define _RICHTEXTBORDERSPAGE_H_
/*! /*!
* Includes * Includes
*/ */
@@ -78,6 +77,9 @@ public:
virtual bool TransferDataToWindow(); virtual bool TransferDataToWindow();
virtual bool TransferDataFromWindow(); virtual bool TransferDataFromWindow();
/// Updates the synchronization checkboxes to reflect the state of the attributes
void UpdateSyncControls();
/// Updates the preview /// Updates the preview
void OnCommand(wxCommandEvent& event); void OnCommand(wxCommandEvent& event);
@@ -97,9 +99,21 @@ public:
/// wxEVT_COMMAND_CHECKBOX_CLICKED event handler for ID_RICHTEXT_BORDER_LEFT_CHECKBOX /// wxEVT_COMMAND_CHECKBOX_CLICKED event handler for ID_RICHTEXT_BORDER_LEFT_CHECKBOX
void OnRichtextBorderCheckboxClick( wxCommandEvent& event ); void OnRichtextBorderCheckboxClick( wxCommandEvent& event );
/// wxEVT_COMMAND_TEXT_UPDATED event handler for ID_RICHTEXT_BORDER_LEFT
void OnRichtextBorderLeftValueTextUpdated( wxCommandEvent& event );
/// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_BORDER_LEFT /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_BORDER_LEFT
void OnRichtextBorderLeftUpdate( wxUpdateUIEvent& event ); void OnRichtextBorderLeftUpdate( wxUpdateUIEvent& event );
/// wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_RICHTEXT_BORDER_LEFT_UNITS
void OnRichtextBorderLeftUnitsSelected( wxCommandEvent& event );
/// wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_RICHTEXT_BORDER_LEFT_STYLE
void OnRichtextBorderLeftStyleSelected( wxCommandEvent& event );
/// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_BORDER_RIGHT_CHECKBOX
void OnRichtextBorderOtherCheckboxUpdate( wxUpdateUIEvent& event );
/// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_BORDER_RIGHT /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_BORDER_RIGHT
void OnRichtextBorderRightUpdate( wxUpdateUIEvent& event ); void OnRichtextBorderRightUpdate( wxUpdateUIEvent& event );
@@ -109,9 +123,27 @@ public:
/// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_BORDER_BOTTOM /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_BORDER_BOTTOM
void OnRichtextBorderBottomUpdate( wxUpdateUIEvent& event ); void OnRichtextBorderBottomUpdate( wxUpdateUIEvent& event );
/// wxEVT_COMMAND_CHECKBOX_CLICKED event handler for ID_RICHTEXT_BORDER_SYNCHRONIZE
void OnRichtextBorderSynchronizeClick( wxCommandEvent& event );
/// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_BORDER_SYNCHRONIZE
void OnRichtextBorderSynchronizeUpdate( wxUpdateUIEvent& event );
/// wxEVT_COMMAND_TEXT_UPDATED event handler for ID_RICHTEXT_OUTLINE_LEFT
void OnRichtextOutlineLeftTextUpdated( wxCommandEvent& event );
/// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_OUTLINE_LEFT /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_OUTLINE_LEFT
void OnRichtextOutlineLeftUpdate( wxUpdateUIEvent& event ); void OnRichtextOutlineLeftUpdate( wxUpdateUIEvent& event );
/// wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_RICHTEXT_OUTLINE_LEFT_UNITS
void OnRichtextOutlineLeftUnitsSelected( wxCommandEvent& event );
/// wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_RICHTEXT_OUTLINE_LEFT_STYLE
void OnRichtextOutlineLeftStyleSelected( wxCommandEvent& event );
/// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_OUTLINE_RIGHT_CHECKBOX
void OnRichtextOutlineOtherCheckboxUpdate( wxUpdateUIEvent& event );
/// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_OUTLINE_RIGHT /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_OUTLINE_RIGHT
void OnRichtextOutlineRightUpdate( wxUpdateUIEvent& event ); void OnRichtextOutlineRightUpdate( wxUpdateUIEvent& event );
@@ -121,6 +153,12 @@ public:
/// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_OUTLINE_BOTTOM /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_OUTLINE_BOTTOM
void OnRichtextOutlineBottomUpdate( wxUpdateUIEvent& event ); void OnRichtextOutlineBottomUpdate( wxUpdateUIEvent& event );
/// wxEVT_COMMAND_CHECKBOX_CLICKED event handler for ID_RICHTEXT_OUTLINE_SYNCHRONIZE
void OnRichtextOutlineSynchronizeClick( wxCommandEvent& event );
/// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_OUTLINE_SYNCHRONIZE
void OnRichtextOutlineSynchronizeUpdate( wxUpdateUIEvent& event );
////@end wxRichTextBordersPage event handler declarations ////@end wxRichTextBordersPage event handler declarations
////@begin wxRichTextBordersPage member function declarations ////@begin wxRichTextBordersPage member function declarations
@@ -156,6 +194,7 @@ public:
wxComboBox* m_bottomBorderWidthUnits; wxComboBox* m_bottomBorderWidthUnits;
wxComboBox* m_bottomBorderStyle; wxComboBox* m_bottomBorderStyle;
wxRichTextColourSwatchCtrl* m_bottomBorderColour; wxRichTextColourSwatchCtrl* m_bottomBorderColour;
wxCheckBox* m_borderSyncCtrl;
wxCheckBox* m_leftOutlineCheckbox; wxCheckBox* m_leftOutlineCheckbox;
wxTextCtrl* m_leftOutlineWidth; wxTextCtrl* m_leftOutlineWidth;
wxComboBox* m_leftOutlineWidthUnits; wxComboBox* m_leftOutlineWidthUnits;
@@ -176,6 +215,7 @@ public:
wxComboBox* m_bottomOutlineWidthUnits; wxComboBox* m_bottomOutlineWidthUnits;
wxComboBox* m_bottomOutlineStyle; wxComboBox* m_bottomOutlineStyle;
wxRichTextColourSwatchCtrl* m_bottomOutlineColour; wxRichTextColourSwatchCtrl* m_bottomOutlineColour;
wxCheckBox* m_outlineSyncCtrl;
wxRichTextBorderPreviewCtrl* m_borderPreviewCtrl; wxRichTextBorderPreviewCtrl* m_borderPreviewCtrl;
/// Control identifiers /// Control identifiers
enum { enum {
@@ -202,6 +242,7 @@ public:
ID_RICHTEXT_BORDER_BOTTOM_UNITS = 10820, ID_RICHTEXT_BORDER_BOTTOM_UNITS = 10820,
ID_RICHTEXT_BORDER_BOTTOM_STYLE = 10821, ID_RICHTEXT_BORDER_BOTTOM_STYLE = 10821,
ID_RICHTEXT_BORDER_BOTTOM_COLOUR = 10822, ID_RICHTEXT_BORDER_BOTTOM_COLOUR = 10822,
ID_RICHTEXT_BORDER_SYNCHRONIZE = 10845,
ID_RICHTEXTBORDERSPAGE_OUTLINE = 10823, ID_RICHTEXTBORDERSPAGE_OUTLINE = 10823,
ID_RICHTEXT_OUTLINE_LEFT_CHECKBOX = 10824, ID_RICHTEXT_OUTLINE_LEFT_CHECKBOX = 10824,
ID_RICHTEXT_OUTLINE_LEFT = 10825, ID_RICHTEXT_OUTLINE_LEFT = 10825,
@@ -223,6 +264,7 @@ public:
ID_RICHTEXT_OUTLINE_BOTTOM_UNITS = 10841, ID_RICHTEXT_OUTLINE_BOTTOM_UNITS = 10841,
ID_RICHTEXT_OUTLINE_BOTTOM_STYLE = 10842, ID_RICHTEXT_OUTLINE_BOTTOM_STYLE = 10842,
ID_RICHTEXT_OUTLINE_BOTTOM_COLOUR = 10843, ID_RICHTEXT_OUTLINE_BOTTOM_COLOUR = 10843,
ID_RICHTEXT_OUTLINE_SYNCHRONIZE = 10846,
ID_RICHTEXT_BORDER_PREVIEW = 10844 ID_RICHTEXT_BORDER_PREVIEW = 10844
}; };
////@end wxRichTextBordersPage member variables ////@end wxRichTextBordersPage member variables

564
src/richtext/richtextborderspage.cpp
View File

@@ -1,12 +1,12 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: src/richtext/richtextborderspage.cpp // Name: src/richtext/richtextborderspage.cpp
// Purpose: // Purpose: A border editing page for the wxRTC formatting dialog.
// Author: Julian Smart // Author: Julian Smart
// Modified by: // Modified by:
// Created: 21/10/2010 11:34:24 // Created: 21/10/2010 11:34:24
// RCS-ID: // RCS-ID:
// Copyright: (c) Julian Smart // Copyright: (c) Julian Smart
// Licence: // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
////@begin includes ////@begin includes
@@ -18,14 +18,12 @@
////@begin XPM images ////@begin XPM images
////@end XPM images ////@end XPM images
/*! /*!
* wxRichTextBordersPage type definition * wxRichTextBordersPage type definition
*/ */
IMPLEMENT_DYNAMIC_CLASS( wxRichTextBordersPage, wxRichTextDialogPage ) IMPLEMENT_DYNAMIC_CLASS( wxRichTextBordersPage, wxRichTextDialogPage )
/*! /*!
* wxRichTextBordersPage event table definition * wxRichTextBordersPage event table definition
*/ */
@@ -40,45 +38,61 @@ BEGIN_EVENT_TABLE( wxRichTextBordersPage, wxRichTextDialogPage )
////@begin wxRichTextBordersPage event table entries ////@begin wxRichTextBordersPage event table entries
EVT_CHECKBOX( ID_RICHTEXT_BORDER_LEFT_CHECKBOX, wxRichTextBordersPage::OnRichtextBorderCheckboxClick ) EVT_CHECKBOX( ID_RICHTEXT_BORDER_LEFT_CHECKBOX, wxRichTextBordersPage::OnRichtextBorderCheckboxClick )
EVT_TEXT( ID_RICHTEXT_BORDER_LEFT, wxRichTextBordersPage::OnRichtextBorderLeftValueTextUpdated )
EVT_UPDATE_UI( ID_RICHTEXT_BORDER_LEFT, wxRichTextBordersPage::OnRichtextBorderLeftUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_BORDER_LEFT, wxRichTextBordersPage::OnRichtextBorderLeftUpdate )
EVT_COMBOBOX( ID_RICHTEXT_BORDER_LEFT_UNITS, wxRichTextBordersPage::OnRichtextBorderLeftUnitsSelected )
EVT_UPDATE_UI( ID_RICHTEXT_BORDER_LEFT_UNITS, wxRichTextBordersPage::OnRichtextBorderLeftUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_BORDER_LEFT_UNITS, wxRichTextBordersPage::OnRichtextBorderLeftUpdate )
EVT_COMBOBOX( ID_RICHTEXT_BORDER_LEFT_STYLE, wxRichTextBordersPage::OnRichtextBorderLeftStyleSelected )
EVT_UPDATE_UI( ID_RICHTEXT_BORDER_LEFT_STYLE, wxRichTextBordersPage::OnRichtextBorderLeftUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_BORDER_LEFT_STYLE, wxRichTextBordersPage::OnRichtextBorderLeftUpdate )
EVT_UPDATE_UI( ID_RICHTEXT_BORDER_LEFT_COLOUR, wxRichTextBordersPage::OnRichtextBorderLeftUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_BORDER_LEFT_COLOUR, wxRichTextBordersPage::OnRichtextBorderLeftUpdate )
EVT_CHECKBOX( ID_RICHTEXT_BORDER_RIGHT_CHECKBOX, wxRichTextBordersPage::OnRichtextBorderCheckboxClick ) EVT_CHECKBOX( ID_RICHTEXT_BORDER_RIGHT_CHECKBOX, wxRichTextBordersPage::OnRichtextBorderCheckboxClick )
EVT_UPDATE_UI( ID_RICHTEXT_BORDER_RIGHT_CHECKBOX, wxRichTextBordersPage::OnRichtextBorderOtherCheckboxUpdate )
EVT_UPDATE_UI( ID_RICHTEXT_BORDER_RIGHT, wxRichTextBordersPage::OnRichtextBorderRightUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_BORDER_RIGHT, wxRichTextBordersPage::OnRichtextBorderRightUpdate )
EVT_UPDATE_UI( ID_RICHTEXT_BORDER_RIGHT_UNITS, wxRichTextBordersPage::OnRichtextBorderRightUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_BORDER_RIGHT_UNITS, wxRichTextBordersPage::OnRichtextBorderRightUpdate )
EVT_UPDATE_UI( ID_RICHTEXT_BORDER_RIGHT_STYLE, wxRichTextBordersPage::OnRichtextBorderRightUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_BORDER_RIGHT_STYLE, wxRichTextBordersPage::OnRichtextBorderRightUpdate )
EVT_UPDATE_UI( ID_RICHTEXT_BORDER_RIGHT_COLOUR, wxRichTextBordersPage::OnRichtextBorderRightUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_BORDER_RIGHT_COLOUR, wxRichTextBordersPage::OnRichtextBorderRightUpdate )
EVT_CHECKBOX( ID_RICHTEXT_BORDER_TOP_CHECKBOX, wxRichTextBordersPage::OnRichtextBorderCheckboxClick ) EVT_CHECKBOX( ID_RICHTEXT_BORDER_TOP_CHECKBOX, wxRichTextBordersPage::OnRichtextBorderCheckboxClick )
EVT_UPDATE_UI( ID_RICHTEXT_BORDER_TOP_CHECKBOX, wxRichTextBordersPage::OnRichtextBorderOtherCheckboxUpdate )
EVT_UPDATE_UI( ID_RICHTEXT_BORDER_TOP, wxRichTextBordersPage::OnRichtextBorderTopUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_BORDER_TOP, wxRichTextBordersPage::OnRichtextBorderTopUpdate )
EVT_UPDATE_UI( ID_RICHTEXT_BORDER_TOP_UNITS, wxRichTextBordersPage::OnRichtextBorderTopUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_BORDER_TOP_UNITS, wxRichTextBordersPage::OnRichtextBorderTopUpdate )
EVT_UPDATE_UI( ID_RICHTEXT_BORDER_TOP_STYLE, wxRichTextBordersPage::OnRichtextBorderTopUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_BORDER_TOP_STYLE, wxRichTextBordersPage::OnRichtextBorderTopUpdate )
EVT_UPDATE_UI( ID_RICHTEXT_BORDER_TOP_COLOUR, wxRichTextBordersPage::OnRichtextBorderTopUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_BORDER_TOP_COLOUR, wxRichTextBordersPage::OnRichtextBorderTopUpdate )
EVT_CHECKBOX( ID_RICHTEXT_BORDER_BOTTOM_CHECKBOX, wxRichTextBordersPage::OnRichtextBorderCheckboxClick ) EVT_CHECKBOX( ID_RICHTEXT_BORDER_BOTTOM_CHECKBOX, wxRichTextBordersPage::OnRichtextBorderCheckboxClick )
EVT_UPDATE_UI( ID_RICHTEXT_BORDER_BOTTOM_CHECKBOX, wxRichTextBordersPage::OnRichtextBorderOtherCheckboxUpdate )
EVT_UPDATE_UI( ID_RICHTEXT_BORDER_BOTTOM, wxRichTextBordersPage::OnRichtextBorderBottomUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_BORDER_BOTTOM, wxRichTextBordersPage::OnRichtextBorderBottomUpdate )
EVT_UPDATE_UI( ID_RICHTEXT_BORDER_BOTTOM_UNITS, wxRichTextBordersPage::OnRichtextBorderBottomUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_BORDER_BOTTOM_UNITS, wxRichTextBordersPage::OnRichtextBorderBottomUpdate )
EVT_UPDATE_UI( ID_RICHTEXT_BORDER_BOTTOM_STYLE, wxRichTextBordersPage::OnRichtextBorderBottomUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_BORDER_BOTTOM_STYLE, wxRichTextBordersPage::OnRichtextBorderBottomUpdate )
EVT_UPDATE_UI( ID_RICHTEXT_BORDER_BOTTOM_COLOUR, wxRichTextBordersPage::OnRichtextBorderBottomUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_BORDER_BOTTOM_COLOUR, wxRichTextBordersPage::OnRichtextBorderBottomUpdate )
EVT_CHECKBOX( ID_RICHTEXT_BORDER_SYNCHRONIZE, wxRichTextBordersPage::OnRichtextBorderSynchronizeClick )
EVT_UPDATE_UI( ID_RICHTEXT_BORDER_SYNCHRONIZE, wxRichTextBordersPage::OnRichtextBorderSynchronizeUpdate )
EVT_CHECKBOX( ID_RICHTEXT_OUTLINE_LEFT_CHECKBOX, wxRichTextBordersPage::OnRichtextBorderCheckboxClick ) EVT_CHECKBOX( ID_RICHTEXT_OUTLINE_LEFT_CHECKBOX, wxRichTextBordersPage::OnRichtextBorderCheckboxClick )
EVT_TEXT( ID_RICHTEXT_OUTLINE_LEFT, wxRichTextBordersPage::OnRichtextOutlineLeftTextUpdated )
EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_LEFT, wxRichTextBordersPage::OnRichtextOutlineLeftUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_LEFT, wxRichTextBordersPage::OnRichtextOutlineLeftUpdate )
EVT_COMBOBOX( ID_RICHTEXT_OUTLINE_LEFT_UNITS, wxRichTextBordersPage::OnRichtextOutlineLeftUnitsSelected )
EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_LEFT_UNITS, wxRichTextBordersPage::OnRichtextOutlineLeftUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_LEFT_UNITS, wxRichTextBordersPage::OnRichtextOutlineLeftUpdate )
EVT_COMBOBOX( ID_RICHTEXT_OUTLINE_LEFT_STYLE, wxRichTextBordersPage::OnRichtextOutlineLeftStyleSelected )
EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_LEFT_STYLE, wxRichTextBordersPage::OnRichtextOutlineLeftUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_LEFT_STYLE, wxRichTextBordersPage::OnRichtextOutlineLeftUpdate )
EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_LEFT_COLOUR, wxRichTextBordersPage::OnRichtextOutlineLeftUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_LEFT_COLOUR, wxRichTextBordersPage::OnRichtextOutlineLeftUpdate )
EVT_CHECKBOX( ID_RICHTEXT_OUTLINE_RIGHT_CHECKBOX, wxRichTextBordersPage::OnRichtextBorderCheckboxClick ) EVT_CHECKBOX( ID_RICHTEXT_OUTLINE_RIGHT_CHECKBOX, wxRichTextBordersPage::OnRichtextBorderCheckboxClick )
EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_RIGHT_CHECKBOX, wxRichTextBordersPage::OnRichtextOutlineOtherCheckboxUpdate )
EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_RIGHT, wxRichTextBordersPage::OnRichtextOutlineRightUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_RIGHT, wxRichTextBordersPage::OnRichtextOutlineRightUpdate )
EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_RIGHT_UNITS, wxRichTextBordersPage::OnRichtextOutlineRightUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_RIGHT_UNITS, wxRichTextBordersPage::OnRichtextOutlineRightUpdate )
EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_RIGHT_STYLE, wxRichTextBordersPage::OnRichtextOutlineRightUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_RIGHT_STYLE, wxRichTextBordersPage::OnRichtextOutlineRightUpdate )
EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_RIGHT_COLOUR, wxRichTextBordersPage::OnRichtextOutlineRightUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_RIGHT_COLOUR, wxRichTextBordersPage::OnRichtextOutlineRightUpdate )
EVT_CHECKBOX( ID_RICHTEXT_OUTLINE_TOP_CHECKBOX, wxRichTextBordersPage::OnRichtextBorderCheckboxClick ) EVT_CHECKBOX( ID_RICHTEXT_OUTLINE_TOP_CHECKBOX, wxRichTextBordersPage::OnRichtextBorderCheckboxClick )
EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_TOP_CHECKBOX, wxRichTextBordersPage::OnRichtextOutlineOtherCheckboxUpdate )
EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_TOP, wxRichTextBordersPage::OnRichtextOutlineTopUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_TOP, wxRichTextBordersPage::OnRichtextOutlineTopUpdate )
EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_TOP_UNITS, wxRichTextBordersPage::OnRichtextOutlineTopUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_TOP_UNITS, wxRichTextBordersPage::OnRichtextOutlineTopUpdate )
EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_TOP_STYLE, wxRichTextBordersPage::OnRichtextOutlineTopUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_TOP_STYLE, wxRichTextBordersPage::OnRichtextOutlineTopUpdate )
EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_TOP_COLOUR, wxRichTextBordersPage::OnRichtextOutlineTopUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_TOP_COLOUR, wxRichTextBordersPage::OnRichtextOutlineTopUpdate )
EVT_CHECKBOX( ID_RICHTEXT_OUTLINE_BOTTOM_CHECKBOX, wxRichTextBordersPage::OnRichtextBorderCheckboxClick ) EVT_CHECKBOX( ID_RICHTEXT_OUTLINE_BOTTOM_CHECKBOX, wxRichTextBordersPage::OnRichtextBorderCheckboxClick )
EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_BOTTOM_CHECKBOX, wxRichTextBordersPage::OnRichtextOutlineOtherCheckboxUpdate )
EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_BOTTOM, wxRichTextBordersPage::OnRichtextOutlineBottomUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_BOTTOM, wxRichTextBordersPage::OnRichtextOutlineBottomUpdate )
EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_BOTTOM_UNITS, wxRichTextBordersPage::OnRichtextOutlineBottomUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_BOTTOM_UNITS, wxRichTextBordersPage::OnRichtextOutlineBottomUpdate )
EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_BOTTOM_STYLE, wxRichTextBordersPage::OnRichtextOutlineBottomUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_BOTTOM_STYLE, wxRichTextBordersPage::OnRichtextOutlineBottomUpdate )
EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_BOTTOM_COLOUR, wxRichTextBordersPage::OnRichtextOutlineBottomUpdate ) EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_BOTTOM_COLOUR, wxRichTextBordersPage::OnRichtextOutlineBottomUpdate )
EVT_CHECKBOX( ID_RICHTEXT_OUTLINE_SYNCHRONIZE, wxRichTextBordersPage::OnRichtextOutlineSynchronizeClick )
EVT_UPDATE_UI( ID_RICHTEXT_OUTLINE_SYNCHRONIZE, wxRichTextBordersPage::OnRichtextOutlineSynchronizeUpdate )
////@end wxRichTextBordersPage event table entries ////@end wxRichTextBordersPage event table entries
END_EVENT_TABLE() END_EVENT_TABLE()
@@ -100,7 +114,6 @@ wxRichTextBordersPage::wxRichTextBordersPage( wxWindow* parent, wxWindowID id, c
Create(parent, id, pos, size, style); Create(parent, id, pos, size, style);
} }
/*! /*!
* wxRichTextBordersPage creator * wxRichTextBordersPage creator
*/ */
@@ -121,7 +134,6 @@ bool wxRichTextBordersPage::Create( wxWindow* parent, wxWindowID id, const wxPoi
return true; return true;
} }
/*! /*!
* wxRichTextBordersPage destructor * wxRichTextBordersPage destructor
*/ */
@@ -132,7 +144,6 @@ wxRichTextBordersPage::~wxRichTextBordersPage()
////@end wxRichTextBordersPage destruction ////@end wxRichTextBordersPage destruction
} }
/*! /*!
* Member initialisation * Member initialisation
*/ */
@@ -162,6 +173,7 @@ void wxRichTextBordersPage::Init()
m_bottomBorderWidthUnits = NULL; m_bottomBorderWidthUnits = NULL;
m_bottomBorderStyle = NULL; m_bottomBorderStyle = NULL;
m_bottomBorderColour = NULL; m_bottomBorderColour = NULL;
m_borderSyncCtrl = NULL;
m_leftOutlineCheckbox = NULL; m_leftOutlineCheckbox = NULL;
m_leftOutlineWidth = NULL; m_leftOutlineWidth = NULL;
m_leftOutlineWidthUnits = NULL; m_leftOutlineWidthUnits = NULL;
@@ -182,11 +194,11 @@ void wxRichTextBordersPage::Init()
m_bottomOutlineWidthUnits = NULL; m_bottomOutlineWidthUnits = NULL;
m_bottomOutlineStyle = NULL; m_bottomOutlineStyle = NULL;
m_bottomOutlineColour = NULL; m_bottomOutlineColour = NULL;
m_outlineSyncCtrl = NULL;
m_borderPreviewCtrl = NULL; m_borderPreviewCtrl = NULL;
////@end wxRichTextBordersPage member initialisation ////@end wxRichTextBordersPage member initialisation
} }
/*! /*!
* Control creation for wxRichTextBordersPage * Control creation for wxRichTextBordersPage
*/ */
@@ -250,6 +262,9 @@ void wxRichTextBordersPage::CreateControls()
wxArrayString m_leftBorderStyleStrings; wxArrayString m_leftBorderStyleStrings;
m_leftBorderStyle = new wxComboBox( itemPanel5, ID_RICHTEXT_BORDER_LEFT_STYLE, wxEmptyString, wxDefaultPosition, wxDefaultSize, m_leftBorderStyleStrings, wxCB_READONLY ); m_leftBorderStyle = new wxComboBox( itemPanel5, ID_RICHTEXT_BORDER_LEFT_STYLE, wxEmptyString, wxDefaultPosition, wxDefaultSize, m_leftBorderStyleStrings, wxCB_READONLY );
m_leftBorderStyle->SetHelpText(_("The border line style."));
if (wxRichTextBordersPage::ShowToolTips())
m_leftBorderStyle->SetToolTip(_("The border line style."));
itemBoxSizer15->Add(m_leftBorderStyle, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); itemBoxSizer15->Add(m_leftBorderStyle, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
itemBoxSizer15->Add(2, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2); itemBoxSizer15->Add(2, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2);
@@ -281,6 +296,9 @@ void wxRichTextBordersPage::CreateControls()
wxArrayString m_rightBorderStyleStrings; wxArrayString m_rightBorderStyleStrings;
m_rightBorderStyle = new wxComboBox( itemPanel5, ID_RICHTEXT_BORDER_RIGHT_STYLE, wxEmptyString, wxDefaultPosition, wxDefaultSize, m_rightBorderStyleStrings, wxCB_READONLY ); m_rightBorderStyle = new wxComboBox( itemPanel5, ID_RICHTEXT_BORDER_RIGHT_STYLE, wxEmptyString, wxDefaultPosition, wxDefaultSize, m_rightBorderStyleStrings, wxCB_READONLY );
m_rightBorderStyle->SetHelpText(_("The border line style."));
if (wxRichTextBordersPage::ShowToolTips())
m_rightBorderStyle->SetToolTip(_("The border line style."));
itemBoxSizer23->Add(m_rightBorderStyle, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); itemBoxSizer23->Add(m_rightBorderStyle, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
itemBoxSizer23->Add(2, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2); itemBoxSizer23->Add(2, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2);
@@ -312,6 +330,9 @@ void wxRichTextBordersPage::CreateControls()
wxArrayString m_topBorderStyleStrings; wxArrayString m_topBorderStyleStrings;
m_topBorderStyle = new wxComboBox( itemPanel5, ID_RICHTEXT_BORDER_TOP_STYLE, wxEmptyString, wxDefaultPosition, wxDefaultSize, m_topBorderStyleStrings, wxCB_READONLY ); m_topBorderStyle = new wxComboBox( itemPanel5, ID_RICHTEXT_BORDER_TOP_STYLE, wxEmptyString, wxDefaultPosition, wxDefaultSize, m_topBorderStyleStrings, wxCB_READONLY );
m_topBorderStyle->SetHelpText(_("The border line style."));
if (wxRichTextBordersPage::ShowToolTips())
m_topBorderStyle->SetToolTip(_("The border line style."));
itemBoxSizer31->Add(m_topBorderStyle, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); itemBoxSizer31->Add(m_topBorderStyle, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
itemBoxSizer31->Add(2, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2); itemBoxSizer31->Add(2, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2);
@@ -343,6 +364,9 @@ void wxRichTextBordersPage::CreateControls()
wxArrayString m_bottomBorderStyleStrings; wxArrayString m_bottomBorderStyleStrings;
m_bottomBorderStyle = new wxComboBox( itemPanel5, ID_RICHTEXT_BORDER_BOTTOM_STYLE, wxEmptyString, wxDefaultPosition, wxDefaultSize, m_bottomBorderStyleStrings, wxCB_READONLY ); m_bottomBorderStyle = new wxComboBox( itemPanel5, ID_RICHTEXT_BORDER_BOTTOM_STYLE, wxEmptyString, wxDefaultPosition, wxDefaultSize, m_bottomBorderStyleStrings, wxCB_READONLY );
m_bottomBorderStyle->SetHelpText(_("The border line style."));
if (wxRichTextBordersPage::ShowToolTips())
m_bottomBorderStyle->SetToolTip(_("The border line style."));
itemBoxSizer39->Add(m_bottomBorderStyle, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); itemBoxSizer39->Add(m_bottomBorderStyle, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
itemBoxSizer39->Add(2, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2); itemBoxSizer39->Add(2, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2);
@@ -350,155 +374,185 @@ void wxRichTextBordersPage::CreateControls()
m_bottomBorderColour = new wxRichTextColourSwatchCtrl( itemPanel5, ID_RICHTEXT_BORDER_BOTTOM_COLOUR, wxDefaultPosition, wxSize(40, 20), wxBORDER_THEME ); m_bottomBorderColour = new wxRichTextColourSwatchCtrl( itemPanel5, ID_RICHTEXT_BORDER_BOTTOM_COLOUR, wxDefaultPosition, wxSize(40, 20), wxBORDER_THEME );
itemBoxSizer39->Add(m_bottomBorderColour, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); itemBoxSizer39->Add(m_bottomBorderColour, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
itemFlexGridSizer13->Add(5, 5, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5);
m_borderSyncCtrl = new wxCheckBox( itemPanel5, ID_RICHTEXT_BORDER_SYNCHRONIZE, _("&Synchronize values"), wxDefaultPosition, wxDefaultSize, 0 );
m_borderSyncCtrl->SetValue(false);
m_borderSyncCtrl->SetHelpText(_("Check to edit all borders simultaneously."));
if (wxRichTextBordersPage::ShowToolTips())
m_borderSyncCtrl->SetToolTip(_("Check to edit all borders simultaneously."));
itemFlexGridSizer13->Add(m_borderSyncCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
itemNotebook4->AddPage(itemPanel5, _("Border")); itemNotebook4->AddPage(itemPanel5, _("Border"));
wxPanel* itemPanel46 = new wxPanel( itemNotebook4, ID_RICHTEXTBORDERSPAGE_OUTLINE, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxTAB_TRAVERSAL ); wxPanel* itemPanel48 = new wxPanel( itemNotebook4, ID_RICHTEXTBORDERSPAGE_OUTLINE, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxTAB_TRAVERSAL );
itemPanel46->SetExtraStyle(wxWS_EX_VALIDATE_RECURSIVELY); itemPanel48->SetExtraStyle(wxWS_EX_VALIDATE_RECURSIVELY);
wxBoxSizer* itemBoxSizer47 = new wxBoxSizer(wxVERTICAL); wxBoxSizer* itemBoxSizer49 = new wxBoxSizer(wxVERTICAL);
itemPanel46->SetSizer(itemBoxSizer47); itemPanel48->SetSizer(itemBoxSizer49);
wxBoxSizer* itemBoxSizer48 = new wxBoxSizer(wxVERTICAL); wxBoxSizer* itemBoxSizer50 = new wxBoxSizer(wxVERTICAL);
itemBoxSizer47->Add(itemBoxSizer48, 0, wxGROW|wxALL, 5); itemBoxSizer49->Add(itemBoxSizer50, 0, wxGROW|wxALL, 5);
wxBoxSizer* itemBoxSizer49 = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* itemBoxSizer51 = new wxBoxSizer(wxHORIZONTAL);
itemBoxSizer48->Add(itemBoxSizer49, 0, wxGROW, 5); itemBoxSizer50->Add(itemBoxSizer51, 0, wxGROW, 5);
wxStaticText* itemStaticText50 = new wxStaticText( itemPanel46, wxID_STATIC, _("Outline"), wxDefaultPosition, wxDefaultSize, 0 ); wxStaticText* itemStaticText52 = new wxStaticText( itemPanel48, wxID_STATIC, _("Outline"), wxDefaultPosition, wxDefaultSize, 0 );
itemStaticText50->SetFont(wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetPointSize(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetFamily(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetStyle(), wxBOLD, false, wxT(""))); itemStaticText52->SetFont(wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetPointSize(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetFamily(), wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetStyle(), wxBOLD, false, wxT("")));
itemBoxSizer49->Add(itemStaticText50, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); itemBoxSizer51->Add(itemStaticText52, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxStaticLine* itemStaticLine51 = new wxStaticLine( itemPanel46, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); wxStaticLine* itemStaticLine53 = new wxStaticLine( itemPanel48, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
itemBoxSizer49->Add(itemStaticLine51, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5); itemBoxSizer51->Add(itemStaticLine53, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxBoxSizer* itemBoxSizer52 = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* itemBoxSizer54 = new wxBoxSizer(wxHORIZONTAL);
itemBoxSizer48->Add(itemBoxSizer52, 0, wxGROW, 5); itemBoxSizer50->Add(itemBoxSizer54, 0, wxGROW, 5);
itemBoxSizer52->Add(5, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); itemBoxSizer54->Add(5, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxFlexGridSizer* itemFlexGridSizer54 = new wxFlexGridSizer(0, 2, 0, 0); wxFlexGridSizer* itemFlexGridSizer56 = new wxFlexGridSizer(0, 2, 0, 0);
itemBoxSizer52->Add(itemFlexGridSizer54, 0, wxGROW, 5); itemBoxSizer54->Add(itemFlexGridSizer56, 0, wxGROW, 5);
m_leftOutlineCheckbox = new wxCheckBox( itemPanel46, ID_RICHTEXT_OUTLINE_LEFT_CHECKBOX, _("&Left:"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER ); m_leftOutlineCheckbox = new wxCheckBox( itemPanel48, ID_RICHTEXT_OUTLINE_LEFT_CHECKBOX, _("&Left:"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER );
m_leftOutlineCheckbox->SetValue(false); m_leftOutlineCheckbox->SetValue(false);
itemFlexGridSizer54->Add(m_leftOutlineCheckbox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); itemFlexGridSizer56->Add(m_leftOutlineCheckbox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxBoxSizer* itemBoxSizer56 = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* itemBoxSizer58 = new wxBoxSizer(wxHORIZONTAL);
itemFlexGridSizer54->Add(itemBoxSizer56, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5); itemFlexGridSizer56->Add(itemBoxSizer58, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5);
m_leftOutlineWidth = new wxTextCtrl( itemPanel46, ID_RICHTEXT_OUTLINE_LEFT, wxEmptyString, wxDefaultPosition, wxSize(50, -1), 0 ); m_leftOutlineWidth = new wxTextCtrl( itemPanel48, ID_RICHTEXT_OUTLINE_LEFT, wxEmptyString, wxDefaultPosition, wxSize(50, -1), 0 );
itemBoxSizer56->Add(m_leftOutlineWidth, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5); itemBoxSizer58->Add(m_leftOutlineWidth, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
wxArrayString m_leftOutlineWidthUnitsStrings; wxArrayString m_leftOutlineWidthUnitsStrings;
m_leftOutlineWidthUnitsStrings.Add(_("px")); m_leftOutlineWidthUnitsStrings.Add(_("px"));
m_leftOutlineWidthUnitsStrings.Add(_("cm")); m_leftOutlineWidthUnitsStrings.Add(_("cm"));
m_leftOutlineWidthUnitsStrings.Add(_("pt")); m_leftOutlineWidthUnitsStrings.Add(_("pt"));
m_leftOutlineWidthUnits = new wxComboBox( itemPanel46, ID_RICHTEXT_OUTLINE_LEFT_UNITS, _("px"), wxDefaultPosition, wxSize(60, -1), m_leftOutlineWidthUnitsStrings, wxCB_READONLY ); m_leftOutlineWidthUnits = new wxComboBox( itemPanel48, ID_RICHTEXT_OUTLINE_LEFT_UNITS, _("px"), wxDefaultPosition, wxSize(60, -1), m_leftOutlineWidthUnitsStrings, wxCB_READONLY );
m_leftOutlineWidthUnits->SetStringSelection(_("px")); m_leftOutlineWidthUnits->SetStringSelection(_("px"));
m_leftOutlineWidthUnits->SetHelpText(_("Units for the left outline width.")); m_leftOutlineWidthUnits->SetHelpText(_("Units for the left outline width."));
if (wxRichTextBordersPage::ShowToolTips()) if (wxRichTextBordersPage::ShowToolTips())
m_leftOutlineWidthUnits->SetToolTip(_("Units for the left outline width.")); m_leftOutlineWidthUnits->SetToolTip(_("Units for the left outline width."));
itemBoxSizer56->Add(m_leftOutlineWidthUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); itemBoxSizer58->Add(m_leftOutlineWidthUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
itemBoxSizer56->Add(2, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2); itemBoxSizer58->Add(2, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2);
wxArrayString m_leftOutlineStyleStrings; wxArrayString m_leftOutlineStyleStrings;
m_leftOutlineStyle = new wxComboBox( itemPanel46, ID_RICHTEXT_OUTLINE_LEFT_STYLE, wxEmptyString, wxDefaultPosition, wxDefaultSize, m_leftOutlineStyleStrings, wxCB_READONLY ); m_leftOutlineStyle = new wxComboBox( itemPanel48, ID_RICHTEXT_OUTLINE_LEFT_STYLE, wxEmptyString, wxDefaultPosition, wxDefaultSize, m_leftOutlineStyleStrings, wxCB_READONLY );
itemBoxSizer56->Add(m_leftOutlineStyle, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); m_leftOutlineStyle->SetHelpText(_("The border line style."));
if (wxRichTextBordersPage::ShowToolTips())
m_leftOutlineStyle->SetToolTip(_("The border line style."));
itemBoxSizer58->Add(m_leftOutlineStyle, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
itemBoxSizer56->Add(2, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2); itemBoxSizer58->Add(2, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2);
m_leftOutlineColour = new wxRichTextColourSwatchCtrl( itemPanel46, ID_RICHTEXT_OUTLINE_LEFT_COLOUR, wxDefaultPosition, wxSize(40, 20), wxBORDER_THEME ); m_leftOutlineColour = new wxRichTextColourSwatchCtrl( itemPanel48, ID_RICHTEXT_OUTLINE_LEFT_COLOUR, wxDefaultPosition, wxSize(40, 20), wxBORDER_THEME );
itemBoxSizer56->Add(m_leftOutlineColour, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); itemBoxSizer58->Add(m_leftOutlineColour, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
m_rightOutlineCheckbox = new wxCheckBox( itemPanel46, ID_RICHTEXT_OUTLINE_RIGHT_CHECKBOX, _("&Right:"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER ); m_rightOutlineCheckbox = new wxCheckBox( itemPanel48, ID_RICHTEXT_OUTLINE_RIGHT_CHECKBOX, _("&Right:"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER );
m_rightOutlineCheckbox->SetValue(false); m_rightOutlineCheckbox->SetValue(false);
itemFlexGridSizer54->Add(m_rightOutlineCheckbox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); itemFlexGridSizer56->Add(m_rightOutlineCheckbox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxBoxSizer* itemBoxSizer64 = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* itemBoxSizer66 = new wxBoxSizer(wxHORIZONTAL);
itemFlexGridSizer54->Add(itemBoxSizer64, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5); itemFlexGridSizer56->Add(itemBoxSizer66, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5);
m_rightOutlineWidth = new wxTextCtrl( itemPanel46, ID_RICHTEXT_OUTLINE_RIGHT, wxEmptyString, wxDefaultPosition, wxSize(50, -1), 0 ); m_rightOutlineWidth = new wxTextCtrl( itemPanel48, ID_RICHTEXT_OUTLINE_RIGHT, wxEmptyString, wxDefaultPosition, wxSize(50, -1), 0 );
itemBoxSizer64->Add(m_rightOutlineWidth, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5); itemBoxSizer66->Add(m_rightOutlineWidth, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
wxArrayString m_rightOutlineWidthUnitsStrings; wxArrayString m_rightOutlineWidthUnitsStrings;
m_rightOutlineWidthUnitsStrings.Add(_("px")); m_rightOutlineWidthUnitsStrings.Add(_("px"));
m_rightOutlineWidthUnitsStrings.Add(_("cm")); m_rightOutlineWidthUnitsStrings.Add(_("cm"));
m_rightOutlineWidthUnitsStrings.Add(_("pt")); m_rightOutlineWidthUnitsStrings.Add(_("pt"));
m_rightOutlineWidthUnits = new wxComboBox( itemPanel46, ID_RICHTEXT_OUTLINE_RIGHT_UNITS, _("px"), wxDefaultPosition, wxSize(60, -1), m_rightOutlineWidthUnitsStrings, wxCB_READONLY ); m_rightOutlineWidthUnits = new wxComboBox( itemPanel48, ID_RICHTEXT_OUTLINE_RIGHT_UNITS, _("px"), wxDefaultPosition, wxSize(60, -1), m_rightOutlineWidthUnitsStrings, wxCB_READONLY );
m_rightOutlineWidthUnits->SetStringSelection(_("px")); m_rightOutlineWidthUnits->SetStringSelection(_("px"));
m_rightOutlineWidthUnits->SetHelpText(_("Units for the right outline width.")); m_rightOutlineWidthUnits->SetHelpText(_("Units for the right outline width."));
if (wxRichTextBordersPage::ShowToolTips()) if (wxRichTextBordersPage::ShowToolTips())
m_rightOutlineWidthUnits->SetToolTip(_("Units for the right outline width.")); m_rightOutlineWidthUnits->SetToolTip(_("Units for the right outline width."));
itemBoxSizer64->Add(m_rightOutlineWidthUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); itemBoxSizer66->Add(m_rightOutlineWidthUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
itemBoxSizer64->Add(2, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2); itemBoxSizer66->Add(2, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2);
wxArrayString m_rightOutlineStyleStrings; wxArrayString m_rightOutlineStyleStrings;
m_rightOutlineStyle = new wxComboBox( itemPanel46, ID_RICHTEXT_OUTLINE_RIGHT_STYLE, wxEmptyString, wxDefaultPosition, wxDefaultSize, m_rightOutlineStyleStrings, wxCB_READONLY ); m_rightOutlineStyle = new wxComboBox( itemPanel48, ID_RICHTEXT_OUTLINE_RIGHT_STYLE, wxEmptyString, wxDefaultPosition, wxDefaultSize, m_rightOutlineStyleStrings, wxCB_READONLY );
itemBoxSizer64->Add(m_rightOutlineStyle, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); m_rightOutlineStyle->SetHelpText(_("The border line style."));
if (wxRichTextBordersPage::ShowToolTips())
m_rightOutlineStyle->SetToolTip(_("The border line style."));
itemBoxSizer66->Add(m_rightOutlineStyle, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
itemBoxSizer64->Add(2, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2); itemBoxSizer66->Add(2, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2);
m_rightOutlineColour = new wxRichTextColourSwatchCtrl( itemPanel46, ID_RICHTEXT_OUTLINE_RIGHT_COLOUR, wxDefaultPosition, wxSize(40, 20), wxBORDER_THEME ); m_rightOutlineColour = new wxRichTextColourSwatchCtrl( itemPanel48, ID_RICHTEXT_OUTLINE_RIGHT_COLOUR, wxDefaultPosition, wxSize(40, 20), wxBORDER_THEME );
itemBoxSizer64->Add(m_rightOutlineColour, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); itemBoxSizer66->Add(m_rightOutlineColour, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
m_topOutlineCheckbox = new wxCheckBox( itemPanel46, ID_RICHTEXT_OUTLINE_TOP_CHECKBOX, _("&Top:"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER ); m_topOutlineCheckbox = new wxCheckBox( itemPanel48, ID_RICHTEXT_OUTLINE_TOP_CHECKBOX, _("&Top:"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER );
m_topOutlineCheckbox->SetValue(false); m_topOutlineCheckbox->SetValue(false);
itemFlexGridSizer54->Add(m_topOutlineCheckbox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); itemFlexGridSizer56->Add(m_topOutlineCheckbox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxBoxSizer* itemBoxSizer72 = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* itemBoxSizer74 = new wxBoxSizer(wxHORIZONTAL);
itemFlexGridSizer54->Add(itemBoxSizer72, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5); itemFlexGridSizer56->Add(itemBoxSizer74, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5);
m_topOutlineWidth = new wxTextCtrl( itemPanel46, ID_RICHTEXT_OUTLINE_TOP, wxEmptyString, wxDefaultPosition, wxSize(50, -1), 0 ); m_topOutlineWidth = new wxTextCtrl( itemPanel48, ID_RICHTEXT_OUTLINE_TOP, wxEmptyString, wxDefaultPosition, wxSize(50, -1), 0 );
itemBoxSizer72->Add(m_topOutlineWidth, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5); itemBoxSizer74->Add(m_topOutlineWidth, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
wxArrayString m_topOutlineWidthUnitsStrings; wxArrayString m_topOutlineWidthUnitsStrings;
m_topOutlineWidthUnitsStrings.Add(_("px")); m_topOutlineWidthUnitsStrings.Add(_("px"));
m_topOutlineWidthUnitsStrings.Add(_("cm")); m_topOutlineWidthUnitsStrings.Add(_("cm"));
m_topOutlineWidthUnitsStrings.Add(_("pt")); m_topOutlineWidthUnitsStrings.Add(_("pt"));
m_topOutlineWidthUnits = new wxComboBox( itemPanel46, ID_RICHTEXT_OUTLINE_TOP_UNITS, _("px"), wxDefaultPosition, wxSize(60, -1), m_topOutlineWidthUnitsStrings, wxCB_READONLY ); m_topOutlineWidthUnits = new wxComboBox( itemPanel48, ID_RICHTEXT_OUTLINE_TOP_UNITS, _("px"), wxDefaultPosition, wxSize(60, -1), m_topOutlineWidthUnitsStrings, wxCB_READONLY );
m_topOutlineWidthUnits->SetStringSelection(_("px")); m_topOutlineWidthUnits->SetStringSelection(_("px"));
m_topOutlineWidthUnits->SetHelpText(_("Units for the top outline width.")); m_topOutlineWidthUnits->SetHelpText(_("Units for the top outline width."));
if (wxRichTextBordersPage::ShowToolTips()) if (wxRichTextBordersPage::ShowToolTips())
m_topOutlineWidthUnits->SetToolTip(_("Units for the top outline width.")); m_topOutlineWidthUnits->SetToolTip(_("Units for the top outline width."));
itemBoxSizer72->Add(m_topOutlineWidthUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); itemBoxSizer74->Add(m_topOutlineWidthUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
itemBoxSizer72->Add(2, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2); itemBoxSizer74->Add(2, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2);
wxArrayString m_topOutlineStyleStrings; wxArrayString m_topOutlineStyleStrings;
m_topOutlineStyle = new wxComboBox( itemPanel46, ID_RICHTEXT_OUTLINE_TOP_STYLE, wxEmptyString, wxDefaultPosition, wxDefaultSize, m_topOutlineStyleStrings, wxCB_READONLY ); m_topOutlineStyle = new wxComboBox( itemPanel48, ID_RICHTEXT_OUTLINE_TOP_STYLE, wxEmptyString, wxDefaultPosition, wxDefaultSize, m_topOutlineStyleStrings, wxCB_READONLY );
itemBoxSizer72->Add(m_topOutlineStyle, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); m_topOutlineStyle->SetHelpText(_("The border line style."));
if (wxRichTextBordersPage::ShowToolTips())
m_topOutlineStyle->SetToolTip(_("The border line style."));
itemBoxSizer74->Add(m_topOutlineStyle, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
itemBoxSizer72->Add(2, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2); itemBoxSizer74->Add(2, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2);
m_topOutlineColour = new wxRichTextColourSwatchCtrl( itemPanel46, ID_RICHTEXT_OUTLINE_TOP_COLOUR, wxDefaultPosition, wxSize(40, 20), wxBORDER_THEME ); m_topOutlineColour = new wxRichTextColourSwatchCtrl( itemPanel48, ID_RICHTEXT_OUTLINE_TOP_COLOUR, wxDefaultPosition, wxSize(40, 20), wxBORDER_THEME );
itemBoxSizer72->Add(m_topOutlineColour, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); itemBoxSizer74->Add(m_topOutlineColour, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
m_bottomOutlineCheckbox = new wxCheckBox( itemPanel46, ID_RICHTEXT_OUTLINE_BOTTOM_CHECKBOX, _("&Bottom:"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER ); m_bottomOutlineCheckbox = new wxCheckBox( itemPanel48, ID_RICHTEXT_OUTLINE_BOTTOM_CHECKBOX, _("&Bottom:"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER );
m_bottomOutlineCheckbox->SetValue(false); m_bottomOutlineCheckbox->SetValue(false);
itemFlexGridSizer54->Add(m_bottomOutlineCheckbox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); itemFlexGridSizer56->Add(m_bottomOutlineCheckbox, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxBoxSizer* itemBoxSizer80 = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* itemBoxSizer82 = new wxBoxSizer(wxHORIZONTAL);
itemFlexGridSizer54->Add(itemBoxSizer80, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5); itemFlexGridSizer56->Add(itemBoxSizer82, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5);
m_bottomOutlineWidth = new wxTextCtrl( itemPanel46, ID_RICHTEXT_OUTLINE_BOTTOM, wxEmptyString, wxDefaultPosition, wxSize(50, -1), 0 ); m_bottomOutlineWidth = new wxTextCtrl( itemPanel48, ID_RICHTEXT_OUTLINE_BOTTOM, wxEmptyString, wxDefaultPosition, wxSize(50, -1), 0 );
itemBoxSizer80->Add(m_bottomOutlineWidth, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5); itemBoxSizer82->Add(m_bottomOutlineWidth, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxBOTTOM, 5);
wxArrayString m_bottomOutlineWidthUnitsStrings; wxArrayString m_bottomOutlineWidthUnitsStrings;
m_bottomOutlineWidthUnitsStrings.Add(_("px")); m_bottomOutlineWidthUnitsStrings.Add(_("px"));
m_bottomOutlineWidthUnitsStrings.Add(_("cm")); m_bottomOutlineWidthUnitsStrings.Add(_("cm"));
m_bottomOutlineWidthUnitsStrings.Add(_("pt")); m_bottomOutlineWidthUnitsStrings.Add(_("pt"));
m_bottomOutlineWidthUnits = new wxComboBox( itemPanel46, ID_RICHTEXT_OUTLINE_BOTTOM_UNITS, _("px"), wxDefaultPosition, wxSize(60, -1), m_bottomOutlineWidthUnitsStrings, wxCB_READONLY ); m_bottomOutlineWidthUnits = new wxComboBox( itemPanel48, ID_RICHTEXT_OUTLINE_BOTTOM_UNITS, _("px"), wxDefaultPosition, wxSize(60, -1), m_bottomOutlineWidthUnitsStrings, wxCB_READONLY );
m_bottomOutlineWidthUnits->SetStringSelection(_("px")); m_bottomOutlineWidthUnits->SetStringSelection(_("px"));
m_bottomOutlineWidthUnits->SetHelpText(_("Units for the bottom outline width.")); m_bottomOutlineWidthUnits->SetHelpText(_("Units for the bottom outline width."));
if (wxRichTextBordersPage::ShowToolTips()) if (wxRichTextBordersPage::ShowToolTips())
m_bottomOutlineWidthUnits->SetToolTip(_("Units for the bottom outline width.")); m_bottomOutlineWidthUnits->SetToolTip(_("Units for the bottom outline width."));
itemBoxSizer80->Add(m_bottomOutlineWidthUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); itemBoxSizer82->Add(m_bottomOutlineWidthUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
itemBoxSizer80->Add(2, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2); itemBoxSizer82->Add(2, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2);
wxArrayString m_bottomOutlineStyleStrings; wxArrayString m_bottomOutlineStyleStrings;
m_bottomOutlineStyle = new wxComboBox( itemPanel46, ID_RICHTEXT_OUTLINE_BOTTOM_STYLE, wxEmptyString, wxDefaultPosition, wxDefaultSize, m_bottomOutlineStyleStrings, wxCB_READONLY ); m_bottomOutlineStyle = new wxComboBox( itemPanel48, ID_RICHTEXT_OUTLINE_BOTTOM_STYLE, wxEmptyString, wxDefaultPosition, wxDefaultSize, m_bottomOutlineStyleStrings, wxCB_READONLY );
itemBoxSizer80->Add(m_bottomOutlineStyle, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); m_bottomOutlineStyle->SetHelpText(_("The border line style."));
if (wxRichTextBordersPage::ShowToolTips())
m_bottomOutlineStyle->SetToolTip(_("The border line style."));
itemBoxSizer82->Add(m_bottomOutlineStyle, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
itemBoxSizer80->Add(2, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2); itemBoxSizer82->Add(2, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2);
m_bottomOutlineColour = new wxRichTextColourSwatchCtrl( itemPanel46, ID_RICHTEXT_OUTLINE_BOTTOM_COLOUR, wxDefaultPosition, wxSize(40, 20), wxBORDER_THEME ); m_bottomOutlineColour = new wxRichTextColourSwatchCtrl( itemPanel48, ID_RICHTEXT_OUTLINE_BOTTOM_COLOUR, wxDefaultPosition, wxSize(40, 20), wxBORDER_THEME );
itemBoxSizer80->Add(m_bottomOutlineColour, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); itemBoxSizer82->Add(m_bottomOutlineColour, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
itemNotebook4->AddPage(itemPanel46, _("Outline")); itemFlexGridSizer56->Add(5, 5, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5);
m_outlineSyncCtrl = new wxCheckBox( itemPanel48, ID_RICHTEXT_OUTLINE_SYNCHRONIZE, _("&Synchronize values"), wxDefaultPosition, wxDefaultSize, 0 );
m_outlineSyncCtrl->SetValue(false);
m_outlineSyncCtrl->SetHelpText(_("Check to edit all borders simultaneously."));
if (wxRichTextBordersPage::ShowToolTips())
m_outlineSyncCtrl->SetToolTip(_("Check to edit all borders simultaneously."));
itemFlexGridSizer56->Add(m_outlineSyncCtrl, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
itemNotebook4->AddPage(itemPanel48, _("Outline"));
itemBoxSizer3->Add(itemNotebook4, 0, wxGROW|wxALL, 5); itemBoxSizer3->Add(itemNotebook4, 0, wxGROW|wxALL, 5);
@@ -534,14 +588,13 @@ void wxRichTextBordersPage::CreateControls()
m_ignoreUpdates = false; m_ignoreUpdates = false;
} }
/*! /*!
* Should we show tooltips? * Should we show tooltips?
*/ */
bool wxRichTextBordersPage::ShowToolTips() bool wxRichTextBordersPage::ShowToolTips()
{ {
return true; return wxRichTextFormattingDialog::ShowToolTips();
} }
// Updates the preview // Updates the preview
@@ -551,6 +604,30 @@ void wxRichTextBordersPage::OnCommand(wxCommandEvent& event)
if (m_ignoreUpdates) if (m_ignoreUpdates)
return; return;
if (event.GetId() == ID_RICHTEXT_BORDER_LEFT_COLOUR && m_borderSyncCtrl->GetValue())
{
m_rightBorderColour->SetColour(m_leftBorderColour->GetColour());
m_rightBorderColour->Refresh();
m_topBorderColour->SetColour(m_leftBorderColour->GetColour());
m_topBorderColour->Refresh();
m_bottomBorderColour->SetColour(m_leftBorderColour->GetColour());
m_bottomBorderColour->Refresh();
}
if (event.GetId() == ID_RICHTEXT_OUTLINE_LEFT_COLOUR && m_outlineSyncCtrl->GetValue())
{
m_rightOutlineColour->SetColour(m_leftOutlineColour->GetColour());
m_rightOutlineColour->Refresh();
m_topOutlineColour->SetColour(m_leftOutlineColour->GetColour());
m_topOutlineColour->Refresh();
m_bottomOutlineColour->SetColour(m_leftOutlineColour->GetColour());
m_bottomOutlineColour->Refresh();
}
if (m_borderPreviewCtrl) if (m_borderPreviewCtrl)
{ {
TransferDataFromWindow(); TransferDataFromWindow();
@@ -571,6 +648,38 @@ void wxRichTextBordersPage::FillStyleComboBox(wxComboBox* styleComboBox)
styleComboBox->Thaw(); styleComboBox->Thaw();
} }
// Updates the synchronization checkboxes to reflect the state of the attributes
void wxRichTextBordersPage::UpdateSyncControls()
{
bool ignoreUpdates = m_ignoreUpdates;
m_ignoreUpdates = true;
if (GetAttributes()->GetTextBoxAttr().GetBorder().GetLeft() == GetAttributes()->GetTextBoxAttr().GetBorder().GetRight() &&
GetAttributes()->GetTextBoxAttr().GetBorder().GetLeft() == GetAttributes()->GetTextBoxAttr().GetBorder().GetTop() &&
GetAttributes()->GetTextBoxAttr().GetBorder().GetLeft() == GetAttributes()->GetTextBoxAttr().GetBorder().GetBottom())
{
m_borderSyncCtrl->SetValue(true);
}
else
{
m_borderSyncCtrl->SetValue(false);
}
if (GetAttributes()->GetTextBoxAttr().GetOutline().GetLeft() == GetAttributes()->GetTextBoxAttr().GetOutline().GetRight() &&
GetAttributes()->GetTextBoxAttr().GetOutline().GetLeft() == GetAttributes()->GetTextBoxAttr().GetOutline().GetTop() &&
GetAttributes()->GetTextBoxAttr().GetOutline().GetLeft() == GetAttributes()->GetTextBoxAttr().GetOutline().GetBottom())
{
m_outlineSyncCtrl->SetValue(true);
}
else
{
m_outlineSyncCtrl->SetValue(false);
}
m_ignoreUpdates = ignoreUpdates;
}
bool wxRichTextBordersPage::TransferDataToWindow() bool wxRichTextBordersPage::TransferDataToWindow()
{ {
m_ignoreUpdates = true; m_ignoreUpdates = true;
@@ -589,6 +698,8 @@ bool wxRichTextBordersPage::TransferDataToWindow()
m_ignoreUpdates = false; m_ignoreUpdates = false;
UpdateSyncControls();
return true; return true;
} }
@@ -702,7 +813,6 @@ wxIcon wxRichTextBordersPage::GetIconResource( const wxString& name )
////@end wxRichTextBordersPage icon retrieval ////@end wxRichTextBordersPage icon retrieval
} }
/*! /*!
* wxEVT_UPDATE_UI event handler for ID_RICHTEXT_BORDER_LEFT * wxEVT_UPDATE_UI event handler for ID_RICHTEXT_BORDER_LEFT
*/ */
@@ -712,24 +822,22 @@ void wxRichTextBordersPage::OnRichtextBorderLeftUpdate( wxUpdateUIEvent& event )
event.Enable(m_leftBorderCheckbox->Get3StateValue() == wxCHK_CHECKED); event.Enable(m_leftBorderCheckbox->Get3StateValue() == wxCHK_CHECKED);
} }
/*! /*!
* wxEVT_UPDATE_UI event handler for ID_RICHTEXT_BORDER_RIGHT * wxEVT_UPDATE_UI event handler for ID_RICHTEXT_BORDER_RIGHT
*/ */
void wxRichTextBordersPage::OnRichtextBorderRightUpdate( wxUpdateUIEvent& event ) void wxRichTextBordersPage::OnRichtextBorderRightUpdate( wxUpdateUIEvent& event )
{ {
event.Enable(m_rightBorderCheckbox->Get3StateValue() == wxCHK_CHECKED); event.Enable(m_rightBorderCheckbox->Get3StateValue() == wxCHK_CHECKED && !m_borderSyncCtrl->GetValue());
} }
/*! /*!
* wxEVT_UPDATE_UI event handler for ID_RICHTEXT_BORDER_TOP * wxEVT_UPDATE_UI event handler for ID_RICHTEXT_BORDER_TOP
*/ */
void wxRichTextBordersPage::OnRichtextBorderTopUpdate( wxUpdateUIEvent& event ) void wxRichTextBordersPage::OnRichtextBorderTopUpdate( wxUpdateUIEvent& event )
{ {
event.Enable(m_topBorderCheckbox->Get3StateValue() == wxCHK_CHECKED); event.Enable(m_topBorderCheckbox->Get3StateValue() == wxCHK_CHECKED && !m_borderSyncCtrl->GetValue());
} }
/*! /*!
@@ -738,10 +846,9 @@ void wxRichTextBordersPage::OnRichtextBorderTopUpdate( wxUpdateUIEvent& event )
void wxRichTextBordersPage::OnRichtextBorderBottomUpdate( wxUpdateUIEvent& event ) void wxRichTextBordersPage::OnRichtextBorderBottomUpdate( wxUpdateUIEvent& event )
{ {
event.Enable(m_bottomBorderCheckbox->Get3StateValue() == wxCHK_CHECKED); event.Enable(m_bottomBorderCheckbox->Get3StateValue() == wxCHK_CHECKED && !m_borderSyncCtrl->GetValue());
} }
/*! /*!
* wxEVT_UPDATE_UI event handler for ID_RICHTEXT_OUTLINE_LEFT * wxEVT_UPDATE_UI event handler for ID_RICHTEXT_OUTLINE_LEFT
*/ */
@@ -751,34 +858,31 @@ void wxRichTextBordersPage::OnRichtextOutlineLeftUpdate( wxUpdateUIEvent& event
event.Enable(m_leftOutlineCheckbox->Get3StateValue() == wxCHK_CHECKED); event.Enable(m_leftOutlineCheckbox->Get3StateValue() == wxCHK_CHECKED);
} }
/*! /*!
* wxEVT_UPDATE_UI event handler for ID_RICHTEXT_OUTLINE_RIGHT * wxEVT_UPDATE_UI event handler for ID_RICHTEXT_OUTLINE_RIGHT
*/ */
void wxRichTextBordersPage::OnRichtextOutlineRightUpdate( wxUpdateUIEvent& event ) void wxRichTextBordersPage::OnRichtextOutlineRightUpdate( wxUpdateUIEvent& event )
{ {
event.Enable(m_rightOutlineCheckbox->Get3StateValue() == wxCHK_CHECKED); event.Enable(m_rightOutlineCheckbox->Get3StateValue() == wxCHK_CHECKED && !m_outlineSyncCtrl->GetValue());
} }
/*! /*!
* wxEVT_UPDATE_UI event handler for ID_RICHTEXT_OUTLINE_TOP * wxEVT_UPDATE_UI event handler for ID_RICHTEXT_OUTLINE_TOP
*/ */
void wxRichTextBordersPage::OnRichtextOutlineTopUpdate( wxUpdateUIEvent& event ) void wxRichTextBordersPage::OnRichtextOutlineTopUpdate( wxUpdateUIEvent& event )
{ {
event.Enable(m_topOutlineCheckbox->Get3StateValue() == wxCHK_CHECKED); event.Enable(m_topOutlineCheckbox->Get3StateValue() == wxCHK_CHECKED && !m_outlineSyncCtrl->GetValue());
} }
/*! /*!
* wxEVT_UPDATE_UI event handler for ID_RICHTEXT_OUTLINE_BOTTOM * wxEVT_UPDATE_UI event handler for ID_RICHTEXT_OUTLINE_BOTTOM
*/ */
void wxRichTextBordersPage::OnRichtextOutlineBottomUpdate( wxUpdateUIEvent& event ) void wxRichTextBordersPage::OnRichtextOutlineBottomUpdate( wxUpdateUIEvent& event )
{ {
event.Enable(m_bottomOutlineCheckbox->Get3StateValue() == wxCHK_CHECKED); event.Enable(m_bottomOutlineCheckbox->Get3StateValue() == wxCHK_CHECKED && !m_outlineSyncCtrl->GetValue());
} }
/*! /*!
@@ -841,6 +945,30 @@ void wxRichTextBordersPage::OnRichtextBorderCheckboxClick( wxCommandEvent& event
else else
comboBox->SetSelection(1); comboBox->SetSelection(1);
if (event.GetId() == ID_RICHTEXT_BORDER_LEFT_CHECKBOX && m_borderSyncCtrl->GetValue())
{
m_topBorderCheckbox->Set3StateValue(checkBox->Get3StateValue());
m_topBorderStyle->SetSelection(comboBox->GetSelection());
m_rightBorderCheckbox->Set3StateValue(checkBox->Get3StateValue());
m_rightBorderStyle->SetSelection(comboBox->GetSelection());
m_bottomBorderCheckbox->Set3StateValue(checkBox->Get3StateValue());
m_bottomBorderStyle->SetSelection(comboBox->GetSelection());
}
if (event.GetId() == ID_RICHTEXT_OUTLINE_LEFT_CHECKBOX && m_outlineSyncCtrl->GetValue())
{
m_topOutlineCheckbox->Set3StateValue(checkBox->Get3StateValue());
m_topOutlineStyle->SetSelection(comboBox->GetSelection());
m_rightOutlineCheckbox->Set3StateValue(checkBox->Get3StateValue());
m_rightOutlineStyle->SetSelection(comboBox->GetSelection());
m_bottomOutlineCheckbox->Set3StateValue(checkBox->Get3StateValue());
m_bottomOutlineStyle->SetSelection(comboBox->GetSelection());
}
TransferDataFromWindow(); TransferDataFromWindow();
m_borderPreviewCtrl->Refresh(); m_borderPreviewCtrl->Refresh();
} }
@@ -848,6 +976,246 @@ void wxRichTextBordersPage::OnRichtextBorderCheckboxClick( wxCommandEvent& event
m_ignoreUpdates = false; m_ignoreUpdates = false;
} }
/*!
* wxEVT_COMMAND_CHECKBOX_CLICKED event handler for ID_RICHTEXT_BORDER_SYNCHRONIZE
*/
void wxRichTextBordersPage::OnRichtextBorderSynchronizeClick( wxCommandEvent& event )
{
if (m_ignoreUpdates)
return;
if (event.IsChecked())
{
TransferDataFromWindow();
GetAttributes()->GetTextBoxAttr().GetBorder().GetTop() = GetAttributes()->GetTextBoxAttr().GetBorder().GetLeft();
GetAttributes()->GetTextBoxAttr().GetBorder().GetRight() = GetAttributes()->GetTextBoxAttr().GetBorder().GetLeft();
GetAttributes()->GetTextBoxAttr().GetBorder().GetBottom() = GetAttributes()->GetTextBoxAttr().GetBorder().GetLeft();
m_ignoreUpdates = true;
TransferDataToWindow();
m_ignoreUpdates = false;
if (m_borderPreviewCtrl)
{
TransferDataFromWindow();
m_borderPreviewCtrl->Refresh();
}
}
}
/*!
* wxEVT_UPDATE_UI event handler for ID_RICHTEXT_BORDER_SYNCHRONIZE
*/
void wxRichTextBordersPage::OnRichtextBorderSynchronizeUpdate( wxUpdateUIEvent& WXUNUSED(event) )
{
}
/*!
* wxEVT_UPDATE_UI event handler for ID_RICHTEXT_BORDER_RIGHT_CHECKBOX
*/
void wxRichTextBordersPage::OnRichtextBorderOtherCheckboxUpdate( wxUpdateUIEvent& event )
{
event.Enable(!m_borderSyncCtrl->GetValue());
}
/*!
* wxEVT_COMMAND_TEXT_UPDATED event handler for ID_RICHTEXT_BORDER_LEFT
*/
void wxRichTextBordersPage::OnRichtextBorderLeftValueTextUpdated( wxCommandEvent& event )
{
if (m_ignoreUpdates)
return;
if (m_borderSyncCtrl->GetValue())
{
wxString value = event.GetString();
m_ignoreUpdates = true;
m_rightBorderWidth->SetValue(value);
m_topBorderWidth->SetValue(value);
m_bottomBorderWidth->SetValue(value);
m_ignoreUpdates = false;
}
if (m_borderPreviewCtrl)
{
TransferDataFromWindow();
m_borderPreviewCtrl->Refresh();
}
}
/*!
* wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_RICHTEXT_BORDER_LEFT_UNITS
*/
void wxRichTextBordersPage::OnRichtextBorderLeftUnitsSelected( wxCommandEvent& WXUNUSED(event) )
{
if (m_ignoreUpdates)
return;
if (m_borderSyncCtrl->GetValue())
{
m_ignoreUpdates = true;
m_rightBorderWidthUnits->SetSelection(m_leftBorderWidthUnits->GetSelection());
m_topBorderWidthUnits->SetSelection(m_leftBorderWidthUnits->GetSelection());
m_bottomBorderWidthUnits->SetSelection(m_leftBorderWidthUnits->GetSelection());
m_ignoreUpdates = false;
}
if (m_borderPreviewCtrl)
{
TransferDataFromWindow();
m_borderPreviewCtrl->Refresh();
}
}
/*!
* wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_RICHTEXT_BORDER_LEFT_STYLE
*/
void wxRichTextBordersPage::OnRichtextBorderLeftStyleSelected( wxCommandEvent& WXUNUSED(event) )
{
if (m_ignoreUpdates)
return;
if (m_borderSyncCtrl->GetValue())
{
m_ignoreUpdates = true;
m_rightBorderStyle->SetSelection(m_leftBorderStyle->GetSelection());
m_topBorderStyle->SetSelection(m_leftBorderStyle->GetSelection());
m_bottomBorderStyle->SetSelection(m_leftBorderStyle->GetSelection());
m_ignoreUpdates = false;
}
if (m_borderPreviewCtrl)
{
TransferDataFromWindow();
m_borderPreviewCtrl->Refresh();
}
}
/*!
* wxEVT_COMMAND_CHECKBOX_CLICKED event handler for ID_RICHTEXT_OUTLINE_SYNCHRONIZE
*/
void wxRichTextBordersPage::OnRichtextOutlineSynchronizeClick( wxCommandEvent& event )
{
if (m_ignoreUpdates)
return;
if (event.IsChecked())
{
TransferDataFromWindow();
GetAttributes()->GetTextBoxAttr().GetOutline().GetTop() = GetAttributes()->GetTextBoxAttr().GetOutline().GetLeft();
GetAttributes()->GetTextBoxAttr().GetOutline().GetRight() = GetAttributes()->GetTextBoxAttr().GetOutline().GetLeft();
GetAttributes()->GetTextBoxAttr().GetOutline().GetBottom() = GetAttributes()->GetTextBoxAttr().GetOutline().GetLeft();
m_ignoreUpdates = true;
TransferDataToWindow();
m_ignoreUpdates = false;
if (m_borderPreviewCtrl)
{
TransferDataFromWindow();
m_borderPreviewCtrl->Refresh();
}
}
}
/*!
* wxEVT_UPDATE_UI event handler for ID_RICHTEXT_OUTLINE_SYNCHRONIZE
*/
void wxRichTextBordersPage::OnRichtextOutlineSynchronizeUpdate( wxUpdateUIEvent& WXUNUSED(event) )
{
}
/*!
* wxEVT_UPDATE_UI event handler for ID_RICHTEXT_OUTLINE_RIGHT_CHECKBOX
*/
void wxRichTextBordersPage::OnRichtextOutlineOtherCheckboxUpdate( wxUpdateUIEvent& event )
{
event.Enable(!m_outlineSyncCtrl->GetValue());
}
/*!
* wxEVT_COMMAND_TEXT_UPDATED event handler for ID_RICHTEXT_OUTLINE_LEFT
*/
void wxRichTextBordersPage::OnRichtextOutlineLeftTextUpdated( wxCommandEvent& event )
{
if (m_ignoreUpdates)
return;
if (m_outlineSyncCtrl->GetValue())
{
wxString value = event.GetString();
m_ignoreUpdates = true;
m_rightOutlineWidth->SetValue(value);
m_topOutlineWidth->SetValue(value);
m_bottomOutlineWidth->SetValue(value);
m_ignoreUpdates = false;
}
if (m_borderPreviewCtrl)
{
TransferDataFromWindow();
m_borderPreviewCtrl->Refresh();
}
}
/*!
* wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_RICHTEXT_OUTLINE_LEFT_UNITS
*/
void wxRichTextBordersPage::OnRichtextOutlineLeftUnitsSelected( wxCommandEvent& WXUNUSED(event) )
{
if (m_ignoreUpdates)
return;
if (m_outlineSyncCtrl->GetValue())
{
m_ignoreUpdates = true;
m_rightOutlineWidthUnits->SetSelection(m_leftOutlineWidthUnits->GetSelection());
m_topOutlineWidthUnits->SetSelection(m_leftOutlineWidthUnits->GetSelection());
m_bottomOutlineWidthUnits->SetSelection(m_leftOutlineWidthUnits->GetSelection());
m_ignoreUpdates = false;
}
if (m_borderPreviewCtrl)
{
TransferDataFromWindow();
m_borderPreviewCtrl->Refresh();
}
}
/*!
* wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_RICHTEXT_OUTLINE_LEFT_STYLE
*/
void wxRichTextBordersPage::OnRichtextOutlineLeftStyleSelected( wxCommandEvent& WXUNUSED(event) )
{
if (m_ignoreUpdates)
return;
if (m_outlineSyncCtrl->GetValue())
{
m_ignoreUpdates = true;
m_rightOutlineStyle->SetSelection(m_leftOutlineStyle->GetSelection());
m_topOutlineStyle->SetSelection(m_leftOutlineStyle->GetSelection());
m_bottomOutlineStyle->SetSelection(m_leftOutlineStyle->GetSelection());
m_ignoreUpdates = false;
}
if (m_borderPreviewCtrl)
{
TransferDataFromWindow();
m_borderPreviewCtrl->Refresh();
}
}
BEGIN_EVENT_TABLE(wxRichTextBorderPreviewCtrl, wxWindow) BEGIN_EVENT_TABLE(wxRichTextBorderPreviewCtrl, wxWindow)
EVT_PAINT(wxRichTextBorderPreviewCtrl::OnPaint) EVT_PAINT(wxRichTextBorderPreviewCtrl::OnPaint)
END_EVENT_TABLE() END_EVENT_TABLE()

232
src/richtext/richtextdialogs.pjd
View File

@@ -20014,14 +20014,6 @@
<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>
@@ -23208,7 +23200,8 @@
<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">"wbTextCtrlProxy"</string> <string name="proxy-type">"wbTextCtrlProxy"</string>
<string name="event-handler-0">"wxEVT_UPDATE_UI|OnRichtextBorderLeftUpdate|NONE||wxRichTextBordersPage"</string> <string name="event-handler-0">"wxEVT_COMMAND_TEXT_UPDATED|OnRichtextBorderLeftValueTextUpdated|NONE||wxRichTextBordersPage"</string>
<string name="event-handler-1">"wxEVT_UPDATE_UI|OnRichtextBorderLeftUpdate|NONE||wxRichTextBordersPage"</string>
<string name="proxy-Id name">"ID_RICHTEXT_BORDER_LEFT"</string> <string name="proxy-Id name">"ID_RICHTEXT_BORDER_LEFT"</string>
<long name="proxy-Id value">10804</long> <long name="proxy-Id value">10804</long>
<string name="proxy-Name">""</string> <string name="proxy-Name">""</string>
@@ -23292,7 +23285,8 @@
<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_UPDATE_UI|OnRichtextBorderLeftUpdate|NONE||wxRichTextBordersPage"</string> <string name="event-handler-0">"wxEVT_COMMAND_COMBOBOX_SELECTED|OnRichtextBorderLeftUnitsSelected|NONE||wxRichTextBordersPage"</string>
<string name="event-handler-1">"wxEVT_UPDATE_UI|OnRichtextBorderLeftUpdate|NONE||wxRichTextBordersPage"</string>
<string name="proxy-Id name">"ID_RICHTEXT_BORDER_LEFT_UNITS"</string> <string name="proxy-Id name">"ID_RICHTEXT_BORDER_LEFT_UNITS"</string>
<long name="proxy-Id value">10805</long> <long name="proxy-Id value">10805</long>
<string name="proxy-Name">""</string> <string name="proxy-Name">""</string>
@@ -23384,7 +23378,8 @@
<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_UPDATE_UI|OnRichtextBorderLeftUpdate|NONE||wxRichTextBordersPage"</string> <string name="event-handler-0">"wxEVT_COMMAND_COMBOBOX_SELECTED|OnRichtextBorderLeftStyleSelected|NONE||wxRichTextBordersPage"</string>
<string name="event-handler-1">"wxEVT_UPDATE_UI|OnRichtextBorderLeftUpdate|NONE||wxRichTextBordersPage"</string>
<string name="proxy-Id name">"ID_RICHTEXT_BORDER_LEFT_STYLE"</string> <string name="proxy-Id name">"ID_RICHTEXT_BORDER_LEFT_STYLE"</string>
<long name="proxy-Id value">10806</long> <long name="proxy-Id value">10806</long>
<string name="proxy-Name">""</string> <string name="proxy-Name">""</string>
@@ -23397,7 +23392,7 @@
<string name="proxy-Member variable name">"m_leftBorderStyle"</string> <string name="proxy-Member variable name">"m_leftBorderStyle"</string>
<string name="proxy-Strings">""</string> <string name="proxy-Strings">""</string>
<string name="proxy-Initial value">""</string> <string name="proxy-Initial value">""</string>
<string name="proxy-Help text">""</string> <string name="proxy-Help text">"The border line style."</string>
<string name="proxy-Tooltip text">""</string> <string name="proxy-Tooltip text">""</string>
<string name="proxy-Background colour">""</string> <string name="proxy-Background colour">""</string>
<string name="proxy-Foreground colour">""</string> <string name="proxy-Foreground colour">""</string>
@@ -23550,6 +23545,7 @@
<long name="locked">0</long> <long name="locked">0</long>
<string name="proxy-type">"wbCheckBoxProxy"</string> <string name="proxy-type">"wbCheckBoxProxy"</string>
<string name="event-handler-0">"wxEVT_COMMAND_CHECKBOX_CLICKED|OnRichtextBorderCheckboxClick|NONE||wxRichTextBordersPage"</string> <string name="event-handler-0">"wxEVT_COMMAND_CHECKBOX_CLICKED|OnRichtextBorderCheckboxClick|NONE||wxRichTextBordersPage"</string>
<string name="event-handler-1">"wxEVT_UPDATE_UI|OnRichtextBorderOtherCheckboxUpdate|NONE||wxRichTextBordersPage"</string>
<string name="proxy-Id name">"ID_RICHTEXT_BORDER_RIGHT_CHECKBOX"</string> <string name="proxy-Id name">"ID_RICHTEXT_BORDER_RIGHT_CHECKBOX"</string>
<long name="proxy-Id value">10808</long> <long name="proxy-Id value">10808</long>
<string name="proxy-Name">""</string> <string name="proxy-Name">""</string>
@@ -23828,7 +23824,7 @@
<string name="proxy-Member variable name">"m_rightBorderStyle"</string> <string name="proxy-Member variable name">"m_rightBorderStyle"</string>
<string name="proxy-Strings">""</string> <string name="proxy-Strings">""</string>
<string name="proxy-Initial value">""</string> <string name="proxy-Initial value">""</string>
<string name="proxy-Help text">""</string> <string name="proxy-Help text">"The border line style."</string>
<string name="proxy-Tooltip text">""</string> <string name="proxy-Tooltip text">""</string>
<string name="proxy-Background colour">""</string> <string name="proxy-Background colour">""</string>
<string name="proxy-Foreground colour">""</string> <string name="proxy-Foreground colour">""</string>
@@ -23981,6 +23977,7 @@
<long name="locked">0</long> <long name="locked">0</long>
<string name="proxy-type">"wbCheckBoxProxy"</string> <string name="proxy-type">"wbCheckBoxProxy"</string>
<string name="event-handler-0">"wxEVT_COMMAND_CHECKBOX_CLICKED|OnRichtextBorderCheckboxClick|NONE||wxRichTextBordersPage"</string> <string name="event-handler-0">"wxEVT_COMMAND_CHECKBOX_CLICKED|OnRichtextBorderCheckboxClick|NONE||wxRichTextBordersPage"</string>
<string name="event-handler-1">"wxEVT_UPDATE_UI|OnRichtextBorderOtherCheckboxUpdate|NONE||wxRichTextBordersPage"</string>
<string name="proxy-Id name">"ID_RICHTEXT_BORDER_TOP_CHECKBOX"</string> <string name="proxy-Id name">"ID_RICHTEXT_BORDER_TOP_CHECKBOX"</string>
<long name="proxy-Id value">10813</long> <long name="proxy-Id value">10813</long>
<string name="proxy-Name">""</string> <string name="proxy-Name">""</string>
@@ -24259,7 +24256,7 @@
<string name="proxy-Member variable name">"m_topBorderStyle"</string> <string name="proxy-Member variable name">"m_topBorderStyle"</string>
<string name="proxy-Strings">""</string> <string name="proxy-Strings">""</string>
<string name="proxy-Initial value">""</string> <string name="proxy-Initial value">""</string>
<string name="proxy-Help text">""</string> <string name="proxy-Help text">"The border line style."</string>
<string name="proxy-Tooltip text">""</string> <string name="proxy-Tooltip text">""</string>
<string name="proxy-Background colour">""</string> <string name="proxy-Background colour">""</string>
<string name="proxy-Foreground colour">""</string> <string name="proxy-Foreground colour">""</string>
@@ -24412,6 +24409,7 @@
<long name="locked">0</long> <long name="locked">0</long>
<string name="proxy-type">"wbCheckBoxProxy"</string> <string name="proxy-type">"wbCheckBoxProxy"</string>
<string name="event-handler-0">"wxEVT_COMMAND_CHECKBOX_CLICKED|OnRichtextBorderCheckboxClick|NONE||wxRichTextBordersPage"</string> <string name="event-handler-0">"wxEVT_COMMAND_CHECKBOX_CLICKED|OnRichtextBorderCheckboxClick|NONE||wxRichTextBordersPage"</string>
<string name="event-handler-1">"wxEVT_UPDATE_UI|OnRichtextBorderOtherCheckboxUpdate|NONE||wxRichTextBordersPage"</string>
<string name="proxy-Id name">"ID_RICHTEXT_BORDER_BOTTOM_CHECKBOX"</string> <string name="proxy-Id name">"ID_RICHTEXT_BORDER_BOTTOM_CHECKBOX"</string>
<long name="proxy-Id value">10818</long> <long name="proxy-Id value">10818</long>
<string name="proxy-Name">""</string> <string name="proxy-Name">""</string>
@@ -24690,7 +24688,7 @@
<string name="proxy-Member variable name">"m_bottomBorderStyle"</string> <string name="proxy-Member variable name">"m_bottomBorderStyle"</string>
<string name="proxy-Strings">""</string> <string name="proxy-Strings">""</string>
<string name="proxy-Initial value">""</string> <string name="proxy-Initial value">""</string>
<string name="proxy-Help text">""</string> <string name="proxy-Help text">"The border line style."</string>
<string name="proxy-Tooltip text">""</string> <string name="proxy-Tooltip text">""</string>
<string name="proxy-Background colour">""</string> <string name="proxy-Background colour">""</string>
<string name="proxy-Foreground colour">""</string> <string name="proxy-Foreground colour">""</string>
@@ -24832,6 +24830,98 @@
<string name="proxy-Event sources">""</string> <string name="proxy-Event sources">""</string>
</document> </document>
</document> </document>
<document>
<string name="title">"Spacer"</string>
<string name="type">"dialog-control-document"</string>
<string name="filename">""</string>
<string name="icon-name">"spacer"</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">"wbSpacerProxy"</string>
<long name="proxy-Width">5</long>
<long name="proxy-Height">5</long>
<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-wxADJUST_MINSIZE">0</bool>
<bool name="proxy-wxFIXED_MINSIZE">0</bool>
<bool name="proxy-wxRESERVE_SPACE_EVEN_IF_HIDDEN">0</bool>
<string name="proxy-Platform">"&lt;Any platform&gt;"</string>
</document>
<document>
<string name="title">"wxCheckBox: ID_RICHTEXT_BORDER_SYNCHRONIZE"</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="event-handler-0">"wxEVT_COMMAND_CHECKBOX_CLICKED|OnRichtextBorderSynchronizeClick|NONE||wxRichTextBordersPage"</string>
<string name="event-handler-1">"wxEVT_UPDATE_UI|OnRichtextBorderSynchronizeUpdate|NONE||wxRichTextBordersPage"</string>
<string name="proxy-Id name">"ID_RICHTEXT_BORDER_SYNCHRONIZE"</string>
<long name="proxy-Id value">10845</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_borderSyncCtrl"</string>
<string name="proxy-Label">"&amp;Synchronize values"</string>
<bool name="proxy-Initial value">0</bool>
<string name="proxy-Help text">"Check to edit all borders simultaneously."</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">"Right"</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>
<bool name="proxy-wxRESERVE_SPACE_EVEN_IF_HIDDEN">0</bool>
<string name="proxy-Custom arguments">""</string>
<string name="proxy-Custom ctor arguments">""</string>
</document>
</document> </document>
</document> </document>
</document> </document>
@@ -25297,7 +25387,8 @@
<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">"wbTextCtrlProxy"</string> <string name="proxy-type">"wbTextCtrlProxy"</string>
<string name="event-handler-0">"wxEVT_UPDATE_UI|OnRichtextOutlineLeftUpdate|NONE||wxRichTextBordersPage"</string> <string name="event-handler-0">"wxEVT_COMMAND_TEXT_UPDATED|OnRichtextOutlineLeftTextUpdated|NONE||wxRichTextBordersPage"</string>
<string name="event-handler-1">"wxEVT_UPDATE_UI|OnRichtextOutlineLeftUpdate|NONE||wxRichTextBordersPage"</string>
<string name="proxy-Id name">"ID_RICHTEXT_OUTLINE_LEFT"</string> <string name="proxy-Id name">"ID_RICHTEXT_OUTLINE_LEFT"</string>
<long name="proxy-Id value">10825</long> <long name="proxy-Id value">10825</long>
<string name="proxy-Name">""</string> <string name="proxy-Name">""</string>
@@ -25381,7 +25472,8 @@
<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_UPDATE_UI|OnRichtextOutlineLeftUpdate|NONE||wxRichTextBordersPage"</string> <string name="event-handler-0">"wxEVT_COMMAND_COMBOBOX_SELECTED|OnRichtextOutlineLeftUnitsSelected|NONE||wxRichTextBordersPage"</string>
<string name="event-handler-1">"wxEVT_UPDATE_UI|OnRichtextOutlineLeftUpdate|NONE||wxRichTextBordersPage"</string>
<string name="proxy-Id name">"ID_RICHTEXT_OUTLINE_LEFT_UNITS"</string> <string name="proxy-Id name">"ID_RICHTEXT_OUTLINE_LEFT_UNITS"</string>
<long name="proxy-Id value">10826</long> <long name="proxy-Id value">10826</long>
<string name="proxy-Name">""</string> <string name="proxy-Name">""</string>
@@ -25473,7 +25565,8 @@
<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_UPDATE_UI|OnRichtextOutlineLeftUpdate|NONE||wxRichTextBordersPage"</string> <string name="event-handler-0">"wxEVT_COMMAND_COMBOBOX_SELECTED|OnRichtextOutlineLeftStyleSelected|NONE||wxRichTextBordersPage"</string>
<string name="event-handler-1">"wxEVT_UPDATE_UI|OnRichtextOutlineLeftUpdate|NONE||wxRichTextBordersPage"</string>
<string name="proxy-Id name">"ID_RICHTEXT_OUTLINE_LEFT_STYLE"</string> <string name="proxy-Id name">"ID_RICHTEXT_OUTLINE_LEFT_STYLE"</string>
<long name="proxy-Id value">10827</long> <long name="proxy-Id value">10827</long>
<string name="proxy-Name">""</string> <string name="proxy-Name">""</string>
@@ -25486,7 +25579,7 @@
<string name="proxy-Member variable name">"m_leftOutlineStyle"</string> <string name="proxy-Member variable name">"m_leftOutlineStyle"</string>
<string name="proxy-Strings">""</string> <string name="proxy-Strings">""</string>
<string name="proxy-Initial value">""</string> <string name="proxy-Initial value">""</string>
<string name="proxy-Help text">""</string> <string name="proxy-Help text">"The border line style."</string>
<string name="proxy-Tooltip text">""</string> <string name="proxy-Tooltip text">""</string>
<string name="proxy-Background colour">""</string> <string name="proxy-Background colour">""</string>
<string name="proxy-Foreground colour">""</string> <string name="proxy-Foreground colour">""</string>
@@ -25639,6 +25732,7 @@
<long name="locked">0</long> <long name="locked">0</long>
<string name="proxy-type">"wbCheckBoxProxy"</string> <string name="proxy-type">"wbCheckBoxProxy"</string>
<string name="event-handler-0">"wxEVT_COMMAND_CHECKBOX_CLICKED|OnRichtextBorderCheckboxClick|NONE||wxRichTextBordersPage"</string> <string name="event-handler-0">"wxEVT_COMMAND_CHECKBOX_CLICKED|OnRichtextBorderCheckboxClick|NONE||wxRichTextBordersPage"</string>
<string name="event-handler-1">"wxEVT_UPDATE_UI|OnRichtextOutlineOtherCheckboxUpdate|NONE||wxRichTextBordersPage"</string>
<string name="proxy-Id name">"ID_RICHTEXT_OUTLINE_RIGHT_CHECKBOX"</string> <string name="proxy-Id name">"ID_RICHTEXT_OUTLINE_RIGHT_CHECKBOX"</string>
<long name="proxy-Id value">10829</long> <long name="proxy-Id value">10829</long>
<string name="proxy-Name">""</string> <string name="proxy-Name">""</string>
@@ -25917,7 +26011,7 @@
<string name="proxy-Member variable name">"m_rightOutlineStyle"</string> <string name="proxy-Member variable name">"m_rightOutlineStyle"</string>
<string name="proxy-Strings">""</string> <string name="proxy-Strings">""</string>
<string name="proxy-Initial value">""</string> <string name="proxy-Initial value">""</string>
<string name="proxy-Help text">""</string> <string name="proxy-Help text">"The border line style."</string>
<string name="proxy-Tooltip text">""</string> <string name="proxy-Tooltip text">""</string>
<string name="proxy-Background colour">""</string> <string name="proxy-Background colour">""</string>
<string name="proxy-Foreground colour">""</string> <string name="proxy-Foreground colour">""</string>
@@ -26070,6 +26164,7 @@
<long name="locked">0</long> <long name="locked">0</long>
<string name="proxy-type">"wbCheckBoxProxy"</string> <string name="proxy-type">"wbCheckBoxProxy"</string>
<string name="event-handler-0">"wxEVT_COMMAND_CHECKBOX_CLICKED|OnRichtextBorderCheckboxClick|NONE||wxRichTextBordersPage"</string> <string name="event-handler-0">"wxEVT_COMMAND_CHECKBOX_CLICKED|OnRichtextBorderCheckboxClick|NONE||wxRichTextBordersPage"</string>
<string name="event-handler-1">"wxEVT_UPDATE_UI|OnRichtextOutlineOtherCheckboxUpdate|NONE||wxRichTextBordersPage"</string>
<string name="proxy-Id name">"ID_RICHTEXT_OUTLINE_TOP_CHECKBOX"</string> <string name="proxy-Id name">"ID_RICHTEXT_OUTLINE_TOP_CHECKBOX"</string>
<long name="proxy-Id value">10834</long> <long name="proxy-Id value">10834</long>
<string name="proxy-Name">""</string> <string name="proxy-Name">""</string>
@@ -26348,7 +26443,7 @@
<string name="proxy-Member variable name">"m_topOutlineStyle"</string> <string name="proxy-Member variable name">"m_topOutlineStyle"</string>
<string name="proxy-Strings">""</string> <string name="proxy-Strings">""</string>
<string name="proxy-Initial value">""</string> <string name="proxy-Initial value">""</string>
<string name="proxy-Help text">""</string> <string name="proxy-Help text">"The border line style."</string>
<string name="proxy-Tooltip text">""</string> <string name="proxy-Tooltip text">""</string>
<string name="proxy-Background colour">""</string> <string name="proxy-Background colour">""</string>
<string name="proxy-Foreground colour">""</string> <string name="proxy-Foreground colour">""</string>
@@ -26501,6 +26596,7 @@
<long name="locked">0</long> <long name="locked">0</long>
<string name="proxy-type">"wbCheckBoxProxy"</string> <string name="proxy-type">"wbCheckBoxProxy"</string>
<string name="event-handler-0">"wxEVT_COMMAND_CHECKBOX_CLICKED|OnRichtextBorderCheckboxClick|NONE||wxRichTextBordersPage"</string> <string name="event-handler-0">"wxEVT_COMMAND_CHECKBOX_CLICKED|OnRichtextBorderCheckboxClick|NONE||wxRichTextBordersPage"</string>
<string name="event-handler-1">"wxEVT_UPDATE_UI|OnRichtextOutlineOtherCheckboxUpdate|NONE||wxRichTextBordersPage"</string>
<string name="proxy-Id name">"ID_RICHTEXT_OUTLINE_BOTTOM_CHECKBOX"</string> <string name="proxy-Id name">"ID_RICHTEXT_OUTLINE_BOTTOM_CHECKBOX"</string>
<long name="proxy-Id value">10839</long> <long name="proxy-Id value">10839</long>
<string name="proxy-Name">""</string> <string name="proxy-Name">""</string>
@@ -26779,7 +26875,7 @@
<string name="proxy-Member variable name">"m_bottomOutlineStyle"</string> <string name="proxy-Member variable name">"m_bottomOutlineStyle"</string>
<string name="proxy-Strings">""</string> <string name="proxy-Strings">""</string>
<string name="proxy-Initial value">""</string> <string name="proxy-Initial value">""</string>
<string name="proxy-Help text">""</string> <string name="proxy-Help text">"The border line style."</string>
<string name="proxy-Tooltip text">""</string> <string name="proxy-Tooltip text">""</string>
<string name="proxy-Background colour">""</string> <string name="proxy-Background colour">""</string>
<string name="proxy-Foreground colour">""</string> <string name="proxy-Foreground colour">""</string>
@@ -26921,6 +27017,98 @@
<string name="proxy-Event sources">""</string> <string name="proxy-Event sources">""</string>
</document> </document>
</document> </document>
<document>
<string name="title">"Spacer"</string>
<string name="type">"dialog-control-document"</string>
<string name="filename">""</string>
<string name="icon-name">"spacer"</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">"wbSpacerProxy"</string>
<long name="proxy-Width">5</long>
<long name="proxy-Height">5</long>
<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-wxADJUST_MINSIZE">0</bool>
<bool name="proxy-wxFIXED_MINSIZE">0</bool>
<bool name="proxy-wxRESERVE_SPACE_EVEN_IF_HIDDEN">0</bool>
<string name="proxy-Platform">"&lt;Any platform&gt;"</string>
</document>
<document>
<string name="title">"wxCheckBox: ID_RICHTEXT_OUTLINE_SYNCHRONIZE"</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="event-handler-0">"wxEVT_COMMAND_CHECKBOX_CLICKED|OnRichtextOutlineSynchronizeClick|NONE||wxRichTextBordersPage"</string>
<string name="event-handler-1">"wxEVT_UPDATE_UI|OnRichtextOutlineSynchronizeUpdate|NONE||wxRichTextBordersPage"</string>
<string name="proxy-Id name">"ID_RICHTEXT_OUTLINE_SYNCHRONIZE"</string>
<long name="proxy-Id value">10846</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_outlineSyncCtrl"</string>
<string name="proxy-Label">"&amp;Synchronize values"</string>
<bool name="proxy-Initial value">0</bool>
<string name="proxy-Help text">"Check to edit all borders simultaneously."</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">"Right"</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>
<bool name="proxy-wxRESERVE_SPACE_EVEN_IF_HIDDEN">0</bool>
<string name="proxy-Custom arguments">""</string>
<string name="proxy-Custom ctor arguments">""</string>
</document>
</document> </document>
</document> </document>
</document> </document>