haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't tie generic validators to a specific field 

(Partial cherry-pick of 15cd13ba6e)

Fixes #3667
This commit is contained in:
Ian McInerney 2020-01-15 16:12:39 +00:00
parent 8a2705f81f
commit df664bd55f
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eeschema/fields_grid_table.cpp
View File

@ -82,13 +82,13 @@ FIELDS_GRID_TABLE<T>::FIELDS_GRID_TABLE( DIALOG_SHIM* aDialog, SCH_BASE_FRAME* a
m_urlAttr = new wxGridCellAttr; m_urlAttr = new wxGridCellAttr;
GRID_CELL_URL_EDITOR* urlEditor = new GRID_CELL_URL_EDITOR( aDialog ); GRID_CELL_URL_EDITOR* urlEditor = new GRID_CELL_URL_EDITOR( aDialog );
urlEditor->SetValidator( SCH_FIELD_VALIDATOR( aFrame->IsType( FRAME_SCH_LIB_EDITOR ), urlEditor->SetValidator( SCH_FIELD_VALIDATOR( aFrame->IsType( FRAME_SCH_LIB_EDITOR ),
DATASHEET ) ); FIELD_VALUE ) );
m_urlAttr->SetEditor( urlEditor ); m_urlAttr->SetEditor( urlEditor );
m_nonUrlAttr = new wxGridCellAttr; m_nonUrlAttr = new wxGridCellAttr;
wxGridCellTextEditor* nonUrlEditor = new wxGridCellTextEditor(); wxGridCellTextEditor* nonUrlEditor = new wxGridCellTextEditor();
nonUrlEditor->SetValidator( SCH_FIELD_VALIDATOR( aFrame->IsType( FRAME_SCH_LIB_EDITOR ), nonUrlEditor->SetValidator( SCH_FIELD_VALIDATOR( aFrame->IsType( FRAME_SCH_LIB_EDITOR ),
DATASHEET ) ); FIELD_VALUE ) );
m_nonUrlAttr->SetEditor( nonUrlEditor ); m_nonUrlAttr->SetEditor( nonUrlEditor );
m_boolAttr = new wxGridCellAttr; m_boolAttr = new wxGridCellAttr;

13
eeschema/sch_validators.cpp
View File

@ -82,12 +82,13 @@ bool SCH_FIELD_VALIDATOR::Validate( wxWindow *aParent )
switch( m_fieldId ) switch( m_fieldId )
{ {
case FIELD_NAME: fieldName = _( "field name" ); break; case FIELD_NAME: fieldName = _( "field name" ); break;
case REFERENCE: fieldName = _( "reference field" ); break; case FIELD_VALUE: fieldName = _( "field value" ); break;
case VALUE: fieldName = _( "value field" ); break; case REFERENCE: fieldName = _( "reference field" ); break;
case FOOTPRINT: fieldName = _( "footprint field" ); break; case VALUE: fieldName = _( "value field" ); break;
case DATASHEET: fieldName = _( "datasheet field" ); break; case FOOTPRINT: fieldName = _( "footprint field" ); break;
default: fieldName = _( "user defined field" ); break; case DATASHEET: fieldName = _( "datasheet field" ); break;
default: fieldName = _( "user defined field" ); break;
}; };
wxString msg; wxString msg;

1
eeschema/sch_validators.h
View File

@ -34,6 +34,7 @@
#define FIELD_NAME -1 #define FIELD_NAME -1
#define FIELD_VALUE -2
/** /**