diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic.cpp b/eeschema/dialogs/dialog_edit_component_in_schematic.cpp
index 2c255e0e14..405e76afbe 100644
--- a/eeschema/dialogs/dialog_edit_component_in_schematic.cpp
+++ b/eeschema/dialogs/dialog_edit_component_in_schematic.cpp
@@ -824,12 +824,7 @@ void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::InitBuffers( SCH_COMPONENT* aComponent
// values from the component will be set.
if( !schField )
{
- if( !it->m_Visible )
- fld.SetVisible( false );
- else
- fld.SetVisible( true );
-
- fld.SetText( it->m_Value ); // empty? ok too.
+ fld.SetVisible( it->m_Visible );
}
else
{
diff --git a/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp b/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp
index 30ca15f633..15217937af 100644
--- a/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp
+++ b/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp
@@ -650,12 +650,7 @@ void DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB::initBuffers()
if( !libField )
{
fld.SetName( it->m_Name );
- fld.SetText( it->m_Value ); // empty? ok too.
-
- if( !it->m_Visible )
- fld.SetVisible( false );
- else
- fld.SetVisible( true );
+ fld.SetVisible( it->m_Visible );
}
else
{
diff --git a/eeschema/dialogs/dialog_eeschema_options.cpp b/eeschema/dialogs/dialog_eeschema_options.cpp
index d2df9408e0..56bb00bf02 100644
--- a/eeschema/dialogs/dialog_eeschema_options.cpp
+++ b/eeschema/dialogs/dialog_eeschema_options.cpp
@@ -207,7 +207,6 @@ void DIALOG_EESCHEMA_OPTIONS::OnAddButtonClick( wxCommandEvent& event )
// Add a new fieldname to the fieldname list
TEMPLATE_FIELDNAME newFieldname = TEMPLATE_FIELDNAME( "Fieldname" );
- newFieldname.m_Value = wxT( "Value" );
newFieldname.m_Visible = false;
templateFields.insert( pos, newFieldname );
TransferDataToFieldGrid();
@@ -345,18 +344,15 @@ bool DIALOG_EESCHEMA_OPTIONS::TransferDataToFieldGrid()
for( int row = 0; row < m_fieldGrid->GetNumberRows(); ++row )
{
m_fieldGrid->SetCellValue( row, 0, templateFields[row].m_Name );
- m_fieldGrid->SetCellValue( row, 1, templateFields[row].m_Value );
- m_fieldGrid->SetCellValue( row, 2,
- templateFields[row].m_Visible ? wxT( "1" ) : wxEmptyString );
+ m_fieldGrid->SetCellValue( row, 1, templateFields[row].m_Visible ? wxT( "1" ) : wxEmptyString );
// Set cell properties
m_fieldGrid->SetCellAlignment( row, 0, wxALIGN_LEFT, wxALIGN_CENTRE );
- m_fieldGrid->SetCellAlignment( row, 1, wxALIGN_LEFT, wxALIGN_CENTRE );
// Render the Visible column as a check box
- m_fieldGrid->SetCellEditor( row, 2, new wxGridCellBoolEditor() );
- m_fieldGrid->SetCellRenderer( row, 2, new wxGridCellBoolRenderer() );
- m_fieldGrid->SetCellAlignment( row, 2, wxALIGN_CENTRE, wxALIGN_CENTRE );
+ m_fieldGrid->SetCellEditor( row, 1, new wxGridCellBoolEditor() );
+ m_fieldGrid->SetCellRenderer( row, 1, new wxGridCellBoolRenderer() );
+ m_fieldGrid->SetCellAlignment( row, 1, wxALIGN_CENTRE, wxALIGN_CENTRE );
}
m_fieldGrid->AutoSizeRows();
@@ -374,8 +370,7 @@ bool DIALOG_EESCHEMA_OPTIONS::TransferDataFromFieldGrid()
for( int row = 0; row < m_fieldGrid->GetNumberRows(); ++row )
{
templateFields[row].m_Name = m_fieldGrid->GetCellValue( row, 0 );
- templateFields[row].m_Value = m_fieldGrid->GetCellValue( row, 1 );
- templateFields[row].m_Visible = ( m_fieldGrid->GetCellValue( row, 2 ) != wxEmptyString );
+ templateFields[row].m_Visible = ( m_fieldGrid->GetCellValue( row, 1 ) != wxEmptyString );
}
return true;
diff --git a/eeschema/dialogs/dialog_eeschema_options_base.cpp b/eeschema/dialogs/dialog_eeschema_options_base.cpp
index e3119d8bbd..e75aab50ff 100644
--- a/eeschema/dialogs/dialog_eeschema_options_base.cpp
+++ b/eeschema/dialogs/dialog_eeschema_options_base.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Apr 19 2018)
+// C++ code generated with wxFormBuilder (version Dec 30 2017)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!
@@ -327,24 +327,20 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx
m_fieldGrid = new wxGrid( m_panel2, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
// Grid
- m_fieldGrid->CreateGrid( 0, 3 );
+ m_fieldGrid->CreateGrid( 0, 2 );
m_fieldGrid->EnableEditing( true );
m_fieldGrid->EnableGridLines( true );
m_fieldGrid->EnableDragGridSize( false );
m_fieldGrid->SetMargins( 0, 0 );
// Columns
- m_fieldGrid->SetColSize( 0, 150 );
- m_fieldGrid->SetColSize( 1, 150 );
- m_fieldGrid->SetColSize( 2, 75 );
+ m_fieldGrid->SetColSize( 0, 300 );
+ m_fieldGrid->SetColSize( 1, 75 );
m_fieldGrid->EnableDragColMove( false );
m_fieldGrid->EnableDragColSize( true );
- m_fieldGrid->SetColLabelSize( 30 );
+ m_fieldGrid->SetColLabelSize( 22 );
m_fieldGrid->SetColLabelValue( 0, _("Name") );
- m_fieldGrid->SetColLabelValue( 1, _("Default Value") );
- m_fieldGrid->SetColLabelValue( 2, _("Visible") );
- m_fieldGrid->SetColLabelValue( 3, _("Name") );
- m_fieldGrid->SetColLabelValue( 4, wxEmptyString );
+ m_fieldGrid->SetColLabelValue( 1, _("Visible") );
m_fieldGrid->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
// Rows
@@ -380,7 +376,7 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx
m_panel2->SetSizer( bSizer6 );
m_panel2->Layout();
bSizer6->Fit( m_panel2 );
- m_notebook->AddPage( m_panel2, _("Default Fields"), false );
+ m_notebook->AddPage( m_panel2, _("Field Name Templates"), false );
bOptionsSizer->Add( m_notebook, 1, wxALL|wxEXPAND, 5 );
diff --git a/eeschema/dialogs/dialog_eeschema_options_base.fbp b/eeschema/dialogs/dialog_eeschema_options_base.fbp
index ffe0b27226..6f77c893da 100644
--- a/eeschema/dialogs/dialog_eeschema_options_base.fbp
+++ b/eeschema/dialogs/dialog_eeschema_options_base.fbp
@@ -14,7 +14,6 @@
dialog_eeschema_options_base
1000
none
-
1
dialog_eeschema_options
@@ -4786,11 +4785,11 @@
-