haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Standardize colon in page layout and cleanup 

Aligned text boxes and placed units beside input where applicable.
This commit is contained in:
Seth Hillbrand 2018-04-23 14:05:46 -07:00
parent 802a96299a
commit ef1d1f80e5
4 changed files with 5786 additions and 4275 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

559
pagelayout_editor/dialogs/properties_frame_base.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Nov 22 2017) // C++ code generated with wxFormBuilder (version Apr 19 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -26,7 +26,7 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c
wxBoxSizer* bSizerType; wxBoxSizer* bSizerType;
bSizerType = new wxBoxSizer( wxVERTICAL ); bSizerType = new wxBoxSizer( wxVERTICAL );
m_staticTextType = new wxStaticText( m_swItemProperties, wxID_ANY, _("Type"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextType = new wxStaticText( m_swItemProperties, wxID_ANY, _("Type:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextType->Wrap( -1 ); m_staticTextType->Wrap( -1 );
m_staticTextType->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); m_staticTextType->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
@ -41,7 +41,7 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c
wxBoxSizer* bSizerPageOpt; wxBoxSizer* bSizerPageOpt;
bSizerPageOpt = new wxBoxSizer( wxVERTICAL ); bSizerPageOpt = new wxBoxSizer( wxVERTICAL );
m_staticTextPageOpt = new wxStaticText( m_swItemProperties, wxID_ANY, _("Page 1 option"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextPageOpt = new wxStaticText( m_swItemProperties, wxID_ANY, _("Page 1 option:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextPageOpt->Wrap( -1 ); m_staticTextPageOpt->Wrap( -1 );
m_staticTextPageOpt->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); m_staticTextPageOpt->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
@ -64,7 +64,7 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c
m_SizerTextOptions = new wxBoxSizer( wxVERTICAL ); m_SizerTextOptions = new wxBoxSizer( wxVERTICAL );
m_staticTextText = new wxStaticText( m_swItemProperties, wxID_ANY, _("Text"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextText = new wxStaticText( m_swItemProperties, wxID_ANY, _("Text:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextText->Wrap( -1 ); m_staticTextText->Wrap( -1 );
m_SizerTextOptions->Add( m_staticTextText, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); m_SizerTextOptions->Add( m_staticTextText, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
@ -74,114 +74,121 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c
wxBoxSizer* bSizerFontOpt; wxBoxSizer* bSizerFontOpt;
bSizerFontOpt = new wxBoxSizer( wxVERTICAL ); bSizerFontOpt = new wxBoxSizer( wxVERTICAL );
wxBoxSizer* bSizerJustify; wxFlexGridSizer* fgSizer1;
bSizerJustify = new wxBoxSizer( wxHORIZONTAL ); fgSizer1 = new wxFlexGridSizer( 0, 3, 0, 0 );
fgSizer1->SetFlexibleDirection( wxBOTH );
fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
m_staticTextHjust = new wxStaticText( m_swItemProperties, wxID_ANY, _("Horizontal justification"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextHjust = new wxStaticText( m_swItemProperties, wxID_ANY, _("Horizontal align:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextHjust->Wrap( -1 ); m_staticTextHjust->Wrap( -1 );
bSizerJustify->Add( m_staticTextHjust, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); fgSizer1->Add( m_staticTextHjust, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
wxString m_choiceHjustifyChoices[] = { _("Left"), _("Center"), _("Right") }; wxString m_choiceHjustifyChoices[] = { _("Left"), _("Center"), _("Right") };
int m_choiceHjustifyNChoices = sizeof( m_choiceHjustifyChoices ) / sizeof( wxString ); int m_choiceHjustifyNChoices = sizeof( m_choiceHjustifyChoices ) / sizeof( wxString );
m_choiceHjustify = new wxChoice( m_swItemProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceHjustifyNChoices, m_choiceHjustifyChoices, 0 ); m_choiceHjustify = new wxChoice( m_swItemProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceHjustifyNChoices, m_choiceHjustifyChoices, 0 );
m_choiceHjustify->SetSelection( 0 ); m_choiceHjustify->SetSelection( 0 );
bSizerJustify->Add( m_choiceHjustify, 0, wxEXPAND|wxALL, 5 ); fgSizer1->Add( m_choiceHjustify, 0, wxEXPAND|wxALL, 5 );
m_checkBoxBold = new wxCheckBox( m_swItemProperties, wxID_ANY, _("Bold"), wxDefaultPosition, wxDefaultSize, 0 ); m_checkBoxBold = new wxCheckBox( m_swItemProperties, wxID_ANY, _("Bold"), wxDefaultPosition, wxDefaultSize, 0 );
bSizerJustify->Add( m_checkBoxBold, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); fgSizer1->Add( m_checkBoxBold, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
m_staticTextVjust = new wxStaticText( m_swItemProperties, wxID_ANY, _("Vertical align:"), wxDefaultPosition, wxDefaultSize, 0 );
bSizerFontOpt->Add( bSizerJustify, 0, 0, 5 );
wxBoxSizer* bSizerBoldItalic;
bSizerBoldItalic = new wxBoxSizer( wxHORIZONTAL );
m_staticTextVjust = new wxStaticText( m_swItemProperties, wxID_ANY, _("Vertical justification"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextVjust->Wrap( -1 ); m_staticTextVjust->Wrap( -1 );
bSizerBoldItalic->Add( m_staticTextVjust, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); fgSizer1->Add( m_staticTextVjust, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
wxString m_choiceVjustifyChoices[] = { _("Top"), _("Center"), _("Bottom") }; wxString m_choiceVjustifyChoices[] = { _("Top"), _("Center"), _("Bottom") };
int m_choiceVjustifyNChoices = sizeof( m_choiceVjustifyChoices ) / sizeof( wxString ); int m_choiceVjustifyNChoices = sizeof( m_choiceVjustifyChoices ) / sizeof( wxString );
m_choiceVjustify = new wxChoice( m_swItemProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceVjustifyNChoices, m_choiceVjustifyChoices, 0 ); m_choiceVjustify = new wxChoice( m_swItemProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceVjustifyNChoices, m_choiceVjustifyChoices, 0 );
m_choiceVjustify->SetSelection( 1 ); m_choiceVjustify->SetSelection( 1 );
bSizerBoldItalic->Add( m_choiceVjustify, 0, wxEXPAND|wxALL, 5 ); fgSizer1->Add( m_choiceVjustify, 0, wxEXPAND|wxALL, 5 );
m_checkBoxItalic = new wxCheckBox( m_swItemProperties, wxID_ANY, _("Italic"), wxDefaultPosition, wxDefaultSize, 0 ); m_checkBoxItalic = new wxCheckBox( m_swItemProperties, wxID_ANY, _("Italic"), wxDefaultPosition, wxDefaultSize, 0 );
bSizerBoldItalic->Add( m_checkBoxItalic, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); fgSizer1->Add( m_checkBoxItalic, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
bSizerFontOpt->Add( bSizerBoldItalic, 1, 0, 5 ); bSizerFontOpt->Add( fgSizer1, 1, wxEXPAND, 5 );
m_SizerTextOptions->Add( bSizerFontOpt, 0, wxEXPAND, 5 ); m_SizerTextOptions->Add( bSizerFontOpt, 0, wxEXPAND, 5 );
wxBoxSizer* bSizerTextSize; wxFlexGridSizer* fgSizer2;
bSizerTextSize = new wxBoxSizer( wxHORIZONTAL ); fgSizer2 = new wxFlexGridSizer( 0, 4, 0, 0 );
fgSizer2->AddGrowableCol( 0 );
fgSizer2->AddGrowableCol( 2 );
fgSizer2->SetFlexibleDirection( wxBOTH );
fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
wxBoxSizer* bSizerTsizeX; m_staticTexTsizeX = new wxStaticText( m_swItemProperties, wxID_ANY, _("Text width:"), wxDefaultPosition, wxDefaultSize, 0 );
bSizerTsizeX = new wxBoxSizer( wxVERTICAL );
m_staticTexTsizeX = new wxStaticText( m_swItemProperties, wxID_ANY, _("Text width (mm)"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTexTsizeX->Wrap( -1 ); m_staticTexTsizeX->Wrap( -1 );
bSizerTsizeX->Add( m_staticTexTsizeX, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); fgSizer2->Add( m_staticTexTsizeX, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
fgSizer2->Add( 0, 0, 1, wxEXPAND, 5 );
m_staticTextTsizeY = new wxStaticText( m_swItemProperties, wxID_ANY, _("Text height:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextTsizeY->Wrap( -1 );
fgSizer2->Add( m_staticTextTsizeY, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
fgSizer2->Add( 0, 0, 1, wxEXPAND, 5 );
m_textCtrlTextSizeX = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_textCtrlTextSizeX = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
bSizerTsizeX->Add( m_textCtrlTextSizeX, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); fgSizer2->Add( m_textCtrlTextSizeX, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
m_units1 = new wxStaticText( m_swItemProperties, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 );
bSizerTextSize->Add( bSizerTsizeX, 1, wxEXPAND, 5 ); m_units1->Wrap( -1 );
fgSizer2->Add( m_units1, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxRIGHT, 5 );
wxBoxSizer* bSizerTsizeY;
bSizerTsizeY = new wxBoxSizer( wxVERTICAL );
m_staticTextTsizeY = new wxStaticText( m_swItemProperties, wxID_ANY, _("Text height (mm)"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextTsizeY->Wrap( -1 );
bSizerTsizeY->Add( m_staticTextTsizeY, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_textCtrlTextSizeY = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_textCtrlTextSizeY = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
bSizerTsizeY->Add( m_textCtrlTextSizeY, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); fgSizer2->Add( m_textCtrlTextSizeY, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
m_units11 = new wxStaticText( m_swItemProperties, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 );
bSizerTextSize->Add( bSizerTsizeY, 1, wxEXPAND, 5 ); m_units11->Wrap( -1 );
fgSizer2->Add( m_units11, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxRIGHT, 5 );
m_SizerTextOptions->Add( bSizerTextSize, 0, 0, 5 );
m_staticTextConstraints = new wxStaticText( m_swItemProperties, wxID_ANY, _("Constraints:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextConstraints = new wxStaticText( m_swItemProperties, wxID_ANY, _("Constraints:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextConstraints->Wrap( -1 ); m_staticTextConstraints->Wrap( -1 );
m_SizerTextOptions->Add( m_staticTextConstraints, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); fgSizer2->Add( m_staticTextConstraints, 0, wxLEFT|wxRIGHT|wxTOP, 5 );
wxBoxSizer* bSizerConstraints;
bSizerConstraints = new wxBoxSizer( wxHORIZONTAL );
wxBoxSizer* bSizer42; fgSizer2->Add( 0, 0, 1, wxEXPAND, 5 );
bSizer42 = new wxBoxSizer( wxVERTICAL );
m_staticTextConstraintX = new wxStaticText( m_swItemProperties, wxID_ANY, _("Maximum width (mm)"), wxDefaultPosition, wxDefaultSize, 0 );
fgSizer2->Add( 0, 0, 1, wxEXPAND, 5 );
fgSizer2->Add( 0, 0, 1, wxEXPAND, 5 );
m_staticTextConstraintX = new wxStaticText( m_swItemProperties, wxID_ANY, _("Maximum width:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextConstraintX->Wrap( -1 ); m_staticTextConstraintX->Wrap( -1 );
bSizer42->Add( m_staticTextConstraintX, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); fgSizer2->Add( m_staticTextConstraintX, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
fgSizer2->Add( 0, 0, 1, wxEXPAND, 5 );
m_staticTextConstraintY = new wxStaticText( m_swItemProperties, wxID_ANY, _("Maximum height:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextConstraintY->Wrap( -1 );
fgSizer2->Add( m_staticTextConstraintY, 0, wxLEFT|wxRIGHT|wxTOP, 5 );
fgSizer2->Add( 0, 0, 1, wxEXPAND, 5 );
m_textCtrlConstraintX = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_textCtrlConstraintX = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
bSizer42->Add( m_textCtrlConstraintX, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); fgSizer2->Add( m_textCtrlConstraintX, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
m_units111 = new wxStaticText( m_swItemProperties, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 );
bSizerConstraints->Add( bSizer42, 1, wxEXPAND, 5 ); m_units111->Wrap( -1 );
fgSizer2->Add( m_units111, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxRIGHT, 5 );
wxBoxSizer* bSizer52;
bSizer52 = new wxBoxSizer( wxVERTICAL );
m_staticTextConstraintY = new wxStaticText( m_swItemProperties, wxID_ANY, _("Maximum height Y (mm)"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextConstraintY->Wrap( -1 );
bSizer52->Add( m_staticTextConstraintY, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_textCtrlConstraintY = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_textCtrlConstraintY = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
bSizer52->Add( m_textCtrlConstraintY, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); fgSizer2->Add( m_textCtrlConstraintY, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
m_units1111 = new wxStaticText( m_swItemProperties, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 );
m_units1111->Wrap( -1 );
fgSizer2->Add( m_units1111, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxRIGHT, 5 );
bSizerConstraints->Add( bSizer52, 1, wxEXPAND, 5 ); m_SizerTextOptions->Add( fgSizer2, 1, wxEXPAND, 5 );
m_SizerTextOptions->Add( bSizerConstraints, 0, 0, 5 );
m_staticline6 = new wxStaticLine( m_swItemProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); m_staticline6 = new wxStaticLine( m_swItemProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
m_SizerTextOptions->Add( m_staticline6, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); m_SizerTextOptions->Add( m_staticline6, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
@ -196,7 +203,7 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c
m_staticline8 = new wxStaticLine( m_swItemProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); m_staticline8 = new wxStaticLine( m_swItemProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
bSizerMain->Add( m_staticline8, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); bSizerMain->Add( m_staticline8, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
m_staticTextComment = new wxStaticText( m_swItemProperties, wxID_ANY, _("Comment"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextComment = new wxStaticText( m_swItemProperties, wxID_ANY, _("Comment:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextComment->Wrap( -1 ); m_staticTextComment->Wrap( -1 );
bSizerMain->Add( m_staticTextComment, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); bSizerMain->Add( m_staticTextComment, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
@ -209,42 +216,47 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c
wxBoxSizer* bSizerPos; wxBoxSizer* bSizerPos;
bSizerPos = new wxBoxSizer( wxHORIZONTAL ); bSizerPos = new wxBoxSizer( wxHORIZONTAL );
wxBoxSizer* bSizerPosXY; wxFlexGridSizer* fgSizer3;
bSizerPosXY = new wxBoxSizer( wxVERTICAL ); fgSizer3 = new wxFlexGridSizer( 0, 2, 0, 0 );
fgSizer3->AddGrowableCol( 0 );
fgSizer3->SetFlexibleDirection( wxBOTH );
fgSizer3->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
wxBoxSizer* bSizer4; m_staticTextPosX = new wxStaticText( m_swItemProperties, wxID_ANY, _("Start X:"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer4 = new wxBoxSizer( wxVERTICAL );
m_staticTextPosX = new wxStaticText( m_swItemProperties, wxID_ANY, _("Position X (mm)"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextPosX->Wrap( -1 ); m_staticTextPosX->Wrap( -1 );
bSizer4->Add( m_staticTextPosX, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); fgSizer3->Add( m_staticTextPosX, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
fgSizer3->Add( 0, 0, 1, wxEXPAND, 5 );
m_textCtrlPosX = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_textCtrlPosX = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
bSizer4->Add( m_textCtrlPosX, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); fgSizer3->Add( m_textCtrlPosX, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
m_units12 = new wxStaticText( m_swItemProperties, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 );
m_units12->Wrap( -1 );
fgSizer3->Add( m_units12, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 );
bSizerPosXY->Add( bSizer4, 1, wxEXPAND, 5 ); m_staticTextPosY = new wxStaticText( m_swItemProperties, wxID_ANY, _("Start Y:"), wxDefaultPosition, wxDefaultSize, 0 );
wxBoxSizer* bSizer5;
bSizer5 = new wxBoxSizer( wxVERTICAL );
m_staticTextPosY = new wxStaticText( m_swItemProperties, wxID_ANY, _("Position Y (mm)"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextPosY->Wrap( -1 ); m_staticTextPosY->Wrap( -1 );
bSizer5->Add( m_staticTextPosY, 0, wxRIGHT|wxLEFT, 5 ); fgSizer3->Add( m_staticTextPosY, 0, wxRIGHT|wxLEFT, 5 );
fgSizer3->Add( 0, 0, 1, wxEXPAND, 5 );
m_textCtrlPosY = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_textCtrlPosY = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
bSizer5->Add( m_textCtrlPosY, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); fgSizer3->Add( m_textCtrlPosY, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
m_units121 = new wxStaticText( m_swItemProperties, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 );
m_units121->Wrap( -1 );
fgSizer3->Add( m_units121, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 );
bSizerPosXY->Add( bSizer5, 1, wxEXPAND, 5 ); bSizerPos->Add( fgSizer3, 1, wxEXPAND|wxRIGHT, 5 );
bSizerPos->Add( bSizerPosXY, 1, 0, 5 );
wxBoxSizer* bSizer6; wxBoxSizer* bSizer6;
bSizer6 = new wxBoxSizer( wxVERTICAL ); bSizer6 = new wxBoxSizer( wxVERTICAL );
m_staticTextOrgPos = new wxStaticText( m_swItemProperties, wxID_ANY, _("Origin"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextOrgPos = new wxStaticText( m_swItemProperties, wxID_ANY, _("Origin:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextOrgPos->Wrap( -1 ); m_staticTextOrgPos->Wrap( -1 );
bSizer6->Add( m_staticTextOrgPos, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); bSizer6->Add( m_staticTextOrgPos, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
@ -260,69 +272,74 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c
bSizerPos->Add( bSizer6, 0, wxALIGN_CENTER_VERTICAL, 5 ); bSizerPos->Add( bSizer6, 0, wxALIGN_CENTER_VERTICAL, 5 );
bSizerMain->Add( bSizerPos, 0, 0, 5 ); bSizerMain->Add( bSizerPos, 0, wxEXPAND, 5 );
m_SizerEndPosition = new wxBoxSizer( wxHORIZONTAL ); m_SizerEndPosition = new wxBoxSizer( wxHORIZONTAL );
wxBoxSizer* bSizerEndXY; wxFlexGridSizer* fgSizer4;
bSizerEndXY = new wxBoxSizer( wxVERTICAL ); fgSizer4 = new wxFlexGridSizer( 0, 2, 0, 0 );
fgSizer4->AddGrowableCol( 0 );
fgSizer4->SetFlexibleDirection( wxBOTH );
fgSizer4->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
wxBoxSizer* bSizer41; m_staticTextEndX = new wxStaticText( m_swItemProperties, wxID_ANY, _("End X:"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer41 = new wxBoxSizer( wxVERTICAL );
m_staticTextEndX = new wxStaticText( m_swItemProperties, wxID_ANY, _("End X (mm)"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextEndX->Wrap( -1 ); m_staticTextEndX->Wrap( -1 );
bSizer41->Add( m_staticTextEndX, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); fgSizer4->Add( m_staticTextEndX, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
fgSizer4->Add( 0, 0, 1, wxEXPAND, 5 );
m_textCtrlEndX = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_textCtrlEndX = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
bSizer41->Add( m_textCtrlEndX, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); fgSizer4->Add( m_textCtrlEndX, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
m_units1211 = new wxStaticText( m_swItemProperties, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 );
m_units1211->Wrap( -1 );
fgSizer4->Add( m_units1211, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 );
bSizerEndXY->Add( bSizer41, 1, wxEXPAND, 5 ); m_staticTextEndY = new wxStaticText( m_swItemProperties, wxID_ANY, _("End Y:"), wxDefaultPosition, wxDefaultSize, 0 );
wxBoxSizer* bSizer51;
bSizer51 = new wxBoxSizer( wxVERTICAL );
m_staticTextEndY = new wxStaticText( m_swItemProperties, wxID_ANY, _("End Y (mm)"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextEndY->Wrap( -1 ); m_staticTextEndY->Wrap( -1 );
bSizer51->Add( m_staticTextEndY, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); fgSizer4->Add( m_staticTextEndY, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
fgSizer4->Add( 0, 0, 1, wxEXPAND, 5 );
m_textCtrlEndY = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_textCtrlEndY = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
bSizer51->Add( m_textCtrlEndY, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); fgSizer4->Add( m_textCtrlEndY, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
m_units12111 = new wxStaticText( m_swItemProperties, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 );
m_units12111->Wrap( -1 );
fgSizer4->Add( m_units12111, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 );
bSizerEndXY->Add( bSizer51, 1, wxEXPAND, 5 ); m_SizerEndPosition->Add( fgSizer4, 1, wxEXPAND|wxRIGHT, 5 );
m_SizerEndPosition->Add( bSizerEndXY, 1, 0, 5 );
wxBoxSizer* bSizer61; wxBoxSizer* bSizer61;
bSizer61 = new wxBoxSizer( wxVERTICAL ); bSizer61 = new wxBoxSizer( wxVERTICAL );
m_staticTextOrgEnd = new wxStaticText( m_swItemProperties, wxID_ANY, _("Origin"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextOrgEnd = new wxStaticText( m_swItemProperties, wxID_ANY, _("Origin:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextOrgEnd->Wrap( -1 ); m_staticTextOrgEnd->Wrap( -1 );
bSizer61->Add( m_staticTextOrgEnd, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); bSizer61->Add( m_staticTextOrgEnd, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_comboBoxCornerEnd = new wxComboBox( m_swItemProperties, wxID_ANY, _("Lower Right"), wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); m_comboBoxCornerEnd = new wxComboBox( m_swItemProperties, wxID_ANY, _("Lower Left"), wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
m_comboBoxCornerEnd->Append( _("Upper Right") ); m_comboBoxCornerEnd->Append( _("Upper Right") );
m_comboBoxCornerEnd->Append( _("Upper Left") ); m_comboBoxCornerEnd->Append( _("Upper Left") );
m_comboBoxCornerEnd->Append( _("Lower Right") ); m_comboBoxCornerEnd->Append( _("Lower Right") );
m_comboBoxCornerEnd->Append( _("Lower Left") ); m_comboBoxCornerEnd->Append( _("Lower Left") );
m_comboBoxCornerEnd->SetSelection( 2 ); m_comboBoxCornerEnd->SetSelection( 3 );
bSizer61->Add( m_comboBoxCornerEnd, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); bSizer61->Add( m_comboBoxCornerEnd, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
m_SizerEndPosition->Add( bSizer61, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_SizerEndPosition->Add( bSizer61, 0, wxALIGN_CENTER_VERTICAL, 5 );
bSizerMain->Add( m_SizerEndPosition, 0, 0, 5 ); bSizerMain->Add( m_SizerEndPosition, 0, wxEXPAND, 5 );
m_SizerLineThickness = new wxBoxSizer( wxHORIZONTAL ); m_SizerLineThickness = new wxBoxSizer( wxHORIZONTAL );
wxBoxSizer* bSizerThickness; wxBoxSizer* bSizerThickness;
bSizerThickness = new wxBoxSizer( wxVERTICAL ); bSizerThickness = new wxBoxSizer( wxVERTICAL );
m_staticTextThickness = new wxStaticText( m_swItemProperties, wxID_ANY, _("Thickness"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextThickness = new wxStaticText( m_swItemProperties, wxID_ANY, _("Thickness:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextThickness->Wrap( -1 ); m_staticTextThickness->Wrap( -1 );
bSizerThickness->Add( m_staticTextThickness, 0, wxLEFT|wxRIGHT, 5 ); bSizerThickness->Add( m_staticTextThickness, 0, wxLEFT|wxRIGHT, 5 );
@ -334,7 +351,7 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c
m_staticTextInfoThickness = new wxStaticText( m_swItemProperties, wxID_ANY, _("Set to 0 to use default"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextInfoThickness = new wxStaticText( m_swItemProperties, wxID_ANY, _("Set to 0 to use default"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextInfoThickness->Wrap( -1 ); m_staticTextInfoThickness->Wrap( -1 );
m_SizerLineThickness->Add( m_staticTextInfoThickness, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); m_SizerLineThickness->Add( m_staticTextInfoThickness, 0, wxALIGN_CENTER|wxALL, 5 );
bSizerMain->Add( m_SizerLineThickness, 0, 0, 5 ); bSizerMain->Add( m_SizerLineThickness, 0, 0, 5 );
@ -344,15 +361,30 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c
m_staticline1 = new wxStaticLine( m_swItemProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); m_staticline1 = new wxStaticLine( m_swItemProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
m_SizerRotation->Add( m_staticline1, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); m_SizerRotation->Add( m_staticline1, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
wxBoxSizer* bSizerRotation; wxFlexGridSizer* fgSizer7;
bSizerRotation = new wxBoxSizer( wxHORIZONTAL ); fgSizer7 = new wxFlexGridSizer( 0, 2, 0, 0 );
fgSizer7->SetFlexibleDirection( wxBOTH );
fgSizer7->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
m_staticTextRot = new wxStaticText( m_swItemProperties, wxID_ANY, _("Rotation"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextRot = new wxStaticText( m_swItemProperties, wxID_ANY, _("Rotation:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextRot->Wrap( -1 ); m_staticTextRot->Wrap( -1 );
bSizerRotation->Add( m_staticTextRot, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); fgSizer7->Add( m_staticTextRot, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
m_textCtrlRotation = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_textCtrlRotation = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
bSizerRotation->Add( m_textCtrlRotation, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); fgSizer7->Add( m_textCtrlRotation, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxLEFT|wxRIGHT, 5 );
m_staticTextBitmapPPI = new wxStaticText( m_swItemProperties, wxID_ANY, _("Bitmap PPI:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextBitmapPPI->Wrap( -1 );
fgSizer7->Add( m_staticTextBitmapPPI, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
m_textCtrlBitmapPPI = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
fgSizer7->Add( m_textCtrlBitmapPPI, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxLEFT|wxRIGHT, 5 );
m_SizerRotation->Add( fgSizer7, 1, wxEXPAND, 5 );
wxBoxSizer* bSizerRotation;
bSizerRotation = new wxBoxSizer( wxHORIZONTAL );
m_SizerRotation->Add( bSizerRotation, 0, wxEXPAND, 5 ); m_SizerRotation->Add( bSizerRotation, 0, wxEXPAND, 5 );
@ -362,13 +394,6 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c
m_SizerBitmapPPI = new wxBoxSizer( wxHORIZONTAL ); m_SizerBitmapPPI = new wxBoxSizer( wxHORIZONTAL );
m_staticTextBitmapPPI = new wxStaticText( m_swItemProperties, wxID_ANY, _("Bitmap PPI"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextBitmapPPI->Wrap( -1 );
m_SizerBitmapPPI->Add( m_staticTextBitmapPPI, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
m_textCtrlBitmapPPI = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_SizerBitmapPPI->Add( m_textCtrlBitmapPPI, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
bSizerMain->Add( m_SizerBitmapPPI, 0, wxEXPAND, 5 ); bSizerMain->Add( m_SizerBitmapPPI, 0, wxEXPAND, 5 );
@ -379,74 +404,75 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c
m_staticTextRepeatPrms->Wrap( -1 ); m_staticTextRepeatPrms->Wrap( -1 );
bSizerMain->Add( m_staticTextRepeatPrms, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); bSizerMain->Add( m_staticTextRepeatPrms, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
wxBoxSizer* bSizer20; wxFlexGridSizer* fgSizer8;
bSizer20 = new wxBoxSizer( wxHORIZONTAL ); fgSizer8 = new wxFlexGridSizer( 0, 4, 0, 0 );
fgSizer8->AddGrowableCol( 0 );
fgSizer8->AddGrowableCol( 2 );
fgSizer8->SetFlexibleDirection( wxBOTH );
fgSizer8->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
wxBoxSizer* bSizer611; m_staticTextRepeatCnt = new wxStaticText( m_swItemProperties, wxID_ANY, _("Repeat count:"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer611 = new wxBoxSizer( wxVERTICAL );
m_staticTextRepeatCnt = new wxStaticText( m_swItemProperties, wxID_ANY, _("Repeat count"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextRepeatCnt->Wrap( -1 ); m_staticTextRepeatCnt->Wrap( -1 );
bSizer611->Add( m_staticTextRepeatCnt, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); fgSizer8->Add( m_staticTextRepeatCnt, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
fgSizer8->Add( 0, 0, 1, wxEXPAND, 5 );
m_staticTextInclabel = new wxStaticText( m_swItemProperties, wxID_ANY, _("Text Increment:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextInclabel->Wrap( -1 );
fgSizer8->Add( m_staticTextInclabel, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
fgSizer8->Add( 0, 0, 1, wxEXPAND, 5 );
m_textCtrlRepeatCount = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_textCtrlRepeatCount = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
bSizer611->Add( m_textCtrlRepeatCount, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); fgSizer8->Add( m_textCtrlRepeatCount, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 );
bSizer20->Add( bSizer611, 1, 0, 5 ); fgSizer8->Add( 0, 0, 1, wxEXPAND, 5 );
m_SizerTextIncrementLabel = new wxBoxSizer( wxVERTICAL );
m_staticTextInclabel = new wxStaticText( m_swItemProperties, wxID_ANY, _("Text Increment"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextInclabel->Wrap( -1 );
m_SizerTextIncrementLabel->Add( m_staticTextInclabel, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_textCtrlTextIncrement = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_textCtrlTextIncrement = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_SizerTextIncrementLabel->Add( m_textCtrlTextIncrement, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); fgSizer8->Add( m_textCtrlTextIncrement, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 );
bSizer20->Add( m_SizerTextIncrementLabel, 1, wxEXPAND, 5 ); fgSizer8->Add( 0, 0, 1, wxEXPAND, 5 );
m_staticTextStepX = new wxStaticText( m_swItemProperties, wxID_ANY, _("Step X:"), wxDefaultPosition, wxDefaultSize, 0 );
bSizerMain->Add( bSizer20, 0, 0, 5 );
wxBoxSizer* bSizerPosY1;
bSizerPosY1 = new wxBoxSizer( wxHORIZONTAL );
wxBoxSizer* bSizer411;
bSizer411 = new wxBoxSizer( wxVERTICAL );
m_staticTextStepX = new wxStaticText( m_swItemProperties, wxID_ANY, _("Step X (mm)"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextStepX->Wrap( -1 ); m_staticTextStepX->Wrap( -1 );
bSizer411->Add( m_staticTextStepX, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); fgSizer8->Add( m_staticTextStepX, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
fgSizer8->Add( 0, 0, 1, wxEXPAND, 5 );
m_staticTextStepY = new wxStaticText( m_swItemProperties, wxID_ANY, _("Step Y:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextStepY->Wrap( -1 );
fgSizer8->Add( m_staticTextStepY, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
fgSizer8->Add( 0, 0, 1, wxEXPAND, 5 );
m_textCtrlStepX = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_textCtrlStepX = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
bSizer411->Add( m_textCtrlStepX, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); fgSizer8->Add( m_textCtrlStepX, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
m_units121111 = new wxStaticText( m_swItemProperties, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 );
bSizerPosY1->Add( bSizer411, 1, wxEXPAND, 5 ); m_units121111->Wrap( -1 );
fgSizer8->Add( m_units121111, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxRIGHT, 5 );
wxBoxSizer* bSizer511;
bSizer511 = new wxBoxSizer( wxVERTICAL );
m_staticTextStepY = new wxStaticText( m_swItemProperties, wxID_ANY, _("Step Y (mm)"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextStepY->Wrap( -1 );
bSizer511->Add( m_staticTextStepY, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_textCtrlStepY = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_textCtrlStepY = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
bSizer511->Add( m_textCtrlStepY, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); fgSizer8->Add( m_textCtrlStepY, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
m_units1211111 = new wxStaticText( m_swItemProperties, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 );
m_units1211111->Wrap( -1 );
fgSizer8->Add( m_units1211111, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxRIGHT, 5 );
bSizerPosY1->Add( bSizer511, 1, wxEXPAND, 5 ); bSizerMain->Add( fgSizer8, 1, wxEXPAND, 5 );
bSizerMain->Add( bSizerPosY1, 0, 0, 5 );
m_swItemProperties->SetSizer( bSizerMain ); m_swItemProperties->SetSizer( bSizerMain );
m_swItemProperties->Layout(); m_swItemProperties->Layout();
bSizerMain->Fit( m_swItemProperties ); bSizerMain->Fit( m_swItemProperties );
m_notebook->AddPage( m_swItemProperties, _("Item Properties"), true ); m_notebook->AddPage( m_swItemProperties, _("Item Properties"), false );
m_swGeneralOpts = new wxScrolledWindow( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxTAB_TRAVERSAL|wxVSCROLL ); m_swGeneralOpts = new wxScrolledWindow( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxTAB_TRAVERSAL|wxVSCROLL );
m_swGeneralOpts->SetScrollRate( 5, 5 ); m_swGeneralOpts->SetScrollRate( 5, 5 );
wxBoxSizer* bSizerGeneralOpts; wxBoxSizer* bSizerGeneralOpts;
@ -459,72 +485,73 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c
m_staticTextDefVal->Wrap( -1 ); m_staticTextDefVal->Wrap( -1 );
bSizerGeneralOpts1->Add( m_staticTextDefVal, 0, wxALL, 5 ); bSizerGeneralOpts1->Add( m_staticTextDefVal, 0, wxALL, 5 );
wxBoxSizer* bSizerDefTextSize; wxFlexGridSizer* fgSizer5;
bSizerDefTextSize = new wxBoxSizer( wxHORIZONTAL ); fgSizer5 = new wxFlexGridSizer( 0, 4, 0, 0 );
fgSizer5->AddGrowableCol( 0 );
fgSizer5->AddGrowableCol( 2 );
fgSizer5->SetFlexibleDirection( wxBOTH );
fgSizer5->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
wxBoxSizer* bSizerDefTsizeX; m_staticTextDefTsX = new wxStaticText( m_swGeneralOpts, wxID_ANY, _("Text width:"), wxDefaultPosition, wxDefaultSize, 0 );
bSizerDefTsizeX = new wxBoxSizer( wxVERTICAL );
m_staticTextDefTsX = new wxStaticText( m_swGeneralOpts, wxID_ANY, _("Text width (mm)"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextDefTsX->Wrap( -1 ); m_staticTextDefTsX->Wrap( -1 );
bSizerDefTsizeX->Add( m_staticTextDefTsX, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); fgSizer5->Add( m_staticTextDefTsX, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
fgSizer5->Add( 0, 0, 1, wxEXPAND, 5 );
m_staticTextDefTsY = new wxStaticText( m_swGeneralOpts, wxID_ANY, _("Text height:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextDefTsY->Wrap( -1 );
fgSizer5->Add( m_staticTextDefTsY, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
fgSizer5->Add( 0, 0, 1, wxEXPAND, 5 );
m_textCtrlDefaultTextSizeX = new wxTextCtrl( m_swGeneralOpts, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_textCtrlDefaultTextSizeX = new wxTextCtrl( m_swGeneralOpts, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
bSizerDefTsizeX->Add( m_textCtrlDefaultTextSizeX, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); fgSizer5->Add( m_textCtrlDefaultTextSizeX, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
m_units14 = new wxStaticText( m_swGeneralOpts, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 );
bSizerDefTextSize->Add( bSizerDefTsizeX, 1, wxEXPAND, 5 ); m_units14->Wrap( -1 );
fgSizer5->Add( m_units14, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxRIGHT, 5 );
wxBoxSizer* bSizerDefTsizeY;
bSizerDefTsizeY = new wxBoxSizer( wxVERTICAL );
m_staticTextDefTsY = new wxStaticText( m_swGeneralOpts, wxID_ANY, _("Text height (mm)"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextDefTsY->Wrap( -1 );
bSizerDefTsizeY->Add( m_staticTextDefTsY, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_textCtrlDefaultTextSizeY = new wxTextCtrl( m_swGeneralOpts, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_textCtrlDefaultTextSizeY = new wxTextCtrl( m_swGeneralOpts, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
bSizerDefTsizeY->Add( m_textCtrlDefaultTextSizeY, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); fgSizer5->Add( m_textCtrlDefaultTextSizeY, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
m_units141 = new wxStaticText( m_swGeneralOpts, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 );
m_units141->Wrap( -1 );
fgSizer5->Add( m_units141, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxRIGHT, 5 );
bSizerDefTextSize->Add( bSizerDefTsizeY, 1, wxEXPAND, 5 ); m_staticTextDefLineW = new wxStaticText( m_swGeneralOpts, wxID_ANY, _("Line thickness:"), wxDefaultPosition, wxDefaultSize, 0 );
bSizerGeneralOpts1->Add( bSizerDefTextSize, 0, wxEXPAND, 5 );
wxBoxSizer* bSizerDefLineWidth;
bSizerDefLineWidth = new wxBoxSizer( wxHORIZONTAL );
wxBoxSizer* bSizer25;
bSizer25 = new wxBoxSizer( wxVERTICAL );
m_staticTextDefLineW = new wxStaticText( m_swGeneralOpts, wxID_ANY, _("Line Thickness (mm)"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextDefLineW->Wrap( -1 ); m_staticTextDefLineW->Wrap( -1 );
bSizer25->Add( m_staticTextDefLineW, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); fgSizer5->Add( m_staticTextDefLineW, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 );
fgSizer5->Add( 0, 0, 1, wxEXPAND, 5 );
m_staticText22 = new wxStaticText( m_swGeneralOpts, wxID_ANY, _("Text thickness:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText22->Wrap( -1 );
fgSizer5->Add( m_staticText22, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 );
fgSizer5->Add( 0, 0, 1, wxEXPAND, 5 );
m_textCtrlDefaultLineWidth = new wxTextCtrl( m_swGeneralOpts, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_textCtrlDefaultLineWidth = new wxTextCtrl( m_swGeneralOpts, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
bSizer25->Add( m_textCtrlDefaultLineWidth, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); fgSizer5->Add( m_textCtrlDefaultLineWidth, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
m_staticText221 = new wxStaticText( m_swGeneralOpts, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 );
bSizerDefLineWidth->Add( bSizer25, 1, 0, 5 ); m_staticText221->Wrap( -1 );
fgSizer5->Add( m_staticText221, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxRIGHT, 5 );
wxBoxSizer* bSizerDefTextThickness;
bSizerDefTextThickness = new wxBoxSizer( wxVERTICAL );
m_staticText22 = new wxStaticText( m_swGeneralOpts, wxID_ANY, _("Text Thickness"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText22->Wrap( -1 );
bSizerDefTextThickness->Add( m_staticText22, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_textCtrlDefaultTextThickness = new wxTextCtrl( m_swGeneralOpts, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_textCtrlDefaultTextThickness = new wxTextCtrl( m_swGeneralOpts, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
bSizerDefTextThickness->Add( m_textCtrlDefaultTextThickness, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); fgSizer5->Add( m_textCtrlDefaultTextThickness, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
bSizerDefLineWidth->Add( bSizerDefTextThickness, 1, 0, 5 ); fgSizer5->Add( 0, 0, 1, wxEXPAND, 5 );
bSizerGeneralOpts1->Add( bSizerDefLineWidth, 0, wxEXPAND, 5 ); bSizerGeneralOpts1->Add( fgSizer5, 1, wxEXPAND, 5 );
bSizerGeneralOpts->Add( bSizerGeneralOpts1, 0, 0, 5 ); bSizerGeneralOpts->Add( bSizerGeneralOpts1, 0, wxEXPAND, 5 );
m_buttonDefault = new wxButton( m_swGeneralOpts, wxID_ANY, _("Set to Default"), wxDefaultPosition, wxDefaultSize, 0 ); m_buttonDefault = new wxButton( m_swGeneralOpts, wxID_ANY, _("Set to Default"), wxDefaultPosition, wxDefaultSize, 0 );
bSizerGeneralOpts->Add( m_buttonDefault, 0, wxALL|wxEXPAND, 5 ); bSizerGeneralOpts->Add( m_buttonDefault, 0, wxALL|wxEXPAND, 5 );
@ -535,76 +562,78 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c
wxBoxSizer* bSizerGeneraMargins; wxBoxSizer* bSizerGeneraMargins;
bSizerGeneraMargins = new wxBoxSizer( wxVERTICAL ); bSizerGeneraMargins = new wxBoxSizer( wxVERTICAL );
m_staticTextMargins = new wxStaticText( m_swGeneralOpts, wxID_ANY, _("Page Margins"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextMargins = new wxStaticText( m_swGeneralOpts, wxID_ANY, _("Page Margins:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextMargins->Wrap( -1 ); m_staticTextMargins->Wrap( -1 );
bSizerGeneraMargins->Add( m_staticTextMargins, 0, wxALL, 5 ); bSizerGeneraMargins->Add( m_staticTextMargins, 0, wxALL, 5 );
wxBoxSizer* bSizerDefLRMargins; wxFlexGridSizer* fgSizer6;
bSizerDefLRMargins = new wxBoxSizer( wxHORIZONTAL ); fgSizer6 = new wxFlexGridSizer( 0, 4, 0, 0 );
fgSizer6->AddGrowableCol( 0 );
fgSizer6->AddGrowableCol( 2 );
fgSizer6->SetFlexibleDirection( wxBOTH );
fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
wxBoxSizer* bSizerDefLeftMargin; m_staticTextLeftMargin = new wxStaticText( m_swGeneralOpts, wxID_ANY, _("Left:"), wxDefaultPosition, wxDefaultSize, 0 );
bSizerDefLeftMargin = new wxBoxSizer( wxVERTICAL );
m_staticTextLeftMargin = new wxStaticText( m_swGeneralOpts, wxID_ANY, _("Left margin (mm)"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextLeftMargin->Wrap( -1 ); m_staticTextLeftMargin->Wrap( -1 );
bSizerDefLeftMargin->Add( m_staticTextLeftMargin, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); fgSizer6->Add( m_staticTextLeftMargin, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
fgSizer6->Add( 0, 0, 1, wxEXPAND, 5 );
m_staticTextDefRightMargin = new wxStaticText( m_swGeneralOpts, wxID_ANY, _("Right:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextDefRightMargin->Wrap( -1 );
fgSizer6->Add( m_staticTextDefRightMargin, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
fgSizer6->Add( 0, 0, 1, wxEXPAND, 5 );
m_textCtrlLeftMargin = new wxTextCtrl( m_swGeneralOpts, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_textCtrlLeftMargin = new wxTextCtrl( m_swGeneralOpts, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
bSizerDefLeftMargin->Add( m_textCtrlLeftMargin, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); fgSizer6->Add( m_textCtrlLeftMargin, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 );
m_units142 = new wxStaticText( m_swGeneralOpts, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 );
bSizerDefLRMargins->Add( bSizerDefLeftMargin, 1, wxEXPAND, 5 ); m_units142->Wrap( -1 );
fgSizer6->Add( m_units142, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxRIGHT, 5 );
wxBoxSizer* bSizerDefTsizeY1;
bSizerDefTsizeY1 = new wxBoxSizer( wxVERTICAL );
m_staticTextDefRightMargin = new wxStaticText( m_swGeneralOpts, wxID_ANY, _("Right margin (mm)"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextDefRightMargin->Wrap( -1 );
bSizerDefTsizeY1->Add( m_staticTextDefRightMargin, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_textCtrlRightMargin = new wxTextCtrl( m_swGeneralOpts, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_textCtrlRightMargin = new wxTextCtrl( m_swGeneralOpts, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
bSizerDefTsizeY1->Add( m_textCtrlRightMargin, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); fgSizer6->Add( m_textCtrlRightMargin, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 );
m_units143 = new wxStaticText( m_swGeneralOpts, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 );
m_units143->Wrap( -1 );
fgSizer6->Add( m_units143, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxRIGHT, 5 );
bSizerDefLRMargins->Add( bSizerDefTsizeY1, 1, wxEXPAND, 5 ); m_staticTextTopMargin = new wxStaticText( m_swGeneralOpts, wxID_ANY, _("Top:"), wxDefaultPosition, wxDefaultSize, 0 );
bSizerGeneraMargins->Add( bSizerDefLRMargins, 0, wxEXPAND, 5 );
wxBoxSizer* bSizerDefTBMargins;
bSizerDefTBMargins = new wxBoxSizer( wxHORIZONTAL );
wxBoxSizer* bSizerTopMargin;
bSizerTopMargin = new wxBoxSizer( wxVERTICAL );
m_staticTextTopMargin = new wxStaticText( m_swGeneralOpts, wxID_ANY, _("Top margin (mm)"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextTopMargin->Wrap( -1 ); m_staticTextTopMargin->Wrap( -1 );
bSizerTopMargin->Add( m_staticTextTopMargin, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); fgSizer6->Add( m_staticTextTopMargin, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
fgSizer6->Add( 0, 0, 1, wxEXPAND, 5 );
m_staticTextBottomMargin = new wxStaticText( m_swGeneralOpts, wxID_ANY, _("Bottom:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextBottomMargin->Wrap( -1 );
fgSizer6->Add( m_staticTextBottomMargin, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
fgSizer6->Add( 0, 0, 1, wxEXPAND, 5 );
m_textCtrlTopMargin = new wxTextCtrl( m_swGeneralOpts, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_textCtrlTopMargin = new wxTextCtrl( m_swGeneralOpts, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
bSizerTopMargin->Add( m_textCtrlTopMargin, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); fgSizer6->Add( m_textCtrlTopMargin, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
m_units1431 = new wxStaticText( m_swGeneralOpts, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 );
bSizerDefTBMargins->Add( bSizerTopMargin, 1, 0, 5 ); m_units1431->Wrap( -1 );
fgSizer6->Add( m_units1431, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxRIGHT, 5 );
wxBoxSizer* bSizerDefBottomMargin;
bSizerDefBottomMargin = new wxBoxSizer( wxVERTICAL );
m_staticTextBottomMargin = new wxStaticText( m_swGeneralOpts, wxID_ANY, _("Bottom margin (mm)"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextBottomMargin->Wrap( -1 );
bSizerDefBottomMargin->Add( m_staticTextBottomMargin, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_textCtrlDefaultBottomMargin = new wxTextCtrl( m_swGeneralOpts, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_textCtrlDefaultBottomMargin = new wxTextCtrl( m_swGeneralOpts, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
bSizerDefBottomMargin->Add( m_textCtrlDefaultBottomMargin, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); fgSizer6->Add( m_textCtrlDefaultBottomMargin, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
m_units1432 = new wxStaticText( m_swGeneralOpts, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 );
m_units1432->Wrap( -1 );
fgSizer6->Add( m_units1432, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxRIGHT, 5 );
bSizerDefTBMargins->Add( bSizerDefBottomMargin, 1, 0, 5 ); bSizerGeneraMargins->Add( fgSizer6, 1, wxEXPAND, 5 );
bSizerGeneraMargins->Add( bSizerDefTBMargins, 0, wxEXPAND, 5 ); bSizerGeneralOpts->Add( bSizerGeneraMargins, 0, wxEXPAND, 5 );
bSizerGeneralOpts->Add( bSizerGeneraMargins, 0, 0, 5 );
m_buttonGeneralOptsOK = new wxButton( m_swGeneralOpts, wxID_ANY, _("Accept"), wxDefaultPosition, wxDefaultSize, 0 ); m_buttonGeneralOptsOK = new wxButton( m_swGeneralOpts, wxID_ANY, _("Accept"), wxDefaultPosition, wxDefaultSize, 0 );
m_buttonGeneralOptsOK->SetDefault(); m_buttonGeneralOptsOK->SetDefault();
@ -614,7 +643,7 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c
m_swGeneralOpts->SetSizer( bSizerGeneralOpts ); m_swGeneralOpts->SetSizer( bSizerGeneralOpts );
m_swGeneralOpts->Layout(); m_swGeneralOpts->Layout();
bSizerGeneralOpts->Fit( m_swGeneralOpts ); bSizerGeneralOpts->Fit( m_swGeneralOpts );
m_notebook->AddPage( m_swGeneralOpts, _("General Options"), false ); m_notebook->AddPage( m_swGeneralOpts, _("General Options"), true );
bSizerpanel->Add( m_notebook, 1, wxEXPAND | wxALL, 5 ); bSizerpanel->Add( m_notebook, 1, wxEXPAND | wxALL, 5 );

9454
pagelayout_editor/dialogs/properties_frame_base.fbp
View File

File diff suppressed because it is too large Load Diff

38
pagelayout_editor/dialogs/properties_frame_base.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Nov 22 2017) // C++ code generated with wxFormBuilder (version Apr 19 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -58,14 +58,18 @@ class PANEL_PROPERTIES_BASE : public wxPanel
wxChoice* m_choiceVjustify; wxChoice* m_choiceVjustify;
wxCheckBox* m_checkBoxItalic; wxCheckBox* m_checkBoxItalic;
wxStaticText* m_staticTexTsizeX; wxStaticText* m_staticTexTsizeX;
wxTextCtrl* m_textCtrlTextSizeX;
wxStaticText* m_staticTextTsizeY; wxStaticText* m_staticTextTsizeY;
wxTextCtrl* m_textCtrlTextSizeX;
wxStaticText* m_units1;
wxTextCtrl* m_textCtrlTextSizeY; wxTextCtrl* m_textCtrlTextSizeY;
wxStaticText* m_units11;
wxStaticText* m_staticTextConstraints; wxStaticText* m_staticTextConstraints;
wxStaticText* m_staticTextConstraintX; wxStaticText* m_staticTextConstraintX;
wxTextCtrl* m_textCtrlConstraintX;
wxStaticText* m_staticTextConstraintY; wxStaticText* m_staticTextConstraintY;
wxTextCtrl* m_textCtrlConstraintX;
wxStaticText* m_units111;
wxTextCtrl* m_textCtrlConstraintY; wxTextCtrl* m_textCtrlConstraintY;
wxStaticText* m_units1111;
wxStaticLine* m_staticline6; wxStaticLine* m_staticline6;
wxButton* m_buttonOK; wxButton* m_buttonOK;
wxStaticLine* m_staticline8; wxStaticLine* m_staticline8;
@ -74,15 +78,19 @@ class PANEL_PROPERTIES_BASE : public wxPanel
wxStaticLine* m_staticline2; wxStaticLine* m_staticline2;
wxStaticText* m_staticTextPosX; wxStaticText* m_staticTextPosX;
wxTextCtrl* m_textCtrlPosX; wxTextCtrl* m_textCtrlPosX;
wxStaticText* m_units12;
wxStaticText* m_staticTextPosY; wxStaticText* m_staticTextPosY;
wxTextCtrl* m_textCtrlPosY; wxTextCtrl* m_textCtrlPosY;
wxStaticText* m_units121;
wxStaticText* m_staticTextOrgPos; wxStaticText* m_staticTextOrgPos;
wxComboBox* m_comboBoxCornerPos; wxComboBox* m_comboBoxCornerPos;
wxBoxSizer* m_SizerEndPosition; wxBoxSizer* m_SizerEndPosition;
wxStaticText* m_staticTextEndX; wxStaticText* m_staticTextEndX;
wxTextCtrl* m_textCtrlEndX; wxTextCtrl* m_textCtrlEndX;
wxStaticText* m_units1211;
wxStaticText* m_staticTextEndY; wxStaticText* m_staticTextEndY;
wxTextCtrl* m_textCtrlEndY; wxTextCtrl* m_textCtrlEndY;
wxStaticText* m_units12111;
wxStaticText* m_staticTextOrgEnd; wxStaticText* m_staticTextOrgEnd;
wxComboBox* m_comboBoxCornerEnd; wxComboBox* m_comboBoxCornerEnd;
wxBoxSizer* m_SizerLineThickness; wxBoxSizer* m_SizerLineThickness;
@ -93,41 +101,49 @@ class PANEL_PROPERTIES_BASE : public wxPanel
wxStaticLine* m_staticline1; wxStaticLine* m_staticline1;
wxStaticText* m_staticTextRot; wxStaticText* m_staticTextRot;
wxTextCtrl* m_textCtrlRotation; wxTextCtrl* m_textCtrlRotation;
wxBoxSizer* m_SizerBitmapPPI;
wxStaticText* m_staticTextBitmapPPI; wxStaticText* m_staticTextBitmapPPI;
wxTextCtrl* m_textCtrlBitmapPPI; wxTextCtrl* m_textCtrlBitmapPPI;
wxBoxSizer* m_SizerBitmapPPI;
wxStaticLine* m_staticline4; wxStaticLine* m_staticline4;
wxStaticText* m_staticTextRepeatPrms; wxStaticText* m_staticTextRepeatPrms;
wxStaticText* m_staticTextRepeatCnt; wxStaticText* m_staticTextRepeatCnt;
wxTextCtrl* m_textCtrlRepeatCount;
wxBoxSizer* m_SizerTextIncrementLabel;
wxStaticText* m_staticTextInclabel; wxStaticText* m_staticTextInclabel;
wxTextCtrl* m_textCtrlRepeatCount;
wxTextCtrl* m_textCtrlTextIncrement; wxTextCtrl* m_textCtrlTextIncrement;
wxStaticText* m_staticTextStepX; wxStaticText* m_staticTextStepX;
wxTextCtrl* m_textCtrlStepX;
wxStaticText* m_staticTextStepY; wxStaticText* m_staticTextStepY;
wxTextCtrl* m_textCtrlStepX;
wxStaticText* m_units121111;
wxTextCtrl* m_textCtrlStepY; wxTextCtrl* m_textCtrlStepY;
wxStaticText* m_units1211111;
wxScrolledWindow* m_swGeneralOpts; wxScrolledWindow* m_swGeneralOpts;
wxStaticText* m_staticTextDefVal; wxStaticText* m_staticTextDefVal;
wxStaticText* m_staticTextDefTsX; wxStaticText* m_staticTextDefTsX;
wxTextCtrl* m_textCtrlDefaultTextSizeX;
wxStaticText* m_staticTextDefTsY; wxStaticText* m_staticTextDefTsY;
wxTextCtrl* m_textCtrlDefaultTextSizeX;
wxStaticText* m_units14;
wxTextCtrl* m_textCtrlDefaultTextSizeY; wxTextCtrl* m_textCtrlDefaultTextSizeY;
wxStaticText* m_units141;
wxStaticText* m_staticTextDefLineW; wxStaticText* m_staticTextDefLineW;
wxTextCtrl* m_textCtrlDefaultLineWidth;
wxStaticText* m_staticText22; wxStaticText* m_staticText22;
wxTextCtrl* m_textCtrlDefaultLineWidth;
wxStaticText* m_staticText221;
wxTextCtrl* m_textCtrlDefaultTextThickness; wxTextCtrl* m_textCtrlDefaultTextThickness;
wxButton* m_buttonDefault; wxButton* m_buttonDefault;
wxStaticLine* m_staticline9; wxStaticLine* m_staticline9;
wxStaticText* m_staticTextMargins; wxStaticText* m_staticTextMargins;
wxStaticText* m_staticTextLeftMargin; wxStaticText* m_staticTextLeftMargin;
wxTextCtrl* m_textCtrlLeftMargin;
wxStaticText* m_staticTextDefRightMargin; wxStaticText* m_staticTextDefRightMargin;
wxTextCtrl* m_textCtrlLeftMargin;
wxStaticText* m_units142;
wxTextCtrl* m_textCtrlRightMargin; wxTextCtrl* m_textCtrlRightMargin;
wxStaticText* m_units143;
wxStaticText* m_staticTextTopMargin; wxStaticText* m_staticTextTopMargin;
wxTextCtrl* m_textCtrlTopMargin;
wxStaticText* m_staticTextBottomMargin; wxStaticText* m_staticTextBottomMargin;
wxTextCtrl* m_textCtrlTopMargin;
wxStaticText* m_units1431;
wxTextCtrl* m_textCtrlDefaultBottomMargin; wxTextCtrl* m_textCtrlDefaultBottomMargin;
wxStaticText* m_units1432;
wxButton* m_buttonGeneralOptsOK; wxButton* m_buttonGeneralOptsOK;
// Virtual event handlers, overide them in your derived class // Virtual event handlers, overide them in your derived class

10
pagelayout_editor/properties_frame.cpp
View File

@ -182,8 +182,9 @@ void PROPERTIES_FRAME::CopyPrmsFromItemToPanel( WORKSHEET_DATAITEM* aItem )
// and be sure widgets which are relevant are enabled // and be sure widgets which are relevant are enabled
if( aItem->GetType() == WORKSHEET_DATAITEM::WS_TEXT ) if( aItem->GetType() == WORKSHEET_DATAITEM::WS_TEXT )
{ {
m_SizerTextOptions->Show(true); m_SizerTextOptions->Show( true );
m_SizerTextIncrementLabel->Show( true ); m_staticTextInclabel->Show( true );
m_textCtrlTextIncrement->Show( true );
WORKSHEET_DATAITEM_TEXT* item = (WORKSHEET_DATAITEM_TEXT*) aItem; WORKSHEET_DATAITEM_TEXT* item = (WORKSHEET_DATAITEM_TEXT*) aItem;
item->m_FullText = item->m_TextBase; item->m_FullText = item->m_TextBase;
@ -228,8 +229,9 @@ void PROPERTIES_FRAME::CopyPrmsFromItemToPanel( WORKSHEET_DATAITEM* aItem )
} }
else else
{ {
m_SizerTextOptions->Show(false); m_SizerTextOptions->Show( false );
m_SizerTextIncrementLabel->Show(false); m_staticTextInclabel->Show( false );
m_textCtrlTextIncrement->Show( false );
} }
if( aItem->GetType() == WORKSHEET_DATAITEM::WS_POLYPOLYGON ) if( aItem->GetType() == WORKSHEET_DATAITEM::WS_POLYPOLYGON )