From 6ee5476fbabdf18719f116cd5235eb57cefc8451 Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Sun, 14 Feb 2021 23:44:42 +0000
Subject: [PATCH] Remove misleading help text for now.

Fixes https://gitlab.com/kicad/code/kicad/issues/7536
---
 pcbnew/dialogs/dialog_get_footprint_by_name.h        | 5 ++++-
 pcbnew/dialogs/dialog_get_footprint_by_name_base.cpp | 6 +++---
 pcbnew/dialogs/dialog_get_footprint_by_name_base.fbp | 6 ++----
 pcbnew/dialogs/dialog_get_footprint_by_name_base.h   | 2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/pcbnew/dialogs/dialog_get_footprint_by_name.h b/pcbnew/dialogs/dialog_get_footprint_by_name.h
index 17f10bc167..234b9fdf10 100644
--- a/pcbnew/dialogs/dialog_get_footprint_by_name.h
+++ b/pcbnew/dialogs/dialog_get_footprint_by_name.h
@@ -47,9 +47,12 @@ public:
         m_choiceFpList->Append( aFpList );
 
         wxFont infoFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT );
-        infoFont.SetSymbolicSize( wxFONTSIZE_SMALL );
+        infoFont.SetSymbolicSize( wxFONTSIZE_X_SMALL );
         m_multipleHint->SetFont( infoFont );
 
+        // Hide help string until someone implements successive placement (#2227)
+        m_multipleHint->Show( false );
+
         // Dialog should not shrink beyond it's minimal size.
         GetSizer()->SetSizeHints( this );
     }
diff --git a/pcbnew/dialogs/dialog_get_footprint_by_name_base.cpp b/pcbnew/dialogs/dialog_get_footprint_by_name_base.cpp
index 58b595800a..1ee866c350 100644
--- a/pcbnew/dialogs/dialog_get_footprint_by_name_base.cpp
+++ b/pcbnew/dialogs/dialog_get_footprint_by_name_base.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.9.0 Nov  1 2020)
+// C++ code generated with wxFormBuilder (version Oct 26 2018)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -30,13 +30,13 @@ DIALOG_GET_FOOTPRINT_BY_NAME_BASE::DIALOG_GET_FOOTPRINT_BY_NAME_BASE( wxWindow*
 	gbSizer1->Add( m_staticTextRef, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
 
 	m_SearchTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 200,-1 ), 0 );
-	gbSizer1->Add( m_SearchTextCtrl, wxGBPosition( 0, 1 ), wxGBSpan( 1, 1 ), wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+	gbSizer1->Add( m_SearchTextCtrl, wxGBPosition( 0, 1 ), wxGBSpan( 1, 1 ), wxEXPAND|wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
 
 	m_multipleHint = new wxStaticText( this, wxID_ANY, _("(specify multiple items separated by spaces for successive placement)"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_multipleHint->Wrap( -1 );
 	gbSizer1->Add( m_multipleHint, wxGBPosition( 1, 0 ), wxGBSpan( 1, 2 ), wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 );
 
-	m_staticTextRef1 = new wxStaticText( this, wxID_ANY, _("Available:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextRef1 = new wxStaticText( this, wxID_ANY, _("Available footprints:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticTextRef1->Wrap( -1 );
 	gbSizer1->Add( m_staticTextRef1, wxGBPosition( 3, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
 
diff --git a/pcbnew/dialogs/dialog_get_footprint_by_name_base.fbp b/pcbnew/dialogs/dialog_get_footprint_by_name_base.fbp
index 2892c134ae..0bdd9baa25 100644
--- a/pcbnew/dialogs/dialog_get_footprint_by_name_base.fbp
+++ b/pcbnew/dialogs/dialog_get_footprint_by_name_base.fbp
@@ -14,7 +14,6 @@
         <property name="file">dialog_get_footprint_by_name_base</property>
         <property name="first_id">1000</property>
         <property name="help_provider">none</property>
-        <property name="image_path_wrapper_function_name"></property>
         <property name="indent_with_spaces"></property>
         <property name="internationalize">1</property>
         <property name="name">dialog_get_footprint_by_name</property>
@@ -26,7 +25,6 @@
         <property name="skip_php_events">1</property>
         <property name="skip_python_events">1</property>
         <property name="ui_table">UI</property>
-        <property name="use_array_enum">0</property>
         <property name="use_enum">0</property>
         <property name="use_microsoft_bom">0</property>
         <object class="Dialog" expanded="1">
@@ -153,7 +151,7 @@
                                     <property name="border">5</property>
                                     <property name="colspan">1</property>
                                     <property name="column">1</property>
-                                    <property name="flag">wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL</property>
+                                    <property name="flag">wxEXPAND|wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL</property>
                                     <property name="row">0</property>
                                     <property name="rowspan">1</property>
                                     <object class="wxTextCtrl" expanded="1">
@@ -315,7 +313,7 @@
                                         <property name="gripper">0</property>
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
-                                        <property name="label">Available:</property>
+                                        <property name="label">Available footprints:</property>
                                         <property name="markup">0</property>
                                         <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
diff --git a/pcbnew/dialogs/dialog_get_footprint_by_name_base.h b/pcbnew/dialogs/dialog_get_footprint_by_name_base.h
index 0f08462df7..d6196b8071 100644
--- a/pcbnew/dialogs/dialog_get_footprint_by_name_base.h
+++ b/pcbnew/dialogs/dialog_get_footprint_by_name_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.9.0 Nov  1 2020)
+// C++ code generated with wxFormBuilder (version Oct 26 2018)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!