From cfafd5fba0d58aafe6c78add93b680de4d8acee0 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Thu, 25 Sep 2025 11:06:54 +0100 Subject: [PATCH] Consistency in Schematic/Board Setup panels. --- common/dialogs/panel_embedded_files.cpp | 53 +- common/dialogs/panel_embedded_files.h | 20 +- common/dialogs/panel_embedded_files_base.cpp | 34 +- common/dialogs/panel_embedded_files_base.fbp | 28 +- common/dialogs/panel_embedded_files_base.h | 3 +- .../dialogs/panel_setup_netclasses_base.cpp | 18 +- .../dialogs/panel_setup_netclasses_base.fbp | 40 +- common/dialogs/panel_text_variables.cpp | 5 +- common/dialogs/panel_text_variables_base.cpp | 6 +- common/dialogs/panel_text_variables_base.fbp | 62 +- common/dialogs/panel_text_variables_base.h | 2 +- common/widgets/wx_grid_autosizer.cpp | 12 +- eeschema/dialogs/dialog_schematic_setup.cpp | 2 +- eeschema/dialogs/panel_bom_presets.fbp | 1045 +++++++++-------- eeschema/dialogs/panel_bom_presets_base.cpp | 17 +- eeschema/dialogs/panel_bom_presets_base.h | 2 +- ...panel_eeschema_annotation_options_base.cpp | 13 +- ...panel_eeschema_annotation_options_base.fbp | 69 +- .../panel_eeschema_annotation_options_base.h | 5 +- eeschema/dialogs/panel_setup_buses_base.cpp | 24 +- eeschema/dialogs/panel_setup_buses_base.fbp | 28 +- .../dialogs/panel_setup_formatting_base.cpp | 8 +- .../dialogs/panel_setup_formatting_base.fbp | 6 +- .../dialogs/panel_setup_formatting_base.h | 2 +- .../panel_template_fieldnames_base.cpp | 10 +- .../panel_template_fieldnames_base.fbp | 12 +- include/panel_text_variables.h | 5 +- pcbnew/dialogs/dialog_board_setup.cpp | 2 +- .../dialogs/panel_fp_properties_3d_model.cpp | 30 +- .../dialogs/panel_setup_constraints_base.cpp | 2 +- .../dialogs/panel_setup_constraints_base.fbp | 2 +- .../panel_setup_time_domain_parameters.cpp | 1 + ...anel_setup_time_domain_parameters_base.cpp | 26 +- ...anel_setup_time_domain_parameters_base.fbp | 26 +- .../panel_setup_time_domain_parameters_base.h | 2 +- .../panel_setup_tracks_and_vias_base.cpp | 57 +- .../panel_setup_tracks_and_vias_base.fbp | 46 +- 37 files changed, 871 insertions(+), 854 deletions(-) diff --git a/common/dialogs/panel_embedded_files.cpp b/common/dialogs/panel_embedded_files.cpp index 794fb65a6d..f20e7ce513 100644 --- a/common/dialogs/panel_embedded_files.cpp +++ b/common/dialogs/panel_embedded_files.cpp @@ -39,6 +39,7 @@ #include #include #include +#include /* ---------- GRID_TRICKS for embedded files grid ---------- */ @@ -91,17 +92,31 @@ void EMBEDDED_FILES_GRID_TRICKS::doPopupSelection( wxCommandEvent& event ) /* ---------- End of GRID_TRICKS for embedded files grid ---------- */ -PANEL_EMBEDDED_FILES::PANEL_EMBEDDED_FILES( wxWindow* parent, EMBEDDED_FILES* aFiles ) : - PANEL_EMBEDDED_FILES_BASE( parent ), +PANEL_EMBEDDED_FILES::PANEL_EMBEDDED_FILES( wxWindow* aParent, EMBEDDED_FILES* aFiles, int aFlags ) : + PANEL_EMBEDDED_FILES_BASE( aParent ), m_files( aFiles ), m_localFiles( new EMBEDDED_FILES() ) { + m_files_grid->SetUseNativeColLabels(); + for( auto& [name, file] : m_files->EmbeddedFileMap() ) { EMBEDDED_FILES::EMBEDDED_FILE* newFile = new EMBEDDED_FILES::EMBEDDED_FILE( *file ); m_localFiles->AddFile( newFile ); } + if( aFlags & NO_MARGINS ) + { + m_filesGridSizer->Detach( m_files_grid ); + m_filesGridSizer->Add( m_files_grid, 5, wxEXPAND, 5 ); + + m_buttonsSizer->Detach( m_browse_button ); + m_buttonsSizer->Prepend( m_browse_button, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); + + m_buttonsSizer->Detach( m_export ); + m_buttonsSizer->Add( m_export, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); + } + // Set up the standard buttons m_delete_button->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) ); m_browse_button->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) ); @@ -110,6 +125,11 @@ PANEL_EMBEDDED_FILES::PANEL_EMBEDDED_FILES( wxWindow* parent, EMBEDDED_FILES* aF m_files_grid->PushEventHandler( new EMBEDDED_FILES_GRID_TRICKS( m_files_grid ) ); + m_autoSizer = std::make_unique( *m_files_grid, + WX_GRID_AUTOSIZER::COL_MIN_WIDTHS{ { 0, 100 }, + { 1, 200 } }, + 1 ); + m_localFiles->SetFileAddedCallback( [this](EMBEDDED_FILES::EMBEDDED_FILE* file) { @@ -138,32 +158,6 @@ PANEL_EMBEDDED_FILES::~PANEL_EMBEDDED_FILES() } -void PANEL_EMBEDDED_FILES::onSize( wxSizeEvent& event ) -{ - resizeGrid(); -} - - -void PANEL_EMBEDDED_FILES::resizeGrid() -{ - int panel_width = GetClientRect().GetWidth(); - int first_width = m_files_grid->GetColSize( 0 ); - int second_width = m_files_grid->GetColSize( 1 ); - - double ratio; - - if( first_width + second_width > 0 ) - ratio = (double)first_width / (double)( first_width + second_width ); - else - ratio = 0.3; - - - m_files_grid->SetColSize( 0, panel_width * ratio ); - m_files_grid->SetColSize( 1, panel_width * ( 1 - ratio ) ); - Layout(); -} - - bool PANEL_EMBEDDED_FILES::TransferDataToWindow() { m_files_grid->ClearGrid(); @@ -183,9 +177,6 @@ bool PANEL_EMBEDDED_FILES::TransferDataToWindow() } m_cbEmbedFonts->SetValue( m_files->GetAreFontsEmbedded() ); - - resizeGrid(); - return true; } diff --git a/common/dialogs/panel_embedded_files.h b/common/dialogs/panel_embedded_files.h index de1963d0a8..6a4d4eca55 100644 --- a/common/dialogs/panel_embedded_files.h +++ b/common/dialogs/panel_embedded_files.h @@ -21,14 +21,18 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef PANEL_EMBEDDED_FILES_H -#define PANEL_EMBEDDED_FILES_H +#pragma once #include #include "panel_embedded_files_base.h" #include "grid_tricks.h" +class WX_GRID_AUTOSIZER; + +#define NO_MARGINS 0x0001 + + class EMBEDDED_FILES_GRID_TRICKS : public GRID_TRICKS { enum @@ -52,10 +56,11 @@ protected: int m_curRow; }; + class PANEL_EMBEDDED_FILES : public PANEL_EMBEDDED_FILES_BASE { public: - PANEL_EMBEDDED_FILES( wxWindow* parent, EMBEDDED_FILES* aFiles ); + PANEL_EMBEDDED_FILES( wxWindow* aParent, EMBEDDED_FILES* aFiles, int aFlags = 0 ); ~PANEL_EMBEDDED_FILES() override; bool TransferDataFromWindow() override; @@ -71,15 +76,10 @@ protected: void onAddEmbeddedFiles( wxCommandEvent& event ) override; void onDeleteEmbeddedFile( wxCommandEvent& event ) override; void onExportFiles( wxCommandEvent& event ) override; - void onSize( wxSizeEvent& event ) override; private: - - void resizeGrid(); - EMBEDDED_FILES* m_files; EMBEDDED_FILES* m_localFiles; + + std::unique_ptr m_autoSizer; }; - - -#endif // PANEL_EMBEDDED_FILES_H \ No newline at end of file diff --git a/common/dialogs/panel_embedded_files_base.cpp b/common/dialogs/panel_embedded_files_base.cpp index 15131e4f09..39995da535 100644 --- a/common/dialogs/panel_embedded_files_base.cpp +++ b/common/dialogs/panel_embedded_files_base.cpp @@ -17,8 +17,7 @@ PANEL_EMBEDDED_FILES_BASE::PANEL_EMBEDDED_FILES_BASE( wxWindow* parent, wxWindow wxBoxSizer* bMainSizer; bMainSizer = new wxBoxSizer( wxVERTICAL ); - wxBoxSizer* m_global_sizer; - m_global_sizer = new wxBoxSizer( wxVERTICAL ); + m_filesGridSizer = new wxBoxSizer( wxVERTICAL ); m_files_grid = new WX_GRID( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); @@ -49,49 +48,42 @@ PANEL_EMBEDDED_FILES_BASE::PANEL_EMBEDDED_FILES_BASE( wxWindow* parent, wxWindow // Cell Defaults m_files_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER ); - m_global_sizer->Add( m_files_grid, 5, wxALL|wxEXPAND, 5 ); + m_filesGridSizer->Add( m_files_grid, 5, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - bMainSizer->Add( m_global_sizer, 1, wxEXPAND, 5 ); + bMainSizer->Add( m_filesGridSizer, 1, wxEXPAND|wxBOTTOM, 3 ); - wxBoxSizer* bButtonsSizer; - bButtonsSizer = new wxBoxSizer( wxHORIZONTAL ); + m_buttonsSizer = new wxBoxSizer( wxHORIZONTAL ); m_browse_button = new STD_BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); m_browse_button->SetToolTip( _("Add embedded file") ); - bButtonsSizer->Add( m_browse_button, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); + m_buttonsSizer->Add( m_browse_button, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); - bButtonsSizer->Add( 20, 0, 0, wxEXPAND, 5 ); + m_buttonsSizer->Add( 20, 0, 0, wxEXPAND, 5 ); m_delete_button = new STD_BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); m_delete_button->SetToolTip( _("Remove embedded file") ); - bButtonsSizer->Add( m_delete_button, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); + m_buttonsSizer->Add( m_delete_button, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - bButtonsSizer->Add( 0, 0, 1, wxEXPAND, 5 ); + m_buttonsSizer->Add( 0, 0, 1, wxEXPAND, 5 ); m_cbEmbedFonts = new wxCheckBox( this, wxID_ANY, _("Embed fonts"), wxDefaultPosition, wxDefaultSize, 0 ); m_cbEmbedFonts->SetToolTip( _("Store a copy of all fonts used") ); - bButtonsSizer->Add( m_cbEmbedFonts, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + m_buttonsSizer->Add( m_cbEmbedFonts, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - bButtonsSizer->Add( 0, 0, 1, wxEXPAND, 5 ); + m_buttonsSizer->Add( 0, 0, 1, wxEXPAND, 5 ); m_export = new wxButton( this, wxID_ANY, _("&Export..."), wxDefaultPosition, wxDefaultSize, 0 ); - bButtonsSizer->Add( m_export, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); + m_buttonsSizer->Add( m_export, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - bMainSizer->Add( bButtonsSizer, 0, wxEXPAND|wxBOTTOM, 3 ); - - wxBoxSizer* bSizer4; - bSizer4 = new wxBoxSizer( wxVERTICAL ); - - - bMainSizer->Add( bSizer4, 0, wxEXPAND, 5 ); + bMainSizer->Add( m_buttonsSizer, 0, wxEXPAND|wxBOTTOM, 5 ); this->SetSizer( bMainSizer ); @@ -99,7 +91,6 @@ PANEL_EMBEDDED_FILES_BASE::PANEL_EMBEDDED_FILES_BASE( wxWindow* parent, wxWindow bMainSizer->Fit( this ); // Connect Events - this->Connect( wxEVT_SIZE, wxSizeEventHandler( PANEL_EMBEDDED_FILES_BASE::onSize ) ); m_files_grid->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( PANEL_EMBEDDED_FILES_BASE::onGridRightClick ), NULL, this ); m_browse_button->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_EMBEDDED_FILES_BASE::onAddEmbeddedFiles ), NULL, this ); m_delete_button->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_EMBEDDED_FILES_BASE::onDeleteEmbeddedFile ), NULL, this ); @@ -110,7 +101,6 @@ PANEL_EMBEDDED_FILES_BASE::PANEL_EMBEDDED_FILES_BASE( wxWindow* parent, wxWindow PANEL_EMBEDDED_FILES_BASE::~PANEL_EMBEDDED_FILES_BASE() { // Disconnect Events - this->Disconnect( wxEVT_SIZE, wxSizeEventHandler( PANEL_EMBEDDED_FILES_BASE::onSize ) ); m_files_grid->Disconnect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( PANEL_EMBEDDED_FILES_BASE::onGridRightClick ), NULL, this ); m_browse_button->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_EMBEDDED_FILES_BASE::onAddEmbeddedFiles ), NULL, this ); m_delete_button->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_EMBEDDED_FILES_BASE::onDeleteEmbeddedFile ), NULL, this ); diff --git a/common/dialogs/panel_embedded_files_base.fbp b/common/dialogs/panel_embedded_files_base.fbp index 43ba9152b0..273fde188f 100644 --- a/common/dialogs/panel_embedded_files_base.fbp +++ b/common/dialogs/panel_embedded_files_base.fbp @@ -55,24 +55,23 @@ wxTAB_TRAVERSAL - onSize bMainSizer wxVERTICAL none - 5 - wxEXPAND + 3 + wxEXPAND|wxBOTTOM 1 - m_global_sizer + m_filesGridSizer wxVERTICAL - none + protected 5 - wxALL|wxEXPAND + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 5 1 @@ -163,14 +162,14 @@ - 3 + 5 wxEXPAND|wxBOTTOM 0 - bButtonsSizer + m_buttonsSizer wxHORIZONTAL - none + protected 5 wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT @@ -494,17 +493,6 @@ - - 5 - wxEXPAND - 0 - - - bSizer4 - wxVERTICAL - none - - diff --git a/common/dialogs/panel_embedded_files_base.h b/common/dialogs/panel_embedded_files_base.h index 2b00f7e92b..62f1b127a1 100644 --- a/common/dialogs/panel_embedded_files_base.h +++ b/common/dialogs/panel_embedded_files_base.h @@ -38,14 +38,15 @@ class PANEL_EMBEDDED_FILES_BASE : public wxPanel private: protected: + wxBoxSizer* m_filesGridSizer; WX_GRID* m_files_grid; + wxBoxSizer* m_buttonsSizer; STD_BITMAP_BUTTON* m_browse_button; STD_BITMAP_BUTTON* m_delete_button; wxCheckBox* m_cbEmbedFonts; wxButton* m_export; // Virtual event handlers, override them in your derived class - virtual void onSize( wxSizeEvent& event ) { event.Skip(); } virtual void onGridRightClick( wxGridEvent& event ) { event.Skip(); } virtual void onAddEmbeddedFiles( wxCommandEvent& event ) { event.Skip(); } virtual void onDeleteEmbeddedFile( wxCommandEvent& event ) { event.Skip(); } diff --git a/common/dialogs/panel_setup_netclasses_base.cpp b/common/dialogs/panel_setup_netclasses_base.cpp index f5d2dd9265..127a5f60e1 100644 --- a/common/dialogs/panel_setup_netclasses_base.cpp +++ b/common/dialogs/panel_setup_netclasses_base.cpp @@ -82,7 +82,7 @@ PANEL_SETUP_NETCLASSES_BASE::PANEL_SETUP_NETCLASSES_BASE( wxWindow* parent, wxWi buttonBoxSizer = new wxBoxSizer( wxHORIZONTAL ); m_addButton = new STD_BITMAP_BUTTON( m_netclassesPane, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); - buttonBoxSizer->Add( m_addButton, 0, wxBOTTOM|wxLEFT, 2 ); + buttonBoxSizer->Add( m_addButton, 0, wxBOTTOM|wxLEFT, 5 ); m_moveUpButton = new STD_BITMAP_BUTTON( m_netclassesPane, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); buttonBoxSizer->Add( m_moveUpButton, 0, wxBOTTOM|wxLEFT, 5 ); @@ -101,13 +101,16 @@ PANEL_SETUP_NETCLASSES_BASE::PANEL_SETUP_NETCLASSES_BASE( wxWindow* parent, wxWi m_colorDefaultHelpText = new wxStaticText( m_netclassesPane, wxID_ANY, _("Set color to transparent to use KiCad default color."), wxDefaultPosition, wxDefaultSize, 0 ); m_colorDefaultHelpText->Wrap( -1 ); - buttonBoxSizer->Add( m_colorDefaultHelpText, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 10 ); + buttonBoxSizer->Add( m_colorDefaultHelpText, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 ); + + + buttonBoxSizer->Add( 10, 0, 0, wxEXPAND, 5 ); m_importColorsButton = new wxButton( m_netclassesPane, wxID_ANY, _("Import colors from schematic"), wxDefaultPosition, wxDefaultSize, 0 ); - buttonBoxSizer->Add( m_importColorsButton, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); + buttonBoxSizer->Add( m_importColorsButton, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - bUpperSizer->Add( buttonBoxSizer, 0, wxEXPAND|wxLEFT|wxTOP, 5 ); + bUpperSizer->Add( buttonBoxSizer, 0, wxEXPAND|wxTOP|wxBOTTOM, 3 ); m_netclassesPane->SetSizer( bUpperSizer ); @@ -117,9 +120,6 @@ PANEL_SETUP_NETCLASSES_BASE::PANEL_SETUP_NETCLASSES_BASE( wxWindow* parent, wxWi wxBoxSizer* bLowerSizer; bLowerSizer = new wxBoxSizer( wxVERTICAL ); - - bLowerSizer->Add( 0, 5, 0, wxEXPAND, 5 ); - m_staticText5 = new wxStaticText( m_membershipPane, wxID_ANY, _("Netclass Assignments"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText5->Wrap( -1 ); bLowerSizer->Add( m_staticText5, 0, wxEXPAND|wxTOP|wxLEFT, 8 ); @@ -173,7 +173,7 @@ PANEL_SETUP_NETCLASSES_BASE::PANEL_SETUP_NETCLASSES_BASE( wxWindow* parent, wxWi buttonBoxSizer1 = new wxBoxSizer( wxHORIZONTAL ); m_addAssignmentButton = new STD_BITMAP_BUTTON( m_membershipPane, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); - buttonBoxSizer1->Add( m_addAssignmentButton, 0, wxLEFT, 2 ); + buttonBoxSizer1->Add( m_addAssignmentButton, 0, wxBOTTOM|wxLEFT, 5 ); buttonBoxSizer1->Add( 20, 0, 0, wxEXPAND, 5 ); @@ -182,7 +182,7 @@ PANEL_SETUP_NETCLASSES_BASE::PANEL_SETUP_NETCLASSES_BASE( wxWindow* parent, wxWi buttonBoxSizer1->Add( m_removeAssignmentButton, 0, wxRIGHT|wxLEFT, 5 ); - bLowerSizer->Add( buttonBoxSizer1, 0, wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 5 ); + bLowerSizer->Add( buttonBoxSizer1, 0, wxEXPAND|wxTOP, 3 ); m_membershipPane->SetSizer( bLowerSizer ); diff --git a/common/dialogs/panel_setup_netclasses_base.fbp b/common/dialogs/panel_setup_netclasses_base.fbp index 718318a1d1..24fde54d1f 100644 --- a/common/dialogs/panel_setup_netclasses_base.fbp +++ b/common/dialogs/panel_setup_netclasses_base.fbp @@ -353,8 +353,8 @@ - 5 - wxEXPAND|wxLEFT|wxTOP + 3 + wxEXPAND|wxTOP|wxBOTTOM 0 @@ -362,7 +362,7 @@ wxHORIZONTAL none - 2 + 5 wxBOTTOM|wxLEFT 0 @@ -682,8 +682,8 @@ - 10 - wxALIGN_CENTER_VERTICAL|wxRIGHT + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT 0 1 @@ -745,7 +745,17 @@ 5 - wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT + wxEXPAND + 0 + + 0 + protected + 10 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT 0 1 @@ -882,16 +892,6 @@ bLowerSizer wxVERTICAL none - - 5 - wxEXPAND - 0 - - 5 - protected - 0 - - 8 wxEXPAND|wxTOP|wxLEFT @@ -1127,8 +1127,8 @@ - 5 - wxEXPAND|wxTOP|wxBOTTOM|wxLEFT + 3 + wxEXPAND|wxTOP 0 @@ -1136,8 +1136,8 @@ wxHORIZONTAL none - 2 - wxLEFT + 5 + wxBOTTOM|wxLEFT 0 1 diff --git a/common/dialogs/panel_text_variables.cpp b/common/dialogs/panel_text_variables.cpp index 07f332b9f3..630101c18e 100644 --- a/common/dialogs/panel_text_variables.cpp +++ b/common/dialogs/panel_text_variables.cpp @@ -66,8 +66,7 @@ PANEL_TEXT_VARIABLES::PANEL_TEXT_VARIABLES( wxWindow* aParent, PROJECT* aProject m_TextVars->SetSelectionMode( wxGrid::wxGridSelectionModes::wxGridSelectRows ); // wxFormBuilder doesn't include this event... - m_TextVars->Connect( wxEVT_GRID_CELL_CHANGING, - wxGridEventHandler( PANEL_TEXT_VARIABLES::OnGridCellChanging ), + m_TextVars->Connect( wxEVT_GRID_CELL_CHANGING, wxGridEventHandler( PANEL_TEXT_VARIABLES::OnGridCellChanging ), nullptr, this ); Bind( wxEVT_IDLE, @@ -87,7 +86,7 @@ PANEL_TEXT_VARIABLES::PANEL_TEXT_VARIABLES( wxWindow* aParent, PROJECT* aProject m_autoSizer = std::make_unique( *m_TextVars, WX_GRID_AUTOSIZER::COL_MIN_WIDTHS{ - { TV_NAME_COL, 72 }, + { TV_NAME_COL, 100 }, { TV_VALUE_COL, 120 }, }, TV_VALUE_COL ); diff --git a/common/dialogs/panel_text_variables_base.cpp b/common/dialogs/panel_text_variables_base.cpp index 44d00c1e7b..02d426ef04 100644 --- a/common/dialogs/panel_text_variables_base.cpp +++ b/common/dialogs/panel_text_variables_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 4.1.0-0-g733bf3d) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -50,7 +50,7 @@ PANEL_TEXT_VARIABLES_BASE::PANEL_TEXT_VARIABLES_BASE( wxWindow* parent, wxWindow m_TextVars->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER ); m_TextVars->SetMinSize( wxSize( 604,170 ) ); - bSizer3->Add( m_TextVars, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); + bSizer3->Add( m_TextVars, 1, wxEXPAND|wxBOTTOM, 3 ); wxBoxSizer* bSizerEnvVarBtns; bSizerEnvVarBtns = new wxBoxSizer( wxHORIZONTAL ); @@ -65,7 +65,7 @@ PANEL_TEXT_VARIABLES_BASE::PANEL_TEXT_VARIABLES_BASE( wxWindow* parent, wxWindow bSizerEnvVarBtns->Add( m_btnDeleteTextVar, 0, wxRIGHT|wxLEFT, 5 ); - bSizer3->Add( bSizerEnvVarBtns, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); + bSizer3->Add( bSizerEnvVarBtns, 0, wxEXPAND|wxBOTTOM, 5 ); bPanelSizer->Add( bSizer3, 1, wxEXPAND, 5 ); diff --git a/common/dialogs/panel_text_variables_base.fbp b/common/dialogs/panel_text_variables_base.fbp index d3ea807c24..41fa377e87 100644 --- a/common/dialogs/panel_text_variables_base.fbp +++ b/common/dialogs/panel_text_variables_base.fbp @@ -1,34 +1,36 @@ - + - C++ - 1 - source_name - 0 - 0 + + 1 + connect + none + + + 0 + 1 res UTF-8 - connect panel_text_variables_base 1000 - none - - 1 + 1 + UI PanelTextVariables - . - + 0 + source_name + 1 + 0 + source_name + + + 1 1 - 1 - 1 - 1 - UI - 0 - 1 0 + 0 0 wxAUI_MGR_DEFAULT @@ -69,18 +71,18 @@ wxVERTICAL none - 5 - wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT|wxTOP + 3 + wxEXPAND|wxBOTTOM 1 1 1 1 1 - + 0 - - + 0 + 0 0 0 @@ -159,7 +161,7 @@ 5 - wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT|wxTOP + wxEXPAND|wxBOTTOM 0 @@ -175,10 +177,10 @@ 1 1 1 - + 0 - - + 0 + 0 0 @@ -260,10 +262,10 @@ 1 1 1 - + 0 - - + 0 + 0 0 diff --git a/common/dialogs/panel_text_variables_base.h b/common/dialogs/panel_text_variables_base.h index a74dc019cd..415356a3dc 100644 --- a/common/dialogs/panel_text_variables_base.h +++ b/common/dialogs/panel_text_variables_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 4.1.0-0-g733bf3d) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/common/widgets/wx_grid_autosizer.cpp b/common/widgets/wx_grid_autosizer.cpp index ca09be16bd..bdb8f6093a 100644 --- a/common/widgets/wx_grid_autosizer.cpp +++ b/common/widgets/wx_grid_autosizer.cpp @@ -30,7 +30,8 @@ WX_GRID_AUTOSIZER::WX_GRID_AUTOSIZER( wxGrid& aGrid, COL_MIN_WIDTHS aAutosizedCols, unsigned aFlexibleCol ) : - m_grid( aGrid ), m_autosizedCols( std::move( aAutosizedCols ) ), + m_grid( aGrid ), + m_autosizedCols( std::move( aAutosizedCols ) ), m_flexibleCol( aFlexibleCol ) { const int colCount = m_grid.GetNumberCols(); @@ -46,12 +47,14 @@ WX_GRID_AUTOSIZER::WX_GRID_AUTOSIZER( wxGrid& aGrid, COL_MIN_WIDTHS aAutosizedCo [this]( wxUpdateUIEvent& aEvent ) { recomputeGridWidths(); + aEvent.Skip(); } ); m_grid.Bind( wxEVT_SIZE, [this]( wxSizeEvent& aEvent ) { onSizeEvent( aEvent ); + aEvent.Skip(); } ); // Handles the case when the user changes the cell content to be longer than the @@ -69,8 +72,7 @@ void WX_GRID_AUTOSIZER::recomputeGridWidths() { if( m_gridWidthsDirty ) { - const int width = - m_grid.GetClientRect().GetWidth() - wxSystemSettings::GetMetric( wxSYS_VSCROLL_X ); + const int width = m_grid.GetClientRect().GetWidth() - wxSystemSettings::GetMetric( wxSYS_VSCROLL_X ); std::optional flexibleMinWidth; @@ -114,9 +116,5 @@ void WX_GRID_AUTOSIZER::onSizeEvent( wxSizeEvent& aEvent ) const int width = aEvent.GetSize().GetX(); if( width != m_gridWidth ) - { m_gridWidthsDirty = true; - } - - aEvent.Skip(); } diff --git a/eeschema/dialogs/dialog_schematic_setup.cpp b/eeschema/dialogs/dialog_schematic_setup.cpp index 3b120c2b86..39e524e01d 100644 --- a/eeschema/dialogs/dialog_schematic_setup.cpp +++ b/eeschema/dialogs/dialog_schematic_setup.cpp @@ -138,7 +138,7 @@ DIALOG_SCHEMATIC_SETUP::DIALOG_SCHEMATIC_SETUP( SCH_EDIT_FRAME* aFrame ) : m_treebook->AddLazySubPage( [this]( wxWindow* aParent ) -> wxWindow* { - return new PANEL_EMBEDDED_FILES( aParent, &m_frame->Schematic() ); + return new PANEL_EMBEDDED_FILES( aParent, &m_frame->Schematic(), NO_MARGINS ); }, _( "Embedded Files" ) ); for( size_t i = 0; i < m_treebook->GetPageCount(); ++i ) diff --git a/eeschema/dialogs/panel_bom_presets.fbp b/eeschema/dialogs/panel_bom_presets.fbp index 6474f85d65..60818cb2f5 100644 --- a/eeschema/dialogs/panel_bom_presets.fbp +++ b/eeschema/dialogs/panel_bom_presets.fbp @@ -1,531 +1,550 @@ - + - - - - C++ - 1 - source_name - 0 - 0 - res - UTF-8 - connect - panel_bom_presets_base - 1000 - none - - - 1 - PanelBomPresets - - . - - 1 - 1 - 1 - 1 - UI - 0 - 1 - 0 - - 0 - wxAUI_MGR_DEFAULT + + + C++ + + 1 + connect + none + + + 0 + 1 + res + UTF-8 + panel_bom_presets_base + 1000 + 1 + 1 + UI + PanelBomPresets + . + 0 + source_name + 1 + 0 + source_name + + + 1 + 1 + 0 + 0 + + 0 + wxAUI_MGR_DEFAULT + + + 1 + 0 + 1 + impl_virtual + + + 0 + wxID_ANY + + + PANEL_BOM_PRESETS_BASE + + -1,-1 + ; forward_declare + + 0 + + + wxTAB_TRAVERSAL + + + bPanelSizer + wxVERTICAL + none + + 8 + wxTOP|wxLEFT|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left + 0 1 - impl_virtual + 1 + 0 0 wxID_ANY + Bill of Materials Presets + 0 + + 0 + + 0 - PANEL_BOM_PRESETS_BASE + 1 + m_bomTitle + 1 + + + protected + 1 - -1,-1 - ; forward_declare + Resizable + 1 + + + ; ; forward_declare + 0 - 0 - wxTAB_TRAVERSAL - - - bPanelSizer - wxVERTICAL - none - - 8 - wxTOP|wxLEFT|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Bill of Materials Presets: - 0 - - 0 - - - 0 - - 1 - m_bomTitle - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxEXPAND - 0 - - 3 - protected - 0 - - - - 5 - wxEXPAND|wxRIGHT - 1 - - 1 - 1 - 1 - 1 - - - - - 0 - 0 - - - - 1 - - - wxALIGN_LEFT - - wxALIGN_CENTER - 0 - 1 - wxALIGN_CENTER - wxGRID_AUTOSIZE - "Name" - wxALIGN_CENTER - 1 - 420 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - 0 - 1 - 0 - 1 - - 1 - - - 1 - 0 - 0 - wxID_ANY - - - - 0 - 0 - - 0 - - -1,-1 - 0 - -1,180 - 1 - m_bomPresetsGrid - 1 - - - protected - 1 - - Resizable - wxALIGN_CENTER - 0 - - wxALIGN_CENTER - - 0 - 1 - - WX_GRID; widgets/wx_grid.h; forward_declare - 0 - - - - - OnSizeGrid - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Delete Field - - 0 - - 0 - - - 0 - -1,-1 - 1 - m_btnDeleteBomPreset - 1 - - - protected - 1 - - - - Resizable - 1 - - - STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnDeleteBomPreset - - - - 8 - wxEXPAND|wxLEFT|wxTOP - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Bill of Materials Formatting Presets: - 0 - - 0 - - - 0 - - 1 - m_bomFmtTitle - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxEXPAND - 0 - - 3 - protected - 0 - - - - 5 - wxEXPAND|wxRIGHT - 1 - - 1 - 1 - 1 - 1 - - - - - 0 - 0 - - - - 1 - - - wxALIGN_LEFT - - wxALIGN_CENTER - 0 - 1 - wxALIGN_CENTER - wxGRID_AUTOSIZE - "Name" - wxALIGN_CENTER - 1 - 420 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - 0 - 1 - 0 - 1 - - 1 - - - 1 - 0 - 0 - wxID_ANY - - - - 0 - 0 - - 0 - - -1,-1 - 0 - -1,180 - 1 - m_bomFmtPresetsGrid - 1 - - - protected - 1 - - Resizable - wxALIGN_CENTER - 0 - - wxALIGN_CENTER - - 0 - 1 - - WX_GRID; widgets/wx_grid.h; forward_declare - 0 - - - - - OnSizeGrid - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Delete Field - - 0 - - 0 - - - 0 - -1,-1 - 1 - m_btnDeleteBomFmtPreset - 1 - - - protected - 1 - - - - Resizable - 1 - - - STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnDeleteBomFmtPreset - - - + + -1 + + + 5 + wxEXPAND + 0 + + 3 + protected + 0 + + + + 3 + wxEXPAND|wxBOTTOM + 1 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + 0 + 0 + + + + 1 + + + wxALIGN_LEFT + + wxALIGN_CENTER + 0 + 1 + wxALIGN_CENTER + wxGRID_AUTOSIZE + "Name" + wxALIGN_CENTER + 1 + 420 + + 1 + 0 + Dock + 0 + Left + 0 + 0 + 1 + 0 + 1 + 0 + 1 + + 1 + + + 1 + 0 + 0 + wxID_ANY + + + + 0 + 0 + + 0 + + -1,-1 + 0 + -1,180 + 1 + m_bomPresetsGrid + 1 + + + protected + 1 + + Resizable + wxALIGN_CENTER + 0 + + wxALIGN_CENTER + + 0 + 1 + + WX_GRID; widgets/wx_grid.h; forward_declare + 0 + + + + + OnSizeGrid + + + + 5 + wxBOTTOM + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 0 + 1 + + 1 + + + 0 + 0 + wxID_ANY + Delete Field + + 0 + + 0 + + + 0 + -1,-1 + 1 + m_btnDeleteBomPreset + 1 + + + protected + 1 + + + + Resizable + 1 + + + STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnDeleteBomPreset + + + + 5 + wxEXPAND + 0 + + 5 + protected + 0 + + + + 8 + wxEXPAND|wxLEFT|wxTOP + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Bill of Materials Formatting Presets + 0 + + 0 + + + 0 + + 1 + m_bomFmtTitle + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxEXPAND + 0 + + 3 + protected + 0 + + + + 3 + wxEXPAND|wxBOTTOM + 1 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + 0 + 0 + + + + 1 + + + wxALIGN_LEFT + + wxALIGN_CENTER + 0 + 1 + wxALIGN_CENTER + wxGRID_AUTOSIZE + "Name" + wxALIGN_CENTER + 1 + 420 + + 1 + 0 + Dock + 0 + Left + 0 + 0 + 1 + 0 + 1 + 0 + 1 + + 1 + + + 1 + 0 + 0 + wxID_ANY + + + + 0 + 0 + + 0 + + -1,-1 + 0 + -1,180 + 1 + m_bomFmtPresetsGrid + 1 + + + protected + 1 + + Resizable + wxALIGN_CENTER + 0 + + wxALIGN_CENTER + + 0 + 1 + + WX_GRID; widgets/wx_grid.h; forward_declare + 0 + + + + + OnSizeGrid + + + + 5 + wxBOTTOM + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 0 + 1 + + 1 + + + 0 + 0 + wxID_ANY + Delete Field + + 0 + + 0 + + + 0 + -1,-1 + 1 + m_btnDeleteBomFmtPreset + 1 + + + protected + 1 + + + + Resizable + 1 + + + STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnDeleteBomFmtPreset + + + + diff --git a/eeschema/dialogs/panel_bom_presets_base.cpp b/eeschema/dialogs/panel_bom_presets_base.cpp index eb1c002ff7..c9a1fbac05 100644 --- a/eeschema/dialogs/panel_bom_presets_base.cpp +++ b/eeschema/dialogs/panel_bom_presets_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -17,7 +17,7 @@ PANEL_BOM_PRESETS_BASE::PANEL_BOM_PRESETS_BASE( wxWindow* parent, wxWindowID id, wxBoxSizer* bPanelSizer; bPanelSizer = new wxBoxSizer( wxVERTICAL ); - m_bomTitle = new wxStaticText( this, wxID_ANY, _("Bill of Materials Presets:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_bomTitle = new wxStaticText( this, wxID_ANY, _("Bill of Materials Presets"), wxDefaultPosition, wxDefaultSize, 0 ); m_bomTitle->Wrap( -1 ); bPanelSizer->Add( m_bomTitle, 0, wxTOP|wxLEFT|wxEXPAND, 8 ); @@ -52,12 +52,15 @@ PANEL_BOM_PRESETS_BASE::PANEL_BOM_PRESETS_BASE( wxWindow* parent, wxWindowID id, m_bomPresetsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER ); m_bomPresetsGrid->SetMinSize( wxSize( -1,180 ) ); - bPanelSizer->Add( m_bomPresetsGrid, 1, wxEXPAND|wxRIGHT, 5 ); + bPanelSizer->Add( m_bomPresetsGrid, 1, wxEXPAND|wxBOTTOM, 3 ); m_btnDeleteBomPreset = new STD_BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); - bPanelSizer->Add( m_btnDeleteBomPreset, 0, wxALL, 5 ); + bPanelSizer->Add( m_btnDeleteBomPreset, 0, wxBOTTOM, 5 ); - m_bomFmtTitle = new wxStaticText( this, wxID_ANY, _("Bill of Materials Formatting Presets:"), wxDefaultPosition, wxDefaultSize, 0 ); + + bPanelSizer->Add( 0, 5, 0, wxEXPAND, 5 ); + + m_bomFmtTitle = new wxStaticText( this, wxID_ANY, _("Bill of Materials Formatting Presets"), wxDefaultPosition, wxDefaultSize, 0 ); m_bomFmtTitle->Wrap( -1 ); bPanelSizer->Add( m_bomFmtTitle, 0, wxEXPAND|wxLEFT|wxTOP, 8 ); @@ -92,10 +95,10 @@ PANEL_BOM_PRESETS_BASE::PANEL_BOM_PRESETS_BASE( wxWindow* parent, wxWindowID id, m_bomFmtPresetsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER ); m_bomFmtPresetsGrid->SetMinSize( wxSize( -1,180 ) ); - bPanelSizer->Add( m_bomFmtPresetsGrid, 1, wxEXPAND|wxRIGHT, 5 ); + bPanelSizer->Add( m_bomFmtPresetsGrid, 1, wxEXPAND|wxBOTTOM, 3 ); m_btnDeleteBomFmtPreset = new STD_BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); - bPanelSizer->Add( m_btnDeleteBomFmtPreset, 0, wxALL, 5 ); + bPanelSizer->Add( m_btnDeleteBomFmtPreset, 0, wxBOTTOM, 5 ); this->SetSizer( bPanelSizer ); diff --git a/eeschema/dialogs/panel_bom_presets_base.h b/eeschema/dialogs/panel_bom_presets_base.h index 5671801d37..b9af573fa9 100644 --- a/eeschema/dialogs/panel_bom_presets_base.h +++ b/eeschema/dialogs/panel_bom_presets_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/eeschema/dialogs/panel_eeschema_annotation_options_base.cpp b/eeschema/dialogs/panel_eeschema_annotation_options_base.cpp index 57c2b5aa7d..ce91ec516b 100644 --- a/eeschema/dialogs/panel_eeschema_annotation_options_base.cpp +++ b/eeschema/dialogs/panel_eeschema_annotation_options_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6a-dirty) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -21,6 +21,9 @@ PANEL_EESCHEMA_ANNOTATION_OPTIONS_BASE::PANEL_EESCHEMA_ANNOTATION_OPTIONS_BASE( m_orderLabel1->Wrap( -1 ); bLeftColumn->Add( m_orderLabel1, 0, wxLEFT|wxRIGHT|wxTOP, 13 ); + m_staticline21 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); + bLeftColumn->Add( m_staticline21, 0, wxEXPAND|wxTOP, 2 ); + wxBoxSizer* bSizer5; bSizer5 = new wxBoxSizer( wxHORIZONTAL ); @@ -35,10 +38,10 @@ PANEL_EESCHEMA_ANNOTATION_OPTIONS_BASE::PANEL_EESCHEMA_ANNOTATION_OPTIONS_BASE( int m_choiceSeparatorRefIdNChoices = sizeof( m_choiceSeparatorRefIdChoices ) / sizeof( wxString ); m_choiceSeparatorRefId = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceSeparatorRefIdNChoices, m_choiceSeparatorRefIdChoices, 0 ); m_choiceSeparatorRefId->SetSelection( 0 ); - bSizer5->Add( m_choiceSeparatorRefId, 1, wxLEFT|wxRIGHT, 5 ); + bSizer5->Add( m_choiceSeparatorRefId, 1, wxLEFT|wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 ); - bLeftColumn->Add( bSizer5, 0, wxEXPAND, 0 ); + bLeftColumn->Add( bSizer5, 0, wxEXPAND|wxTOP|wxLEFT, 5 ); bLeftColumn->Add( 0, 15, 0, wxEXPAND, 5 ); @@ -48,7 +51,7 @@ PANEL_EESCHEMA_ANNOTATION_OPTIONS_BASE::PANEL_EESCHEMA_ANNOTATION_OPTIONS_BASE( bLeftColumn->Add( m_orderLabel, 0, wxTOP|wxRIGHT|wxLEFT, 13 ); m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bLeftColumn->Add( m_staticline2, 0, wxEXPAND|wxTOP|wxBOTTOM, 2 ); + bLeftColumn->Add( m_staticline2, 0, wxEXPAND|wxTOP, 2 ); bLeftColumn->Add( 0, 5, 0, wxEXPAND, 5 ); @@ -85,7 +88,7 @@ PANEL_EESCHEMA_ANNOTATION_OPTIONS_BASE::PANEL_EESCHEMA_ANNOTATION_OPTIONS_BASE( bLeftColumn->Add( m_numberingLabel, 0, wxTOP|wxRIGHT|wxLEFT, 13 ); m_staticline3 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bLeftColumn->Add( m_staticline3, 0, wxEXPAND|wxTOP|wxBOTTOM, 2 ); + bLeftColumn->Add( m_staticline3, 0, wxEXPAND|wxTOP, 2 ); bLeftColumn->Add( 0, 5, 0, wxEXPAND, 5 ); diff --git a/eeschema/dialogs/panel_eeschema_annotation_options_base.fbp b/eeschema/dialogs/panel_eeschema_annotation_options_base.fbp index 9dd65202c9..c6035f1975 100644 --- a/eeschema/dialogs/panel_eeschema_annotation_options_base.fbp +++ b/eeschema/dialogs/panel_eeschema_annotation_options_base.fbp @@ -132,8 +132,67 @@ - 0 - wxEXPAND + 2 + wxEXPAND|wxTOP + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_staticline21 + 1 + + + protected + 1 + + Resizable + 1 + + wxLI_HORIZONTAL + ; ; forward_declare + 0 + + + + + + + + 5 + wxEXPAND|wxTOP|wxLEFT 0 @@ -214,7 +273,7 @@ 5 - wxLEFT|wxRIGHT + wxLEFT|wxRIGHT|wxALIGN_CENTER_VERTICAL 1 1 @@ -353,7 +412,7 @@ 2 - wxEXPAND|wxTOP|wxBOTTOM + wxEXPAND|wxTOP 0 1 @@ -766,7 +825,7 @@ 2 - wxEXPAND|wxTOP|wxBOTTOM + wxEXPAND|wxTOP 0 1 diff --git a/eeschema/dialogs/panel_eeschema_annotation_options_base.h b/eeschema/dialogs/panel_eeschema_annotation_options_base.h index 7ba08d4198..9713554365 100644 --- a/eeschema/dialogs/panel_eeschema_annotation_options_base.h +++ b/eeschema/dialogs/panel_eeschema_annotation_options_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6a-dirty) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -17,9 +17,9 @@ #include #include #include +#include #include #include -#include #include #include #include @@ -47,6 +47,7 @@ class PANEL_EESCHEMA_ANNOTATION_OPTIONS_BASE : public RESETTABLE_PANEL protected: wxStaticText* m_orderLabel1; + wxStaticLine* m_staticline21; wxStaticText* m_staticText6; wxChoice* m_choiceSeparatorRefId; wxStaticText* m_orderLabel; diff --git a/eeschema/dialogs/panel_setup_buses_base.cpp b/eeschema/dialogs/panel_setup_buses_base.cpp index f29f35cf99..7590ef9503 100644 --- a/eeschema/dialogs/panel_setup_buses_base.cpp +++ b/eeschema/dialogs/panel_setup_buses_base.cpp @@ -21,9 +21,9 @@ PANEL_SETUP_BUSES_BASE::PANEL_SETUP_BUSES_BASE( wxWindow* parent, wxWindowID id, bLeftCol = new wxBoxSizer( wxVERTICAL ); - m_busesLabel = new wxStaticText( this, wxID_ANY, _("Bus definitions:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_busesLabel = new wxStaticText( this, wxID_ANY, _("Bus Definitions"), wxDefaultPosition, wxDefaultSize, 0 ); m_busesLabel->Wrap( -1 ); - bLeftCol->Add( m_busesLabel, 0, wxLEFT|wxTOP, 5 ); + bLeftCol->Add( m_busesLabel, 0, wxLEFT|wxTOP, 8 ); bLeftCol->Add( 0, 3, 0, wxEXPAND, 5 ); @@ -62,23 +62,23 @@ PANEL_SETUP_BUSES_BASE::PANEL_SETUP_BUSES_BASE( wxWindow* parent, wxWindowID id, bSizer10 = new wxBoxSizer( wxHORIZONTAL ); m_addAlias = new STD_BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); - bSizer10->Add( m_addAlias, 0, wxTOP|wxBOTTOM|wxLEFT, 5 ); + bSizer10->Add( m_addAlias, 0, wxBOTTOM, 5 ); bSizer10->Add( 20, 0, 0, wxEXPAND, 5 ); m_deleteAlias = new STD_BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); - bSizer10->Add( m_deleteAlias, 0, wxALL, 5 ); + bSizer10->Add( m_deleteAlias, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); bSizer10->Add( 15, 0, 1, 0, 5 ); m_source = new wxStaticText( this, wxID_ANY, _("(source)"), wxDefaultPosition, wxDefaultSize, 0 ); m_source->Wrap( -1 ); - bSizer10->Add( m_source, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); + bSizer10->Add( m_source, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - bLeftCol->Add( bSizer10, 0, wxEXPAND, 10 ); + bLeftCol->Add( bSizer10, 0, wxEXPAND|wxTOP, 3 ); bMargins->Add( bLeftCol, 1, wxEXPAND|wxRIGHT, 5 ); @@ -91,9 +91,9 @@ PANEL_SETUP_BUSES_BASE::PANEL_SETUP_BUSES_BASE( wxWindow* parent, wxWindowID id, wxBoxSizer* bSizer7; bSizer7 = new wxBoxSizer( wxVERTICAL ); - m_membersLabel = new wxStaticText( membersPanel, wxID_ANY, _("Members of '%s':"), wxDefaultPosition, wxDefaultSize, 0 ); + m_membersLabel = new wxStaticText( membersPanel, wxID_ANY, _("Members of '%s'"), wxDefaultPosition, wxDefaultSize, 0 ); m_membersLabel->Wrap( -1 ); - bSizer7->Add( m_membersLabel, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); + bSizer7->Add( m_membersLabel, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 8 ); bSizer7->Add( 0, 3, 0, wxEXPAND, 5 ); @@ -111,7 +111,7 @@ PANEL_SETUP_BUSES_BASE::PANEL_SETUP_BUSES_BASE( wxWindow* parent, wxWindowID id, m_membersGrid->SetColSize( 0, 300 ); m_membersGrid->EnableDragColMove( false ); m_membersGrid->EnableDragColSize( true ); - m_membersGrid->SetColLabelValue( 0, _("Net / Nested Bus Name") ); + m_membersGrid->SetColLabelValue( 0, _("Net or Nested Bus Name") ); m_membersGrid->SetColLabelSize( wxGRID_AUTOSIZE ); m_membersGrid->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); @@ -132,16 +132,16 @@ PANEL_SETUP_BUSES_BASE::PANEL_SETUP_BUSES_BASE( wxWindow* parent, wxWindowID id, bSizer101 = new wxBoxSizer( wxHORIZONTAL ); m_addMember = new STD_BITMAP_BUTTON( membersPanel, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); - bSizer101->Add( m_addMember, 0, wxTOP|wxBOTTOM|wxLEFT, 5 ); + bSizer101->Add( m_addMember, 0, wxBOTTOM, 5 ); bSizer101->Add( 20, 0, 0, wxEXPAND, 5 ); m_removeMember = new STD_BITMAP_BUTTON( membersPanel, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); - bSizer101->Add( m_removeMember, 0, wxALL, 5 ); + bSizer101->Add( m_removeMember, 0, wxBOTTOM|wxLEFT, 5 ); - bSizer7->Add( bSizer101, 0, wxEXPAND, 5 ); + bSizer7->Add( bSizer101, 0, wxEXPAND|wxTOP, 3 ); membersPanel->SetSizer( bSizer7 ); diff --git a/eeschema/dialogs/panel_setup_buses_base.fbp b/eeschema/dialogs/panel_setup_buses_base.fbp index 46b2950ab4..05e721d9c6 100644 --- a/eeschema/dialogs/panel_setup_buses_base.fbp +++ b/eeschema/dialogs/panel_setup_buses_base.fbp @@ -80,7 +80,7 @@ wxVERTICAL protected - 5 + 8 wxLEFT|wxTOP 0 @@ -112,7 +112,7 @@ 0 0 wxID_ANY - Bus definitions: + Bus Definitions 0 0 @@ -242,8 +242,8 @@ - 10 - wxEXPAND + 3 + wxEXPAND|wxTOP 0 @@ -252,7 +252,7 @@ none 5 - wxTOP|wxBOTTOM|wxLEFT + wxBOTTOM 0 1 @@ -337,7 +337,7 @@ 5 - wxALL + wxBOTTOM|wxRIGHT|wxLEFT 0 1 @@ -422,7 +422,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT 0 1 @@ -612,7 +612,7 @@ wxVERTICAL none - 5 + 8 wxEXPAND|wxTOP|wxRIGHT|wxLEFT 0 @@ -644,7 +644,7 @@ 0 0 wxID_ANY - Members of '%s': + Members of '%s' 0 0 @@ -711,7 +711,7 @@ 1 wxALIGN_CENTER wxGRID_AUTOSIZE - "Net / Nested Bus Name" + "Net or Nested Bus Name" wxALIGN_CENTER 1 300 @@ -774,8 +774,8 @@ - 5 - wxEXPAND + 3 + wxEXPAND|wxTOP 0 @@ -784,7 +784,7 @@ none 5 - wxTOP|wxBOTTOM|wxLEFT + wxBOTTOM 0 1 @@ -869,7 +869,7 @@ 5 - wxALL + wxBOTTOM|wxLEFT 0 1 diff --git a/eeschema/dialogs/panel_setup_formatting_base.cpp b/eeschema/dialogs/panel_setup_formatting_base.cpp index a9668f2946..07f61f5003 100644 --- a/eeschema/dialogs/panel_setup_formatting_base.cpp +++ b/eeschema/dialogs/panel_setup_formatting_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6a-dirty) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -86,7 +86,7 @@ PANEL_SETUP_FORMATTING_BASE::PANEL_SETUP_FORMATTING_BASE( wxWindow* parent, wxWi sbSizer4->Add( fgSizer2, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - bLeftColumn->Add( sbSizer4, 0, wxEXPAND|wxBOTTOM|wxRIGHT, 5 ); + bLeftColumn->Add( sbSizer4, 0, wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT, 5 ); wxStaticBoxSizer* sbSizer41; sbSizer41 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Symbols") ), wxVERTICAL ); @@ -173,7 +173,7 @@ PANEL_SETUP_FORMATTING_BASE::PANEL_SETUP_FORMATTING_BASE( wxWindow* parent, wxWi bLeftColumn->Add( sbSizer2, 1, wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT, 5 ); - bPanelSizer->Add( bLeftColumn, 1, wxEXPAND|wxBOTTOM|wxLEFT, 5 ); + bPanelSizer->Add( bLeftColumn, 1, wxEXPAND|wxBOTTOM, 5 ); wxBoxSizer* bRightColumn; bRightColumn = new wxBoxSizer( wxVERTICAL ); @@ -317,7 +317,7 @@ PANEL_SETUP_FORMATTING_BASE::PANEL_SETUP_FORMATTING_BASE( wxWindow* parent, wxWi bRightColumn->Add( sbSizer7, 1, wxEXPAND|wxALL, 5 ); - bPanelSizer->Add( bRightColumn, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + bPanelSizer->Add( bRightColumn, 1, wxEXPAND|wxBOTTOM|wxLEFT, 5 ); this->SetSizer( bPanelSizer ); diff --git a/eeschema/dialogs/panel_setup_formatting_base.fbp b/eeschema/dialogs/panel_setup_formatting_base.fbp index 51871d39ca..f98b5320ed 100644 --- a/eeschema/dialogs/panel_setup_formatting_base.fbp +++ b/eeschema/dialogs/panel_setup_formatting_base.fbp @@ -62,7 +62,7 @@ none 5 - wxEXPAND|wxBOTTOM|wxLEFT + wxEXPAND|wxBOTTOM 1 @@ -71,7 +71,7 @@ none 5 - wxEXPAND|wxBOTTOM|wxRIGHT + wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT 0 wxID_ANY @@ -1766,7 +1766,7 @@ 5 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + wxEXPAND|wxBOTTOM|wxLEFT 1 diff --git a/eeschema/dialogs/panel_setup_formatting_base.h b/eeschema/dialogs/panel_setup_formatting_base.h index f5e4ea323b..93c09ddb4b 100644 --- a/eeschema/dialogs/panel_setup_formatting_base.h +++ b/eeschema/dialogs/panel_setup_formatting_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6a-dirty) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/eeschema/dialogs/panel_template_fieldnames_base.cpp b/eeschema/dialogs/panel_template_fieldnames_base.cpp index ce15367c35..3298fcb65f 100644 --- a/eeschema/dialogs/panel_template_fieldnames_base.cpp +++ b/eeschema/dialogs/panel_template_fieldnames_base.cpp @@ -62,26 +62,26 @@ PANEL_TEMPLATE_FIELDNAMES_BASE::PANEL_TEMPLATE_FIELDNAMES_BASE( wxWindow* parent bSizer10 = new wxBoxSizer( wxHORIZONTAL ); m_addFieldButton = new STD_BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); - bSizer10->Add( m_addFieldButton, 0, wxTOP|wxBOTTOM|wxLEFT, 5 ); + bSizer10->Add( m_addFieldButton, 0, wxBOTTOM, 5 ); m_bpMoveUp = new STD_BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); m_bpMoveUp->SetToolTip( _("Move up") ); - bSizer10->Add( m_bpMoveUp, 0, wxTOP|wxBOTTOM|wxLEFT, 5 ); + bSizer10->Add( m_bpMoveUp, 0, wxBOTTOM|wxLEFT, 5 ); m_bpMoveDown = new STD_BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); m_bpMoveDown->SetToolTip( _("Move down") ); - bSizer10->Add( m_bpMoveDown, 0, wxTOP|wxBOTTOM|wxLEFT, 5 ); + bSizer10->Add( m_bpMoveDown, 0, wxBOTTOM|wxLEFT, 5 ); bSizer10->Add( 20, 0, 0, wxEXPAND, 5 ); m_deleteFieldButton = new STD_BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); - bSizer10->Add( m_deleteFieldButton, 0, wxALL, 5 ); + bSizer10->Add( m_deleteFieldButton, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - bPanelSizer->Add( bSizer10, 0, wxEXPAND, 10 ); + bPanelSizer->Add( bSizer10, 0, wxEXPAND|wxTOP, 3 ); this->SetSizer( bPanelSizer ); diff --git a/eeschema/dialogs/panel_template_fieldnames_base.fbp b/eeschema/dialogs/panel_template_fieldnames_base.fbp index 8e14fddc13..b470934d08 100644 --- a/eeschema/dialogs/panel_template_fieldnames_base.fbp +++ b/eeschema/dialogs/panel_template_fieldnames_base.fbp @@ -223,8 +223,8 @@ - 10 - wxEXPAND + 3 + wxEXPAND|wxTOP 0 @@ -233,7 +233,7 @@ none 5 - wxTOP|wxBOTTOM|wxLEFT + wxBOTTOM 0 1 @@ -308,7 +308,7 @@ 5 - wxTOP|wxBOTTOM|wxLEFT + wxBOTTOM|wxLEFT 0 1 @@ -383,7 +383,7 @@ 5 - wxTOP|wxBOTTOM|wxLEFT + wxBOTTOM|wxLEFT 0 1 @@ -468,7 +468,7 @@ 5 - wxALL + wxBOTTOM|wxRIGHT|wxLEFT 0 1 diff --git a/include/panel_text_variables.h b/include/panel_text_variables.h index 5c064eb976..80832740d0 100644 --- a/include/panel_text_variables.h +++ b/include/panel_text_variables.h @@ -21,8 +21,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef _PANEL_TEXT_VARIABLES_H_ -#define _PANEL_TEXT_VARIABLES_H_ +#pragma once #include <../common/dialogs/panel_text_variables_base.h> #include @@ -70,5 +69,3 @@ private: std::unique_ptr m_autoSizer; }; - -#endif // _PANEL_TEXT_VARIABLES_H_ diff --git a/pcbnew/dialogs/dialog_board_setup.cpp b/pcbnew/dialogs/dialog_board_setup.cpp index ffe86c4228..e640b9ac3f 100644 --- a/pcbnew/dialogs/dialog_board_setup.cpp +++ b/pcbnew/dialogs/dialog_board_setup.cpp @@ -236,7 +236,7 @@ DIALOG_BOARD_SETUP::DIALOG_BOARD_SETUP( PCB_EDIT_FRAME* aFrame, wxWindow* aParen m_treebook->AddLazySubPage( [this]( wxWindow* aParent ) -> wxWindow* { - return new PANEL_EMBEDDED_FILES( aParent, m_frame->GetBoard() ); + return new PANEL_EMBEDDED_FILES( aParent, m_frame->GetBoard(), NO_MARGINS ); }, _( "Embedded Files" ) ); diff --git a/pcbnew/dialogs/panel_fp_properties_3d_model.cpp b/pcbnew/dialogs/panel_fp_properties_3d_model.cpp index 7f02917f73..631f9a319a 100644 --- a/pcbnew/dialogs/panel_fp_properties_3d_model.cpp +++ b/pcbnew/dialogs/panel_fp_properties_3d_model.cpp @@ -106,25 +106,21 @@ PANEL_FP_PROPERTIES_3D_MODEL::PANEL_FP_PROPERTIES_3D_MODEL( PCB_BASE_EDIT_FRAME* if( cfg ) { - attr->SetEditor( new GRID_CELL_PATH_EDITOR( m_parentDialog, m_modelsGrid, - &cfg->m_LastFootprint3dDir, wxT( "*.*" ), true, - m_frame->Prj().GetProjectPath(), - [this]( const wxString& aFile ) -> wxString - { - EMBEDDED_FILES::EMBEDDED_FILE* result = - m_filesPanel->AddEmbeddedFile( aFile ); + attr->SetEditor( new GRID_CELL_PATH_EDITOR( m_parentDialog, m_modelsGrid, &cfg->m_LastFootprint3dDir, + wxT( "*.*" ), true, m_frame->Prj().GetProjectPath(), + [this]( const wxString& aFile ) -> wxString + { + EMBEDDED_FILES::EMBEDDED_FILE* result = m_filesPanel->AddEmbeddedFile( aFile ); - if( !result ) - { - wxString msg = wxString::Format( - _( "Error adding 3D model" ) ); - wxMessageBox( msg, _( "Error" ), - wxICON_ERROR | wxOK, this ); - return wxString(); - } + if( !result ) + { + wxString msg = wxString::Format( _( "Error adding 3D model" ) ); + wxMessageBox( msg, _( "Error" ), wxICON_ERROR | wxOK, this ); + return wxString(); + } - return result->GetLink(); - } ) ); + return result->GetLink(); + } ) ); } m_modelsGrid->SetColAttr( COL_FILENAME, attr ); diff --git a/pcbnew/dialogs/panel_setup_constraints_base.cpp b/pcbnew/dialogs/panel_setup_constraints_base.cpp index d648f81885..73c986eb51 100644 --- a/pcbnew/dialogs/panel_setup_constraints_base.cpp +++ b/pcbnew/dialogs/panel_setup_constraints_base.cpp @@ -206,7 +206,7 @@ PANEL_SETUP_CONSTRAINTS_BASE::PANEL_SETUP_CONSTRAINTS_BASE( wxWindow* parent, wx fgFeatureConstraints->Add( m_staticline5, 0, wxEXPAND|wxTOP|wxBOTTOM, 2 ); m_staticline6 = new wxStaticLine( m_scrolledWindow, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - fgFeatureConstraints->Add( m_staticline6, 0, wxEXPAND|wxTOP, 2 ); + fgFeatureConstraints->Add( m_staticline6, 0, wxEXPAND, 2 ); m_bitmapMinViaDrill = new wxStaticBitmap( m_scrolledWindow, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); fgFeatureConstraints->Add( m_bitmapMinViaDrill, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); diff --git a/pcbnew/dialogs/panel_setup_constraints_base.fbp b/pcbnew/dialogs/panel_setup_constraints_base.fbp index d0e81251b3..72d9952829 100644 --- a/pcbnew/dialogs/panel_setup_constraints_base.fbp +++ b/pcbnew/dialogs/panel_setup_constraints_base.fbp @@ -2731,7 +2731,7 @@ 2 - wxEXPAND|wxTOP + wxEXPAND 0 1 diff --git a/pcbnew/dialogs/panel_setup_time_domain_parameters.cpp b/pcbnew/dialogs/panel_setup_time_domain_parameters.cpp index 7f1a73c6ed..739b192e20 100644 --- a/pcbnew/dialogs/panel_setup_time_domain_parameters.cpp +++ b/pcbnew/dialogs/panel_setup_time_domain_parameters.cpp @@ -43,6 +43,7 @@ PANEL_SETUP_TIME_DOMAIN_PARAMETERS::PANEL_SETUP_TIME_DOMAIN_PARAMETERS( m_board( aFrame->GetBoard() ) { m_timeDomainParametersPane->SetBorders( true, false, false, false ); + m_viaDelayOverridesPane->SetBorders( true, false, false, false ); // Set up units m_unitsProvider = std::make_unique( pcbIUScale, m_frame->GetUserUnits() ); diff --git a/pcbnew/dialogs/panel_setup_time_domain_parameters_base.cpp b/pcbnew/dialogs/panel_setup_time_domain_parameters_base.cpp index f24b970116..8f25c84950 100644 --- a/pcbnew/dialogs/panel_setup_time_domain_parameters_base.cpp +++ b/pcbnew/dialogs/panel_setup_time_domain_parameters_base.cpp @@ -67,7 +67,7 @@ PANEL_SETUP_TIME_DOMAIN_PARAMETERS_BASE::PANEL_SETUP_TIME_DOMAIN_PARAMETERS_BASE buttonBoxSizer = new wxBoxSizer( wxHORIZONTAL ); m_addDelayProfileButton = new STD_BITMAP_BUTTON( m_timeDomainParametersPane, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); - buttonBoxSizer->Add( m_addDelayProfileButton, 0, wxLEFT, 2 ); + buttonBoxSizer->Add( m_addDelayProfileButton, 0, wxBOTTOM|wxLEFT, 5 ); buttonBoxSizer->Add( 20, 0, 0, wxEXPAND, 5 ); @@ -79,24 +79,24 @@ PANEL_SETUP_TIME_DOMAIN_PARAMETERS_BASE::PANEL_SETUP_TIME_DOMAIN_PARAMETERS_BASE buttonBoxSizer->Add( 20, 0, 0, wxEXPAND, 5 ); - bUpperSizer->Add( buttonBoxSizer, 0, wxEXPAND|wxLEFT|wxTOP, 5 ); + bUpperSizer->Add( buttonBoxSizer, 0, wxEXPAND|wxTOP, 3 ); m_timeDomainParametersPane->SetSizer( bUpperSizer ); m_timeDomainParametersPane->Layout(); bUpperSizer->Fit( m_timeDomainParametersPane ); - m_timeDomainParametersPane1 = new WX_PANEL( m_splitter, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + m_viaDelayOverridesPane = new WX_PANEL( m_splitter, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bUpperSizer1; bUpperSizer1 = new wxBoxSizer( wxVERTICAL ); - m_staticText31 = new wxStaticText( m_timeDomainParametersPane1, wxID_ANY, _("Via Delay Overrides"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText31 = new wxStaticText( m_viaDelayOverridesPane, wxID_ANY, _("Via Delay Overrides"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText31->Wrap( -1 ); bUpperSizer1->Add( m_staticText31, 0, wxTOP|wxLEFT|wxEXPAND, 8 ); bUpperSizer1->Add( 0, 3, 0, wxEXPAND, 5 ); - m_viaPropagationGrid = new WX_GRID( m_timeDomainParametersPane1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxTAB_TRAVERSAL|wxVSCROLL ); + m_viaPropagationGrid = new WX_GRID( m_viaDelayOverridesPane, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxTAB_TRAVERSAL|wxVSCROLL ); // Grid m_viaPropagationGrid->CreateGrid( 0, 6 ); @@ -131,26 +131,26 @@ PANEL_SETUP_TIME_DOMAIN_PARAMETERS_BASE::PANEL_SETUP_TIME_DOMAIN_PARAMETERS_BASE wxBoxSizer* buttonBoxSizer1; buttonBoxSizer1 = new wxBoxSizer( wxHORIZONTAL ); - m_addViaOverrideButton = new STD_BITMAP_BUTTON( m_timeDomainParametersPane1, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); - buttonBoxSizer1->Add( m_addViaOverrideButton, 0, wxLEFT, 2 ); + m_addViaOverrideButton = new STD_BITMAP_BUTTON( m_viaDelayOverridesPane, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); + buttonBoxSizer1->Add( m_addViaOverrideButton, 0, wxBOTTOM|wxLEFT, 5 ); buttonBoxSizer1->Add( 20, 0, 0, wxEXPAND, 5 ); - m_removeViaOverrideButton = new STD_BITMAP_BUTTON( m_timeDomainParametersPane1, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); + m_removeViaOverrideButton = new STD_BITMAP_BUTTON( m_viaDelayOverridesPane, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); buttonBoxSizer1->Add( m_removeViaOverrideButton, 0, wxBOTTOM|wxLEFT, 5 ); buttonBoxSizer1->Add( 20, 0, 0, wxEXPAND, 5 ); - bUpperSizer1->Add( buttonBoxSizer1, 0, wxEXPAND|wxLEFT|wxTOP, 5 ); + bUpperSizer1->Add( buttonBoxSizer1, 0, wxEXPAND|wxTOP, 3 ); - m_timeDomainParametersPane1->SetSizer( bUpperSizer1 ); - m_timeDomainParametersPane1->Layout(); - bUpperSizer1->Fit( m_timeDomainParametersPane1 ); - m_splitter->SplitHorizontally( m_timeDomainParametersPane, m_timeDomainParametersPane1, -1 ); + m_viaDelayOverridesPane->SetSizer( bUpperSizer1 ); + m_viaDelayOverridesPane->Layout(); + bUpperSizer1->Fit( m_viaDelayOverridesPane ); + m_splitter->SplitHorizontally( m_timeDomainParametersPane, m_viaDelayOverridesPane, -1 ); bMargins->Add( m_splitter, 1, wxEXPAND, 10 ); diff --git a/pcbnew/dialogs/panel_setup_time_domain_parameters_base.fbp b/pcbnew/dialogs/panel_setup_time_domain_parameters_base.fbp index 88fd253a50..07e4e39826 100644 --- a/pcbnew/dialogs/panel_setup_time_domain_parameters_base.fbp +++ b/pcbnew/dialogs/panel_setup_time_domain_parameters_base.fbp @@ -133,7 +133,7 @@ - + 1 1 1 @@ -185,7 +185,7 @@ wxTAB_TRAVERSAL - + bUpperSizer wxVERTICAL @@ -352,18 +352,18 @@ OnSizeTraceParametersGrid - - 5 - wxEXPAND|wxLEFT|wxTOP + + 3 + wxEXPAND|wxTOP 0 - + buttonBoxSizer wxHORIZONTAL none - 2 - wxLEFT + 5 + wxBOTTOM|wxLEFT 0 1 @@ -573,7 +573,7 @@ 0 1 - m_timeDomainParametersPane1 + m_viaDelayOverridesPane 1 @@ -757,8 +757,8 @@ - 5 - wxEXPAND|wxLEFT|wxTOP + 3 + wxEXPAND|wxTOP 0 @@ -766,8 +766,8 @@ wxHORIZONTAL none - 2 - wxLEFT + 5 + wxBOTTOM|wxLEFT 0 1 diff --git a/pcbnew/dialogs/panel_setup_time_domain_parameters_base.h b/pcbnew/dialogs/panel_setup_time_domain_parameters_base.h index aff54d5743..b05d18c433 100644 --- a/pcbnew/dialogs/panel_setup_time_domain_parameters_base.h +++ b/pcbnew/dialogs/panel_setup_time_domain_parameters_base.h @@ -46,7 +46,7 @@ class PANEL_SETUP_TIME_DOMAIN_PARAMETERS_BASE : public wxPanel WX_GRID* m_tracePropagationGrid; STD_BITMAP_BUTTON* m_addDelayProfileButton; STD_BITMAP_BUTTON* m_removeDelayProfileButton; - WX_PANEL* m_timeDomainParametersPane1; + WX_PANEL* m_viaDelayOverridesPane; wxStaticText* m_staticText31; WX_GRID* m_viaPropagationGrid; STD_BITMAP_BUTTON* m_addViaOverrideButton; diff --git a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp index 17c6812b93..1a169db05c 100644 --- a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp +++ b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp @@ -35,6 +35,7 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa m_trackWidthsGrid->SetMargins( 0, 0 ); // Columns + m_trackWidthsGrid->SetColSize( 0, 120 ); m_trackWidthsGrid->EnableDragColMove( false ); m_trackWidthsGrid->EnableDragColSize( false ); m_trackWidthsGrid->SetColLabelValue( 0, _("Width") ); @@ -43,14 +44,6 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa // Rows m_trackWidthsGrid->EnableDragRowSize( false ); - m_trackWidthsGrid->SetRowLabelValue( 0, _("1") ); - m_trackWidthsGrid->SetRowLabelValue( 1, _("2") ); - m_trackWidthsGrid->SetRowLabelValue( 2, _("3") ); - m_trackWidthsGrid->SetRowLabelValue( 3, _("4") ); - m_trackWidthsGrid->SetRowLabelValue( 4, _("5") ); - m_trackWidthsGrid->SetRowLabelValue( 5, _("6") ); - m_trackWidthsGrid->SetRowLabelValue( 6, _("7") ); - m_trackWidthsGrid->SetRowLabelValue( 7, _("8") ); m_trackWidthsGrid->SetRowLabelSize( 0 ); m_trackWidthsGrid->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); @@ -58,28 +51,25 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa // Cell Defaults m_trackWidthsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER ); - bSizerTracks->Add( m_trackWidthsGrid, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); + bSizerTracks->Add( m_trackWidthsGrid, 1, wxEXPAND|wxRIGHT, 5 ); wxBoxSizer* bSizer3; bSizer3 = new wxBoxSizer( wxHORIZONTAL ); m_trackWidthsAddButton = new STD_BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); - bSizer3->Add( m_trackWidthsAddButton, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + bSizer3->Add( m_trackWidthsAddButton, 0, wxBOTTOM|wxRIGHT, 5 ); m_trackWidthsSortButton = new STD_BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); bSizer3->Add( m_trackWidthsSortButton, 0, wxRIGHT|wxLEFT, 5 ); - - bSizer3->Add( 20, 0, 0, wxEXPAND, 5 ); - m_trackWidthsRemoveButton = new STD_BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); - bSizer3->Add( m_trackWidthsRemoveButton, 0, wxLEFT|wxRIGHT, 5 ); + bSizer3->Add( m_trackWidthsRemoveButton, 0, wxLEFT|wxRIGHT, 25 ); - bSizerTracks->Add( bSizer3, 0, wxEXPAND|wxTOP, 2 ); + bSizerTracks->Add( bSizer3, 0, wxEXPAND|wxTOP, 3 ); - bMainSizer->Add( bSizerTracks, 1, wxEXPAND|wxRIGHT, 5 ); + bMainSizer->Add( bSizerTracks, 1, wxEXPAND, 5 ); wxBoxSizer* bSizerVias; bSizerVias = new wxBoxSizer( wxVERTICAL ); @@ -99,6 +89,8 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa m_viaSizesGrid->SetMargins( 0, 0 ); // Columns + m_viaSizesGrid->SetColSize( 0, 120 ); + m_viaSizesGrid->SetColSize( 1, 120 ); m_viaSizesGrid->EnableDragColMove( false ); m_viaSizesGrid->EnableDragColSize( false ); m_viaSizesGrid->SetColLabelValue( 0, _("Diameter") ); @@ -108,14 +100,6 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa // Rows m_viaSizesGrid->EnableDragRowSize( false ); - m_viaSizesGrid->SetRowLabelValue( 0, _("1") ); - m_viaSizesGrid->SetRowLabelValue( 1, _("2") ); - m_viaSizesGrid->SetRowLabelValue( 2, _("3") ); - m_viaSizesGrid->SetRowLabelValue( 3, _("4") ); - m_viaSizesGrid->SetRowLabelValue( 4, _("5") ); - m_viaSizesGrid->SetRowLabelValue( 5, _("6") ); - m_viaSizesGrid->SetRowLabelValue( 6, _("7") ); - m_viaSizesGrid->SetRowLabelValue( 7, _("8") ); m_viaSizesGrid->SetRowLabelSize( 0 ); m_viaSizesGrid->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); @@ -123,13 +107,13 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa // Cell Defaults m_viaSizesGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER ); - bSizerVias->Add( m_viaSizesGrid, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); + bSizerVias->Add( m_viaSizesGrid, 1, wxEXPAND|wxRIGHT, 5 ); wxBoxSizer* bSizer4; bSizer4 = new wxBoxSizer( wxHORIZONTAL ); m_viaSizesAddButton = new STD_BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); - bSizer4->Add( m_viaSizesAddButton, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + bSizer4->Add( m_viaSizesAddButton, 0, wxBOTTOM|wxRIGHT, 5 ); m_viaSizesSortButton = new STD_BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); bSizer4->Add( m_viaSizesSortButton, 0, wxRIGHT|wxLEFT, 5 ); @@ -141,10 +125,10 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa bSizer4->Add( m_viaSizesRemoveButton, 0, wxLEFT|wxRIGHT, 5 ); - bSizerVias->Add( bSizer4, 0, wxEXPAND|wxTOP, 2 ); + bSizerVias->Add( bSizer4, 0, wxEXPAND|wxTOP, 3 ); - bMainSizer->Add( bSizerVias, 2, wxEXPAND|wxRIGHT, 5 ); + bMainSizer->Add( bSizerVias, 2, wxEXPAND, 5 ); wxBoxSizer* bSizerDiffPairs; bSizerDiffPairs = new wxBoxSizer( wxVERTICAL ); @@ -164,6 +148,9 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa m_diffPairsGrid->SetMargins( 0, 0 ); // Columns + m_diffPairsGrid->SetColSize( 0, 120 ); + m_diffPairsGrid->SetColSize( 1, 120 ); + m_diffPairsGrid->SetColSize( 2, 120 ); m_diffPairsGrid->EnableDragColMove( false ); m_diffPairsGrid->EnableDragColSize( false ); m_diffPairsGrid->SetColLabelValue( 0, _("Width") ); @@ -174,14 +161,6 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa // Rows m_diffPairsGrid->EnableDragRowSize( false ); - m_diffPairsGrid->SetRowLabelValue( 0, _("1") ); - m_diffPairsGrid->SetRowLabelValue( 1, _("2") ); - m_diffPairsGrid->SetRowLabelValue( 2, _("3") ); - m_diffPairsGrid->SetRowLabelValue( 3, _("4") ); - m_diffPairsGrid->SetRowLabelValue( 4, _("5") ); - m_diffPairsGrid->SetRowLabelValue( 5, _("6") ); - m_diffPairsGrid->SetRowLabelValue( 6, _("7") ); - m_diffPairsGrid->SetRowLabelValue( 7, _("8") ); m_diffPairsGrid->SetRowLabelSize( 0 ); m_diffPairsGrid->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); @@ -190,13 +169,13 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa // Cell Defaults m_diffPairsGrid->SetDefaultCellBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); m_diffPairsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER ); - bSizerDiffPairs->Add( m_diffPairsGrid, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); + bSizerDiffPairs->Add( m_diffPairsGrid, 1, wxEXPAND, 5 ); wxBoxSizer* bSizer5; bSizer5 = new wxBoxSizer( wxHORIZONTAL ); m_diffPairsAddButton = new STD_BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); - bSizer5->Add( m_diffPairsAddButton, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + bSizer5->Add( m_diffPairsAddButton, 0, wxBOTTOM|wxRIGHT, 5 ); m_diffPairsSortButton = new STD_BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); bSizer5->Add( m_diffPairsSortButton, 0, wxRIGHT|wxLEFT, 5 ); @@ -208,7 +187,7 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa bSizer5->Add( m_diffPairsRemoveButton, 0, wxLEFT|wxRIGHT, 5 ); - bSizerDiffPairs->Add( bSizer5, 0, wxEXPAND|wxTOP, 2 ); + bSizerDiffPairs->Add( bSizer5, 0, wxEXPAND|wxTOP, 3 ); bMainSizer->Add( bSizerDiffPairs, 3, wxEXPAND, 5 ); diff --git a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.fbp b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.fbp index 4fb85ce860..41dd32c9ee 100644 --- a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.fbp +++ b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.fbp @@ -62,7 +62,7 @@ none 5 - wxEXPAND|wxRIGHT + wxEXPAND 1 @@ -133,7 +133,7 @@ 5 - wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT + wxEXPAND|wxRIGHT 1 1 @@ -162,7 +162,7 @@ "Width" wxALIGN_CENTER 1 - + 120 1 0 @@ -206,7 +206,7 @@ Resizable wxALIGN_CENTER 0 - "1" "2" "3" "4" "5" "6" "7" "8" + wxALIGN_CENTER 8 @@ -221,7 +221,7 @@ - 2 + 3 wxEXPAND|wxTOP 0 @@ -231,7 +231,7 @@ none 5 - wxBOTTOM|wxLEFT|wxRIGHT + wxBOTTOM|wxRIGHT 0 1 @@ -380,17 +380,7 @@ - 5 - wxEXPAND - 0 - - 0 - protected - 20 - - - - 5 + 25 wxLEFT|wxRIGHT 0 @@ -470,7 +460,7 @@ 5 - wxEXPAND|wxRIGHT + wxEXPAND 2 @@ -541,7 +531,7 @@ 5 - wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT + wxEXPAND|wxRIGHT 1 1 @@ -570,7 +560,7 @@ "Diameter" "Hole" wxALIGN_CENTER 2 - + 120,120 1 0 @@ -614,7 +604,7 @@ Resizable wxALIGN_CENTER 0 - "1" "2" "3" "4" "5" "6" "7" "8" + wxALIGN_CENTER 8 @@ -629,7 +619,7 @@ - 2 + 3 wxEXPAND|wxTOP 0 @@ -639,7 +629,7 @@ none 5 - wxBOTTOM|wxLEFT|wxRIGHT + wxBOTTOM|wxRIGHT 0 1 @@ -949,7 +939,7 @@ 5 - wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT + wxEXPAND 1 1 @@ -978,7 +968,7 @@ "Width" "Gap" "Via Gap" wxALIGN_CENTER 3 - + 120,120,120 1 0 @@ -1022,7 +1012,7 @@ Resizable wxALIGN_CENTER 0 - "1" "2" "3" "4" "5" "6" "7" "8" + wxALIGN_CENTER 8 @@ -1037,7 +1027,7 @@ - 2 + 3 wxEXPAND|wxTOP 0 @@ -1047,7 +1037,7 @@ none 5 - wxBOTTOM|wxLEFT|wxRIGHT + wxBOTTOM|wxRIGHT 0 1