diff --git a/pagelayout_editor/dialogs/properties_frame_base.cpp b/pagelayout_editor/dialogs/properties_frame_base.cpp index 69666dccc3..146eff33ff 100644 --- a/pagelayout_editor/dialogs/properties_frame_base.cpp +++ b/pagelayout_editor/dialogs/properties_frame_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 30 2017) +// C++ code generated with wxFormBuilder (version Dec 1 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -9,235 +9,235 @@ /////////////////////////////////////////////////////////////////////////// -PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) +PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name ) { wxBoxSizer* bSizerpanel; bSizerpanel = new wxBoxSizer( wxVERTICAL ); - + m_notebook = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); m_swItemProperties = new wxScrolledWindow( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxTAB_TRAVERSAL|wxVSCROLL ); m_swItemProperties->SetScrollRate( 5, 5 ); m_SizerItemProperties = new wxBoxSizer( wxVERTICAL ); - + wxBoxSizer* bSizerButt; bSizerButt = new wxBoxSizer( wxHORIZONTAL ); - + 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_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); - + bSizerButt->Add( m_staticTextType, 1, wxLEFT|wxRIGHT, 5 ); - + wxString m_choicePageOptChoices[] = { _("Show on all pages"), _("First page only"), _("Subsequent pages only") }; int m_choicePageOptNChoices = sizeof( m_choicePageOptChoices ) / sizeof( wxString ); m_choicePageOpt = new wxChoice( m_swItemProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choicePageOptNChoices, m_choicePageOptChoices, 0 ); m_choicePageOpt->SetSelection( 2 ); bSizerButt->Add( m_choicePageOpt, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - - + + m_SizerItemProperties->Add( bSizerButt, 0, wxEXPAND|wxTOP, 5 ); - + m_staticline5 = new wxStaticLine( m_swItemProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); m_SizerItemProperties->Add( m_staticline5, 0, wxTOP|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - + m_SizerTextOptions = new wxBoxSizer( wxVERTICAL ); - + m_staticTextText = new wxStaticText( m_swItemProperties, wxID_ANY, _("Text:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextText->Wrap( -1 ); m_SizerTextOptions->Add( m_staticTextText, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_textCtrlText = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE ); m_SizerTextOptions->Add( m_textCtrlText, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - + wxBoxSizer* bSizerFontOpt; bSizerFontOpt = new wxBoxSizer( wxVERTICAL ); - + wxFlexGridSizer* fgSizer1; fgSizer1 = new wxFlexGridSizer( 0, 4, 0, 0 ); fgSizer1->SetFlexibleDirection( wxBOTH ); fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_staticTextHjust = new wxStaticText( m_swItemProperties, wxID_ANY, _("H align:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextHjust->Wrap( -1 ); fgSizer1->Add( m_staticTextHjust, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 ); - + wxString m_choiceHjustifyChoices[] = { _("Left"), _("Center"), _("Right") }; 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->SetSelection( 0 ); fgSizer1->Add( m_choiceHjustify, 0, wxEXPAND|wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - - + + fgSizer1->Add( 0, 0, 1, wxEXPAND|wxRIGHT|wxLEFT, 10 ); - + m_checkBoxBold = new wxCheckBox( m_swItemProperties, wxID_ANY, _("Bold"), wxDefaultPosition, wxDefaultSize, 0 ); fgSizer1->Add( m_checkBoxBold, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - + m_staticTextVjust = new wxStaticText( m_swItemProperties, wxID_ANY, _("V align:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextVjust->Wrap( -1 ); fgSizer1->Add( m_staticTextVjust, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT, 5 ); - + wxString m_choiceVjustifyChoices[] = { _("Top"), _("Center"), _("Bottom") }; 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->SetSelection( 1 ); fgSizer1->Add( m_choiceVjustify, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - - + + fgSizer1->Add( 0, 0, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - + m_checkBoxItalic = new wxCheckBox( m_swItemProperties, wxID_ANY, _("Italic"), wxDefaultPosition, wxDefaultSize, 0 ); fgSizer1->Add( m_checkBoxItalic, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - + + bSizerFontOpt->Add( fgSizer1, 0, wxEXPAND, 5 ); - - + + m_SizerTextOptions->Add( bSizerFontOpt, 0, wxEXPAND|wxBOTTOM, 2 ); - + wxFlexGridSizer* fgSizer2; fgSizer2 = new wxFlexGridSizer( 0, 5, 0, 0 ); fgSizer2->AddGrowableCol( 0 ); fgSizer2->AddGrowableCol( 3 ); fgSizer2->SetFlexibleDirection( wxBOTH ); fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_staticTexTsizeX = new wxStaticText( m_swItemProperties, wxID_ANY, _("Text width:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTexTsizeX->Wrap( -1 ); fgSizer2->Add( m_staticTexTsizeX, 0, wxRIGHT|wxLEFT, 5 ); - - + + fgSizer2->Add( 0, 0, 0, wxEXPAND, 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, wxRIGHT|wxLEFT, 5 ); - - + + fgSizer2->Add( 0, 0, 0, wxEXPAND, 5 ); - + m_textCtrlTextSizeX = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer2->Add( m_textCtrlTextSizeX, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT, 5 ); - + m_units1 = new wxStaticText( m_swItemProperties, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); m_units1->Wrap( -1 ); fgSizer2->Add( m_units1, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxBOTTOM, 5 ); - - + + fgSizer2->Add( 0, 0, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - + m_textCtrlTextSizeY = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer2->Add( m_textCtrlTextSizeY, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT, 5 ); - + m_units11 = new wxStaticText( m_swItemProperties, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); m_units11->Wrap( -1 ); fgSizer2->Add( m_units11, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxBOTTOM|wxRIGHT, 5 ); - + m_staticTextConstraintX = new wxStaticText( m_swItemProperties, wxID_ANY, _("Maximum width:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextConstraintX->Wrap( -1 ); m_staticTextConstraintX->SetToolTip( _("Set to 0 to disable this constraint") ); - + fgSizer2->Add( m_staticTextConstraintX, 0, wxRIGHT|wxLEFT, 5 ); - - + + fgSizer2->Add( 0, 0, 1, wxEXPAND, 5 ); - - + + fgSizer2->Add( 0, 0, 0, wxEXPAND, 5 ); - + m_staticTextConstraintY = new wxStaticText( m_swItemProperties, wxID_ANY, _("Maximum height:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextConstraintY->Wrap( -1 ); m_staticTextConstraintY->SetToolTip( _("Set to 0 to disable this constraint") ); - + fgSizer2->Add( m_staticTextConstraintY, 0, wxRIGHT|wxLEFT, 5 ); - - + + fgSizer2->Add( 0, 0, 0, wxEXPAND, 5 ); - + m_textCtrlConstraintX = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer2->Add( m_textCtrlConstraintX, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT, 5 ); - + m_units111 = new wxStaticText( m_swItemProperties, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); m_units111->Wrap( -1 ); fgSizer2->Add( m_units111, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxBOTTOM, 5 ); - - + + fgSizer2->Add( 0, 0, 1, wxEXPAND, 5 ); - + m_textCtrlConstraintY = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer2->Add( m_textCtrlConstraintY, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM|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|wxBOTTOM|wxRIGHT, 5 ); - - + + m_SizerTextOptions->Add( fgSizer2, 0, wxEXPAND, 5 ); - + m_staticTextSizeInfo = new wxStaticText( m_swItemProperties, wxID_ANY, _("Set to 0 to use default values"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextSizeInfo->Wrap( -1 ); m_SizerTextOptions->Add( m_staticTextSizeInfo, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - + m_staticline6 = new wxStaticLine( m_swItemProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); m_SizerTextOptions->Add( m_staticline6, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - - + + m_SizerItemProperties->Add( m_SizerTextOptions, 1, wxEXPAND, 5 ); - + m_staticTextComment = new wxStaticText( m_swItemProperties, wxID_ANY, _("Comment:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextComment->Wrap( -1 ); m_SizerItemProperties->Add( m_staticTextComment, 0, wxRIGHT|wxLEFT, 5 ); - + m_textCtrlComment = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_SizerItemProperties->Add( m_textCtrlComment, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - + m_staticline2 = new wxStaticLine( m_swItemProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); m_SizerItemProperties->Add( m_staticline2, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); - + wxBoxSizer* bSizerPos; bSizerPos = new wxBoxSizer( wxHORIZONTAL ); - + wxFlexGridSizer* fgSizer3; fgSizer3 = new wxFlexGridSizer( 0, 3, 0, 0 ); fgSizer3->AddGrowableCol( 1 ); fgSizer3->SetFlexibleDirection( wxHORIZONTAL ); fgSizer3->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_staticTextPosX = new wxStaticText( m_swItemProperties, wxID_ANY, _("X:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextPosX->Wrap( -1 ); fgSizer3->Add( m_staticTextPosX, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - + m_textCtrlPosX = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer3->Add( m_textCtrlPosX, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM, 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|wxBOTTOM, 5 ); - + m_staticTextPosY = new wxStaticText( m_swItemProperties, wxID_ANY, _("Y:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextPosY->Wrap( -1 ); fgSizer3->Add( m_staticTextPosY, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - + m_textCtrlPosY = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer3->Add( m_textCtrlPosY, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM, 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|wxBOTTOM, 5 ); - - + + bSizerPos->Add( fgSizer3, 0, wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT, 5 ); - + wxBoxSizer* bSizer6; bSizer6 = new wxBoxSizer( wxVERTICAL ); - + m_staticTextOrgPos = new wxStaticText( m_swItemProperties, wxID_ANY, _("From:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextOrgPos->Wrap( -1 ); bSizer6->Add( m_staticTextOrgPos, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_comboBoxCornerPos = new wxComboBox( m_swItemProperties, wxID_ANY, _("Lower Right"), wxDefaultPosition, wxSize( -1,-1 ), 0, NULL, 0 ); m_comboBoxCornerPos->Append( _("Upper Right") ); m_comboBoxCornerPos->Append( _("Upper Left") ); @@ -245,55 +245,55 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c m_comboBoxCornerPos->Append( _("Lower Left") ); m_comboBoxCornerPos->SetSelection( 2 ); m_comboBoxCornerPos->SetMinSize( wxSize( 132,-1 ) ); - + bSizer6->Add( m_comboBoxCornerPos, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - + + bSizerPos->Add( bSizer6, 0, wxALIGN_CENTER_VERTICAL, 5 ); - - + + m_SizerItemProperties->Add( bSizerPos, 0, wxEXPAND, 5 ); - + m_SizerEndPosition = new wxBoxSizer( wxHORIZONTAL ); - + wxFlexGridSizer* fgSizer4; fgSizer4 = new wxFlexGridSizer( 0, 3, 0, 0 ); fgSizer4->AddGrowableCol( 1 ); fgSizer4->SetFlexibleDirection( wxHORIZONTAL ); fgSizer4->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_staticTextEndX = new wxStaticText( m_swItemProperties, wxID_ANY, _("X:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextEndX->Wrap( -1 ); fgSizer4->Add( m_staticTextEndX, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - + m_textCtrlEndX = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer4->Add( m_textCtrlEndX, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM, 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|wxBOTTOM, 5 ); - + m_staticTextEndY = new wxStaticText( m_swItemProperties, wxID_ANY, _("Y:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextEndY->Wrap( -1 ); fgSizer4->Add( m_staticTextEndY, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - + m_textCtrlEndY = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer4->Add( m_textCtrlEndY, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM, 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|wxBOTTOM, 5 ); - - + + m_SizerEndPosition->Add( fgSizer4, 0, wxEXPAND|wxRIGHT, 5 ); - + wxBoxSizer* bSizer61; bSizer61 = new wxBoxSizer( wxVERTICAL ); - + m_staticTextOrgEnd = new wxStaticText( m_swItemProperties, wxID_ANY, _("From:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextOrgEnd->Wrap( -1 ); bSizer61->Add( m_staticTextOrgEnd, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_comboBoxCornerEnd = new wxComboBox( m_swItemProperties, wxID_ANY, _("Lower Left"), wxDefaultPosition, wxSize( -1,-1 ), 0, NULL, 0 ); m_comboBoxCornerEnd->Append( _("Upper Right") ); m_comboBoxCornerEnd->Append( _("Upper Left") ); @@ -301,164 +301,159 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c m_comboBoxCornerEnd->Append( _("Lower Left") ); m_comboBoxCornerEnd->SetSelection( 3 ); m_comboBoxCornerEnd->SetMinSize( wxSize( 132,-1 ) ); - + bSizer61->Add( m_comboBoxCornerEnd, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - + + m_SizerEndPosition->Add( bSizer61, 0, wxALIGN_CENTER_VERTICAL, 5 ); - - + + m_SizerItemProperties->Add( m_SizerEndPosition, 0, wxTOP|wxBOTTOM|wxEXPAND, 5 ); - + m_SizerLineThickness = new wxBoxSizer( wxHORIZONTAL ); - + m_staticTextThickness = new wxStaticText( m_swItemProperties, wxID_ANY, _("Line width:"), wxDefaultPosition, wxSize( -1,-1 ), 0 ); m_staticTextThickness->Wrap( -1 ); - m_staticTextThickness->SetMinSize( wxSize( 76,-1 ) ); - m_SizerLineThickness->Add( m_staticTextThickness, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - + m_textCtrlThickness = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_SizerLineThickness->Add( m_textCtrlThickness, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 ); - + m_staticTextInfoThickness = new wxStaticText( m_swItemProperties, wxID_ANY, _("Set to 0 for default"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextInfoThickness->Wrap( -1 ); m_SizerLineThickness->Add( m_staticTextInfoThickness, 0, wxALIGN_CENTER|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - + + m_SizerItemProperties->Add( m_SizerLineThickness, 0, 0, 5 ); - + m_SizerRotation = new wxBoxSizer( wxVERTICAL ); - + wxFlexGridSizer* fgSizerRotation; fgSizerRotation = new wxFlexGridSizer( 0, 2, 0, 0 ); fgSizerRotation->SetFlexibleDirection( wxBOTH ); fgSizerRotation->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_staticTextRot = new wxStaticText( m_swItemProperties, wxID_ANY, _("Rotation:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextRot->Wrap( -1 ); - m_staticTextRot->SetMinSize( wxSize( 76,-1 ) ); - fgSizerRotation->Add( m_staticTextRot, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - + m_textCtrlRotation = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerRotation->Add( m_textCtrlRotation, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 ); - - + + m_SizerRotation->Add( fgSizerRotation, 0, wxEXPAND, 5 ); - - + + m_SizerItemProperties->Add( m_SizerRotation, 0, wxEXPAND, 5 ); - + m_SizerPPI = new wxBoxSizer( wxVERTICAL ); - + wxFlexGridSizer* fgSizerPPI; fgSizerPPI = new wxFlexGridSizer( 0, 2, 0, 0 ); fgSizerPPI->SetFlexibleDirection( wxBOTH ); fgSizerPPI->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_staticTextBitmapPPI1 = new wxStaticText( m_swItemProperties, wxID_ANY, _("Bitmap DPI:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextBitmapPPI1->Wrap( -1 ); - m_staticTextBitmapPPI1->SetMinSize( wxSize( 76,-1 ) ); - fgSizerPPI->Add( m_staticTextBitmapPPI1, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - + m_textCtrlBitmapPPI = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerPPI->Add( m_textCtrlBitmapPPI, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 ); - - + + m_SizerPPI->Add( fgSizerPPI, 0, wxEXPAND, 5 ); - - + + m_SizerItemProperties->Add( m_SizerPPI, 0, wxEXPAND, 5 ); - + m_staticline111 = new wxStaticLine( m_swItemProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); m_SizerItemProperties->Add( m_staticline111, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - + wxFlexGridSizer* fgSizer8; fgSizer8 = new wxFlexGridSizer( 0, 5, 0, 0 ); fgSizer8->AddGrowableCol( 0 ); fgSizer8->AddGrowableCol( 3 ); fgSizer8->SetFlexibleDirection( wxBOTH ); fgSizer8->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_staticTextRepeatCnt = new wxStaticText( m_swItemProperties, wxID_ANY, _("Repeat count:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextRepeatCnt->Wrap( -1 ); fgSizer8->Add( m_staticTextRepeatCnt, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - - + + fgSizer8->Add( 0, 0, 0, wxEXPAND, 5 ); - - + + fgSizer8->Add( 0, 0, 1, wxEXPAND, 5 ); - + m_staticTextInclabel = new wxStaticText( m_swItemProperties, wxID_ANY, _("Step text:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextInclabel->Wrap( -1 ); fgSizer8->Add( m_staticTextInclabel, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - - + + fgSizer8->Add( 0, 0, 0, wxEXPAND, 5 ); - + m_textCtrlRepeatCount = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer8->Add( m_textCtrlRepeatCount, 0, wxEXPAND|wxLEFT, 5 ); - - + + fgSizer8->Add( 0, 0, 0, wxEXPAND, 5 ); - - + + fgSizer8->Add( 0, 0, 1, wxEXPAND, 5 ); - + m_textCtrlTextIncrement = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer8->Add( m_textCtrlTextIncrement, 0, wxEXPAND|wxLEFT, 5 ); - - + + fgSizer8->Add( 0, 0, 0, wxEXPAND, 5 ); - + m_staticTextStepX = new wxStaticText( m_swItemProperties, wxID_ANY, _("Step X:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextStepX->Wrap( -1 ); fgSizer8->Add( m_staticTextStepX, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - - + + fgSizer8->Add( 0, 0, 0, wxEXPAND, 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, 0, wxEXPAND, 5 ); - + m_textCtrlStepX = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), 0 ); fgSizer8->Add( m_textCtrlStepX, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT, 5 ); - + m_units121111 = new wxStaticText( m_swItemProperties, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); m_units121111->Wrap( -1 ); fgSizer8->Add( m_units121111, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxBOTTOM|wxRIGHT, 5 ); - - + + fgSizer8->Add( 0, 0, 1, wxEXPAND|wxLEFT, 5 ); - + m_textCtrlStepY = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer8->Add( m_textCtrlStepY, 0, wxEXPAND|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 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|wxBOTTOM|wxRIGHT, 5 ); - - + + m_SizerItemProperties->Add( fgSizer8, 0, wxEXPAND, 5 ); - + m_staticline8 = new wxStaticLine( m_swItemProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); m_SizerItemProperties->Add( m_staticline8, 0, wxEXPAND|wxALL, 5 ); - + m_buttonOK = new wxButton( m_swItemProperties, wxID_ANY, _("Apply"), wxDefaultPosition, wxDefaultSize, 0 ); - m_buttonOK->SetDefault(); + + m_buttonOK->SetDefault(); m_SizerItemProperties->Add( m_buttonOK, 0, wxALL|wxEXPAND, 5 ); - - + + m_swItemProperties->SetSizer( m_SizerItemProperties ); m_swItemProperties->Layout(); m_SizerItemProperties->Fit( m_swItemProperties ); @@ -467,208 +462,209 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c m_swGeneralOpts->SetScrollRate( 5, 5 ); wxBoxSizer* bSizerGeneralOpts; bSizerGeneralOpts = new wxBoxSizer( wxVERTICAL ); - + wxBoxSizer* bSizerGeneralOpts1; bSizerGeneralOpts1 = new wxBoxSizer( wxVERTICAL ); - + m_staticTextDefVal = new wxStaticText( m_swGeneralOpts, wxID_ANY, _("Default Values:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextDefVal->Wrap( -1 ); bSizerGeneralOpts1->Add( m_staticTextDefVal, 0, wxALL, 5 ); - + wxFlexGridSizer* fgSizer5; fgSizer5 = new wxFlexGridSizer( 0, 5, 0, 0 ); fgSizer5->AddGrowableCol( 0 ); fgSizer5->AddGrowableCol( 3 ); fgSizer5->SetFlexibleDirection( wxBOTH ); fgSizer5->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_staticTextDefTsX = new wxStaticText( m_swGeneralOpts, wxID_ANY, _("Text width:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextDefTsX->Wrap( -1 ); fgSizer5->Add( m_staticTextDefTsX, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - - + + fgSizer5->Add( 0, 0, 1, wxEXPAND, 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 ); fgSizer5->Add( m_textCtrlDefaultTextSizeX, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT, 5 ); - + m_units14 = new wxStaticText( m_swGeneralOpts, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); m_units14->Wrap( -1 ); fgSizer5->Add( m_units14, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxBOTTOM|wxRIGHT, 5 ); - - + + fgSizer5->Add( 0, 0, 1, wxEXPAND, 5 ); - + m_textCtrlDefaultTextSizeY = new wxTextCtrl( m_swGeneralOpts, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer5->Add( m_textCtrlDefaultTextSizeY, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT, 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|wxBOTTOM|wxRIGHT, 5 ); - + m_staticTextDefLineW = new wxStaticText( m_swGeneralOpts, wxID_ANY, _("Line thickness:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextDefLineW->Wrap( -1 ); fgSizer5->Add( m_staticTextDefLineW, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); - - + + fgSizer5->Add( 0, 0, 1, wxEXPAND, 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 ); fgSizer5->Add( m_textCtrlDefaultLineWidth, 0, wxEXPAND|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - + m_staticText221 = new wxStaticText( m_swGeneralOpts, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText221->Wrap( -1 ); fgSizer5->Add( m_staticText221, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxBOTTOM|wxRIGHT, 5 ); - - + + fgSizer5->Add( 0, 0, 1, wxEXPAND|wxRIGHT, 5 ); - + m_textCtrlDefaultTextThickness = new wxTextCtrl( m_swGeneralOpts, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer5->Add( m_textCtrlDefaultTextThickness, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT, 5 ); - + m_staticText2211 = new wxStaticText( m_swGeneralOpts, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText2211->Wrap( -1 ); fgSizer5->Add( m_staticText2211, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 ); - - + + fgSizer5->Add( 0, 0, 1, wxEXPAND, 5 ); - - + + bSizerGeneralOpts1->Add( fgSizer5, 1, wxEXPAND, 5 ); - - + + bSizerGeneralOpts->Add( bSizerGeneralOpts1, 0, wxEXPAND, 5 ); - + m_buttonDefault = new wxButton( m_swGeneralOpts, wxID_ANY, _("Set to Default"), wxDefaultPosition, wxDefaultSize, 0 ); bSizerGeneralOpts->Add( m_buttonDefault, 0, wxALL|wxEXPAND, 5 ); - + m_staticline9 = new wxStaticLine( m_swGeneralOpts, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); bSizerGeneralOpts->Add( m_staticline9, 0, wxALL, 5 ); - + wxBoxSizer* bSizerGeneraMargins; bSizerGeneraMargins = new wxBoxSizer( wxVERTICAL ); - + m_staticTextMargins = new wxStaticText( m_swGeneralOpts, wxID_ANY, _("Page Margins:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextMargins->Wrap( -1 ); bSizerGeneraMargins->Add( m_staticTextMargins, 0, wxALL, 5 ); - + wxFlexGridSizer* fgSizer6; fgSizer6 = new wxFlexGridSizer( 0, 5, 0, 0 ); fgSizer6->AddGrowableCol( 0 ); fgSizer6->AddGrowableCol( 3 ); fgSizer6->SetFlexibleDirection( wxBOTH ); fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_staticTextLeftMargin = new wxStaticText( m_swGeneralOpts, wxID_ANY, _("Left:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextLeftMargin->Wrap( -1 ); fgSizer6->Add( m_staticTextLeftMargin, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - - + + fgSizer6->Add( 0, 0, 1, wxEXPAND, 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 ); fgSizer6->Add( m_textCtrlLeftMargin, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); - + m_units142 = new wxStaticText( m_swGeneralOpts, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); m_units142->Wrap( -1 ); fgSizer6->Add( m_units142, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxRIGHT, 5 ); - - + + fgSizer6->Add( 0, 0, 1, wxEXPAND|wxRIGHT, 5 ); - + m_textCtrlRightMargin = new wxTextCtrl( m_swGeneralOpts, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer6->Add( m_textCtrlRightMargin, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxLEFT, 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 ); - + m_staticTextTopMargin = new wxStaticText( m_swGeneralOpts, wxID_ANY, _("Top:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextTopMargin->Wrap( -1 ); fgSizer6->Add( m_staticTextTopMargin, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - - + + fgSizer6->Add( 0, 0, 1, wxEXPAND, 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 ); fgSizer6->Add( m_textCtrlTopMargin, 0, wxEXPAND|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - + m_units1431 = new wxStaticText( m_swGeneralOpts, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); m_units1431->Wrap( -1 ); fgSizer6->Add( m_units1431, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxBOTTOM|wxRIGHT, 5 ); - - + + fgSizer6->Add( 0, 0, 1, wxEXPAND, 5 ); - + m_textCtrlDefaultBottomMargin = new wxTextCtrl( m_swGeneralOpts, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer6->Add( m_textCtrlDefaultBottomMargin, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT, 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|wxBOTTOM|wxRIGHT, 5 ); - - + + bSizerGeneraMargins->Add( fgSizer6, 1, wxEXPAND, 5 ); - - + + bSizerGeneralOpts->Add( bSizerGeneraMargins, 0, wxEXPAND|wxBOTTOM, 15 ); - + m_buttonGeneralOptsOK = new wxButton( m_swGeneralOpts, wxID_ANY, _("Apply"), wxDefaultPosition, wxDefaultSize, 0 ); - m_buttonGeneralOptsOK->SetDefault(); + + m_buttonGeneralOptsOK->SetDefault(); bSizerGeneralOpts->Add( m_buttonGeneralOptsOK, 0, wxALL|wxEXPAND, 5 ); - - + + m_swGeneralOpts->SetSizer( bSizerGeneralOpts ); m_swGeneralOpts->Layout(); bSizerGeneralOpts->Fit( m_swGeneralOpts ); m_notebook->AddPage( m_swGeneralOpts, _("General Options"), false ); - + bSizerpanel->Add( m_notebook, 1, wxEXPAND, 5 ); - - + + this->SetSizer( bSizerpanel ); this->Layout(); - + // Connect Events m_notebook->Connect( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxNotebookEventHandler( PANEL_PROPERTIES_BASE::OnPageChanged ), NULL, this ); m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PROPERTIES_BASE::OnAcceptPrms ), NULL, this ); @@ -683,5 +679,5 @@ PANEL_PROPERTIES_BASE::~PANEL_PROPERTIES_BASE() m_buttonOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PROPERTIES_BASE::OnAcceptPrms ), 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 ); - + } diff --git a/pagelayout_editor/dialogs/properties_frame_base.fbp b/pagelayout_editor/dialogs/properties_frame_base.fbp index 6346f773f4..f3ea944f0b 100644 --- a/pagelayout_editor/dialogs/properties_frame_base.fbp +++ b/pagelayout_editor/dialogs/properties_frame_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -14,6 +14,7 @@ properties_frame_base 1000 none + 1 properties_frame @@ -48,36 +49,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizerpanel @@ -140,31 +111,7 @@ - - - - - - - - - - - - - - - - OnPageChanged - - - - - - - - Item Properties @@ -222,29 +169,6 @@ wxHSCROLL|wxTAB_TRAVERSAL|wxVSCROLL - - - - - - - - - - - - - - - - - - - - - - - m_SizerItemProperties @@ -292,6 +216,7 @@ 0 wxID_ANY Type + 0 0 @@ -317,29 +242,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -404,30 +306,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -488,29 +366,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -555,6 +410,7 @@ 0 wxID_ANY Text: + 0 0 @@ -580,29 +436,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -667,33 +500,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -754,6 +560,7 @@ 0 wxID_ANY H align: + 0 0 @@ -779,29 +586,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -866,30 +650,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -964,30 +724,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1023,6 +759,7 @@ 0 wxID_ANY V align: + 0 0 @@ -1048,29 +785,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -1135,30 +849,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1233,30 +923,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1312,6 +978,7 @@ 0 wxID_ANY Text width: + 0 0 @@ -1337,29 +1004,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -1415,6 +1059,7 @@ 0 wxID_ANY Text height: + 0 0 @@ -1440,29 +1085,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -1537,33 +1159,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1599,6 +1194,7 @@ 0 wxID_ANY mm + 0 0 @@ -1624,29 +1220,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -1721,33 +1294,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1783,6 +1329,7 @@ 0 wxID_ANY mm + 0 0 @@ -1808,29 +1355,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -1866,6 +1390,7 @@ 0 wxID_ANY Maximum width: + 0 0 @@ -1891,29 +1416,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -1969,6 +1471,7 @@ 0 wxID_ANY Maximum height: + 0 0 @@ -1994,29 +1497,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -2091,33 +1571,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2153,6 +1606,7 @@ 0 wxID_ANY mm + 0 0 @@ -2178,29 +1632,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -2275,33 +1706,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2337,6 +1741,7 @@ 0 wxID_ANY mm + 0 0 @@ -2362,29 +1767,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -2422,6 +1804,7 @@ 0 wxID_ANY Set to 0 to use default values + 0 0 @@ -2447,29 +1830,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -2528,29 +1888,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -2588,6 +1925,7 @@ 0 wxID_ANY Comment: + 0 0 @@ -2613,29 +1951,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -2700,33 +2015,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2785,29 +2073,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -2868,6 +2133,7 @@ 0 wxID_ANY X: + 0 0 @@ -2893,29 +2159,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -2980,33 +2223,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3042,6 +2258,7 @@ 0 wxID_ANY mm + 0 0 @@ -3067,29 +2284,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -3125,6 +2319,7 @@ 0 wxID_ANY Y: + 0 0 @@ -3150,29 +2345,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -3237,33 +2409,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3299,6 +2444,7 @@ 0 wxID_ANY mm + 0 0 @@ -3324,29 +2470,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -3393,6 +2516,7 @@ 0 wxID_ANY From: + 0 0 @@ -3418,29 +2542,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -3506,34 +2607,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3598,6 +2671,7 @@ 0 wxID_ANY X: + 0 0 @@ -3623,29 +2697,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -3710,33 +2761,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3772,6 +2796,7 @@ 0 wxID_ANY mm + 0 0 @@ -3797,29 +2822,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -3855,6 +2857,7 @@ 0 wxID_ANY Y: + 0 0 @@ -3880,29 +2883,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -3967,33 +2947,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4029,6 +2982,7 @@ 0 wxID_ANY mm + 0 0 @@ -4054,29 +3008,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -4123,6 +3054,7 @@ 0 wxID_ANY From: + 0 0 @@ -4148,29 +3080,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -4236,34 +3145,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4312,12 +3193,13 @@ 0 wxID_ANY Line width: + 0 0 0 - 76,-1 + -1,-1 1 m_staticTextThickness 1 @@ -4337,29 +3219,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -4424,33 +3283,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4486,6 +3318,7 @@ 0 wxID_ANY Set to 0 for default + 0 0 @@ -4511,29 +3344,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -4596,12 +3406,13 @@ 0 wxID_ANY Rotation: + 0 0 0 - 76,-1 + -1,-1 1 m_staticTextRot 1 @@ -4621,29 +3432,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -4708,33 +3496,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4799,12 +3560,13 @@ 0 wxID_ANY Bitmap DPI: + 0 0 0 - 76,-1 + -1,-1 1 m_staticTextBitmapPPI1 1 @@ -4824,29 +3586,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -4911,33 +3650,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5000,29 +3712,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -5074,6 +3763,7 @@ 0 wxID_ANY Repeat count: + 0 0 @@ -5099,29 +3789,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -5177,6 +3844,7 @@ 0 wxID_ANY Step text: + 0 0 @@ -5202,29 +3870,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -5299,33 +3944,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5410,33 +4028,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5482,6 +4073,7 @@ 0 wxID_ANY Step X: + 0 0 @@ -5507,29 +4099,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -5585,6 +4154,7 @@ 0 wxID_ANY Step Y: + 0 0 @@ -5610,29 +4180,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -5707,33 +4254,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5769,6 +4289,7 @@ 0 wxID_ANY mm + 0 0 @@ -5794,29 +4315,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -5891,33 +4389,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5953,6 +4424,7 @@ 0 wxID_ANY mm + 0 0 @@ -5978,29 +4450,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -6061,29 +4510,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -6101,25 +4527,31 @@ + 1 0 1 1 + 1 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY Apply + + 0 0 @@ -6134,6 +4566,8 @@ protected 1 + + Resizable 1 @@ -6149,29 +4583,6 @@ OnAcceptPrms - - - - - - - - - - - - - - - - - - - - - - - @@ -6234,29 +4645,6 @@ wxHSCROLL|wxTAB_TRAVERSAL|wxVSCROLL - - - - - - - - - - - - - - - - - - - - - - - bSizerGeneralOpts @@ -6304,6 +4692,7 @@ 0 wxID_ANY Default Values: + 0 0 @@ -6329,29 +4718,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -6403,6 +4769,7 @@ 0 wxID_ANY Text width: + 0 0 @@ -6428,29 +4795,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -6506,6 +4850,7 @@ 0 wxID_ANY Text height: + 0 0 @@ -6531,29 +4876,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -6628,33 +4950,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6690,6 +4985,7 @@ 0 wxID_ANY mm + 0 0 @@ -6715,29 +5011,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -6812,33 +5085,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6874,6 +5120,7 @@ 0 wxID_ANY mm + 0 0 @@ -6899,29 +5146,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -6957,6 +5181,7 @@ 0 wxID_ANY Line thickness: + 0 0 @@ -6982,29 +5207,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -7060,6 +5262,7 @@ 0 wxID_ANY Text thickness: + 0 0 @@ -7085,29 +5288,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -7182,33 +5362,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -7244,6 +5397,7 @@ 0 wxID_ANY mm + 0 0 @@ -7269,29 +5423,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -7366,33 +5497,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -7428,6 +5532,7 @@ 0 wxID_ANY mm + 0 0 @@ -7453,29 +5558,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -7507,25 +5589,31 @@ + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY Set to Default + + 0 0 @@ -7540,6 +5628,8 @@ protected 1 + + Resizable 1 @@ -7555,29 +5645,6 @@ OnSetDefaultValues - - - - - - - - - - - - - - - - - - - - - - - @@ -7636,29 +5703,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -7703,6 +5747,7 @@ 0 wxID_ANY Page Margins: + 0 0 @@ -7728,29 +5773,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -7802,6 +5824,7 @@ 0 wxID_ANY Left: + 0 0 @@ -7827,29 +5850,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -7905,6 +5905,7 @@ 0 wxID_ANY Right: + 0 0 @@ -7930,29 +5931,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -8027,33 +6005,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -8089,6 +6040,7 @@ 0 wxID_ANY mm + 0 0 @@ -8114,29 +6066,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -8211,33 +6140,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -8273,6 +6175,7 @@ 0 wxID_ANY mm + 0 0 @@ -8298,29 +6201,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -8356,6 +6236,7 @@ 0 wxID_ANY Top: + 0 0 @@ -8381,29 +6262,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -8459,6 +6317,7 @@ 0 wxID_ANY Bottom: + 0 0 @@ -8484,29 +6343,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -8581,33 +6417,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -8643,6 +6452,7 @@ 0 wxID_ANY mm + 0 0 @@ -8668,29 +6478,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -8765,33 +6552,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -8827,6 +6587,7 @@ 0 wxID_ANY mm + 0 0 @@ -8852,29 +6613,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -8896,25 +6634,31 @@ + 1 0 1 1 + 1 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY Apply + + 0 0 @@ -8929,6 +6673,8 @@ protected 1 + + Resizable 1 @@ -8944,29 +6690,6 @@ OnAcceptPrms - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pagelayout_editor/dialogs/properties_frame_base.h b/pagelayout_editor/dialogs/properties_frame_base.h index c94d057cda..f8fb798f3e 100644 --- a/pagelayout_editor/dialogs/properties_frame_base.h +++ b/pagelayout_editor/dialogs/properties_frame_base.h @@ -1,12 +1,11 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 30 2017) +// C++ code generated with wxFormBuilder (version Dec 1 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#ifndef __PROPERTIES_FRAME_BASE_H__ -#define __PROPERTIES_FRAME_BASE_H__ +#pragma once #include #include @@ -23,11 +22,11 @@ #include #include #include -#include -#include #include #include #include +#include +#include #include #include @@ -36,10 +35,10 @@ /////////////////////////////////////////////////////////////////////////////// /// Class PANEL_PROPERTIES_BASE /////////////////////////////////////////////////////////////////////////////// -class PANEL_PROPERTIES_BASE : public wxPanel +class PANEL_PROPERTIES_BASE : public wxPanel { private: - + protected: wxNotebook* m_notebook; wxScrolledWindow* m_swItemProperties; @@ -143,18 +142,17 @@ class PANEL_PROPERTIES_BASE : public wxPanel wxTextCtrl* m_textCtrlDefaultBottomMargin; wxStaticText* m_units1432; wxButton* m_buttonGeneralOptsOK; - + // Virtual event handlers, overide them in your derived class virtual void OnPageChanged( wxNotebookEvent& event ) { event.Skip(); } virtual void OnAcceptPrms( wxCommandEvent& event ) { event.Skip(); } virtual void OnSetDefaultValues( wxCommandEvent& event ) { event.Skip(); } - - + + public: - - PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 340,775 ), long style = wxTAB_TRAVERSAL ); + + PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 340,775 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); ~PANEL_PROPERTIES_BASE(); - + }; -#endif //__PROPERTIES_FRAME_BASE_H__ diff --git a/pagelayout_editor/pl_draw_panel_gal.cpp b/pagelayout_editor/pl_draw_panel_gal.cpp index 8739ab9436..d7439d0657 100644 --- a/pagelayout_editor/pl_draw_panel_gal.cpp +++ b/pagelayout_editor/pl_draw_panel_gal.cpp @@ -47,6 +47,7 @@ PL_DRAW_PANEL_GAL::PL_DRAW_PANEL_GAL( wxWindow* aParentWindow, wxWindowID aWindo m_painter.reset( new KIGFX::WS_PAINTER( m_gal ) ); m_view->SetPainter( m_painter.get() ); + m_view->SetScaleLimits( 20.0, 0.05 ); // This fixes the zoom in and zoom out limits setDefaultLayerDeps(); @@ -76,12 +77,29 @@ void PL_DRAW_PANEL_GAL::DisplayWorksheet() selTool->GetSelection().Clear(); m_view->Clear(); + // Obviously, always show the page limit: + m_edaFrame->SetShowPageLimits( true ); + auto painter = m_view->GetPainter(); + auto settings = painter->GetSettings(); + settings->SetShowPageLimits( true ); + model.SetupDrawEnvironment( m_edaFrame->GetPageSettings(), Mils2iu( 1 ) ); for( WS_DATA_ITEM* dataItem : model.GetItems() ) dataItem->SyncDrawItems( nullptr, m_view ); selTool->RebuildSelection(); + + // Gives a reasonable boundary to the view area + // Otherwise scroll bars are not usable + // A full size = 2 * page size allows a margin around the worksheet. + // (Note: no need to have a large working area: nothing can be drawn outside th page size). + double size_x = m_edaFrame->GetPageSizeIU().x; + double size_y = m_edaFrame->GetPageSizeIU().y; + BOX2D boundary( VECTOR2D( -size_x/4 , -size_y/4 ), + VECTOR2D( size_x * 1.5, size_y * 1.5) ); + m_view->SetBoundary( boundary ); + } diff --git a/pagelayout_editor/pl_editor_screen.cpp b/pagelayout_editor/pl_editor_screen.cpp index 2129328681..f7f9861bf9 100644 --- a/pagelayout_editor/pl_editor_screen.cpp +++ b/pagelayout_editor/pl_editor_screen.cpp @@ -41,9 +41,7 @@ */ static const double pl_editorZoomList[] = { - ZOOM_FACTOR( 5 ), - ZOOM_FACTOR( 7.0 ), - ZOOM_FACTOR( 10.0 ), + ZOOM_FACTOR( 10.0 ), // Zoom in ZOOM_FACTOR( 15.0 ), ZOOM_FACTOR( 22.0 ), ZOOM_FACTOR( 35.0 ), @@ -60,10 +58,11 @@ static const double pl_editorZoomList[] = ZOOM_FACTOR( 1500.0 ), ZOOM_FACTOR( 2000.0 ), ZOOM_FACTOR( 3000.0 ), + ZOOM_FACTOR( 4500.0 ), // Zoom out }; -// Default grid sizes for PCB editor screens. +// Default grid sizes for page layout editor screens. static GRID_TYPE pl_editorGridList[] = { // predefined grid list in mm