From 3f4c82b39b102e41f00a0af76a8b86acb1fbdc87 Mon Sep 17 00:00:00 2001 From: Mike Williams Date: Wed, 22 May 2024 10:08:11 -0400 Subject: [PATCH] annotate: cleanup Annote event name to match button --- eeschema/dialogs/dialog_annotate.cpp | 4 +- eeschema/dialogs/dialog_annotate_base.cpp | 6 +- eeschema/dialogs/dialog_annotate_base.fbp | 2353 +++++++++++---------- eeschema/dialogs/dialog_annotate_base.h | 4 +- 4 files changed, 1192 insertions(+), 1175 deletions(-) diff --git a/eeschema/dialogs/dialog_annotate.cpp b/eeschema/dialogs/dialog_annotate.cpp index a8c3c85939..e242b9be0b 100644 --- a/eeschema/dialogs/dialog_annotate.cpp +++ b/eeschema/dialogs/dialog_annotate.cpp @@ -52,7 +52,7 @@ private: void OnClearAnnotationClick( wxCommandEvent& event ) override; void OnCloseClick( wxCommandEvent& event ) override; void OnClose( wxCloseEvent& event ) override; - void OnApplyClick( wxCommandEvent& event ) override; + void OnAnnotateClick( wxCommandEvent& event ) override; // User functions: bool GetResetItems(); @@ -212,7 +212,7 @@ void DIALOG_ANNOTATE::OnClose( wxCloseEvent& event ) } -void DIALOG_ANNOTATE::OnApplyClick( wxCommandEvent& event ) +void DIALOG_ANNOTATE::OnAnnotateClick( wxCommandEvent& event ) { SCH_COMMIT commit( m_Parent ); diff --git a/eeschema/dialogs/dialog_annotate_base.cpp b/eeschema/dialogs/dialog_annotate_base.cpp index f4a3ff9ea5..cf7812d45b 100644 --- a/eeschema/dialogs/dialog_annotate_base.cpp +++ b/eeschema/dialogs/dialog_annotate_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) +// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf-dirty) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -164,7 +164,7 @@ DIALOG_ANNOTATE_BASE::DIALOG_ANNOTATE_BASE( wxWindow* parent, wxWindowID id, con m_rbSheetX1000->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_ANNOTATE_BASE::OnOptionChanged ), NULL, this ); m_btnClear->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ANNOTATE_BASE::OnClearAnnotationClick ), NULL, this ); m_sdbSizer1Cancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ANNOTATE_BASE::OnCloseClick ), NULL, this ); - m_sdbSizer1OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ANNOTATE_BASE::OnApplyClick ), NULL, this ); + m_sdbSizer1OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ANNOTATE_BASE::OnAnnotateClick ), NULL, this ); } DIALOG_ANNOTATE_BASE::~DIALOG_ANNOTATE_BASE() @@ -180,6 +180,6 @@ DIALOG_ANNOTATE_BASE::~DIALOG_ANNOTATE_BASE() m_rbSheetX1000->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_ANNOTATE_BASE::OnOptionChanged ), NULL, this ); m_btnClear->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ANNOTATE_BASE::OnClearAnnotationClick ), NULL, this ); m_sdbSizer1Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ANNOTATE_BASE::OnCloseClick ), NULL, this ); - m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ANNOTATE_BASE::OnApplyClick ), NULL, this ); + m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ANNOTATE_BASE::OnAnnotateClick ), NULL, this ); } diff --git a/eeschema/dialogs/dialog_annotate_base.fbp b/eeschema/dialogs/dialog_annotate_base.fbp index 5a9cab1764..fa626f1240 100644 --- a/eeschema/dialogs/dialog_annotate_base.fbp +++ b/eeschema/dialogs/dialog_annotate_base.fbp @@ -1,72 +1,366 @@ - + - - - - C++ - 1 - source_name - 0 - 0 - res - UTF-8 - connect - dialog_annotate_base - 1000 - none - - - 1 - dialog_annotate_base - - . - - 1 - 1 - 1 - 1 - UI - 0 - 0 - 0 - - 0 - wxAUI_MGR_DEFAULT + + + + C++ + 1 + source_name + 0 + 0 + res + UTF-8 + connect + dialog_annotate_base + 1000 + none + + + 1 + dialog_annotate_base + + . + + 1 + 1 + 1 + 1 + UI + 0 + 0 + 0 + + 0 + wxAUI_MGR_DEFAULT + + + + 1 + 0 + 1 + impl_virtual + + + + 0 + wxID_ANY + + + DIALOG_ANNOTATE_BASE + + -1,-1 + wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER + DIALOG_SHIM; dialog_shim.h + Annotate Schematic + + 0 + + + + OnClose + + + bmainSizer + wxVERTICAL + none + + 5 + wxEXPAND|wxBOTTOM + 0 + + 1 + 1 + 1 + 1 + + + + + - + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left + 0 + 500 1 - impl_virtual - + 1 - 0 + 0 + 1 + wxSHOW_EFFECT_NONE wxID_ANY + + 0 + + 0 - DIALOG_ANNOTATE_BASE + 1 + m_infoBar + 1 + + + protected + 1 - -1,-1 - wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - DIALOG_SHIM; dialog_shim.h - Annotate Schematic + Resizable + 1 + wxSHOW_EFFECT_NONE + + WX_INFOBAR; widgets/wx_infobar.h; forward_declare + 0 - 0 - OnClose - + + + + 6 + wxEXPAND|wxTOP|wxRIGHT|wxLEFT + 1 + + + bupperSizer + wxVERTICAL + none + + 5 + wxBOTTOM|wxEXPAND + 0 + + 2 + wxBOTH + 0,1 + + 0 - bmainSizer - wxVERTICAL + fgSizer1 + wxFLEX_GROWMODE_SPECIFIED none - - 5 - wxEXPAND|wxBOTTOM - 0 - + 2 + 0 + + 5 + wxALL|wxEXPAND + 1 + + wxID_ANY + Scope + + sbSizer3 + wxVERTICAL + 1 + none + + 5 + wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Entire schematic + + 0 + + + 0 + + 1 + m_rbScope_Schematic + 1 + + + protected + 1 + + Resizable + 1 + + wxRB_GROUP + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + + + + 5 + wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Current sheet only + + 0 + + + 0 + + 1 + m_rbScope_Sheet + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + + + + 5 + wxLEFT|wxRIGHT|wxBOTTOM + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Selection + + 0 + + + 0 + + 1 + m_rbScope_Selection + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + + + + 5 + wxALL + 0 + 1 1 1 @@ -80,6 +374,7 @@ 1 0 + 0 1 1 @@ -87,15 +382,15 @@ Dock 0 Left - 500 + 0 1 1 0 - 1 - wxSHOW_EFFECT_NONE + 0 wxID_ANY + Recurse into subsheets 0 @@ -103,7 +398,7 @@ 0 1 - m_infoBar + m_checkRecursive 1 @@ -112,1140 +407,862 @@ Resizable 1 - wxSHOW_EFFECT_NONE - WX_INFOBAR; widgets/wx_infobar.h; forward_declare + + ; ; forward_declare 0 + + wxFILTER_NONE + wxDefaultValidator + + + - - 6 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT - 1 - + + 5 + wxALL|wxEXPAND + 0 + + wxID_ANY + Order + + sbSizer1 + wxVERTICAL + 1 + none + + 5 + wxBOTTOM|wxEXPAND + 0 + - bupperSizer - wxVERTICAL + bSizerXpos + wxHORIZONTAL none - - 5 - wxBOTTOM|wxEXPAND - 0 - - 2 - wxBOTH - 0,1 - - 0 - - fgSizer1 - wxFLEX_GROWMODE_SPECIFIED - none - 2 - 0 - - 5 - wxALL|wxEXPAND - 1 - - wxID_ANY - Scope - - sbSizer3 - wxVERTICAL - 1 - none - - 5 - wxLEFT|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Entire schematic - - 0 - - - 0 - - 1 - m_rbScope_Schematic - 1 - - - protected - 1 - - Resizable - 1 - - wxRB_GROUP - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - - - - 5 - wxLEFT|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Current sheet only - - 0 - - - 0 - - 1 - m_rbScope_Sheet - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - - - - 5 - wxLEFT|wxRIGHT|wxBOTTOM - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Selection - - 0 - - - 0 - - 1 - m_rbScope_Selection - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Recurse into subsheets - - 0 - - - 0 - - 1 - m_checkRecursive - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - 5 - wxALL|wxEXPAND - 0 - - wxID_ANY - Order - - sbSizer1 - wxVERTICAL - 1 - none - - 5 - wxBOTTOM|wxEXPAND - 0 - - - bSizerXpos - wxHORIZONTAL - none - - 3 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_SORT_BY_X_POSITION - Sort symbols by &X position - - 0 - - - 0 - - 1 - m_rbSortBy_X_Position - 1 - - - protected - 1 - - Resizable - 1 - - wxRB_GROUP - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - OnOptionChanged - - - - 5 - wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - Load From Resource; - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - annotate_down_right_bitmap - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - - - - - - - - - - 5 - wxEXPAND - 0 - - - bSizerYpos - wxHORIZONTAL - none - - 3 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_SORT_BY_Y_POSITION - Sort symbols by &Y position - - 0 - - - 0 - - 1 - m_rbSortBy_Y_Position - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - OnOptionChanged - - - - 5 - wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - Load From Resource; - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - annotate_right_down_bitmap - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - - - - - - - - - - - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "Keep existing annotations" "Reset existing annotations" - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Options - 1 - - 0 - - - 0 - - 1 - m_rbOptions - 1 - - - protected - 1 - - Resizable - 0 - 1 - - wxRA_SPECIFY_COLS - ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnOptionChanged - - - - 5 - wxALL|wxEXPAND - 1 - - wxID_ANY - Numbering - - sbSizer2 - wxVERTICAL - 1 - none - - 5 - wxEXPAND - 1 - - - wxBOTH - - - 0 - - gbSizer1 - wxFLEX_GROWMODE_SPECIFIED - none - 0 - - 2 - 1 - 0 - wxALIGN_CENTER_VERTICAL - 0 - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_FIRST_FREE - Use first free number after: - - 0 - - - 0 - - 1 - m_rbFirstFree - 1 - - - protected - 1 - - Resizable - 1 - - wxRB_GROUP - ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - OnOptionChanged - - - - 2 - 1 - 1 - wxLEFT|wxRIGHT - 0 - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - - 1 - m_textNumberAfter - 1 - - - protected - 1 - - Resizable - 1 - 60,-1 - - ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - OnOptionChanged - - - - 2 - 2 - 0 - wxBOTTOM|wxTOP - 1 - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_SHEET_X_100 - First free after sheet number X 100 - - 0 - - - 0 - - 1 - m_rbSheetX100 - 1 - - - protected - 1 - - Resizable - 1 - - - ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - OnOptionChanged - - - - 2 - 2 - 0 - wxBOTTOM|wxTOP - 2 - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_SHEET_X_1000 - First free after sheet number X 1000 - - 0 - - - 0 - - 1 - m_rbSheetX1000 - 1 - - - protected - 1 - - Resizable - 1 - - - ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - OnOptionChanged - - - - - - - + + 3 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + ID_SORT_BY_X_POSITION + Sort symbols by &X position + + 0 + + + 0 + + 1 + m_rbSortBy_X_Position + 1 + + + protected + 1 + + Resizable + 1 + + wxRB_GROUP + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + OnOptionChanged + - - 5 - wxEXPAND|wxRIGHT|wxLEFT - 5 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - -1,120 - 1 - m_MessageWindow - 1 - - - protected - 1 - - Resizable - 1 - - WX_HTML_REPORT_PANEL; widgets/wx_html_report_panel.h; forward_declare - 0 - - - - wxTAB_TRAVERSAL - + + 5 + wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + Load From Resource; + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + annotate_down_right_bitmap + 1 + + + protected + 1 + + Resizable + 1 + + + 0 + + + + + + - - - 5 - wxEXPAND|wxLEFT - 0 - + + 5 + wxEXPAND + 0 + - m_buttonsSizer + bSizerYpos wxHORIZONTAL none - - 10 - wxEXPAND|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - ID_CLEAR_ANNOTATION_CMP - Clear Annotation - - 0 - - 0 - - - 0 - - 1 - m_btnClear - 1 - - - protected - 1 - - - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnClearAnnotationClick - + + 3 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + ID_SORT_BY_Y_POSITION + Sort symbols by &Y position + + 0 + + + 0 + + 1 + m_rbSortBy_Y_Position + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + OnOptionChanged + + + + 5 + wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + Load From Resource; + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + annotate_right_down_bitmap + 1 + + + protected + 1 + + Resizable + 1 + + + 0 + + + + + + + + + + + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + "Keep existing annotations" "Reset existing annotations" + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Options + 1 + + 0 + + + 0 + + 1 + m_rbOptions + 1 + + + protected + 1 + + Resizable + 0 + 1 + + wxRA_SPECIFY_COLS + ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnOptionChanged + + + + 5 + wxALL|wxEXPAND + 1 + + wxID_ANY + Numbering + + sbSizer2 + wxVERTICAL + 1 + none + + 5 + wxEXPAND + 1 + + + wxBOTH + + + 0 + + gbSizer1 + wxFLEX_GROWMODE_SPECIFIED + none + 0 + + 2 + 1 + 0 + wxALIGN_CENTER_VERTICAL + 0 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_FIRST_FREE + Use first free number after: + + 0 + + + 0 + + 1 + m_rbFirstFree + 1 + + + protected + 1 + + Resizable + 1 + + wxRB_GROUP + ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + OnOptionChanged + + + + 2 + 1 + 1 + wxLEFT|wxRIGHT + 0 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + + 0 + + 1 + m_textNumberAfter + 1 + + + protected + 1 + + Resizable + 1 + 60,-1 + + ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + OnOptionChanged + - - 5 - wxEXPAND - 1 - - 0 - protected - 0 - + + 2 + 2 + 0 + wxBOTTOM|wxTOP + 1 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_SHEET_X_100 + First free after sheet number X 100 + + 0 + + + 0 + + 1 + m_rbSheetX100 + 1 + + + protected + 1 + + Resizable + 1 + + + ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + OnOptionChanged + - - 5 - wxALL|wxEXPAND - 0 - - 0 - 1 - 0 - 0 - 0 - 1 - 0 - 0 - - m_sdbSizer1 - protected - OnCloseClick - OnApplyClick - + + 2 + 2 + 0 + wxBOTTOM|wxTOP + 2 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_SHEET_X_1000 + First free after sheet number X 1000 + + 0 + + + 0 + + 1 + m_rbSheetX1000 + 1 + + + protected + 1 + + Resizable + 1 + + + ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + OnOptionChanged + + + + + + + 5 + wxEXPAND|wxRIGHT|wxLEFT + 5 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + -1,120 + 1 + m_MessageWindow + 1 + + + protected + 1 + + Resizable + 1 + + WX_HTML_REPORT_PANEL; widgets/wx_html_report_panel.h; forward_declare + 0 + + + + wxTAB_TRAVERSAL + + + + + + 5 + wxEXPAND|wxLEFT + 0 + + + m_buttonsSizer + wxHORIZONTAL + none + + 10 + wxEXPAND|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 0 + 1 + + 1 + + + 0 + 0 + ID_CLEAR_ANNOTATION_CMP + Clear Annotation + + 0 + + 0 + + + 0 + + 1 + m_btnClear + 1 + + + protected + 1 + + + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnClearAnnotationClick + + + + 5 + wxEXPAND + 1 + + 0 + protected + 0 + + + + 5 + wxALL|wxEXPAND + 0 + + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + + m_sdbSizer1 + protected + OnCloseClick + OnAnnotateClick + + + + diff --git a/eeschema/dialogs/dialog_annotate_base.h b/eeschema/dialogs/dialog_annotate_base.h index c0f13dce66..1544f85f4f 100644 --- a/eeschema/dialogs/dialog_annotate_base.h +++ b/eeschema/dialogs/dialog_annotate_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) +// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf-dirty) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -77,7 +77,7 @@ class DIALOG_ANNOTATE_BASE : public DIALOG_SHIM virtual void OnOptionChanged( wxCommandEvent& event ) { event.Skip(); } virtual void OnClearAnnotationClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnCloseClick( wxCommandEvent& event ) { event.Skip(); } - virtual void OnApplyClick( wxCommandEvent& event ) { event.Skip(); } + virtual void OnAnnotateClick( wxCommandEvent& event ) { event.Skip(); } public: