diff --git a/common/dialogs/wx_html_report_panel_base.cpp b/common/dialogs/wx_html_report_panel_base.cpp index f6837baa14..bda5f1ddfb 100644 --- a/common/dialogs/wx_html_report_panel_base.cpp +++ b/common/dialogs/wx_html_report_panel_base.cpp @@ -28,9 +28,15 @@ WX_HTML_REPORT_PANEL_BASE::WX_HTML_REPORT_PANEL_BASE( wxWindow* parent, wxWindow wxBoxSizer* bSizer1; bSizer1 = new wxBoxSizer( wxHORIZONTAL ); + wxBoxSizer* bMargins; + bMargins = new wxBoxSizer( wxVERTICAL ); + m_staticText3 = new wxStaticText( m_box->GetStaticBox(), wxID_ANY, _("Show:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText3->Wrap( -1 ); - bSizer1->Add( m_staticText3, 0, wxALL, 5 ); + bMargins->Add( m_staticText3, 0, wxALIGN_CENTER_VERTICAL, 5 ); + + + bSizer1->Add( bMargins, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_checkBoxShowAll = new wxCheckBox( m_box->GetStaticBox(), wxID_ANY, _("All"), wxDefaultPosition, wxDefaultSize, 0 ); m_checkBoxShowAll->SetValue(true); diff --git a/common/dialogs/wx_html_report_panel_base.fbp b/common/dialogs/wx_html_report_panel_base.fbp index 5879fe0c34..24f804b70a 100644 --- a/common/dialogs/wx_html_report_panel_base.fbp +++ b/common/dialogs/wx_html_report_panel_base.fbp @@ -196,87 +196,98 @@ bSizer1 wxHORIZONTAL none - + 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Show: - - 0 - - - 0 + wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL + 1 + - 1 - m_staticText3 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - + bMargins + wxVERTICAL + none + + 5 + wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Show: + + 0 + + + 0 + + 1 + m_staticText3 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/dialogs/wx_html_report_panel_base.h b/common/dialogs/wx_html_report_panel_base.h index 7443dc4087..2c4ac75fca 100644 --- a/common/dialogs/wx_html_report_panel_base.h +++ b/common/dialogs/wx_html_report_panel_base.h @@ -18,13 +18,13 @@ #include #include #include +#include #include #include #include #include #include #include -#include #include #include diff --git a/cvpcb/cvpcb_mainframe.cpp b/cvpcb/cvpcb_mainframe.cpp index 46eff2904c..a517009eb7 100644 --- a/cvpcb/cvpcb_mainframe.cpp +++ b/cvpcb/cvpcb_mainframe.cpp @@ -176,23 +176,23 @@ CVPCB_MAINFRAME::CVPCB_MAINFRAME( KIWAY* aKiway, wxWindow* aParent ) : auto bottomPanel = new wxPanel( this ); auto panelSizer = new wxBoxSizer( wxVERTICAL ); - wxFlexGridSizer* fgSizerStatus = new wxFlexGridSizer( 2, 1, 1, 0 ); + wxFlexGridSizer* fgSizerStatus = new wxFlexGridSizer( 2, 1, 0, 0 ); fgSizerStatus->SetFlexibleDirection( wxBOTH ); fgSizerStatus->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); m_statusLine1 = new wxStaticText( bottomPanel, wxID_ANY, wxEmptyString ); - fgSizerStatus->Add( m_statusLine1, 0, wxTOP, 2 ); + fgSizerStatus->Add( m_statusLine1, 0, 0, 5 ); m_statusLine2 = new wxStaticText( bottomPanel, wxID_ANY, wxEmptyString ); - fgSizerStatus->Add( m_statusLine2, 0, wxBOTTOM, 4 ); + fgSizerStatus->Add( m_statusLine2, 0, wxBOTTOM, 3 ); - panelSizer->Add( fgSizerStatus, 1, wxEXPAND|wxLEFT, 3 ); + panelSizer->Add( fgSizerStatus, 1, wxEXPAND|wxLEFT, 2 ); wxStaticLine* staticline1 = new wxStaticLine( bottomPanel ); panelSizer->Add( staticline1, 0, wxEXPAND, 5 ); wxFont statusFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT ); - statusFont.SetSymbolicSize( wxFONTSIZE_X_SMALL ); + statusFont.SetSymbolicSize( wxFONTSIZE_SMALL ); m_statusLine1->SetFont( statusFont ); m_statusLine2->SetFont( statusFont ); diff --git a/eeschema/dialogs/dialog_erc.cpp b/eeschema/dialogs/dialog_erc.cpp index 112b224300..332302638a 100644 --- a/eeschema/dialogs/dialog_erc.cpp +++ b/eeschema/dialogs/dialog_erc.cpp @@ -79,6 +79,12 @@ DIALOG_ERC::DIALOG_ERC( SCH_EDIT_FRAME* parent ) : { m_parent = parent; m_lastMarkerFound = NULL; + + wxFont infoFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT ); + infoFont.SetSymbolicSize( wxFONTSIZE_SMALL ); + m_textMarkers->SetFont( infoFont ); + m_titleMessages->SetFont( infoFont ); + Init(); // Now all widgets have the size fixed, call FinishDialogSettings diff --git a/eeschema/dialogs/dialog_erc_base.cpp b/eeschema/dialogs/dialog_erc_base.cpp index 3edaec198d..13115ad6cd 100644 --- a/eeschema/dialogs/dialog_erc_base.cpp +++ b/eeschema/dialogs/dialog_erc_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 19 2018) +// C++ code generated with wxFormBuilder (version Dec 30 2017) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -85,7 +85,7 @@ DIALOG_ERC_BASE::DIALOG_ERC_BASE( wxWindow* parent, wxWindowID id, const wxStrin bercSizer->Add( bupperSizer, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 8 ); - m_textMarkers = new wxStaticText( m_PanelERC, wxID_ANY, _("Error list:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_textMarkers = new wxStaticText( m_PanelERC, wxID_ANY, _("Error List:"), wxDefaultPosition, wxDefaultSize, 0 ); m_textMarkers->Wrap( -1 ); m_textMarkers->SetFont( wxFont( 11, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); @@ -120,7 +120,7 @@ DIALOG_ERC_BASE::DIALOG_ERC_BASE( wxWindow* parent, wxWindowID id, const wxStrin m_panelMatrixSizer = new wxBoxSizer( wxVERTICAL ); wxStaticBoxSizer* sbSizer2; - sbSizer2 = new wxStaticBoxSizer( new wxStaticBox( m_PanelERCOptions, wxID_ANY, _("Label to Label Connections:") ), wxVERTICAL ); + sbSizer2 = new wxStaticBoxSizer( new wxStaticBox( m_PanelERCOptions, wxID_ANY, _("Label to Label Connections") ), wxVERTICAL ); m_cbTestSimilarLabels = new wxCheckBox( sbSizer2->GetStaticBox(), wxID_ANY, _("Test similar labels"), wxDefaultPosition, wxDefaultSize, 0 ); m_cbTestSimilarLabels->SetToolTip( _("Similar labels are labels (inside a sheet) which differs only by upper/lower case") ); @@ -136,7 +136,7 @@ DIALOG_ERC_BASE::DIALOG_ERC_BASE( wxWindow* parent, wxWindowID id, const wxStrin m_panelMatrixSizer->Add( sbSizer2, 0, wxALL|wxEXPAND, 5 ); wxStaticBoxSizer* sbSizer3; - sbSizer3 = new wxStaticBoxSizer( new wxStaticBox( m_PanelERCOptions, wxID_ANY, _("Pin to Pin Connections:") ), wxVERTICAL ); + sbSizer3 = new wxStaticBoxSizer( new wxStaticBox( m_PanelERCOptions, wxID_ANY, _("Pin to Pin Connections") ), wxVERTICAL ); m_matrixPanel = new wxPanel( sbSizer3->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); sbSizer3->Add( m_matrixPanel, 1, wxEXPAND | wxALL, 5 ); diff --git a/eeschema/dialogs/dialog_erc_base.fbp b/eeschema/dialogs/dialog_erc_base.fbp index d06987447a..26d42cb1d0 100644 --- a/eeschema/dialogs/dialog_erc_base.fbp +++ b/eeschema/dialogs/dialog_erc_base.fbp @@ -14,7 +14,6 @@ dialog_erc_base 1000 none - 1 dialog_ERC_base @@ -1207,7 +1206,7 @@ 0 0 wxID_ANY - Error list: + Error List: 0 @@ -1709,7 +1708,7 @@ 0 wxID_ANY - Label to Label Connections: + Label to Label Connections sbSizer2 wxVERTICAL @@ -1900,7 +1899,7 @@ 0 wxID_ANY - Pin to Pin Connections: + Pin to Pin Connections sbSizer3 wxVERTICAL diff --git a/eeschema/dialogs/dialog_erc_base.h b/eeschema/dialogs/dialog_erc_base.h index 256f88ea8c..33c3c65b1e 100644 --- a/eeschema/dialogs/dialog_erc_base.h +++ b/eeschema/dialogs/dialog_erc_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 19 2018) +// C++ code generated with wxFormBuilder (version Dec 30 2017) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/eeschema/dialogs/dialog_lib_edit_text.cpp b/eeschema/dialogs/dialog_lib_edit_text.cpp index 24dca09a0e..4768354029 100644 --- a/eeschema/dialogs/dialog_lib_edit_text.cpp +++ b/eeschema/dialogs/dialog_lib_edit_text.cpp @@ -44,6 +44,10 @@ DIALOG_LIB_EDIT_TEXT::DIALOG_LIB_EDIT_TEXT( LIB_EDIT_FRAME* aParent, LIB_TEXT* a m_TextValueSelectButton->Hide(); m_PowerComponentValues->Show( false ); + wxFont infoFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT ); + infoFont.SetSymbolicSize( wxFONTSIZE_SMALL ); + m_PowerComponentValues->SetFont( infoFont ); + SetInitialFocus( m_TextValue ); m_sdbSizerButtonsOK->SetDefault(); diff --git a/eeschema/dialogs/dialog_lib_edit_text_base.cpp b/eeschema/dialogs/dialog_lib_edit_text_base.cpp index a4fe50bb6b..f0dbeddb82 100644 --- a/eeschema/dialogs/dialog_lib_edit_text_base.cpp +++ b/eeschema/dialogs/dialog_lib_edit_text_base.cpp @@ -34,7 +34,7 @@ DIALOG_LIB_EDIT_TEXT_BASE::DIALOG_LIB_EDIT_TEXT_BASE( wxWindow* parent, wxWindow bTextValueBoxSizer->Add( m_TextValue, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); - m_PowerComponentValues = new wxStaticText( this, wxID_ANY, _("(Power symbol value text cannot be modified.)"), wxDefaultPosition, wxDefaultSize, 0 ); + m_PowerComponentValues = new wxStaticText( this, wxID_ANY, _("(Power symbol value field text cannot be changed.)"), wxDefaultPosition, wxDefaultSize, 0 ); m_PowerComponentValues->Wrap( -1 ); m_PowerComponentValues->SetFont( wxFont( 11, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); diff --git a/eeschema/dialogs/dialog_lib_edit_text_base.fbp b/eeschema/dialogs/dialog_lib_edit_text_base.fbp index 4755ce1c2d..49d0974d51 100644 --- a/eeschema/dialogs/dialog_lib_edit_text_base.fbp +++ b/eeschema/dialogs/dialog_lib_edit_text_base.fbp @@ -326,7 +326,7 @@ 0 0 wxID_ANY - (Power symbol value text cannot be modified.) + (Power symbol value field text cannot be changed.) 0 diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp index e06b70a2c2..17c6417130 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp +++ b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp @@ -116,12 +116,9 @@ DIALOG_FOOTPRINT_BOARD_EDITOR::DIALOG_FOOTPRINT_BOARD_EDITOR( PCB_EDIT_FRAME* aP // Set font sizes wxFont infoFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT ); - infoFont.SetSymbolicSize( wxFONTSIZE_SMALL ); m_allow90Label->SetFont( infoFont ); m_allow180Label->SetFont( infoFont ); - - infoFont.SetSymbolicSize( wxFONTSIZE_X_SMALL ); m_libraryIDLabel->SetFont( infoFont ); m_staticLibraryID->SetFont( infoFont ); m_sheetPathLabel->SetFont( infoFont ); diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp index ac9b0de497..06aa73a224 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp +++ b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp @@ -106,7 +106,7 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow bSizerLeft = new wxBoxSizer( wxVERTICAL ); - bSizerLeft->Add( 0, 0, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 ); + bSizerLeft->Add( 0, 0, 0, wxEXPAND|wxTOP, 5 ); wxFlexGridSizer* fgSizerPos; fgSizerPos = new wxFlexGridSizer( 2, 3, 3, 0 ); @@ -142,13 +142,13 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow bSizerLeft->Add( fgSizerPos, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - bSizerLeft->Add( 0, 0, 0, wxEXPAND|wxTOP, 5 ); + bSizerLeft->Add( 0, 0, 0, wxEXPAND|wxTOP, 3 ); wxStaticBoxSizer* sbOrientationSizer; sbOrientationSizer = new wxStaticBoxSizer( new wxStaticBox( m_PanelGeneral, wxID_ANY, _("Orientation") ), wxVERTICAL ); wxGridBagSizer* gbSizer1; - gbSizer1 = new wxGridBagSizer( 3, 0 ); + gbSizer1 = new wxGridBagSizer( 4, 0 ); gbSizer1->SetFlexibleDirection( wxBOTH ); gbSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); @@ -176,13 +176,13 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow sbOrientationSizer->Add( gbSizer1, 1, wxEXPAND, 5 ); - bSizerLeft->Add( sbOrientationSizer, 1, wxEXPAND|wxALL, 5 ); + bSizerLeft->Add( sbOrientationSizer, 0, wxEXPAND|wxALL, 5 ); wxString m_LayerCtrlChoices[] = { _("Front"), _("Back") }; int m_LayerCtrlNChoices = sizeof( m_LayerCtrlChoices ) / sizeof( wxString ); m_LayerCtrl = new wxRadioBox( m_PanelGeneral, wxID_ANY, _("Board Side"), wxDefaultPosition, wxDefaultSize, m_LayerCtrlNChoices, m_LayerCtrlChoices, 1, wxRA_SPECIFY_COLS ); m_LayerCtrl->SetSelection( 0 ); - bSizerLeft->Add( m_LayerCtrl, 0, wxALL|wxEXPAND, 5 ); + bSizerLeft->Add( m_LayerCtrl, 1, wxALL|wxEXPAND, 5 ); bSizerProperties->Add( bSizerLeft, 8, wxEXPAND, 5 ); @@ -194,7 +194,7 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow int m_AutoPlaceCtrlNChoices = sizeof( m_AutoPlaceCtrlChoices ) / sizeof( wxString ); m_AutoPlaceCtrl = new wxRadioBox( m_PanelGeneral, wxID_ANY, _("Move and Place"), wxDefaultPosition, wxDefaultSize, m_AutoPlaceCtrlNChoices, m_AutoPlaceCtrlChoices, 1, wxRA_SPECIFY_COLS ); m_AutoPlaceCtrl->SetSelection( 0 ); - bSizerMiddle->Add( m_AutoPlaceCtrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + bSizerMiddle->Add( m_AutoPlaceCtrl, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); wxStaticBoxSizer* sbSizerAP; sbSizerAP = new wxStaticBoxSizer( new wxStaticBox( m_PanelGeneral, wxID_ANY, _("Auto-placement Rules") ), wxVERTICAL ); @@ -221,7 +221,7 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow m_allow180Label->Wrap( -1 ); m_allow180Label->SetFont( wxFont( 11, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); - bSizerMoveOpt->Add( m_allow180Label, 0, wxTOP, 3 ); + bSizerMoveOpt->Add( m_allow180Label, 0, 0, 5 ); m_CostRot180Ctrl = new wxSlider( sbSizerAP->GetStaticBox(), wxID_ANY, 0, 0, 10, wxDefaultPosition, wxDefaultSize, wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_LABELS ); bSizerMoveOpt->Add( m_CostRot180Ctrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); @@ -251,7 +251,7 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow bButtonsSizer->Add( m_buttonModuleEditor, 0, wxEXPAND|wxALL, 5 ); - bSizerRight->Add( bButtonsSizer, 0, wxEXPAND|wxALL, 5 ); + bSizerRight->Add( bButtonsSizer, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); bSizerRight->Add( 0, 0, 1, wxEXPAND, 5 ); diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.fbp b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.fbp index 00245629a6..9906576ca3 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.fbp +++ b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.fbp @@ -643,7 +643,7 @@ private 5 - wxEXPAND|wxTOP|wxBOTTOM + wxEXPAND|wxTOP 0 0 @@ -1184,7 +1184,7 @@ - 5 + 3 wxEXPAND|wxTOP 0 @@ -1196,7 +1196,7 @@ 5 wxEXPAND|wxALL - 1 + 0 wxID_ANY Orientation @@ -1220,7 +1220,7 @@ gbSizer1 wxFLEX_GROWMODE_SPECIFIED none - 3 + 4 5 2 @@ -1777,7 +1777,7 @@ 5 wxALL|wxEXPAND - 0 + 1 1 1 @@ -1878,7 +1878,7 @@ 5 wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT - 0 + 1 1 1 @@ -2190,8 +2190,8 @@ wxVERTICAL none - 3 - wxTOP + 5 + 0 1 @@ -2397,7 +2397,7 @@ none 5 - wxEXPAND|wxALL + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 0 diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp index 2d0e5bd5a8..6b5d75e24a 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp +++ b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp @@ -111,12 +111,9 @@ DIALOG_FOOTPRINT_FP_EDITOR::DIALOG_FOOTPRINT_FP_EDITOR( FOOTPRINT_EDIT_FRAME* aP // Set font sizes wxFont infoFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT ); - infoFont.SetSymbolicSize( wxFONTSIZE_SMALL ); m_allow90Label->SetFont( infoFont ); m_allow180Label->SetFont( infoFont ); - - infoFont.SetSymbolicSize( wxFONTSIZE_X_SMALL ); m_staticTextInfoValNeg->SetFont( infoFont ); m_staticTextInfoValPos->SetFont( infoFont ); m_staticTextInfoCopper->SetFont( infoFont ); diff --git a/pcbnew/dialogs/dialog_exchange_footprints_base.cpp b/pcbnew/dialogs/dialog_exchange_footprints_base.cpp index cafdad77bc..e86683022a 100644 --- a/pcbnew/dialogs/dialog_exchange_footprints_base.cpp +++ b/pcbnew/dialogs/dialog_exchange_footprints_base.cpp @@ -45,27 +45,24 @@ DIALOG_EXCHANGE_FOOTPRINTS_BASE::DIALOG_EXCHANGE_FOOTPRINTS_BASE( wxWindow* pare m_matchSpecifiedID = new wxRadioButton( this, wxID_ANY, _("%s footprints with identifier:"), wxDefaultPosition, wxDefaultSize, 0 ); m_upperSizer->Add( m_matchSpecifiedID, wxGBPosition( 5, 0 ), wxGBSpan( 1, 2 ), wxLEFT|wxRIGHT|wxTOP|wxEXPAND, 5 ); - wxFlexGridSizer* fgSizer1; - fgSizer1 = new wxFlexGridSizer( 0, 2, 0, 0 ); - fgSizer1->AddGrowableCol( 0 ); - fgSizer1->SetFlexibleDirection( wxBOTH ); - fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + + m_upperSizer->AddGrowableCol( 1 ); + + m_mainSizer->Add( m_upperSizer, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 ); + + wxBoxSizer* bSizer4; + bSizer4 = new wxBoxSizer( wxHORIZONTAL ); m_specifiedID = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_specifiedID->SetMinSize( wxSize( 500,22 ) ); - fgSizer1->Add( m_specifiedID, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); + bSizer4->Add( m_specifiedID, 1, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); m_specifiedIDBrowseButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); - fgSizer1->Add( m_specifiedIDBrowseButton, 0, wxALIGN_CENTER_VERTICAL, 5 ); + bSizer4->Add( m_specifiedIDBrowseButton, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); - m_upperSizer->Add( fgSizer1, wxGBPosition( 6, 0 ), wxGBSpan( 1, 2 ), wxEXPAND, 5 ); - - - m_upperSizer->AddGrowableCol( 1 ); - - m_mainSizer->Add( m_upperSizer, 0, wxEXPAND|wxALL, 10 ); + m_mainSizer->Add( bSizer4, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 10 ); m_changeSizer = new wxBoxSizer( wxVERTICAL ); @@ -78,22 +75,19 @@ DIALOG_EXCHANGE_FOOTPRINTS_BASE::DIALOG_EXCHANGE_FOOTPRINTS_BASE( wxWindow* pare newIdLabel->Wrap( -1 ); m_changeSizer->Add( newIdLabel, 0, wxLEFT|wxRIGHT|wxTOP|wxEXPAND, 5 ); - wxFlexGridSizer* fgSizer2; - fgSizer2 = new wxFlexGridSizer( 0, 2, 0, 0 ); - fgSizer2->AddGrowableCol( 0 ); - fgSizer2->SetFlexibleDirection( wxBOTH ); - fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + wxBoxSizer* bSizer3; + bSizer3 = new wxBoxSizer( wxHORIZONTAL ); m_newID = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_newID->SetMinSize( wxSize( 500,22 ) ); - fgSizer2->Add( m_newID, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); + bSizer3->Add( m_newID, 1, wxALIGN_CENTER_VERTICAL, 5 ); m_newIDBrowseButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); - fgSizer2->Add( m_newIDBrowseButton, 0, wxALIGN_CENTER_VERTICAL, 5 ); + bSizer3->Add( m_newIDBrowseButton, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); - m_changeSizer->Add( fgSizer2, 0, 0, 5 ); + m_changeSizer->Add( bSizer3, 1, wxEXPAND|wxLEFT, 5 ); m_mainSizer->Add( m_changeSizer, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 10 ); diff --git a/pcbnew/dialogs/dialog_exchange_footprints_base.fbp b/pcbnew/dialogs/dialog_exchange_footprints_base.fbp index e2983d0894..9987b817b2 100644 --- a/pcbnew/dialogs/dialog_exchange_footprints_base.fbp +++ b/pcbnew/dialogs/dialog_exchange_footprints_base.fbp @@ -95,7 +95,7 @@ protected 10 - wxEXPAND|wxALL + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 0 @@ -842,209 +842,199 @@ - + + + + 10 + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + 0 + + + bSizer4 + wxHORIZONTAL + none + 5 - 2 - 0 - wxEXPAND - 6 - 1 - - 2 - wxBOTH - 0 - - 0 + wxALIGN_CENTER_VERTICAL|wxLEFT + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + + 0 + 500,22 + 1 + m_specifiedID + 1 + + + protected + 1 + + Resizable + 1 + + + ; + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + + Dock + 0 + Left + 1 + + 1 + + + 0 + 0 + + wxID_ANY + Browse Library + + 0 + + + 0 - fgSizer1 - wxFLEX_GROWMODE_SPECIFIED - none - 0 - 0 - - 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - 500,22 - 1 - m_specifiedID - 1 - - - protected - 1 - - Resizable - 1 - - - ; - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - - 1 - 0 - 1 - - 1 - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - - wxID_ANY - Browse Library - - 0 - - - 0 - - 1 - m_specifiedIDBrowseButton - 1 - - - protected - 1 - - Resizable - - 1 - - wxBU_AUTODRAW - ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - ViewAndSelectFootprint - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + m_specifiedIDBrowseButton + 1 + + + protected + 1 + + Resizable + + 1 + + wxBU_AUTODRAW + ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + ViewAndSelectFootprint + + + + + + + + + + + + + + + + + + + + + + + @@ -1224,24 +1214,17 @@ 5 - - 0 - - 2 - wxBOTH - 0 - - 0 + wxEXPAND|wxLEFT + 1 + - fgSizer2 - wxFLEX_GROWMODE_SPECIFIED + bSizer3 + wxHORIZONTAL none - 0 - 0 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT - 0 + wxALIGN_CENTER_VERTICAL + 1 1 1 @@ -1331,7 +1314,7 @@ 5 - wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 1 diff --git a/pcbnew/dialogs/dialog_exchange_footprints_base.h b/pcbnew/dialogs/dialog_exchange_footprints_base.h index a058fbaccb..3902463df4 100644 --- a/pcbnew/dialogs/dialog_exchange_footprints_base.h +++ b/pcbnew/dialogs/dialog_exchange_footprints_base.h @@ -21,13 +21,13 @@ class WX_HTML_REPORT_PANEL; #include #include #include +#include #include #include #include #include #include #include -#include #include #include #include diff --git a/pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp b/pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp index 172e35be23..4df2ca4f45 100644 --- a/pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp +++ b/pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp @@ -114,6 +114,10 @@ DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS::DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS( PCB_ m_LayerCtrl->Resync(); m_grid->SetCellHighlightPenWidth( 0 ); + wxFont infoFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT ); + infoFont.SetSymbolicSize( wxFONTSIZE_SMALL ); + m_grid->SetDefaultCellFont( infoFont ); + m_sdbSizerButtonsOK->SetDefault(); FinishDialogSettings(); diff --git a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp index 78b38130df..4321893bbe 100644 --- a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp +++ b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp @@ -106,6 +106,9 @@ DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS::DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS( PCB_EDIT m_layerBox->SetNotAllowedLayerSet( LSET::AllNonCuMask() ); m_layerBox->Resync(); + wxFont infoFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT ); + infoFont.SetSymbolicSize( wxFONTSIZE_SMALL ); + m_netclassGrid->SetDefaultCellFont( infoFont ); buildNetclassesGrid(); m_netclassGrid->SetCellHighlightPenWidth( 0 ); @@ -172,7 +175,7 @@ void DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS::buildNetclassesGrid() #define SET_NETCLASS_VALUE( aRow, aGrid, aCol, aValue ) \ aGrid->SetCellValue( aRow, aCol, StringFromValue( GetUserUnits(), aValue, true, true ) ) - m_netclassGrid->SetCellValue( 0, GRID_NAME, _( "Netclass" ) ); + m_netclassGrid->SetCellValue( 0, GRID_NAME, wxEmptyString ); m_netclassGrid->SetCellValue( 0, GRID_TRACKSIZE, _( "Track width" ) ); m_netclassGrid->SetCellValue( 0, GRID_VIASIZE, _( "Via size" ) ); m_netclassGrid->SetCellValue( 0, GRID_VIADRILL, _( "Via drill" ) ); diff --git a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp index 1eed55d7c9..529c199031 100644 --- a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp +++ b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp @@ -110,7 +110,7 @@ DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE bSizerTrackViaPopups->Add( m_viaSizesSelectBox, 5, wxEXPAND|wxRIGHT|wxLEFT, 5 ); m_layerBox = new PCB_LAYER_BOX_SELECTOR( sbAction->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); - bSizerTrackViaPopups->Add( m_layerBox, 0, wxRIGHT, 5 ); + bSizerTrackViaPopups->Add( m_layerBox, 0, wxRIGHT|wxLEFT, 3 ); sbAction->Add( bSizerTrackViaPopups, 0, wxEXPAND|wxBOTTOM|wxLEFT, 15 ); diff --git a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.fbp b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.fbp index 0b3e62a1ff..1daa7b0622 100644 --- a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.fbp +++ b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.fbp @@ -1183,8 +1183,8 @@ - 5 - wxRIGHT + 3 + wxRIGHT|wxLEFT 0 1 diff --git a/pcbnew/dialogs/dialog_pad_properties.cpp b/pcbnew/dialogs/dialog_pad_properties.cpp index 5541b727be..c5489aa77f 100644 --- a/pcbnew/dialogs/dialog_pad_properties.cpp +++ b/pcbnew/dialogs/dialog_pad_properties.cpp @@ -153,6 +153,9 @@ DIALOG_PAD_PROPERTIES::DIALOG_PAD_PROPERTIES( PCB_BASE_FRAME* aParent, D_PAD* aP wxFont infoFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT ); infoFont.SetSymbolicSize( wxFONTSIZE_SMALL ); + m_techLayersLabel->SetFont( infoFont ); + m_parentInfoLine1->SetFont( infoFont ); + m_parentInfoLine2->SetFont( infoFont ); m_staticTextInfoNegVal->SetFont( infoFont ); m_staticTextInfoPosValue->SetFont( infoFont ); m_nonCopperNote->SetFont( infoFont ); diff --git a/pcbnew/dialogs/dialog_pad_properties_base.cpp b/pcbnew/dialogs/dialog_pad_properties_base.cpp index c0d798519b..2a71bb1f5b 100644 --- a/pcbnew/dialogs/dialog_pad_properties_base.cpp +++ b/pcbnew/dialogs/dialog_pad_properties_base.cpp @@ -318,12 +318,11 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_LayersSizer->Add( bSizer11, 0, wxEXPAND, 5 ); - wxStaticText* m_staticText85; - m_staticText85 = new wxStaticText( m_LayersSizer->GetStaticBox(), wxID_ANY, _("Technical layers:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText85->Wrap( -1 ); - m_staticText85->SetFont( wxFont( 11, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); + m_techLayersLabel = new wxStaticText( m_LayersSizer->GetStaticBox(), wxID_ANY, _("Technical layers:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_techLayersLabel->Wrap( -1 ); + m_techLayersLabel->SetFont( wxFont( 11, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); - m_LayersSizer->Add( m_staticText85, 0, wxALL, 5 ); + m_LayersSizer->Add( m_techLayersLabel, 0, wxALL, 5 ); m_PadLayerAdhCmp = new wxCheckBox( m_LayersSizer->GetStaticBox(), wxID_ANY, _("Front adhesive"), wxDefaultPosition, wxDefaultSize, 0 ); m_LayersSizer->Add( m_PadLayerAdhCmp, 0, wxLEFT|wxRIGHT, 4 ); @@ -673,7 +672,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_parentInfoLine2->Wrap( -1 ); m_parentInfoLine2->SetFont( wxFont( 11, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); - bSizerDisplayPad->Add( m_parentInfoLine2, 0, wxTOP|wxBOTTOM|wxRIGHT, 3 ); + bSizerDisplayPad->Add( m_parentInfoLine2, 0, wxRIGHT, 3 ); bSizerDisplayPad->Add( 0, 0, 1, wxEXPAND, 5 ); diff --git a/pcbnew/dialogs/dialog_pad_properties_base.fbp b/pcbnew/dialogs/dialog_pad_properties_base.fbp index 204316d3c6..b1f63b401c 100644 --- a/pcbnew/dialogs/dialog_pad_properties_base.fbp +++ b/pcbnew/dialogs/dialog_pad_properties_base.fbp @@ -5235,11 +5235,11 @@ 0 1 - m_staticText85 + m_techLayersLabel 1 - none + protected 1 Resizable @@ -10286,7 +10286,7 @@ 3 - wxTOP|wxBOTTOM|wxRIGHT + wxRIGHT 0 1 diff --git a/pcbnew/dialogs/dialog_pad_properties_base.h b/pcbnew/dialogs/dialog_pad_properties_base.h index 164780cc66..49343c1f56 100644 --- a/pcbnew/dialogs/dialog_pad_properties_base.h +++ b/pcbnew/dialogs/dialog_pad_properties_base.h @@ -119,6 +119,7 @@ class DIALOG_PAD_PROPERTIES_BASE : public DIALOG_SHIM wxStaticText* m_staticText86; wxStaticText* m_staticText511; wxChoice* m_rbCopperLayersSel; + wxStaticText* m_techLayersLabel; wxCheckBox* m_PadLayerAdhCmp; wxCheckBox* m_PadLayerAdhCu; wxCheckBox* m_PadLayerPateCmp; diff --git a/pcbnew/dialogs/dialog_text_properties.cpp b/pcbnew/dialogs/dialog_text_properties.cpp index 57e425457c..b6180533d5 100644 --- a/pcbnew/dialogs/dialog_text_properties.cpp +++ b/pcbnew/dialogs/dialog_text_properties.cpp @@ -125,9 +125,8 @@ DIALOG_TEXT_PROPERTIES::DIALOG_TEXT_PROPERTIES( PCB_BASE_EDIT_FRAME* aParent, BO // Set font sizes wxFont infoFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT ); - infoFont.SetSymbolicSize( wxFONTSIZE_X_SMALL ); - m_statusLine1->SetFont( infoFont ); - m_statusLine2->SetFont( infoFont ); + infoFont.SetSymbolicSize( wxFONTSIZE_SMALL ); + m_statusLine->SetFont( infoFont ); m_sdbSizerOK->SetDefault(); @@ -192,7 +191,7 @@ void DIALOG_TEXT_PROPERTIES::OnCharHook( wxKeyEvent& aEvent ) bool DIALOG_TEXT_PROPERTIES::TransferDataToWindow() { - wxString msg1, msg2; + wxString msg; if( m_SingleLineText->IsShown() ) { @@ -211,14 +210,15 @@ bool DIALOG_TEXT_PROPERTIES::TransferDataToWindow() if( module ) { - wxString side = module->IsFlipped() ? _( "back side (mirrored)" ) : _( "front side" ); - msg1.Printf( _("Footprint %s (%s),"), module->GetReference(), module->GetValue() ); - msg2.Printf( _("%s, rotated %.1f deg"), side, module->GetOrientation() / 10.0 ); + msg.Printf( _("Footprint %s (%s), %s, rotated %.1f deg"), + module->GetReference(), + module->GetValue(), + module->IsFlipped() ? _( "back side (mirrored)" ) : _( "front side" ), + module->GetOrientation() / 10.0 ); } } - m_statusLine1->SetLabel( msg1 ); - m_statusLine2->SetLabel( msg2 ); + m_statusLine->SetLabel( msg ); m_LayerSelectionCtrl->SetLayerSelection( m_item->GetLayer() ); diff --git a/pcbnew/dialogs/dialog_text_properties_base.cpp b/pcbnew/dialogs/dialog_text_properties_base.cpp index 7cfc218205..363789eae5 100644 --- a/pcbnew/dialogs/dialog_text_properties_base.cpp +++ b/pcbnew/dialogs/dialog_text_properties_base.cpp @@ -161,35 +161,29 @@ DIALOG_TEXT_PROPERTIES_BASE::DIALOG_TEXT_PROPERTIES_BASE( wxWindow* parent, wxWi fgSizerSetup->Add( m_KeepUpright, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); - bMainSizer->Add( fgSizerSetup, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 10 ); + bMainSizer->Add( fgSizerSetup, 0, wxEXPAND|wxRIGHT|wxLEFT, 10 ); bMainSizer->Add( 0, 0, 1, wxEXPAND|wxTOP, 5 ); + wxBoxSizer* bMargins; + bMargins = new wxBoxSizer( wxVERTICAL ); + + m_statusLine = new wxStaticText( this, wxID_ANY, _("Parent footprint description"), wxDefaultPosition, wxDefaultSize, 0 ); + m_statusLine->Wrap( -1 ); + m_statusLine->SetFont( wxFont( 11, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); + + bMargins->Add( m_statusLine, 0, wxBOTTOM|wxRIGHT|wxLEFT, 3 ); + + + bMainSizer->Add( bMargins, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 12 ); + m_staticline = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); bMainSizer->Add( m_staticline, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 ); wxBoxSizer* lowerSizer; lowerSizer = new wxBoxSizer( wxHORIZONTAL ); - wxBoxSizer* bSizer7; - bSizer7 = new wxBoxSizer( wxVERTICAL ); - - m_statusLine1 = new wxStaticText( this, wxID_ANY, _("Status line 1"), wxDefaultPosition, wxDefaultSize, 0 ); - m_statusLine1->Wrap( -1 ); - m_statusLine1->SetFont( wxFont( 11, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); - - bSizer7->Add( m_statusLine1, 0, wxRIGHT|wxLEFT, 2 ); - - m_statusLine2 = new wxStaticText( this, wxID_ANY, _("Status line 2"), wxDefaultPosition, wxDefaultSize, 0 ); - m_statusLine2->Wrap( -1 ); - m_statusLine2->SetFont( wxFont( 11, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); - - bSizer7->Add( m_statusLine2, 0, wxRIGHT|wxLEFT, 2 ); - - - lowerSizer->Add( bSizer7, 0, wxEXPAND|wxTOP|wxLEFT, 8 ); - m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); m_sdbSizer->AddButton( m_sdbSizerOK ); diff --git a/pcbnew/dialogs/dialog_text_properties_base.fbp b/pcbnew/dialogs/dialog_text_properties_base.fbp index fe6c5b2839..a58cf552c4 100644 --- a/pcbnew/dialogs/dialog_text_properties_base.fbp +++ b/pcbnew/dialogs/dialog_text_properties_base.fbp @@ -465,7 +465,7 @@ 10 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + wxEXPAND|wxRIGHT|wxLEFT 0 5 @@ -562,11 +562,11 @@ - + 5 wxALIGN_CENTER_VERTICAL|wxEXPAND 0 - + 1 1 1 @@ -653,21 +653,21 @@ - + 40 wxEXPAND|wxRIGHT|wxLEFT 1 - + 0 protected 0 - + 5 wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT 0 - + 1 1 1 @@ -751,11 +751,11 @@ - + 5 wxEXPAND 1 - + 0 protected 0 @@ -935,11 +935,11 @@ - + 5 wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -1018,11 +1018,11 @@ - + 5 wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT 0 - + 1 1 1 @@ -1106,11 +1106,11 @@ - + 5 wxEXPAND 1 - + 0 protected 0 @@ -1290,11 +1290,11 @@ - + 5 wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -1718,11 +1718,11 @@ - + 5 wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -1884,11 +1884,11 @@ - + 5 wxEXPAND 0 - + 1 1 1 @@ -2151,11 +2151,11 @@ - + 5 wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -2234,11 +2234,11 @@ - + 5 wxALIGN_CENTER_VERTICAL|wxLEFT 0 - + 1 1 1 @@ -2322,11 +2322,11 @@ - + 5 wxEXPAND 1 - + 0 protected 0 @@ -2506,11 +2506,11 @@ - + 5 wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -2589,11 +2589,11 @@ - + 5 wxALIGN_CENTER_VERTICAL|wxLEFT 0 - + 1 1 1 @@ -2689,6 +2689,100 @@ 0 + + 12 + wxEXPAND|wxTOP|wxRIGHT|wxLEFT + 0 + + + bMargins + wxVERTICAL + none + + 3 + wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + ,90,90,11,70,0 + 0 + 0 + wxID_ANY + Parent footprint description + + 0 + + + 0 + + 1 + m_statusLine + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 10 wxEXPAND|wxTOP|wxRIGHT|wxLEFT @@ -2779,183 +2873,6 @@ lowerSizer wxHORIZONTAL none - - 8 - wxEXPAND|wxTOP|wxLEFT - 0 - - - bSizer7 - wxVERTICAL - none - - 2 - wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - ,90,90,11,70,0 - 0 - 0 - wxID_ANY - Status line 1 - - 0 - - - 0 - - 1 - m_statusLine1 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 2 - wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - ,90,90,11,70,0 - 0 - 0 - wxID_ANY - Status line 2 - - 0 - - - 0 - - 1 - m_statusLine2 - 1 - - - protected - 1 - - Resizable - 1 - - - ; forward_declare - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 wxEXPAND|wxALL diff --git a/pcbnew/dialogs/dialog_text_properties_base.h b/pcbnew/dialogs/dialog_text_properties_base.h index 5f7833494d..ca1d0dc0e3 100644 --- a/pcbnew/dialogs/dialog_text_properties_base.h +++ b/pcbnew/dialogs/dialog_text_properties_base.h @@ -71,9 +71,8 @@ class DIALOG_TEXT_PROPERTIES_BASE : public DIALOG_SHIM wxTextCtrl* m_PositionYCtrl; wxStaticText* m_PositionYUnits; wxCheckBox* m_KeepUpright; + wxStaticText* m_statusLine; wxStaticLine* m_staticline; - wxStaticText* m_statusLine1; - wxStaticText* m_statusLine2; wxStdDialogButtonSizer* m_sdbSizer; wxButton* m_sdbSizerOK; wxButton* m_sdbSizerCancel;