diff --git a/common/dialogs/dialog_display_info_HTML_base.cpp b/common/dialogs/dialog_display_info_HTML_base.cpp index 5c8ca9a5a7..d492f8af4c 100644 --- a/common/dialogs/dialog_display_info_HTML_base.cpp +++ b/common/dialogs/dialog_display_info_HTML_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.9.0 Jun 3 2020) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -11,14 +11,12 @@ DIALOG_DISPLAY_HTML_TEXT_BASE::DIALOG_DISPLAY_HTML_TEXT_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( wxSize( -1,-1 ), wxDefaultSize ); + this->SetSizeHints( wxSize( 500,300 ), wxDefaultSize ); wxBoxSizer* bMainSizer; bMainSizer = new wxBoxSizer( wxVERTICAL ); m_htmlWindow = new wxHtmlWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO ); - m_htmlWindow->SetMinSize( wxSize( 400,250 ) ); - bMainSizer->Add( m_htmlWindow, 1, wxALL|wxEXPAND, 5 ); m_sdbSizer1 = new wxStdDialogButtonSizer(); @@ -26,7 +24,7 @@ DIALOG_DISPLAY_HTML_TEXT_BASE::DIALOG_DISPLAY_HTML_TEXT_BASE( wxWindow* parent, m_sdbSizer1->AddButton( m_sdbSizer1OK ); m_sdbSizer1->Realize(); - bMainSizer->Add( m_sdbSizer1, 0, wxBOTTOM|wxEXPAND, 5 ); + bMainSizer->Add( m_sdbSizer1, 0, wxEXPAND|wxBOTTOM|wxRIGHT, 5 ); this->SetSizer( bMainSizer ); diff --git a/common/dialogs/dialog_display_info_HTML_base.fbp b/common/dialogs/dialog_display_info_HTML_base.fbp index 9333e16b1d..da400200d1 100644 --- a/common/dialogs/dialog_display_info_HTML_base.fbp +++ b/common/dialogs/dialog_display_info_HTML_base.fbp @@ -14,7 +14,6 @@ dialog_display_info_HTML_base 1000 none - 1 dialog_display_info_HTML @@ -26,7 +25,6 @@ 1 1 UI - 0 0 0 @@ -44,7 +42,7 @@ 0 wxID_ANY - -1,-1 + 500,300 DIALOG_DISPLAY_HTML_TEXT_BASE -1,-1 @@ -97,7 +95,7 @@ 0 - 400,250 + -1,-1 1 m_htmlWindow 1 @@ -121,7 +119,7 @@ 5 - wxBOTTOM|wxEXPAND + wxEXPAND|wxBOTTOM|wxRIGHT 0 0 diff --git a/common/dialogs/dialog_display_info_HTML_base.h b/common/dialogs/dialog_display_info_HTML_base.h index d6b3ddd2d4..61a4f891c3 100644 --- a/common/dialogs/dialog_display_info_HTML_base.h +++ b/common/dialogs/dialog_display_info_HTML_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.9.0 Jun 3 2020) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/eeschema/tools/ee_inspection_tool.cpp b/eeschema/tools/ee_inspection_tool.cpp index 2516275715..67cc173e98 100644 --- a/eeschema/tools/ee_inspection_tool.cpp +++ b/eeschema/tools/ee_inspection_tool.cpp @@ -335,7 +335,7 @@ int EE_INSPECTION_TOOL::CheckSymbol( const TOOL_EVENT& aEvent ) { if( symbol->GetUnitCount() <= 1 ) { - msg.Printf( _( "Hidden power pin %s %s at location (%s, %s)" + msg.Printf( _( "Info: Hidden power pin %s %s at location (%s, %s)" " of converted." ), pin->GetNumber(), pinName, @@ -344,7 +344,7 @@ int EE_INSPECTION_TOOL::CheckSymbol( const TOOL_EVENT& aEvent ) } else { - msg.Printf( _( "Hidden power pin %s %s at location (%s, %s)" + msg.Printf( _( "Info: Hidden power pin %s %s at location (%s, %s)" " in unit %c of converted." ), pin->GetNumber(), pinName, @@ -357,7 +357,7 @@ int EE_INSPECTION_TOOL::CheckSymbol( const TOOL_EVENT& aEvent ) { if( symbol->GetUnitCount() <= 1 ) { - msg.Printf( _( "Hidden power pin %s %s at location (%s, %s)." ), + msg.Printf( _( "Info: Hidden power pin %s %s at location (%s, %s)." ), pin->GetNumber(), pinName, MessageTextFromValue( units, pin->GetPosition().x ), @@ -365,7 +365,7 @@ int EE_INSPECTION_TOOL::CheckSymbol( const TOOL_EVENT& aEvent ) } else { - msg.Printf( _( "Hidden power pin %s %s at location (%s, %s)" + msg.Printf( _( "Info: Hidden power pin %s %s at location (%s, %s)" " in unit %c." ), pin->GetNumber(), pinName,