From 8b3e257648911f72afc175c39049ab1c60113db4 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Wed, 7 Aug 2019 20:01:50 +0100 Subject: [PATCH] Shorten ERC dialog options page. Fixes: lp:1839338 * https://bugs.launchpad.net/kicad/+bug/1839338 --- eeschema/dialogs/dialog_erc.cpp | 24 +- eeschema/dialogs/dialog_erc.h | 1 + eeschema/dialogs/dialog_erc_base.cpp | 166 +++---- eeschema/dialogs/dialog_erc_base.fbp | 700 +++++++++++++++++++++++---- eeschema/dialogs/dialog_erc_base.h | 32 +- 5 files changed, 717 insertions(+), 206 deletions(-) diff --git a/eeschema/dialogs/dialog_erc.cpp b/eeschema/dialogs/dialog_erc.cpp index db344faa4c..7ea8691e4c 100644 --- a/eeschema/dialogs/dialog_erc.cpp +++ b/eeschema/dialogs/dialog_erc.cpp @@ -3,7 +3,7 @@ * * Copyright (C) 2015 Jean-Pierre Charras, jp.charras at wanadoo.fr * Copyright (C) 2012 Wayne Stambaugh - * Copyright (C) 1992-2017 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 1992-2019 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -23,14 +23,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -/** - * @file dialog_erc.cpp - * @brief Electrical Rules Check dialog implementation. - */ - #include -#include -#include #include #include #include @@ -42,7 +35,6 @@ #include #include #include -#include #include #include #include @@ -117,10 +109,10 @@ void DIALOG_ERC::Init() { m_initialized = false; - for( int ii = 0; ii < PINTYPE_COUNT; ii++ ) + for( auto& buttonRow : m_buttonList ) { - for( int jj = 0; jj < PINTYPE_COUNT; jj++ ) - m_buttonList[ii][jj] = NULL; + for( auto& button : buttonRow ) + button = NULL; } m_settings = m_parent->GetErcSettings(); @@ -136,6 +128,14 @@ void DIALOG_ERC::Init() } +void DIALOG_ERC::OnUpdateUI( wxUpdateUIEvent& event ) +{ + m_buttondelmarkers->Show( m_NoteBook->GetSelection() == 0 ); + m_ResetOptButton->Show( m_NoteBook->GetSelection() == 1 ); + m_buttonsSizer->Layout(); +} + + void DIALOG_ERC::transferSettingsToControls() { m_WriteResultOpt->SetValue( m_settings.write_erc_file ); diff --git a/eeschema/dialogs/dialog_erc.h b/eeschema/dialogs/dialog_erc.h index a7736bfaf7..4c167a790d 100644 --- a/eeschema/dialogs/dialog_erc.h +++ b/eeschema/dialogs/dialog_erc.h @@ -60,6 +60,7 @@ private: void OnEraseDrcMarkersClick( wxCommandEvent& event ) override; void OnButtonCloseClick( wxCommandEvent& event ) override; void OnResetMatrixClick( wxCommandEvent& event ) override; + void OnUpdateUI( wxUpdateUIEvent& event ) override; void RedrawDrawPanel(); diff --git a/eeschema/dialogs/dialog_erc_base.cpp b/eeschema/dialogs/dialog_erc_base.cpp index e896b5f030..628cfde3b6 100644 --- a/eeschema/dialogs/dialog_erc_base.cpp +++ b/eeschema/dialogs/dialog_erc_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Feb 17 2019) +// C++ code generated with wxFormBuilder (version Dec 30 2017) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -14,87 +14,87 @@ DIALOG_ERC_BASE::DIALOG_ERC_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* bSizer1; bSizer1 = new wxBoxSizer( wxVERTICAL ); - + m_NoteBook = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); m_PanelERC = new wxPanel( m_NoteBook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bercSizer; bercSizer = new wxBoxSizer( wxVERTICAL ); - + wxBoxSizer* bupperSizer; bupperSizer = new wxBoxSizer( wxHORIZONTAL ); - + wxStaticBoxSizer* sdiagSizer; sdiagSizer = new wxStaticBoxSizer( new wxStaticBox( m_PanelERC, wxID_ANY, _("ERC Report:") ), wxVERTICAL ); - + wxGridSizer* gSizeDiag; gSizeDiag = new wxGridSizer( 3, 2, 5, 5 ); - + m_ErcTotalErrorsText = new wxStaticText( sdiagSizer->GetStaticBox(), wxID_ANY, _("Total:"), wxDefaultPosition, wxDefaultSize, 0 ); m_ErcTotalErrorsText->Wrap( -1 ); gSizeDiag->Add( m_ErcTotalErrorsText, 1, wxALIGN_CENTER_VERTICAL, 5 ); - + m_TotalErrCount = new wxTextCtrl( sdiagSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); gSizeDiag->Add( m_TotalErrCount, 0, wxALIGN_CENTER_VERTICAL, 5 ); - + m_WarnErcErrorsText = new wxStaticText( sdiagSizer->GetStaticBox(), wxID_ANY, _("Warnings:"), wxDefaultPosition, wxDefaultSize, 0 ); m_WarnErcErrorsText->Wrap( -1 ); gSizeDiag->Add( m_WarnErcErrorsText, 1, wxALIGN_CENTER_VERTICAL, 5 ); - + m_LastWarningCount = new wxTextCtrl( sdiagSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); gSizeDiag->Add( m_LastWarningCount, 0, wxALIGN_CENTER_VERTICAL, 5 ); - + m_LastErrCountText = new wxStaticText( sdiagSizer->GetStaticBox(), wxID_ANY, _("Errors:"), wxDefaultPosition, wxDefaultSize, 0 ); m_LastErrCountText->Wrap( -1 ); gSizeDiag->Add( m_LastErrCountText, 1, wxALIGN_CENTER_VERTICAL, 5 ); - + m_LastErrCount = new wxTextCtrl( sdiagSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); gSizeDiag->Add( m_LastErrCount, 0, wxALIGN_CENTER_VERTICAL, 5 ); - - + + sdiagSizer->Add( gSizeDiag, 0, wxALL|wxEXPAND, 5 ); - + m_staticline1 = new wxStaticLine( sdiagSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); sdiagSizer->Add( m_staticline1, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 ); - + m_WriteResultOpt = new wxCheckBox( sdiagSizer->GetStaticBox(), wxID_ANY, _("Create ERC file report"), wxDefaultPosition, wxDefaultSize, 0 ); sdiagSizer->Add( m_WriteResultOpt, 0, wxALL|wxBOTTOM|wxRIGHT|wxTOP, 5 ); - - + + bupperSizer->Add( sdiagSizer, 0, wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT, 5 ); - + wxBoxSizer* bSizerMessages; bSizerMessages = new wxBoxSizer( wxVERTICAL ); - + m_titleMessages = new wxStaticText( m_PanelERC, wxID_ANY, _("Messages:"), wxDefaultPosition, wxDefaultSize, 0 ); m_titleMessages->Wrap( -1 ); m_titleMessages->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); - + bSizerMessages->Add( m_titleMessages, 0, wxRIGHT|wxLEFT, 12 ); - + m_MessagesList = new wxTextCtrl( m_PanelERC, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY ); m_MessagesList->SetMinSize( wxSize( 180,-1 ) ); - + bSizerMessages->Add( m_MessagesList, 1, wxEXPAND|wxBOTTOM|wxLEFT, 5 ); - - + + bupperSizer->Add( bSizerMessages, 1, wxBOTTOM|wxEXPAND|wxRIGHT|wxTOP, 3 ); - - + + bercSizer->Add( bupperSizer, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 8 ); - + m_textMarkers = new wxStaticText( m_PanelERC, wxID_ANY, _("Error List:"), wxDefaultPosition, wxDefaultSize, 0 ); m_textMarkers->Wrap( -1 ); m_textMarkers->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); - + bercSizer->Add( m_textMarkers, 0, wxLEFT|wxRIGHT, 20 ); - + m_MarkersList = new ERC_HTML_LISTFRAME( m_PanelERC, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO|wxBORDER_SIMPLE ); bercSizer->Add( m_MarkersList, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 8 ); - - + + m_PanelERC->SetSizer( bercSizer ); m_PanelERC->Layout(); bercSizer->Fit( m_PanelERC ); @@ -102,92 +102,93 @@ DIALOG_ERC_BASE::DIALOG_ERC_BASE( wxWindow* parent, wxWindowID id, const wxStrin m_PanelERCOptions = new wxPanel( m_NoteBook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* m_panelMatrixSizer; m_panelMatrixSizer = new wxBoxSizer( wxVERTICAL ); - + wxStaticBoxSizer* sbSizer2; sbSizer2 = new wxStaticBoxSizer( new wxStaticBox( m_PanelERCOptions, wxID_ANY, _("Label to Label Connections") ), wxVERTICAL ); - + m_cbTestSimilarLabels = new wxCheckBox( sbSizer2->GetStaticBox(), wxID_ANY, _("Test similar labels"), wxDefaultPosition, wxDefaultSize, 0 ); m_cbTestSimilarLabels->SetToolTip( _("Similar labels are labels (inside a sheet) which differs only by upper/lower case") ); - - sbSizer2->Add( m_cbTestSimilarLabels, 0, wxALL, 5 ); - + + sbSizer2->Add( m_cbTestSimilarLabels, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + m_cbTestUniqueGlbLabels = new wxCheckBox( sbSizer2->GetStaticBox(), wxID_ANY, _("Test single instances of global labels"), wxDefaultPosition, wxDefaultSize, 0 ); m_cbTestUniqueGlbLabels->SetToolTip( _("Global labels are used to connect signals across the full hierarchy.\nThey are expected to be at least two labels with the same name.") ); - + sbSizer2->Add( m_cbTestUniqueGlbLabels, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); - - - m_panelMatrixSizer->Add( sbSizer2, 0, wxALL|wxEXPAND, 5 ); - + + + m_panelMatrixSizer->Add( sbSizer2, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + wxStaticBoxSizer* sbSizer3; sbSizer3 = new wxStaticBoxSizer( new wxStaticBox( m_PanelERCOptions, wxID_ANY, _("Pin to Pin Connections") ), wxVERTICAL ); - + m_matrixPanel = new wxPanel( sbSizer3->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); sbSizer3->Add( m_matrixPanel, 1, wxEXPAND | wxALL, 5 ); - - m_ResetOptButton = new wxButton( sbSizer3->GetStaticBox(), ID_RESET_MATRIX, _("Reset to Defaults"), wxDefaultPosition, wxDefaultSize, 0 ); - sbSizer3->Add( m_ResetOptButton, 0, wxALL, 5 ); - - + + m_panelMatrixSizer->Add( sbSizer3, 0, wxALL|wxEXPAND, 5 ); - + wxStaticBoxSizer* sbSizer31; sbSizer31 = new wxStaticBoxSizer( new wxStaticBox( m_PanelERCOptions, wxID_ANY, _("Bus Connections") ), wxVERTICAL ); - + m_cbCheckBusToNetConflicts = new wxCheckBox( sbSizer31->GetStaticBox(), wxID_ANY, _("Check that bus wires are not connected to hierarchical net pins and vice versa"), wxDefaultPosition, wxDefaultSize, 0 ); - sbSizer31->Add( m_cbCheckBusToNetConflicts, 0, wxALL, 5 ); - + sbSizer31->Add( m_cbCheckBusToNetConflicts, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + m_cbCheckBusToBusConflicts = new wxCheckBox( sbSizer31->GetStaticBox(), wxID_ANY, _("Check that bus-to-bus connections have shared members"), wxDefaultPosition, wxDefaultSize, 0 ); - sbSizer31->Add( m_cbCheckBusToBusConflicts, 0, wxALL, 5 ); - + sbSizer31->Add( m_cbCheckBusToBusConflicts, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + m_cbCheckBusEntries = new wxCheckBox( sbSizer31->GetStaticBox(), wxID_ANY, _("Check that nets are members of buses they graphically connect to"), wxDefaultPosition, wxDefaultSize, 0 ); - sbSizer31->Add( m_cbCheckBusEntries, 0, wxALL, 5 ); - + sbSizer31->Add( m_cbCheckBusEntries, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + m_cbCheckBusDriverConflicts = new wxCheckBox( sbSizer31->GetStaticBox(), wxID_ANY, _("Check buses for conflicting drivers"), wxDefaultPosition, wxDefaultSize, 0 ); - sbSizer31->Add( m_cbCheckBusDriverConflicts, 0, wxALL, 5 ); - - + sbSizer31->Add( m_cbCheckBusDriverConflicts, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + + m_panelMatrixSizer->Add( sbSizer31, 0, wxALL|wxEXPAND, 5 ); - - + + m_PanelERCOptions->SetSizer( m_panelMatrixSizer ); m_PanelERCOptions->Layout(); m_panelMatrixSizer->Fit( m_PanelERCOptions ); m_NoteBook->AddPage( m_PanelERCOptions, _("Options"), false ); - + bSizer1->Add( m_NoteBook, 1, wxEXPAND | wxALL, 5 ); - - wxBoxSizer* bbuttonsSizer; - bbuttonsSizer = new wxBoxSizer( wxHORIZONTAL ); - + + m_buttonsSizer = new wxBoxSizer( wxHORIZONTAL ); + m_buttondelmarkers = new wxButton( this, ID_ERASE_DRC_MARKERS, _("Delete Markers"), wxDefaultPosition, wxDefaultSize, 0 ); - bbuttonsSizer->Add( m_buttondelmarkers, 0, wxALL|wxEXPAND, 5 ); - - - bbuttonsSizer->Add( 0, 0, 1, wxEXPAND, 5 ); - + m_buttonsSizer->Add( m_buttondelmarkers, 0, wxALL|wxEXPAND, 5 ); + + m_ResetOptButton = new wxButton( this, ID_RESET_MATRIX, _("Reset to Defaults"), wxDefaultPosition, wxDefaultSize, 0 ); + m_buttonsSizer->Add( m_ResetOptButton, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + + + m_buttonsSizer->Add( 0, 0, 1, wxEXPAND, 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(); - - bbuttonsSizer->Add( m_sdbSizer1, 0, wxALL|wxEXPAND, 5 ); - - - bSizer1->Add( bbuttonsSizer, 0, wxEXPAND|wxLEFT, 5 ); - - + + m_buttonsSizer->Add( m_sdbSizer1, 0, wxALL|wxEXPAND, 5 ); + + + bSizer1->Add( m_buttonsSizer, 0, wxEXPAND|wxLEFT, 10 ); + + this->SetSizer( bSizer1 ); this->Layout(); - + bSizer1->Fit( this ); + // Connect Events this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_ERC_BASE::OnCloseErcDialog ) ); + m_NoteBook->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_ERC_BASE::OnUpdateUI ), NULL, this ); m_MarkersList->Connect( wxEVT_COMMAND_HTML_LINK_CLICKED, wxHtmlLinkEventHandler( DIALOG_ERC_BASE::OnLeftClickMarkersList ), NULL, this ); m_MarkersList->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( DIALOG_ERC_BASE::OnLeftDblClickMarkersList ), NULL, this ); - m_ResetOptButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ERC_BASE::OnResetMatrixClick ), NULL, this ); m_buttondelmarkers->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ERC_BASE::OnEraseDrcMarkersClick ), NULL, this ); + m_ResetOptButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ERC_BASE::OnResetMatrixClick ), NULL, this ); m_sdbSizer1Cancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ERC_BASE::OnButtonCloseClick ), NULL, this ); m_sdbSizer1OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ERC_BASE::OnErcCmpClick ), NULL, this ); } @@ -196,11 +197,12 @@ DIALOG_ERC_BASE::~DIALOG_ERC_BASE() { // Disconnect Events this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_ERC_BASE::OnCloseErcDialog ) ); + m_NoteBook->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_ERC_BASE::OnUpdateUI ), NULL, this ); m_MarkersList->Disconnect( wxEVT_COMMAND_HTML_LINK_CLICKED, wxHtmlLinkEventHandler( DIALOG_ERC_BASE::OnLeftClickMarkersList ), NULL, this ); m_MarkersList->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( DIALOG_ERC_BASE::OnLeftDblClickMarkersList ), NULL, this ); - m_ResetOptButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ERC_BASE::OnResetMatrixClick ), NULL, this ); m_buttondelmarkers->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ERC_BASE::OnEraseDrcMarkersClick ), NULL, this ); + m_ResetOptButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ERC_BASE::OnResetMatrixClick ), NULL, this ); m_sdbSizer1Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ERC_BASE::OnButtonCloseClick ), NULL, this ); m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ERC_BASE::OnErcCmpClick ), NULL, this ); - + } diff --git a/eeschema/dialogs/dialog_erc_base.fbp b/eeschema/dialogs/dialog_erc_base.fbp index fcab33b323..97f91d048f 100644 --- a/eeschema/dialogs/dialog_erc_base.fbp +++ b/eeschema/dialogs/dialog_erc_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -14,7 +14,6 @@ dialog_erc_base 1000 none - 1 dialog_ERC_base @@ -45,7 +44,7 @@ DIALOG_ERC_BASE - 483,420 + -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h Electrical Rules Checker @@ -53,7 +52,42 @@ + + + + + + + + + OnCloseErcDialog + + + + + + + + + + + + + + + + + + + + + + + + + + bSizer1 @@ -116,6 +150,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + OnUpdateUI ERC @@ -171,6 +230,29 @@ wxTAB_TRAVERSAL + + + + + + + + + + + + + + + + + + + + + + + bercSizer @@ -197,6 +279,7 @@ wxVERTICAL 1 none + 5 wxALL|wxEXPAND @@ -242,7 +325,6 @@ 0 wxID_ANY Total: - 0 0 @@ -268,6 +350,29 @@ -1 + + + + + + + + + + + + + + + + + + + + + + + @@ -332,6 +437,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -367,7 +499,6 @@ 0 wxID_ANY Warnings: - 0 0 @@ -393,6 +524,29 @@ -1 + + + + + + + + + + + + + + + + + + + + + + + @@ -457,6 +611,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -492,7 +673,6 @@ 0 wxID_ANY Errors: - 0 0 @@ -518,6 +698,29 @@ -1 + + + + + + + + + + + + + + + + + + + + + + + @@ -582,6 +785,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -642,6 +872,29 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -706,6 +959,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -752,7 +1029,6 @@ 0 wxID_ANY Messages: - 0 0 @@ -778,6 +1054,29 @@ -1 + + + + + + + + + + + + + + + + + + + + + + + @@ -842,6 +1141,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -881,7 +1207,6 @@ 0 wxID_ANY Error List: - 0 0 @@ -907,6 +1232,29 @@ -1 + + + + + + + + + + + + + + + + + + + + + + + @@ -965,8 +1313,32 @@ wxBORDER_SIMPLE + + + + + OnLeftClickMarkersList + + + + OnLeftDblClickMarkersList + + + + + + + + + + + + + + + @@ -1027,6 +1399,29 @@ wxTAB_TRAVERSAL + + + + + + + + + + + + + + + + + + + + + + + m_panelMatrixSizer @@ -1034,7 +1429,7 @@ none 5 - wxALL|wxEXPAND + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 0 wxID_ANY @@ -1044,9 +1439,10 @@ wxVERTICAL 1 none + 5 - wxALL + wxBOTTOM|wxRIGHT|wxLEFT 0 1 @@ -1106,6 +1502,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -1170,6 +1590,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -1186,6 +1630,7 @@ wxVERTICAL 1 none + 5 wxEXPAND | wxALL @@ -1241,79 +1686,29 @@ wxTAB_TRAVERSAL - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - ID_RESET_MATRIX - Reset to Defaults - - 0 - - 0 - - - 0 - - 1 - m_ResetOptButton - 1 - - - protected - 1 - - - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnResetMatrixClick + + + + + + + + + + + + + + + + + + + + + + + @@ -1333,7 +1728,7 @@ 5 - wxALL + wxBOTTOM|wxRIGHT|wxLEFT 0 1 @@ -1421,7 +1816,7 @@ 5 - wxALL + wxBOTTOM|wxRIGHT|wxLEFT 0 1 @@ -1509,7 +1904,7 @@ 5 - wxALL + wxBOTTOM|wxRIGHT|wxLEFT 0 1 @@ -1597,7 +1992,7 @@ 5 - wxALL + wxBOTTOM|wxRIGHT|wxLEFT 0 1 @@ -1691,14 +2086,14 @@ - 5 + 10 wxEXPAND|wxLEFT 0 - bbuttonsSizer + m_buttonsSizer wxHORIZONTAL - none + protected 5 wxALL|wxEXPAND @@ -1714,31 +2109,25 @@ - 1 0 1 1 - 0 0 - Dock 0 Left 1 1 - 0 0 ID_ERASE_DRC_MARKERS Delete Markers - - 0 0 @@ -1753,8 +2142,6 @@ protected 1 - - Resizable 1 @@ -1770,6 +2157,117 @@ OnEraseDrcMarkersClick + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_RESET_MATRIX + Reset to Defaults + + 0 + + + 0 + + 1 + m_ResetOptButton + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnResetMatrixClick + + + + + + + + + + + + + + + + + + + + + + + @@ -1798,8 +2296,14 @@ m_sdbSizer1 protected + OnButtonCloseClick + + + OnErcCmpClick + + diff --git a/eeschema/dialogs/dialog_erc_base.h b/eeschema/dialogs/dialog_erc_base.h index e98944f574..616611d089 100644 --- a/eeschema/dialogs/dialog_erc_base.h +++ b/eeschema/dialogs/dialog_erc_base.h @@ -1,11 +1,12 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Feb 17 2019) +// C++ code generated with wxFormBuilder (version Dec 30 2017) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#pragma once +#ifndef __DIALOG_ERC_BASE_H__ +#define __DIALOG_ERC_BASE_H__ #include #include @@ -29,14 +30,14 @@ class ERC_HTML_LISTFRAME; #include #include #include -#include #include +#include #include /////////////////////////////////////////////////////////////////////////// -#define ID_RESET_MATRIX 1000 -#define ID_ERASE_DRC_MARKERS 1001 +#define ID_ERASE_DRC_MARKERS 1000 +#define ID_RESET_MATRIX 1001 /////////////////////////////////////////////////////////////////////////////// /// Class DIALOG_ERC_BASE @@ -44,7 +45,7 @@ class ERC_HTML_LISTFRAME; class DIALOG_ERC_BASE : public DIALOG_SHIM { private: - + protected: wxNotebook* m_NoteBook; wxPanel* m_PanelERC; @@ -64,30 +65,33 @@ class DIALOG_ERC_BASE : public DIALOG_SHIM wxCheckBox* m_cbTestSimilarLabels; wxCheckBox* m_cbTestUniqueGlbLabels; wxPanel* m_matrixPanel; - wxButton* m_ResetOptButton; wxCheckBox* m_cbCheckBusToNetConflicts; wxCheckBox* m_cbCheckBusToBusConflicts; wxCheckBox* m_cbCheckBusEntries; wxCheckBox* m_cbCheckBusDriverConflicts; + wxBoxSizer* m_buttonsSizer; wxButton* m_buttondelmarkers; + wxButton* m_ResetOptButton; wxStdDialogButtonSizer* m_sdbSizer1; wxButton* m_sdbSizer1OK; wxButton* m_sdbSizer1Cancel; - + // Virtual event handlers, overide them in your derived class virtual void OnCloseErcDialog( wxCloseEvent& event ) { event.Skip(); } + virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); } virtual void OnLeftClickMarkersList( wxHtmlLinkEvent& event ) { event.Skip(); } virtual void OnLeftDblClickMarkersList( wxMouseEvent& event ) { event.Skip(); } - virtual void OnResetMatrixClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnEraseDrcMarkersClick( wxCommandEvent& event ) { event.Skip(); } + virtual void OnResetMatrixClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnButtonCloseClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnErcCmpClick( wxCommandEvent& event ) { event.Skip(); } - - + + public: - - DIALOG_ERC_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Electrical Rules Checker"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 483,420 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + + DIALOG_ERC_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Electrical Rules Checker"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_ERC_BASE(); - + }; +#endif //__DIALOG_ERC_BASE_H__