From a1508d253138f44af5df37feebbe3094e5eb6bcb Mon Sep 17 00:00:00 2001 From: Wayne Stambaugh Date: Fri, 30 Oct 2020 10:49:24 -0400 Subject: [PATCH] Symbol editor: minor symbol properties dialog layout fixes. --- .../dialogs/dialog_symbol_properties_base.cpp | 16 ++++++------ .../dialogs/dialog_symbol_properties_base.fbp | 25 +++++++++++++------ .../dialogs/dialog_symbol_properties_base.h | 2 +- 3 files changed, 27 insertions(+), 16 deletions(-) diff --git a/eeschema/dialogs/dialog_symbol_properties_base.cpp b/eeschema/dialogs/dialog_symbol_properties_base.cpp index 934fff0a4e..2eb16cbcc6 100644 --- a/eeschema/dialogs/dialog_symbol_properties_base.cpp +++ b/eeschema/dialogs/dialog_symbol_properties_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.9.0 Jun 18 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -125,14 +125,14 @@ DIALOG_SYMBOL_PROPERTIES_BASE::DIALOG_SYMBOL_PROPERTIES_BASE( wxWindow* parent, m_unitLabel = new wxStaticText( sbGeneralProps->GetStaticBox(), wxID_ANY, _("Unit:"), wxDefaultPosition, wxDefaultSize, 0 ); m_unitLabel->Wrap( -1 ); - gbSizer1->Add( m_unitLabel, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + gbSizer1->Add( m_unitLabel, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); wxArrayString m_unitChoiceChoices; m_unitChoice = new wxChoice( sbGeneralProps->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_unitChoiceChoices, 0 ); m_unitChoice->SetSelection( 0 ); m_unitChoice->SetMinSize( wxSize( 100,-1 ) ); - gbSizer1->Add( m_unitChoice, wxGBPosition( 0, 1 ), wxGBSpan( 1, 1 ), wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + gbSizer1->Add( m_unitChoice, wxGBPosition( 0, 1 ), wxGBSpan( 1, 1 ), wxEXPAND|wxLEFT|wxRIGHT, 5 ); m_cbAlternateSymbol = new wxCheckBox( sbGeneralProps->GetStaticBox(), wxID_ANY, _("Alternate symbol (DeMorgan)"), wxDefaultPosition, wxDefaultSize, 0 ); m_cbAlternateSymbol->SetToolTip( _("Use the alternate shape of this symbol.\nFor gates, this is the \"De Morgan\" conversion") ); @@ -141,23 +141,23 @@ DIALOG_SYMBOL_PROPERTIES_BASE::DIALOG_SYMBOL_PROPERTIES_BASE( wxWindow* parent, m_orientationLabel = new wxStaticText( sbGeneralProps->GetStaticBox(), wxID_ANY, _("Angle:"), wxDefaultPosition, wxDefaultSize, 0 ); m_orientationLabel->Wrap( -1 ); - gbSizer1->Add( m_orientationLabel, wxGBPosition( 3, 0 ), wxGBSpan( 1, 1 ), wxBOTTOM|wxLEFT|wxRIGHT|wxTOP, 5 ); + gbSizer1->Add( m_orientationLabel, wxGBPosition( 3, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP, 5 ); wxString m_orientationCtrlChoices[] = { _("0"), _("+90"), _("-90"), _("180") }; int m_orientationCtrlNChoices = sizeof( m_orientationCtrlChoices ) / sizeof( wxString ); m_orientationCtrl = new wxChoice( sbGeneralProps->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_orientationCtrlNChoices, m_orientationCtrlChoices, 0 ); m_orientationCtrl->SetSelection( 0 ); - gbSizer1->Add( m_orientationCtrl, wxGBPosition( 3, 1 ), wxGBSpan( 1, 1 ), wxALL|wxEXPAND, 5 ); + gbSizer1->Add( m_orientationCtrl, wxGBPosition( 3, 1 ), wxGBSpan( 1, 1 ), wxEXPAND|wxLEFT|wxRIGHT, 5 ); m_mirrorLabel = new wxStaticText( sbGeneralProps->GetStaticBox(), wxID_ANY, _("Mirror:"), wxDefaultPosition, wxDefaultSize, 0 ); m_mirrorLabel->Wrap( -1 ); - gbSizer1->Add( m_mirrorLabel, wxGBPosition( 4, 0 ), wxGBSpan( 1, 1 ), wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + gbSizer1->Add( m_mirrorLabel, wxGBPosition( 4, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); wxString m_mirrorCtrlChoices[] = { _("Not mirrored"), _("Around X axis"), _("Around Y axis") }; int m_mirrorCtrlNChoices = sizeof( m_mirrorCtrlChoices ) / sizeof( wxString ); m_mirrorCtrl = new wxChoice( sbGeneralProps->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_mirrorCtrlNChoices, m_mirrorCtrlChoices, 0 ); m_mirrorCtrl->SetSelection( 0 ); - gbSizer1->Add( m_mirrorCtrl, wxGBPosition( 4, 1 ), wxGBSpan( 1, 1 ), wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + gbSizer1->Add( m_mirrorCtrl, wxGBPosition( 4, 1 ), wxGBSpan( 1, 1 ), wxEXPAND|wxLEFT|wxRIGHT, 5 ); gbSizer1->AddGrowableCol( 1 ); @@ -306,7 +306,7 @@ DIALOG_SYMBOL_PROPERTIES_BASE::DIALOG_SYMBOL_PROPERTIES_BASE( wxWindow* parent, m_tcLibraryID->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) ); m_tcLibraryID->SetToolTip( _("The library ID and footprint ID currently assigned. Use \"Change Footprint...\" to assign a different footprint.") ); - bLibLink->Add( m_tcLibraryID, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + bLibLink->Add( m_tcLibraryID, 1, wxEXPAND|wxLEFT|wxRIGHT, 5 ); bSizerBottom->Add( bLibLink, 1, wxEXPAND|wxLEFT, 10 ); diff --git a/eeschema/dialogs/dialog_symbol_properties_base.fbp b/eeschema/dialogs/dialog_symbol_properties_base.fbp index 8edca13ec4..03f488efd5 100644 --- a/eeschema/dialogs/dialog_symbol_properties_base.fbp +++ b/eeschema/dialogs/dialog_symbol_properties_base.fbp @@ -14,6 +14,7 @@ dialog_symbol_properties_base 1000 none + 1 dialog_edit_component_in_schematic_base @@ -25,6 +26,7 @@ 1 1 UI + 0 0 0 @@ -301,6 +303,7 @@ + 0 @@ -374,6 +377,7 @@ + 0 @@ -447,6 +451,7 @@ + 0 @@ -530,6 +535,7 @@ + 0 @@ -644,7 +650,7 @@ 5 1 0 - wxBOTTOM|wxLEFT|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT 0 1 @@ -708,7 +714,7 @@ 5 1 1 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -842,7 +848,7 @@ 5 1 0 - wxBOTTOM|wxLEFT|wxRIGHT|wxTOP + wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP 3 1 @@ -906,7 +912,7 @@ 5 1 1 - wxALL|wxEXPAND + wxEXPAND|wxLEFT|wxRIGHT 3 1 @@ -973,7 +979,7 @@ 5 1 0 - wxBOTTOM|wxLEFT|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT 4 1 @@ -1037,7 +1043,7 @@ 5 1 1 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + wxEXPAND|wxLEFT|wxRIGHT 4 1 @@ -1421,6 +1427,7 @@ + 0 @@ -1494,6 +1501,7 @@ + 0 @@ -1567,6 +1575,7 @@ + 0 @@ -1650,6 +1659,7 @@ + 0 @@ -1963,7 +1973,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALL + wxEXPAND|wxLEFT|wxRIGHT 1 1 @@ -2050,6 +2060,7 @@ + 0 diff --git a/eeschema/dialogs/dialog_symbol_properties_base.h b/eeschema/dialogs/dialog_symbol_properties_base.h index 3cfa2fd6cd..eb05d4fb6e 100644 --- a/eeschema/dialogs/dialog_symbol_properties_base.h +++ b/eeschema/dialogs/dialog_symbol_properties_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.9.0 Jun 18 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE!