From e3b8de9a78962cdb12201fcdc60f1c3c3b274df0 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Wed, 23 Aug 2023 17:40:10 +0100 Subject: [PATCH] Work-around non-functional row-major radio button groups on Mac. --- .../dialogs/dialog_symbol_fields_table.cpp | 64 +- .../dialog_symbol_fields_table_base.cpp | 69 ++- .../dialog_symbol_fields_table_base.fbp | 582 +++++++++++++----- .../dialogs/dialog_symbol_fields_table_base.h | 15 +- 4 files changed, 542 insertions(+), 188 deletions(-) diff --git a/eeschema/dialogs/dialog_symbol_fields_table.cpp b/eeschema/dialogs/dialog_symbol_fields_table.cpp index a17dcfb6d9..ac399ffa62 100644 --- a/eeschema/dialogs/dialog_symbol_fields_table.cpp +++ b/eeschema/dialogs/dialog_symbol_fields_table.cpp @@ -62,6 +62,9 @@ wxDEFINE_EVENT( EDA_EVT_CLOSE_DIALOG_SYMBOL_FIELDS_TABLE, wxCommandEvent ); #define COLUMN_MARGIN 15 #endif +using SCOPE = FIELDS_EDITOR_GRID_DATA_MODEL::SCOPE; + + enum { MYID_SELECT_FOOTPRINT = GRIDTRICKS_FIRST_CLIENT_ID, @@ -281,8 +284,20 @@ DIALOG_SYMBOL_FIELDS_TABLE::DIALOG_SYMBOL_FIELDS_TABLE( SCH_EDIT_FRAME* parent ) SetSize( dlgSize ); m_nbPages->SetSelection( cfg->m_FieldEditorPanel.page ); - m_radioSelect->SetSelection( cfg->m_FieldEditorPanel.selection_mode ); - m_radioScope->SetSelection( cfg->m_FieldEditorPanel.scope ); + + switch( cfg->m_FieldEditorPanel.selection_mode ) + { + case 0: m_radioHighlight->SetValue( true ); break; + case 1: m_radioSelect->SetValue( true ); break; + case 2: m_radioOff->SetValue( true ); break; + } + + switch( cfg->m_FieldEditorPanel.scope ) + { + case SCOPE::SCOPE_ALL: m_radioProject->SetValue( true ); break; + case SCOPE::SCOPE_SHEET: m_radioCurrentSheet->SetValue( true ); break; + case SCOPE::SCOPE_SHEET_RECURSIVE: m_radioRecursive->SetValue( true ); break; + } m_outputFileName->SetValue( cfg->m_FieldEditorPanel.export_filename ); @@ -958,7 +973,14 @@ void DIALOG_SYMBOL_FIELDS_TABLE::OnScopeChanged( wxCommandEvent& aEvent ) void DIALOG_SYMBOL_FIELDS_TABLE::UpdateScope() { m_dataModel->SetPath( m_parent->GetCurrentSheet() ); - m_dataModel->SetScope( (FIELDS_EDITOR_GRID_DATA_MODEL::SCOPE) m_radioScope->GetSelection() ); + + if( m_radioProject->GetValue() ) + m_dataModel->SetScope( FIELDS_EDITOR_GRID_DATA_MODEL::SCOPE::SCOPE_ALL ); + else if( m_radioCurrentSheet->GetValue() ) + m_dataModel->SetScope( FIELDS_EDITOR_GRID_DATA_MODEL::SCOPE::SCOPE_SHEET ); + else if( m_radioRecursive->GetValue() ) + m_dataModel->SetScope( FIELDS_EDITOR_GRID_DATA_MODEL::SCOPE::SCOPE_SHEET_RECURSIVE ); + m_dataModel->RebuildRows(); } @@ -988,16 +1010,16 @@ void DIALOG_SYMBOL_FIELDS_TABLE::OnTableRangeSelected( wxGridRangeSelectEvent& a if( aEvent.Selecting() ) { for( int i = aEvent.GetTopRow(); i <= aEvent.GetBottomRow(); i++ ) - for( SCH_REFERENCE ref : m_dataModel->GetRowReferences( i ) ) + { + for( const SCH_REFERENCE& ref : m_dataModel->GetRowReferences( i ) ) refs.insert( ref ); + } for( const SCH_REFERENCE& ref : refs ) symbols.insert( ref.GetSymbol() ); } - switch( m_radioSelect->GetSelection() ) - { - case 0: + if( m_radioHighlight->GetValue() ) { SCH_EDITOR_CONTROL* editor = m_parent->GetToolManager()->GetTool(); @@ -1011,11 +1033,11 @@ void DIALOG_SYMBOL_FIELDS_TABLE::OnTableRangeSelected( wxGridRangeSelectEvent& a wxEmptyString ); } else + { m_parent->FocusOnItem( nullptr ); - - break; + } } - case 1: + else if( m_radioSelect->GetValue() ) { EE_SELECTION_TOOL* selTool = m_parent->GetToolManager()->GetTool(); @@ -1025,12 +1047,10 @@ void DIALOG_SYMBOL_FIELDS_TABLE::OnTableRangeSelected( wxGridRangeSelectEvent& a selTool->SyncSelection( refs.begin()->GetSheetPath(), nullptr, items ); else selTool->ClearSelection(); - - break; - } - default: break; } } + + void DIALOG_SYMBOL_FIELDS_TABLE::OnTableItemContextMenu( wxGridEvent& event ) { // TODO: Option to select footprint if FOOTPRINT column selected @@ -1248,8 +1268,20 @@ void DIALOG_SYMBOL_FIELDS_TABLE::OnClose( wxCloseEvent& event ) cfg->m_FieldEditorPanel.height = GetSize().y; cfg->m_FieldEditorPanel.page = m_nbPages->GetSelection(); cfg->m_FieldEditorPanel.export_filename = m_outputFileName->GetValue(); - cfg->m_FieldEditorPanel.selection_mode = m_radioSelect->GetSelection(); - cfg->m_FieldEditorPanel.scope = m_radioScope->GetSelection(); + + if( m_radioHighlight->GetValue() ) + cfg->m_FieldEditorPanel.selection_mode = 0; + else if( m_radioHighlight->GetValue() ) + cfg->m_FieldEditorPanel.selection_mode = 1; + else if( m_radioOff->GetValue() ) + cfg->m_FieldEditorPanel.selection_mode = 2; + + if( m_radioProject->GetValue() ) + cfg->m_FieldEditorPanel.scope = SCOPE::SCOPE_ALL; + else if( m_radioCurrentSheet->GetValue() ) + cfg->m_FieldEditorPanel.scope = SCOPE::SCOPE_SHEET; + else if( m_radioRecursive->GetValue() ) + cfg->m_FieldEditorPanel.scope = SCOPE::SCOPE_SHEET_RECURSIVE; for( int i = 0; i < m_grid->GetNumberCols(); i++ ) { diff --git a/eeschema/dialogs/dialog_symbol_fields_table_base.cpp b/eeschema/dialogs/dialog_symbol_fields_table_base.cpp index fefdab58b3..4ca14852b1 100644 --- a/eeschema/dialogs/dialog_symbol_fields_table_base.cpp +++ b/eeschema/dialogs/dialog_symbol_fields_table_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -119,24 +119,6 @@ DIALOG_SYMBOL_FIELDS_TABLE_BASE::DIALOG_SYMBOL_FIELDS_TABLE_BASE( wxWindow* pare bRightSizer->Add( bControls, 0, wxEXPAND|wxLEFT, 5 ); - wxBoxSizer* bControls1; - bControls1 = new wxBoxSizer( wxHORIZONTAL ); - - wxString m_radioSelectChoices[] = { _("Highlight"), _("Select"), _("Off") }; - int m_radioSelectNChoices = sizeof( m_radioSelectChoices ) / sizeof( wxString ); - m_radioSelect = new wxRadioBox( m_rightPanel, wxID_ANY, _("Selection Control"), wxDefaultPosition, wxDefaultSize, m_radioSelectNChoices, m_radioSelectChoices, 3, wxRA_SPECIFY_COLS ); - m_radioSelect->SetSelection( 0 ); - bControls1->Add( m_radioSelect, 0, wxALL, 5 ); - - wxString m_radioScopeChoices[] = { _("Entire Project"), _("Current sheet only"), _("Recursive") }; - int m_radioScopeNChoices = sizeof( m_radioScopeChoices ) / sizeof( wxString ); - m_radioScope = new wxRadioBox( m_rightPanel, wxID_ANY, _("Scope"), wxDefaultPosition, wxDefaultSize, m_radioScopeNChoices, m_radioScopeChoices, 3, wxRA_SPECIFY_COLS ); - m_radioScope->SetSelection( 0 ); - bControls1->Add( m_radioScope, 0, wxALL, 5 ); - - - bRightSizer->Add( bControls1, 0, wxEXPAND|wxLEFT, 5 ); - m_grid = new WX_GRID( m_rightPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); // Grid @@ -163,7 +145,46 @@ DIALOG_SYMBOL_FIELDS_TABLE_BASE::DIALOG_SYMBOL_FIELDS_TABLE_BASE( wxWindow* pare m_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP ); m_grid->SetMinSize( wxSize( 600,240 ) ); - bRightSizer->Add( m_grid, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); + bRightSizer->Add( m_grid, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + + wxBoxSizer* bSizer12; + bSizer12 = new wxBoxSizer( wxHORIZONTAL ); + + wxStaticBoxSizer* sbSizer2; + sbSizer2 = new wxStaticBoxSizer( new wxStaticBox( m_rightPanel, wxID_ANY, _("Scope") ), wxHORIZONTAL ); + + m_radioProject = new wxRadioButton( sbSizer2->GetStaticBox(), wxID_ANY, _("Entire project"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); + sbSizer2->Add( m_radioProject, 0, 0, 6 ); + + m_radioCurrentSheet = new wxRadioButton( sbSizer2->GetStaticBox(), wxID_ANY, _("Current sheet only"), wxDefaultPosition, wxDefaultSize, 0 ); + sbSizer2->Add( m_radioCurrentSheet, 0, wxRIGHT|wxLEFT, 12 ); + + m_radioRecursive = new wxRadioButton( sbSizer2->GetStaticBox(), wxID_ANY, _("Recursive"), wxDefaultPosition, wxDefaultSize, 0 ); + sbSizer2->Add( m_radioRecursive, 0, 0, 6 ); + + + bSizer12->Add( sbSizer2, 0, wxEXPAND, 5 ); + + + bSizer12->Add( 12, 0, 1, wxEXPAND, 5 ); + + wxStaticBoxSizer* sbSizer1; + sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( m_rightPanel, wxID_ANY, _("Cross Probe Action") ), wxHORIZONTAL ); + + m_radioHighlight = new wxRadioButton( sbSizer1->GetStaticBox(), wxID_ANY, _("Highlight"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); + sbSizer1->Add( m_radioHighlight, 0, 0, 8 ); + + m_radioSelect = new wxRadioButton( sbSizer1->GetStaticBox(), wxID_ANY, _("Select"), wxDefaultPosition, wxDefaultSize, 0 ); + sbSizer1->Add( m_radioSelect, 0, wxRIGHT|wxLEFT, 12 ); + + m_radioOff = new wxRadioButton( sbSizer1->GetStaticBox(), wxID_ANY, _("Off"), wxDefaultPosition, wxDefaultSize, 0 ); + sbSizer1->Add( m_radioOff, 0, 0, 8 ); + + + bSizer12->Add( sbSizer1, 0, wxEXPAND, 5 ); + + + bRightSizer->Add( bSizer12, 0, wxEXPAND|wxTOP, 5 ); m_rightPanel->SetSizer( bRightSizer ); @@ -342,12 +363,14 @@ DIALOG_SYMBOL_FIELDS_TABLE_BASE::DIALOG_SYMBOL_FIELDS_TABLE_BASE( wxWindow* pare m_checkExcludeDNP->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnExcludeDNPToggled ), NULL, this ); m_groupSymbolsBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnGroupSymbolsToggled ), NULL, this ); m_bRefresh->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnRegroupSymbols ), NULL, this ); - m_radioScope->Connect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnScopeChanged ), NULL, this ); m_grid->Connect( wxEVT_GRID_CELL_CHANGED, wxGridEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnTableValueChanged ), NULL, this ); m_grid->Connect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnTableCellClick ), NULL, this ); m_grid->Connect( wxEVT_GRID_CELL_LEFT_DCLICK, wxGridEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnTableCellClick ), NULL, this ); m_grid->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnTableItemContextMenu ), NULL, this ); m_grid->Connect( wxEVT_GRID_COL_SIZE, wxGridSizeEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnTableColSize ), NULL, this ); + m_radioProject->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnScopeChanged ), NULL, this ); + m_radioCurrentSheet->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnScopeChanged ), NULL, this ); + m_radioRecursive->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnScopeChanged ), NULL, this ); m_textFieldDelimiter->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnPreviewRefresh ), NULL, this ); m_textStringDelimiter->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnPreviewRefresh ), NULL, this ); m_textRefDelimiter->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnPreviewRefresh ), NULL, this ); @@ -377,12 +400,14 @@ DIALOG_SYMBOL_FIELDS_TABLE_BASE::~DIALOG_SYMBOL_FIELDS_TABLE_BASE() m_checkExcludeDNP->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnExcludeDNPToggled ), NULL, this ); m_groupSymbolsBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnGroupSymbolsToggled ), NULL, this ); m_bRefresh->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnRegroupSymbols ), NULL, this ); - m_radioScope->Disconnect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnScopeChanged ), NULL, this ); m_grid->Disconnect( wxEVT_GRID_CELL_CHANGED, wxGridEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnTableValueChanged ), NULL, this ); m_grid->Disconnect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnTableCellClick ), NULL, this ); m_grid->Disconnect( wxEVT_GRID_CELL_LEFT_DCLICK, wxGridEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnTableCellClick ), NULL, this ); m_grid->Disconnect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnTableItemContextMenu ), NULL, this ); m_grid->Disconnect( wxEVT_GRID_COL_SIZE, wxGridSizeEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnTableColSize ), NULL, this ); + m_radioProject->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnScopeChanged ), NULL, this ); + m_radioCurrentSheet->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnScopeChanged ), NULL, this ); + m_radioRecursive->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnScopeChanged ), NULL, this ); m_textFieldDelimiter->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnPreviewRefresh ), NULL, this ); m_textStringDelimiter->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnPreviewRefresh ), NULL, this ); m_textRefDelimiter->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnPreviewRefresh ), NULL, this ); diff --git a/eeschema/dialogs/dialog_symbol_fields_table_base.fbp b/eeschema/dialogs/dialog_symbol_fields_table_base.fbp index 055662cf9f..960d6f0eda 100644 --- a/eeschema/dialogs/dialog_symbol_fields_table_base.fbp +++ b/eeschema/dialogs/dialog_symbol_fields_table_base.fbp @@ -1258,153 +1258,9 @@ - - 5 - wxEXPAND|wxLEFT - 0 - - - bControls1 - wxHORIZONTAL - none - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "Highlight" "Select" "Off" - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Selection Control - 3 - - 0 - - - 0 - - 1 - m_radioSelect - 1 - - - protected - 1 - - Resizable - 0 - 1 - - wxRA_SPECIFY_COLS - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "Entire Project" "Current sheet only" "Recursive" - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Scope - 3 - - 0 - - - 0 - - 1 - m_radioScope - 1 - - - protected - 1 - - Resizable - 0 - 1 - - wxRA_SPECIFY_COLS - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnScopeChanged - - - - 5 - wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT|wxTOP + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 1 1 @@ -1495,6 +1351,442 @@ OnTableColSize + + 5 + wxEXPAND|wxTOP + 0 + + + bSizer12 + wxHORIZONTAL + none + + 5 + wxEXPAND + 0 + + wxID_ANY + Scope + + sbSizer2 + wxHORIZONTAL + 1 + none + + 6 + + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Entire project + + 0 + + + 0 + + 1 + m_radioProject + 1 + + + protected + 1 + + Resizable + 1 + + wxRB_GROUP + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + OnScopeChanged + + + + 12 + wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Current sheet only + + 0 + + + 0 + + 1 + m_radioCurrentSheet + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + OnScopeChanged + + + + 6 + + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Recursive + + 0 + + + 0 + + 1 + m_radioRecursive + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + OnScopeChanged + + + + + + 5 + wxEXPAND + 1 + + 0 + protected + 12 + + + + 5 + wxEXPAND + 0 + + wxID_ANY + Cross Probe Action + + sbSizer1 + wxHORIZONTAL + 1 + none + + 8 + + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Highlight + + 0 + + + 0 + + 1 + m_radioHighlight + 1 + + + protected + 1 + + Resizable + 1 + + wxRB_GROUP + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + + + + 12 + wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Select + + 0 + + + 0 + + 1 + m_radioSelect + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + + + + 8 + + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Off + + 0 + + + 0 + + 1 + m_radioOff + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + + + + + + diff --git a/eeschema/dialogs/dialog_symbol_fields_table_base.h b/eeschema/dialogs/dialog_symbol_fields_table_base.h index 92e899adf2..fad2c212e0 100644 --- a/eeschema/dialogs/dialog_symbol_fields_table_base.h +++ b/eeschema/dialogs/dialog_symbol_fields_table_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -31,8 +31,9 @@ class WX_GRID; #include #include #include -#include #include +#include +#include #include #include #include @@ -69,9 +70,13 @@ class DIALOG_SYMBOL_FIELDS_TABLE_BASE : public DIALOG_SHIM wxCheckBox* m_groupSymbolsBox; BITMAP_BUTTON* m_separator3; wxBitmapButton* m_bRefresh; - wxRadioBox* m_radioSelect; - wxRadioBox* m_radioScope; WX_GRID* m_grid; + wxRadioButton* m_radioProject; + wxRadioButton* m_radioCurrentSheet; + wxRadioButton* m_radioRecursive; + wxRadioButton* m_radioHighlight; + wxRadioButton* m_radioSelect; + wxRadioButton* m_radioOff; wxPanel* m_panelExport; wxStaticText* m_labelBomExportPresets; wxChoice* m_cbBomFmtPresets; @@ -113,11 +118,11 @@ class DIALOG_SYMBOL_FIELDS_TABLE_BASE : public DIALOG_SHIM virtual void OnExcludeDNPToggled( wxCommandEvent& event ) { event.Skip(); } virtual void OnGroupSymbolsToggled( wxCommandEvent& event ) { event.Skip(); } virtual void OnRegroupSymbols( wxCommandEvent& event ) { event.Skip(); } - virtual void OnScopeChanged( wxCommandEvent& event ) { event.Skip(); } virtual void OnTableValueChanged( wxGridEvent& event ) { event.Skip(); } virtual void OnTableCellClick( wxGridEvent& event ) { event.Skip(); } virtual void OnTableItemContextMenu( wxGridEvent& event ) { event.Skip(); } virtual void OnTableColSize( wxGridSizeEvent& event ) { event.Skip(); } + virtual void OnScopeChanged( wxCommandEvent& event ) { event.Skip(); } virtual void OnPreviewRefresh( wxCommandEvent& event ) { event.Skip(); } virtual void OnOutputFileBrowseClicked( wxCommandEvent& event ) { event.Skip(); } virtual void OnExport( wxCommandEvent& event ) { event.Skip(); }