Eeschema dialog improvements.

* Use the proper verb Annotate in the Annotate dialog for the action button
* Used the proper verb Generate in the Netlist dialog for the action button
* Fix ERC dialog title to be "Electrical Rules Checker".
* Fix all usages of "Erc" to "ERC" consistently in ERC dialog.
* Move action buttons to bottom of ERC dialog and change Del Markers to
  Delete Markers.
* Add tooltips to ERC options matrix buttons to indicate their current state.
* Cleanup ERC options code that for some reason decided to delete the button
  and recreate it instead of just updating it's bitmap directly.
* Rename "Test ERC" to "Run" to describe what it's actually doing properly

eeschema/dialogs/dialog_annotate_base.cpp

 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Apr 10 2012)
+// C++ code generated with wxFormBuilder (version Jun  6 2014)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!
@@ -205,7 +205,7 @@ DIALOG_ANNOTATE_BASE::DIALOG_ANNOTATE_BASE( wxWindow* parent, wxWindowID id, con
 	m_btnClear = new wxButton( this, ID_CLEAR_ANNOTATION_CMP, _("Clear Annotation"), wxDefaultPosition, wxDefaultSize, 0 );
 	bButtonsSizer->Add( m_btnClear, 0, wxALL|wxEXPAND, 5 );
 	
-	m_btnApply = new wxButton( this, wxID_APPLY, _("Annotation"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_btnApply = new wxButton( this, wxID_APPLY, _("Annotate"), wxDefaultPosition, wxDefaultSize, 0 );
 	bButtonsSizer->Add( m_btnApply, 0, wxALL|wxEXPAND, 5 );
 	
 	

eeschema/dialogs/dialog_annotate_base.fbp

 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <wxFormBuilder_Project>
-    <FileVersion major="1" minor="11" />
+    <FileVersion major="1" minor="13" />
     <object class="Project" expanded="1">
         <property name="class_decoration"></property>
         <property name="code_generation">C++</property>
@@ -20,8 +20,10 @@
         <property name="path">.</property>
         <property name="precompiled_header"></property>
         <property name="relative_path">1</property>
+        <property name="skip_lua_events">1</property>
         <property name="skip_php_events">1</property>
         <property name="skip_python_events">1</property>
+        <property name="ui_table">UI</property>
         <property name="use_enum">0</property>
         <property name="use_microsoft_bom">0</property>
         <object class="Dialog" expanded="1">
@@ -42,7 +44,7 @@
             <property name="minimum_size"></property>
             <property name="name">DIALOG_ANNOTATE_BASE</property>
             <property name="pos"></property>
-            <property name="size">432,454</property>
+            <property name="size">432,550</property>
             <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
             <property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
             <property name="title">Annotate Schematic</property>
@@ -2398,7 +2400,7 @@
                                         <property name="gripper">0</property>
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_APPLY</property>
-                                        <property name="label">Annotation</property>
+                                        <property name="label">Annotate</property>
                                         <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
                                         <property name="maximum_size"></property>

eeschema/dialogs/dialog_annotate_base.h

 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Apr 10 2012)
+// C++ code generated with wxFormBuilder (version Jun  6 2014)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!
@@ -11,6 +11,8 @@
 #include <wx/artprov.h>
 #include <wx/xrc/xmlres.h>
 #include <wx/intl.h>
+class DIALOG_SHIM;
+
 #include "dialog_shim.h"
 #include <wx/string.h>
 #include <wx/stattext.h>
@@ -81,7 +83,7 @@ class DIALOG_ANNOTATE_BASE : public DIALOG_SHIM
 	
 	public:
 		
-		DIALOG_ANNOTATE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Annotate Schematic"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 432,454 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
+		DIALOG_ANNOTATE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Annotate Schematic"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 432,550 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
 		~DIALOG_ANNOTATE_BASE();
 	
 };

eeschema/dialogs/dialog_erc.cpp

@@ -88,18 +88,7 @@ void DIALOG_ERC::Init()
     m_WriteResultOpt->SetValue( m_writeErcFile );
 
     SCH_SCREENS screens;
-    int markers = screens.GetMarkerCount();
-    int warnings = screens.GetMarkerCount( WAR );
-
-    wxString num;
-    num.Printf( wxT( "%d" ), markers );
-    m_TotalErrCount->SetLabel( num );
-
-    num.Printf( wxT( "%d" ), markers - warnings );
-    m_LastErrCount->SetLabel( num );
-
-    num.Printf( wxT( "%d" ), warnings );
-    m_LastWarningCount->SetLabel( num );
+    updateMarkerCounts( &screens );
 
     DisplayERC_MarkersList();
 
@@ -110,6 +99,22 @@ void DIALOG_ERC::Init()
     m_buttonERC->SetDefault();
 }
 
+void DIALOG_ERC::updateMarkerCounts( SCH_SCREENS *screens )
+{
+    int markers = screens->GetMarkerCount();
+    int warnings = screens->GetMarkerCount( WAR );
+
+    wxString num;
+    num.Printf( wxT( "%d" ), markers );
+    m_TotalErrCount->SetValue( num );
+
+    num.Printf( wxT( "%d" ), markers - warnings );
+    m_LastErrCount->SetValue( num );
+
+    num.Printf( wxT( "%d" ), warnings );
+    m_LastWarningCount->SetValue( num );
+}
+
 /* Delete the old ERC markers, over the whole hierarchy
  */
 void DIALOG_ERC::OnEraseDrcMarkersClick( wxCommandEvent& event )
@@ -117,6 +122,8 @@ void DIALOG_ERC::OnEraseDrcMarkersClick( wxCommandEvent& event )
     SCH_SCREENS ScreenList;
 
     ScreenList.DeleteAllMarkers( MARK_ERC );
+    updateMarkerCounts( &ScreenList );
+
     m_MarkersList->ClearList();
     m_parent->GetCanvas()->Refresh();
 }
@@ -289,30 +296,14 @@ void DIALOG_ERC::ReBuildMatrixPanel()
             }
 
             int event_id = ID_MATRIX_0 + ii + ( jj * PIN_NMAX );
-            BITMAP_DEF bitmap_butt = NULL;
-
-            // Add button on matrix
-            switch( diag )
-            {
-            case OK:
-                bitmap_butt = erc_green_xpm;
-                break;
-
-            case WAR:
-                bitmap_butt = ercwarn_xpm ;
-                break;
-
-            default:
-            case ERR:
-                bitmap_butt = ercerr_xpm;
-                break;
-            }
+            BITMAP_DEF bitmap_butt = erc_green_xpm;
 
             delete m_buttonList[ii][jj];
             m_buttonList[ii][jj] = new wxBitmapButton( m_matrixPanel,
                                                        event_id,
                                                        KiBitmap( bitmap_butt ),
                                                        wxPoint( x, y ) );
+            setDRCMatrixButtonState( m_buttonList[ii][jj], diag );
         }
     }
 
@@ -320,6 +311,37 @@ void DIALOG_ERC::ReBuildMatrixPanel()
 }
 
 
+void DIALOG_ERC::setDRCMatrixButtonState( wxBitmapButton *aButton, int aState )
+{
+    BITMAP_DEF bitmap_butt = NULL;
+    wxString tooltip;
+
+    switch( aState )
+    {
+    case OK:
+        bitmap_butt = erc_green_xpm;
+        tooltip = _("No error or warning");
+        break;
+
+    case WAR:
+        bitmap_butt = ercwarn_xpm;
+        tooltip = _("Generate warning");
+        break;
+
+    case ERR:
+        bitmap_butt = ercerr_xpm;
+        tooltip = _("Generate error");
+        break;
+    }
+    
+    if( bitmap_butt )
+    {
+        aButton->SetBitmap(KiBitmap( bitmap_butt ));
+        aButton->SetToolTip(tooltip);
+    }
+}
+
+
 void DIALOG_ERC::DisplayERC_MarkersList()
 {
     SCH_SHEET_LIST sheetList;
@@ -359,7 +381,6 @@ void DIALOG_ERC::ResetDefaultERCDiag( wxCommandEvent& event )
 void DIALOG_ERC::ChangeErrorLevel( wxCommandEvent& event )
 {
     int             id, level, ii, x, y;
-    BITMAP_DEF      new_bitmap_butt = NULL;
     wxPoint         pos;
 
     id   = event.GetId();
@@ -371,33 +392,25 @@ void DIALOG_ERC::ChangeErrorLevel( wxCommandEvent& event )
 
     level = DiagErc[y][x];
 
+    //change to the next error level
     switch( level )
     {
     case OK:
         level = WAR;
-        new_bitmap_butt = ercwarn_xpm;
         break;
 
     case WAR:
         level = ERR;
-        new_bitmap_butt = ercerr_xpm;
         break;
 
     case ERR:
         level = OK;
-        new_bitmap_butt = erc_green_xpm;
         break;
     }
 
-    if( new_bitmap_butt )
-    {
-        delete butt;
-        butt = new wxBitmapButton( m_matrixPanel, id,
-                                   KiBitmap( new_bitmap_butt ), pos );
+    setDRCMatrixButtonState( butt, level);
 
-        m_buttonList[y][x] = butt;
-        DiagErc[y][x] = DiagErc[x][y] = level;
-    }
+    DiagErc[y][x] = DiagErc[x][y] = level;
 }
 
 
@@ -515,18 +528,7 @@ void DIALOG_ERC::TestErc( wxArrayString* aMessagesList )
     }
 
     // Displays global results:
-    wxString num;
-    int markers = screens.GetMarkerCount();
-    int warnings = screens.GetMarkerCount( WAR );
-
-    num.Printf( wxT( "%d" ), markers );
-    m_TotalErrCount->SetLabel( num );
-
-    num.Printf( wxT( "%d" ), markers - warnings );
-    m_LastErrCount->SetLabel( num );
-
-    num.Printf( wxT( "%d" ), warnings );
-    m_LastWarningCount->SetLabel( num );
+    updateMarkerCounts(&screens);
 
     // Display diags:
     DisplayERC_MarkersList();

eeschema/dialogs/dialog_erc.h

@@ -61,6 +61,8 @@ private:
     void ResetDefaultERCDiag( wxCommandEvent& event );
     void ChangeErrorLevel( wxCommandEvent& event );
     void ReBuildMatrixPanel();
+    void setDRCMatrixButtonState( wxBitmapButton *aButton, int aState );
+    void updateMarkerCounts( SCH_SCREENS *screens );
 };
 
 

eeschema/dialogs/dialog_erc_base.cpp

 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Nov  6 2013)
+// C++ code generated with wxFormBuilder (version Jun  6 2014)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!
@@ -13,11 +13,11 @@
 
 BEGIN_EVENT_TABLE( DIALOG_ERC_BASE, DIALOG_SHIM )
 	EVT_CLOSE( DIALOG_ERC_BASE::_wxFB_OnCloseErcDialog )
-	EVT_BUTTON( ID_ERC_CMP, DIALOG_ERC_BASE::_wxFB_OnErcCmpClick )
-	EVT_BUTTON( ID_ERASE_DRC_MARKERS, DIALOG_ERC_BASE::_wxFB_OnEraseDrcMarkersClick )
-	EVT_BUTTON( wxID_CANCEL, DIALOG_ERC_BASE::_wxFB_OnButtonCloseClick )
 	EVT_LISTBOX( ID_MAKER_HTMLLISTBOX, DIALOG_ERC_BASE::_wxFB_OnLeftClickMarkersList )
 	EVT_LISTBOX_DCLICK( ID_MAKER_HTMLLISTBOX, DIALOG_ERC_BASE::_wxFB_OnLeftDblClickMarkersList )
+	EVT_BUTTON( ID_ERASE_DRC_MARKERS, DIALOG_ERC_BASE::_wxFB_OnEraseDrcMarkersClick )
+	EVT_BUTTON( ID_ERC_CMP, DIALOG_ERC_BASE::_wxFB_OnErcCmpClick )
+	EVT_BUTTON( wxID_CANCEL, DIALOG_ERC_BASE::_wxFB_OnButtonCloseClick )
 	EVT_BUTTON( ID_RESET_MATRIX, DIALOG_ERC_BASE::_wxFB_OnResetMatrixClick )
 END_EVENT_TABLE()
 
@@ -37,26 +37,26 @@ DIALOG_ERC_BASE::DIALOG_ERC_BASE( wxWindow* parent, wxWindowID id, const wxStrin
 	bupperSizer = new wxBoxSizer( wxHORIZONTAL );
 	
 	wxStaticBoxSizer* sdiagSizer;
-	sdiagSizer = new wxStaticBoxSizer( new wxStaticBox( m_PanelERC, wxID_ANY, _("Erc report:") ), wxVERTICAL );
+	sdiagSizer = new wxStaticBoxSizer( new wxStaticBox( m_PanelERC, wxID_ANY, _("ERC Report:") ), wxVERTICAL );
 	
 	wxGridSizer* gSizeDiag;
 	gSizeDiag = new wxGridSizer( 3, 2, 0, 0 );
 	
-	m_ErcTotalErrorsText = new wxStaticText( m_PanelERC, wxID_ANY, _("Total errors count:  "), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
+	m_ErcTotalErrorsText = new wxStaticText( m_PanelERC, wxID_ANY, _("Total:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
 	m_ErcTotalErrorsText->Wrap( -1 );
 	gSizeDiag->Add( m_ErcTotalErrorsText, 0, wxALIGN_CENTER_VERTICAL, 5 );
 	
 	m_TotalErrCount = new wxTextCtrl( m_PanelERC, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
 	gSizeDiag->Add( m_TotalErrCount, 0, wxALIGN_CENTER_VERTICAL, 5 );
 	
-	m_WarnErcErrorsText = new wxStaticText( m_PanelERC, wxID_ANY, _("Warnings count:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
+	m_WarnErcErrorsText = new wxStaticText( m_PanelERC, wxID_ANY, _("Warnings:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
 	m_WarnErcErrorsText->Wrap( -1 );
 	gSizeDiag->Add( m_WarnErcErrorsText, 0, wxALIGN_CENTER_VERTICAL, 5 );
 	
 	m_LastWarningCount = new wxTextCtrl( m_PanelERC, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
 	gSizeDiag->Add( m_LastWarningCount, 0, wxALIGN_CENTER_VERTICAL, 5 );
 	
-	m_LastErrCountText = new wxStaticText( m_PanelERC, wxID_ANY, _("Errors count:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
+	m_LastErrCountText = new wxStaticText( m_PanelERC, wxID_ANY, _("Errors:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
 	m_LastErrCountText->Wrap( -1 );
 	gSizeDiag->Add( m_LastErrCountText, 0, wxALIGN_CENTER_VERTICAL, 5 );
 	
@@ -86,24 +86,8 @@ DIALOG_ERC_BASE::DIALOG_ERC_BASE( wxWindow* parent, wxWindowID id, const wxStrin
 	
 	bupperSizer->Add( bSizerMessages, 1, wxEXPAND, 5 );
 	
-	wxBoxSizer* bbuttonsSizer;
-	bbuttonsSizer = new wxBoxSizer( wxVERTICAL );
-	
-	m_buttonERC = new wxButton( m_PanelERC, ID_ERC_CMP, _("&Test Erc"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_buttonERC->SetDefault(); 
-	bbuttonsSizer->Add( m_buttonERC, 0, wxALL|wxEXPAND, 5 );
-	
-	m_buttondelmarkers = new wxButton( m_PanelERC, ID_ERASE_DRC_MARKERS, _("&Del Markers"), wxDefaultPosition, wxDefaultSize, 0 );
-	bbuttonsSizer->Add( m_buttondelmarkers, 0, wxALL|wxEXPAND, 5 );
-	
-	m_buttonClose = new wxButton( m_PanelERC, wxID_CANCEL, _("&Close"), wxDefaultPosition, wxDefaultSize, 0 );
-	bbuttonsSizer->Add( m_buttonClose, 0, wxALL|wxEXPAND, 5 );
-	
-	
-	bupperSizer->Add( bbuttonsSizer, 0, wxALIGN_CENTER_VERTICAL, 5 );
 	
-	
-	bercSizer->Add( bupperSizer, 0, wxEXPAND, 5 );
+	bercSizer->Add( bupperSizer, 0, wxALL|wxEXPAND, 5 );
 	
 	m_textMarkers = new wxStaticText( m_PanelERC, wxID_ANY, _("Error list:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_textMarkers->Wrap( -1 );
@@ -114,6 +98,22 @@ DIALOG_ERC_BASE::DIALOG_ERC_BASE( wxWindow* parent, wxWindowID id, const wxStrin
 	
 	bercSizer->Add( m_MarkersList, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 	
+	wxBoxSizer* bbuttonsSizer;
+	bbuttonsSizer = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_buttondelmarkers = new wxButton( m_PanelERC, ID_ERASE_DRC_MARKERS, _("&Delete Markers"), wxDefaultPosition, wxDefaultSize, 0 );
+	bbuttonsSizer->Add( m_buttondelmarkers, 0, wxALL|wxEXPAND, 5 );
+	
+	m_buttonERC = new wxButton( m_PanelERC, ID_ERC_CMP, _("&Run"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_buttonERC->SetDefault(); 
+	bbuttonsSizer->Add( m_buttonERC, 0, wxALL|wxEXPAND, 5 );
+	
+	m_buttonClose = new wxButton( m_PanelERC, wxID_CANCEL, _("&Close"), wxDefaultPosition, wxDefaultSize, 0 );
+	bbuttonsSizer->Add( m_buttonClose, 0, wxALL|wxEXPAND, 5 );
+	
+	
+	bercSizer->Add( bbuttonsSizer, 0, wxALIGN_RIGHT, 5 );
+	
 	
 	m_PanelERC->SetSizer( bercSizer );
 	m_PanelERC->Layout();

eeschema/dialogs/dialog_erc_base.h

 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Nov  6 2013)
+// C++ code generated with wxFormBuilder (version Jun  6 2014)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!
@@ -25,8 +25,8 @@ class ERC_HTML_LISTBOX;
 #include <wx/sizer.h>
 #include <wx/checkbox.h>
 #include <wx/statbox.h>
-#include <wx/button.h>
 #include <wx/listbox.h>
+#include <wx/button.h>
 #include <wx/panel.h>
 #include <wx/bitmap.h>
 #include <wx/image.h>
@@ -46,20 +46,20 @@ class DIALOG_ERC_BASE : public DIALOG_SHIM
 		
 		// Private event handlers
 		void _wxFB_OnCloseErcDialog( wxCloseEvent& event ){ OnCloseErcDialog( event ); }
-		void _wxFB_OnErcCmpClick( wxCommandEvent& event ){ OnErcCmpClick( event ); }
-		void _wxFB_OnEraseDrcMarkersClick( wxCommandEvent& event ){ OnEraseDrcMarkersClick( event ); }
-		void _wxFB_OnButtonCloseClick( wxCommandEvent& event ){ OnButtonCloseClick( event ); }
 		void _wxFB_OnLeftClickMarkersList( wxCommandEvent& event ){ OnLeftClickMarkersList( event ); }
 		void _wxFB_OnLeftDblClickMarkersList( wxCommandEvent& event ){ OnLeftDblClickMarkersList( event ); }
+		void _wxFB_OnEraseDrcMarkersClick( wxCommandEvent& event ){ OnEraseDrcMarkersClick( event ); }
+		void _wxFB_OnErcCmpClick( wxCommandEvent& event ){ OnErcCmpClick( event ); }
+		void _wxFB_OnButtonCloseClick( wxCommandEvent& event ){ OnButtonCloseClick( event ); }
 		void _wxFB_OnResetMatrixClick( wxCommandEvent& event ){ OnResetMatrixClick( event ); }
 		
 	
 	protected:
 		enum
 		{
-			ID_ERC_CMP = 1000,
+			ID_MAKER_HTMLLISTBOX = 1000,
 			ID_ERASE_DRC_MARKERS,
-			ID_MAKER_HTMLLISTBOX,
+			ID_ERC_CMP,
 			ID_RESET_MATRIX
 		};
 		
@@ -74,28 +74,28 @@ class DIALOG_ERC_BASE : public DIALOG_SHIM
 		wxCheckBox* m_WriteResultOpt;
 		wxStaticText* m_titleMessages;
 		wxTextCtrl* m_MessagesList;
-		wxButton* m_buttonERC;
-		wxButton* m_buttondelmarkers;
-		wxButton* m_buttonClose;
 		wxStaticText* m_textMarkers;
 		ERC_HTML_LISTBOX* m_MarkersList;
+		wxButton* m_buttondelmarkers;
+		wxButton* m_buttonERC;
+		wxButton* m_buttonClose;
 		wxPanel* m_PanelERCOptions;
 		wxButton* m_ResetOptButton;
 		wxPanel* m_matrixPanel;
 		
 		// Virtual event handlers, overide them in your derived class
 		virtual void OnCloseErcDialog( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnErcCmpClick( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnEraseDrcMarkersClick( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnButtonCloseClick( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnLeftClickMarkersList( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnLeftDblClickMarkersList( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnEraseDrcMarkersClick( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnErcCmpClick( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnButtonCloseClick( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnResetMatrixClick( wxCommandEvent& event ) { event.Skip(); }
 		
 	
 	public:
 		
-		DIALOG_ERC_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("EESchema Erc"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 519,392 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
+		DIALOG_ERC_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Electrical Rules Checker"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 519,392 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
 		~DIALOG_ERC_BASE();
 	
 };

eeschema/dialogs/dialog_netlist_base.cpp

 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Apr 10 2012)
+// C++ code generated with wxFormBuilder (version Jun  6 2014)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!
@@ -43,7 +43,7 @@ NETLIST_DIALOG_BASE::NETLIST_DIALOG_BASE( wxWindow* parent, wxWindowID id, const
 	
 	bLeftSizer->Add( 0, 0, 0, wxTOP, 15 );
 	
-	m_buttonNetlist = new wxButton( this, ID_CREATE_NETLIST, _("Netlist"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_buttonNetlist = new wxButton( this, ID_CREATE_NETLIST, _("Generate"), wxDefaultPosition, wxDefaultSize, 0 );
 	bLeftSizer->Add( m_buttonNetlist, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
 	
 	m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -72,6 +72,7 @@ NETLIST_DIALOG_BASE::NETLIST_DIALOG_BASE( wxWindow* parent, wxWindowID id, const
 	bMainSizer->Add( m_staticTextDefaultFN, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 	
 	m_textCtrlDefaultFileName = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
+	m_textCtrlDefaultFileName->SetMaxLength( 0 ); 
 	bMainSizer->Add( m_textCtrlDefaultFileName, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 	
 	
@@ -106,6 +107,7 @@ NETLIST_DIALOG_ADD_PLUGIN_BASE::NETLIST_DIALOG_ADD_PLUGIN_BASE( wxWindow* parent
 	bSizerLeft->Add( m_staticTextCmd, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 	
 	m_textCtrlCommand = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_textCtrlCommand->SetMaxLength( 0 ); 
 	m_textCtrlCommand->SetMinSize( wxSize( 300,-1 ) );
 	
 	bSizerLeft->Add( m_textCtrlCommand, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
@@ -115,6 +117,7 @@ NETLIST_DIALOG_ADD_PLUGIN_BASE::NETLIST_DIALOG_ADD_PLUGIN_BASE( wxWindow* parent
 	bSizerLeft->Add( m_staticTextName, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 	
 	m_textCtrlName = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_textCtrlName->SetMaxLength( 0 ); 
 	bSizerLeft->Add( m_textCtrlName, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 	
 	

eeschema/dialogs/dialog_netlist_base.fbp

 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <wxFormBuilder_Project>
-    <FileVersion major="1" minor="11" />
+    <FileVersion major="1" minor="13" />
     <object class="Project" expanded="1">
         <property name="class_decoration"></property>
         <property name="code_generation">C++</property>
@@ -20,8 +20,10 @@
         <property name="path">.</property>
         <property name="precompiled_header"></property>
         <property name="relative_path">1</property>
+        <property name="skip_lua_events">1</property>
         <property name="skip_php_events">1</property>
         <property name="skip_python_events">1</property>
+        <property name="ui_table">UI</property>
         <property name="use_enum">1</property>
         <property name="use_microsoft_bom">0</property>
         <object class="Dialog" expanded="1">
@@ -247,7 +249,7 @@
                                         <property name="gripper">0</property>
                                         <property name="hidden">0</property>
                                         <property name="id">ID_CREATE_NETLIST</property>
-                                        <property name="label">Netlist</property>
+                                        <property name="label">Generate</property>
                                         <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
                                         <property name="maximum_size"></property>

eeschema/dialogs/dialog_netlist_base.h

 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Apr 10 2012)
+// C++ code generated with wxFormBuilder (version Jun  6 2014)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!
@@ -11,6 +11,8 @@
 #include <wx/artprov.h>
 #include <wx/xrc/xmlres.h>
 #include <wx/intl.h>
+class DIALOG_SHIM;
+
 #include "dialog_shim.h"
 #include <wx/gdicmn.h>
 #include <wx/notebook.h>