From f1aee2fa184e86609e6d41241e03b5906089f7d0 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Sat, 14 Jan 2023 01:45:30 +0000 Subject: [PATCH] Minor dialog tweaks. --- eeschema/dialogs/dialog_sim_model_base.cpp | 5 ++++- eeschema/dialogs/dialog_sim_model_base.fbp | 12 +++++++++++- eeschema/dialogs/dialog_symbol_properties_base.cpp | 2 +- eeschema/dialogs/dialog_symbol_properties_base.fbp | 2 +- pcbnew/dialogs/dialog_footprint_properties_base.cpp | 6 +++--- pcbnew/dialogs/dialog_footprint_properties_base.fbp | 8 ++++---- .../dialog_footprint_properties_fp_editor_base.cpp | 2 +- .../dialog_footprint_properties_fp_editor_base.fbp | 2 +- 8 files changed, 26 insertions(+), 13 deletions(-) diff --git a/eeschema/dialogs/dialog_sim_model_base.cpp b/eeschema/dialogs/dialog_sim_model_base.cpp index 2b45338b4f..17b5694869 100644 --- a/eeschema/dialogs/dialog_sim_model_base.cpp +++ b/eeschema/dialogs/dialog_sim_model_base.cpp @@ -201,11 +201,14 @@ DIALOG_SIM_MODEL_BASE::DIALOG_SIM_MODEL_BASE( wxWindow* parent, wxWindowID id, c bSizerMargins->Add( m_modelNotebook, 1, wxEXPAND|wxALL, 5 ); + + bSizerMargins->Add( 0, 4, 0, wxEXPAND, 5 ); + m_saveInValueCheckbox = new wxCheckBox( m_modelPanel, wxID_ANY, _("Save {} in Value field as \"{}\""), wxDefaultPosition, wxDefaultSize, 0 ); bSizerMargins->Add( m_saveInValueCheckbox, 0, wxALL, 6 ); - bSizerMargins->Add( 0, 3, 0, wxEXPAND, 5 ); + bSizerMargins->Add( 0, 2, 0, wxEXPAND, 5 ); bSizerPanel->Add( bSizerMargins, 1, wxEXPAND, 5 ); diff --git a/eeschema/dialogs/dialog_sim_model_base.fbp b/eeschema/dialogs/dialog_sim_model_base.fbp index bfab422f43..0893bba32a 100644 --- a/eeschema/dialogs/dialog_sim_model_base.fbp +++ b/eeschema/dialogs/dialog_sim_model_base.fbp @@ -1656,6 +1656,16 @@ + + 5 + wxEXPAND + 0 + + 4 + protected + 0 + + 6 wxALL @@ -1725,7 +1735,7 @@ wxEXPAND 0 - 3 + 2 protected 0 diff --git a/eeschema/dialogs/dialog_symbol_properties_base.cpp b/eeschema/dialogs/dialog_symbol_properties_base.cpp index fb48771976..94c6b3e459 100644 --- a/eeschema/dialogs/dialog_symbol_properties_base.cpp +++ b/eeschema/dialogs/dialog_symbol_properties_base.cpp @@ -341,7 +341,7 @@ DIALOG_SYMBOL_PROPERTIES_BASE::DIALOG_SYMBOL_PROPERTIES_BASE( wxWindow* parent, bSizerBottom->Add( m_stdDialogButtonSizer, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - mainSizer->Add( bSizerBottom, 0, wxEXPAND, 5 ); + mainSizer->Add( bSizerBottom, 0, wxEXPAND|wxTOP, 5 ); this->SetSizer( mainSizer ); diff --git a/eeschema/dialogs/dialog_symbol_properties_base.fbp b/eeschema/dialogs/dialog_symbol_properties_base.fbp index 9b50caa964..7da02437f9 100644 --- a/eeschema/dialogs/dialog_symbol_properties_base.fbp +++ b/eeschema/dialogs/dialog_symbol_properties_base.fbp @@ -2043,7 +2043,7 @@ 5 - wxEXPAND + wxEXPAND|wxTOP 0 diff --git a/pcbnew/dialogs/dialog_footprint_properties_base.cpp b/pcbnew/dialogs/dialog_footprint_properties_base.cpp index 4283be48f7..0734c76665 100644 --- a/pcbnew/dialogs/dialog_footprint_properties_base.cpp +++ b/pcbnew/dialogs/dialog_footprint_properties_base.cpp @@ -106,7 +106,7 @@ DIALOG_FOOTPRINT_PROPERTIES_BASE::DIALOG_FOOTPRINT_PROPERTIES_BASE( wxWindow* pa sbSizer7 = new wxStaticBoxSizer( new wxStaticBox( m_PanelGeneral, wxID_ANY, _("Position") ), wxVERTICAL ); wxFlexGridSizer* fgSizerPos; - fgSizerPos = new wxFlexGridSizer( 4, 3, 1, 0 ); + fgSizerPos = new wxFlexGridSizer( 4, 3, 3, 0 ); fgSizerPos->AddGrowableCol( 1 ); fgSizerPos->AddGrowableRow( 2 ); fgSizerPos->SetFlexibleDirection( wxBOTH ); @@ -383,7 +383,7 @@ DIALOG_FOOTPRINT_PROPERTIES_BASE::DIALOG_FOOTPRINT_PROPERTIES_BASE( wxWindow* pa m_libraryIDLabel = new wxStaticText( this, wxID_ANY, _("Library link:"), wxDefaultPosition, wxDefaultSize, 0 ); m_libraryIDLabel->Wrap( -1 ); - fgSizerSymbolRef->Add( m_libraryIDLabel, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 2 ); + fgSizerSymbolRef->Add( m_libraryIDLabel, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 2 ); m_tcLibraryID = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY|wxBORDER_NONE ); m_tcLibraryID->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) ); @@ -407,7 +407,7 @@ DIALOG_FOOTPRINT_PROPERTIES_BASE::DIALOG_FOOTPRINT_PROPERTIES_BASE( wxWindow* pa bSizerButtons->Add( m_sdbSizerStdButtons, 0, wxEXPAND|wxALL, 5 ); - m_GeneralBoxSizer->Add( bSizerButtons, 0, wxEXPAND|wxRIGHT|wxLEFT, 10 ); + m_GeneralBoxSizer->Add( bSizerButtons, 0, wxEXPAND|wxTOP|wxLEFT, 5 ); this->SetSizer( m_GeneralBoxSizer ); diff --git a/pcbnew/dialogs/dialog_footprint_properties_base.fbp b/pcbnew/dialogs/dialog_footprint_properties_base.fbp index 8561ef7665..4e5973135d 100644 --- a/pcbnew/dialogs/dialog_footprint_properties_base.fbp +++ b/pcbnew/dialogs/dialog_footprint_properties_base.fbp @@ -498,7 +498,7 @@ wxFLEX_GROWMODE_SPECIFIED none 4 - 1 + 3 5 wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT @@ -3256,8 +3256,8 @@ - 10 - wxEXPAND|wxRIGHT|wxLEFT + 5 + wxEXPAND|wxTOP|wxLEFT 0 @@ -3282,7 +3282,7 @@ 4 2 - wxALIGN_CENTER_VERTICAL|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 1 diff --git a/pcbnew/dialogs/dialog_footprint_properties_fp_editor_base.cpp b/pcbnew/dialogs/dialog_footprint_properties_fp_editor_base.cpp index 0258eab2ee..9048d6e4fd 100644 --- a/pcbnew/dialogs/dialog_footprint_properties_fp_editor_base.cpp +++ b/pcbnew/dialogs/dialog_footprint_properties_fp_editor_base.cpp @@ -410,7 +410,7 @@ DIALOG_FOOTPRINT_PROPERTIES_FP_EDITOR_BASE::DIALOG_FOOTPRINT_PROPERTIES_FP_EDITO bSizer16->Add( m_sdbSizerStdButtons, 1, wxEXPAND|wxALL, 5 ); - m_GeneralBoxSizer->Add( bSizer16, 0, wxEXPAND, 5 ); + m_GeneralBoxSizer->Add( bSizer16, 0, wxEXPAND|wxTOP, 5 ); this->SetSizer( m_GeneralBoxSizer ); diff --git a/pcbnew/dialogs/dialog_footprint_properties_fp_editor_base.fbp b/pcbnew/dialogs/dialog_footprint_properties_fp_editor_base.fbp index 5371ff9314..299c8da950 100644 --- a/pcbnew/dialogs/dialog_footprint_properties_fp_editor_base.fbp +++ b/pcbnew/dialogs/dialog_footprint_properties_fp_editor_base.fbp @@ -3156,7 +3156,7 @@ 5 - wxEXPAND + wxEXPAND|wxTOP 0