diff --git a/eeschema/fields_grid_table.cpp b/eeschema/fields_grid_table.cpp index d0b40c168a..e1848d5690 100644 --- a/eeschema/fields_grid_table.cpp +++ b/eeschema/fields_grid_table.cpp @@ -82,13 +82,13 @@ FIELDS_GRID_TABLE::FIELDS_GRID_TABLE( DIALOG_SHIM* aDialog, SCH_BASE_FRAME* a m_urlAttr = new wxGridCellAttr; GRID_CELL_URL_EDITOR* urlEditor = new GRID_CELL_URL_EDITOR( aDialog ); urlEditor->SetValidator( SCH_FIELD_VALIDATOR( aFrame->IsType( FRAME_SCH_LIB_EDITOR ), - DATASHEET ) ); + FIELD_VALUE ) ); m_urlAttr->SetEditor( urlEditor ); m_nonUrlAttr = new wxGridCellAttr; wxGridCellTextEditor* nonUrlEditor = new wxGridCellTextEditor(); nonUrlEditor->SetValidator( SCH_FIELD_VALIDATOR( aFrame->IsType( FRAME_SCH_LIB_EDITOR ), - DATASHEET ) ); + FIELD_VALUE ) ); m_nonUrlAttr->SetEditor( nonUrlEditor ); m_boolAttr = new wxGridCellAttr; diff --git a/eeschema/sch_validators.cpp b/eeschema/sch_validators.cpp index 58cfc1da08..c2a136b16d 100644 --- a/eeschema/sch_validators.cpp +++ b/eeschema/sch_validators.cpp @@ -82,12 +82,13 @@ bool SCH_FIELD_VALIDATOR::Validate( wxWindow *aParent ) switch( m_fieldId ) { - case FIELD_NAME: fieldName = _( "field name" ); break; - case REFERENCE: fieldName = _( "reference field" ); break; - case VALUE: fieldName = _( "value field" ); break; - case FOOTPRINT: fieldName = _( "footprint field" ); break; - case DATASHEET: fieldName = _( "datasheet field" ); break; - default: fieldName = _( "user defined field" ); break; + case FIELD_NAME: fieldName = _( "field name" ); break; + case FIELD_VALUE: fieldName = _( "field value" ); break; + case REFERENCE: fieldName = _( "reference field" ); break; + case VALUE: fieldName = _( "value field" ); break; + case FOOTPRINT: fieldName = _( "footprint field" ); break; + case DATASHEET: fieldName = _( "datasheet field" ); break; + default: fieldName = _( "user defined field" ); break; }; wxString msg; diff --git a/eeschema/sch_validators.h b/eeschema/sch_validators.h index 93c30e8b4a..ad3012af84 100644 --- a/eeschema/sch_validators.h +++ b/eeschema/sch_validators.h @@ -34,6 +34,7 @@ #define FIELD_NAME -1 +#define FIELD_VALUE -2 /**