diff --git a/pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp b/pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp index dcc5e6b923..8d4eb78a2d 100644 --- a/pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp +++ b/pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp @@ -238,6 +238,9 @@ bool DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS::TransferDataToWindow() m_visible->Set3StateValue( wxCHK_UNDETERMINED ); m_LayerCtrl->SetLayerSelection( UNDEFINED_LAYER ); + wxCommandEvent dummy; + onActionButtonChange( dummy ); + #define SET_INT_VALUE( aRow, aCol, aValue ) \ m_grid->SetCellValue( aRow, aCol, m_parent->StringFromValue( aValue, true ) ) @@ -309,10 +312,19 @@ void DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS::onActionButtonChange( wxCommandEvent& // Update the UNIT_BINDER controls if the action to take is changed bool enable = m_setToSpecifiedValues->GetValue(); + m_LayerLabel->Enable( enable ); + m_LayerCtrl->Enable( enable ); + m_lineWidth.Enable( enable ); m_textWidth.Enable( enable ); m_textHeight.Enable( enable ); m_thickness.Enable( enable ); + + m_fontLabel->Enable( enable ); + m_fontCtrl->Enable( enable ); + + enable = !enable; + m_grid->Enable( enable ); } 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 18c1e393ac..1a82670129 100644 --- a/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp +++ b/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.cpp @@ -231,14 +231,14 @@ DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE::DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_ 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 ); + fgSizer1->Add( m_ThicknessLabel, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); m_ThicknessCtrl = new wxTextCtrl( m_specifiedValues, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer1->Add( m_ThicknessCtrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + fgSizer1->Add( m_ThicknessCtrl, 0, wxEXPAND|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 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 ); + fgSizer1->Add( m_ThicknessUnit, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); bSizer2->Add( fgSizer1, 1, wxEXPAND|wxTOP, 2 ); @@ -247,7 +247,7 @@ DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE::DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_ m_specifiedValues->SetSizer( bSizer2 ); m_specifiedValues->Layout(); bSizer2->Fit( m_specifiedValues ); - sbAction->Add( m_specifiedValues, 0, wxEXPAND|wxBOTTOM|wxLEFT, 12 ); + sbAction->Add( m_specifiedValues, 0, wxEXPAND|wxBOTTOM|wxLEFT, 18 ); 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|wxEXPAND, 5 ); @@ -285,7 +285,7 @@ DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE::DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_ 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 ); - sbAction->Add( m_grid, 0, wxEXPAND|wxLEFT, 15 ); + sbAction->Add( m_grid, 0, wxEXPAND|wxLEFT, 22 ); sbAction->Add( 0, 0, 0, wxEXPAND|wxBOTTOM, 5 ); 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 bb184ee205..104fc60fda 100644 --- a/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.fbp +++ b/pcbnew/dialogs/dialog_global_edit_text_and_graphics_base.fbp @@ -1212,7 +1212,7 @@ - 12 + 18 wxEXPAND|wxBOTTOM|wxLEFT 0 @@ -2491,7 +2491,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 1 @@ -2552,7 +2552,7 @@ 5 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + wxEXPAND|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL 0 1 @@ -2616,7 +2616,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxRIGHT 0 1 @@ -2746,7 +2746,7 @@ - 15 + 22 wxEXPAND|wxLEFT 0 diff --git a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp index 0c8fc04576..6a1dc83c14 100644 --- a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp +++ b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp @@ -73,7 +73,7 @@ public: ~DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS() override; protected: - void onSpecifiedValuesUpdateUi( wxUpdateUIEvent& event ) override; + void onActionButtonChange( wxCommandEvent& event ) override; void OnSizeNetclassGrid( wxSizeEvent& event ) override; void OnNetclassFilterSelect( wxCommandEvent& event ) override @@ -140,16 +140,16 @@ DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS::DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS( PCB_EDIT buildFilterLists(); - m_parent->UpdateTrackWidthSelectBox( m_trackWidthSelectBox, false ); - m_trackWidthSelectBox->Append( INDETERMINATE_ACTION ); - m_parent->UpdateViaSizeSelectBox( m_viaSizesSelectBox, false ); - m_viaSizesSelectBox->Append( INDETERMINATE_ACTION ); + m_parent->UpdateTrackWidthSelectBox( m_trackWidthCtrl, false ); + m_trackWidthCtrl->Append( INDETERMINATE_ACTION ); + m_parent->UpdateViaSizeSelectBox( m_viaSizesCtrl, false ); + m_viaSizesCtrl->Append( INDETERMINATE_ACTION ); - m_layerBox->SetBoardFrame( m_parent ); - m_layerBox->SetLayersHotkeys( false ); - m_layerBox->SetNotAllowedLayerSet( LSET::AllNonCuMask() ); - m_layerBox->SetUndefinedLayerName( INDETERMINATE_ACTION ); - m_layerBox->Resync(); + m_layerCtrl->SetBoardFrame( m_parent ); + m_layerCtrl->SetLayersHotkeys( false ); + m_layerCtrl->SetNotAllowedLayerSet( LSET::AllNonCuMask() ); + m_layerCtrl->SetUndefinedLayerName( INDETERMINATE_ACTION ); + m_layerCtrl->Resync(); m_netclassGrid->SetDefaultCellFont( KIUI::GetInfoFont( this ) ); buildNetclassesGrid(); @@ -198,16 +198,16 @@ DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS::~DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS() void DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS::onUnitsChanged( wxCommandEvent& aEvent ) { - int trackSel = m_trackWidthSelectBox->GetSelection(); - int viaSel = m_viaSizesSelectBox->GetSelection(); + int trackSel = m_trackWidthCtrl->GetSelection(); + int viaSel = m_viaSizesCtrl->GetSelection(); - m_parent->UpdateTrackWidthSelectBox( m_trackWidthSelectBox, false ); - m_trackWidthSelectBox->Append( INDETERMINATE_ACTION ); - m_parent->UpdateViaSizeSelectBox( m_viaSizesSelectBox, false ); - m_viaSizesSelectBox->Append( INDETERMINATE_ACTION ); + m_parent->UpdateTrackWidthSelectBox( m_trackWidthCtrl, false ); + m_trackWidthCtrl->Append( INDETERMINATE_ACTION ); + m_parent->UpdateViaSizeSelectBox( m_viaSizesCtrl, false ); + m_viaSizesCtrl->Append( INDETERMINATE_ACTION ); - m_trackWidthSelectBox->SetSelection( trackSel ); - m_viaSizesSelectBox->SetSelection( viaSel ); + m_trackWidthCtrl->SetSelection( trackSel ); + m_viaSizesCtrl->SetSelection( viaSel ); m_netclassGrid->ClearGrid(); buildNetclassesGrid(); @@ -334,20 +334,33 @@ bool DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS::TransferDataToWindow() m_viaSizeFilter.SetValue( g_viaSizeFilter ); } - m_trackWidthSelectBox->SetSelection( (int) m_trackWidthSelectBox->GetCount() - 1 ); - m_viaSizesSelectBox->SetSelection( (int) m_viaSizesSelectBox->GetCount() - 1 ); - m_layerBox->SetStringSelection( INDETERMINATE_ACTION ); + m_trackWidthCtrl->SetSelection( (int) m_trackWidthCtrl->GetCount() - 1 ); + m_viaSizesCtrl->SetSelection( (int) m_viaSizesCtrl->GetCount() - 1 ); + m_layerCtrl->SetStringSelection( INDETERMINATE_ACTION ); m_selectedItemsFilter->SetValue( g_filterSelected ); + wxCommandEvent dummy; + onActionButtonChange( dummy ); + return true; } -void DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS::onSpecifiedValuesUpdateUi( wxUpdateUIEvent& event ) +void DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS::onActionButtonChange( wxCommandEvent& event ) { // Enable the items in the use specified values section - event.Enable( m_setToSpecifiedValues->GetValue() ); + bool enable = m_setToSpecifiedValues->GetValue(); + + m_trackWidthLabel->Enable( enable ); + m_trackWidthCtrl->Enable( enable ); + m_viaSizeLabel->Enable( enable ); + m_viaSizesCtrl->Enable( enable ); + m_layerLabel->Enable( enable ); + m_layerCtrl->Enable( enable ); + + enable = !enable; + m_netclassGrid->Enable( enable ); } @@ -361,11 +374,10 @@ void DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS::processItem( PICKED_ITEMS_LIST* aUndoLi if( m_setToSpecifiedValues->GetValue() ) { - if( ( isArc || isTrack ) - && m_trackWidthSelectBox->GetStringSelection() != INDETERMINATE_ACTION ) + if( ( isArc || isTrack ) && m_trackWidthCtrl->GetStringSelection() != INDETERMINATE_ACTION ) { unsigned int prevTrackWidthIndex = brdSettings.GetTrackWidthIndex(); - int trackWidthIndex = m_trackWidthSelectBox->GetSelection(); + int trackWidthIndex = m_trackWidthCtrl->GetSelection(); if( trackWidthIndex >= 0 ) brdSettings.SetTrackWidthIndex( static_cast( trackWidthIndex ) ); @@ -374,10 +386,10 @@ void DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS::processItem( PICKED_ITEMS_LIST* aUndoLi brdSettings.SetTrackWidthIndex( prevTrackWidthIndex ); } - else if( isVia && m_viaSizesSelectBox->GetStringSelection() != INDETERMINATE_ACTION ) + else if( isVia && m_viaSizesCtrl->GetStringSelection() != INDETERMINATE_ACTION ) { unsigned int prevViaSizeIndex = brdSettings.GetViaSizeIndex(); - int viaSizeIndex = m_viaSizesSelectBox->GetSelection(); + int viaSizeIndex = m_viaSizesCtrl->GetSelection(); if( viaSizeIndex >= 0 ) brdSettings.SetViaSizeIndex( static_cast( viaSizeIndex ) ); @@ -387,7 +399,7 @@ void DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS::processItem( PICKED_ITEMS_LIST* aUndoLi brdSettings.SetViaSizeIndex( prevViaSizeIndex ); } - if( ( isArc || isTrack ) && m_layerBox->GetLayerSelection() != UNDEFINED_LAYER ) + if( ( isArc || isTrack ) && m_layerCtrl->GetLayerSelection() != UNDEFINED_LAYER ) { if( aUndoList->FindItem( aItem ) < 0 ) { @@ -396,7 +408,7 @@ void DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS::processItem( PICKED_ITEMS_LIST* aUndoLi aUndoList->PushItem( picker ); } - aItem->SetLayer( ToLAYER_ID( m_layerBox->GetLayerSelection() ) ); + aItem->SetLayer( ToLAYER_ID( m_layerCtrl->GetLayerSelection() ) ); m_parent->GetBoard()->GetConnectivity()->Update( aItem ); } } 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 559bfefc99..4f14b67d1e 100644 --- a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp +++ b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp @@ -144,41 +144,41 @@ DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE fgSizerTrackViaPopups->SetFlexibleDirection( wxHORIZONTAL ); fgSizerTrackViaPopups->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_NONE ); - m_staticTextTrackWidth = new wxStaticText( sbAction->GetStaticBox(), wxID_ANY, _("Track Width"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticTextTrackWidth->Wrap( -1 ); - fgSizerTrackViaPopups->Add( m_staticTextTrackWidth, 0, wxRIGHT|wxLEFT|wxALIGN_BOTTOM, 5 ); + m_trackWidthLabel = new wxStaticText( sbAction->GetStaticBox(), wxID_ANY, _("Track width:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_trackWidthLabel->Wrap( -1 ); + fgSizerTrackViaPopups->Add( m_trackWidthLabel, 0, wxRIGHT|wxLEFT|wxALIGN_BOTTOM, 5 ); - m_staticTextViaSize = new wxStaticText( sbAction->GetStaticBox(), wxID_ANY, _("Via Size"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticTextViaSize->Wrap( -1 ); - fgSizerTrackViaPopups->Add( m_staticTextViaSize, 0, wxRIGHT|wxLEFT|wxALIGN_BOTTOM, 5 ); + m_viaSizeLabel = new wxStaticText( sbAction->GetStaticBox(), wxID_ANY, _("Via size:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_viaSizeLabel->Wrap( -1 ); + fgSizerTrackViaPopups->Add( m_viaSizeLabel, 0, wxRIGHT|wxLEFT|wxALIGN_BOTTOM, 5 ); - m_staticTextLayer = new wxStaticText( sbAction->GetStaticBox(), wxID_ANY, _("Layer"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticTextLayer->Wrap( -1 ); - fgSizerTrackViaPopups->Add( m_staticTextLayer, 0, wxRIGHT|wxLEFT|wxALIGN_BOTTOM, 5 ); + m_layerLabel = new wxStaticText( sbAction->GetStaticBox(), wxID_ANY, _("Layer:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_layerLabel->Wrap( -1 ); + fgSizerTrackViaPopups->Add( m_layerLabel, 0, wxRIGHT|wxLEFT|wxALIGN_BOTTOM, 5 ); - wxArrayString m_trackWidthSelectBoxChoices; - m_trackWidthSelectBox = new wxChoice( sbAction->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_trackWidthSelectBoxChoices, 0 ); - m_trackWidthSelectBox->SetSelection( 0 ); - fgSizerTrackViaPopups->Add( m_trackWidthSelectBox, 4, wxEXPAND|wxRIGHT, 5 ); + wxArrayString m_trackWidthCtrlChoices; + m_trackWidthCtrl = new wxChoice( sbAction->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_trackWidthCtrlChoices, 0 ); + m_trackWidthCtrl->SetSelection( 0 ); + fgSizerTrackViaPopups->Add( m_trackWidthCtrl, 4, wxEXPAND|wxRIGHT, 5 ); - wxArrayString m_viaSizesSelectBoxChoices; - m_viaSizesSelectBox = new wxChoice( sbAction->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_viaSizesSelectBoxChoices, 0 ); - m_viaSizesSelectBox->SetSelection( 0 ); - fgSizerTrackViaPopups->Add( m_viaSizesSelectBox, 5, wxEXPAND|wxLEFT|wxRIGHT, 5 ); + wxArrayString m_viaSizesCtrlChoices; + m_viaSizesCtrl = new wxChoice( sbAction->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_viaSizesCtrlChoices, 0 ); + m_viaSizesCtrl->SetSelection( 0 ); + fgSizerTrackViaPopups->Add( m_viaSizesCtrl, 5, wxEXPAND|wxLEFT|wxRIGHT, 5 ); - m_layerBox = new PCB_LAYER_BOX_SELECTOR( sbAction->GetStaticBox(), wxID_ANY, _("Combo!"), wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); - fgSizerTrackViaPopups->Add( m_layerBox, 0, wxRIGHT|wxLEFT, 3 ); + m_layerCtrl = new PCB_LAYER_BOX_SELECTOR( sbAction->GetStaticBox(), wxID_ANY, _("Combo!"), wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); + fgSizerTrackViaPopups->Add( m_layerCtrl, 0, wxRIGHT|wxLEFT, 3 ); - sbAction->Add( fgSizerTrackViaPopups, 1, wxBOTTOM|wxEXPAND|wxLEFT, 15 ); + sbAction->Add( fgSizerTrackViaPopups, 0, wxBOTTOM|wxEXPAND|wxLEFT, 22 ); m_setToNetclassValues = new wxRadioButton( sbAction->GetStaticBox(), ID_SPECIFIED_NET_TO_NETCLASS_VALUES, _("Set to net class values:"), wxDefaultPosition, wxDefaultSize, 0 ); sbAction->Add( m_setToNetclassValues, 0, wxTOP|wxBOTTOM, 5 ); - m_netclassGrid = new wxGrid( sbAction->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_DEFAULT|wxVSCROLL ); + m_netclassGrid = new wxGrid( sbAction->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_SIMPLE|wxVSCROLL ); // Grid - m_netclassGrid->CreateGrid( 1, 6 ); + m_netclassGrid->CreateGrid( 6, 6 ); m_netclassGrid->EnableEditing( false ); m_netclassGrid->EnableGridLines( true ); m_netclassGrid->EnableDragGridSize( false ); @@ -207,10 +207,10 @@ DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE m_netclassGrid->SetDefaultCellBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) ); m_netclassGrid->SetDefaultCellFont( wxFont( 11, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); m_netclassGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER ); - sbAction->Add( m_netclassGrid, 0, wxEXPAND|wxLEFT, 15 ); + sbAction->Add( m_netclassGrid, 1, wxEXPAND|wxLEFT, 22 ); - sbAction->Add( 0, 0, 1, wxEXPAND|wxTOP, 5 ); + sbAction->Add( 0, 5, 0, wxEXPAND, 5 ); bMainSizer->Add( sbAction, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 ); @@ -234,8 +234,8 @@ DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE m_layerFilter->Connect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnLayerFilterSelect ), NULL, this ); m_trackWidthFilterCtrl->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnTrackWidthText ), NULL, this ); m_viaSizeFilterCtrl->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnViaSizeText ), NULL, this ); - m_trackWidthSelectBox->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::onSpecifiedValuesUpdateUi ), NULL, this ); - m_viaSizesSelectBox->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::onSpecifiedValuesUpdateUi ), NULL, this ); + m_setToSpecifiedValues->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::onActionButtonChange ), NULL, this ); + m_setToNetclassValues->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::onActionButtonChange ), NULL, this ); m_netclassGrid->Connect( wxEVT_SIZE, wxSizeEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnSizeNetclassGrid ), NULL, this ); } @@ -246,8 +246,8 @@ DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::~DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BAS m_layerFilter->Disconnect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnLayerFilterSelect ), NULL, this ); m_trackWidthFilterCtrl->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnTrackWidthText ), NULL, this ); m_viaSizeFilterCtrl->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnViaSizeText ), NULL, this ); - m_trackWidthSelectBox->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::onSpecifiedValuesUpdateUi ), NULL, this ); - m_viaSizesSelectBox->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::onSpecifiedValuesUpdateUi ), NULL, this ); + m_setToSpecifiedValues->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::onActionButtonChange ), NULL, this ); + m_setToNetclassValues->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::onActionButtonChange ), NULL, this ); m_netclassGrid->Disconnect( wxEVT_SIZE, wxSizeEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnSizeNetclassGrid ), NULL, this ); } 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 b7ed364bcc..0c3922e060 100644 --- a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.fbp +++ b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.fbp @@ -1221,12 +1221,13 @@ + onActionButtonChange - 15 + 22 wxBOTTOM|wxEXPAND|wxLEFT - 1 + 0 3 wxHORIZONTAL @@ -1271,7 +1272,7 @@ 0 0 wxID_ANY - Track Width + Track width: 0 0 @@ -1280,7 +1281,7 @@ 0 1 - m_staticTextTrackWidth + m_trackWidthLabel 1 @@ -1332,7 +1333,7 @@ 0 0 wxID_ANY - Via Size + Via size: 0 0 @@ -1341,7 +1342,7 @@ 0 1 - m_staticTextViaSize + m_viaSizeLabel 1 @@ -1393,7 +1394,7 @@ 0 0 wxID_ANY - Layer + Layer: 0 0 @@ -1402,7 +1403,7 @@ 0 1 - m_staticTextLayer + m_layerLabel 1 @@ -1462,7 +1463,7 @@ 0 1 - m_trackWidthSelectBox + m_trackWidthCtrl 1 @@ -1484,7 +1485,6 @@ - onSpecifiedValuesUpdateUi @@ -1527,7 +1527,7 @@ 0 1 - m_viaSizesSelectBox + m_viaSizesCtrl 1 @@ -1549,7 +1549,6 @@ - onSpecifiedValuesUpdateUi @@ -1592,7 +1591,7 @@ 0 1 - m_layerBox + m_layerCtrl 1 @@ -1681,12 +1680,13 @@ + onActionButtonChange - 15 + 22 wxEXPAND|wxLEFT - 0 + 1 1 1 @@ -1760,7 +1760,7 @@ wxALIGN_CENTER - 1 + 6 1 @@ -1768,16 +1768,16 @@ - wxBORDER_DEFAULT|wxVSCROLL + wxBORDER_SIMPLE|wxVSCROLL OnSizeNetclassGrid 5 - wxEXPAND|wxTOP - 1 + wxEXPAND + 0 - 0 + 5 protected 0 diff --git a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.h b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.h index ca2f70f8a8..2544da78bf 100644 --- a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.h +++ b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.h @@ -60,12 +60,12 @@ class DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE : public DIALOG_SHIM wxStaticText* m_viaSizeFilterUnits; wxCheckBox* m_selectedItemsFilter; wxRadioButton* m_setToSpecifiedValues; - wxStaticText* m_staticTextTrackWidth; - wxStaticText* m_staticTextViaSize; - wxStaticText* m_staticTextLayer; - wxChoice* m_trackWidthSelectBox; - wxChoice* m_viaSizesSelectBox; - PCB_LAYER_BOX_SELECTOR* m_layerBox; + wxStaticText* m_trackWidthLabel; + wxStaticText* m_viaSizeLabel; + wxStaticText* m_layerLabel; + wxChoice* m_trackWidthCtrl; + wxChoice* m_viaSizesCtrl; + PCB_LAYER_BOX_SELECTOR* m_layerCtrl; wxRadioButton* m_setToNetclassValues; wxGrid* m_netclassGrid; wxStdDialogButtonSizer* m_sdbSizer; @@ -77,7 +77,7 @@ class DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE : public DIALOG_SHIM virtual void OnLayerFilterSelect( wxCommandEvent& event ) { event.Skip(); } virtual void OnTrackWidthText( wxCommandEvent& event ) { event.Skip(); } virtual void OnViaSizeText( wxCommandEvent& event ) { event.Skip(); } - virtual void onSpecifiedValuesUpdateUi( wxUpdateUIEvent& event ) { event.Skip(); } + virtual void onActionButtonChange( wxCommandEvent& event ) { event.Skip(); } virtual void OnSizeNetclassGrid( wxSizeEvent& event ) { event.Skip(); }