diff --git a/eeschema/dialogs/dialog_edit_label.cpp b/eeschema/dialogs/dialog_edit_label.cpp index 49373adddf..dedc28a1dc 100644 --- a/eeschema/dialogs/dialog_edit_label.cpp +++ b/eeschema/dialogs/dialog_edit_label.cpp @@ -170,14 +170,10 @@ DIALOG_LABEL_EDITOR::DIALOG_LABEL_EDITOR( SCH_EDIT_FRAME* aParent, SCH_TEXT* aTe { wxFont infoFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT ); infoFont.SetSymbolicSize( wxFONTSIZE_X_SMALL ); - m_textOffsetNote1->SetFont( infoFont ); - m_textOffsetNote2->SetFont( infoFont ); + m_textOffsetNote->SetFont( infoFont ); } else - { - m_textOffsetNote1->Show( false ); - m_textOffsetNote2->Show( false ); - } + m_textOffsetNote->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 a9677a9d59..4e151ea802 100644 --- a/eeschema/dialogs/dialog_edit_label_base.cpp +++ b/eeschema/dialogs/dialog_edit_label_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version Jul 10 2019) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -98,13 +98,9 @@ DIALOG_LABEL_EDITOR_BASE::DIALOG_LABEL_EDITOR_BASE( wxWindow* parent, wxWindowID wxBoxSizer* bSizer5; bSizer5 = new wxBoxSizer( wxVERTICAL ); - m_textOffsetNote1 = new wxStaticText( this, wxID_ANY, _("Note: the margins around the text are controlled by the text"), wxDefaultPosition, wxDefaultSize, 0 ); - m_textOffsetNote1->Wrap( -1 ); - bSizer5->Add( m_textOffsetNote1, 0, 0, 5 ); - - m_textOffsetNote2 = new wxStaticText( this, wxID_ANY, _("offset ratio in Schematic Setup > General > Formatting."), wxDefaultPosition, wxDefaultSize, 0 ); - m_textOffsetNote2->Wrap( -1 ); - bSizer5->Add( m_textOffsetNote2, 0, 0, 5 ); + m_textOffsetNote = new wxStaticText( this, wxID_ANY, _("Note:\nthe margins around the text are controlled by the text\noffset ratio in Schematic Setup > General > Formatting."), wxDefaultPosition, wxDefaultSize, 0 ); + m_textOffsetNote->Wrap( -1 ); + bSizer5->Add( m_textOffsetNote, 0, 0, 5 ); bSizeCtrlSizer->Add( bSizer5, 0, wxEXPAND|wxLEFT, 10 ); diff --git a/eeschema/dialogs/dialog_edit_label_base.fbp b/eeschema/dialogs/dialog_edit_label_base.fbp index e443e96f44..74ae00591a 100644 --- a/eeschema/dialogs/dialog_edit_label_base.fbp +++ b/eeschema/dialogs/dialog_edit_label_base.fbp @@ -14,6 +14,7 @@ dialog_edit_label_base 1000 none + 1 dialog_edit_label_base @@ -25,6 +26,7 @@ 1 1 UI + 0 1 0 @@ -700,7 +702,7 @@ 0 0 wxID_ANY - Note: the margins around the text are controlled by the text + Note: the margins around the text are controlled by the text offset ratio in Schematic Setup > General > Formatting. 0 0 @@ -709,68 +711,7 @@ 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 - offset ratio in Schematic Setup > General > Formatting. - 0 - - 0 - - - 0 - - 1 - m_textOffsetNote2 + m_textOffsetNote 1 diff --git a/eeschema/dialogs/dialog_edit_label_base.h b/eeschema/dialogs/dialog_edit_label_base.h index 2784448f90..1b6a9c6452 100644 --- a/eeschema/dialogs/dialog_edit_label_base.h +++ b/eeschema/dialogs/dialog_edit_label_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version Jul 10 2019) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -51,8 +51,7 @@ class DIALOG_LABEL_EDITOR_BASE : public DIALOG_SHIM wxStaticText* m_textSizeLabel; wxTextCtrl* m_textSizeCtrl; wxStaticText* m_textSizeUnits; - wxStaticText* m_textOffsetNote1; - wxStaticText* m_textOffsetNote2; + wxStaticText* m_textOffsetNote; wxRadioBox* m_TextOrient; wxRadioBox* m_TextStyle; wxRadioBox* m_TextShape; diff --git a/gerbview/files.cpp b/gerbview/files.cpp index 40a5760a84..93429cd164 100644 --- a/gerbview/files.cpp +++ b/gerbview/files.cpp @@ -38,7 +38,7 @@ #include // HTML Messages used more than one time: -#define MSG_NO_MORE_LAYER _( "No more available layers in Gerbview to load files" ) +#define MSG_NO_MORE_LAYER _( "No more available layers in Gerbview to load files" ) #define MSG_NOT_LOADED _( "\nNot loaded: %s" )