diff --git a/eeschema/dialogs/dialog_paste_special.cpp b/eeschema/dialogs/dialog_paste_special.cpp index e35c02562a..ff05627080 100644 --- a/eeschema/dialogs/dialog_paste_special.cpp +++ b/eeschema/dialogs/dialog_paste_special.cpp @@ -25,7 +25,6 @@ static bool g_keepAnnotations = true; -static bool g_dropAnnotations = false; DIALOG_PASTE_SPECIAL::DIALOG_PASTE_SPECIAL( wxWindow* parent, bool* aKeep, bool* aDrop ) : @@ -41,28 +40,12 @@ DIALOG_PASTE_SPECIAL::DIALOG_PASTE_SPECIAL( wxWindow* parent, bool* aKeep, bool* bool DIALOG_PASTE_SPECIAL::TransferDataToWindow() { m_keepAnnotations->SetValue( g_keepAnnotations ); - m_dropAnnotations->SetValue( g_dropAnnotations ); return true; } -void DIALOG_PASTE_SPECIAL::OnKeepAnnotations( wxCommandEvent& event ) -{ - if( m_keepAnnotations->GetValue() ) - m_dropAnnotations->SetValue( false ); -} - - -void DIALOG_PASTE_SPECIAL::OnDropAnnotations( wxCommandEvent& event ) -{ - if( m_dropAnnotations->GetValue() ) - m_keepAnnotations->SetValue( false ); -} - - bool DIALOG_PASTE_SPECIAL::TransferDataFromWindow() { g_keepAnnotations = *m_keep = m_keepAnnotations->GetValue(); - g_dropAnnotations = *m_drop = m_dropAnnotations->GetValue(); return true; } diff --git a/eeschema/dialogs/dialog_paste_special.h b/eeschema/dialogs/dialog_paste_special.h index ef9711544f..404ae1f58d 100644 --- a/eeschema/dialogs/dialog_paste_special.h +++ b/eeschema/dialogs/dialog_paste_special.h @@ -38,9 +38,6 @@ class DIALOG_PASTE_SPECIAL : public DIALOG_PASTE_SPECIAL_BASE public: DIALOG_PASTE_SPECIAL( wxWindow* parent, bool* aKeepAnnotations, bool* aDropAnnotations ); - void OnKeepAnnotations( wxCommandEvent& event ) override; - void OnDropAnnotations( wxCommandEvent& event ) override; - bool TransferDataToWindow() override; bool TransferDataFromWindow() override; diff --git a/eeschema/dialogs/dialog_paste_special_base.cpp b/eeschema/dialogs/dialog_paste_special_base.cpp index 90eb3be104..1c328db652 100644 --- a/eeschema/dialogs/dialog_paste_special_base.cpp +++ b/eeschema/dialogs/dialog_paste_special_base.cpp @@ -26,9 +26,6 @@ DIALOG_PASTE_SPECIAL_BASE::DIALOG_PASTE_SPECIAL_BASE( wxWindow* parent, wxWindow m_keepAnnotations = new wxCheckBox( this, wxID_ANY, _("Keep existing annotations, even if they are duplicated"), wxDefaultPosition, wxDefaultSize, 0 ); optionsSizer->Add( m_keepAnnotations, 0, wxALL, 5 ); - m_dropAnnotations = new wxCheckBox( this, wxID_ANY, _("Clear annotations on pasted items"), wxDefaultPosition, wxDefaultSize, 0 ); - optionsSizer->Add( m_dropAnnotations, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - m_mainSizer->Add( optionsSizer, 1, wxALL|wxEXPAND, 10 ); @@ -52,16 +49,12 @@ DIALOG_PASTE_SPECIAL_BASE::DIALOG_PASTE_SPECIAL_BASE( wxWindow* parent, wxWindow this->Centre( wxBOTH ); // Connect Events - m_keepAnnotations->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_PASTE_SPECIAL_BASE::OnKeepAnnotations ), NULL, this ); - m_dropAnnotations->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_PASTE_SPECIAL_BASE::OnDropAnnotations ), NULL, this ); m_sdbSizerOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PASTE_SPECIAL_BASE::onOKButton ), NULL, this ); } DIALOG_PASTE_SPECIAL_BASE::~DIALOG_PASTE_SPECIAL_BASE() { // Disconnect Events - m_keepAnnotations->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_PASTE_SPECIAL_BASE::OnKeepAnnotations ), NULL, this ); - m_dropAnnotations->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_PASTE_SPECIAL_BASE::OnDropAnnotations ), NULL, this ); m_sdbSizerOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PASTE_SPECIAL_BASE::onOKButton ), NULL, this ); } diff --git a/eeschema/dialogs/dialog_paste_special_base.fbp b/eeschema/dialogs/dialog_paste_special_base.fbp index 631c55234f..ed2d52f7b5 100644 --- a/eeschema/dialogs/dialog_paste_special_base.fbp +++ b/eeschema/dialogs/dialog_paste_special_base.fbp @@ -190,72 +190,6 @@ - OnKeepAnnotations - - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Clear annotations on pasted items - - 0 - - - 0 - - 1 - m_dropAnnotations - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnDropAnnotations diff --git a/eeschema/dialogs/dialog_paste_special_base.h b/eeschema/dialogs/dialog_paste_special_base.h index fed8ddebac..47c0dd7c77 100644 --- a/eeschema/dialogs/dialog_paste_special_base.h +++ b/eeschema/dialogs/dialog_paste_special_base.h @@ -36,15 +36,12 @@ class DIALOG_PASTE_SPECIAL_BASE : public DIALOG_SHIM protected: wxStaticText* m_staticText7; wxCheckBox* m_keepAnnotations; - wxCheckBox* m_dropAnnotations; wxStaticLine* m_staticline1; wxStdDialogButtonSizer* m_sdbSizer; wxButton* m_sdbSizerOK; wxButton* m_sdbSizerCancel; // Virtual event handlers, overide them in your derived class - virtual void OnKeepAnnotations( wxCommandEvent& event ) { event.Skip(); } - virtual void OnDropAnnotations( wxCommandEvent& event ) { event.Skip(); } virtual void onOKButton( wxCommandEvent& event ) { event.Skip(); } diff --git a/eeschema/tools/sch_editor_control.cpp b/eeschema/tools/sch_editor_control.cpp index 9833943d4f..5315df457b 100644 --- a/eeschema/tools/sch_editor_control.cpp +++ b/eeschema/tools/sch_editor_control.cpp @@ -1333,7 +1333,7 @@ int SCH_EDITOR_CONTROL::Paste( const TOOL_EVENT& aEvent ) } bool forceKeepAnnotations = false; - bool forceDropAnnotations = false; + bool forceDropAnnotations = true; bool dropAnnotations = false; if( aEvent.IsAction( &ACTIONS::pasteSpecial ) )