diff --git a/pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp b/pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp index 89cc22aead..49c9204609 100644 --- a/pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp +++ b/pagelayout_editor/dialogs/dialog_new_dataitem_base.cpp @@ -1,8 +1,8 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Aug 4 2017) +// C++ code generated with wxFormBuilder (version Apr 19 2018) // http://www.wxformbuilder.org/ // -// PLEASE DO "NOT" EDIT THIS FILE! +// PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// #include "dialog_new_dataitem_base.h" @@ -22,22 +22,38 @@ DIALOG_NEW_DATAITEM_BASE::DIALOG_NEW_DATAITEM_BASE( wxWindow* parent, wxWindowID wxBoxSizer* bSizerPos; bSizerPos = new wxBoxSizer( wxHORIZONTAL ); - wxBoxSizer* bSizerPosXY; - bSizerPosXY = new wxBoxSizer( wxVERTICAL ); + wxFlexGridSizer* bSizerPosXY; + bSizerPosXY = new wxFlexGridSizer( 0, 2, 0, 0 ); + bSizerPosXY->SetFlexibleDirection( wxBOTH ); + bSizerPosXY->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_staticTextPosX = new wxStaticText( this, wxID_ANY, _("Pos X (mm)"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticTextPosX->Wrap( -1 ); - bSizerPosXY->Add( m_staticTextPosX, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - - m_textCtrlPosX = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bSizerPosXY->Add( m_textCtrlPosX, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - - m_staticTextPosY = new wxStaticText( this, wxID_ANY, _("Pos Y (mm)"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextPosY = new wxStaticText( this, wxID_ANY, _("Y start:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextPosY->Wrap( -1 ); bSizerPosXY->Add( m_staticTextPosY, 0, wxRIGHT|wxLEFT, 5 ); + + bSizerPosXY->Add( 0, 0, 0, 0, 5 ); + m_textCtrlPosY = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bSizerPosXY->Add( m_textCtrlPosY, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); + bSizerPosXY->Add( m_textCtrlPosY, 1, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); + + m_units1 = new wxStaticText( this, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); + m_units1->Wrap( -1 ); + bSizerPosXY->Add( m_units1, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 1 ); + + m_staticTextPosX = new wxStaticText( this, wxID_ANY, _("X start:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextPosX->Wrap( -1 ); + bSizerPosXY->Add( m_staticTextPosX, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + + + bSizerPosXY->Add( 0, 0, 0, 0, 0 ); + + m_textCtrlPosX = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + bSizerPosXY->Add( m_textCtrlPosX, 1, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); + + m_units11 = new wxStaticText( this, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); + m_units11->Wrap( -1 ); + bSizerPosXY->Add( m_units11, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 1 ); bSizerPos->Add( bSizerPosXY, 1, wxEXPAND, 5 ); @@ -66,25 +82,41 @@ DIALOG_NEW_DATAITEM_BASE::DIALOG_NEW_DATAITEM_BASE( wxWindow* parent, wxWindowID m_SizerEndPosition = new wxBoxSizer( wxHORIZONTAL ); - wxBoxSizer* bSizerEndXY; - bSizerEndXY = new wxBoxSizer( wxVERTICAL ); + wxFlexGridSizer* fgSizer3; + fgSizer3 = new wxFlexGridSizer( 0, 2, 0, 0 ); + fgSizer3->SetFlexibleDirection( wxBOTH ); + fgSizer3->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_staticTextEndX = new wxStaticText( this, wxID_ANY, _("End X (mm)"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextEndX = new wxStaticText( this, wxID_ANY, _("X end:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextEndX->Wrap( -1 ); - bSizerEndXY->Add( m_staticTextEndX, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizer3->Add( m_staticTextEndX, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + + + fgSizer3->Add( 0, 0, 1, wxEXPAND, 5 ); m_textCtrlEndX = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bSizerEndXY->Add( m_textCtrlEndX, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); + fgSizer3->Add( m_textCtrlEndX, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - m_staticTextEndY = new wxStaticText( this, wxID_ANY, _("End Y (mm)"), wxDefaultPosition, wxDefaultSize, 0 ); + m_units3 = new wxStaticText( this, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); + m_units3->Wrap( -1 ); + fgSizer3->Add( m_units3, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 ); + + m_staticTextEndY = new wxStaticText( this, wxID_ANY, _("Y end:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextEndY->Wrap( -1 ); - bSizerEndXY->Add( m_staticTextEndY, 0, wxRIGHT|wxLEFT, 5 ); + fgSizer3->Add( m_staticTextEndY, 0, wxRIGHT|wxLEFT, 5 ); + + + fgSizer3->Add( 0, 0, 1, wxEXPAND, 5 ); m_textCtrlEndY = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bSizerEndXY->Add( m_textCtrlEndY, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); + fgSizer3->Add( m_textCtrlEndY, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); + + m_units4 = new wxStaticText( this, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); + m_units4->Wrap( -1 ); + fgSizer3->Add( m_units4, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 ); - m_SizerEndPosition->Add( bSizerEndXY, 1, 0, 5 ); + m_SizerEndPosition->Add( fgSizer3, 1, wxEXPAND, 5 ); wxBoxSizer* bSizer61; bSizer61 = new wxBoxSizer( wxVERTICAL ); diff --git a/pagelayout_editor/dialogs/dialog_new_dataitem_base.fbp b/pagelayout_editor/dialogs/dialog_new_dataitem_base.fbp index f1cfd20495..b2c01f22a2 100644 --- a/pagelayout_editor/dialogs/dialog_new_dataitem_base.fbp +++ b/pagelayout_editor/dialogs/dialog_new_dataitem_base.fbp @@ -14,6 +14,7 @@ dialog_new_dataitem_base 1000 none + 1 dialog_new_dataitem_base @@ -115,190 +116,23 @@ 5 wxEXPAND 1 - + + 2 + wxBOTH + + + 0 bSizerPosXY - wxVERTICAL + wxFLEX_GROWMODE_SPECIFIED none - - 5 - wxTOP|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Pos X (mm) - - 0 - - - 0 - - 1 - m_staticTextPosX - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - m_textCtrlPosX - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 0 + 0 + 5 wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -326,7 +160,7 @@ 0 0 wxID_ANY - Pos Y (mm) + Y start: 0 @@ -377,11 +211,21 @@ - + + 5 + + 0 + + 0 + protected + 0 + + + 5 wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND - 0 - + 1 + 1 1 1 @@ -468,22 +312,372 @@ + + 1 + wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + mm + + 0 + + + 0 + + 1 + m_units1 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxTOP|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + X start: + + 0 + + + 0 + + 1 + m_staticTextPosX + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + + 0 + + 0 + protected + 0 + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + m_textCtrlPosX + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + mm + + 0 + + + 0 + + 1 + m_units11 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + 5 wxALIGN_CENTER_VERTICAL 0 - + bSizer6 wxVERTICAL none - + 5 wxTOP|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -562,11 +756,11 @@ - + 5 wxBOTTOM|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -746,18 +940,25 @@ protected 5 - + wxEXPAND 1 - + + 2 + wxBOTH + + + 0 - bSizerEndXY - wxVERTICAL + fgSizer3 + wxFLEX_GROWMODE_SPECIFIED none - + 0 + 0 + 5 wxTOP|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -785,7 +986,7 @@ 0 0 wxID_ANY - End X (mm) + X end: 0 @@ -836,11 +1037,21 @@ - + + 5 + wxEXPAND + 1 + + 0 + protected + 0 + + + 5 wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND 0 - + 1 1 1 @@ -927,11 +1138,11 @@ - + 5 - wxRIGHT|wxLEFT + wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT 0 - + 1 1 1 @@ -959,7 +1170,90 @@ 0 0 wxID_ANY - End Y (mm) + mm + + 0 + + + 0 + + 1 + m_units3 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Y end: 0 @@ -1010,11 +1304,21 @@ - + + 5 + wxEXPAND + 1 + + 0 + protected + 0 + + + 5 wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND 0 - + 1 1 1 @@ -1101,22 +1405,105 @@ + + 5 + wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + mm + + 0 + + + 0 + + 1 + m_units4 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + 5 wxALIGN_CENTER_VERTICAL 0 - + bSizer61 wxVERTICAL none - + 5 wxTOP|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -1195,11 +1582,11 @@ - + 5 wxBOTTOM|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -1372,16 +1759,16 @@ 5 wxEXPAND 1 - + m_SizerText wxVERTICAL protected - + 5 wxTOP|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -1460,11 +1847,11 @@ - + 5 wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 1 - + 1 1 1 @@ -1551,11 +1938,11 @@ - + 5 wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 0 - + 1 1 1 diff --git a/pagelayout_editor/dialogs/dialog_new_dataitem_base.h b/pagelayout_editor/dialogs/dialog_new_dataitem_base.h index f61d970e49..b80a344d48 100644 --- a/pagelayout_editor/dialogs/dialog_new_dataitem_base.h +++ b/pagelayout_editor/dialogs/dialog_new_dataitem_base.h @@ -1,8 +1,8 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Aug 4 2017) +// C++ code generated with wxFormBuilder (version Apr 19 2018) // http://www.wxformbuilder.org/ // -// PLEASE DO "NOT" EDIT THIS FILE! +// PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// #ifndef __DIALOG_NEW_DATAITEM_BASE_H__ @@ -11,8 +11,6 @@ #include #include #include -class DIALOG_SHIM; - #include "dialog_shim.h" #include #include @@ -38,18 +36,22 @@ class DIALOG_NEW_DATAITEM_BASE : public DIALOG_SHIM private: protected: - wxStaticText* m_staticTextPosX; - wxTextCtrl* m_textCtrlPosX; wxStaticText* m_staticTextPosY; wxTextCtrl* m_textCtrlPosY; + wxStaticText* m_units1; + wxStaticText* m_staticTextPosX; + wxTextCtrl* m_textCtrlPosX; + wxStaticText* m_units11; wxStaticText* m_staticTextOrgPos; wxChoice* m_choiceCornerPos; wxStaticLine* m_staticline2; wxBoxSizer* m_SizerEndPosition; wxStaticText* m_staticTextEndX; wxTextCtrl* m_textCtrlEndX; + wxStaticText* m_units3; wxStaticText* m_staticTextEndY; wxTextCtrl* m_textCtrlEndY; + wxStaticText* m_units4; wxStaticText* m_staticTextOrgPos1; wxChoice* m_choiceCornerEnd; wxStaticLine* m_staticlineEndXY;