diff --git a/3d-viewer/3d_cache/dialogs/dialog_select_3dmodel_base.fbp b/3d-viewer/3d_cache/dialogs/dialog_select_3dmodel_base.fbp index 4b7c43350a..1b46acb83c 100644 --- a/3d-viewer/3d_cache/dialogs/dialog_select_3dmodel_base.fbp +++ b/3d-viewer/3d_cache/dialogs/dialog_select_3dmodel_base.fbp @@ -47,7 +47,7 @@ DLG_SELECT_3D_MODELE_BASE - 468,347 + -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h; forward_declare Select 3D Model @@ -117,8 +117,8 @@ 1 Resizable - 0.5 - 340 + 0.35 + 300 -1 1 @@ -246,7 +246,7 @@ - wxBORDER_SIMPLE + wxBORDER_DEFAULT OnFileActivated OnSelectionChanged @@ -466,6 +466,7 @@ + 0 diff --git a/3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp b/3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp index ffed059871..72939ad4de 100644 --- a/3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp +++ b/3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp @@ -59,8 +59,8 @@ DLG_SELECT_3DMODEL::DLG_SELECT_3DMODEL( wxWindow* aParent, S3D_CACHE* aCacheMana m_modelViewer = new C3D_MODEL_VIEWER( m_pane3Dviewer, COGL_ATT_LIST::GetAttributesList( ANTIALIASING_MODE::AA_8X ), m_cache ); - m_modelViewer->SetMinSize( wxSize( 300, -1 ) ); - m_Sizer3Dviewer->Add( m_modelViewer, 1, wxEXPAND, 5 ); + m_modelViewer->SetMinSize( wxSize( 400, -1 ) ); + m_Sizer3Dviewer->Add( m_modelViewer, 1, wxEXPAND|wxRIGHT, 5 ); // create the filter list if( NULL != m_cache ) @@ -122,9 +122,9 @@ DLG_SELECT_3DMODEL::DLG_SELECT_3DMODEL( wxWindow* aParent, S3D_CACHE* aCacheMana m_FileTree->SetFilterIndex( 0 ); } - // Fix the filter box on the file selector widget so that it always shows the start of the filter - // string in the combobox. Otherwise it will only show the end of the string, which is empty for - // all but the all supported filters option. + // Fix the filter box on the file selector widget so that it always shows the start of + // the filter string in the combobox. Otherwise it will only show the end of the string, + // which is empty for all but the all supported filters option. wxChoice* filterBox = m_FileTree->GetFilterListCtrl(); KIPLATFORM::UI::EllipsizeChoiceBox( filterBox ); diff --git a/3d-viewer/3d_cache/dialogs/dlg_select_3dmodel_base.cpp b/3d-viewer/3d_cache/dialogs/dlg_select_3dmodel_base.cpp index 6eb901292b..ddb575d1f0 100644 --- a/3d-viewer/3d_cache/dialogs/dlg_select_3dmodel_base.cpp +++ b/3d-viewer/3d_cache/dialogs/dlg_select_3dmodel_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jul 10 2019) +// C++ code generated with wxFormBuilder (version 3.9.0 Nov 1 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -21,14 +21,14 @@ DLG_SELECT_3D_MODELE_BASE::DLG_SELECT_3D_MODELE_BASE( wxWindow* parent, wxWindow bSizerUpper->SetMinSize( wxSize( -1,400 ) ); m_splitterWin = new wxSplitterWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_3D ); - m_splitterWin->SetSashGravity( 0.5 ); + m_splitterWin->SetSashGravity( 0.35 ); m_splitterWin->Connect( wxEVT_IDLE, wxIdleEventHandler( DLG_SELECT_3D_MODELE_BASE::m_splitterWinOnIdle ), NULL, this ); m_panelLeft = new wxPanel( m_splitterWin, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizerLeft; bSizerLeft = new wxBoxSizer( wxVERTICAL ); - m_FileTree = new wxGenericDirCtrl( m_panelLeft, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxDIRCTRL_3D_INTERNAL|wxDIRCTRL_EDIT_LABELS|wxDIRCTRL_SELECT_FIRST|wxDIRCTRL_SHOW_FILTERS|wxBORDER_SIMPLE, wxEmptyString, 0 ); + m_FileTree = new wxGenericDirCtrl( m_panelLeft, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxDIRCTRL_3D_INTERNAL|wxDIRCTRL_EDIT_LABELS|wxDIRCTRL_SELECT_FIRST|wxDIRCTRL_SHOW_FILTERS|wxBORDER_DEFAULT, wxEmptyString, 0 ); m_FileTree->ShowHidden( false ); m_FileTree->SetMinSize( wxSize( 300,-1 ) ); @@ -46,7 +46,7 @@ DLG_SELECT_3D_MODELE_BASE::DLG_SELECT_3D_MODELE_BASE( wxWindow* parent, wxWindow m_pane3Dviewer->SetSizer( m_Sizer3Dviewer ); m_pane3Dviewer->Layout(); m_Sizer3Dviewer->Fit( m_pane3Dviewer ); - m_splitterWin->SplitVertically( m_panelLeft, m_pane3Dviewer, 340 ); + m_splitterWin->SplitVertically( m_panelLeft, m_pane3Dviewer, 300 ); bSizerUpper->Add( m_splitterWin, 1, wxEXPAND, 5 ); @@ -82,6 +82,7 @@ DLG_SELECT_3D_MODELE_BASE::DLG_SELECT_3D_MODELE_BASE( wxWindow* parent, wxWindow this->SetSizer( bSizerMain ); this->Layout(); + bSizerMain->Fit( this ); this->Centre( wxBOTH ); diff --git a/3d-viewer/3d_cache/dialogs/dlg_select_3dmodel_base.h b/3d-viewer/3d_cache/dialogs/dlg_select_3dmodel_base.h index 0e303bc52b..c91094e1da 100644 --- a/3d-viewer/3d_cache/dialogs/dlg_select_3dmodel_base.h +++ b/3d-viewer/3d_cache/dialogs/dlg_select_3dmodel_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jul 10 2019) +// C++ code generated with wxFormBuilder (version 3.9.0 Nov 1 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -22,10 +22,10 @@ #include #include #include +#include #include #include #include -#include #include /////////////////////////////////////////////////////////////////////////// @@ -60,12 +60,12 @@ class DLG_SELECT_3D_MODELE_BASE : public DIALOG_SHIM public: - DLG_SELECT_3D_MODELE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Select 3D Model"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 468,347 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DLG_SELECT_3D_MODELE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Select 3D Model"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DLG_SELECT_3D_MODELE_BASE(); void m_splitterWinOnIdle( wxIdleEvent& ) { - m_splitterWin->SetSashPosition( 340 ); + m_splitterWin->SetSashPosition( 300 ); m_splitterWin->Disconnect( wxEVT_IDLE, wxIdleEventHandler( DLG_SELECT_3D_MODELE_BASE::m_splitterWinOnIdle ), NULL, this ); } diff --git a/bitmap2component/bitmap2cmp_gui_base.cpp b/bitmap2component/bitmap2cmp_gui_base.cpp index 7ac6389cf4..c8857f3e11 100644 --- a/bitmap2component/bitmap2cmp_gui_base.cpp +++ b/bitmap2component/bitmap2cmp_gui_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.9.0 Nov 1 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -38,7 +38,7 @@ BM2CMP_FRAME_BASE::BM2CMP_FRAME_BASE( wxWindow* parent, wxWindowID id, const wxS brightSizer = new wxBoxSizer( wxVERTICAL ); wxStaticBoxSizer* sbSizerInfo; - sbSizerInfo = new wxStaticBoxSizer( new wxStaticBox( m_panelRight, wxID_ANY, _("Bitmap Info:") ), wxVERTICAL ); + sbSizerInfo = new wxStaticBoxSizer( new wxStaticBox( m_panelRight, wxID_ANY, _("Bitmap Information") ), wxVERTICAL ); wxFlexGridSizer* fgSizerInfo; fgSizerInfo = new wxFlexGridSizer( 0, 4, 0, 0 ); @@ -101,7 +101,7 @@ BM2CMP_FRAME_BASE::BM2CMP_FRAME_BASE( wxWindow* parent, wxWindowID id, const wxS brightSizer->Add( sbSizerInfo, 0, wxEXPAND|wxALL, 5 ); wxStaticBoxSizer* sbSizerImgPrms; - sbSizerImgPrms = new wxStaticBoxSizer( new wxStaticBox( m_panelRight, wxID_ANY, _("Output Parameters:") ), wxVERTICAL ); + sbSizerImgPrms = new wxStaticBoxSizer( new wxStaticBox( m_panelRight, wxID_ANY, _("Output Parameters") ), wxVERTICAL ); wxBoxSizer* bSizerLock; bSizerLock = new wxBoxSizer( wxHORIZONTAL ); @@ -155,14 +155,14 @@ BM2CMP_FRAME_BASE::BM2CMP_FRAME_BASE( wxWindow* parent, wxWindowID id, const wxS m_buttonExportClipboard = new wxButton( m_panelRight, wxID_ANY, _("Export to Clipboard"), wxDefaultPosition, wxDefaultSize, 0 ); brightSizer->Add( m_buttonExportClipboard, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - wxString m_rbOutputFormatChoices[] = { _("Eeschema (.lib file)"), _("Pcbnew (.kicad_mod file)"), _("PostScript (.ps file)"), _("Logo for title block (.kicad_wks file)") }; + wxString m_rbOutputFormatChoices[] = { _("Eeschema (.lib file)"), _("Pcbnew (.kicad_mod file)"), _("Postscript (.ps file)"), _("Logo for title block (.kicad_wks file)") }; int m_rbOutputFormatNChoices = sizeof( m_rbOutputFormatChoices ) / sizeof( wxString ); - m_rbOutputFormat = new wxRadioBox( m_panelRight, wxID_ANY, _("Format:"), wxDefaultPosition, wxDefaultSize, m_rbOutputFormatNChoices, m_rbOutputFormatChoices, 1, wxRA_SPECIFY_COLS ); + m_rbOutputFormat = new wxRadioBox( m_panelRight, wxID_ANY, _("Format"), wxDefaultPosition, wxDefaultSize, m_rbOutputFormatNChoices, m_rbOutputFormatChoices, 1, wxRA_SPECIFY_COLS ); m_rbOutputFormat->SetSelection( 1 ); brightSizer->Add( m_rbOutputFormat, 0, wxEXPAND|wxALL, 5 ); wxStaticBoxSizer* sbSizer2; - sbSizer2 = new wxStaticBoxSizer( new wxStaticBox( m_panelRight, wxID_ANY, _("Image Options:") ), wxVERTICAL ); + sbSizer2 = new wxStaticBoxSizer( new wxStaticBox( m_panelRight, wxID_ANY, _("Image Options") ), wxVERTICAL ); m_ThresholdText = new wxStaticText( sbSizer2->GetStaticBox(), wxID_ANY, _("Black / White Threshold:"), wxDefaultPosition, wxDefaultSize, 0 ); m_ThresholdText->Wrap( -1 ); @@ -181,7 +181,7 @@ BM2CMP_FRAME_BASE::BM2CMP_FRAME_BASE( wxWindow* parent, wxWindowID id, const wxS wxString m_rbPCBLayerChoices[] = { _("Front silk screen"), _("Front solder mask"), _("User layer Eco1"), _("User layer Eco2") }; int m_rbPCBLayerNChoices = sizeof( m_rbPCBLayerChoices ) / sizeof( wxString ); - m_rbPCBLayer = new wxRadioBox( m_panelRight, wxID_ANY, _("Board Layer for Outline:"), wxDefaultPosition, wxDefaultSize, m_rbPCBLayerNChoices, m_rbPCBLayerChoices, 1, wxRA_SPECIFY_COLS ); + m_rbPCBLayer = new wxRadioBox( m_panelRight, wxID_ANY, _("Board Layer for Outline"), wxDefaultPosition, wxDefaultSize, m_rbPCBLayerNChoices, m_rbPCBLayerChoices, 1, wxRA_SPECIFY_COLS ); m_rbPCBLayer->SetSelection( 1 ); m_rbPCBLayer->SetToolTip( _("Choose the board layer to place the outline.\nThe reference designator and value are always placed on the silk screen layer (but will be marked invisible).") ); @@ -196,6 +196,7 @@ BM2CMP_FRAME_BASE::BM2CMP_FRAME_BASE( wxWindow* parent, wxWindowID id, const wxS this->SetSizer( bMainSizer ); this->Layout(); + bMainSizer->Fit( this ); m_statusBar = this->CreateStatusBar( 1, wxSTB_SIZEGRIP, wxID_ANY ); // Connect Events diff --git a/bitmap2component/bitmap2cmp_gui_base.fbp b/bitmap2component/bitmap2cmp_gui_base.fbp index 2fa219ea6d..e1ee2709fc 100644 --- a/bitmap2component/bitmap2cmp_gui_base.fbp +++ b/bitmap2component/bitmap2cmp_gui_base.fbp @@ -14,6 +14,7 @@ bitmap2cmp_gui_base 1000 none + 1 bitmap2cmp_gui @@ -25,6 +26,7 @@ 1 1 UI + 0 0 0 @@ -45,7 +47,7 @@ BM2CMP_FRAME_BASE - 746,684 + -1,-1 wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER KIWAY_PLAYER; kiway_player.h Bitmap to Component Converter @@ -364,7 +366,7 @@ 0 wxID_ANY - Bitmap Info: + Bitmap Information sbSizerInfo wxVERTICAL @@ -1077,7 +1079,7 @@ 0 wxID_ANY - Output Parameters: + Output Parameters sbSizerImgPrms wxVERTICAL @@ -1166,6 +1168,7 @@ + 0 @@ -1510,6 +1513,7 @@ + 0 @@ -1583,6 +1587,7 @@ + 0 @@ -1656,6 +1661,7 @@ + 0 @@ -1749,7 +1755,7 @@ 0 0 wxID_ANY - Format: + Format 1 0 @@ -1789,7 +1795,7 @@ 0 wxID_ANY - Image Options: + Image Options sbSizer2 wxVERTICAL @@ -2022,7 +2028,7 @@ 0 0 wxID_ANY - Board Layer for Outline: + Board Layer for Outline 1 0 diff --git a/bitmap2component/bitmap2cmp_gui_base.h b/bitmap2component/bitmap2cmp_gui_base.h index 0ebbd142be..dd67febb9d 100644 --- a/bitmap2component/bitmap2cmp_gui_base.h +++ b/bitmap2component/bitmap2cmp_gui_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.9.0 Nov 1 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -97,7 +97,7 @@ class BM2CMP_FRAME_BASE : public KIWAY_PLAYER public: - BM2CMP_FRAME_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Bitmap to Component Converter"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 746,684 ), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL ); + BM2CMP_FRAME_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Bitmap to Component Converter"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL ); ~BM2CMP_FRAME_BASE(); diff --git a/cvpcb/dialogs/dialog_config_equfiles_base.cpp b/cvpcb/dialogs/dialog_config_equfiles_base.cpp index 489e432797..c4b0693704 100644 --- a/cvpcb/dialogs/dialog_config_equfiles_base.cpp +++ b/cvpcb/dialogs/dialog_config_equfiles_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2018) +// C++ code generated with wxFormBuilder (version 3.9.0 Nov 1 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -12,118 +12,118 @@ DIALOG_CONFIG_EQUFILES_BASE::DIALOG_CONFIG_EQUFILES_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) { this->SetSizeHints( wxDefaultSize, wxDefaultSize ); - + wxBoxSizer* bMainSizer; bMainSizer = new wxBoxSizer( wxVERTICAL ); - + wxStaticBoxSizer* sbEquivChoiceSizer; sbEquivChoiceSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Symbol Footprint Association Files (.equ)") ), wxHORIZONTAL ); - + wxBoxSizer* bSizerFlist; bSizerFlist = new wxBoxSizer( wxVERTICAL ); - - m_ListEquiv = new wxListBox( sbEquivChoiceSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_EXTENDED|wxLB_HSCROLL|wxLB_NEEDED_SB|wxLB_SINGLE ); + + m_ListEquiv = new wxListBox( sbEquivChoiceSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_EXTENDED|wxLB_HSCROLL|wxLB_NEEDED_SB|wxLB_SINGLE ); m_ListEquiv->SetMinSize( wxSize( 350,-1 ) ); - + bSizerFlist->Add( m_ListEquiv, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); - - + + sbEquivChoiceSizer->Add( bSizerFlist, 1, wxEXPAND, 5 ); - + wxBoxSizer* bSizerButtons; bSizerButtons = new wxBoxSizer( wxVERTICAL ); - + m_buttonAddEqu = new wxButton( sbEquivChoiceSizer->GetStaticBox(), ID_ADD_EQU, _("Add"), wxDefaultPosition, wxDefaultSize, 0 ); bSizerButtons->Add( m_buttonAddEqu, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); - + m_buttonRemoveEqu = new wxButton( sbEquivChoiceSizer->GetStaticBox(), ID_REMOVE_EQU, _("Remove"), wxDefaultPosition, wxDefaultSize, 0 ); bSizerButtons->Add( m_buttonRemoveEqu, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); - + m_buttonMoveUp = new wxButton( sbEquivChoiceSizer->GetStaticBox(), ID_EQU_UP, _("Move Up"), wxDefaultPosition, wxDefaultSize, 0 ); bSizerButtons->Add( m_buttonMoveUp, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); - + m_buttonMoveDown = new wxButton( sbEquivChoiceSizer->GetStaticBox(), ID_EQU_DOWN, _("Move Down"), wxDefaultPosition, wxDefaultSize, 0 ); bSizerButtons->Add( m_buttonMoveDown, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); - + m_buttonEdit = new wxButton( sbEquivChoiceSizer->GetStaticBox(), wxID_ANY, _("Edit File"), wxDefaultPosition, wxDefaultSize, 0 ); bSizerButtons->Add( m_buttonEdit, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); - - + + sbEquivChoiceSizer->Add( bSizerButtons, 0, wxALIGN_CENTER_VERTICAL, 5 ); - - + + bMainSizer->Add( sbEquivChoiceSizer, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - + wxBoxSizer* bSizerLower; bSizerLower = new wxBoxSizer( wxHORIZONTAL ); - + wxBoxSizer* bSizerEnvVar; bSizerEnvVar = new wxBoxSizer( wxVERTICAL ); - + m_staticText2 = new wxStaticText( this, wxID_ANY, _("Available environment variables for relative paths:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText2->Wrap( -1 ); bSizerEnvVar->Add( m_staticText2, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_gridEnvVars = new wxGrid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); - + // Grid m_gridEnvVars->CreateGrid( 2, 2 ); m_gridEnvVars->EnableEditing( true ); m_gridEnvVars->EnableGridLines( true ); m_gridEnvVars->EnableDragGridSize( false ); m_gridEnvVars->SetMargins( 0, 0 ); - + // Columns m_gridEnvVars->EnableDragColMove( false ); m_gridEnvVars->EnableDragColSize( true ); m_gridEnvVars->SetColLabelSize( 25 ); m_gridEnvVars->SetColLabelValue( 0, _("Name") ); m_gridEnvVars->SetColLabelValue( 1, _("Value") ); - m_gridEnvVars->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_gridEnvVars->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Rows m_gridEnvVars->AutoSizeRows(); m_gridEnvVars->EnableDragRowSize( true ); m_gridEnvVars->SetRowLabelSize( 30 ); - m_gridEnvVars->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_gridEnvVars->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Label Appearance - + // Cell Defaults m_gridEnvVars->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP ); bSizerEnvVar->Add( m_gridEnvVars, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - + + bSizerLower->Add( bSizerEnvVar, 1, wxEXPAND, 5 ); - + wxString m_rbPathOptionChoiceChoices[] = { _("Absolute"), _("Relative") }; int m_rbPathOptionChoiceNChoices = sizeof( m_rbPathOptionChoiceChoices ) / sizeof( wxString ); - m_rbPathOptionChoice = new wxRadioBox( this, wxID_ANY, _("Path Type:"), wxDefaultPosition, wxDefaultSize, m_rbPathOptionChoiceNChoices, m_rbPathOptionChoiceChoices, 1, wxRA_SPECIFY_COLS ); + m_rbPathOptionChoice = new wxRadioBox( this, wxID_ANY, _("Path Type"), wxDefaultPosition, wxDefaultSize, m_rbPathOptionChoiceNChoices, m_rbPathOptionChoiceChoices, 1, wxRA_SPECIFY_COLS ); m_rbPathOptionChoice->SetSelection( 1 ); bSizerLower->Add( m_rbPathOptionChoice, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - - + + bMainSizer->Add( bSizerLower, 0, wxEXPAND, 5 ); - + m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); bMainSizer->Add( m_staticline2, 0, wxEXPAND|wxALL, 5 ); - + m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); m_sdbSizer->AddButton( m_sdbSizerOK ); m_sdbSizerCancel = new wxButton( this, wxID_CANCEL ); m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); - + bMainSizer->Add( m_sdbSizer, 0, wxALL|wxALIGN_RIGHT, 5 ); - - + + this->SetSizer( bMainSizer ); this->Layout(); bMainSizer->Fit( this ); - + this->Centre( wxBOTH ); - + // Connect Events this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_CONFIG_EQUFILES_BASE::OnCloseWindow ) ); m_buttonAddEqu->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_CONFIG_EQUFILES_BASE::OnAddFiles ), NULL, this ); @@ -144,5 +144,5 @@ DIALOG_CONFIG_EQUFILES_BASE::~DIALOG_CONFIG_EQUFILES_BASE() m_buttonMoveDown->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_CONFIG_EQUFILES_BASE::OnButtonMoveDown ), NULL, this ); m_buttonEdit->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_CONFIG_EQUFILES_BASE::OnEditEquFile ), NULL, this ); m_sdbSizerOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_CONFIG_EQUFILES_BASE::OnOkClick ), NULL, this ); - + } diff --git a/cvpcb/dialogs/dialog_config_equfiles_base.fbp b/cvpcb/dialogs/dialog_config_equfiles_base.fbp index 6f6fe56d26..4dc118f269 100644 --- a/cvpcb/dialogs/dialog_config_equfiles_base.fbp +++ b/cvpcb/dialogs/dialog_config_equfiles_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -14,6 +14,7 @@ dialog_config_equfiles_base 1000 none + 1 dialog_cvpcb_config_equfile_base @@ -25,6 +26,7 @@ 1 1 UI + 0 1 0 @@ -53,42 +55,7 @@ - - - - - - - - - OnCloseWindow - - - - - - - - - - - - - - - - - - - - - - - - - - bMainSizer @@ -106,7 +73,6 @@ wxHORIZONTAL 1 none - 5 wxEXPAND @@ -177,31 +143,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - @@ -228,27 +169,34 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 ID_ADD_EQU Add + + 0 0 @@ -263,6 +211,8 @@ protected 1 + + Resizable 1 @@ -278,29 +228,6 @@ OnAddFiles - - - - - - - - - - - - - - - - - - - - - - - @@ -316,27 +243,34 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 ID_REMOVE_EQU Remove + + 0 0 @@ -351,6 +285,8 @@ protected 1 + + Resizable 1 @@ -366,29 +302,6 @@ OnRemoveFiles - - - - - - - - - - - - - - - - - - - - - - - @@ -404,27 +317,34 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 ID_EQU_UP Move Up + + 0 0 @@ -439,6 +359,8 @@ protected 1 + + Resizable 1 @@ -454,29 +376,6 @@ OnButtonMoveUp - - - - - - - - - - - - - - - - - - - - - - - @@ -492,27 +391,34 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 ID_EQU_DOWN Move Down + + 0 0 @@ -527,6 +433,8 @@ protected 1 + + Resizable 1 @@ -542,29 +450,6 @@ OnButtonMoveDown - - - - - - - - - - - - - - - - - - - - - - - @@ -580,27 +465,34 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY Edit File + + 0 0 @@ -615,6 +507,8 @@ protected 1 + + Resizable 1 @@ -630,29 +524,6 @@ OnEditEquFile - - - - - - - - - - - - - - - - - - - - - - - @@ -710,6 +581,7 @@ 0 wxID_ANY Available environment variables for relative paths: + 0 0 @@ -735,29 +607,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -786,10 +635,10 @@ wxALIGN_TOP 0 1 - wxALIGN_CENTRE + wxALIGN_CENTER 25 "Name" "Value" - wxALIGN_CENTRE + wxALIGN_CENTER 2 @@ -832,10 +681,10 @@ 1 Resizable - wxALIGN_CENTRE + wxALIGN_CENTER 30 - wxALIGN_CENTRE + wxALIGN_CENTER 2 1 @@ -846,61 +695,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -938,7 +732,7 @@ 0 0 wxID_ANY - Path Type: + Path Type 1 0 @@ -969,30 +763,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1053,29 +823,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -1094,14 +841,7 @@ m_sdbSizer protected - - - - - OnOkClick - - diff --git a/cvpcb/dialogs/dialog_config_equfiles_base.h b/cvpcb/dialogs/dialog_config_equfiles_base.h index f2e9b0062e..f4cebfa6cc 100644 --- a/cvpcb/dialogs/dialog_config_equfiles_base.h +++ b/cvpcb/dialogs/dialog_config_equfiles_base.h @@ -1,12 +1,11 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2018) +// C++ code generated with wxFormBuilder (version 3.9.0 Nov 1 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#ifndef __DIALOG_CONFIG_EQUFILES_BASE_H__ -#define __DIALOG_CONFIG_EQUFILES_BASE_H__ +#pragma once #include #include @@ -20,6 +19,9 @@ #include #include #include +#include +#include +#include #include #include #include @@ -35,7 +37,7 @@ class DIALOG_CONFIG_EQUFILES_BASE : public DIALOG_SHIM { private: - + protected: enum { @@ -44,7 +46,7 @@ class DIALOG_CONFIG_EQUFILES_BASE : public DIALOG_SHIM ID_EQU_UP, ID_EQU_DOWN }; - + wxListBox* m_ListEquiv; wxButton* m_buttonAddEqu; wxButton* m_buttonRemoveEqu; @@ -58,7 +60,7 @@ class DIALOG_CONFIG_EQUFILES_BASE : public DIALOG_SHIM wxStdDialogButtonSizer* m_sdbSizer; wxButton* m_sdbSizerOK; wxButton* m_sdbSizerCancel; - + // Virtual event handlers, overide them in your derived class virtual void OnCloseWindow( wxCloseEvent& event ) { event.Skip(); } virtual void OnAddFiles( wxCommandEvent& event ) { event.Skip(); } @@ -67,13 +69,12 @@ class DIALOG_CONFIG_EQUFILES_BASE : public DIALOG_SHIM virtual void OnButtonMoveDown( wxCommandEvent& event ) { event.Skip(); } virtual void OnEditEquFile( wxCommandEvent& event ) { event.Skip(); } virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); } - - + + public: - - DIALOG_CONFIG_EQUFILES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + + DIALOG_CONFIG_EQUFILES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_CONFIG_EQUFILES_BASE(); - + }; -#endif //__DIALOG_CONFIG_EQUFILES_BASE_H__ diff --git a/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp b/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp index d64a9661e8..f242985ff8 100644 --- a/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp +++ b/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.9.0 Jun 18 2020) +// C++ code generated with wxFormBuilder (version 3.9.0 Nov 1 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -60,7 +60,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow bSizeLeftpReg->Add( bSizerBitmapReg, 1, wxEXPAND, 5 ); wxStaticBoxSizer* sbSizerRegFormula; - sbSizerRegFormula = new wxStaticBoxSizer( new wxStaticBox( m_panelRegulators, wxID_ANY, _("Formula:") ), wxVERTICAL ); + sbSizerRegFormula = new wxStaticBoxSizer( new wxStaticBox( m_panelRegulators, wxID_ANY, _("Formula") ), wxVERTICAL ); m_RegulFormula = new wxStaticText( sbSizerRegFormula->GetStaticBox(), wxID_ANY, _("Vout = Vref * (R1 + R2) / R2"), wxDefaultPosition, wxDefaultSize, 0 ); m_RegulFormula->Wrap( -1 ); @@ -69,7 +69,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow sbSizerRegFormula->Add( m_RegulFormula, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 ); - bSizeLeftpReg->Add( sbSizerRegFormula, 0, wxEXPAND, 5 ); + bSizeLeftpReg->Add( sbSizerRegFormula, 0, wxBOTTOM|wxEXPAND|wxLEFT, 5 ); bSizerMainReg->Add( bSizeLeftpReg, 1, wxEXPAND, 5 ); @@ -198,7 +198,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow bSizerRegulRight->Add( bSizerRegulButtonCalcReset, 0, wxEXPAND, 5 ); wxStaticBoxSizer* sbSizerRegulatorsChooser; - sbSizerRegulatorsChooser = new wxStaticBoxSizer( new wxStaticBox( m_panelRegulators, wxID_ANY, _("Regulator:") ), wxVERTICAL ); + sbSizerRegulatorsChooser = new wxStaticBoxSizer( new wxStaticBox( m_panelRegulators, wxID_ANY, _("Regulator") ), wxVERTICAL ); wxArrayString m_choiceRegulatorSelectorChoices; m_choiceRegulatorSelector = new wxChoice( sbSizerRegulatorsChooser->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceRegulatorSelectorChoices, 0 ); @@ -245,7 +245,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow sbSizerRegulatorsChooser->Add( bSizerReulBtn, 1, wxEXPAND, 5 ); - bSizerRegulRight->Add( sbSizerRegulatorsChooser, 0, wxEXPAND, 5 ); + bSizerRegulRight->Add( sbSizerRegulatorsChooser, 0, wxEXPAND|wxRIGHT, 5 ); m_RegulMessage = new wxStaticText( m_panelRegulators, wxID_ANY, _("Message"), wxDefaultPosition, wxDefaultSize, 0 ); m_RegulMessage->Wrap( -1 ); @@ -389,7 +389,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow sbSizerAttValues->Add( fgSizerAttResults, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 ); - bMiddleSizerAtt->Add( sbSizerAttValues, 0, wxEXPAND|wxTOP, 5 ); + bMiddleSizerAtt->Add( sbSizerAttValues, 0, wxEXPAND|wxRIGHT|wxTOP, 5 ); m_staticTextAttMsg = new wxStaticText( m_panelAttenuators, wxID_ANY, _("Messages:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextAttMsg->Wrap( -1 ); @@ -414,7 +414,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_panelAttenuators->SetSizer( bSizerAtt ); m_panelAttenuators->Layout(); bSizerAtt->Fit( m_panelAttenuators ); - m_Notebook->AddPage( m_panelAttenuators, _("RF Attenuators"), false ); + m_Notebook->AddPage( m_panelAttenuators, _("RF Attenuators"), true ); m_panelESeries = new wxPanel( m_Notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizerESerie; bSizerESerie = new wxBoxSizer( wxVERTICAL ); @@ -464,7 +464,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_UnitRegultR111 = new wxStaticText( sbSizerESeriesInput->GetStaticBox(), wxID_ANY, _("kOhm"), wxDefaultPosition, wxDefaultSize, 0 ); m_UnitRegultR111->Wrap( -1 ); - fgSizerAttPrms1->Add( m_UnitRegultR111, 0, wxALL, 5 ); + fgSizerAttPrms1->Add( m_UnitRegultR111, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); m_ESrequired1 = new wxStaticText( sbSizerESeriesInput->GetStaticBox(), wxID_ANY, _("Exclude Value 1:"), wxDefaultPosition, wxDefaultSize, 0 ); m_ESrequired1->Wrap( -1 ); @@ -475,7 +475,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_UnitRegultR1111 = new wxStaticText( sbSizerESeriesInput->GetStaticBox(), wxID_ANY, _("kOhm"), wxDefaultPosition, wxDefaultSize, 0 ); m_UnitRegultR1111->Wrap( -1 ); - fgSizerAttPrms1->Add( m_UnitRegultR1111, 0, wxALL, 5 ); + fgSizerAttPrms1->Add( m_UnitRegultR1111, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); m_ESrequired11 = new wxStaticText( sbSizerESeriesInput->GetStaticBox(), wxID_ANY, _("Exclude Value 2:"), wxDefaultPosition, wxDefaultSize, 0 ); m_ESrequired11->Wrap( -1 ); @@ -486,11 +486,11 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_UnitRegultR1112 = new wxStaticText( sbSizerESeriesInput->GetStaticBox(), wxID_ANY, _("kOhm"), wxDefaultPosition, wxDefaultSize, 0 ); m_UnitRegultR1112->Wrap( -1 ); - fgSizerAttPrms1->Add( m_UnitRegultR1112, 0, wxALL, 5 ); + fgSizerAttPrms1->Add( m_UnitRegultR1112, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); wxString m_rbESerieSelectionChoices[] = { _("E1"), _("E3"), _("E6"), _("E12") }; int m_rbESerieSelectionNChoices = sizeof( m_rbESerieSelectionChoices ) / sizeof( wxString ); - m_rbESerieSelection = new wxRadioBox( sbSizerESeriesInput->GetStaticBox(), wxID_ANY, _("Available Values:"), wxDefaultPosition, wxDefaultSize, m_rbESerieSelectionNChoices, m_rbESerieSelectionChoices, 4, wxRA_SPECIFY_COLS ); + m_rbESerieSelection = new wxRadioBox( sbSizerESeriesInput->GetStaticBox(), wxID_ANY, _("Available Values"), wxDefaultPosition, wxDefaultSize, m_rbESerieSelectionNChoices, m_rbESerieSelectionChoices, 4, wxRA_SPECIFY_COLS ); m_rbESerieSelection->SetSelection( 2 ); fgSizerAttPrms1->Add( m_rbESerieSelection, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); @@ -498,7 +498,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow sbSizerESeriesInput->Add( fgSizerAttPrms1, 0, wxEXPAND, 5 ); - bMiddleSizerESeries->Add( sbSizerESeriesInput, 0, wxRIGHT|wxTOP, 5 ); + bMiddleSizerESeries->Add( sbSizerESeriesInput, 0, wxLEFT|wxRIGHT|wxTOP, 5 ); wxStaticBoxSizer* sbSizerESeriesSolutions; sbSizerESeriesSolutions = new wxStaticBoxSizer( new wxStaticBox( m_panelESeries, wxID_ANY, _("Solutions") ), wxVERTICAL ); @@ -520,7 +520,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_ESeriesSimpleErr = new wxStaticText( sbSizerESeriesSolutions->GetStaticBox(), wxID_ANY, _("Error:"), wxDefaultPosition, wxDefaultSize, 0 ); m_ESeriesSimpleErr->Wrap( -1 ); - fgSizerESerieResults->Add( m_ESeriesSimpleErr, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerESerieResults->Add( m_ESeriesSimpleErr, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); m_ESeriesError2R = new wxTextCtrl( sbSizerESeriesSolutions->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerESerieResults->Add( m_ESeriesError2R, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); @@ -547,27 +547,27 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_ESeriesAltPercent = new wxStaticText( sbSizerESeriesSolutions->GetStaticBox(), wxID_ANY, _("%"), wxDefaultPosition, wxDefaultSize, 0 ); m_ESeriesAltPercent->Wrap( -1 ); - fgSizerESerieResults->Add( m_ESeriesAltPercent, 0, wxALL, 5 ); + fgSizerESerieResults->Add( m_ESeriesAltPercent, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); m_ESeries4RSolution = new wxStaticText( sbSizerESeriesSolutions->GetStaticBox(), wxID_ANY, _("4R Solution:"), wxDefaultPosition, wxDefaultSize, 0 ); m_ESeries4RSolution->Wrap( -1 ); - fgSizerESerieResults->Add( m_ESeries4RSolution, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerESerieResults->Add( m_ESeries4RSolution, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); m_ESeries_Sol4R = new wxTextCtrl( sbSizerESeriesSolutions->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_ESeries_Sol4R->SetMinSize( wxSize( 290,-1 ) ); - fgSizerESerieResults->Add( m_ESeries_Sol4R, 0, wxALL|wxALIGN_BOTTOM, 5 ); + fgSizerESerieResults->Add( m_ESeries_Sol4R, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); m_ESeriesAltErr1 = new wxStaticText( sbSizerESeriesSolutions->GetStaticBox(), wxID_ANY, _("Error:"), wxDefaultPosition, wxDefaultSize, 0 ); m_ESeriesAltErr1->Wrap( -1 ); fgSizerESerieResults->Add( m_ESeriesAltErr1, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); m_ESeriesError4R = new wxTextCtrl( sbSizerESeriesSolutions->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerESerieResults->Add( m_ESeriesError4R, 0, wxALL, 5 ); + fgSizerESerieResults->Add( m_ESeriesError4R, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); m_ESeriesAltPercent1 = new wxStaticText( sbSizerESeriesSolutions->GetStaticBox(), wxID_ANY, _("%"), wxDefaultPosition, wxDefaultSize, 0 ); m_ESeriesAltPercent1->Wrap( -1 ); - fgSizerESerieResults->Add( m_ESeriesAltPercent1, 0, wxALL, 5 ); + fgSizerESerieResults->Add( m_ESeriesAltPercent1, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); m_buttonEScalculate = new wxButton( sbSizerESeriesSolutions->GetStaticBox(), wxID_ANY, _("Calculate"), wxDefaultPosition, wxDefaultSize, 0 ); fgSizerESerieResults->Add( m_buttonEScalculate, 0, wxALL, 5 ); @@ -597,7 +597,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow sbLowerSizerEseriesHelp->Add( m_panelESeriesHelp, 1, wxALL|wxEXPAND, 5 ); - bLowerESerie->Add( sbLowerSizerEseriesHelp, 1, wxEXPAND, 5 ); + bLowerESerie->Add( sbLowerSizerEseriesHelp, 1, wxEXPAND|wxLEFT|wxRIGHT, 5 ); bSizerESerie->Add( bLowerESerie, 1, wxEXPAND, 5 ); @@ -817,7 +817,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow bMiddleSizer->Add( sbSubstrateBoxSizer, 0, wxEXPAND|wxBOTTOM, 5 ); wxStaticBoxSizer* sbCmpPrmsSizer; - sbCmpPrmsSizer = new wxStaticBoxSizer( new wxStaticBox( m_panelTransline, wxID_ANY, _("Component Parameters:") ), wxVERTICAL ); + sbCmpPrmsSizer = new wxStaticBoxSizer( new wxStaticBox( m_panelTransline, wxID_ANY, _("Component Parameters") ), wxVERTICAL ); wxFlexGridSizer* fgSizeCmpPrms; fgSizeCmpPrms = new wxFlexGridSizer( 1, 3, 0, 0 ); @@ -1022,7 +1022,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow sbElectricalResultsSizer->Add( fgSizerResults, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 ); - bRightSizer->Add( sbElectricalResultsSizer, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 ); + bRightSizer->Add( sbElectricalResultsSizer, 0, wxBOTTOM|wxEXPAND|wxRIGHT|wxTOP, 5 ); wxStaticBoxSizer* sbMessagesSizer; sbMessagesSizer = new wxStaticBoxSizer( new wxStaticBox( m_panelTransline, wxID_ANY, _("Results") ), wxVERTICAL ); @@ -1093,7 +1093,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow sbMessagesSizer->Add( fgSizerTranslResults, 1, wxEXPAND, 5 ); - bRightSizer->Add( sbMessagesSizer, 1, wxEXPAND|wxTOP, 5 ); + bRightSizer->Add( sbMessagesSizer, 1, wxEXPAND|wxRIGHT|wxTOP, 5 ); m_buttonTransLineReset = new wxButton( m_panelTransline, wxID_ANY, _("Reset to Defaults"), wxDefaultPosition, wxDefaultSize, 0 ); bRightSizer->Add( m_buttonTransLineReset, 0, wxALIGN_RIGHT|wxALL, 5 ); @@ -1267,9 +1267,6 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow sbSizerVS_Inputs->Add( fgSizerVS_Inputs, 0, wxEXPAND, 5 ); - m_staticline31 = new wxStaticLine( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - sbSizerVS_Inputs->Add( m_staticline31, 0, wxALL|wxEXPAND, 5 ); - m_bitmap10 = new wxStaticBitmap( sbSizerVS_Inputs->GetStaticBox(), wxID_ANY, wxBitmap( via_xpm ), wxDefaultPosition, wxDefaultSize, 0 ); m_bitmap10->SetToolTip( _("Top view of via") ); @@ -1508,7 +1505,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow bSizeLeft->Add( sbSizerTW_Prms, 0, wxALL|wxEXPAND, 5 ); m_htmlWinFormulas = new wxHtmlWindow( m_panelTrackWidth, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_NO_SELECTION|wxHW_SCROLLBAR_AUTO|wxBORDER_SIMPLE ); - bSizeLeft->Add( m_htmlWinFormulas, 1, wxTOP|wxEXPAND, 5 ); + bSizeLeft->Add( m_htmlWinFormulas, 1, wxEXPAND|wxLEFT|wxTOP, 5 ); bSizerTrackWidth->Add( bSizeLeft, 1, wxEXPAND, 5 ); @@ -1763,7 +1760,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow // Columns m_gridElectricalSpacingValues->EnableDragColMove( false ); m_gridElectricalSpacingValues->EnableDragColSize( true ); - m_gridElectricalSpacingValues->SetColLabelSize( 70 ); + m_gridElectricalSpacingValues->SetColLabelSize( 30 ); m_gridElectricalSpacingValues->SetColLabelValue( 0, _("B1") ); m_gridElectricalSpacingValues->SetColLabelValue( 1, _("B2") ); m_gridElectricalSpacingValues->SetColLabelValue( 2, _("B3") ); @@ -1861,10 +1858,10 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow // Cell Defaults m_gridClassesValuesDisplay->SetDefaultCellAlignment( wxALIGN_CENTER, wxALIGN_TOP ); - brdclsSizerRight->Add( m_gridClassesValuesDisplay, 0, wxALL|wxEXPAND, 5 ); + brdclsSizerRight->Add( m_gridClassesValuesDisplay, 0, wxALL, 5 ); m_panelShowClassPrms = new wxPanel( m_panelBoardClass, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - brdclsSizerRight->Add( m_panelShowClassPrms, 1, wxEXPAND | wxALL, 5 ); + brdclsSizerRight->Add( m_panelShowClassPrms, 1, wxALL|wxEXPAND, 5 ); bSizerBoardClass->Add( brdclsSizerRight, 1, wxEXPAND, 5 ); @@ -1873,13 +1870,14 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow m_panelBoardClass->SetSizer( bSizerBoardClass ); m_panelBoardClass->Layout(); bSizerBoardClass->Fit( m_panelBoardClass ); - m_Notebook->AddPage( m_panelBoardClass, _("Board Classes"), true ); + m_Notebook->AddPage( m_panelBoardClass, _("Board Classes"), false ); bmainFrameSizer->Add( m_Notebook, 1, wxEXPAND, 5 ); this->SetSizer( bmainFrameSizer ); this->Layout(); + bmainFrameSizer->Fit( this ); this->Centre( wxBOTH ); diff --git a/pcb_calculator/dialogs/pcb_calculator_frame_base.fbp b/pcb_calculator/dialogs/pcb_calculator_frame_base.fbp index c1b9473930..5a76483382 100644 --- a/pcb_calculator/dialogs/pcb_calculator_frame_base.fbp +++ b/pcb_calculator/dialogs/pcb_calculator_frame_base.fbp @@ -47,7 +47,7 @@ PCB_CALCULATOR_FRAME_BASE - 1331,845 + -1,-1 wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER KIWAY_PLAYER; kiway_player.h PCB Calculator @@ -165,11 +165,11 @@ - + Regulators 0 - + 1 1 1 @@ -220,7 +220,7 @@ wxTAB_TRAVERSAL - + bSizerMainReg wxHORIZONTAL @@ -383,11 +383,11 @@ 5 - wxEXPAND + wxBOTTOM|wxEXPAND|wxLEFT 0 wxID_ANY - Formula: + Formula sbSizerRegFormula wxVERTICAL @@ -458,11 +458,11 @@ - + 5 wxEXPAND 1 - + bSizerRegulRight wxVERTICAL @@ -1952,13 +1952,13 @@ - + 5 - wxEXPAND + wxEXPAND|wxRIGHT 0 - + wxID_ANY - Regulator: + Regulator sbSizerRegulatorsChooser wxVERTICAL @@ -2540,11 +2540,11 @@ - + RF Attenuators - 0 - + 1 + 1 1 1 @@ -2595,7 +2595,7 @@ wxTAB_TRAVERSAL - + bSizerAtt wxHORIZONTAL @@ -3496,7 +3496,7 @@ 5 - wxEXPAND|wxTOP + wxEXPAND|wxRIGHT|wxTOP 0 wxID_ANY @@ -4280,11 +4280,11 @@ - + E-Series 0 - + 1 1 1 @@ -4335,7 +4335,7 @@ wxTAB_TRAVERSAL - + bSizerESerie wxVERTICAL @@ -4434,18 +4434,18 @@ - + 5 wxEXPAND|wxTOP 0 - + bMiddleSizerESeries wxHORIZONTAL none 5 - wxRIGHT|wxTOP + wxLEFT|wxRIGHT|wxTOP 0 wxID_ANY @@ -4598,7 +4598,7 @@ 5 - wxALL + wxALIGN_CENTER_VERTICAL|wxRIGHT 0 1 @@ -4784,7 +4784,7 @@ 5 - wxALL + wxALIGN_CENTER_VERTICAL|wxRIGHT 0 1 @@ -4970,7 +4970,7 @@ 5 - wxALL + wxALIGN_CENTER_VERTICAL|wxRIGHT 0 1 @@ -5062,7 +5062,7 @@ 0 0 wxID_ANY - Available Values: + Available Values 4 0 @@ -5100,11 +5100,11 @@ - + 5 wxRIGHT|wxTOP 0 - + wxID_ANY Solutions @@ -5112,11 +5112,11 @@ wxVERTICAL 1 none - + 5 wxEXPAND|wxTOP|wxBOTTOM 0 - + 5 wxBOTH @@ -5255,7 +5255,7 @@ 5 - wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT 0 1 @@ -5691,7 +5691,7 @@ 5 - wxALL + wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT 0 1 @@ -5752,7 +5752,7 @@ 5 - wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT 0 1 @@ -5813,7 +5813,7 @@ 5 - wxALL|wxALIGN_BOTTOM + wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT 0 1 @@ -5938,7 +5938,7 @@ 5 - wxALL + wxALIGN_CENTER_VERTICAL|wxLEFT 0 1 @@ -6002,7 +6002,7 @@ 5 - wxALL + wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT 0 1 @@ -6163,7 +6163,7 @@ none 5 - wxEXPAND + wxEXPAND|wxLEFT|wxRIGHT 1 wxID_ANY @@ -9132,7 +9132,7 @@ 0 wxID_ANY - Component Parameters: + Component Parameters sbCmpPrmsSizer wxVERTICAL @@ -10635,7 +10635,7 @@ 5 - wxEXPAND|wxTOP|wxBOTTOM + wxBOTTOM|wxEXPAND|wxRIGHT|wxTOP 0 wxID_ANY @@ -11234,7 +11234,7 @@ 5 - wxEXPAND|wxTOP + wxEXPAND|wxRIGHT|wxTOP 1 wxID_ANY @@ -14394,64 +14394,6 @@ - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_staticline31 - 1 - - - protected - 1 - - Resizable - 1 - - wxLI_HORIZONTAL - - 0 - - - - - - 5 wxALIGN_CENTER_HORIZONTAL|wxALL @@ -17206,7 +17148,7 @@ 5 - wxTOP|wxEXPAND + wxEXPAND|wxLEFT|wxTOP 1 1 @@ -20308,7 +20250,7 @@ 0 1 wxALIGN_CENTER - 70 + 30 "B1" "B2" "B3" "B4" "A5" "A6" "A7" wxALIGN_CENTER 7 @@ -20438,7 +20380,7 @@ Board Classes - 1 + 0 1 1 @@ -20632,7 +20574,7 @@ 5 - wxALL|wxEXPAND + wxALL 0 1 @@ -20720,7 +20662,7 @@ 5 - wxEXPAND | wxALL + wxALL|wxEXPAND 1 1 diff --git a/pcb_calculator/dialogs/pcb_calculator_frame_base.h b/pcb_calculator/dialogs/pcb_calculator_frame_base.h index 4d22dc48dc..8b1a81ff9f 100644 --- a/pcb_calculator/dialogs/pcb_calculator_frame_base.h +++ b/pcb_calculator/dialogs/pcb_calculator_frame_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.9.0 Jun 18 2020) +// C++ code generated with wxFormBuilder (version 3.9.0 Nov 1 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -273,7 +273,6 @@ class PCB_CALCULATOR_FRAME_BASE : public KIWAY_PLAYER wxStaticText* m_staticTextRiseTime; wxTextCtrl* m_textCtrlRiseTime; wxStaticText* m_staticTextRiseTimeUnits; - wxStaticLine* m_staticline31; wxStaticBitmap* m_bitmap10; wxStaticText* m_staticTextArea11; wxStaticText* m_ViaResistance; @@ -414,7 +413,7 @@ class PCB_CALCULATOR_FRAME_BASE : public KIWAY_PLAYER public: - PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("PCB Calculator"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 1331,845 ), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxFULL_REPAINT_ON_RESIZE|wxTAB_TRAVERSAL, const wxString& name = wxT("pcb_calculator") ); + PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("PCB Calculator"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxFULL_REPAINT_ON_RESIZE|wxTAB_TRAVERSAL, const wxString& name = wxT("pcb_calculator") ); ~PCB_CALCULATOR_FRAME_BASE();