diff --git a/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp b/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp index bf1bc09f9f..1e24367c22 100644 --- a/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp +++ b/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 1 2018) +// C++ code generated with wxFormBuilder (version Dec 30 2017) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -14,223 +14,229 @@ DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE::DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) { this->SetSizeHints( wxDefaultSize, wxDefaultSize ); - + wxBoxSizer* bMainSizer; bMainSizer = new wxBoxSizer( wxVERTICAL ); - + wxStaticBoxSizer* sbScope; sbScope = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Scope") ), wxVERTICAL ); - + wxFlexGridSizer* fgSizer3; fgSizer3 = new wxFlexGridSizer( 0, 2, 0, 0 ); fgSizer3->AddGrowableCol( 0 ); fgSizer3->AddGrowableCol( 1 ); fgSizer3->SetFlexibleDirection( wxBOTH ); fgSizer3->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_references = new wxCheckBox( sbScope->GetStaticBox(), wxID_ANY, _("Footprint references"), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer3->Add( m_references, 0, wxALL, 5 ); - + fgSizer3->Add( m_references, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + m_boardText = new wxCheckBox( sbScope->GetStaticBox(), wxID_ANY, _("PCB text items"), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer3->Add( m_boardText, 0, wxALL, 5 ); - + fgSizer3->Add( m_boardText, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + m_values = new wxCheckBox( sbScope->GetStaticBox(), wxID_ANY, _("Footprint values"), wxDefaultPosition, wxDefaultSize, 0 ); fgSizer3->Add( m_values, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - + m_boardGraphics = new wxCheckBox( sbScope->GetStaticBox(), wxID_ANY, _("PCB graphic items"), wxDefaultPosition, wxDefaultSize, 0 ); fgSizer3->Add( m_boardGraphics, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - + m_otherFields = new wxCheckBox( sbScope->GetStaticBox(), wxID_ANY, _("Other footprint fields"), wxDefaultPosition, wxDefaultSize, 0 ); fgSizer3->Add( m_otherFields, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - + + fgSizer3->Add( 0, 0, 1, wxEXPAND, 5 ); - + m_footprintGraphics = new wxCheckBox( sbScope->GetStaticBox(), wxID_ANY, _("Footprint graphic items"), wxDefaultPosition, wxDefaultSize, 0 ); fgSizer3->Add( m_footprintGraphics, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - + + sbScope->Add( fgSizer3, 0, wxEXPAND, 5 ); - - + + bMainSizer->Add( sbScope, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 ); - + + + bMainSizer->Add( 0, 0, 0, wxTOP, 5 ); + wxStaticBoxSizer* sbFilters; sbFilters = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Filters") ), wxVERTICAL ); - + wxFlexGridSizer* fgSizer2; - fgSizer2 = new wxFlexGridSizer( 0, 3, 3, 0 ); + fgSizer2 = new wxFlexGridSizer( 0, 3, 1, 0 ); fgSizer2->AddGrowableCol( 1 ); fgSizer2->SetFlexibleDirection( wxBOTH ); fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_layerFilterOpt = new wxCheckBox( sbFilters->GetStaticBox(), wxID_ANY, _("Filter items by layer:"), wxDefaultPosition, wxDefaultSize, 0 ); fgSizer2->Add( m_layerFilterOpt, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); - - m_layerFilter = new PCB_LAYER_BOX_SELECTOR( sbFilters->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); + + m_layerFilter = new PCB_LAYER_BOX_SELECTOR( sbFilters->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); fgSizer2->Add( m_layerFilter, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT, 5 ); - - + + fgSizer2->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 60 ); - + m_referenceFilterOpt = new wxCheckBox( sbFilters->GetStaticBox(), wxID_ANY, _("Filter items by parent footprint reference:"), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer2->Add( m_referenceFilterOpt, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); - + fgSizer2->Add( m_referenceFilterOpt, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + m_referenceFilter = new wxTextCtrl( sbFilters->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer2->Add( m_referenceFilter, 0, wxEXPAND|wxLEFT, 5 ); - - + fgSizer2->Add( m_referenceFilter, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM|wxLEFT, 5 ); + + fgSizer2->Add( 0, 0, 1, wxEXPAND, 5 ); - + m_footprintFilterOpt = new wxCheckBox( sbFilters->GetStaticBox(), wxID_ANY, _("Filter items by parent footprint identifier:"), wxDefaultPosition, wxDefaultSize, 0 ); fgSizer2->Add( m_footprintFilterOpt, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - + m_footprintFilter = new wxTextCtrl( sbFilters->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer2->Add( m_footprintFilter, 0, wxEXPAND|wxBOTTOM|wxLEFT, 5 ); - - + fgSizer2->Add( m_footprintFilter, 0, wxEXPAND|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); + + fgSizer2->Add( 0, 0, 1, wxEXPAND, 5 ); - - + + sbFilters->Add( fgSizer2, 0, wxEXPAND|wxRIGHT, 5 ); - - - bMainSizer->Add( sbFilters, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 ); - + + + bMainSizer->Add( sbFilters, 0, wxEXPAND|wxRIGHT|wxLEFT, 10 ); + + + bMainSizer->Add( 0, 0, 0, wxTOP, 5 ); + wxStaticBoxSizer* sbAction; sbAction = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Action") ), wxVERTICAL ); - + m_setToSpecifiedValues = new wxRadioButton( sbAction->GetStaticBox(), ID_SPECIFIED_NET_TO_NETCLASS_VALUES, _("Set to specified values:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_setToSpecifiedValues->SetValue( true ); - sbAction->Add( m_setToSpecifiedValues, 0, wxBOTTOM|wxRIGHT|wxTOP, 5 ); - + m_setToSpecifiedValues->SetValue( true ); + sbAction->Add( m_setToSpecifiedValues, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); + m_specifiedValues = new wxPanel( sbAction->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizer2; bSizer2 = new wxBoxSizer( wxVERTICAL ); - + wxFlexGridSizer* fgSizer1; - fgSizer1 = new wxFlexGridSizer( 0, 5, 3, 0 ); + fgSizer1 = new wxFlexGridSizer( 0, 5, 2, 0 ); fgSizer1->SetFlexibleDirection( wxBOTH ); fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_LayerLabel = new wxStaticText( m_specifiedValues, wxID_ANY, _("Layer:"), wxDefaultPosition, wxDefaultSize, 0 ); m_LayerLabel->Wrap( -1 ); fgSizer1->Add( m_LayerLabel, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); - - m_LayerCtrl = new PCB_LAYER_BOX_SELECTOR( m_specifiedValues, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); + + m_LayerCtrl = new PCB_LAYER_BOX_SELECTOR( m_specifiedValues, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); fgSizer1->Add( m_LayerCtrl, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); - - + + fgSizer1->Add( 0, 0, 0, wxEXPAND, 5 ); - - + + fgSizer1->Add( 55, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - + m_Visible = new wxCheckBox( m_specifiedValues, wxID_ANY, _("Visible"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER ); - m_Visible->SetValue(true); - fgSizer1->Add( m_Visible, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP, 5 ); - + m_Visible->SetValue(true); + fgSizer1->Add( m_Visible, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); + m_lineWidthLabel = new wxStaticText( m_specifiedValues, wxID_ANY, _("Line thickness:"), wxDefaultPosition, wxDefaultSize, 0 ); m_lineWidthLabel->Wrap( -1 ); fgSizer1->Add( m_lineWidthLabel, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - + m_LineWidthCtrl = new wxTextCtrl( m_specifiedValues, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer1->Add( m_LineWidthCtrl, 0, wxEXPAND|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - + m_lineWidthUnits = new wxStaticText( m_specifiedValues, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_lineWidthUnits->Wrap( -1 ); fgSizer1->Add( m_lineWidthUnits, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 ); - - + + fgSizer1->Add( 0, 0, 1, wxEXPAND, 5 ); - - + + fgSizer1->Add( 0, 0, 1, wxEXPAND, 5 ); - - + + fgSizer1->Add( 0, 0, 1, wxEXPAND|wxTOP, 5 ); - - + + fgSizer1->Add( 0, 0, 1, wxEXPAND, 5 ); - - + + fgSizer1->Add( 0, 0, 1, wxEXPAND, 5 ); - - + + fgSizer1->Add( 0, 0, 1, wxEXPAND, 5 ); - - + + fgSizer1->Add( 0, 0, 1, wxEXPAND, 5 ); - + m_SizeXlabel = new wxStaticText( m_specifiedValues, wxID_ANY, _("Text width:"), wxDefaultPosition, wxDefaultSize, 0 ); m_SizeXlabel->Wrap( -1 ); fgSizer1->Add( m_SizeXlabel, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); - + m_SizeXCtrl = new wxTextCtrl( m_specifiedValues, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_SizeXCtrl->SetMinSize( wxSize( 120,-1 ) ); - + fgSizer1->Add( m_SizeXCtrl, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - + m_SizeXunit = new wxStaticText( m_specifiedValues, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_SizeXunit->Wrap( -1 ); fgSizer1->Add( m_SizeXunit, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - - + + fgSizer1->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 20 ); - + m_Italic = new wxCheckBox( m_specifiedValues, wxID_ANY, _("Italic"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER ); fgSizer1->Add( m_Italic, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); - + m_SizeYlabel = new wxStaticText( m_specifiedValues, wxID_ANY, _("Text height:"), wxDefaultPosition, wxDefaultSize, 0 ); m_SizeYlabel->Wrap( -1 ); fgSizer1->Add( m_SizeYlabel, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); - + m_SizeYCtrl = new wxTextCtrl( m_specifiedValues, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer1->Add( m_SizeYCtrl, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - + m_SizeYunit = new wxStaticText( m_specifiedValues, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_SizeYunit->Wrap( -1 ); fgSizer1->Add( m_SizeYunit, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - - + + fgSizer1->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 20 ); - + m_keepUpright = new wxCheckBox( m_specifiedValues, wxID_ANY, _("Keep upright"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER ); - m_keepUpright->SetValue(true); + m_keepUpright->SetValue(true); fgSizer1->Add( m_keepUpright, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); - + m_ThicknessLabel = new wxStaticText( m_specifiedValues, wxID_ANY, _("Text thickness:"), wxDefaultPosition, wxDefaultSize, 0 ); m_ThicknessLabel->Wrap( -1 ); fgSizer1->Add( m_ThicknessLabel, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); - + m_ThicknessCtrl = new wxTextCtrl( m_specifiedValues, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer1->Add( m_ThicknessCtrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - + m_ThicknessUnit = new wxStaticText( m_specifiedValues, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_ThicknessUnit->Wrap( -1 ); fgSizer1->Add( m_ThicknessUnit, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 ); - - + + bSizer2->Add( fgSizer1, 1, wxEXPAND|wxTOP, 2 ); - - + + m_specifiedValues->SetSizer( bSizer2 ); m_specifiedValues->Layout(); bSizer2->Fit( m_specifiedValues ); - sbAction->Add( m_specifiedValues, 1, wxEXPAND|wxBOTTOM|wxLEFT, 15 ); - + sbAction->Add( m_specifiedValues, 1, wxEXPAND|wxBOTTOM|wxLEFT, 12 ); + m_setToLayerDefaults = new wxRadioButton( sbAction->GetStaticBox(), ID_ALL_TRACKS_VIAS, _("Set to layer default values:"), wxDefaultPosition, wxDefaultSize, 0 ); - sbAction->Add( m_setToLayerDefaults, 0, wxTOP|wxBOTTOM, 5 ); - + sbAction->Add( m_setToLayerDefaults, 0, wxBOTTOM, 5 ); + m_grid = new wxGrid( sbAction->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_SIMPLE ); - + // Grid m_grid->CreateGrid( 6, 7 ); m_grid->EnableEditing( false ); m_grid->EnableGridLines( true ); m_grid->EnableDragGridSize( false ); m_grid->SetMargins( 0, 0 ); - + // Columns m_grid->SetColSize( 0, 120 ); m_grid->SetColSize( 1, 110 ); @@ -242,41 +248,41 @@ DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE::DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_ m_grid->EnableDragColMove( false ); m_grid->EnableDragColSize( false ); m_grid->SetColLabelSize( 0 ); - m_grid->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); - + m_grid->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); + // Rows m_grid->EnableDragRowSize( false ); m_grid->SetRowLabelSize( 0 ); - m_grid->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); - + m_grid->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); + // Label Appearance - + // Cell Defaults m_grid->SetDefaultCellBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) ); m_grid->SetDefaultCellFont( wxFont( 11, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); - m_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER ); + m_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTRE ); sbAction->Add( m_grid, 0, wxEXPAND|wxLEFT, 15 ); - - + + sbAction->Add( 0, 0, 0, wxEXPAND|wxBOTTOM, 5 ); - - - bMainSizer->Add( sbAction, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 ); - + + + bMainSizer->Add( sbAction, 1, wxEXPAND|wxRIGHT|wxLEFT, 10 ); + m_sdbSizerButtons = new wxStdDialogButtonSizer(); m_sdbSizerButtonsOK = new wxButton( this, wxID_OK ); m_sdbSizerButtons->AddButton( m_sdbSizerButtonsOK ); m_sdbSizerButtonsCancel = new wxButton( this, wxID_CANCEL ); m_sdbSizerButtons->AddButton( m_sdbSizerButtonsCancel ); m_sdbSizerButtons->Realize(); - + bMainSizer->Add( m_sdbSizerButtons, 0, wxALL|wxEXPAND, 5 ); - - + + this->SetSizer( bMainSizer ); this->Layout(); bMainSizer->Fit( this ); - + // Connect Events this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE::OnUpdateUI ) ); m_layerFilter->Connect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE::OnLayerFilterSelect ), NULL, this ); @@ -293,5 +299,5 @@ DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE::~DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS m_referenceFilter->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE::OnReferenceFilterText ), NULL, this ); m_footprintFilter->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE::OnFootprintFilterText ), NULL, this ); m_grid->Disconnect( wxEVT_SIZE, wxSizeEventHandler( DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE::OnSizeNetclassGrid ), NULL, this ); - + } diff --git a/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.fbp b/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.fbp index 3a5df6e879..cbed457f2a 100644 --- a/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.fbp +++ b/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -14,7 +14,6 @@ dialog_global_edit_text_and_graphics_base 1000 none - 1 dialog_global_edit_text_and_graphics @@ -53,6 +52,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OnUpdateUI @@ -63,7 +97,7 @@ 10 wxEXPAND|wxTOP|wxRIGHT|wxLEFT 0 - + wxID_ANY Scope @@ -71,11 +105,12 @@ wxVERTICAL 1 none - + + 5 wxEXPAND 0 - + 2 wxBOTH 0,1 @@ -87,11 +122,11 @@ none 0 0 - + 5 - wxALL + wxBOTTOM|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -149,13 +184,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + - + 5 - wxALL + wxBOTTOM|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -213,13 +272,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + - + 5 wxBOTTOM|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -277,13 +360,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + - + 5 wxBOTTOM|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -341,13 +448,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + - + 5 wxBOTTOM|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -405,23 +536,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + - + 5 wxEXPAND 1 - + 0 protected 0 - + 5 wxBOTTOM|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -479,6 +634,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -486,10 +665,20 @@ - 10 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT + 5 + wxTOP 0 - + + 0 + protected + 0 + + + + 10 + wxEXPAND|wxRIGHT|wxLEFT + 0 + wxID_ANY Filters @@ -497,11 +686,12 @@ wxVERTICAL 1 none - + + 5 wxEXPAND|wxRIGHT 0 - + 3 wxBOTH 1 @@ -512,12 +702,12 @@ wxFLEX_GROWMODE_SPECIFIED none 0 - 3 - + 1 + 5 wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -575,13 +765,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + - + 5 wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT 0 - + 1 1 1 @@ -640,24 +854,49 @@ + OnLayerFilterSelect + + + + + + + + + + + + + + + + + + + + + + + + - + 60 wxEXPAND|wxRIGHT|wxLEFT 0 - + 0 protected 0 - + 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -715,11 +954,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + 5 - wxEXPAND|wxLEFT + wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM|wxLEFT 0 1 @@ -779,24 +1042,50 @@ + + + + + + + + + + + + + + + + + + + + + + OnReferenceFilterText + + + + - + 5 wxEXPAND 1 - + 0 protected 0 - + 5 wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL 0 - + 1 1 1 @@ -854,13 +1143,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + - + 5 - wxEXPAND|wxBOTTOM|wxLEFT + wxEXPAND|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL 0 - + 1 1 1 @@ -918,14 +1231,40 @@ + + + + + + + + + + + + + + + + + + + + + + OnFootprintFilterText + + + + - + 5 wxEXPAND 1 - + 0 protected 0 @@ -935,11 +1274,21 @@ + + 5 + wxTOP + 0 + + 0 + protected + 0 + + 10 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxRIGHT|wxLEFT 1 - + wxID_ANY Action @@ -947,9 +1296,10 @@ wxVERTICAL 1 none + 5 - wxBOTTOM|wxRIGHT|wxTOP + wxALIGN_CENTER_VERTICAL|wxRIGHT 0 1 @@ -1009,13 +1359,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + - - 15 + + 12 wxEXPAND|wxBOTTOM|wxLEFT 1 - + 1 1 1 @@ -1066,16 +1440,39 @@ wxTAB_TRAVERSAL - + + + + + + + + + + + + + + + + + + + + + + + + bSizer2 wxVERTICAL none - + 2 wxEXPAND|wxTOP 1 - + 5 wxBOTH @@ -1086,7 +1483,7 @@ wxFLEX_GROWMODE_SPECIFIED none 0 - 3 + 2 5 wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT @@ -1120,7 +1517,6 @@ 0 wxID_ANY Layer: - 0 0 @@ -1146,6 +1542,29 @@ -1 + + + + + + + + + + + + + + + + + + + + + + + @@ -1211,6 +1630,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1235,7 +1680,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 1 @@ -1295,6 +1740,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -1330,7 +1799,6 @@ 0 wxID_ANY Line thickness: - 0 0 @@ -1356,6 +1824,29 @@ -1 + + + + + + + + + + + + + + + + + + + + + + + @@ -1420,6 +1911,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1455,7 +1973,6 @@ 0 wxID_ANY unit - 0 0 @@ -1481,6 +1998,29 @@ -1 + + + + + + + + + + + + + + + + + + + + + + + @@ -1586,7 +2126,6 @@ 0 wxID_ANY Text width: - 0 0 @@ -1612,6 +2151,29 @@ -1 + + + + + + + + + + + + + + + + + + + + + + + @@ -1676,6 +2238,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1711,7 +2300,6 @@ 0 wxID_ANY unit - 0 0 @@ -1737,6 +2325,29 @@ -1 + + + + + + + + + + + + + + + + + + + + + + + @@ -1811,6 +2422,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -1846,7 +2481,6 @@ 0 wxID_ANY Text height: - 0 0 @@ -1872,6 +2506,29 @@ -1 + + + + + + + + + + + + + + + + + + + + + + + @@ -1936,6 +2593,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1971,7 +2655,6 @@ 0 wxID_ANY unit - 0 0 @@ -1997,6 +2680,29 @@ -1 + + + + + + + + + + + + + + + + + + + + + + + @@ -2071,6 +2777,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -2106,7 +2836,6 @@ 0 wxID_ANY Text thickness: - 0 0 @@ -2132,6 +2861,29 @@ -1 + + + + + + + + + + + + + + + + + + + + + + + @@ -2196,6 +2948,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2231,7 +3010,6 @@ 0 wxID_ANY unit - 0 0 @@ -2257,6 +3035,29 @@ -1 + + + + + + + + + + + + + + + + + + + + + + + @@ -2264,11 +3065,11 @@ - + 5 - wxTOP|wxBOTTOM + wxBOTTOM 0 - + 1 1 1 @@ -2326,6 +3127,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -2351,13 +3176,13 @@ ,90,90,11,70,0 wxALIGN_LEFT - wxALIGN_CENTER + wxALIGN_CENTRE 0 1 - wxALIGN_CENTER + wxALIGN_CENTRE 0 - wxALIGN_CENTER + wxALIGN_CENTRE 7 120,110,110,110,110,60,80 @@ -2400,10 +3225,10 @@ 1 Resizable - wxALIGN_CENTER + wxALIGN_CENTRE 0 - wxALIGN_CENTER + wxALIGN_CENTRE 6 1 @@ -2414,14 +3239,68 @@ wxBORDER_SIMPLE + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OnSizeNetclassGrid + - + 5 wxEXPAND|wxBOTTOM 0 - + 0 protected 0 @@ -2445,6 +3324,14 @@ m_sdbSizerButtons protected + + + + + + + + diff --git a/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.h b/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.h index b125260a2a..8b107691e2 100644 --- a/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.h +++ b/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.h @@ -1,11 +1,12 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 1 2018) +// C++ code generated with wxFormBuilder (version Dec 30 2017) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#pragma once +#ifndef __DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE_H__ +#define __DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE_H__ #include #include @@ -41,7 +42,7 @@ class PCB_LAYER_BOX_SELECTOR; class DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE : public DIALOG_SHIM { private: - + protected: wxCheckBox* m_references; wxCheckBox* m_boardText; @@ -79,19 +80,20 @@ class DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE : public DIALOG_SHIM wxStdDialogButtonSizer* m_sdbSizerButtons; wxButton* m_sdbSizerButtonsOK; wxButton* m_sdbSizerButtonsCancel; - + // Virtual event handlers, overide them in your derived class virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); } virtual void OnLayerFilterSelect( wxCommandEvent& event ) { event.Skip(); } virtual void OnReferenceFilterText( wxCommandEvent& event ) { event.Skip(); } virtual void OnFootprintFilterText( wxCommandEvent& event ) { event.Skip(); } virtual void OnSizeNetclassGrid( wxSizeEvent& event ) { event.Skip(); } - - + + public: - - DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Edit Text and Graphic Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + + DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Edit Text and Graphic Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE(); - + }; +#endif //__DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE_H__ diff --git a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp index 2db8f75458..6f608a96aa 100644 --- a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp +++ b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp @@ -40,13 +40,13 @@ DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE sbScope->Add( fgSizer1, 0, wxEXPAND, 5 ); - bMainSizer->Add( sbScope, 0, wxALL|wxEXPAND, 5 ); + bMainSizer->Add( sbScope, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 ); wxStaticBoxSizer* sbFilters; sbFilters = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Filters") ), wxVERTICAL ); wxFlexGridSizer* fgSizer3; - fgSizer3 = new wxFlexGridSizer( 0, 3, 3, 0 ); + fgSizer3 = new wxFlexGridSizer( 0, 3, 2, 0 ); fgSizer3->AddGrowableCol( 1 ); fgSizer3->AddGrowableCol( 2 ); fgSizer3->SetFlexibleDirection( wxHORIZONTAL ); @@ -85,14 +85,14 @@ DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE sbFilters->Add( fgSizer3, 1, wxEXPAND, 5 ); - bMainSizer->Add( sbFilters, 0, wxALL|wxEXPAND, 5 ); + bMainSizer->Add( sbFilters, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 ); wxStaticBoxSizer* sbAction; sbAction = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Action") ), wxVERTICAL ); m_setToSpecifiedValues = new wxRadioButton( sbAction->GetStaticBox(), ID_SPECIFIED_NET_TO_SPECIFIED_VALUES, _("Set to specified values:"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); m_setToSpecifiedValues->SetValue( true ); - sbAction->Add( m_setToSpecifiedValues, 0, wxTOP|wxBOTTOM, 5 ); + sbAction->Add( m_setToSpecifiedValues, 0, wxBOTTOM, 5 ); wxBoxSizer* bSizerTrackViaPopups; bSizerTrackViaPopups = new wxBoxSizer( wxHORIZONTAL ); @@ -154,7 +154,7 @@ DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE sbAction->Add( 0, 0, 1, wxEXPAND|wxTOP, 5 ); - bMainSizer->Add( sbAction, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); + bMainSizer->Add( sbAction, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 ); m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); diff --git a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.fbp b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.fbp index ffc8179d02..582073b870 100644 --- a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.fbp +++ b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.fbp @@ -94,8 +94,8 @@ wxVERTICAL none - 5 - wxALL|wxEXPAND + 10 + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 0 wxID_ANY @@ -303,8 +303,8 @@ - 5 - wxALL|wxEXPAND + 10 + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 0 wxID_ANY @@ -330,7 +330,7 @@ wxFLEX_GROWMODE_SPECIFIED none 0 - 3 + 2 5 wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT @@ -894,7 +894,7 @@ - 5 + 10 wxEXPAND|wxTOP|wxRIGHT|wxLEFT 1 @@ -908,7 +908,7 @@ 5 - wxTOP|wxBOTTOM + wxBOTTOM 0 1