Remove confirmation for De Morgan (and spell his name right).

Fixes https://gitlab.com/kicad/code/kicad/issues/9483

eeschema/dialogs/dialog_lib_new_symbol_base.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.9.0 Jun  3 2020)
+// C++ code generated with wxFormBuilder (version Oct 26 2018)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!

eeschema/dialogs/dialog_lib_new_symbol_base.fbp

@@ -14,7 +14,6 @@
         <property name="file">dialog_lib_new_symbol_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_lib_new_symbol_base</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">1</property>
         <property name="use_microsoft_bom">0</property>
         <object class="Dialog" expanded="1">

eeschema/dialogs/dialog_lib_new_symbol_base.h

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.9.0 Jun  3 2020)
+// C++ code generated with wxFormBuilder (version Oct 26 2018)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!

eeschema/dialogs/dialog_lib_symbol_properties.cpp

@@ -272,20 +272,19 @@ bool DIALOG_LIB_SYMBOL_PROPERTIES::Validate()
         }
     }
 
+    /*
+     * Confirm destructive actions.
+     */
+
     if( m_SelNumberOfUnits->GetValue() < m_libEntry->GetUnitCount() )
     {
         if( !IsOK( this, _( "Delete extra units from symbol?" ) ) )
             return false;
     }
 
-    if( m_AsConvertButt->GetValue() && !m_libEntry->HasConversion() )
+    if( !m_AsConvertButt->GetValue() && m_libEntry->HasConversion() )
     {
-        if( !IsOK( this, _( "Add new pins for alternate body style (DeMorgan) to symbol?" ) ) )
+        if( !IsOK( this, _( "Delete alternate body style (De Morgan) from symbol?" ) ) )
-            return false;
-    }
-    else if( !m_AsConvertButt->GetValue() && m_libEntry->HasConversion() )
-    {
-        if( !IsOK( this, _( "Delete alternate body style (DeMorgan) draw items from symbol?" ) ) )
             return false;
     }
 

eeschema/dialogs/dialog_pin_properties.cpp

@@ -221,6 +221,7 @@ DIALOG_PIN_PROPERTIES::DIALOG_PIN_PROPERTIES( SYMBOL_EDIT_FRAME* parent, LIB_PIN
 
     m_addAlternate->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
     m_deleteAlternate->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
+    m_addAlternate->GetParent()->Layout();
 
     m_sdbSizerButtonsOK->SetDefault();
     SetInitialFocus( m_textPinName );

eeschema/dialogs/dialog_pin_properties_base.cpp

@@ -204,6 +204,9 @@ DIALOG_PIN_PROPERTIES_BASE::DIALOG_PIN_PROPERTIES_BASE( wxWindow* parent, wxWind
 	wxBoxSizer* bAlternatesSizer;
 	bAlternatesSizer = new wxBoxSizer( wxVERTICAL );
 
+	wxBoxSizer* bRightMargin;
+	bRightMargin = new wxBoxSizer( wxVERTICAL );
+
 	m_alternatesGrid = new WX_GRID( m_alternatesTurndown->GetPane(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
 
 	// Grid
@@ -236,13 +239,16 @@ DIALOG_PIN_PROPERTIES_BASE::DIALOG_PIN_PROPERTIES_BASE( wxWindow* parent, wxWind
 	m_alternatesGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
 	m_alternatesGrid->SetMinSize( wxSize( -1,100 ) );
 
-	bAlternatesSizer->Add( m_alternatesGrid, 1, wxEXPAND|wxRIGHT, 5 );
+	bRightMargin->Add( m_alternatesGrid, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 );
+
+
+	bAlternatesSizer->Add( bRightMargin, 1, wxEXPAND|wxRIGHT, 5 );
 
 	wxBoxSizer* bButtonSizer;
 	bButtonSizer = new wxBoxSizer( wxHORIZONTAL );
 
 	m_addAlternate = new wxBitmapButton( m_alternatesTurndown->GetPane(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
-	bButtonSizer->Add( m_addAlternate, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	bButtonSizer->Add( m_addAlternate, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
 
 
 	bButtonSizer->Add( 20, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
@@ -251,19 +257,19 @@ DIALOG_PIN_PROPERTIES_BASE::DIALOG_PIN_PROPERTIES_BASE( wxWindow* parent, wxWind
 	bButtonSizer->Add( m_deleteAlternate, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
 
 
-	bAlternatesSizer->Add( bButtonSizer, 0, wxEXPAND|wxTOP, 5 );
+	bAlternatesSizer->Add( bButtonSizer, 0, wxTOP, 5 );
 
 
 	m_alternatesTurndown->GetPane()->SetSizer( bAlternatesSizer );
 	m_alternatesTurndown->GetPane()->Layout();
 	bAlternatesSizer->Fit( m_alternatesTurndown->GetPane() );
-	bLowerSizer->Add( m_alternatesTurndown, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 10 );
+	bLowerSizer->Add( m_alternatesTurndown, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
 
 	mainSizer->Add( bLowerSizer, 1, wxEXPAND|wxLEFT, 5 );
 
 	m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	mainSizer->Add( m_staticline1, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 );
+	mainSizer->Add( m_staticline1, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
 
 	m_sdbSizerButtons = new wxStdDialogButtonSizer();
 	m_sdbSizerButtonsOK = new wxButton( this, wxID_OK );

eeschema/dialogs/dialog_pin_properties_base.fbp

@@ -2301,7 +2301,7 @@
                         <property name="orient">wxVERTICAL</property>
                         <property name="permission">none</property>
                         <object class="sizeritem" expanded="1">
-                            <property name="border">10</property>
+                            <property name="border">5</property>
                             <property name="flag">wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT</property>
                             <property name="proportion">1</property>
                             <object class="wxCollapsiblePane" expanded="1">
@@ -2371,6 +2371,15 @@
                                         <property name="border">5</property>
                                         <property name="flag">wxEXPAND|wxRIGHT</property>
                                         <property name="proportion">1</property>
+                                        <object class="wxBoxSizer" expanded="1">
+                                            <property name="minimum_size"></property>
+                                            <property name="name">bRightMargin</property>
+                                            <property name="orient">wxVERTICAL</property>
+                                            <property name="permission">none</property>
+                                            <object class="sizeritem" expanded="1">
+                                                <property name="border">5</property>
+                                                <property name="flag">wxEXPAND|wxRIGHT|wxLEFT</property>
+                                                <property name="proportion">1</property>
                                                 <object class="wxGrid" expanded="1">
                                                     <property name="BottomDockable">1</property>
                                                     <property name="LeftDockable">1</property>
@@ -2455,9 +2464,11 @@
                                                     <property name="window_style"></property>
                                                 </object>
                                             </object>
+                                        </object>
+                                    </object>
                                     <object class="sizeritem" expanded="1">
                                         <property name="border">5</property>
-                                        <property name="flag">wxEXPAND|wxTOP</property>
+                                        <property name="flag">wxTOP</property>
                                         <property name="proportion">0</property>
                                         <object class="wxBoxSizer" expanded="1">
                                             <property name="minimum_size"></property>
@@ -2466,7 +2477,7 @@
                                             <property name="permission">none</property>
                                             <object class="sizeritem" expanded="1">
                                                 <property name="border">5</property>
-                                                <property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT</property>
+                                                <property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT</property>
                                                 <property name="proportion">0</property>
                                                 <object class="wxBitmapButton" expanded="1">
                                                     <property name="BottomDockable">1</property>
@@ -2629,7 +2640,7 @@
                 </object>
                 <object class="sizeritem" expanded="1">
                     <property name="border">5</property>
-                    <property name="flag">wxEXPAND|wxLEFT|wxRIGHT</property>
+                    <property name="flag">wxEXPAND|wxTOP|wxRIGHT|wxLEFT</property>
                     <property name="proportion">0</property>
                     <object class="wxStaticLine" expanded="1">
                         <property name="BottomDockable">1</property>