From cb24fb2588418f1c44e2f2b9a4b56913b98db03d Mon Sep 17 00:00:00 2001 From: charras Date: Thu, 12 Nov 2009 14:55:33 +0000 Subject: [PATCH] convert dialog_global_edit_tracks_and_vias to Gnome standards. --- pcbnew/dialog_global_edit_tracks_and_vias.cpp | 17 +- pcbnew/dialog_global_edit_tracks_and_vias.h | 2 + ...ialog_global_edit_tracks_and_vias_base.cpp | 139 +- ...ialog_global_edit_tracks_and_vias_base.fbp | 1557 ++++++++--------- .../dialog_global_edit_tracks_and_vias_base.h | 31 +- 5 files changed, 809 insertions(+), 937 deletions(-) diff --git a/pcbnew/dialog_global_edit_tracks_and_vias.cpp b/pcbnew/dialog_global_edit_tracks_and_vias.cpp index c030311624..76a02b376f 100644 --- a/pcbnew/dialog_global_edit_tracks_and_vias.cpp +++ b/pcbnew/dialog_global_edit_tracks_and_vias.cpp @@ -27,10 +27,11 @@ DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS::DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS( { m_Parent = aParent; m_Netcode = aNetcode; + m_OptionID = 0; MyInit(); - Layout(); GetSizer()->Fit( this ); GetSizer()->SetSizeHints( this ); + Layout(); } @@ -55,11 +56,17 @@ void DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS::MyInit() netclass = netclasses.Find( board->m_CurrentNetClassName ); } - // Enable/disable the option "copy current to net" if we ause only default netclass values + // Disable the option "copy current to net" if we have only default netclass values if( !board->m_TrackWidthSelector && !board->m_ViaSizeSelector ) { m_Net2CurrValueButton->Enable( false ); - m_Net2CurrValueText->Enable( false ); + m_OptionID = ID_NETCLASS_VALUES_TO_CURRENT_NET; + m_NetUseNetclassValueButton->SetValue(true); + } + else + { + m_OptionID = ID_CURRENT_VALUES_TO_CURRENT_NET; + m_Net2CurrValueButton->SetValue(true); } // Display current values, and current netclass values: @@ -121,7 +128,7 @@ void DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS::MyInit() msg = _( "Default" ); m_gridDisplayCurrentSettings->SetCellValue( 1, 4, msg ); - // Set all cells Roead Only + // Set all cells Read Only for( int ii = 0; ii < m_gridDisplayCurrentSettings->GetNumberRows(); ii++ ) { for( int jj = 0; jj < m_gridDisplayCurrentSettings->GetNumberCols(); jj++ ) @@ -138,7 +145,7 @@ void DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS::OnOkClick( wxCommandEvent& event ) { bool change = false; - switch( event.GetId() ) + switch( m_OptionID ) { case ID_CURRENT_VALUES_TO_CURRENT_NET: if( !IsOK( this, diff --git a/pcbnew/dialog_global_edit_tracks_and_vias.h b/pcbnew/dialog_global_edit_tracks_and_vias.h index 79ba64973a..1fa48d76ba 100644 --- a/pcbnew/dialog_global_edit_tracks_and_vias.h +++ b/pcbnew/dialog_global_edit_tracks_and_vias.h @@ -36,12 +36,14 @@ class DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS : private: WinEDA_PcbFrame* m_Parent; int m_Netcode; + int m_OptionID; public: DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS( WinEDA_PcbFrame* aParent, int aNetcode ); ~DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS() {}; // Virtual event handlers, overided here + void OnSelectionClick( wxCommandEvent& event ){ m_OptionID = event.GetId(); } void OnOkClick( wxCommandEvent& event ); void OnCancelClick( wxCommandEvent& event ); void MyInit(); diff --git a/pcbnew/dialog_global_edit_tracks_and_vias_base.cpp b/pcbnew/dialog_global_edit_tracks_and_vias_base.cpp index 968a8c7fe9..2f1e49db18 100644 --- a/pcbnew/dialog_global_edit_tracks_and_vias_base.cpp +++ b/pcbnew/dialog_global_edit_tracks_and_vias_base.cpp @@ -16,8 +16,23 @@ DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE wxBoxSizer* bMainSizer; bMainSizer = new wxBoxSizer( wxVERTICAL ); - wxStaticBoxSizer* sbCurrSettingsSizer; - sbCurrSettingsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Current Settings") ), wxVERTICAL ); + wxBoxSizer* bSizerCurrSettings; + bSizerCurrSettings = new wxBoxSizer( wxVERTICAL ); + + m_staticText12 = new wxStaticText( this, wxID_ANY, _("Current Settings:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText12->Wrap( -1 ); + m_staticText12->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + + bSizerCurrSettings->Add( m_staticText12, 0, wxALL, 5 ); + + wxBoxSizer* bSizerCurrSettingsLeft; + bSizerCurrSettingsLeft = new wxBoxSizer( wxHORIZONTAL ); + + + bSizerCurrSettingsLeft->Add( 20, 0, 0, 0, 5 ); + + wxBoxSizer* bSizerGrids; + bSizerGrids = new wxBoxSizer( wxVERTICAL ); wxFlexGridSizer* fgSizeNetInfo; fgSizeNetInfo = new wxFlexGridSizer( 2, 2, 0, 0 ); @@ -26,17 +41,17 @@ DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE m_CurrentNetText = new wxStaticText( this, wxID_ANY, _("Current Net:"), wxDefaultPosition, wxDefaultSize, 0 ); m_CurrentNetText->Wrap( -1 ); - fgSizeNetInfo->Add( m_CurrentNetText, 0, wxALL|wxALIGN_RIGHT, 5 ); + fgSizeNetInfo->Add( m_CurrentNetText, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); m_CurrentNetName = new wxStaticText( this, wxID_ANY, _("NetName"), wxDefaultPosition, wxDefaultSize, 0 ); m_CurrentNetName->Wrap( -1 ); m_CurrentNetName->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - fgSizeNetInfo->Add( m_CurrentNetName, 0, wxALL, 5 ); + fgSizeNetInfo->Add( m_CurrentNetName, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); m_CurrentNetclassText = new wxStaticText( this, wxID_ANY, _("Current NetClass:"), wxDefaultPosition, wxDefaultSize, 0 ); m_CurrentNetclassText->Wrap( -1 ); - fgSizeNetInfo->Add( m_CurrentNetclassText, 0, wxALL|wxALIGN_RIGHT, 5 ); + fgSizeNetInfo->Add( m_CurrentNetclassText, 0, wxALL, 5 ); m_CurrentNetclassName = new wxStaticText( this, wxID_ANY, _("NetClassName"), wxDefaultPosition, wxDefaultSize, 0 ); m_CurrentNetclassName->Wrap( -1 ); @@ -44,7 +59,10 @@ DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE fgSizeNetInfo->Add( m_CurrentNetclassName, 0, wxALL, 5 ); - sbCurrSettingsSizer->Add( fgSizeNetInfo, 1, wxEXPAND, 5 ); + bSizerGrids->Add( fgSizeNetInfo, 1, wxEXPAND, 5 ); + + + bSizerGrids->Add( 10, 10, 0, 0, 5 ); m_gridDisplayCurrentSettings = new wxGrid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); @@ -79,92 +97,85 @@ DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE // Cell Defaults m_gridDisplayCurrentSettings->SetDefaultCellAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - sbCurrSettingsSizer->Add( m_gridDisplayCurrentSettings, 0, wxALL|wxEXPAND, 5 ); + bSizerGrids->Add( m_gridDisplayCurrentSettings, 0, wxALL|wxEXPAND, 5 ); - bMainSizer->Add( sbCurrSettingsSizer, 1, wxALL|wxEXPAND, 5 ); + bSizerCurrSettingsLeft->Add( bSizerGrids, 1, wxEXPAND, 5 ); + + bSizerCurrSettings->Add( bSizerCurrSettingsLeft, 1, wxEXPAND, 5 ); + + bMainSizer->Add( bSizerCurrSettings, 0, 0, 5 ); m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bMainSizer->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 ); + bMainSizer->Add( m_staticline1, 0, wxALL|wxEXPAND, 5 ); wxBoxSizer* bLowerSizer; - bLowerSizer = new wxBoxSizer( wxHORIZONTAL ); + bLowerSizer = new wxBoxSizer( wxVERTICAL ); - wxStaticBoxSizer* sbSizerCommands; - sbSizerCommands = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Options") ), wxVERTICAL ); + m_staticText11 = new wxStaticText( this, wxID_ANY, _("Global Edition Option:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText11->Wrap( -1 ); + m_staticText11->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - wxFlexGridSizer* fgSizer2; - fgSizer2 = new wxFlexGridSizer( 5, 2, 0, 0 ); - fgSizer2->SetFlexibleDirection( wxBOTH ); - fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + bLowerSizer->Add( m_staticText11, 0, wxALL, 5 ); - m_Net2CurrValueText = new wxStaticText( this, wxID_ANY, _("Set tracks and vias of the current Net to the current value"), wxDefaultPosition, wxDefaultSize, 0 ); - m_Net2CurrValueText->Wrap( -1 ); - fgSizer2->Add( m_Net2CurrValueText, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 ); + bMainSizer->Add( bLowerSizer, 0, wxALL|wxEXPAND, 5 ); - m_Net2CurrValueButton = new wxButton( this, ID_CURRENT_VALUES_TO_CURRENT_NET, _("Ok"), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer2->Add( m_Net2CurrValueButton, 0, wxALL|wxEXPAND, 5 ); + wxBoxSizer* bSizerOptions; + bSizerOptions = new wxBoxSizer( wxHORIZONTAL ); - m_staticText5 = new wxStaticText( this, wxID_ANY, _("Set tracks and vias of the current Net to the Netclass value"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText5->Wrap( -1 ); - fgSizer2->Add( m_staticText5, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); - m_button3 = new wxButton( this, ID_NETCLASS_VALUES_TO_CURRENT_NET, _("Ok"), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer2->Add( m_button3, 0, wxALL, 5 ); + bSizerOptions->Add( 20, 0, 0, 0, 5 ); - m_staticText6 = new wxStaticText( this, wxID_ANY, _("Set ALL tracks and vias to their Netclass value"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText6->Wrap( -1 ); - fgSizer2->Add( m_staticText6, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); + wxBoxSizer* bSizerRadioButtons; + bSizerRadioButtons = new wxBoxSizer( wxVERTICAL ); - m_button4 = new wxButton( this, ID_ALL_TRACKS_VIAS, _("Ok"), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer2->Add( m_button4, 0, wxALL, 5 ); + m_Net2CurrValueButton = new wxRadioButton( this, ID_CURRENT_VALUES_TO_CURRENT_NET, _("Set tracks and vias of the current Net to the current value"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizerRadioButtons->Add( m_Net2CurrValueButton, 0, wxALL, 5 ); - m_staticText7 = new wxStaticText( this, wxID_ANY, _("Set ALL vias (no track) to their Netclass value"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText7->Wrap( -1 ); - fgSizer2->Add( m_staticText7, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); + m_NetUseNetclassValueButton = new wxRadioButton( this, ID_NETCLASS_VALUES_TO_CURRENT_NET, _("Set tracks and vias of the current Net to the Netclass value"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizerRadioButtons->Add( m_NetUseNetclassValueButton, 0, wxALL, 5 ); - m_button5 = new wxButton( this, ID_ALL_VIAS, _("Ok"), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer2->Add( m_button5, 0, wxALL, 5 ); + m_radioBtn3 = new wxRadioButton( this, ID_ALL_TRACKS_VIAS, _("Set all tracks and vias to their Netclass value"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizerRadioButtons->Add( m_radioBtn3, 0, wxALL, 5 ); - m_staticText8 = new wxStaticText( this, wxID_ANY, _("Set ALL tracks (no via) to their Netclass value"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText8->Wrap( -1 ); - fgSizer2->Add( m_staticText8, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); + m_radioBtn4 = new wxRadioButton( this, ID_ALL_VIAS, _("Set all vias (no track) to their Netclass value"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizerRadioButtons->Add( m_radioBtn4, 0, wxALL, 5 ); - m_button6 = new wxButton( this, ID_ALL_TRACKS, _("Ok"), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer2->Add( m_button6, 0, wxALL, 5 ); + m_radioBtn5 = new wxRadioButton( this, ID_ALL_TRACKS, _("Set all tracks (no via) to their Netclass value"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizerRadioButtons->Add( m_radioBtn5, 0, wxALL, 5 ); - sbSizerCommands->Add( fgSizer2, 1, wxEXPAND, 5 ); + bSizerOptions->Add( bSizerRadioButtons, 1, wxEXPAND, 5 ); - bLowerSizer->Add( sbSizerCommands, 1, wxEXPAND, 5 ); + bMainSizer->Add( bSizerOptions, 0, wxEXPAND, 5 ); - wxBoxSizer* bbuttonsSizer; - bbuttonsSizer = new wxBoxSizer( wxVERTICAL ); - - m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); - bbuttonsSizer->Add( m_buttonCancel, 0, wxALL|wxEXPAND, 5 ); - - bLowerSizer->Add( bbuttonsSizer, 0, wxALIGN_CENTER_VERTICAL, 5 ); - - bMainSizer->Add( bLowerSizer, 1, wxEXPAND|wxALL, 5 ); + m_sdbSizer1 = new wxStdDialogButtonSizer(); + m_sdbSizer1OK = new wxButton( this, wxID_OK ); + m_sdbSizer1->AddButton( m_sdbSizer1OK ); + m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); + m_sdbSizer1->Realize(); + bMainSizer->Add( m_sdbSizer1, 0, wxEXPAND|wxALL, 5 ); this->SetSizer( bMainSizer ); this->Layout(); // Connect Events - m_Net2CurrValueButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnOkClick ), NULL, this ); - m_button3->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnOkClick ), NULL, this ); - m_button4->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnOkClick ), NULL, this ); - m_button5->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnOkClick ), NULL, this ); - m_button6->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnOkClick ), NULL, this ); - m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnCancelClick ), NULL, this ); + m_Net2CurrValueButton->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnSelectionClick ), NULL, this ); + m_NetUseNetclassValueButton->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnSelectionClick ), NULL, this ); + m_radioBtn3->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnSelectionClick ), NULL, this ); + m_radioBtn4->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnSelectionClick ), NULL, this ); + m_radioBtn5->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnSelectionClick ), NULL, this ); + m_sdbSizer1Cancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnCancelClick ), NULL, this ); + m_sdbSizer1OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnOkClick ), NULL, this ); } DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::~DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE() { // Disconnect Events - m_Net2CurrValueButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnOkClick ), NULL, this ); - m_button3->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnOkClick ), NULL, this ); - m_button4->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnOkClick ), NULL, this ); - m_button5->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnOkClick ), NULL, this ); - m_button6->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnOkClick ), NULL, this ); - m_buttonCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnCancelClick ), NULL, this ); + m_Net2CurrValueButton->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnSelectionClick ), NULL, this ); + m_NetUseNetclassValueButton->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnSelectionClick ), NULL, this ); + m_radioBtn3->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnSelectionClick ), NULL, this ); + m_radioBtn4->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnSelectionClick ), NULL, this ); + m_radioBtn5->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnSelectionClick ), NULL, this ); + m_sdbSizer1Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnCancelClick ), NULL, this ); + m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::OnOkClick ), NULL, this ); } diff --git a/pcbnew/dialog_global_edit_tracks_and_vias_base.fbp b/pcbnew/dialog_global_edit_tracks_and_vias_base.fbp index 5354463e05..c21199e07d 100644 --- a/pcbnew/dialog_global_edit_tracks_and_vias_base.fbp +++ b/pcbnew/dialog_global_edit_tracks_and_vias_base.fbp @@ -32,10 +32,10 @@ DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE - 711,418 + 711,376 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - + Global Edition of Tracks and Vias @@ -77,327 +77,42 @@ none 5 - wxALL|wxEXPAND - 1 - - wxID_ANY - Current Settings + + 0 + - sbCurrSettingsSizer + bSizerCurrSettings wxVERTICAL none - 5 - wxEXPAND - 1 - - 2 - wxBOTH - - - 0 - - fgSizeNetInfo - wxFLEX_GROWMODE_SPECIFIED - none - 2 - 0 - - 5 - wxALL|wxALIGN_RIGHT - 0 - - - - 1 - - - 0 - wxID_ANY - Current Net: - - - m_CurrentNetText - protected - - - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 0 - - - - 1 - - ,90,92,-1,70,0 - 0 - wxID_ANY - NetName - - - m_CurrentNetName - protected - - - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxALIGN_RIGHT - 0 - - - - 1 - - - 0 - wxID_ANY - Current NetClass: - - - m_CurrentNetclassText - protected - - - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 0 - - - - 1 - - ,90,92,-1,70,0 - 0 - wxID_ANY - NetClassName - - - m_CurrentNetclassName - protected - - - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxEXPAND + wxALL 0 - - 1 - 1 + - - - wxALIGN_CENTRE - - wxALIGN_CENTRE - wxALIGN_CENTRE - 30 - "Track size" "Via diameter" "Via drill" "uVia size" "uVia Drill" - wxALIGN_CENTRE - 5 - - 0 - 1 - 0 - 1 - 1 1 - - - 1 + ,90,92,-1,70,0 0 wxID_ANY - - - - 0 - 0 + Current Settings: - m_gridDisplayCurrentSettings + m_staticText12 protected - wxALIGN_CENTRE - 100 - "Netclass value" "Current value" - wxALIGN_CENTRE - - 2 + + -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -420,11 +135,386 @@ + + 5 + wxEXPAND + 1 + + + bSizerCurrSettingsLeft + wxHORIZONTAL + none + + 5 + + 0 + + 0 + protected + 20 + + + + 5 + wxEXPAND + 1 + + + bSizerGrids + wxVERTICAL + none + + 5 + wxEXPAND + 1 + + 2 + wxBOTH + + + 0 + + fgSizeNetInfo + wxFLEX_GROWMODE_SPECIFIED + none + 2 + 0 + + 5 + wxTOP|wxRIGHT|wxLEFT + 0 + + + + 1 + + + 0 + wxID_ANY + Current Net: + + + m_CurrentNetText + protected + + + + + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxTOP|wxRIGHT|wxLEFT + 0 + + + + 1 + + ,90,92,-1,70,0 + 0 + wxID_ANY + NetName + + + m_CurrentNetName + protected + + + + + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL + 0 + + + + 1 + + + 0 + wxID_ANY + Current NetClass: + + + m_CurrentNetclassText + protected + + + + + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL + 0 + + + + 1 + + ,90,92,-1,70,0 + 0 + wxID_ANY + NetClassName + + + m_CurrentNetclassName + protected + + + + + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + + 0 + + 10 + protected + 10 + + + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + + + + wxALIGN_CENTRE + + wxALIGN_CENTRE + wxALIGN_CENTRE + 30 + "Track size" "Via diameter" "Via drill" "uVia size" "uVia Drill" + wxALIGN_CENTRE + 5 + + + 0 + 1 + 0 + 1 + 1 + 1 + + + + 1 + 0 + wxID_ANY + + + + 0 + 0 + + + m_gridDisplayCurrentSettings + protected + + wxALIGN_CENTRE + 100 + "Netclass value" "Current value" + wxALIGN_CENTRE + + 2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 - wxEXPAND | wxALL + wxALL|wxEXPAND 0 @@ -473,596 +563,120 @@ 5 - wxEXPAND|wxALL - 1 + wxALL|wxEXPAND + 0 bLowerSizer + wxVERTICAL + none + + 5 + wxALL + 0 + + + + 1 + + ,90,92,-1,70,0 + 0 + wxID_ANY + Global Edition Option: + + + m_staticText11 + protected + + + + + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 0 + + + bSizerOptions wxHORIZONTAL none 5 - wxEXPAND - 1 - - wxID_ANY - Options - - sbSizerCommands - wxVERTICAL - none - - - 5 - wxEXPAND - 1 - - 2 - wxBOTH - - - 0 - - fgSizer2 - wxFLEX_GROWMODE_SPECIFIED - none - 5 - 0 - - 5 - wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL - 0 - - - - 1 - - - 0 - wxID_ANY - Set tracks and vias of the current Net to the current value - - - m_Net2CurrValueText - protected - - - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxEXPAND - 0 - - - - 0 - 1 - - - 0 - ID_CURRENT_VALUES_TO_CURRENT_NET - Ok - - - m_Net2CurrValueButton - protected - - - - - - - - - OnOkClick - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT - 0 - - - - 1 - - - 0 - wxID_ANY - Set tracks and vias of the current Net to the Netclass value - - - m_staticText5 - protected - - - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 0 - - - - 0 - 1 - - - 0 - ID_NETCLASS_VALUES_TO_CURRENT_NET - Ok - - - m_button3 - protected - - - - - - - - - OnOkClick - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT - 0 - - - - 1 - - - 0 - wxID_ANY - Set ALL tracks and vias to their Netclass value - - - m_staticText6 - protected - - - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 0 - - - - 0 - 1 - - - 0 - ID_ALL_TRACKS_VIAS - Ok - - - m_button4 - protected - - - - - - - - - OnOkClick - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT - 0 - - - - 1 - - - 0 - wxID_ANY - Set ALL vias (no track) to their Netclass value - - - m_staticText7 - protected - - - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 0 - - - - 0 - 1 - - - 0 - ID_ALL_VIAS - Ok - - - m_button5 - protected - - - - - - - - - OnOkClick - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT - 0 - - - - 1 - - - 0 - wxID_ANY - Set ALL tracks (no via) to their Netclass value - - - m_staticText8 - protected - - - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 0 - - - - 0 - 1 - - - 0 - ID_ALL_TRACKS - Ok - - - m_button6 - protected - - - - - - - - - OnOkClick - - - - - - - - - - - - - - - - - - - - - - - - - - - + + 0 + + 0 + protected + 20 5 - wxALIGN_CENTER_VERTICAL - 0 + wxEXPAND + 1 - bbuttonsSizer + bSizerRadioButtons wxVERTICAL none 5 - wxALL|wxEXPAND + wxALL 0 - + - 0 1 0 - wxID_CANCEL - Cancel + ID_CURRENT_VALUES_TO_CURRENT_NET + Set tracks and vias of the current Net to the current value - m_buttonCancel + m_Net2CurrValueButton protected + 0 - OnCancelClick @@ -1080,6 +694,215 @@ + OnSelectionClick + + + + + + + + + + 5 + wxALL + 0 + + + + 1 + + + 0 + ID_NETCLASS_VALUES_TO_CURRENT_NET + Set tracks and vias of the current Net to the Netclass value + + + m_NetUseNetclassValueButton + protected + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + OnSelectionClick + + + + + + + + + + 5 + wxALL + 0 + + + + 1 + + + 0 + ID_ALL_TRACKS_VIAS + Set all tracks and vias to their Netclass value + + + m_radioBtn3 + protected + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + OnSelectionClick + + + + + + + + + + 5 + wxALL + 0 + + + + 1 + + + 0 + ID_ALL_VIAS + Set all vias (no track) to their Netclass value + + + m_radioBtn4 + protected + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + OnSelectionClick + + + + + + + + + + 5 + wxALL + 0 + + + + 1 + + + 0 + ID_ALL_TRACKS + Set all tracks (no via) to their Netclass value + + + m_radioBtn5 + protected + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + OnSelectionClick @@ -1092,6 +915,32 @@ + + 5 + wxEXPAND|wxALL + 0 + + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + + m_sdbSizer1 + protected + + OnCancelClick + + + + OnOkClick + + + + diff --git a/pcbnew/dialog_global_edit_tracks_and_vias_base.h b/pcbnew/dialog_global_edit_tracks_and_vias_base.h index edb1876b3d..adba275d76 100644 --- a/pcbnew/dialog_global_edit_tracks_and_vias_base.h +++ b/pcbnew/dialog_global_edit_tracks_and_vias_base.h @@ -18,8 +18,8 @@ #include #include #include -#include #include +#include #include #include @@ -39,31 +39,34 @@ class DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE : public wxDialog private: protected: + wxStaticText* m_staticText12; + wxStaticText* m_CurrentNetText; wxStaticText* m_CurrentNetName; wxStaticText* m_CurrentNetclassText; wxStaticText* m_CurrentNetclassName; + wxGrid* m_gridDisplayCurrentSettings; wxStaticLine* m_staticline1; - wxStaticText* m_Net2CurrValueText; - wxButton* m_Net2CurrValueButton; - wxStaticText* m_staticText5; - wxButton* m_button3; - wxStaticText* m_staticText6; - wxButton* m_button4; - wxStaticText* m_staticText7; - wxButton* m_button5; - wxStaticText* m_staticText8; - wxButton* m_button6; - wxButton* m_buttonCancel; + wxStaticText* m_staticText11; + + wxRadioButton* m_Net2CurrValueButton; + wxRadioButton* m_NetUseNetclassValueButton; + wxRadioButton* m_radioBtn3; + wxRadioButton* m_radioBtn4; + wxRadioButton* m_radioBtn5; + wxStdDialogButtonSizer* m_sdbSizer1; + wxButton* m_sdbSizer1OK; + wxButton* m_sdbSizer1Cancel; // Virtual event handlers, overide them in your derived class - virtual void OnOkClick( wxCommandEvent& event ){ event.Skip(); } + virtual void OnSelectionClick( wxCommandEvent& event ){ event.Skip(); } virtual void OnCancelClick( wxCommandEvent& event ){ event.Skip(); } + virtual void OnOkClick( wxCommandEvent& event ){ event.Skip(); } public: - DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 711,418 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Global Edition of Tracks and Vias"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 711,376 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE(); };