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

Don't tie generic validators to a specific field. 

Fixes: lp:1834103
* https://bugs.launchpad.net/kicad/+bug/1834103
This commit is contained in:
Jeff Young 2019-06-26 00:38:28 +01:00
parent cb1fd069f0
commit 15cd13ba6e
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

@ -54,8 +54,8 @@ FIELDS_GRID_TABLE<T>::FIELDS_GRID_TABLE( DIALOG_SHIM* aDialog, SCH_BASE_FRAME* a
m_referenceValidator( aFrame->IsType( FRAME_SCH_LIB_EDITOR ), REFERENCE ), m_referenceValidator( aFrame->IsType( FRAME_SCH_LIB_EDITOR ), REFERENCE ),
m_valueValidator( aFrame->IsType( FRAME_SCH_LIB_EDITOR ), VALUE ), m_valueValidator( aFrame->IsType( FRAME_SCH_LIB_EDITOR ), VALUE ),
m_libIdValidator( LIB_ID::ID_PCB ), m_libIdValidator( LIB_ID::ID_PCB ),
m_urlValidator( aFrame->IsType( FRAME_SCH_LIB_EDITOR ), DATASHEET ), m_urlValidator( aFrame->IsType( FRAME_SCH_LIB_EDITOR ), FIELD_VALUE ),
m_nonUrlValidator( aFrame->IsType( FRAME_SCH_LIB_EDITOR ), DATASHEET ) m_nonUrlValidator( aFrame->IsType( FRAME_SCH_LIB_EDITOR ), FIELD_VALUE )
{ {
// Build the various grid cell attributes. // Build the various grid cell attributes.
// NOTE: validators and cellAttrs are member variables to get the destruction order // NOTE: validators and cellAttrs are member variables to get the destruction order

13
eeschema/sch_validators.cpp
View File

@ -84,12 +84,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
/** /**