From 9e4125c451ac99e5689bff076c6232abf0782ade Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Tue, 5 May 2020 20:25:38 +0100 Subject: [PATCH] Add note on spacing to Global Label Properties dialog. Also cleans up some of the other notes to have a uniform presentation. Fixes https://gitlab.com/kicad/code/kicad/issues/4323 --- ...ialog_edit_component_in_schematic_base.cpp | 11 +- ...ialog_edit_component_in_schematic_base.fbp | 14 +- eeschema/dialogs/dialog_edit_label.cpp | 13 ++ eeschema/dialogs/dialog_edit_label_base.cpp | 38 +++- eeschema/dialogs/dialog_edit_label_base.fbp | 202 ++++++++++++++++-- eeschema/dialogs/dialog_edit_label_base.h | 2 + .../dialogs/dialog_sch_sheet_props_base.cpp | 25 ++- .../dialogs/dialog_sch_sheet_props_base.fbp | 24 +-- .../dialogs/dialog_sch_sheet_props_base.h | 2 +- ...og_edit_footprint_for_BoardEditor_base.cpp | 13 +- ...og_edit_footprint_for_BoardEditor_base.fbp | 30 ++- ...alog_edit_footprint_for_BoardEditor_base.h | 2 +- pcbnew/dialogs/dialog_text_properties.cpp | 2 +- 13 files changed, 292 insertions(+), 86 deletions(-) diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp b/eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp index ffec883bad..38b9671424 100644 --- a/eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp +++ b/eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp @@ -203,18 +203,19 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_BASE::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_BASE m_timeStampLabel = new wxStaticText( this, wxID_ANY, _("Unique ID:"), wxDefaultPosition, wxDefaultSize, 0 ); m_timeStampLabel->Wrap( -1 ); - bSizerUUID->Add( m_timeStampLabel, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + bSizerUUID->Add( m_timeStampLabel, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); - m_textCtrlTimeStamp = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); + m_textCtrlTimeStamp = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY|wxBORDER_NONE ); + m_textCtrlTimeStamp->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) ); m_textCtrlTimeStamp->SetToolTip( _("Unique ID that identifies the symbol") ); - bSizerUUID->Add( m_textCtrlTimeStamp, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 ); + bSizerUUID->Add( m_textCtrlTimeStamp, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); - bSizerBottom->Add( bSizerUUID, 1, wxEXPAND, 10 ); + bSizerBottom->Add( bSizerUUID, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - bSizerBottom->Add( 10, 0, 0, wxEXPAND, 5 ); + bSizerBottom->Add( 20, 0, 0, wxEXPAND, 5 ); m_spiceFieldsButton = new wxButton( this, wxID_ANY, _("Edit Spice Model..."), wxDefaultPosition, wxDefaultSize, 0 ); bSizerBottom->Add( m_spiceFieldsButton, 0, wxEXPAND|wxALL, 5 ); diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic_base.fbp b/eeschema/dialogs/dialog_edit_component_in_schematic_base.fbp index 978693e6cd..5a1bb692a1 100644 --- a/eeschema/dialogs/dialog_edit_component_in_schematic_base.fbp +++ b/eeschema/dialogs/dialog_edit_component_in_schematic_base.fbp @@ -1210,8 +1210,8 @@ wxHORIZONTAL none - 10 - wxEXPAND + 5 + wxEXPAND|wxRIGHT|wxLEFT 1 @@ -1220,7 +1220,7 @@ none 5 - wxALIGN_CENTER_VERTICAL|wxLEFT + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 1 @@ -1281,7 +1281,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM + wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT 1 1 @@ -1293,7 +1293,7 @@ - + wxSYS_COLOUR_BTNFACE 1 0 @@ -1340,7 +1340,7 @@ - + wxBORDER_NONE @@ -1352,7 +1352,7 @@ 0 protected - 10 + 20 diff --git a/eeschema/dialogs/dialog_edit_label.cpp b/eeschema/dialogs/dialog_edit_label.cpp index 20cfa522a2..49373adddf 100644 --- a/eeschema/dialogs/dialog_edit_label.cpp +++ b/eeschema/dialogs/dialog_edit_label.cpp @@ -166,6 +166,19 @@ DIALOG_LABEL_EDITOR::DIALOG_LABEL_EDITOR( SCH_EDIT_FRAME* aParent, SCH_TEXT* aTe m_TextShape->Show( m_CurrentText->Type() == SCH_GLOBAL_LABEL_T || m_CurrentText->Type() == SCH_HIER_LABEL_T ); + if( m_CurrentText->Type() == SCH_GLOBAL_LABEL_T ) + { + wxFont infoFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT ); + infoFont.SetSymbolicSize( wxFONTSIZE_X_SMALL ); + m_textOffsetNote1->SetFont( infoFont ); + m_textOffsetNote2->SetFont( infoFont ); + } + else + { + m_textOffsetNote1->Show( false ); + m_textOffsetNote2->Show( false ); + } + m_sdbSizer1OK->SetDefault(); Layout(); diff --git a/eeschema/dialogs/dialog_edit_label_base.cpp b/eeschema/dialogs/dialog_edit_label_base.cpp index b33bb51379..11a9ff1302 100644 --- a/eeschema/dialogs/dialog_edit_label_base.cpp +++ b/eeschema/dialogs/dialog_edit_label_base.cpp @@ -36,7 +36,7 @@ DIALOG_LABEL_EDITOR_BASE::DIALOG_LABEL_EDITOR_BASE( wxWindow* parent, wxWindowID m_labelMultiLine = new wxStaticText( this, wxID_ANY, _("Text:"), wxDefaultPosition, wxDefaultSize, 0 ); m_labelMultiLine->Wrap( -1 ); - m_textEntrySizer->Add( m_labelMultiLine, 0, wxRIGHT, 5 ); + m_textEntrySizer->Add( m_labelMultiLine, 0, wxTOP|wxRIGHT, 6 ); m_valueMultiLine = new wxStyledTextCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_SUNKEN, wxEmptyString ); m_valueMultiLine->SetUseTabs( true ); @@ -86,14 +86,34 @@ DIALOG_LABEL_EDITOR_BASE::DIALOG_LABEL_EDITOR_BASE( wxWindow* parent, wxWindowID bSizeCtrlSizer = new wxBoxSizer( wxHORIZONTAL ); m_textSizeCtrl = new wxTextCtrl( this, wxID_SIZE, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bSizeCtrlSizer->Add( m_textSizeCtrl, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); + bSizeCtrlSizer->Add( m_textSizeCtrl, 0, wxLEFT|wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 ); - m_textSizeUnits = new wxStaticText( this, wxID_ANY, _("units"), wxDefaultPosition, wxDefaultSize, 0 ); + m_textSizeUnits = new wxStaticText( this, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); m_textSizeUnits->Wrap( -1 ); - bSizeCtrlSizer->Add( m_textSizeUnits, 0, wxALIGN_CENTER_VERTICAL, 2 ); + bSizeCtrlSizer->Add( m_textSizeUnits, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 20 ); - m_textEntrySizer->Add( bSizeCtrlSizer, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 3 ); + bSizeCtrlSizer->Add( 0, 0, 1, wxEXPAND, 15 ); + + wxBoxSizer* bSizer5; + bSizer5 = new wxBoxSizer( wxVERTICAL ); + + m_textOffsetNote1 = new wxStaticText( this, wxID_ANY, _("Note: margins between text and shape are controlled by the"), wxDefaultPosition, wxDefaultSize, 0 ); + m_textOffsetNote1->Wrap( -1 ); + bSizer5->Add( m_textOffsetNote1, 0, 0, 5 ); + + m_textOffsetNote2 = new wxStaticText( this, wxID_ANY, _("text offset ratio in Preferences > General > Formatting."), wxDefaultPosition, wxDefaultSize, 0 ); + m_textOffsetNote2->Wrap( -1 ); + bSizer5->Add( m_textOffsetNote2, 0, 0, 5 ); + + + bSizeCtrlSizer->Add( bSizer5, 0, wxEXPAND|wxLEFT, 10 ); + + + bSizeCtrlSizer->Add( 0, 0, 1, wxEXPAND, 5 ); + + + m_textEntrySizer->Add( bSizeCtrlSizer, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP, 3 ); bMainSizer->Add( m_textEntrySizer, 1, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 12 ); @@ -122,6 +142,9 @@ DIALOG_LABEL_EDITOR_BASE::DIALOG_LABEL_EDITOR_BASE( wxWindow* parent, wxWindowID bMainSizer->Add( m_OptionsSizer, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 10 ); + wxBoxSizer* bSizer4; + bSizer4 = new wxBoxSizer( wxHORIZONTAL ); + m_sdbSizer1 = new wxStdDialogButtonSizer(); m_sdbSizer1OK = new wxButton( this, wxID_OK ); m_sdbSizer1->AddButton( m_sdbSizer1OK ); @@ -129,7 +152,10 @@ DIALOG_LABEL_EDITOR_BASE::DIALOG_LABEL_EDITOR_BASE( wxWindow* parent, wxWindowID m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->Realize(); - bMainSizer->Add( m_sdbSizer1, 0, wxALL|wxEXPAND, 5 ); + bSizer4->Add( m_sdbSizer1, 1, wxALL|wxEXPAND, 5 ); + + + bMainSizer->Add( bSizer4, 0, wxEXPAND|wxALL, 5 ); this->SetSizer( bMainSizer ); diff --git a/eeschema/dialogs/dialog_edit_label_base.fbp b/eeschema/dialogs/dialog_edit_label_base.fbp index 5d16216cc6..413bec3fc4 100644 --- a/eeschema/dialogs/dialog_edit_label_base.fbp +++ b/eeschema/dialogs/dialog_edit_label_base.fbp @@ -201,8 +201,8 @@ - 5 - wxRIGHT + 6 + wxTOP|wxRIGHT 0 1 @@ -517,7 +517,7 @@ 3 - wxEXPAND|wxALIGN_CENTER_VERTICAL + wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP 1 @@ -526,7 +526,7 @@ none 5 - wxEXPAND|wxLEFT|wxRIGHT + wxLEFT|wxRIGHT|wxALIGN_CENTER_VERTICAL 0 1 @@ -589,8 +589,8 @@ - 2 - wxALIGN_CENTER_VERTICAL + 20 + wxALIGN_CENTER_VERTICAL|wxRIGHT 0 1 @@ -620,7 +620,7 @@ 0 0 wxID_ANY - units + mm 0 0 @@ -649,6 +649,159 @@ -1 + + 15 + wxEXPAND + 1 + + 0 + protected + 0 + + + + 10 + wxEXPAND|wxLEFT + 0 + + + bSizer5 + wxVERTICAL + none + + 5 + + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Note: margins between text and shape are controlled by the + 0 + + 0 + + + 0 + + 1 + m_textOffsetNote1 + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + text offset ratio in Preferences > General > Formatting. + 0 + + 0 + + + 0 + + 1 + m_textOffsetNote2 + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + + + 5 + wxEXPAND + 1 + + 0 + protected + 0 + + @@ -864,20 +1017,31 @@ 5 - wxALL|wxEXPAND + wxEXPAND|wxALL 0 - - 0 - 1 - 0 - 0 - 0 - 1 - 0 - 0 + - m_sdbSizer1 - protected + bSizer4 + wxHORIZONTAL + none + + 5 + wxALL|wxEXPAND + 1 + + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + + m_sdbSizer1 + protected + + diff --git a/eeschema/dialogs/dialog_edit_label_base.h b/eeschema/dialogs/dialog_edit_label_base.h index 09871ec3db..2784448f90 100644 --- a/eeschema/dialogs/dialog_edit_label_base.h +++ b/eeschema/dialogs/dialog_edit_label_base.h @@ -51,6 +51,8 @@ class DIALOG_LABEL_EDITOR_BASE : public DIALOG_SHIM wxStaticText* m_textSizeLabel; wxTextCtrl* m_textSizeCtrl; wxStaticText* m_textSizeUnits; + wxStaticText* m_textOffsetNote1; + wxStaticText* m_textOffsetNote2; wxRadioBox* m_TextOrient; wxRadioBox* m_TextStyle; wxRadioBox* m_TextShape; diff --git a/eeschema/dialogs/dialog_sch_sheet_props_base.cpp b/eeschema/dialogs/dialog_sch_sheet_props_base.cpp index 6d938f71e1..9b7704e8ff 100644 --- a/eeschema/dialogs/dialog_sch_sheet_props_base.cpp +++ b/eeschema/dialogs/dialog_sch_sheet_props_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 6 2019) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -167,35 +167,38 @@ DIALOG_SCH_SHEET_PROPS_BASE::DIALOG_SCH_SHEET_PROPS_BASE( wxWindow* parent, wxWi bSizerBottom = new wxBoxSizer( wxHORIZONTAL ); wxFlexGridSizer* fgSizer1; - fgSizer1 = new wxFlexGridSizer( 0, 2, 0, 0 ); + fgSizer1 = new wxFlexGridSizer( 0, 2, 4, 0 ); fgSizer1->AddGrowableCol( 1 ); fgSizer1->SetFlexibleDirection( wxHORIZONTAL ); fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); m_hiearchicalPathLabel = new wxStaticText( this, wxID_ANY, _("Hierarchical path:"), wxDefaultPosition, wxDefaultSize, 0 ); m_hiearchicalPathLabel->Wrap( -1 ); - fgSizer1->Add( m_hiearchicalPathLabel, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT, 5 ); + fgSizer1->Add( m_hiearchicalPathLabel, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); - m_heirarchyPath = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); - fgSizer1->Add( m_heirarchyPath, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + m_heirarchyPath = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY|wxBORDER_NONE ); + m_heirarchyPath->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) ); + + fgSizer1->Add( m_heirarchyPath, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 ); m_timestampLabel = new wxStaticText( this, wxID_ANY, _("Unique identifier:"), wxDefaultPosition, wxDefaultSize, 0 ); m_timestampLabel->Wrap( -1 ); - fgSizer1->Add( m_timestampLabel, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT, 5 ); + fgSizer1->Add( m_timestampLabel, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); - m_textCtrlTimeStamp = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); + m_textCtrlTimeStamp = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY|wxBORDER_NONE ); + m_textCtrlTimeStamp->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) ); m_textCtrlTimeStamp->SetToolTip( _("Unique ID that identifies the symbol") ); - fgSizer1->Add( m_textCtrlTimeStamp, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); + fgSizer1->Add( m_textCtrlTimeStamp, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 ); - bSizerBottom->Add( fgSizer1, 1, wxEXPAND, 5 ); + bSizerBottom->Add( fgSizer1, 1, wxEXPAND|wxLEFT, 5 ); - mainSizer->Add( bSizerBottom, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); + mainSizer->Add( bSizerBottom, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - mainSizer->Add( m_staticline1, 0, wxEXPAND, 5 ); + mainSizer->Add( m_staticline1, 0, wxEXPAND|wxTOP, 5 ); m_stdDialogButtonSizer = new wxStdDialogButtonSizer(); m_stdDialogButtonSizerOK = new wxButton( this, wxID_OK ); diff --git a/eeschema/dialogs/dialog_sch_sheet_props_base.fbp b/eeschema/dialogs/dialog_sch_sheet_props_base.fbp index 46bbe0326c..6798981354 100644 --- a/eeschema/dialogs/dialog_sch_sheet_props_base.fbp +++ b/eeschema/dialogs/dialog_sch_sheet_props_base.fbp @@ -976,7 +976,7 @@ 5 - wxEXPAND|wxLEFT|wxRIGHT + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 0 @@ -985,7 +985,7 @@ none 5 - wxEXPAND + wxEXPAND|wxLEFT 1 2 @@ -998,10 +998,10 @@ wxFLEX_GROWMODE_SPECIFIED none 0 - 0 + 4 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT + wxALIGN_CENTER_VERTICAL|wxLEFT 0 1 @@ -1062,7 +1062,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT 0 1 @@ -1074,7 +1074,7 @@ - + wxSYS_COLOUR_BTNFACE 1 0 @@ -1121,12 +1121,12 @@ - + wxBORDER_NONE 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT + wxALIGN_CENTER_VERTICAL|wxLEFT 0 1 @@ -1187,7 +1187,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT 0 1 @@ -1199,7 +1199,7 @@ - + wxSYS_COLOUR_BTNFACE 1 0 @@ -1246,7 +1246,7 @@ - + wxBORDER_NONE @@ -1255,7 +1255,7 @@ 5 - wxEXPAND + wxEXPAND|wxTOP 0 1 diff --git a/eeschema/dialogs/dialog_sch_sheet_props_base.h b/eeschema/dialogs/dialog_sch_sheet_props_base.h index 534dff23c7..39e995e434 100644 --- a/eeschema/dialogs/dialog_sch_sheet_props_base.h +++ b/eeschema/dialogs/dialog_sch_sheet_props_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 6 2019) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp index 5331aa3d00..afe15f3863 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 Jul 10 2019) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -71,7 +71,6 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow m_itemsGrid->SetRowLabelAlignment( wxALIGN_LEFT, wxALIGN_CENTER ); // Label Appearance - m_itemsGrid->SetLabelFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); // Cell Defaults m_itemsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP ); @@ -499,7 +498,7 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow bSizerButtons = new wxBoxSizer( wxHORIZONTAL ); wxFlexGridSizer* fgSizerSymbolRef; - fgSizerSymbolRef = new wxFlexGridSizer( 0, 2, 5, 0 ); + fgSizerSymbolRef = new wxFlexGridSizer( 0, 2, 4, 0 ); fgSizerSymbolRef->AddGrowableCol( 1 ); fgSizerSymbolRef->SetFlexibleDirection( wxBOTH ); fgSizerSymbolRef->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); @@ -510,7 +509,7 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow fgSizerSymbolRef->Add( m_libraryIDLabel, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 3 ); - m_tcLibraryID = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); + m_tcLibraryID = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY|wxBORDER_NONE ); m_tcLibraryID->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) ); m_tcLibraryID->SetToolTip( _("The library ID and footprint ID currently assigned. Use “Change Footprint…” to assign a different footprint.") ); @@ -520,17 +519,17 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow m_stFullUuid->Wrap( -1 ); fgSizerSymbolRef->Add( m_stFullUuid, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - m_tcFullUuid = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); + m_tcFullUuid = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY|wxBORDER_NONE ); m_tcFullUuid->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) ); m_tcFullUuid->SetToolTip( _("The link to the associated schematic symbol, comprising the Unique IDs of the parent sheet(s) and the symbol.") ); fgSizerSymbolRef->Add( m_tcFullUuid, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT, 5 ); - bSizerButtons->Add( fgSizerSymbolRef, 1, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT|wxTOP, 5 ); + bSizerButtons->Add( fgSizerSymbolRef, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 ); - m_GeneralBoxSizer->Add( bSizerButtons, 0, wxEXPAND|wxLEFT, 5 ); + m_GeneralBoxSizer->Add( bSizerButtons, 0, wxEXPAND|wxRIGHT|wxLEFT, 10 ); m_sdbSizerStdButtons = new wxStdDialogButtonSizer(); m_sdbSizerStdButtonsOK = new wxButton( this, wxID_OK ); diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.fbp b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.fbp index 6d3207e8c8..64572bbf29 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.fbp +++ b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.fbp @@ -14,7 +14,6 @@ dialog_edit_footprint_for_BoardEditor_base 1000 none - 1 dialog_edit_footprint_for_BoardEditor_base @@ -26,10 +25,9 @@ 1 1 UI - 0 0 0 - + 0 wxAUI_MGR_DEFAULT @@ -57,16 +55,16 @@ OnInitDlg OnUpdateUI - + m_GeneralBoxSizer wxVERTICAL private - + 5 wxEXPAND|wxRIGHT|wxLEFT 1 - + 1 1 1 @@ -120,11 +118,11 @@ OnPageChange - + General 1 - + 1 1 1 @@ -175,7 +173,7 @@ wxTAB_TRAVERSAL - + m_PanelPropertiesBoxSizer wxVERTICAL @@ -245,7 +243,7 @@ 0 wxID_ANY - ,90,92,-1,70,0 + 0 0 @@ -4025,8 +4023,8 @@ - 5 - wxEXPAND|wxLEFT + 10 + wxEXPAND|wxRIGHT|wxLEFT 0 @@ -4035,7 +4033,7 @@ none 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT|wxTOP + wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT 1 2 @@ -4048,7 +4046,7 @@ wxFLEX_GROWMODE_SPECIFIED none 0 - 5 + 4 3 wxALIGN_CENTER_VERTICAL|wxRIGHT @@ -4171,7 +4169,7 @@ - + wxBORDER_NONE @@ -4296,7 +4294,7 @@ - + wxBORDER_NONE diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.h b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.h index ed1c36be03..42c2a3359d 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 Jul 10 2019) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/pcbnew/dialogs/dialog_text_properties.cpp b/pcbnew/dialogs/dialog_text_properties.cpp index 72d4aeb832..564acc5a8f 100644 --- a/pcbnew/dialogs/dialog_text_properties.cpp +++ b/pcbnew/dialogs/dialog_text_properties.cpp @@ -159,7 +159,7 @@ 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_SMALL ); + infoFont.SetSymbolicSize( wxFONTSIZE_X_SMALL ); m_statusLine->SetFont( infoFont ); m_sdbSizerOK->SetDefault();