From 0032845f9e8cb2411743448a7fef609e67fd4506 Mon Sep 17 00:00:00 2001 From: Wayne Stambaugh Date: Wed, 3 Jun 2020 13:46:50 -0400 Subject: [PATCH] Fix clipped bitmap buttons with GTK on Linux. A note to developers, please do not set the minimum and/or size of bitmap buttons. It causes bitmaps to get clipped using GTK on Linux. If the bitmap button size is not acceptable, then supply an appropriately sized bitmap rather than attempt to force the wxWidgets sizing mechanism to do what you want. This almost always causes platform differences that do not work well. --- .../3d_cache/dialogs/panel_prev_3d_base.cpp | 20 +- .../3d_cache/dialogs/panel_prev_3d_base.fbp | 28 +- .../3d_cache/dialogs/panel_prev_3d_base.h | 2 +- .../dialogs/dialog_configure_paths_base.cpp | 14 +- .../dialogs/dialog_configure_paths_base.fbp | 20 +- common/dialogs/dialog_configure_paths_base.h | 2 +- common/dialogs/panel_common_settings_base.cpp | 6 +- common/dialogs/panel_common_settings_base.fbp | 4 +- common/dialogs/panel_common_settings_base.h | 2 +- common/dialogs/panel_text_variables_base.cpp | 6 +- common/dialogs/panel_text_variables_base.fbp | 4 +- common/dialogs/panel_text_variables_base.h | 2 +- eeschema/dialogs/dialog_bom_base.cpp | 9 +- eeschema/dialogs/dialog_bom_base.fbp | 8 +- eeschema/dialogs/dialog_bom_base.h | 4 +- .../dialog_edit_component_in_lib_base.cpp | 7 +- .../dialog_edit_component_in_lib_base.fbp | 18 +- .../dialog_edit_component_in_lib_base.h | 4 +- .../dialogs/dialog_sch_sheet_props_base.fbp | 14 +- ...anel_eeschema_template_fieldnames_base.cpp | 6 +- ...anel_eeschema_template_fieldnames_base.fbp | 4 +- .../panel_eeschema_template_fieldnames_base.h | 2 +- eeschema/dialogs/panel_sym_lib_table_base.cpp | 13 +- eeschema/dialogs/panel_sym_lib_table_base.fbp | 19 +- eeschema/dialogs/panel_sym_lib_table_base.h | 4 +- .../dialogs/properties_frame_base.cpp | 3 +- .../dialogs/properties_frame_base.fbp | 7 +- .../dialogs/properties_frame_base.h | 6 +- ...og_edit_footprint_for_BoardEditor_base.cpp | 17 +- ...og_edit_footprint_for_BoardEditor_base.fbp | 28 +- ...alog_edit_footprint_for_BoardEditor_base.h | 4 +- ...alog_edit_footprint_for_fp_editor_base.cpp | 16 +- ...alog_edit_footprint_for_fp_editor_base.fbp | 20 +- ...dialog_edit_footprint_for_fp_editor_base.h | 2 +- pcbnew/dialogs/panel_fp_lib_table.cpp | 49 +- pcbnew/dialogs/panel_fp_lib_table_base.cpp | 13 +- pcbnew/dialogs/panel_fp_lib_table_base.fbp | 18 +- pcbnew/dialogs/panel_fp_lib_table_base.h | 4 +- .../panel_pcbnew_action_plugins_base.cpp | 9 +- .../panel_pcbnew_action_plugins_base.fbp | 805 ++++++------- .../panel_pcbnew_action_plugins_base.h | 4 +- .../dialogs/panel_setup_netclasses_base.cpp | 6 +- .../dialogs/panel_setup_netclasses_base.fbp | 12 +- pcbnew/dialogs/panel_setup_netclasses_base.h | 2 +- .../panel_setup_tracks_and_vias_base.cpp | 152 ++- .../panel_setup_tracks_and_vias_base.fbp | 1013 ++++++----------- .../panel_setup_tracks_and_vias_base.h | 24 +- 47 files changed, 1077 insertions(+), 1359 deletions(-) diff --git a/3d-viewer/3d_cache/dialogs/panel_prev_3d_base.cpp b/3d-viewer/3d_cache/dialogs/panel_prev_3d_base.cpp index b67bc128a8..51dfe0ef62 100644 --- a/3d-viewer/3d_cache/dialogs/panel_prev_3d_base.cpp +++ b/3d-viewer/3d_cache/dialogs/panel_prev_3d_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 6 2019) +// C++ code generated with wxFormBuilder (version 3.9.0 Jun 3 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -169,7 +169,7 @@ PANEL_PREV_3D_BASE::PANEL_PREV_3D_BASE( wxWindow* parent, wxWindowID id, const w staticPreviewLabel->Wrap( -1 ); staticPreviewLabel->SetFont( wxFont( 11, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); - bSizerRight->Add( staticPreviewLabel, 0, wxLEFT|wxRIGHT, 10 ); + bSizerRight->Add( staticPreviewLabel, 0, wxEXPAND|wxLEFT|wxRIGHT, 10 ); m_SizerPanelView = new wxBoxSizer( wxVERTICAL ); @@ -185,7 +185,7 @@ PANEL_PREV_3D_BASE::PANEL_PREV_3D_BASE( wxWindow* parent, wxWindowID id, const w bSizer3DButtons->Add( 0, 0, 0, wxEXPAND|wxTOP, 5 ); - m_bpvISO = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW|0 ); + m_bpvISO = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); m_bpvISO->SetToolTip( _("Change to isometric perspective") ); bSizer3DButtons->Add( m_bpvISO, 0, wxTOP|wxBOTTOM, 5 ); @@ -193,28 +193,28 @@ PANEL_PREV_3D_BASE::PANEL_PREV_3D_BASE( wxWindow* parent, wxWindowID id, const w bSizer3DButtons->Add( 0, 0, 1, wxEXPAND, 5 ); - m_bpvLeft = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW|0 ); + m_bpvLeft = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); bSizer3DButtons->Add( m_bpvLeft, 0, wxALIGN_LEFT|wxALIGN_RIGHT|wxBOTTOM, 5 ); - m_bpvRight = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW|0 ); + m_bpvRight = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); bSizer3DButtons->Add( m_bpvRight, 0, wxBOTTOM, 5 ); - m_bpvFront = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW|0 ); + m_bpvFront = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); bSizer3DButtons->Add( m_bpvFront, 0, wxBOTTOM, 5 ); - m_bpvBack = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW|0 ); + m_bpvBack = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); bSizer3DButtons->Add( m_bpvBack, 0, wxBOTTOM, 5 ); - m_bpvTop = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW|0 ); + m_bpvTop = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); bSizer3DButtons->Add( m_bpvTop, 0, wxBOTTOM, 5 ); - m_bpvBottom = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW|0 ); + m_bpvBottom = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); bSizer3DButtons->Add( m_bpvBottom, 0, 0, 5 ); bSizer3DButtons->Add( 0, 0, 1, wxEXPAND, 5 ); - m_bpUpdate = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW|0 ); + m_bpUpdate = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); m_bpUpdate->SetToolTip( _("Reload board and 3D models") ); bSizer3DButtons->Add( m_bpUpdate, 0, wxBOTTOM, 5 ); diff --git a/3d-viewer/3d_cache/dialogs/panel_prev_3d_base.fbp b/3d-viewer/3d_cache/dialogs/panel_prev_3d_base.fbp index 70fe252eae..98bd244828 100644 --- a/3d-viewer/3d_cache/dialogs/panel_prev_3d_base.fbp +++ b/3d-viewer/3d_cache/dialogs/panel_prev_3d_base.fbp @@ -14,6 +14,7 @@ panel_prev_3d_base 1000 none + 1 panel_prev_3d_base @@ -25,6 +26,7 @@ 1 1 UI + 0 0 0 @@ -1935,7 +1937,7 @@ none 10 - wxLEFT|wxRIGHT + wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -2039,6 +2041,7 @@ + 0 @@ -2084,7 +2087,7 @@ Resizable 1 - 40,40 + -1,-1 0 @@ -2122,6 +2125,7 @@ + 0 @@ -2167,7 +2171,7 @@ Resizable 1 - 40,40 + -1,-1 0 @@ -2195,6 +2199,7 @@ + 0 @@ -2240,7 +2245,7 @@ Resizable 1 - 40,40 + -1,-1 0 @@ -2268,6 +2273,7 @@ + 0 @@ -2313,7 +2319,7 @@ Resizable 1 - 40,40 + -1,-1 0 @@ -2341,6 +2347,7 @@ + 0 @@ -2386,7 +2393,7 @@ Resizable 1 - 40,40 + -1,-1 0 @@ -2414,6 +2421,7 @@ + 0 @@ -2459,7 +2467,7 @@ Resizable 1 - 40,40 + -1,-1 0 @@ -2487,6 +2495,7 @@ + 0 @@ -2532,7 +2541,7 @@ Resizable 1 - 40,40 + -1,-1 0 @@ -2570,6 +2579,7 @@ + 0 @@ -2615,7 +2625,7 @@ Resizable 1 - 40,40 + -1,-1 0 diff --git a/3d-viewer/3d_cache/dialogs/panel_prev_3d_base.h b/3d-viewer/3d_cache/dialogs/panel_prev_3d_base.h index 3bcad750f8..bd622480ab 100644 --- a/3d-viewer/3d_cache/dialogs/panel_prev_3d_base.h +++ b/3d-viewer/3d_cache/dialogs/panel_prev_3d_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 6 2019) +// C++ code generated with wxFormBuilder (version 3.9.0 Jun 3 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/common/dialogs/dialog_configure_paths_base.cpp b/common/dialogs/dialog_configure_paths_base.cpp index d30e66eb00..b1630727fa 100644 --- a/common/dialogs/dialog_configure_paths_base.cpp +++ b/common/dialogs/dialog_configure_paths_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 6 2019) +// C++ code generated with wxFormBuilder (version 3.9.0 Jun 3 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -57,16 +57,12 @@ DIALOG_CONFIGURE_PATHS_BASE::DIALOG_CONFIGURE_PATHS_BASE( wxWindow* parent, wxWi bSizerEnvVarBtns = new wxBoxSizer( wxHORIZONTAL ); m_btnAddEnvVar = new wxBitmapButton( sbEnvVars->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); - m_btnAddEnvVar->SetMinSize( wxSize( 30,29 ) ); - bSizerEnvVarBtns->Add( m_btnAddEnvVar, 0, wxBOTTOM|wxLEFT, 5 ); bSizerEnvVarBtns->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); m_btnDeleteEnvVar = new wxBitmapButton( sbEnvVars->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); - m_btnDeleteEnvVar->SetMinSize( wxSize( 30,29 ) ); - bSizerEnvVarBtns->Add( m_btnDeleteEnvVar, 0, wxBOTTOM, 5 ); @@ -116,26 +112,18 @@ DIALOG_CONFIGURE_PATHS_BASE::DIALOG_CONFIGURE_PATHS_BASE( wxWindow* parent, wxWi bSizerSearchPathBtns = new wxBoxSizer( wxHORIZONTAL ); m_btnAddSearchPath = new wxBitmapButton( m_sb3DSearchPaths->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); - m_btnAddSearchPath->SetMinSize( wxSize( 30,29 ) ); - bSizerSearchPathBtns->Add( m_btnAddSearchPath, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); m_btnMoveUp = new wxBitmapButton( m_sb3DSearchPaths->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); - m_btnMoveUp->SetMinSize( wxSize( 30,29 ) ); - bSizerSearchPathBtns->Add( m_btnMoveUp, 0, wxBOTTOM|wxRIGHT, 5 ); m_btnMoveDown = new wxBitmapButton( m_sb3DSearchPaths->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); - m_btnMoveDown->SetMinSize( wxSize( 30,29 ) ); - bSizerSearchPathBtns->Add( m_btnMoveDown, 0, wxBOTTOM|wxRIGHT, 5 ); bSizerSearchPathBtns->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); m_btnDeleteSearchPath = new wxBitmapButton( m_sb3DSearchPaths->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); - m_btnDeleteSearchPath->SetMinSize( wxSize( 30,29 ) ); - bSizerSearchPathBtns->Add( m_btnDeleteSearchPath, 0, wxBOTTOM|wxRIGHT, 5 ); diff --git a/common/dialogs/dialog_configure_paths_base.fbp b/common/dialogs/dialog_configure_paths_base.fbp index 5b682670b0..3c057879b2 100644 --- a/common/dialogs/dialog_configure_paths_base.fbp +++ b/common/dialogs/dialog_configure_paths_base.fbp @@ -14,6 +14,7 @@ dialog_configure_paths_base 1000 none + 1 DIALOG_CONFIGURE_PATHS_BASE @@ -25,6 +26,7 @@ 1 1 UI + 0 0 0 @@ -183,6 +185,7 @@ + 0 @@ -215,7 +218,7 @@ 0 - 30,29 + -1,-1 1 m_btnAddEnvVar 1 @@ -266,6 +269,7 @@ + 0 @@ -298,7 +302,7 @@ 0 - 30,29 + -1,-1 1 m_btnDeleteEnvVar 1 @@ -454,6 +458,7 @@ + 0 @@ -486,7 +491,7 @@ 0 - 30,29 + -1,-1 1 m_btnAddSearchPath 1 @@ -527,6 +532,7 @@ + 0 @@ -559,7 +565,7 @@ 0 - 30,29 + -1,-1 1 m_btnMoveUp 1 @@ -600,6 +606,7 @@ + 0 @@ -632,7 +639,7 @@ 0 - 30,29 + -1,-1 1 m_btnMoveDown 1 @@ -683,6 +690,7 @@ + 0 @@ -715,7 +723,7 @@ 0 - 30,29 + -1,-1 1 m_btnDeleteSearchPath 1 diff --git a/common/dialogs/dialog_configure_paths_base.h b/common/dialogs/dialog_configure_paths_base.h index 1dbdbef246..0eadbb4bc9 100644 --- a/common/dialogs/dialog_configure_paths_base.h +++ b/common/dialogs/dialog_configure_paths_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 6 2019) +// C++ code generated with wxFormBuilder (version 3.9.0 Jun 3 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/common/dialogs/panel_common_settings_base.cpp b/common/dialogs/panel_common_settings_base.cpp index 38bda776b6..73356f1746 100644 --- a/common/dialogs/panel_common_settings_base.cpp +++ b/common/dialogs/panel_common_settings_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version Nov 6 2019) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -97,8 +97,6 @@ PANEL_COMMON_SETTINGS_BASE::PANEL_COMMON_SETTINGS_BASE( wxWindow* parent, wxWind gridHelperApps->Add( m_textEditorPath, wxGBPosition( 0, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxEXPAND, 8 ); m_textEditorBtn = new wxBitmapButton( sizerHelperApps->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); - m_textEditorBtn->SetMinSize( wxSize( 29,29 ) ); - gridHelperApps->Add( m_textEditorBtn, wxGBPosition( 0, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxBOTTOM, 5 ); m_defaultPDFViewer = new wxRadioButton( sizerHelperApps->GetStaticBox(), wxID_ANY, _("System default PDF viewer"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -113,8 +111,6 @@ PANEL_COMMON_SETTINGS_BASE::PANEL_COMMON_SETTINGS_BASE( wxWindow* parent, wxWind gridHelperApps->Add( m_PDFViewerPath, wxGBPosition( 4, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxEXPAND, 8 ); m_pdfViewerBtn = new wxBitmapButton( sizerHelperApps->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); - m_pdfViewerBtn->SetMinSize( wxSize( 29,29 ) ); - gridHelperApps->Add( m_pdfViewerBtn, wxGBPosition( 4, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxBOTTOM, 5 ); diff --git a/common/dialogs/panel_common_settings_base.fbp b/common/dialogs/panel_common_settings_base.fbp index f66b1ccc2e..9e2eae9296 100644 --- a/common/dialogs/panel_common_settings_base.fbp +++ b/common/dialogs/panel_common_settings_base.fbp @@ -878,7 +878,7 @@ 0 - 29,29 + -1,-1 1 m_textEditorBtn 1 @@ -1156,7 +1156,7 @@ 0 - 29,29 + -1,-1 1 m_pdfViewerBtn 1 diff --git a/common/dialogs/panel_common_settings_base.h b/common/dialogs/panel_common_settings_base.h index f1d44bcd94..f9bb1be0fa 100644 --- a/common/dialogs/panel_common_settings_base.h +++ b/common/dialogs/panel_common_settings_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version Nov 6 2019) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/common/dialogs/panel_text_variables_base.cpp b/common/dialogs/panel_text_variables_base.cpp index 78d170c012..b3e79bc1f1 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 Oct 26 2018) +// C++ code generated with wxFormBuilder (version Nov 6 2019) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -55,16 +55,12 @@ PANEL_TEXT_VARIABLES_BASE::PANEL_TEXT_VARIABLES_BASE( wxWindow* parent, wxWindow bSizerEnvVarBtns = new wxBoxSizer( wxHORIZONTAL ); m_btnAddTextVar = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); - m_btnAddTextVar->SetMinSize( wxSize( 30,29 ) ); - bSizerEnvVarBtns->Add( m_btnAddTextVar, 0, wxRIGHT, 5 ); bSizerEnvVarBtns->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); m_btnDeleteTextVar = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); - m_btnDeleteTextVar->SetMinSize( wxSize( 30,29 ) ); - bSizerEnvVarBtns->Add( m_btnDeleteTextVar, 0, wxRIGHT|wxLEFT, 5 ); diff --git a/common/dialogs/panel_text_variables_base.fbp b/common/dialogs/panel_text_variables_base.fbp index 7539fd94e5..6dc5b37758 100644 --- a/common/dialogs/panel_text_variables_base.fbp +++ b/common/dialogs/panel_text_variables_base.fbp @@ -208,7 +208,7 @@ 0 - 30,29 + -1,-1 1 m_btnAddTextVar 1 @@ -291,7 +291,7 @@ 0 - 30,29 + -1,-1 1 m_btnDeleteTextVar 1 diff --git a/common/dialogs/panel_text_variables_base.h b/common/dialogs/panel_text_variables_base.h index 0a8b881069..265b3cdd99 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 Oct 26 2018) +// C++ code generated with wxFormBuilder (version Nov 6 2019) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/eeschema/dialogs/dialog_bom_base.cpp b/eeschema/dialogs/dialog_bom_base.cpp index 39b9a3c17a..22532ee993 100644 --- a/eeschema/dialogs/dialog_bom_base.cpp +++ b/eeschema/dialogs/dialog_bom_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 1 2018) +// C++ code generated with wxFormBuilder (version Nov 6 2019) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -64,13 +64,13 @@ DIALOG_BOM_BASE::DIALOG_BOM_BASE( wxWindow* parent, wxWindowID id, const wxStrin wxBoxSizer* bGeneratorButtons; bGeneratorButtons = new wxBoxSizer( wxHORIZONTAL ); - m_buttonAddGenerator = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW|0 ); + m_buttonAddGenerator = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); m_buttonAddGenerator->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); m_buttonAddGenerator->SetToolTip( _("Add a new BOM generator and its command line to the list") ); bGeneratorButtons->Add( m_buttonAddGenerator, 0, wxRIGHT|wxLEFT, 5 ); - m_buttonEdit = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW|0 ); + m_buttonEdit = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); m_buttonEdit->SetToolTip( _("Edit the script file in the text editor") ); bGeneratorButtons->Add( m_buttonEdit, 0, wxRIGHT, 5 ); @@ -78,7 +78,7 @@ DIALOG_BOM_BASE::DIALOG_BOM_BASE( wxWindow* parent, wxWindowID id, const wxStrin bGeneratorButtons->Add( 0, 0, 0, wxRIGHT|wxLEFT, 5 ); - m_buttonDelGenerator = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW|0 ); + m_buttonDelGenerator = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); m_buttonDelGenerator->SetToolTip( _("Remove the current generator script from list") ); bGeneratorButtons->Add( m_buttonDelGenerator, 0, wxRIGHT, 5 ); @@ -123,6 +123,7 @@ DIALOG_BOM_BASE::DIALOG_BOM_BASE( wxWindow* parent, wxWindowID id, const wxStrin this->SetSizer( bMainSizer ); this->Layout(); + bMainSizer->Fit( this ); this->Centre( wxBOTH ); diff --git a/eeschema/dialogs/dialog_bom_base.fbp b/eeschema/dialogs/dialog_bom_base.fbp index d37dbc9262..6acea41fe3 100644 --- a/eeschema/dialogs/dialog_bom_base.fbp +++ b/eeschema/dialogs/dialog_bom_base.fbp @@ -45,7 +45,7 @@ -1,-1 DIALOG_BOM_BASE - 617,433 + -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h Bill of Material @@ -485,7 +485,7 @@ Resizable 1 - 30,30 + -1,-1 ; forward_declare 0 @@ -558,7 +558,7 @@ Resizable 1 - 30,30 + -1,-1 ; forward_declare 0 @@ -641,7 +641,7 @@ Resizable 1 - 30,30 + -1,-1 ; forward_declare 0 diff --git a/eeschema/dialogs/dialog_bom_base.h b/eeschema/dialogs/dialog_bom_base.h index 31aa605cb6..60fd4da677 100644 --- a/eeschema/dialogs/dialog_bom_base.h +++ b/eeschema/dialogs/dialog_bom_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 1 2018) +// C++ code generated with wxFormBuilder (version Nov 6 2019) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -77,7 +77,7 @@ class DIALOG_BOM_BASE : public DIALOG_SHIM public: - DIALOG_BOM_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Bill of Material"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 617,433 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_BOM_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Bill of Material"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_BOM_BASE(); }; diff --git a/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp b/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp index 7d0f7a4971..4bb67ba264 100644 --- a/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp +++ b/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jul 10 2019) +// C++ code generated with wxFormBuilder (version 3.9.0 Jun 3 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -83,19 +83,16 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx m_bpAdd = new wxBitmapButton( sbSizer4->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); m_bpAdd->SetToolTip( _("Add field") ); - m_bpAdd->SetMinSize( wxSize( 30,29 ) ); bButtonSize->Add( m_bpAdd, 0, wxRIGHT|wxLEFT, 5 ); m_bpMoveUp = new wxBitmapButton( sbSizer4->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); m_bpMoveUp->SetToolTip( _("Move up") ); - m_bpMoveUp->SetMinSize( wxSize( 30,29 ) ); bButtonSize->Add( m_bpMoveUp, 0, wxRIGHT, 5 ); m_bpMoveDown = new wxBitmapButton( sbSizer4->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); m_bpMoveDown->SetToolTip( _("Move down") ); - m_bpMoveDown->SetMinSize( wxSize( 30,29 ) ); bButtonSize->Add( m_bpMoveDown, 0, wxRIGHT, 5 ); @@ -104,7 +101,6 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx m_bpDelete = new wxBitmapButton( sbSizer4->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); m_bpDelete->SetToolTip( _("Delete field") ); - m_bpDelete->SetMinSize( wxSize( 30,29 ) ); bButtonSize->Add( m_bpDelete, 0, wxRIGHT|wxLEFT, 10 ); @@ -349,6 +345,7 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx this->SetSizer( bMainSizer ); this->Layout(); + bMainSizer->Fit( this ); // Connect Events this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::OnUpdateUI ) ); diff --git a/eeschema/dialogs/dialog_edit_component_in_lib_base.fbp b/eeschema/dialogs/dialog_edit_component_in_lib_base.fbp index f568cafa37..c2d4c5141b 100644 --- a/eeschema/dialogs/dialog_edit_component_in_lib_base.fbp +++ b/eeschema/dialogs/dialog_edit_component_in_lib_base.fbp @@ -47,7 +47,7 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE - 875,549 + -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h Library Symbol Properties @@ -310,6 +310,7 @@ + 0 @@ -342,7 +343,7 @@ 0 - 30,29 + -1,-1 1 m_bpAdd 1 @@ -383,6 +384,7 @@ + 0 @@ -415,7 +417,7 @@ 0 - 30,29 + -1,-1 1 m_bpMoveUp 1 @@ -456,6 +458,7 @@ + 0 @@ -488,7 +491,7 @@ 0 - 30,29 + -1,-1 1 m_bpMoveDown 1 @@ -539,6 +542,7 @@ + 0 @@ -571,7 +575,7 @@ 0 - 30,29 + -1,-1 1 m_bpDelete 1 @@ -2151,6 +2155,7 @@ + 0 @@ -2224,6 +2229,7 @@ + 0 @@ -2307,6 +2313,7 @@ + 0 @@ -2410,6 +2417,7 @@ + 0 diff --git a/eeschema/dialogs/dialog_edit_component_in_lib_base.h b/eeschema/dialogs/dialog_edit_component_in_lib_base.h index c8d9b3537f..bb5c563c6b 100644 --- a/eeschema/dialogs/dialog_edit_component_in_lib_base.h +++ b/eeschema/dialogs/dialog_edit_component_in_lib_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jul 10 2019) +// C++ code generated with wxFormBuilder (version 3.9.0 Jun 3 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -104,7 +104,7 @@ class DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE : public DIALOG_SHIM public: - DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wxWindow* parent, wxWindowID id = ID_LIBEDIT_NOTEBOOK, const wxString& title = _("Library Symbol Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 875,549 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wxWindow* parent, wxWindowID id = ID_LIBEDIT_NOTEBOOK, const wxString& title = _("Library Symbol Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE(); }; diff --git a/eeschema/dialogs/dialog_sch_sheet_props_base.fbp b/eeschema/dialogs/dialog_sch_sheet_props_base.fbp index 6798981354..9ed501f8a0 100644 --- a/eeschema/dialogs/dialog_sch_sheet_props_base.fbp +++ b/eeschema/dialogs/dialog_sch_sheet_props_base.fbp @@ -14,6 +14,7 @@ dialog_sch_sheet_props_base 1000 none + 1 dialog_sch_sheet_props_base @@ -25,6 +26,7 @@ 1 1 UI + 0 0 0 @@ -192,6 +194,7 @@ + 0 @@ -224,7 +227,7 @@ 0 - 30,30 + -1,-1 1 m_bpAdd 1 @@ -265,6 +268,7 @@ + 0 @@ -297,7 +301,7 @@ 0 - 30,30 + -1,-1 1 m_bpMoveUp 1 @@ -338,6 +342,7 @@ + 0 @@ -370,7 +375,7 @@ 0 - 30,30 + -1,-1 1 m_bpMoveDown 1 @@ -421,6 +426,7 @@ + 0 @@ -453,7 +459,7 @@ 0 - 30,30 + -1,-1 1 m_bpDelete 1 diff --git a/eeschema/dialogs/panel_eeschema_template_fieldnames_base.cpp b/eeschema/dialogs/panel_eeschema_template_fieldnames_base.cpp index 9fe4caa26b..5f506e4dc1 100644 --- a/eeschema/dialogs/panel_eeschema_template_fieldnames_base.cpp +++ b/eeschema/dialogs/panel_eeschema_template_fieldnames_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version Nov 6 2019) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -62,16 +62,12 @@ PANEL_EESCHEMA_TEMPLATE_FIELDNAMES_BASE::PANEL_EESCHEMA_TEMPLATE_FIELDNAMES_BASE bSizer10 = new wxBoxSizer( wxHORIZONTAL ); m_addFieldButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); - m_addFieldButton->SetMinSize( wxSize( 29,29 ) ); - bSizer10->Add( m_addFieldButton, 0, wxTOP|wxRIGHT, 5 ); bSizer10->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); m_deleteFieldButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); - m_deleteFieldButton->SetMinSize( wxSize( 29,29 ) ); - bSizer10->Add( m_deleteFieldButton, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); diff --git a/eeschema/dialogs/panel_eeschema_template_fieldnames_base.fbp b/eeschema/dialogs/panel_eeschema_template_fieldnames_base.fbp index 20f87a0fe4..156e3e34b3 100644 --- a/eeschema/dialogs/panel_eeschema_template_fieldnames_base.fbp +++ b/eeschema/dialogs/panel_eeschema_template_fieldnames_base.fbp @@ -276,7 +276,7 @@ 0 - 29,29 + -1,-1 1 m_addFieldButton 1 @@ -359,7 +359,7 @@ 0 - 29,29 + -1,-1 1 m_deleteFieldButton 1 diff --git a/eeschema/dialogs/panel_eeschema_template_fieldnames_base.h b/eeschema/dialogs/panel_eeschema_template_fieldnames_base.h index 20653729cd..593e0d2cbd 100644 --- a/eeschema/dialogs/panel_eeschema_template_fieldnames_base.h +++ b/eeschema/dialogs/panel_eeschema_template_fieldnames_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version Nov 6 2019) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/eeschema/dialogs/panel_sym_lib_table_base.cpp b/eeschema/dialogs/panel_sym_lib_table_base.cpp index 8a2c51429a..d8f444bf73 100644 --- a/eeschema/dialogs/panel_sym_lib_table_base.cpp +++ b/eeschema/dialogs/panel_sym_lib_table_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 6 2019) +// C++ code generated with wxFormBuilder (version 3.9.0 Jun 3 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -133,22 +133,22 @@ PANEL_SYM_LIB_TABLE_BASE::PANEL_SYM_LIB_TABLE_BASE( wxWindow* parent, wxWindowID wxBoxSizer* bSizer51; bSizer51 = new wxBoxSizer( wxHORIZONTAL ); - m_append_button = new wxBitmapButton( m_top_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW|0 ); + m_append_button = new wxBitmapButton( m_top_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); m_append_button->SetToolTip( _("Add empty row to table") ); bSizer51->Add( m_append_button, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); - m_browse_button = new wxBitmapButton( m_top_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW|0 ); + m_browse_button = new wxBitmapButton( m_top_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); m_browse_button->SetToolTip( _("Add existing library to table") ); bSizer51->Add( m_browse_button, 0, wxBOTTOM|wxRIGHT, 5 ); - m_move_up_button = new wxBitmapButton( m_top_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW|0 ); + m_move_up_button = new wxBitmapButton( m_top_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); m_move_up_button->SetToolTip( _("Move up") ); bSizer51->Add( m_move_up_button, 0, wxBOTTOM|wxRIGHT, 5 ); - m_move_down_button = new wxBitmapButton( m_top_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW|0 ); + m_move_down_button = new wxBitmapButton( m_top_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); m_move_down_button->SetToolTip( _("Move down") ); bSizer51->Add( m_move_down_button, 0, wxBOTTOM|wxRIGHT, 5 ); @@ -156,7 +156,7 @@ PANEL_SYM_LIB_TABLE_BASE::PANEL_SYM_LIB_TABLE_BASE( wxWindow* parent, wxWindowID bSizer51->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - m_delete_button = new wxBitmapButton( m_top_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW|0 ); + m_delete_button = new wxBitmapButton( m_top_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); m_delete_button->SetToolTip( _("Remove library from table") ); bSizer51->Add( m_delete_button, 0, wxBOTTOM|wxRIGHT, 5 ); @@ -207,6 +207,7 @@ PANEL_SYM_LIB_TABLE_BASE::PANEL_SYM_LIB_TABLE_BASE( wxWindow* parent, wxWindowID this->SetSizer( bSizer1 ); this->Layout(); + bSizer1->Fit( this ); // Connect Events m_auinotebook->Connect( wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, wxAuiNotebookEventHandler( PANEL_SYM_LIB_TABLE_BASE::pageChangedHandler ), NULL, this ); diff --git a/eeschema/dialogs/panel_sym_lib_table_base.fbp b/eeschema/dialogs/panel_sym_lib_table_base.fbp index 5d2c331e35..a38c1ecf3a 100644 --- a/eeschema/dialogs/panel_sym_lib_table_base.fbp +++ b/eeschema/dialogs/panel_sym_lib_table_base.fbp @@ -14,6 +14,7 @@ panel_sym_lib_table_base 1000 none + 1 sym_lib_table @@ -25,6 +26,7 @@ 1 1 UI + 0 0 0 @@ -43,7 +45,7 @@ PANEL_SYM_LIB_TABLE_BASE - 500,300 + -1,-1 ; forward_declare @@ -731,6 +733,7 @@ + 0 @@ -776,7 +779,7 @@ Resizable 1 - 30,30 + -1,-1 ; forward_declare 0 @@ -804,6 +807,7 @@ + 0 @@ -849,7 +853,7 @@ Resizable 1 - 30,30 + -1,-1 ; forward_declare 0 @@ -877,6 +881,7 @@ + 0 @@ -922,7 +927,7 @@ Resizable 1 - 30,30 + -1,-1 ; forward_declare 0 @@ -950,6 +955,7 @@ + 0 @@ -995,7 +1001,7 @@ Resizable 1 - 30,30 + -1,-1 ; forward_declare 0 @@ -1033,6 +1039,7 @@ + 0 @@ -1078,7 +1085,7 @@ Resizable 1 - 30,30 + -1,-1 ; forward_declare 0 diff --git a/eeschema/dialogs/panel_sym_lib_table_base.h b/eeschema/dialogs/panel_sym_lib_table_base.h index 621a570b4b..d40e08ed4c 100644 --- a/eeschema/dialogs/panel_sym_lib_table_base.h +++ b/eeschema/dialogs/panel_sym_lib_table_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 6 2019) +// C++ code generated with wxFormBuilder (version 3.9.0 Jun 3 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -68,7 +68,7 @@ class PANEL_SYM_LIB_TABLE_BASE : public wxPanel public: - PANEL_SYM_LIB_TABLE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,300 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); + PANEL_SYM_LIB_TABLE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); ~PANEL_SYM_LIB_TABLE_BASE(); }; diff --git a/pagelayout_editor/dialogs/properties_frame_base.cpp b/pagelayout_editor/dialogs/properties_frame_base.cpp index 10ddbcdd6c..e8b6c4a83d 100644 --- a/pagelayout_editor/dialogs/properties_frame_base.cpp +++ b/pagelayout_editor/dialogs/properties_frame_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 3 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -692,6 +692,7 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c this->SetSizer( bSizerpanel ); this->Layout(); + bSizerpanel->Fit( this ); // Connect Events m_notebook->Connect( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxNotebookEventHandler( PANEL_PROPERTIES_BASE::OnPageChanged ), NULL, this ); diff --git a/pagelayout_editor/dialogs/properties_frame_base.fbp b/pagelayout_editor/dialogs/properties_frame_base.fbp index ed1608e8c0..4483a1dd04 100644 --- a/pagelayout_editor/dialogs/properties_frame_base.fbp +++ b/pagelayout_editor/dialogs/properties_frame_base.fbp @@ -14,6 +14,7 @@ properties_frame_base 1000 none + 1 properties_frame @@ -25,6 +26,7 @@ 1 1 UI + 0 1 0 @@ -43,7 +45,7 @@ PANEL_PROPERTIES_BASE - 340,775 + -1,-1 @@ -4527,6 +4529,7 @@ + 0 @@ -5589,6 +5592,7 @@ + 0 @@ -6634,6 +6638,7 @@ + 0 diff --git a/pagelayout_editor/dialogs/properties_frame_base.h b/pagelayout_editor/dialogs/properties_frame_base.h index a910b9ab5a..5f0bca3238 100644 --- a/pagelayout_editor/dialogs/properties_frame_base.h +++ b/pagelayout_editor/dialogs/properties_frame_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 3 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -23,10 +23,10 @@ #include #include #include +#include #include #include #include -#include #include #include #include @@ -152,7 +152,7 @@ class PANEL_PROPERTIES_BASE : public wxPanel public: - PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 340,775 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); + PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); ~PANEL_PROPERTIES_BASE(); }; diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp index afe15f3863..266d153f32 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp +++ b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_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 3 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -82,16 +82,12 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow bButtonSize = new wxBoxSizer( wxHORIZONTAL ); m_bpAdd = new wxBitmapButton( sbSizerTexts->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); - m_bpAdd->SetMinSize( wxSize( 30,29 ) ); - bButtonSize->Add( m_bpAdd, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); bButtonSize->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); m_bpDelete = new wxBitmapButton( sbSizerTexts->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); - m_bpDelete->SetMinSize( wxSize( 30,29 ) ); - bButtonSize->Add( m_bpDelete, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); @@ -287,7 +283,7 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow m_PanelGeneral->SetSizer( m_PanelPropertiesBoxSizer ); m_PanelGeneral->Layout(); m_PanelPropertiesBoxSizer->Fit( m_PanelGeneral ); - m_NoteBook->AddPage( m_PanelGeneral, _("General"), true ); + m_NoteBook->AddPage( m_PanelGeneral, _("General"), false ); m_PanelClearances = new wxPanel( m_NoteBook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizerPanelClearances; bSizerPanelClearances = new wxBoxSizer( wxVERTICAL ); @@ -452,21 +448,15 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow bSizer3DButtons = new wxBoxSizer( wxHORIZONTAL ); m_buttonAdd = new wxBitmapButton( sbSizer3->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); - m_buttonAdd->SetMinSize( wxSize( 30,29 ) ); - bSizer3DButtons->Add( m_buttonAdd, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); m_buttonBrowse = new wxBitmapButton( sbSizer3->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); - m_buttonBrowse->SetMinSize( wxSize( 30,29 ) ); - bSizer3DButtons->Add( m_buttonBrowse, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); bSizer3DButtons->Add( 10, 0, 0, wxEXPAND|wxLEFT, 5 ); m_buttonRemove = new wxBitmapButton( sbSizer3->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); - m_buttonRemove->SetMinSize( wxSize( 30,29 ) ); - bSizer3DButtons->Add( m_buttonRemove, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); @@ -490,7 +480,7 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow m_Panel3D->SetSizer( bSizerMain3D ); m_Panel3D->Layout(); bSizerMain3D->Fit( m_Panel3D ); - m_NoteBook->AddPage( m_Panel3D, _("3D Settings"), false ); + m_NoteBook->AddPage( m_Panel3D, _("3D Settings"), true ); m_GeneralBoxSizer->Add( m_NoteBook, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); @@ -543,6 +533,7 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow this->SetSizer( m_GeneralBoxSizer ); this->Layout(); + m_GeneralBoxSizer->Fit( this ); // Connect Events this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::OnInitDlg ) ); diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.fbp b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.fbp index 64572bbf29..797c037e6b 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.fbp +++ b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.fbp @@ -14,6 +14,7 @@ dialog_edit_footprint_for_BoardEditor_base 1000 none + 1 dialog_edit_footprint_for_BoardEditor_base @@ -25,6 +26,7 @@ 1 1 UI + 0 0 0 @@ -45,7 +47,7 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE - 859,600 + -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h Footprint Properties @@ -121,7 +123,7 @@ General - 1 + 0 1 1 @@ -301,6 +303,7 @@ + 0 @@ -333,7 +336,7 @@ 0 - 30,29 + -1,-1 1 m_bpAdd 1 @@ -384,6 +387,7 @@ + 0 @@ -416,7 +420,7 @@ 0 - 30,29 + -1,-1 1 m_bpDelete 1 @@ -1862,6 +1866,7 @@ + 0 @@ -1935,6 +1940,7 @@ + 0 @@ -2008,6 +2014,7 @@ + 0 @@ -2091,6 +2098,7 @@ + 0 @@ -3522,7 +3530,7 @@ 3D Settings - 0 + 1 1 1 @@ -3703,6 +3711,7 @@ + 0 @@ -3735,7 +3744,7 @@ 0 - 30,29 + -1,-1 1 m_buttonAdd 1 @@ -3776,6 +3785,7 @@ + 0 @@ -3808,7 +3818,7 @@ 0 - 30,29 + -1,-1 1 m_buttonBrowse 1 @@ -3859,6 +3869,7 @@ + 0 @@ -3891,7 +3902,7 @@ 0 - 30,29 + -1,-1 1 m_buttonRemove 1 @@ -3942,6 +3953,7 @@ + 0 diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.h b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.h index 42c2a3359d..a191074fdc 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.h +++ b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_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 3 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -143,7 +143,7 @@ class DIALOG_FOOTPRINT_BOARD_EDITOR_BASE : public DIALOG_SHIM public: - DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Footprint Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 859,600 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Footprint Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_FOOTPRINT_BOARD_EDITOR_BASE(); }; diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp index ea3d71c70d..28c44aba8f 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp +++ b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jul 10 2019) +// C++ code generated with wxFormBuilder (version 3.9.0 Jun 3 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -83,16 +83,12 @@ DIALOG_FOOTPRINT_FP_EDITOR_BASE::DIALOG_FOOTPRINT_FP_EDITOR_BASE( wxWindow* pare bButtonSize = new wxBoxSizer( wxHORIZONTAL ); m_bpAdd = new wxBitmapButton( sbSizerTexts->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); - m_bpAdd->SetMinSize( wxSize( 30,29 ) ); - bButtonSize->Add( m_bpAdd, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); bButtonSize->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); m_bpDelete = new wxBitmapButton( sbSizerTexts->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); - m_bpDelete->SetMinSize( wxSize( 30,29 ) ); - bButtonSize->Add( m_bpDelete, 0, wxRIGHT, 5 ); @@ -191,7 +187,7 @@ DIALOG_FOOTPRINT_FP_EDITOR_BASE::DIALOG_FOOTPRINT_FP_EDITOR_BASE( wxWindow* pare m_PanelGeneral->SetSizer( m_PanelPropertiesBoxSizer ); m_PanelGeneral->Layout(); m_PanelPropertiesBoxSizer->Fit( m_PanelGeneral ); - m_NoteBook->AddPage( m_PanelGeneral, _("General"), false ); + m_NoteBook->AddPage( m_PanelGeneral, _("General"), true ); m_PanelClearances = new wxPanel( m_NoteBook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizerPanelClearances; bSizerPanelClearances = new wxBoxSizer( wxVERTICAL ); @@ -353,16 +349,16 @@ DIALOG_FOOTPRINT_FP_EDITOR_BASE::DIALOG_FOOTPRINT_FP_EDITOR_BASE( wxWindow* pare wxBoxSizer* bSizer3DButtons; bSizer3DButtons = new wxBoxSizer( wxHORIZONTAL ); - m_button3DShapeAdd = new wxBitmapButton( sbSizer3->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,29 ), wxBU_AUTODRAW|0 ); + m_button3DShapeAdd = new wxBitmapButton( sbSizer3->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); bSizer3DButtons->Add( m_button3DShapeAdd, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); - m_button3DShapeBrowse = new wxBitmapButton( sbSizer3->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,29 ), wxBU_AUTODRAW|0 ); + m_button3DShapeBrowse = new wxBitmapButton( sbSizer3->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); bSizer3DButtons->Add( m_button3DShapeBrowse, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); bSizer3DButtons->Add( 0, 0, 0, wxLEFT|wxRIGHT, 5 ); - m_button3DShapeRemove = new wxBitmapButton( sbSizer3->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,29 ), wxBU_AUTODRAW|0 ); + m_button3DShapeRemove = new wxBitmapButton( sbSizer3->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); bSizer3DButtons->Add( m_button3DShapeRemove, 0, wxALIGN_CENTER_VERTICAL, 5 ); @@ -386,7 +382,7 @@ DIALOG_FOOTPRINT_FP_EDITOR_BASE::DIALOG_FOOTPRINT_FP_EDITOR_BASE( wxWindow* pare m_Panel3D->SetSizer( bSizerMain3D ); m_Panel3D->Layout(); bSizerMain3D->Fit( m_Panel3D ); - m_NoteBook->AddPage( m_Panel3D, _("3D Settings"), true ); + m_NoteBook->AddPage( m_Panel3D, _("3D Settings"), false ); m_GeneralBoxSizer->Add( m_NoteBook, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.fbp b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.fbp index 6e52bdbf61..c73041b459 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.fbp +++ b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.fbp @@ -122,7 +122,7 @@ General - 0 + 1 1 1 @@ -302,6 +302,7 @@ + 0 @@ -334,7 +335,7 @@ 0 - 30,29 + -1,-1 1 m_bpAdd 1 @@ -385,6 +386,7 @@ + 0 @@ -417,7 +419,7 @@ 0 - 30,29 + -1,-1 1 m_bpDelete 1 @@ -2573,7 +2575,7 @@ 3D Settings - 1 + 0 1 1 @@ -2754,6 +2756,7 @@ + 0 @@ -2799,7 +2802,7 @@ Resizable 1 - 30,29 + -1,-1 ; forward_declare 0 @@ -2827,6 +2830,7 @@ + 0 @@ -2872,7 +2876,7 @@ Resizable 1 - 30,29 + -1,-1 ; forward_declare 0 @@ -2910,6 +2914,7 @@ + 0 @@ -2955,7 +2960,7 @@ Resizable 1 - 30,29 + -1,-1 ; forward_declare 0 @@ -2993,6 +2998,7 @@ + 0 diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.h b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.h index 90abe8c818..87d559b172 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.h +++ b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jul 10 2019) +// C++ code generated with wxFormBuilder (version 3.9.0 Jun 3 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/pcbnew/dialogs/panel_fp_lib_table.cpp b/pcbnew/dialogs/panel_fp_lib_table.cpp index 46d9b2c945..a1e8eb8c85 100644 --- a/pcbnew/dialogs/panel_fp_lib_table.cpp +++ b/pcbnew/dialogs/panel_fp_lib_table.cpp @@ -3,7 +3,7 @@ * * Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck * Copyright (C) 2013 CERN - * Copyright (C) 2012-2019 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 2012-2020 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -85,23 +85,43 @@ enum { }; /** -* Map with event id as the key to supported file types that will be listed for the add a library option. +* Map with event id as the key to supported file types that will be listed for the add a +* library option. * */ static const std::map& fileTypes() { /* * TODO(C++20): Clean this up - * This is wrapped inside a function to prevent a static initialization order fiasco with the file extension - * variables. Once C++20 is allowed in KiCad code, those file extensions can be made constexpr and this can - * be removed from a function call and placed in the file normally. + * This is wrapped inside a function to prevent a static initialization order fiasco + * with the file extension variables. Once C++20 is allowed in KiCad code, those file + * extensions can be made constexpr and this can be removed from a function call and + * placed in the file normally. */ static const std::map fileTypes = { - { ID_PANEL_FPLIB_ADD_KICADMOD, { "KiCad (folder with .kicad_mod files)", "", KiCadFootprintFileExtension, false, IO_MGR::KICAD_SEXP } }, - { ID_PANEL_FPLIB_ADD_EAGLE6, { "Eagle 6.x (*.lbr)", EagleFootprintLibPathWildcard(), "", true, IO_MGR::EAGLE } }, - { ID_PANEL_FPLIB_ADD_KICADLEGACY, { "KiCad legacy (*.mod)", LegacyFootprintLibPathWildcard(), "", true, IO_MGR::LEGACY } }, - { ID_PANEL_FPLIB_ADD_GEDA, { "Geda (folder with *.fp files)", "", GedaPcbFootprintLibFileExtension, false, IO_MGR::GEDA_PCB } }, + { ID_PANEL_FPLIB_ADD_KICADMOD, + { + "KiCad (folder with .kicad_mod files)", "", KiCadFootprintFileExtension, + false, IO_MGR::KICAD_SEXP + } + }, + { ID_PANEL_FPLIB_ADD_EAGLE6, + { + "Eagle 6.x (*.lbr)", EagleFootprintLibPathWildcard(), "", true, IO_MGR::EAGLE + } + }, + { ID_PANEL_FPLIB_ADD_KICADLEGACY, + { + "KiCad legacy (*.mod)", LegacyFootprintLibPathWildcard(), "", true, IO_MGR::LEGACY + } + }, + { ID_PANEL_FPLIB_ADD_GEDA, + { + "Geda (folder with *.fp files)", "", GedaPcbFootprintLibFileExtension, false, + IO_MGR::GEDA_PCB + } + }, }; return fileTypes; @@ -427,10 +447,13 @@ PANEL_FP_LIB_TABLE::PANEL_FP_LIB_TABLE( DIALOG_EDIT_LIBRARY_TABLES* aParent, m_move_up_button->SetBitmap( KiBitmap( small_up_xpm ) ); m_move_down_button->SetBitmap( KiBitmap( small_down_xpm ) ); + wxSize buttonSize = m_append_button->GetSize(); + m_browseButton->SetBitmap( KiBitmap( folder_xpm ) ); + // We must set the size to match the other bitmaps manually m_browseButton->SetWidthPadding( 4 ); - m_browseButton->SetMinSize( wxSize( 30, 30 ) ); + m_browseButton->SetMinSize( buttonSize ); // Gives a selection to each grid, mainly for delete button. wxGrid's wake up with // a currentCell which is sometimes not highlighted. @@ -440,8 +463,11 @@ PANEL_FP_LIB_TABLE::PANEL_FP_LIB_TABLE( DIALOG_EDIT_LIBRARY_TABLES* aParent, if( m_project_grid->GetNumberRows() > 0 ) m_project_grid->SelectRow( 0 ); + wxSize textSize; + // Populate the browse library options wxMenu* browseMenu = m_browseButton->GetSplitButtonMenu(); + for( auto& fileType : fileTypes() ) { browseMenu->Append( fileType.first, fileType.second.m_Description ); @@ -488,7 +514,7 @@ bool PANEL_FP_LIB_TABLE::verifyTables() // button. model->DeleteRows( r, 1 ); } - else if( ( illegalCh = LIB_ID::FindIllegalLibNicknameChar( nick, LIB_ID::ID_PCB ) ) ) + else if( ( illegalCh = LIB_ID::FindIllegalLibNicknameChar( nick, LIB_ID::ID_PCB ) ) ) { wxString msg = wxString::Format( _( "Illegal character '%c' in Nickname: \"%s\"" ), illegalCh, @@ -620,6 +646,7 @@ void PANEL_FP_LIB_TABLE::deleteRowHandler( wxCommandEvent& event ) // Remove selected rows (note: a row can be stored more than once in list) int last_row = -1; + for( int ii = selectedRows.GetCount()-1; ii >= 0; ii-- ) { int row = selectedRows[ii]; diff --git a/pcbnew/dialogs/panel_fp_lib_table_base.cpp b/pcbnew/dialogs/panel_fp_lib_table_base.cpp index 3ffff4081e..4dc89bafab 100644 --- a/pcbnew/dialogs/panel_fp_lib_table_base.cpp +++ b/pcbnew/dialogs/panel_fp_lib_table_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 6 2019) +// C++ code generated with wxFormBuilder (version 3.9.0 Jun 3 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -132,20 +132,20 @@ PANEL_FP_LIB_TABLE_BASE::PANEL_FP_LIB_TABLE_BASE( wxWindow* parent, wxWindowID i wxBoxSizer* bButtonsSizer; bButtonsSizer = new wxBoxSizer( wxHORIZONTAL ); - m_append_button = new wxBitmapButton( m_top_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW|0 ); + m_append_button = new wxBitmapButton( m_top_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); m_append_button->SetToolTip( _("Add empty row to table") ); bButtonsSizer->Add( m_append_button, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); m_browseButton = new SPLIT_BUTTON( m_top_sizer->GetStaticBox(), wxID_ANY, _( "Add Existing" ), wxDefaultPosition ); - bButtonsSizer->Add( m_browseButton, 0, wxBOTTOM|wxRIGHT, 5 ); + bButtonsSizer->Add( m_browseButton, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 ); - m_move_up_button = new wxBitmapButton( m_top_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW|0 ); + m_move_up_button = new wxBitmapButton( m_top_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); m_move_up_button->SetToolTip( _("Move up") ); bButtonsSizer->Add( m_move_up_button, 0, wxBOTTOM|wxRIGHT, 5 ); - m_move_down_button = new wxBitmapButton( m_top_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW|0 ); + m_move_down_button = new wxBitmapButton( m_top_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); m_move_down_button->SetToolTip( _("Move down") ); bButtonsSizer->Add( m_move_down_button, 0, wxBOTTOM|wxRIGHT, 5 ); @@ -153,7 +153,7 @@ PANEL_FP_LIB_TABLE_BASE::PANEL_FP_LIB_TABLE_BASE( wxWindow* parent, wxWindowID i bButtonsSizer->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - m_delete_button = new wxBitmapButton( m_top_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW|0 ); + m_delete_button = new wxBitmapButton( m_top_sizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); m_delete_button->SetToolTip( _("Remove library from table") ); bButtonsSizer->Add( m_delete_button, 0, wxBOTTOM|wxRIGHT, 5 ); @@ -204,6 +204,7 @@ PANEL_FP_LIB_TABLE_BASE::PANEL_FP_LIB_TABLE_BASE( wxWindow* parent, wxWindowID i this->SetSizer( bMainSizer ); this->Layout(); + bMainSizer->Fit( this ); // Connect Events m_auinotebook->Connect( wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, wxAuiNotebookEventHandler( PANEL_FP_LIB_TABLE_BASE::pageChangedHandler ), NULL, this ); diff --git a/pcbnew/dialogs/panel_fp_lib_table_base.fbp b/pcbnew/dialogs/panel_fp_lib_table_base.fbp index 9a67936495..cafb36be7a 100644 --- a/pcbnew/dialogs/panel_fp_lib_table_base.fbp +++ b/pcbnew/dialogs/panel_fp_lib_table_base.fbp @@ -14,6 +14,7 @@ panel_fp_lib_table_base 1000 none + 1 panel_fp_lib_table @@ -25,6 +26,7 @@ 1 1 UI + 0 0 0 @@ -43,7 +45,7 @@ PANEL_FP_LIB_TABLE_BASE - 500,300 + -1,-1 ; forward_declare @@ -731,6 +733,7 @@ + 0 @@ -776,7 +779,7 @@ Resizable 1 - 30,30 + -1,-1 ; forward_declare 0 @@ -793,7 +796,7 @@ 5 - wxBOTTOM|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT 0 1 @@ -866,6 +869,7 @@ + 0 @@ -911,7 +915,7 @@ Resizable 1 - 30,30 + -1,-1 ; forward_declare 0 @@ -939,6 +943,7 @@ + 0 @@ -984,7 +989,7 @@ Resizable 1 - 30,30 + -1,-1 ; forward_declare 0 @@ -1022,6 +1027,7 @@ + 0 @@ -1067,7 +1073,7 @@ Resizable 1 - 30,30 + -1,-1 ; forward_declare 0 diff --git a/pcbnew/dialogs/panel_fp_lib_table_base.h b/pcbnew/dialogs/panel_fp_lib_table_base.h index fd462b9af5..aa9c090ddc 100644 --- a/pcbnew/dialogs/panel_fp_lib_table_base.h +++ b/pcbnew/dialogs/panel_fp_lib_table_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 6 2019) +// C++ code generated with wxFormBuilder (version 3.9.0 Jun 3 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -68,7 +68,7 @@ class PANEL_FP_LIB_TABLE_BASE : public wxPanel public: - PANEL_FP_LIB_TABLE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,300 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); + PANEL_FP_LIB_TABLE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); ~PANEL_FP_LIB_TABLE_BASE(); }; diff --git a/pcbnew/dialogs/panel_pcbnew_action_plugins_base.cpp b/pcbnew/dialogs/panel_pcbnew_action_plugins_base.cpp index f3513969c9..a3290ee7c3 100644 --- a/pcbnew/dialogs/panel_pcbnew_action_plugins_base.cpp +++ b/pcbnew/dialogs/panel_pcbnew_action_plugins_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 1 2018) +// C++ code generated with wxFormBuilder (version 3.9.0 Jun 3 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -59,21 +59,15 @@ PANEL_PCBNEW_ACTION_PLUGINS_BASE::PANEL_PCBNEW_ACTION_PLUGINS_BASE( wxWindow* pa bButtonsSizer = new wxBoxSizer( wxHORIZONTAL ); m_moveUpButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); - m_moveUpButton->SetMinSize( wxSize( 30,30 ) ); - bButtonsSizer->Add( m_moveUpButton, 0, wxLEFT|wxRIGHT, 5 ); m_moveDownButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); - m_moveDownButton->SetMinSize( wxSize( 30,30 ) ); - bButtonsSizer->Add( m_moveDownButton, 0, wxRIGHT, 5 ); bButtonsSizer->Add( 0, 0, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); m_reloadButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); - m_reloadButton->SetMinSize( wxSize( 30,30 ) ); - bButtonsSizer->Add( m_reloadButton, 0, wxLEFT|wxRIGHT, 5 ); @@ -82,6 +76,7 @@ PANEL_PCBNEW_ACTION_PLUGINS_BASE::PANEL_PCBNEW_ACTION_PLUGINS_BASE( wxWindow* pa this->SetSizer( bPanelSizer ); this->Layout(); + bPanelSizer->Fit( this ); // Connect Events m_grid->Connect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( PANEL_PCBNEW_ACTION_PLUGINS_BASE::OnGridCellClick ), NULL, this ); diff --git a/pcbnew/dialogs/panel_pcbnew_action_plugins_base.fbp b/pcbnew/dialogs/panel_pcbnew_action_plugins_base.fbp index d7cb003dba..77a8f2de3f 100644 --- a/pcbnew/dialogs/panel_pcbnew_action_plugins_base.fbp +++ b/pcbnew/dialogs/panel_pcbnew_action_plugins_base.fbp @@ -1,400 +1,405 @@ - - - - - - C++ - 1 - source_name - 0 - 0 - res - UTF-8 - connect - panel_pcbnew_action_plugins_base - 1000 - none - 0 - 1 - PanelPcbnewActionPlugins - - . - - 1 - 1 - 1 - 1 - UI - 1 - 0 - - 0 - wxAUI_MGR_DEFAULT - - - 1 - 1 - impl_virtual - - - 0 - wxID_ANY - - - PANEL_PCBNEW_ACTION_PLUGINS_BASE - - 485,200 - ; forward_declare - - - - wxTAB_TRAVERSAL - - - bPanelSizer - wxVERTICAL - none - - 0 - wxALIGN_LEFT|wxEXPAND|wxLEFT - 1 - - - bGridSizer - wxVERTICAL - none - - 5 - wxALL|wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - 1 - 0 - - - - 1 - - - wxALIGN_LEFT - - wxALIGN_CENTER - 0 - 1 - wxALIGN_CENTER - 22 - "Icon" "Show button" "Name" "Category" "Description" "Path" - wxALIGN_CENTER - 6 - - - 1 - 0 - Dock - 0 - Left - 0 - 1 - 0 - 1 - 0 - 1 - - 1 - - - 1 - 0 - 0 - wxID_ANY - - - - 0 - 0 - - 0 - - - 0 - - 1 - m_grid - 1 - - - protected - 1 - - Resizable - wxALIGN_CENTER - 0 - - wxALIGN_CENTER - - 3 - 1 - - WX_GRID; widgets/wx_grid.h; forward_declare - 0 - - - - - OnGridCellClick - - - - - - 0 - wxEXPAND - 0 - - - bButtonsSizer - wxHORIZONTAL - none - - 5 - wxLEFT|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Move Up - - 0 - - 0 - - - 0 - 30,30 - 1 - m_moveUpButton - 1 - - - protected - 1 - - - - Resizable - 1 - - - ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnMoveUpButtonClick - - - - 5 - wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Move Down - - 0 - - 0 - - - 0 - 30,30 - 1 - m_moveDownButton - 1 - - - protected - 1 - - - - Resizable - 1 - - - ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnMoveDownButtonClick - - - - 5 - wxEXPAND|wxLEFT|wxRIGHT - 0 - - 0 - protected - 0 - - - - 5 - wxLEFT|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Reload Plugins - - 0 - - 0 - - - 0 - 30,30 - 1 - m_reloadButton - 1 - - - protected - 1 - - - - Resizable - 1 - - - ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnReloadButtonClick - - - - - - - - + + + + + + C++ + 1 + source_name + 0 + 0 + res + UTF-8 + connect + panel_pcbnew_action_plugins_base + 1000 + none + + 0 + 1 + PanelPcbnewActionPlugins + + . + + 1 + 1 + 1 + 1 + UI + 0 + 1 + 0 + + 0 + wxAUI_MGR_DEFAULT + + + 1 + 1 + impl_virtual + + + 0 + wxID_ANY + + + PANEL_PCBNEW_ACTION_PLUGINS_BASE + + -1,-1 + ; forward_declare + + + + wxTAB_TRAVERSAL + + + bPanelSizer + wxVERTICAL + none + + 0 + wxALIGN_LEFT|wxEXPAND|wxLEFT + 1 + + + bGridSizer + wxVERTICAL + none + + 5 + wxALL|wxEXPAND + 1 + + 1 + 1 + 1 + 1 + + + + + 1 + 0 + + + + 1 + + + wxALIGN_LEFT + + wxALIGN_CENTER + 0 + 1 + wxALIGN_CENTER + 22 + "Icon" "Show button" "Name" "Category" "Description" "Path" + wxALIGN_CENTER + 6 + + + 1 + 0 + Dock + 0 + Left + 0 + 1 + 0 + 1 + 0 + 1 + + 1 + + + 1 + 0 + 0 + wxID_ANY + + + + 0 + 0 + + 0 + + + 0 + + 1 + m_grid + 1 + + + protected + 1 + + Resizable + wxALIGN_CENTER + 0 + + wxALIGN_CENTER + + 3 + 1 + + WX_GRID; widgets/wx_grid.h; forward_declare + 0 + + + + + OnGridCellClick + + + + + + 0 + wxEXPAND + 0 + + + bButtonsSizer + wxHORIZONTAL + none + + 5 + wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 1 + + 1 + + + 0 + 0 + wxID_ANY + Move Up + + 0 + + 0 + + + 0 + -1,-1 + 1 + m_moveUpButton + 1 + + + protected + 1 + + + + Resizable + 1 + + + ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnMoveUpButtonClick + + + + 5 + wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 1 + + 1 + + + 0 + 0 + wxID_ANY + Move Down + + 0 + + 0 + + + 0 + -1,-1 + 1 + m_moveDownButton + 1 + + + protected + 1 + + + + Resizable + 1 + + + ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnMoveDownButtonClick + + + + 5 + wxEXPAND|wxLEFT|wxRIGHT + 0 + + 0 + protected + 0 + + + + 5 + wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 1 + + 1 + + + 0 + 0 + wxID_ANY + Reload Plugins + + 0 + + 0 + + + 0 + -1,-1 + 1 + m_reloadButton + 1 + + + protected + 1 + + + + Resizable + 1 + + + ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnReloadButtonClick + + + + + + + + diff --git a/pcbnew/dialogs/panel_pcbnew_action_plugins_base.h b/pcbnew/dialogs/panel_pcbnew_action_plugins_base.h index 4f15677f20..b85b06c0d2 100644 --- a/pcbnew/dialogs/panel_pcbnew_action_plugins_base.h +++ b/pcbnew/dialogs/panel_pcbnew_action_plugins_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 1 2018) +// C++ code generated with wxFormBuilder (version 3.9.0 Jun 3 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -50,7 +50,7 @@ class PANEL_PCBNEW_ACTION_PLUGINS_BASE : public wxPanel public: - PANEL_PCBNEW_ACTION_PLUGINS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 485,200 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); + PANEL_PCBNEW_ACTION_PLUGINS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); ~PANEL_PCBNEW_ACTION_PLUGINS_BASE(); }; diff --git a/pcbnew/dialogs/panel_setup_netclasses_base.cpp b/pcbnew/dialogs/panel_setup_netclasses_base.cpp index 42e71d3e83..c4c76870a2 100644 --- a/pcbnew/dialogs/panel_setup_netclasses_base.cpp +++ b/pcbnew/dialogs/panel_setup_netclasses_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 3 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -77,16 +77,12 @@ PANEL_SETUP_NETCLASSES_BASE::PANEL_SETUP_NETCLASSES_BASE( wxWindow* parent, wxWi buttonBoxSizer = new wxBoxSizer( wxHORIZONTAL ); m_addButton = new wxBitmapButton( m_netclassesPane, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); - m_addButton->SetMinSize( wxSize( 30,29 ) ); - buttonBoxSizer->Add( m_addButton, 0, wxRIGHT, 5 ); buttonBoxSizer->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); m_removeButton = new wxBitmapButton( m_netclassesPane, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); - m_removeButton->SetMinSize( wxSize( 30,29 ) ); - buttonBoxSizer->Add( m_removeButton, 0, wxRIGHT|wxLEFT, 5 ); diff --git a/pcbnew/dialogs/panel_setup_netclasses_base.fbp b/pcbnew/dialogs/panel_setup_netclasses_base.fbp index 549f84781b..2e50f3370f 100644 --- a/pcbnew/dialogs/panel_setup_netclasses_base.fbp +++ b/pcbnew/dialogs/panel_setup_netclasses_base.fbp @@ -14,6 +14,7 @@ panel_setup_netclasses_base 1000 none + 1 panel_setup_netclasses_base @@ -25,6 +26,7 @@ 1 1 UI + 0 1 0 @@ -238,6 +240,7 @@ + 0 @@ -270,7 +273,7 @@ 0 - 30,29 + -1,-1 1 m_addButton 1 @@ -321,6 +324,7 @@ + 0 @@ -353,7 +357,7 @@ 0 - 30,29 + -1,-1 1 m_removeButton 1 @@ -764,6 +768,7 @@ + 0 @@ -847,6 +852,7 @@ + 0 @@ -1081,6 +1087,7 @@ + 0 @@ -1164,6 +1171,7 @@ + 0 diff --git a/pcbnew/dialogs/panel_setup_netclasses_base.h b/pcbnew/dialogs/panel_setup_netclasses_base.h index d0baea8bd7..85c227108a 100644 --- a/pcbnew/dialogs/panel_setup_netclasses_base.h +++ b/pcbnew/dialogs/panel_setup_netclasses_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 3 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp index c3f1eeaa82..43032a6a64 100644 --- a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp +++ b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 30 2017) +// C++ code generated with wxFormBuilder (version 3.9.0 Jun 3 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -11,38 +11,38 @@ /////////////////////////////////////////////////////////////////////////// -PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) +PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name ) { wxBoxSizer* bMainSizer; bMainSizer = new wxBoxSizer( wxVERTICAL ); - + m_label = new wxStaticText( this, wxID_ANY, _("Pre-defined track and via dimensions:"), wxDefaultPosition, wxDefaultSize, 0 ); m_label->Wrap( -1 ); bMainSizer->Add( m_label, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - + wxBoxSizer* bSizerLower; bSizerLower = new wxBoxSizer( wxHORIZONTAL ); - + wxStaticBoxSizer* sbSizer4; sbSizer4 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Tracks") ), wxVERTICAL ); - + m_trackWidthsGrid = new WX_GRID( sbSizer4->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); - + // Grid m_trackWidthsGrid->CreateGrid( 8, 1 ); m_trackWidthsGrid->EnableEditing( true ); m_trackWidthsGrid->EnableGridLines( true ); m_trackWidthsGrid->EnableDragGridSize( false ); m_trackWidthsGrid->SetMargins( 0, 0 ); - + // Columns m_trackWidthsGrid->SetColSize( 0, 125 ); m_trackWidthsGrid->EnableDragColMove( false ); m_trackWidthsGrid->EnableDragColSize( false ); m_trackWidthsGrid->SetColLabelSize( 24 ); m_trackWidthsGrid->SetColLabelValue( 0, _("Width") ); - m_trackWidthsGrid->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_trackWidthsGrid->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Rows m_trackWidthsGrid->EnableDragRowSize( false ); m_trackWidthsGrid->SetRowLabelSize( 0 ); @@ -54,48 +54,44 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa m_trackWidthsGrid->SetRowLabelValue( 5, _("6") ); m_trackWidthsGrid->SetRowLabelValue( 6, _("7") ); m_trackWidthsGrid->SetRowLabelValue( 7, _("8") ); - m_trackWidthsGrid->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_trackWidthsGrid->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Label Appearance - + // Cell Defaults m_trackWidthsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP ); sbSizer4->Add( m_trackWidthsGrid, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - + wxBoxSizer* bSizer3; bSizer3 = new wxBoxSizer( wxHORIZONTAL ); - - m_trackWidthsAddButton = new wxBitmapButton( sbSizer4->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); - m_trackWidthsAddButton->SetMinSize( wxSize( 30,30 ) ); - + + m_trackWidthsAddButton = new wxBitmapButton( sbSizer4->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); bSizer3->Add( m_trackWidthsAddButton, 0, wxLEFT|wxRIGHT, 5 ); - - + + bSizer3->Add( 0, 0, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); - - m_trackWidthsRemoveButton = new wxBitmapButton( sbSizer4->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); - m_trackWidthsRemoveButton->SetMinSize( wxSize( 30,30 ) ); - + + m_trackWidthsRemoveButton = new wxBitmapButton( sbSizer4->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); bSizer3->Add( m_trackWidthsRemoveButton, 0, wxLEFT|wxRIGHT, 5 ); - - + + sbSizer4->Add( bSizer3, 0, wxEXPAND|wxTOP, 2 ); - - + + bSizerLower->Add( sbSizer4, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); - + wxStaticBoxSizer* sbSizer5; sbSizer5 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Vias") ), wxVERTICAL ); - + m_viaSizesGrid = new WX_GRID( sbSizer5->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); - + // Grid m_viaSizesGrid->CreateGrid( 8, 2 ); m_viaSizesGrid->EnableEditing( true ); m_viaSizesGrid->EnableGridLines( true ); m_viaSizesGrid->EnableDragGridSize( false ); m_viaSizesGrid->SetMargins( 0, 0 ); - + // Columns m_viaSizesGrid->SetColSize( 0, 125 ); m_viaSizesGrid->SetColSize( 1, 125 ); @@ -104,8 +100,8 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa m_viaSizesGrid->SetColLabelSize( 24 ); m_viaSizesGrid->SetColLabelValue( 0, _("Size") ); m_viaSizesGrid->SetColLabelValue( 1, _("Drill") ); - m_viaSizesGrid->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_viaSizesGrid->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Rows m_viaSizesGrid->EnableDragRowSize( false ); m_viaSizesGrid->SetRowLabelSize( 0 ); @@ -117,48 +113,44 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa m_viaSizesGrid->SetRowLabelValue( 5, _("6") ); m_viaSizesGrid->SetRowLabelValue( 6, _("7") ); m_viaSizesGrid->SetRowLabelValue( 7, _("8") ); - m_viaSizesGrid->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_viaSizesGrid->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Label Appearance - + // Cell Defaults m_viaSizesGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP ); sbSizer5->Add( m_viaSizesGrid, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - + wxBoxSizer* bSizer4; bSizer4 = new wxBoxSizer( wxHORIZONTAL ); - - m_viaSizesAddButton = new wxBitmapButton( sbSizer5->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); - m_viaSizesAddButton->SetMinSize( wxSize( 30,30 ) ); - + + m_viaSizesAddButton = new wxBitmapButton( sbSizer5->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); bSizer4->Add( m_viaSizesAddButton, 0, wxLEFT|wxRIGHT, 5 ); - - + + bSizer4->Add( 0, 0, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); - - m_viaSizesRemoveButton = new wxBitmapButton( sbSizer5->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); - m_viaSizesRemoveButton->SetMinSize( wxSize( 30,30 ) ); - + + m_viaSizesRemoveButton = new wxBitmapButton( sbSizer5->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); bSizer4->Add( m_viaSizesRemoveButton, 0, wxLEFT|wxRIGHT, 5 ); - - + + sbSizer5->Add( bSizer4, 0, wxEXPAND|wxTOP, 2 ); - - + + bSizerLower->Add( sbSizer5, 0, wxEXPAND|wxRIGHT|wxLEFT, 10 ); - + wxStaticBoxSizer* sbSizer6; sbSizer6 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Differential Pairs") ), wxVERTICAL ); - + m_diffPairsGrid = new WX_GRID( sbSizer6->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); - + // Grid m_diffPairsGrid->CreateGrid( 8, 3 ); m_diffPairsGrid->EnableEditing( true ); m_diffPairsGrid->EnableGridLines( true ); m_diffPairsGrid->EnableDragGridSize( false ); m_diffPairsGrid->SetMargins( 0, 0 ); - + // Columns m_diffPairsGrid->SetColSize( 0, 125 ); m_diffPairsGrid->SetColSize( 1, 125 ); @@ -169,8 +161,8 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa m_diffPairsGrid->SetColLabelValue( 0, _("Width") ); m_diffPairsGrid->SetColLabelValue( 1, _("Gap") ); m_diffPairsGrid->SetColLabelValue( 2, _("Via Gap") ); - m_diffPairsGrid->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_diffPairsGrid->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Rows m_diffPairsGrid->EnableDragRowSize( true ); m_diffPairsGrid->SetRowLabelSize( 0 ); @@ -182,45 +174,41 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa m_diffPairsGrid->SetRowLabelValue( 5, _("6") ); m_diffPairsGrid->SetRowLabelValue( 6, _("7") ); m_diffPairsGrid->SetRowLabelValue( 7, _("8") ); - m_diffPairsGrid->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_diffPairsGrid->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Label Appearance - + // Cell Defaults m_diffPairsGrid->SetDefaultCellBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); m_diffPairsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP ); sbSizer6->Add( m_diffPairsGrid, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - + wxBoxSizer* bSizer5; bSizer5 = new wxBoxSizer( wxHORIZONTAL ); - - m_diffPairsAddButton = new wxBitmapButton( sbSizer6->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); - m_diffPairsAddButton->SetMinSize( wxSize( 30,30 ) ); - + + m_diffPairsAddButton = new wxBitmapButton( sbSizer6->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); bSizer5->Add( m_diffPairsAddButton, 0, wxLEFT|wxRIGHT, 5 ); - - + + bSizer5->Add( 0, 0, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); - - m_diffPairsRemoveButton = new wxBitmapButton( sbSizer6->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); - m_diffPairsRemoveButton->SetMinSize( wxSize( 30,30 ) ); - + + m_diffPairsRemoveButton = new wxBitmapButton( sbSizer6->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); bSizer5->Add( m_diffPairsRemoveButton, 0, wxLEFT|wxRIGHT, 5 ); - - + + sbSizer6->Add( bSizer5, 0, wxEXPAND|wxTOP, 2 ); - - + + bSizerLower->Add( sbSizer6, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 ); - - + + bMainSizer->Add( bSizerLower, 5, wxEXPAND|wxLEFT, 20 ); - - + + this->SetSizer( bMainSizer ); this->Layout(); bMainSizer->Fit( this ); - + // Connect Events m_trackWidthsAddButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_SETUP_TRACKS_AND_VIAS_BASE::OnAddTrackWidthsClick ), NULL, this ); m_trackWidthsRemoveButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_SETUP_TRACKS_AND_VIAS_BASE::OnRemoveTrackWidthsClick ), NULL, this ); @@ -239,5 +227,5 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::~PANEL_SETUP_TRACKS_AND_VIAS_BASE() m_viaSizesRemoveButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_SETUP_TRACKS_AND_VIAS_BASE::OnRemoveViaSizesClick ), NULL, this ); m_diffPairsAddButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_SETUP_TRACKS_AND_VIAS_BASE::OnAddDiffPairsClick ), NULL, this ); m_diffPairsRemoveButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_SETUP_TRACKS_AND_VIAS_BASE::OnRemoveDiffPairsClick ), NULL, this ); - + } diff --git a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.fbp b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.fbp index b1f0315e35..3c78f5c600 100644 --- a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.fbp +++ b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.fbp @@ -2,7 +2,7 @@ - + C++ 1 source_name @@ -14,72 +14,45 @@ panel_setup_tracks_and_vias_base 1000 none + + 1 panel_setup_tracks_and_vias_base - + . - + 1 1 1 1 UI + 0 1 0 0 wxAUI_MGR_DEFAULT - - + + 1 1 impl_virtual - - + + 0 wxID_ANY - - + + PANEL_SETUP_TRACKS_AND_VIAS_BASE - + -1,-1 ; forward_declare - - - + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + bMainSizer wxVERTICAL none @@ -92,78 +65,56 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Pre-defined track and via dimensions: - + 0 + 0 - - + + 0 - + 1 m_label 1 - - + + protected 1 - + Resizable 1 - - + + ; forward_declare 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -171,7 +122,7 @@ wxEXPAND|wxLEFT 5 - + bSizerLower wxHORIZONTAL none @@ -182,12 +133,11 @@ wxID_ANY Tracks - + sbSizer4 wxVERTICAL 1 none - 5 wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT @@ -197,20 +147,20 @@ 1 1 1 - - - - + + + + 0 0 - - - + + + 1 - - + + wxALIGN_LEFT - + wxALIGN_TOP 0 1 @@ -220,7 +170,7 @@ wxALIGN_CENTER 1 125 - + 1 0 Dock @@ -232,103 +182,48 @@ 0 1 1 - + 1 - - + + 1 0 0 wxID_ANY - - - + + + 0 0 - + 0 - - + + 0 - + 1 m_trackWidthsGrid 1 - - + + protected 1 - + Resizable wxALIGN_CENTER 0 "1" "2" "3" "4" "5" "6" "7" "8" wxALIGN_CENTER - + 8 1 - + WX_GRID; widgets/wx_grid.h; forward_declare 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + @@ -336,7 +231,7 @@ wxEXPAND|wxTOP 0 - + bSizer3 wxHORIZONTAL none @@ -349,88 +244,69 @@ 1 1 1 - - - - - - - - + + + + + 0 + + + + 1 0 1 - + 1 + 0 0 - + Dock 0 Left 1 - + 1 - - + + 0 0 - wxID_ANY MyButton - + + 0 + 0 - - + + 0 - 30,30 + -1,-1 1 m_trackWidthsAddButton 1 - - + + protected 1 - + + + Resizable - 1 - - + + ; forward_declare 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - + + + + OnAddTrackWidthsClick - - - - - - - - - - - - - - - - - - - - - - - @@ -452,88 +328,69 @@ 1 1 1 - - - - - - - - + + + + + 0 + + + + 1 0 1 - + 1 + 0 0 - + Dock 0 Left 1 - + 1 - - + + 0 0 - wxID_ANY MyButton - + + 0 + 0 - - + + 0 - 30,30 + -1,-1 1 m_trackWidthsRemoveButton 1 - - + + protected 1 - + + + Resizable - 1 - - + + ; forward_declare 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - + + + + OnRemoveTrackWidthsClick - - - - - - - - - - - - - - - - - - - - - - - @@ -547,12 +404,11 @@ wxID_ANY Vias - + sbSizer5 wxVERTICAL 1 none - 5 wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT @@ -562,20 +418,20 @@ 1 1 1 - - - - + + + + 0 0 - - - + + + 1 - - + + wxALIGN_LEFT - + wxALIGN_TOP 0 1 @@ -585,7 +441,7 @@ wxALIGN_CENTER 2 125,125 - + 1 0 Dock @@ -597,103 +453,48 @@ 0 1 1 - + 1 - - + + 1 0 0 wxID_ANY - - - + + + 0 0 - + 0 - - + + 0 - + 1 m_viaSizesGrid 1 - - + + protected 1 - + Resizable wxALIGN_CENTER 0 "1" "2" "3" "4" "5" "6" "7" "8" wxALIGN_CENTER - + 8 1 - + WX_GRID; widgets/wx_grid.h; forward_declare 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + @@ -701,7 +502,7 @@ wxEXPAND|wxTOP 0 - + bSizer4 wxHORIZONTAL none @@ -714,88 +515,69 @@ 1 1 1 - - - - - - - - + + + + + 0 + + + + 1 0 1 - + 1 + 0 0 - + Dock 0 Left 1 - + 1 - - + + 0 0 - wxID_ANY MyButton - + + 0 + 0 - - + + 0 - 30,30 + -1,-1 1 m_viaSizesAddButton 1 - - + + protected 1 - + + + Resizable - 1 - - + + ; forward_declare 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - + + + + OnAddViaSizesClick - - - - - - - - - - - - - - - - - - - - - - - @@ -817,88 +599,69 @@ 1 1 1 - - - - - - - - + + + + + 0 + + + + 1 0 1 - + 1 + 0 0 - + Dock 0 Left 1 - + 1 - - + + 0 0 - wxID_ANY MyButton - + + 0 + 0 - - + + 0 - 30,30 + -1,-1 1 m_viaSizesRemoveButton 1 - - + + protected 1 - + + + Resizable - 1 - - + + ; forward_declare 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - + + + + OnRemoveViaSizesClick - - - - - - - - - - - - - - - - - - - - - - - @@ -912,12 +675,11 @@ wxID_ANY Differential Pairs - + sbSizer6 wxVERTICAL 1 none - 5 wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT @@ -927,20 +689,20 @@ 1 1 1 - - - - + + + + 0 0 - - - + + + 1 wxSYS_COLOUR_WINDOW - + wxALIGN_LEFT - + wxALIGN_TOP 0 1 @@ -950,7 +712,7 @@ wxALIGN_CENTER 3 125,125,125 - + 1 0 Dock @@ -962,103 +724,48 @@ 1 1 1 - + 1 - - + + 1 0 0 wxID_ANY - - - + + + 0 0 - + 0 - - + + 0 - + 1 m_diffPairsGrid 1 - - + + protected 1 - + Resizable wxALIGN_CENTER 0 "1" "2" "3" "4" "5" "6" "7" "8" wxALIGN_CENTER - + 8 1 - + WX_GRID; widgets/wx_grid.h; forward_declare 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + @@ -1066,7 +773,7 @@ wxEXPAND|wxTOP 0 - + bSizer5 wxHORIZONTAL none @@ -1079,88 +786,69 @@ 1 1 1 - - - - - - - - + + + + + 0 + + + + 1 0 1 - + 1 + 0 0 - + Dock 0 Left 1 - + 1 - - + + 0 0 - wxID_ANY MyButton - + + 0 + 0 - - + + 0 - 30,30 + -1,-1 1 m_diffPairsAddButton 1 - - + + protected 1 - + + + Resizable - 1 - - + + ; forward_declare 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - + + + + OnAddDiffPairsClick - - - - - - - - - - - - - - - - - - - - - - - @@ -1182,88 +870,69 @@ 1 1 1 - - - - - - - - + + + + + 0 + + + + 1 0 1 - + 1 + 0 0 - + Dock 0 Left 1 - + 1 - - + + 0 0 - wxID_ANY MyButton - + + 0 + 0 - - + + 0 - 30,30 + -1,-1 1 m_diffPairsRemoveButton 1 - - + + protected 1 - + + + Resizable - 1 - - + + ; forward_declare 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - + + + + OnRemoveDiffPairsClick - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.h b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.h index b6831f9503..84486659c9 100644 --- a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.h +++ b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.h @@ -1,12 +1,11 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 30 2017) +// C++ code generated with wxFormBuilder (version 3.9.0 Jun 3 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#ifndef __PANEL_SETUP_TRACKS_AND_VIAS_BASE_H__ -#define __PANEL_SETUP_TRACKS_AND_VIAS_BASE_H__ +#pragma once #include #include @@ -20,10 +19,10 @@ class WX_GRID; #include #include #include +#include #include #include #include -#include #include #include #include @@ -34,10 +33,10 @@ class WX_GRID; /////////////////////////////////////////////////////////////////////////////// /// Class PANEL_SETUP_TRACKS_AND_VIAS_BASE /////////////////////////////////////////////////////////////////////////////// -class PANEL_SETUP_TRACKS_AND_VIAS_BASE : public wxPanel +class PANEL_SETUP_TRACKS_AND_VIAS_BASE : public wxPanel { private: - + protected: wxStaticText* m_label; WX_GRID* m_trackWidthsGrid; @@ -49,7 +48,7 @@ class PANEL_SETUP_TRACKS_AND_VIAS_BASE : public wxPanel WX_GRID* m_diffPairsGrid; wxBitmapButton* m_diffPairsAddButton; wxBitmapButton* m_diffPairsRemoveButton; - + // Virtual event handlers, overide them in your derived class virtual void OnAddTrackWidthsClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnRemoveTrackWidthsClick( wxCommandEvent& event ) { event.Skip(); } @@ -57,13 +56,12 @@ class PANEL_SETUP_TRACKS_AND_VIAS_BASE : public wxPanel virtual void OnRemoveViaSizesClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnAddDiffPairsClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnRemoveDiffPairsClick( wxCommandEvent& event ) { event.Skip(); } - - + + public: - - PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL ); + + PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); ~PANEL_SETUP_TRACKS_AND_VIAS_BASE(); - + }; -#endif //__PANEL_SETUP_TRACKS_AND_VIAS_BASE_H__