From 414dfb47459b4620c1009399a90a1b5fb79e7ecf Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Tue, 15 Feb 2022 15:38:08 +0100 Subject: [PATCH] Eeschema, DIALOG_TEXT_PROPERTIES and DIALOG_LIB_TEXTBOX_PROPERTIES: fix minor issues Fixes #10863 https://gitlab.com/kicad/code/kicad/issues/10863 --- .../dialogs/dialog_lib_textbox_properties.cpp | 2 +- .../dialog_lib_textbox_properties_base.cpp | 13 ++++----- .../dialog_lib_textbox_properties_base.fbp | 27 ++++++++++++++----- .../dialog_lib_textbox_properties_base.h | 5 ++-- eeschema/dialogs/dialog_text_properties.cpp | 2 +- .../dialogs/dialog_text_properties_base.cpp | 13 ++++----- .../dialogs/dialog_text_properties_base.fbp | 27 ++++++++++++++----- .../dialogs/dialog_text_properties_base.h | 5 ++-- 8 files changed, 64 insertions(+), 30 deletions(-) diff --git a/eeschema/dialogs/dialog_lib_textbox_properties.cpp b/eeschema/dialogs/dialog_lib_textbox_properties.cpp index 0fb020bcc7..82c81ebcb5 100644 --- a/eeschema/dialogs/dialog_lib_textbox_properties.cpp +++ b/eeschema/dialogs/dialog_lib_textbox_properties.cpp @@ -184,7 +184,7 @@ bool DIALOG_LIB_TEXTBOX_PROPERTIES::TransferDataToWindow() void DIALOG_LIB_TEXTBOX_PROPERTIES::onSpinButton( wxCommandEvent& aEvent ) { - for( BITMAP_BUTTON* btn : { m_spin0, m_spin1, m_spin2, m_spin3 } ) + for( BITMAP_BUTTON* btn : { m_spin0, m_spin1, m_spin2, m_spin3, m_spin4, m_spin5 } ) { if( btn->IsChecked() && btn != aEvent.GetEventObject() ) btn->Check( false ); diff --git a/eeschema/dialogs/dialog_lib_textbox_properties_base.cpp b/eeschema/dialogs/dialog_lib_textbox_properties_base.cpp index ea3f71effd..e4000a660e 100644 --- a/eeschema/dialogs/dialog_lib_textbox_properties_base.cpp +++ b/eeschema/dialogs/dialog_lib_textbox_properties_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.10.0-39-g3487c3cb) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -38,6 +38,7 @@ DIALOG_LIB_TEXTBOX_PROPERTIES_BASE::DIALOG_LIB_TEXTBOX_PROPERTIES_BASE( wxWindow m_textCtrl->SetViewWhiteSpace( false ); m_textCtrl->SetMarginWidth( 2, 0 ); m_textCtrl->SetIndentationGuides( false ); + m_textCtrl->SetReadOnly( false ); m_textCtrl->SetMarginWidth( 1, 0 ); m_textCtrl->SetMarginWidth( 0, 0 ); m_textCtrl->MarkerDefine( wxSTC_MARKNUM_FOLDER, wxSTC_MARK_BOXPLUS ); @@ -95,27 +96,27 @@ DIALOG_LIB_TEXTBOX_PROPERTIES_BASE::DIALOG_LIB_TEXTBOX_PROPERTIES_BASE( wxWindow bSizeCtrlSizer->Add( m_separator2, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_spin0 = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE ); - m_spin0->SetToolTip( _("Align right") ); + m_spin0->SetToolTip( _("Align left") ); bSizeCtrlSizer->Add( m_spin0, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_spin1 = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE ); - m_spin1->SetToolTip( _("Align bottom") ); + m_spin1->SetToolTip( _("Align horizontal center") ); bSizeCtrlSizer->Add( m_spin1, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_spin2 = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE ); - m_spin2->SetToolTip( _("Align left") ); + m_spin2->SetToolTip( _("Align right") ); bSizeCtrlSizer->Add( m_spin2, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_spin3 = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE ); - m_spin3->SetToolTip( _("Align top") ); + m_spin3->SetToolTip( _("Align bottom") ); bSizeCtrlSizer->Add( m_spin3, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_spin4 = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE ); - m_spin4->SetToolTip( _("Align top") ); + m_spin4->SetToolTip( _("Align vertical center") ); bSizeCtrlSizer->Add( m_spin4, 0, wxALIGN_CENTER_VERTICAL, 5 ); diff --git a/eeschema/dialogs/dialog_lib_textbox_properties_base.fbp b/eeschema/dialogs/dialog_lib_textbox_properties_base.fbp index e9ca6fcad1..c90145a0dd 100644 --- a/eeschema/dialogs/dialog_lib_textbox_properties_base.fbp +++ b/eeschema/dialogs/dialog_lib_textbox_properties_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -14,6 +14,7 @@ dialog_lib_textbox_properties_base 1000 none + 1 dialog_lib_textbox_properties_base @@ -25,6 +26,7 @@ 1 1 UI + 0 1 0 @@ -50,6 +52,7 @@ DIALOG_SHIM; dialog_shim.h Text Box Properties + 0 @@ -190,6 +193,7 @@ protected 1 + 0 Resizable 1 @@ -363,6 +367,7 @@ + 0 @@ -435,6 +440,7 @@ + 0 @@ -507,6 +513,7 @@ + 0 @@ -579,6 +586,7 @@ + 0 @@ -651,6 +659,7 @@ + 0 @@ -700,7 +709,7 @@ wxBORDER_NONE BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare 0 - Align right + Align left wxFILTER_NONE wxDefaultValidator @@ -723,6 +732,7 @@ + 0 @@ -772,7 +782,7 @@ wxBORDER_NONE BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare 0 - Align bottom + Align horizontal center wxFILTER_NONE wxDefaultValidator @@ -795,6 +805,7 @@ + 0 @@ -844,7 +855,7 @@ wxBORDER_NONE BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare 0 - Align left + Align right wxFILTER_NONE wxDefaultValidator @@ -867,6 +878,7 @@ + 0 @@ -916,7 +928,7 @@ wxBORDER_NONE BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare 0 - Align top + Align bottom wxFILTER_NONE wxDefaultValidator @@ -939,6 +951,7 @@ + 0 @@ -988,7 +1001,7 @@ wxBORDER_NONE BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare 0 - Align top + Align vertical center wxFILTER_NONE wxDefaultValidator @@ -1011,6 +1024,7 @@ + 0 @@ -1083,6 +1097,7 @@ + 0 diff --git a/eeschema/dialogs/dialog_lib_textbox_properties_base.h b/eeschema/dialogs/dialog_lib_textbox_properties_base.h index 39083e29bf..8126651a28 100644 --- a/eeschema/dialogs/dialog_lib_textbox_properties_base.h +++ b/eeschema/dialogs/dialog_lib_textbox_properties_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.10.0-39-g3487c3cb) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -94,7 +94,7 @@ class DIALOG_LIB_TEXTBOX_PROPERTIES_BASE : public DIALOG_SHIM wxButton* m_sdbSizer1OK; wxButton* m_sdbSizer1Cancel; - // Virtual event handlers, overide them in your derived class + // Virtual event handlers, override them in your derived class virtual void onMultiLineTCLostFocus( wxFocusEvent& event ) { event.Skip(); } virtual void OnFormattingHelp( wxHyperlinkEvent& event ) { event.Skip(); } virtual void onBorderChecked( wxCommandEvent& event ) { event.Skip(); } @@ -104,6 +104,7 @@ class DIALOG_LIB_TEXTBOX_PROPERTIES_BASE : public DIALOG_SHIM public: DIALOG_LIB_TEXTBOX_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Text Box Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + ~DIALOG_LIB_TEXTBOX_PROPERTIES_BASE(); }; diff --git a/eeschema/dialogs/dialog_text_properties.cpp b/eeschema/dialogs/dialog_text_properties.cpp index 42c661c1a0..74c300ce9d 100644 --- a/eeschema/dialogs/dialog_text_properties.cpp +++ b/eeschema/dialogs/dialog_text_properties.cpp @@ -309,7 +309,7 @@ void DIALOG_TEXT_PROPERTIES::onScintillaCharAdded( wxStyledTextEvent &aEvent ) void DIALOG_TEXT_PROPERTIES::onSpinButton( wxCommandEvent& aEvent ) { - for( BITMAP_BUTTON* btn : { m_spin0, m_spin1, m_spin2, m_spin3 } ) + for( BITMAP_BUTTON* btn : { m_spin0, m_spin1, m_spin2, m_spin3, m_spin4, m_spin5 } ) { if( btn->IsChecked() && btn != aEvent.GetEventObject() ) btn->Check( false ); diff --git a/eeschema/dialogs/dialog_text_properties_base.cpp b/eeschema/dialogs/dialog_text_properties_base.cpp index 0ab2bac90f..9c20181186 100644 --- a/eeschema/dialogs/dialog_text_properties_base.cpp +++ b/eeschema/dialogs/dialog_text_properties_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.10.0-39-g3487c3cb) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -38,6 +38,7 @@ DIALOG_TEXT_PROPERTIES_BASE::DIALOG_TEXT_PROPERTIES_BASE( wxWindow* parent, wxWi m_textCtrl->SetViewWhiteSpace( false ); m_textCtrl->SetMarginWidth( 2, 0 ); m_textCtrl->SetIndentationGuides( false ); + m_textCtrl->SetReadOnly( false ); m_textCtrl->SetMarginWidth( 1, 0 ); m_textCtrl->SetMarginWidth( 0, 0 ); m_textCtrl->MarkerDefine( wxSTC_MARKNUM_FOLDER, wxSTC_MARK_BOXPLUS ); @@ -95,27 +96,27 @@ DIALOG_TEXT_PROPERTIES_BASE::DIALOG_TEXT_PROPERTIES_BASE( wxWindow* parent, wxWi bSizeCtrlSizer->Add( m_separator2, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_spin0 = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE ); - m_spin0->SetToolTip( _("Align right") ); + m_spin0->SetToolTip( _("Align left") ); bSizeCtrlSizer->Add( m_spin0, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_spin1 = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE ); - m_spin1->SetToolTip( _("Align right") ); + m_spin1->SetToolTip( _("Align horizontal center") ); bSizeCtrlSizer->Add( m_spin1, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_spin2 = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE ); - m_spin2->SetToolTip( _("Align bottom") ); + m_spin2->SetToolTip( _("Align right") ); bSizeCtrlSizer->Add( m_spin2, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_spin3 = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE ); - m_spin3->SetToolTip( _("Align left") ); + m_spin3->SetToolTip( _("Align bottom") ); bSizeCtrlSizer->Add( m_spin3, 0, wxALIGN_CENTER_VERTICAL, 5 ); m_spin4 = new BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 21,21 ), wxBU_AUTODRAW|wxBORDER_NONE ); - m_spin4->SetToolTip( _("Align left") ); + m_spin4->SetToolTip( _("Align vertical center") ); bSizeCtrlSizer->Add( m_spin4, 0, wxALIGN_CENTER_VERTICAL, 5 ); diff --git a/eeschema/dialogs/dialog_text_properties_base.fbp b/eeschema/dialogs/dialog_text_properties_base.fbp index f60b522b73..f9999b720b 100644 --- a/eeschema/dialogs/dialog_text_properties_base.fbp +++ b/eeschema/dialogs/dialog_text_properties_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -14,6 +14,7 @@ dialog_text_properties_base 1000 none + 1 dialog_text_properties_base @@ -25,6 +26,7 @@ 1 1 UI + 0 1 0 @@ -50,6 +52,7 @@ DIALOG_SHIM; dialog_shim.h Text Properties + 0 @@ -190,6 +193,7 @@ protected 1 + 0 Resizable 1 @@ -363,6 +367,7 @@ + 0 @@ -435,6 +440,7 @@ + 0 @@ -507,6 +513,7 @@ + 0 @@ -579,6 +586,7 @@ + 0 @@ -651,6 +659,7 @@ + 0 @@ -700,7 +709,7 @@ wxBORDER_NONE BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare 0 - Align right + Align left wxFILTER_NONE wxDefaultValidator @@ -723,6 +732,7 @@ + 0 @@ -772,7 +782,7 @@ wxBORDER_NONE BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare 0 - Align right + Align horizontal center wxFILTER_NONE wxDefaultValidator @@ -795,6 +805,7 @@ + 0 @@ -844,7 +855,7 @@ wxBORDER_NONE BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare 0 - Align bottom + Align right wxFILTER_NONE wxDefaultValidator @@ -867,6 +878,7 @@ + 0 @@ -916,7 +928,7 @@ wxBORDER_NONE BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare 0 - Align left + Align bottom wxFILTER_NONE wxDefaultValidator @@ -939,6 +951,7 @@ + 0 @@ -988,7 +1001,7 @@ wxBORDER_NONE BITMAP_BUTTON; widgets/bitmap_button.h; forward_declare 0 - Align left + Align vertical center wxFILTER_NONE wxDefaultValidator @@ -1011,6 +1024,7 @@ + 0 @@ -1083,6 +1097,7 @@ + 0 diff --git a/eeschema/dialogs/dialog_text_properties_base.h b/eeschema/dialogs/dialog_text_properties_base.h index 8edcbd8cd1..a940bd3212 100644 --- a/eeschema/dialogs/dialog_text_properties_base.h +++ b/eeschema/dialogs/dialog_text_properties_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.10.0-39-g3487c3cb) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -91,7 +91,7 @@ class DIALOG_TEXT_PROPERTIES_BASE : public DIALOG_SHIM wxButton* m_sdbSizer1OK; wxButton* m_sdbSizer1Cancel; - // Virtual event handlers, overide them in your derived class + // Virtual event handlers, override them in your derived class virtual void onMultiLineTCLostFocus( wxFocusEvent& event ) { event.Skip(); } virtual void OnFormattingHelp( wxHyperlinkEvent& event ) { event.Skip(); } virtual void onBorderChecked( wxCommandEvent& event ) { event.Skip(); } @@ -101,6 +101,7 @@ class DIALOG_TEXT_PROPERTIES_BASE : public DIALOG_SHIM public: DIALOG_TEXT_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Text Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + ~DIALOG_TEXT_PROPERTIES_BASE(); };