AllSpiceMirrors/kicad
7
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-21 00:21:25 +00:00
Files Issues Releases Activity

Get rid of Drawing Sheet Editor's Apply buttons.

Browse Source 
Fixes https://gitlab.com/kicad/code/kicad/-/issues/18367
This commit is contained in:
Jeff Young 2024-08-15 22:11:46 -06:00
parent 6b22f86a54
commit 781cb0fb8e
5 changed files with 152 additions and 190 deletions

54
pagelayout_editor/dialogs/properties_frame.cpp
View File

@ -76,7 +76,8 @@ PROPERTIES_FRAME::PROPERTIES_FRAME( PL_EDITOR_FRAME* aParent ) :
m_textRightMargin( aParent, m_rightMarginLabel, m_rightMarginCtrl, m_rightMarginUnits ),
m_textTopMargin( aParent, m_topMarginLabel, m_topMarginCtrl, m_topMarginUnits ),
m_textBottomMargin( aParent, m_bottomMarginLabel, m_bottomMarginCtrl, m_bottomMarginUnits ),
m_lineWidth( aParent, m_lineWidthLabel, m_lineWidthCtrl, m_lineWidthUnits )
m_lineWidth( aParent, m_lineWidthLabel, m_lineWidthCtrl, m_lineWidthUnits ),
m_propertiesDirty( false )
{
m_parent = aParent;
@ -123,7 +124,11 @@ PROPERTIES_FRAME::PROPERTIES_FRAME( PL_EDITOR_FRAME* aParent ) :
m_textColorSwatch->SetDefaultColor( COLOR4D::UNSPECIFIED );
m_textColorSwatch->SetSwatchBackground( aParent->GetDrawBgColor() );
m_buttonOK->SetDefault();
m_textColorSwatch->Bind( COLOR_SWATCH_CHANGED,
[this]( wxCommandEvent& event )
{
m_propertiesDirty = true;
} );
// ensure sizers are up to date
// (fix an issue on GTK but should not create issues on other platforms):
@ -148,17 +153,6 @@ PROPERTIES_FRAME::~PROPERTIES_FRAME()
}
void PROPERTIES_FRAME::OnPageChanged( wxNotebookEvent& event )
{
if( event.GetSelection() == 0 )
m_buttonOK->SetDefault();
else
m_buttonGeneralOptsOK->SetDefault();
event.Skip();
}
wxSize PROPERTIES_FRAME::GetMinSize() const
{
return FromDIP( wxSize( 150, -1 ) );
@ -411,6 +405,8 @@ void PROPERTIES_FRAME::onHAlignButton( wxCommandEvent& aEvent )
if( btn->IsChecked() && btn != aEvent.GetEventObject() )
btn->Check( false );
}
m_propertiesDirty = true;
}
@ -421,10 +417,12 @@ void PROPERTIES_FRAME::onVAlignButton( wxCommandEvent& aEvent )
if( btn->IsChecked() && btn != aEvent.GetEventObject() )
btn->Check( false );
}
m_propertiesDirty = true;
}
void PROPERTIES_FRAME::OnAcceptPrms( wxCommandEvent& event )
void PROPERTIES_FRAME::OnAcceptPrms()
{
PL_SELECTION_TOOL* selTool = m_parent->GetToolManager()->GetTool<PL_SELECTION_TOOL>();
PL_SELECTION& selection = selTool->GetSelection();
@ -449,6 +447,8 @@ void PROPERTIES_FRAME::OnAcceptPrms( wxCommandEvent& event )
// Refresh values, exactly as they are converted, to avoid any mistake
CopyPrmsFromGeneralToPanel();
m_propertiesDirty = false;
m_parent->OnModify();
// Rebuild the draw list with the new parameters
@ -457,6 +457,31 @@ void PROPERTIES_FRAME::OnAcceptPrms( wxCommandEvent& event )
}
void PROPERTIES_FRAME::onModify( wxCommandEvent& aEvent )
{
m_propertiesDirty = true;
}
void PROPERTIES_FRAME::onTextFocusLost( wxFocusEvent& aEvent )
{
m_propertiesDirty = true;
}
void PROPERTIES_FRAME::OnUpdateUI( wxUpdateUIEvent& aEvent )
{
if( m_propertiesDirty )
{
CallAfter(
[this]()
{
OnAcceptPrms();
} );
}
}
void PROPERTIES_FRAME::OnSetDefaultValues( wxCommandEvent& event )
{
DS_DATA_MODEL& model = DS_DATA_MODEL::GetTheInstance();
@ -635,6 +660,7 @@ void PROPERTIES_FRAME::onScintillaCharAdded( wxStyledTextEvent &aEvent )
void PROPERTIES_FRAME::onScintillaFocusLost( wxFocusEvent& aEvent )
{
m_stcText->AutoCompCancel();
m_propertiesDirty = true;
aEvent.Skip();
}

9
pagelayout_editor/dialogs/properties_frame.h
View File

@ -75,13 +75,18 @@ class PROPERTIES_FRAME : public PANEL_PROPERTIES_BASE
UNIT_BINDER m_lineWidth;
bool m_propertiesDirty;
public:
PROPERTIES_FRAME( PL_EDITOR_FRAME* aParent );
~PROPERTIES_FRAME();
void OnAcceptPrms();
// Event functions
void OnPageChanged( wxNotebookEvent& event ) override;
void OnAcceptPrms( wxCommandEvent& event ) override;
void OnUpdateUI( wxUpdateUIEvent& aEvent ) override;
void onModify( wxCommandEvent& aEvent ) override;
void onTextFocusLost( wxFocusEvent& aEvent ) override;
void OnSetDefaultValues( wxCommandEvent& event ) override;
void onScintillaCharAdded( wxStyledTextEvent &aEvent );
void onScintillaFocusLost( wxFocusEvent& aEvent ) override;

86
pagelayout_editor/dialogs/properties_frame_base.cpp
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version 4.1.0-0-g733bf3d)
// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!
@ -28,7 +28,7 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c
m_staticTextType = new wxStaticText( m_swItemProperties, wxID_ANY, _("Type"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextType->Wrap( -1 );
m_staticTextType->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
m_staticTextType->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_SLANT, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
bSizerButt->Add( m_staticTextType, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 4 );
@ -447,11 +447,6 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c
m_SizerItemProperties->Add( m_sbStep, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 );
m_buttonOK = new wxButton( m_swItemProperties, wxID_ANY, _("Apply"), wxDefaultPosition, wxDefaultSize, 0 );
m_buttonOK->SetDefault();
m_SizerItemProperties->Add( m_buttonOK, 0, wxALL|wxEXPAND, 5 );
m_swItemProperties->SetSizer( m_SizerItemProperties );
m_swItemProperties->Layout();
@ -607,11 +602,6 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c
bSizerGeneraMargins->Add( fgSizer6, 1, wxEXPAND, 5 );
m_buttonGeneralOptsOK = new wxButton( bSizerGeneraMargins->GetStaticBox(), wxID_ANY, _("Apply"), wxDefaultPosition, wxDefaultSize, 0 );
m_buttonGeneralOptsOK->SetDefault();
bSizerGeneraMargins->Add( m_buttonGeneralOptsOK, 0, wxALL|wxEXPAND, 5 );
bSizerGeneralOpts->Add( bSizerGeneraMargins, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 );
@ -629,22 +619,82 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c
bSizerpanel->Fit( this );
// Connect Events
m_notebook->Connect( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxNotebookEventHandler( PANEL_PROPERTIES_BASE::OnPageChanged ), NULL, this );
this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( PANEL_PROPERTIES_BASE::OnUpdateUI ) );
m_buttonHelp->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PROPERTIES_BASE::onHelp ), NULL, this );
m_choicePageOpt->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( PANEL_PROPERTIES_BASE::onModify ), NULL, this );
m_stcText->Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onScintillaFocusLost ), NULL, this );
m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PROPERTIES_BASE::OnAcceptPrms ), NULL, this );
m_bold->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PROPERTIES_BASE::onModify ), NULL, this );
m_italic->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PROPERTIES_BASE::onModify ), NULL, this );
m_fontCtrl->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( PANEL_PROPERTIES_BASE::onModify ), NULL, this );
m_textCtrlTextSizeX->Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_textCtrlTextSizeY->Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_constraintXCtrl->Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_constraintYCtrl->Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_textCtrlComment->Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_textCtrlPosX->Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_textCtrlPosY->Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_comboBoxCornerPos->Connect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( PANEL_PROPERTIES_BASE::onModify ), NULL, this );
m_comboBoxCornerPos->Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_textCtrlEndX->Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_textCtrlEndY->Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_comboBoxCornerEnd->Connect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( PANEL_PROPERTIES_BASE::onModify ), NULL, this );
m_comboBoxCornerEnd->Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_lineWidthCtrl->Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_textCtrlRotation->Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_textCtrlBitmapDPI->Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_textCtrlRepeatCount->Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_textCtrlTextIncrement->Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_textCtrlStepX->Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_textCtrlStepY->Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_textCtrlDefaultTextSizeX->Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_textCtrlDefaultTextSizeY->Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_defaultLineWidthCtrl->Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_defaultTextThicknessCtrl->Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_buttonDefault->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PROPERTIES_BASE::OnSetDefaultValues ), NULL, this );
m_buttonGeneralOptsOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PROPERTIES_BASE::OnAcceptPrms ), NULL, this );
m_leftMarginCtrl->Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_rightMarginCtrl->Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_topMarginCtrl->Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_bottomMarginCtrl->Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
}
PANEL_PROPERTIES_BASE::~PANEL_PROPERTIES_BASE()
{
// Disconnect Events
m_notebook->Disconnect( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxNotebookEventHandler( PANEL_PROPERTIES_BASE::OnPageChanged ), NULL, this );
this->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( PANEL_PROPERTIES_BASE::OnUpdateUI ) );
m_buttonHelp->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PROPERTIES_BASE::onHelp ), NULL, this );
m_choicePageOpt->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( PANEL_PROPERTIES_BASE::onModify ), NULL, this );
m_stcText->Disconnect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onScintillaFocusLost ), NULL, this );
m_buttonOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PROPERTIES_BASE::OnAcceptPrms ), NULL, this );
m_bold->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PROPERTIES_BASE::onModify ), NULL, this );
m_italic->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PROPERTIES_BASE::onModify ), NULL, this );
m_fontCtrl->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( PANEL_PROPERTIES_BASE::onModify ), NULL, this );
m_textCtrlTextSizeX->Disconnect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_textCtrlTextSizeY->Disconnect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_constraintXCtrl->Disconnect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_constraintYCtrl->Disconnect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_textCtrlComment->Disconnect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_textCtrlPosX->Disconnect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_textCtrlPosY->Disconnect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_comboBoxCornerPos->Disconnect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( PANEL_PROPERTIES_BASE::onModify ), NULL, this );
m_comboBoxCornerPos->Disconnect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_textCtrlEndX->Disconnect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_textCtrlEndY->Disconnect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_comboBoxCornerEnd->Disconnect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( PANEL_PROPERTIES_BASE::onModify ), NULL, this );
m_comboBoxCornerEnd->Disconnect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_lineWidthCtrl->Disconnect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_textCtrlRotation->Disconnect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_textCtrlBitmapDPI->Disconnect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_textCtrlRepeatCount->Disconnect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_textCtrlTextIncrement->Disconnect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_textCtrlStepX->Disconnect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_textCtrlStepY->Disconnect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_textCtrlDefaultTextSizeX->Disconnect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_textCtrlDefaultTextSizeY->Disconnect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_defaultLineWidthCtrl->Disconnect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_defaultTextThicknessCtrl->Disconnect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_buttonDefault->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PROPERTIES_BASE::OnSetDefaultValues ), NULL, this );
m_buttonGeneralOptsOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PROPERTIES_BASE::OnAcceptPrms ), NULL, this );
m_leftMarginCtrl->Disconnect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_rightMarginCtrl->Disconnect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_topMarginCtrl->Disconnect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
m_bottomMarginCtrl->Disconnect( wxEVT_KILL_FOCUS, wxFocusEventHandler( PANEL_PROPERTIES_BASE::onTextFocusLost ), NULL, this );
}

184
pagelayout_editor/dialogs/properties_frame_base.fbp
View File

@ -53,6 +53,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style">wxTAB_TRAVERSAL</property>
<event name="OnUpdateUI">OnUpdateUI</event>
<object class="wxBoxSizer" expanded="true">
<property name="minimum_size"></property>
<property name="name">bSizerpanel</property>
@ -116,7 +117,6 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnNotebookPageChanged">OnPageChanged</event>
<object class="notebookpage" expanded="true">
<property name="bitmap"></property>
<property name="label">Item Properties</property>
@ -389,6 +389,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnChoice">onModify</event>
</object>
</object>
</object>
@ -579,6 +580,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnButtonClick">onModify</event>
</object>
</object>
<object class="sizeritem" expanded="false">
@ -653,6 +655,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnButtonClick">onModify</event>
</object>
</object>
<object class="sizeritem" expanded="false">
@ -1581,6 +1584,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnChoice">onModify</event>
</object>
</object>
<object class="gbsizeritem" expanded="true">
@ -1714,6 +1718,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnKillFocus">onTextFocusLost</event>
</object>
</object>
<object class="gbsizeritem" expanded="true">
@ -1912,6 +1917,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnKillFocus">onTextFocusLost</event>
</object>
</object>
<object class="gbsizeritem" expanded="true">
@ -2110,6 +2116,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnKillFocus">onTextFocusLost</event>
</object>
</object>
<object class="gbsizeritem" expanded="true">
@ -2308,6 +2315,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnKillFocus">onTextFocusLost</event>
</object>
</object>
<object class="gbsizeritem" expanded="true">
@ -2586,6 +2594,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnKillFocus">onTextFocusLost</event>
</object>
</object>
<object class="sizeritem" expanded="true">
@ -2741,6 +2750,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnKillFocus">onTextFocusLost</event>
</object>
</object>
<object class="sizeritem" expanded="false">
@ -2930,6 +2940,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnKillFocus">onTextFocusLost</event>
</object>
</object>
<object class="sizeritem" expanded="false">
@ -3120,6 +3131,8 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnCombobox">onModify</event>
<event name="OnKillFocus">onTextFocusLost</event>
</object>
</object>
<object class="sizeritem" expanded="true">
@ -3289,6 +3302,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnKillFocus">onTextFocusLost</event>
</object>
</object>
<object class="sizeritem" expanded="false">
@ -3478,6 +3492,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnKillFocus">onTextFocusLost</event>
</object>
</object>
<object class="sizeritem" expanded="false">
@ -3668,6 +3683,8 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnCombobox">onModify</event>
<event name="OnKillFocus">onTextFocusLost</event>
</object>
</object>
<object class="sizeritem" expanded="true">
@ -3839,6 +3856,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnKillFocus">onTextFocusLost</event>
</object>
</object>
<object class="gbsizeritem" expanded="true">
@ -4037,6 +4055,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnKillFocus">onTextFocusLost</event>
</object>
</object>
<object class="gbsizeritem" expanded="true">
@ -4170,6 +4189,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnKillFocus">onTextFocusLost</event>
</object>
</object>
</object>
@ -4329,6 +4349,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnKillFocus">onTextFocusLost</event>
</object>
</object>
<object class="sizeritem" expanded="false">
@ -4466,6 +4487,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnKillFocus">onTextFocusLost</event>
</object>
</object>
<object class="sizeritem" expanded="false">
@ -4603,6 +4625,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnKillFocus">onTextFocusLost</event>
</object>
</object>
<object class="sizeritem" expanded="false">
@ -4792,6 +4815,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnKillFocus">onTextFocusLost</event>
</object>
</object>
<object class="sizeritem" expanded="false">
@ -4860,81 +4884,6 @@
</object>
</object>
</object>
<object class="sizeritem" expanded="false">
<property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">0</property>
<object class="wxButton" expanded="false">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="auth_needed">0</property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="bitmap"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="current"></property>
<property name="default">1</property>
<property name="default_pane">0</property>
<property name="disabled"></property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="drag_accept_files">0</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="focus"></property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Apply</property>
<property name="margins"></property>
<property name="markup">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_buttonOK</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="position"></property>
<property name="pressed"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnButtonClick">OnAcceptPrms</event>
</object>
</object>
</object>
</object>
</object>
@ -5164,6 +5113,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnKillFocus">onTextFocusLost</event>
</object>
</object>
<object class="sizeritem" expanded="false">
@ -5363,6 +5313,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnKillFocus">onTextFocusLost</event>
</object>
</object>
<object class="sizeritem" expanded="false">
@ -5562,6 +5513,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnKillFocus">onTextFocusLost</event>
</object>
</object>
<object class="sizeritem" expanded="false">
@ -5761,6 +5713,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnKillFocus">onTextFocusLost</event>
</object>
</object>
<object class="sizeritem" expanded="false">
@ -6077,6 +6030,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnKillFocus">onTextFocusLost</event>
</object>
</object>
<object class="sizeritem" expanded="false">
@ -6276,6 +6230,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnKillFocus">onTextFocusLost</event>
</object>
</object>
<object class="sizeritem" expanded="false">
@ -6475,6 +6430,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnKillFocus">onTextFocusLost</event>
</object>
</object>
<object class="sizeritem" expanded="false">
@ -6674,6 +6630,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnKillFocus">onTextFocusLost</event>
</object>
</object>
<object class="sizeritem" expanded="false">
@ -6740,81 +6697,6 @@
</object>
</object>
</object>
<object class="sizeritem" expanded="false">
<property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">0</property>
<object class="wxButton" expanded="false">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="auth_needed">0</property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="bitmap"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="current"></property>
<property name="default">1</property>
<property name="default_pane">0</property>
<property name="disabled"></property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="drag_accept_files">0</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="focus"></property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Apply</property>
<property name="margins"></property>
<property name="markup">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_buttonGeneralOptsOK</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="position"></property>
<property name="pressed"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnButtonClick">OnAcceptPrms</event>
</object>
</object>
</object>
</object>
</object>

9
pagelayout_editor/dialogs/properties_frame_base.h
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version 4.1.0-0-g733bf3d)
// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!
@ -119,7 +119,6 @@ class PANEL_PROPERTIES_BASE : public wxPanel
wxStaticText* m_staticTextStepY;
wxTextCtrl* m_textCtrlStepY;
wxStaticText* m_TextStepYUnits;
wxButton* m_buttonOK;
wxScrolledWindow* m_swGeneralOpts;
wxStaticText* m_staticTextDefTsX;
wxTextCtrl* m_textCtrlDefaultTextSizeX;
@ -146,13 +145,13 @@ class PANEL_PROPERTIES_BASE : public wxPanel
wxStaticText* m_bottomMarginLabel;
wxTextCtrl* m_bottomMarginCtrl;
wxStaticText* m_bottomMarginUnits;
wxButton* m_buttonGeneralOptsOK;
// Virtual event handlers, override them in your derived class
virtual void OnPageChanged( wxNotebookEvent& event ) { event.Skip(); }
virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); }
virtual void onHelp( wxCommandEvent& event ) { event.Skip(); }
virtual void onModify( wxCommandEvent& event ) { event.Skip(); }
virtual void onScintillaFocusLost( wxFocusEvent& event ) { event.Skip(); }
virtual void OnAcceptPrms( wxCommandEvent& event ) { event.Skip(); }
virtual void onTextFocusLost( wxFocusEvent& event ) { event.Skip(); }
virtual void OnSetDefaultValues( wxCommandEvent& event ) { event.Skip(); }