From de72ef851846ba2cbd84f98155a90a41be290bc4 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Fri, 16 Feb 2018 20:26:55 +0100 Subject: [PATCH] Fix code after renaming files --- pcbnew/CMakeLists.txt | 4 +- .../dialog_edit_footprint_for_BoardEditor.cpp | 42 ++++++------ .../dialog_edit_footprint_for_BoardEditor.h | 6 +- ...og_edit_footprint_for_BoardEditor_base.cpp | 56 +++++++-------- ...og_edit_footprint_for_BoardEditor_base.fbp | 2 +- ...alog_edit_footprint_for_BoardEditor_base.h | 8 +-- .../dialog_edit_footprint_for_fp_editor.cpp | 30 ++++---- .../dialog_edit_footprint_for_fp_editor.h | 8 +-- ...alog_edit_footprint_for_fp_editor_base.cpp | 42 ++++++------ ...alog_edit_footprint_for_fp_editor_base.fbp | 6 +- ...dialog_edit_footprint_for_fp_editor_base.h | 14 ++-- .../dialog_edit_footprint_text_base.cpp | 2 +- .../dialog_edit_footprint_text_base.fbp | 4 +- .../dialogs/dialog_edit_footprint_text_base.h | 6 +- pcbnew/dialogs/dialog_exchange_footprints.cpp | 48 ++++++------- pcbnew/dialogs/dialog_exchange_footprints.h | 14 ++-- .../dialog_exchange_footprints_base.cpp | 68 +++++++++---------- .../dialog_exchange_footprints_base.fbp | 2 +- .../dialogs/dialog_exchange_footprints_base.h | 8 +-- ...ialog_gen_footprint_position_file_base.cpp | 12 ++-- ...ialog_gen_footprint_position_file_base.fbp | 2 +- .../dialog_gen_footprint_position_file_base.h | 8 +-- ...ialog_global_footprints_fields_edition.cpp | 28 ++++---- ..._global_footprints_fields_edition_base.cpp | 4 +- ..._global_footprints_fields_edition_base.fbp | 2 +- ...og_global_footprints_fields_edition_base.h | 8 +-- pcbnew/exporters/gen_footprints_placefile.cpp | 22 +++--- pcbnew/footprint_edit_frame.cpp | 2 +- pcbnew/footprint_editor_onclick.cpp | 4 +- pcbnew/footprint_editor_utils.cpp | 6 +- pcbnew/footprint_info_impl.cpp | 6 +- pcbnew/pcb_edit_frame.cpp | 16 ++--- pcbnew/swig/pcbnew.i | 2 +- pcbnew/tools/drawing_tool.cpp | 2 +- pcbnew/tools/edit_tool.cpp | 4 +- pcbnew/tools/footprint_editor_tools.cpp | 2 +- 36 files changed, 250 insertions(+), 250 deletions(-) diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt index 769c4f8196..0e86e2b5cc 100644 --- a/pcbnew/CMakeLists.txt +++ b/pcbnew/CMakeLists.txt @@ -70,8 +70,8 @@ set( PCBNEW_DIALOGS dialogs/dialog_drc_base.cpp dialogs/dialog_edit_footprint_for_BoardEditor.cpp dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp - dialogs/dialog_edit_footprint_for_Modedit.cpp - dialogs/dialog_edit_footprint_for_Modedit_base.cpp + dialogs/dialog_edit_footprint_for_fp_editor.cpp + dialogs/dialog_edit_footprint_for_fp_editor_base.cpp dialogs/dialog_edit_footprint_text.cpp dialogs/dialog_edit_footprint_text_base.cpp dialogs/dialog_enum_pads.cpp diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp index 80ea18bad7..a7ad2bb8cc 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp +++ b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp @@ -1,5 +1,5 @@ /** - * Module editor: Dialog for editing module properties in the pcb editor. + * Module editor: Dialog for editing footprint properties in the pcb editor. */ /* @@ -58,13 +58,13 @@ #include -size_t DIALOG_MODULE_BOARD_EDITOR::m_page = 0; // remember the last open page during session +size_t DIALOG_FOOTPRINT_BOARD_EDITOR::m_page = 0; // remember the last open page during session -DIALOG_MODULE_BOARD_EDITOR::DIALOG_MODULE_BOARD_EDITOR( PCB_EDIT_FRAME* aParent, +DIALOG_FOOTPRINT_BOARD_EDITOR::DIALOG_FOOTPRINT_BOARD_EDITOR( PCB_EDIT_FRAME* aParent, MODULE* aModule, wxDC* aDC ) : - DIALOG_MODULE_BOARD_EDITOR_BASE( aParent ), + DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( aParent ), m_OrientValidator( 1, &m_OrientValue ) { wxASSERT( aParent != NULL ); @@ -108,7 +108,7 @@ DIALOG_MODULE_BOARD_EDITOR::DIALOG_MODULE_BOARD_EDITOR( PCB_EDIT_FRAME* aParent -DIALOG_MODULE_BOARD_EDITOR::~DIALOG_MODULE_BOARD_EDITOR() +DIALOG_FOOTPRINT_BOARD_EDITOR::~DIALOG_FOOTPRINT_BOARD_EDITOR() { m_shapes3D_list.clear(); @@ -137,7 +137,7 @@ DIALOG_MODULE_BOARD_EDITOR::~DIALOG_MODULE_BOARD_EDITOR() // Creation of the panel properties of the module editor. -void DIALOG_MODULE_BOARD_EDITOR::InitBoardProperties() +void DIALOG_FOOTPRINT_BOARD_EDITOR::InitBoardProperties() { PutValueInLocalUnits( *m_ModPositionX, m_CurrentModule->GetPosition().x ); m_XPosUnit->SetLabel( GetAbbreviatedUnitsLabel( g_UserUnit ) ); @@ -230,7 +230,7 @@ void DIALOG_MODULE_BOARD_EDITOR::InitBoardProperties() } -void DIALOG_MODULE_BOARD_EDITOR::GotoModuleEditor( wxCommandEvent& event ) +void DIALOG_FOOTPRINT_BOARD_EDITOR::GotoModuleEditor( wxCommandEvent& event ) { if( m_CurrentModule->GetTimeStamp() == 0 ) // Module Editor needs a non null timestamp { @@ -242,19 +242,19 @@ void DIALOG_MODULE_BOARD_EDITOR::GotoModuleEditor( wxCommandEvent& event ) } -void DIALOG_MODULE_BOARD_EDITOR::UpdateModule( wxCommandEvent& event ) +void DIALOG_FOOTPRINT_BOARD_EDITOR::UpdateModule( wxCommandEvent& event ) { EndModal( PRM_EDITOR_WANT_UPDATE_FP ); } -void DIALOG_MODULE_BOARD_EDITOR::ExchangeModule( wxCommandEvent& event ) +void DIALOG_FOOTPRINT_BOARD_EDITOR::ExchangeModule( wxCommandEvent& event ) { EndModal( PRM_EDITOR_WANT_EXCHANGE_FP ); } -void DIALOG_MODULE_BOARD_EDITOR::ModuleOrientEvent( wxCommandEvent& event ) +void DIALOG_FOOTPRINT_BOARD_EDITOR::ModuleOrientEvent( wxCommandEvent& event ) { bool custom_orientation = false; @@ -286,7 +286,7 @@ void DIALOG_MODULE_BOARD_EDITOR::ModuleOrientEvent( wxCommandEvent& event ) } -void DIALOG_MODULE_BOARD_EDITOR::InitModeditProperties() +void DIALOG_FOOTPRINT_BOARD_EDITOR::InitModeditProperties() { wxString default_path; wxGetEnv( KISYS3DMOD, &default_path ); @@ -411,7 +411,7 @@ void DIALOG_MODULE_BOARD_EDITOR::InitModeditProperties() } -void DIALOG_MODULE_BOARD_EDITOR::On3DShapeNameSelected( wxCommandEvent& event ) +void DIALOG_FOOTPRINT_BOARD_EDITOR::On3DShapeNameSelected( wxCommandEvent& event ) { m_LastSelected3DShapeIndex = m_3D_ShapeNameListBox->GetSelection(); @@ -442,7 +442,7 @@ void DIALOG_MODULE_BOARD_EDITOR::On3DShapeNameSelected( wxCommandEvent& event ) -void DIALOG_MODULE_BOARD_EDITOR::Remove3DShape( wxCommandEvent& event ) +void DIALOG_FOOTPRINT_BOARD_EDITOR::Remove3DShape( wxCommandEvent& event ) { int ii = m_3D_ShapeNameListBox->GetSelection(); @@ -479,7 +479,7 @@ void DIALOG_MODULE_BOARD_EDITOR::Remove3DShape( wxCommandEvent& event ) } -void DIALOG_MODULE_BOARD_EDITOR::Edit3DShapeFileName() +void DIALOG_FOOTPRINT_BOARD_EDITOR::Edit3DShapeFileName() { int idx = m_3D_ShapeNameListBox->GetSelection(); @@ -531,7 +531,7 @@ void DIALOG_MODULE_BOARD_EDITOR::Edit3DShapeFileName() } -void DIALOG_MODULE_BOARD_EDITOR::BrowseAndAdd3DShapeFile() +void DIALOG_FOOTPRINT_BOARD_EDITOR::BrowseAndAdd3DShapeFile() { PROJECT& prj = Prj(); MODULE_3D_SETTINGS model; @@ -598,7 +598,7 @@ void DIALOG_MODULE_BOARD_EDITOR::BrowseAndAdd3DShapeFile() } -bool DIALOG_MODULE_BOARD_EDITOR::TransferDataToWindow() +bool DIALOG_FOOTPRINT_BOARD_EDITOR::TransferDataToWindow() { if( !wxDialog::TransferDataToWindow() || !m_PanelProperties->TransferDataToWindow() ) @@ -621,12 +621,12 @@ bool DIALOG_MODULE_BOARD_EDITOR::TransferDataToWindow() } -bool DIALOG_MODULE_BOARD_EDITOR::TransferDataFromWindow() +bool DIALOG_FOOTPRINT_BOARD_EDITOR::TransferDataFromWindow() { wxPoint modpos; wxString msg; - if( !Validate() || !DIALOG_MODULE_BOARD_EDITOR_BASE::TransferDataFromWindow() || + if( !Validate() || !DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::TransferDataFromWindow() || !m_PanelProperties->TransferDataFromWindow() ) { wxMessageBox( _( "Error: invalid or missing footprint parameter" ) ); @@ -781,7 +781,7 @@ bool DIALOG_MODULE_BOARD_EDITOR::TransferDataFromWindow() } -void DIALOG_MODULE_BOARD_EDITOR::OnEditReference( wxCommandEvent& event ) +void DIALOG_FOOTPRINT_BOARD_EDITOR::OnEditReference( wxCommandEvent& event ) { wxPoint tmp = m_Parent->GetCrossHairPosition(); @@ -796,7 +796,7 @@ void DIALOG_MODULE_BOARD_EDITOR::OnEditReference( wxCommandEvent& event ) } -void DIALOG_MODULE_BOARD_EDITOR::OnEditValue( wxCommandEvent& event ) +void DIALOG_FOOTPRINT_BOARD_EDITOR::OnEditValue( wxCommandEvent& event ) { wxPoint tmp = m_Parent->GetCrossHairPosition(); @@ -811,7 +811,7 @@ void DIALOG_MODULE_BOARD_EDITOR::OnEditValue( wxCommandEvent& event ) } -void DIALOG_MODULE_BOARD_EDITOR::Cfg3DPath( wxCommandEvent& event ) +void DIALOG_FOOTPRINT_BOARD_EDITOR::Cfg3DPath( wxCommandEvent& event ) { if( S3D::Configure3DPaths( this, Prj().Get3DCacheManager()->GetResolver() ) ) if( m_LastSelected3DShapeIndex >= 0 ) diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.h b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.h index cebcb16a6a..aec1639580 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.h +++ b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.h @@ -32,7 +32,7 @@ class PANEL_PREV_3D; -class DIALOG_MODULE_BOARD_EDITOR: public DIALOG_MODULE_BOARD_EDITOR_BASE +class DIALOG_FOOTPRINT_BOARD_EDITOR: public DIALOG_FOOTPRINT_BOARD_EDITOR_BASE { private: PCB_EDIT_FRAME * m_Parent; @@ -63,8 +63,8 @@ public: public: // Constructor and destructor - DIALOG_MODULE_BOARD_EDITOR( PCB_EDIT_FRAME* aParent, MODULE* aModule, wxDC* aDC ); - ~DIALOG_MODULE_BOARD_EDITOR(); + DIALOG_FOOTPRINT_BOARD_EDITOR( PCB_EDIT_FRAME* aParent, MODULE* aModule, wxDC* aDC ); + ~DIALOG_FOOTPRINT_BOARD_EDITOR(); private: void BrowseAndAdd3DShapeFile(); diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp index 1bb22cff58..a1939cafb0 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp +++ b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp @@ -11,7 +11,7 @@ /////////////////////////////////////////////////////////////////////////// -DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) +DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_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( wxDefaultSize, wxDefaultSize ); @@ -387,36 +387,36 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare m_GeneralBoxSizer->Fit( this ); // Connect Events - this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::OnInitDlg ) ); - m_button4->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::OnEditReference ), NULL, this ); - m_button5->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::OnEditValue ), NULL, this ); - m_OrientCtrl->Connect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::ModuleOrientEvent ), NULL, this ); - m_buttonUpdate->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::UpdateModule ), NULL, this ); - m_buttonExchange->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::ExchangeModule ), NULL, this ); - m_buttonModuleEditor->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::GotoModuleEditor ), NULL, this ); - m_3D_ShapeNameListBox->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::On3DShapeNameSelected ), NULL, this ); - m_3D_ShapeNameListBox->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::Edit3DShapeFilename ), NULL, this ); - m_buttonAdd->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::Add3DShape ), NULL, this ); - m_buttonRemove->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::Remove3DShape ), NULL, this ); - m_buttonEdit->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::Edit3DShapeFilename ), NULL, this ); - m_button8->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::Cfg3DPath ), NULL, this ); + this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::OnInitDlg ) ); + m_button4->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::OnEditReference ), NULL, this ); + m_button5->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::OnEditValue ), NULL, this ); + m_OrientCtrl->Connect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::ModuleOrientEvent ), NULL, this ); + m_buttonUpdate->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::UpdateModule ), NULL, this ); + m_buttonExchange->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::ExchangeModule ), NULL, this ); + m_buttonModuleEditor->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::GotoModuleEditor ), NULL, this ); + m_3D_ShapeNameListBox->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::On3DShapeNameSelected ), NULL, this ); + m_3D_ShapeNameListBox->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::Edit3DShapeFilename ), NULL, this ); + m_buttonAdd->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::Add3DShape ), NULL, this ); + m_buttonRemove->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::Remove3DShape ), NULL, this ); + m_buttonEdit->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::Edit3DShapeFilename ), NULL, this ); + m_button8->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::Cfg3DPath ), NULL, this ); } -DIALOG_MODULE_BOARD_EDITOR_BASE::~DIALOG_MODULE_BOARD_EDITOR_BASE() +DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::~DIALOG_FOOTPRINT_BOARD_EDITOR_BASE() { // Disconnect Events - this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::OnInitDlg ) ); - m_button4->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::OnEditReference ), NULL, this ); - m_button5->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::OnEditValue ), NULL, this ); - m_OrientCtrl->Disconnect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::ModuleOrientEvent ), NULL, this ); - m_buttonUpdate->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::UpdateModule ), NULL, this ); - m_buttonExchange->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::ExchangeModule ), NULL, this ); - m_buttonModuleEditor->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::GotoModuleEditor ), NULL, this ); - m_3D_ShapeNameListBox->Disconnect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::On3DShapeNameSelected ), NULL, this ); - m_3D_ShapeNameListBox->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::Edit3DShapeFilename ), NULL, this ); - m_buttonAdd->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::Add3DShape ), NULL, this ); - m_buttonRemove->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::Remove3DShape ), NULL, this ); - m_buttonEdit->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::Edit3DShapeFilename ), NULL, this ); - m_button8->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_BOARD_EDITOR_BASE::Cfg3DPath ), NULL, this ); + this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::OnInitDlg ) ); + m_button4->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::OnEditReference ), NULL, this ); + m_button5->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::OnEditValue ), NULL, this ); + m_OrientCtrl->Disconnect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::ModuleOrientEvent ), NULL, this ); + m_buttonUpdate->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::UpdateModule ), NULL, this ); + m_buttonExchange->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::ExchangeModule ), NULL, this ); + m_buttonModuleEditor->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::GotoModuleEditor ), NULL, this ); + m_3D_ShapeNameListBox->Disconnect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::On3DShapeNameSelected ), NULL, this ); + m_3D_ShapeNameListBox->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::Edit3DShapeFilename ), NULL, this ); + m_buttonAdd->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::Add3DShape ), NULL, this ); + m_buttonRemove->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::Remove3DShape ), NULL, this ); + m_buttonEdit->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::Edit3DShapeFilename ), NULL, this ); + m_button8->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::Cfg3DPath ), NULL, this ); } diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.fbp b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.fbp index ef8f6f6783..19a58a7565 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.fbp +++ b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.fbp @@ -42,7 +42,7 @@ wxID_ANY - DIALOG_MODULE_BOARD_EDITOR_BASE + DIALOG_FOOTPRINT_BOARD_EDITOR_BASE -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.h b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.h index 6a58af7468..5555d3e56d 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.h +++ b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.h @@ -48,9 +48,9 @@ class TEXT_CTRL_EVAL; #define ID_REMOVE_3D_SHAPE 1006 /////////////////////////////////////////////////////////////////////////////// -/// Class DIALOG_MODULE_BOARD_EDITOR_BASE +/// Class DIALOG_FOOTPRINT_BOARD_EDITOR_BASE /////////////////////////////////////////////////////////////////////////////// -class DIALOG_MODULE_BOARD_EDITOR_BASE : public DIALOG_SHIM +class DIALOG_FOOTPRINT_BOARD_EDITOR_BASE : public DIALOG_SHIM { private: wxBoxSizer* m_GeneralBoxSizer; @@ -136,8 +136,8 @@ class DIALOG_MODULE_BOARD_EDITOR_BASE : public DIALOG_SHIM public: - DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Footprint Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); - ~DIALOG_MODULE_BOARD_EDITOR_BASE(); + DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Footprint Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + ~DIALOG_FOOTPRINT_BOARD_EDITOR_BASE(); }; diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp index 2c424ecbd8..28da4363b8 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp +++ b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp @@ -1,5 +1,5 @@ /** - * @file dialog_edit_module_for_Modedit.cpp + * @file dialog_edit_footprint_for_fp_editor.cpp * * @brief Dialog for editing a module properties in module editor (modedit) */ @@ -50,7 +50,7 @@ #include #include #include -#include +#include #include #include #include "3d_cache/dialogs/panel_prev_model.h" @@ -60,12 +60,12 @@ #include -size_t DIALOG_MODULE_MODULE_EDITOR::m_page = 0; // remember the last open page during session +size_t DIALOG_FOOTPRINT_FP_EDITOR::m_page = 0; // remember the last open page during session -DIALOG_MODULE_MODULE_EDITOR::DIALOG_MODULE_MODULE_EDITOR( FOOTPRINT_EDIT_FRAME* aParent, +DIALOG_FOOTPRINT_FP_EDITOR::DIALOG_FOOTPRINT_FP_EDITOR( FOOTPRINT_EDIT_FRAME* aParent, MODULE* aModule ) : - DIALOG_MODULE_MODULE_EDITOR_BASE( aParent ) + DIALOG_FOOTPRINT_FP_EDITOR_BASE( aParent ) { m_parent = aParent; m_currentModule = aModule; @@ -99,7 +99,7 @@ DIALOG_MODULE_MODULE_EDITOR::DIALOG_MODULE_MODULE_EDITOR( FOOTPRINT_EDIT_FRAME* } -DIALOG_MODULE_MODULE_EDITOR::~DIALOG_MODULE_MODULE_EDITOR() +DIALOG_FOOTPRINT_FP_EDITOR::~DIALOG_FOOTPRINT_FP_EDITOR() { m_shapes3D_list.clear(); @@ -127,7 +127,7 @@ DIALOG_MODULE_MODULE_EDITOR::~DIALOG_MODULE_MODULE_EDITOR() } -void DIALOG_MODULE_MODULE_EDITOR::initModeditProperties() +void DIALOG_FOOTPRINT_FP_EDITOR::initModeditProperties() { SetFocus(); @@ -268,7 +268,7 @@ void DIALOG_MODULE_MODULE_EDITOR::initModeditProperties() } -void DIALOG_MODULE_MODULE_EDITOR::On3DShapeNameSelected(wxCommandEvent& event) +void DIALOG_FOOTPRINT_FP_EDITOR::On3DShapeNameSelected(wxCommandEvent& event) { m_lastSelected3DShapeIndex = m_3D_ShapeNameListBox->GetSelection(); @@ -295,7 +295,7 @@ void DIALOG_MODULE_MODULE_EDITOR::On3DShapeNameSelected(wxCommandEvent& event) } -void DIALOG_MODULE_MODULE_EDITOR::Remove3DShape( wxCommandEvent& event ) +void DIALOG_FOOTPRINT_FP_EDITOR::Remove3DShape( wxCommandEvent& event ) { int ii = m_3D_ShapeNameListBox->GetSelection(); @@ -332,7 +332,7 @@ void DIALOG_MODULE_MODULE_EDITOR::Remove3DShape( wxCommandEvent& event ) } -void DIALOG_MODULE_MODULE_EDITOR::Edit3DShapeFileName() +void DIALOG_FOOTPRINT_FP_EDITOR::Edit3DShapeFileName() { int idx = m_3D_ShapeNameListBox->GetSelection(); @@ -384,7 +384,7 @@ void DIALOG_MODULE_MODULE_EDITOR::Edit3DShapeFileName() } -void DIALOG_MODULE_MODULE_EDITOR::BrowseAndAdd3DShapeFile() +void DIALOG_FOOTPRINT_FP_EDITOR::BrowseAndAdd3DShapeFile() { PROJECT& prj = Prj(); MODULE_3D_SETTINGS model; @@ -449,7 +449,7 @@ void DIALOG_MODULE_MODULE_EDITOR::BrowseAndAdd3DShapeFile() } -bool DIALOG_MODULE_MODULE_EDITOR::TransferDataFromWindow() +bool DIALOG_FOOTPRINT_FP_EDITOR::TransferDataFromWindow() { wxString msg; // First, test for invalid chars in module name @@ -553,7 +553,7 @@ bool DIALOG_MODULE_MODULE_EDITOR::TransferDataFromWindow() } -void DIALOG_MODULE_MODULE_EDITOR::OnEditReference( wxCommandEvent& event ) +void DIALOG_FOOTPRINT_FP_EDITOR::OnEditReference( wxCommandEvent& event ) { wxPoint tmp = m_parent->GetCrossHairPosition(); m_parent->SetCrossHairPosition( m_referenceCopy->GetTextPos() ); @@ -566,7 +566,7 @@ void DIALOG_MODULE_MODULE_EDITOR::OnEditReference( wxCommandEvent& event ) } -void DIALOG_MODULE_MODULE_EDITOR::OnEditValue( wxCommandEvent& event ) +void DIALOG_FOOTPRINT_FP_EDITOR::OnEditValue( wxCommandEvent& event ) { wxPoint tmp = m_parent->GetCrossHairPosition(); m_parent->SetCrossHairPosition( m_valueCopy->GetTextPos() ); @@ -579,7 +579,7 @@ void DIALOG_MODULE_MODULE_EDITOR::OnEditValue( wxCommandEvent& event ) } -void DIALOG_MODULE_MODULE_EDITOR::Cfg3DPath( wxCommandEvent& event ) +void DIALOG_FOOTPRINT_FP_EDITOR::Cfg3DPath( wxCommandEvent& event ) { if( S3D::Configure3DPaths( this, Prj().Get3DCacheManager()->GetResolver() ) ) if( m_lastSelected3DShapeIndex >= 0 ) diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.h b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.h index 1d0f25a570..a4d55958d0 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.h +++ b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.h @@ -27,12 +27,12 @@ // Include the wxFormBuider header base: #include -#include +#include class PANEL_PREV_3D; class MODULE; -class DIALOG_MODULE_MODULE_EDITOR : public DIALOG_MODULE_MODULE_EDITOR_BASE +class DIALOG_FOOTPRINT_FP_EDITOR : public DIALOG_FOOTPRINT_FP_EDITOR_BASE { private: @@ -50,8 +50,8 @@ private: public: // Constructor and destructor - DIALOG_MODULE_MODULE_EDITOR( FOOTPRINT_EDIT_FRAME* aParent, MODULE* aModule ); - ~DIALOG_MODULE_MODULE_EDITOR(); + DIALOG_FOOTPRINT_FP_EDITOR( FOOTPRINT_EDIT_FRAME* aParent, MODULE* aModule ); + ~DIALOG_FOOTPRINT_FP_EDITOR(); private: void BrowseAndAdd3DShapeFile(); diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp index 605c49e042..bd83eed1be 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp +++ b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp @@ -7,11 +7,11 @@ #include "widgets/text_ctrl_eval.h" -#include "dialog_edit_footprint_for_Modedit_base.h" +#include "dialog_edit_footprint_for_fp_editor_base.h" /////////////////////////////////////////////////////////////////////////// -DIALOG_MODULE_MODULE_EDITOR_BASE::DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) +DIALOG_FOOTPRINT_FP_EDITOR_BASE::DIALOG_FOOTPRINT_FP_EDITOR_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( wxDefaultSize, wxDefaultSize ); @@ -320,28 +320,28 @@ DIALOG_MODULE_MODULE_EDITOR_BASE::DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* pa m_GeneralBoxSizer->Fit( this ); // Connect Events - this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_MODULE_MODULE_EDITOR_BASE::OnInitDlg ) ); - m_button4->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_MODULE_EDITOR_BASE::OnEditReference ), NULL, this ); - m_button5->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_MODULE_EDITOR_BASE::OnEditValue ), NULL, this ); - m_3D_ShapeNameListBox->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( DIALOG_MODULE_MODULE_EDITOR_BASE::On3DShapeNameSelected ), NULL, this ); - m_3D_ShapeNameListBox->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( DIALOG_MODULE_MODULE_EDITOR_BASE::Edit3DShapeFilename ), NULL, this ); - m_buttonBrowse->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_MODULE_EDITOR_BASE::Add3DShape ), NULL, this ); - m_buttonRemove->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_MODULE_EDITOR_BASE::Remove3DShape ), NULL, this ); - m_buttonEdit->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_MODULE_EDITOR_BASE::Edit3DShapeFilename ), NULL, this ); - m_button6->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_MODULE_EDITOR_BASE::Cfg3DPath ), NULL, this ); + this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_FOOTPRINT_FP_EDITOR_BASE::OnInitDlg ) ); + m_button4->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FOOTPRINT_FP_EDITOR_BASE::OnEditReference ), NULL, this ); + m_button5->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FOOTPRINT_FP_EDITOR_BASE::OnEditValue ), NULL, this ); + m_3D_ShapeNameListBox->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( DIALOG_FOOTPRINT_FP_EDITOR_BASE::On3DShapeNameSelected ), NULL, this ); + m_3D_ShapeNameListBox->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( DIALOG_FOOTPRINT_FP_EDITOR_BASE::Edit3DShapeFilename ), NULL, this ); + m_buttonBrowse->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FOOTPRINT_FP_EDITOR_BASE::Add3DShape ), NULL, this ); + m_buttonRemove->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FOOTPRINT_FP_EDITOR_BASE::Remove3DShape ), NULL, this ); + m_buttonEdit->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FOOTPRINT_FP_EDITOR_BASE::Edit3DShapeFilename ), NULL, this ); + m_button6->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FOOTPRINT_FP_EDITOR_BASE::Cfg3DPath ), NULL, this ); } -DIALOG_MODULE_MODULE_EDITOR_BASE::~DIALOG_MODULE_MODULE_EDITOR_BASE() +DIALOG_FOOTPRINT_FP_EDITOR_BASE::~DIALOG_FOOTPRINT_FP_EDITOR_BASE() { // Disconnect Events - this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_MODULE_MODULE_EDITOR_BASE::OnInitDlg ) ); - m_button4->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_MODULE_EDITOR_BASE::OnEditReference ), NULL, this ); - m_button5->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_MODULE_EDITOR_BASE::OnEditValue ), NULL, this ); - m_3D_ShapeNameListBox->Disconnect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( DIALOG_MODULE_MODULE_EDITOR_BASE::On3DShapeNameSelected ), NULL, this ); - m_3D_ShapeNameListBox->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( DIALOG_MODULE_MODULE_EDITOR_BASE::Edit3DShapeFilename ), NULL, this ); - m_buttonBrowse->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_MODULE_EDITOR_BASE::Add3DShape ), NULL, this ); - m_buttonRemove->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_MODULE_EDITOR_BASE::Remove3DShape ), NULL, this ); - m_buttonEdit->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_MODULE_EDITOR_BASE::Edit3DShapeFilename ), NULL, this ); - m_button6->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_MODULE_MODULE_EDITOR_BASE::Cfg3DPath ), NULL, this ); + this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_FOOTPRINT_FP_EDITOR_BASE::OnInitDlg ) ); + m_button4->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FOOTPRINT_FP_EDITOR_BASE::OnEditReference ), NULL, this ); + m_button5->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FOOTPRINT_FP_EDITOR_BASE::OnEditValue ), NULL, this ); + m_3D_ShapeNameListBox->Disconnect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( DIALOG_FOOTPRINT_FP_EDITOR_BASE::On3DShapeNameSelected ), NULL, this ); + m_3D_ShapeNameListBox->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( DIALOG_FOOTPRINT_FP_EDITOR_BASE::Edit3DShapeFilename ), NULL, this ); + m_buttonBrowse->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FOOTPRINT_FP_EDITOR_BASE::Add3DShape ), NULL, this ); + m_buttonRemove->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FOOTPRINT_FP_EDITOR_BASE::Remove3DShape ), NULL, this ); + m_buttonEdit->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FOOTPRINT_FP_EDITOR_BASE::Edit3DShapeFilename ), NULL, this ); + m_button6->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FOOTPRINT_FP_EDITOR_BASE::Cfg3DPath ), NULL, this ); } diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.fbp b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.fbp index 5d0882aefe..fc7b200bc2 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.fbp +++ b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.fbp @@ -11,11 +11,11 @@ res UTF-8 connect - dialog_edit_footprint_for_Modedit_base + dialog_edit_footprint_for_fp_editor_base 1000 none 1 - dialog_edit_footprint_for_Modedit_base + dialog_edit_footprint_for_fp_editor_base . @@ -42,7 +42,7 @@ wxID_ANY - DIALOG_MODULE_MODULE_EDITOR_BASE + DIALOG_FOOTPRINT_FP_EDITOR_BASE -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.h b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.h index 425ded8cf3..c0569ce81d 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.h +++ b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.h @@ -5,8 +5,8 @@ // PLEASE DO "NOT" EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#ifndef __DIALOG_EDIT_FOOTPRINT_FOR_MODEDIT_BASE_H__ -#define __DIALOG_EDIT_FOOTPRINT_FOR_MODEDIT_BASE_H__ +#ifndef __DIALOG_EDIT_FOOTPRINT_FOR_FP_EDITOR_BASE_H__ +#define __DIALOG_EDIT_FOOTPRINT_FOR_FP_EDITOR_BASE_H__ #include #include @@ -43,9 +43,9 @@ class TEXT_CTRL_EVAL; #define ID_REMOVE_3D_SHAPE 1002 /////////////////////////////////////////////////////////////////////////////// -/// Class DIALOG_MODULE_MODULE_EDITOR_BASE +/// Class DIALOG_FOOTPRINT_FP_EDITOR_BASE /////////////////////////////////////////////////////////////////////////////// -class DIALOG_MODULE_MODULE_EDITOR_BASE : public DIALOG_SHIM +class DIALOG_FOOTPRINT_FP_EDITOR_BASE : public DIALOG_SHIM { private: wxBoxSizer* m_GeneralBoxSizer; @@ -116,9 +116,9 @@ class DIALOG_MODULE_MODULE_EDITOR_BASE : public DIALOG_SHIM public: - DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Footprint Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); - ~DIALOG_MODULE_MODULE_EDITOR_BASE(); + DIALOG_FOOTPRINT_FP_EDITOR_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Footprint Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + ~DIALOG_FOOTPRINT_FP_EDITOR_BASE(); }; -#endif //__DIALOG_EDIT_FOOTPRINT_FOR_MODEDIT_BASE_H__ +#endif //__DIALOG_EDIT_FOOTPRINT_FOR_FP_EDITOR_BASE_H__ diff --git a/pcbnew/dialogs/dialog_edit_footprint_text_base.cpp b/pcbnew/dialogs/dialog_edit_footprint_text_base.cpp index d7ffdeebb7..8b9d328431 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_text_base.cpp +++ b/pcbnew/dialogs/dialog_edit_footprint_text_base.cpp @@ -8,7 +8,7 @@ #include "pcb_layer_box_selector.h" #include "widgets/text_ctrl_eval.h" -#include "dialog_edit_module_text_base.h" +#include "dialog_edit_footprint_text_base.h" /////////////////////////////////////////////////////////////////////////// diff --git a/pcbnew/dialogs/dialog_edit_footprint_text_base.fbp b/pcbnew/dialogs/dialog_edit_footprint_text_base.fbp index 107376f2e1..3841f9e6b0 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_text_base.fbp +++ b/pcbnew/dialogs/dialog_edit_footprint_text_base.fbp @@ -11,11 +11,11 @@ res UTF-8 connect - dialog_edit_module_text_base + dialog_edit_footprint_text_base 1000 none 1 - DialogEditModuleText_base + dialog_edit_footprint_text_base . diff --git a/pcbnew/dialogs/dialog_edit_footprint_text_base.h b/pcbnew/dialogs/dialog_edit_footprint_text_base.h index 546f3299c8..5bc5c63117 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_text_base.h +++ b/pcbnew/dialogs/dialog_edit_footprint_text_base.h @@ -5,8 +5,8 @@ // PLEASE DO "NOT" EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#ifndef __DIALOG_EDIT_MODULE_TEXT_BASE_H__ -#define __DIALOG_EDIT_MODULE_TEXT_BASE_H__ +#ifndef __DIALOG_EDIT_FOOTPRINT_TEXT_BASE_H__ +#define __DIALOG_EDIT_FOOTPRINT_TEXT_BASE_H__ #include #include @@ -81,4 +81,4 @@ class DIALOG_EDIT_FPTEXT_BASE : public DIALOG_SHIM }; -#endif //__DIALOG_EDIT_MODULE_TEXT_BASE_H__ +#endif //__DIALOG_EDIT_FOOTPRINT_TEXT_BASE_H__ diff --git a/pcbnew/dialogs/dialog_exchange_footprints.cpp b/pcbnew/dialogs/dialog_exchange_footprints.cpp index 829894c210..7b4a058b1d 100644 --- a/pcbnew/dialogs/dialog_exchange_footprints.cpp +++ b/pcbnew/dialogs/dialog_exchange_footprints.cpp @@ -40,7 +40,7 @@ #include #include -#include +#include #include #include @@ -53,15 +53,15 @@ static bool RecreateCmpFile( BOARD * aBrd, const wxString& aFullCmpFileName ); #define ID_MATCH_FP_VAL 4202 #define ID_MATCH_FP_ID 4203 -int DIALOG_EXCHANGE_MODULE::m_matchModeForUpdate = ID_MATCH_FP_ALL; -int DIALOG_EXCHANGE_MODULE::m_matchModeForExchange = ID_MATCH_FP_REF; -int DIALOG_EXCHANGE_MODULE::m_matchModeForUpdateSelected = ID_MATCH_FP_REF; -int DIALOG_EXCHANGE_MODULE::m_matchModeForExchangeSelected = ID_MATCH_FP_REF; +int DIALOG_EXCHANGE_FOOTPRINTS::m_matchModeForUpdate = ID_MATCH_FP_ALL; +int DIALOG_EXCHANGE_FOOTPRINTS::m_matchModeForExchange = ID_MATCH_FP_REF; +int DIALOG_EXCHANGE_FOOTPRINTS::m_matchModeForUpdateSelected = ID_MATCH_FP_REF; +int DIALOG_EXCHANGE_FOOTPRINTS::m_matchModeForExchangeSelected = ID_MATCH_FP_REF; -DIALOG_EXCHANGE_MODULE::DIALOG_EXCHANGE_MODULE( PCB_EDIT_FRAME* parent, MODULE* Module, +DIALOG_EXCHANGE_FOOTPRINTS::DIALOG_EXCHANGE_FOOTPRINTS( PCB_EDIT_FRAME* parent, MODULE* Module, bool updateMode ) : - DIALOG_EXCHANGE_MODULE_BASE( parent ), m_commit( parent ) + DIALOG_EXCHANGE_FOOTPRINTS_BASE( parent ), m_commit( parent ) { m_parent = parent; m_currentModule = Module; @@ -82,14 +82,14 @@ DIALOG_EXCHANGE_MODULE::DIALOG_EXCHANGE_MODULE( PCB_EDIT_FRAME* parent, MODULE* } -void DIALOG_EXCHANGE_MODULE::OnQuit( wxCommandEvent& event ) +void DIALOG_EXCHANGE_FOOTPRINTS::OnQuit( wxCommandEvent& event ) { Show( false ); EndQuasiModal( wxID_CANCEL ); } -void DIALOG_EXCHANGE_MODULE::init( bool updateMode ) +void DIALOG_EXCHANGE_FOOTPRINTS::init( bool updateMode ) { SetFocus(); @@ -174,7 +174,7 @@ void DIALOG_EXCHANGE_MODULE::init( bool updateMode ) } -int DIALOG_EXCHANGE_MODULE::getMatchMode() +int DIALOG_EXCHANGE_FOOTPRINTS::getMatchMode() { if( m_updateMode ) return( m_currentModule ? m_matchModeForUpdateSelected : m_matchModeForUpdate ); @@ -183,7 +183,7 @@ int DIALOG_EXCHANGE_MODULE::getMatchMode() } -void DIALOG_EXCHANGE_MODULE::setMatchMode( int aMatchMode ) +void DIALOG_EXCHANGE_FOOTPRINTS::setMatchMode( int aMatchMode ) { if( m_updateMode ) { @@ -202,7 +202,7 @@ void DIALOG_EXCHANGE_MODULE::setMatchMode( int aMatchMode ) } -bool DIALOG_EXCHANGE_MODULE::isMatch( MODULE* aModule ) +bool DIALOG_EXCHANGE_FOOTPRINTS::isMatch( MODULE* aModule ) { switch( getMatchMode() ) { @@ -227,7 +227,7 @@ bool DIALOG_EXCHANGE_MODULE::isMatch( MODULE* aModule ) } -wxRadioButton* DIALOG_EXCHANGE_MODULE::getRadioButtonForMode() +wxRadioButton* DIALOG_EXCHANGE_FOOTPRINTS::getRadioButtonForMode() { switch( getMatchMode() ) { @@ -245,7 +245,7 @@ wxRadioButton* DIALOG_EXCHANGE_MODULE::getRadioButtonForMode() } -void DIALOG_EXCHANGE_MODULE::updateMatchModeRadioButtons( wxUpdateUIEvent& ) +void DIALOG_EXCHANGE_FOOTPRINTS::updateMatchModeRadioButtons( wxUpdateUIEvent& ) { wxRadioButton* rb_button = getRadioButtonForMode(); @@ -271,14 +271,14 @@ void DIALOG_EXCHANGE_MODULE::updateMatchModeRadioButtons( wxUpdateUIEvent& ) } -void DIALOG_EXCHANGE_MODULE::OnMatchAllClicked( wxCommandEvent& event ) +void DIALOG_EXCHANGE_FOOTPRINTS::OnMatchAllClicked( wxCommandEvent& event ) { setMatchMode( ID_MATCH_FP_ALL ); m_matchAll->SetFocus(); } -void DIALOG_EXCHANGE_MODULE::OnMatchRefClicked( wxCommandEvent& event ) +void DIALOG_EXCHANGE_FOOTPRINTS::OnMatchRefClicked( wxCommandEvent& event ) { setMatchMode( ID_MATCH_FP_REF ); @@ -287,7 +287,7 @@ void DIALOG_EXCHANGE_MODULE::OnMatchRefClicked( wxCommandEvent& event ) } -void DIALOG_EXCHANGE_MODULE::OnMatchValueClicked( wxCommandEvent& event ) +void DIALOG_EXCHANGE_FOOTPRINTS::OnMatchValueClicked( wxCommandEvent& event ) { setMatchMode( ID_MATCH_FP_VAL ); @@ -296,7 +296,7 @@ void DIALOG_EXCHANGE_MODULE::OnMatchValueClicked( wxCommandEvent& event ) } -void DIALOG_EXCHANGE_MODULE::OnMatchIDClicked( wxCommandEvent& event ) +void DIALOG_EXCHANGE_FOOTPRINTS::OnMatchIDClicked( wxCommandEvent& event ) { setMatchMode( ID_MATCH_FP_ID ); @@ -305,7 +305,7 @@ void DIALOG_EXCHANGE_MODULE::OnMatchIDClicked( wxCommandEvent& event ) } -void DIALOG_EXCHANGE_MODULE::OnApplyClick( wxCommandEvent& event ) +void DIALOG_EXCHANGE_FOOTPRINTS::OnApplyClick( wxCommandEvent& event ) { bool result = false; @@ -329,7 +329,7 @@ void DIALOG_EXCHANGE_MODULE::OnApplyClick( wxCommandEvent& event ) } -void DIALOG_EXCHANGE_MODULE::RebuildCmpList( wxCommandEvent& event ) +void DIALOG_EXCHANGE_FOOTPRINTS::RebuildCmpList( wxCommandEvent& event ) { wxString msg; REPORTER& reporter = m_MessageWindow->Reporter(); @@ -354,7 +354,7 @@ void DIALOG_EXCHANGE_MODULE::RebuildCmpList( wxCommandEvent& event ) } -bool DIALOG_EXCHANGE_MODULE::changeCurrentFootprint() +bool DIALOG_EXCHANGE_FOOTPRINTS::changeCurrentFootprint() { if( m_updateMode ) return change_1_Module( m_currentModule, m_currentModule->GetFPID(), true ); @@ -368,7 +368,7 @@ bool DIALOG_EXCHANGE_MODULE::changeCurrentFootprint() } -bool DIALOG_EXCHANGE_MODULE::changeSameFootprints() +bool DIALOG_EXCHANGE_FOOTPRINTS::changeSameFootprints() { MODULE* Module; MODULE* PtBack; @@ -414,7 +414,7 @@ bool DIALOG_EXCHANGE_MODULE::changeSameFootprints() } -bool DIALOG_EXCHANGE_MODULE::change_1_Module( MODULE* aModule, +bool DIALOG_EXCHANGE_FOOTPRINTS::change_1_Module( MODULE* aModule, const LIB_ID& aNewFootprintFPID, bool aShowError ) { @@ -500,7 +500,7 @@ void PCB_EDIT_FRAME::Exchange_Module( MODULE* aOldModule, } -void DIALOG_EXCHANGE_MODULE::ViewAndSelectFootprint( wxCommandEvent& event ) +void DIALOG_EXCHANGE_FOOTPRINTS::ViewAndSelectFootprint( wxCommandEvent& event ) { wxString newname; diff --git a/pcbnew/dialogs/dialog_exchange_footprints.h b/pcbnew/dialogs/dialog_exchange_footprints.h index 6fb91804c8..2c3283bb1f 100644 --- a/pcbnew/dialogs/dialog_exchange_footprints.h +++ b/pcbnew/dialogs/dialog_exchange_footprints.h @@ -22,17 +22,17 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef DIALOG_EXCHANGE_MODULES_H_ -#define DIALOG_EXCHANGE_MODULES_H_ +#ifndef DIALOG_EXCHANGE_FOOTPRINTS_H_ +#define DIALOG_EXCHANGE_FOOTPRINTS_H_ -#include +#include #include class PCB_EDIT_FRAME; class MODULE; -class DIALOG_EXCHANGE_MODULE : public DIALOG_EXCHANGE_MODULE_BASE +class DIALOG_EXCHANGE_FOOTPRINTS : public DIALOG_EXCHANGE_FOOTPRINTS_BASE { private: PCB_EDIT_FRAME* m_parent; @@ -44,8 +44,8 @@ private: static int m_matchModeForExchangeSelected; // remember last match-mode public: - DIALOG_EXCHANGE_MODULE( PCB_EDIT_FRAME* aParent, MODULE* aModule, bool updateMode ); - ~DIALOG_EXCHANGE_MODULE() { }; + DIALOG_EXCHANGE_FOOTPRINTS( PCB_EDIT_FRAME* aParent, MODULE* aModule, bool updateMode ); + ~DIALOG_EXCHANGE_FOOTPRINTS() { }; private: void updateMatchModeRadioButtons( wxUpdateUIEvent& event ) override; @@ -75,4 +75,4 @@ private: BOARD_COMMIT m_commit; }; -#endif // DIALOG_EXCHANGE_MODULES_H_ +#endif // DIALOG_EXCHANGE_FOOTPRINTS_H_ diff --git a/pcbnew/dialogs/dialog_exchange_footprints_base.cpp b/pcbnew/dialogs/dialog_exchange_footprints_base.cpp index f9223189cf..c31c96b5e6 100644 --- a/pcbnew/dialogs/dialog_exchange_footprints_base.cpp +++ b/pcbnew/dialogs/dialog_exchange_footprints_base.cpp @@ -11,7 +11,7 @@ /////////////////////////////////////////////////////////////////////////// -DIALOG_EXCHANGE_MODULE_BASE::DIALOG_EXCHANGE_MODULE_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) +DIALOG_EXCHANGE_FOOTPRINTS_BASE::DIALOG_EXCHANGE_FOOTPRINTS_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( wxDefaultSize, wxDefaultSize ); @@ -139,42 +139,42 @@ DIALOG_EXCHANGE_MODULE_BASE::DIALOG_EXCHANGE_MODULE_BASE( wxWindow* parent, wxWi m_mainSizer->Fit( this ); // Connect Events - this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_EXCHANGE_MODULE_BASE::updateMatchModeRadioButtons ) ); - m_matchAll->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnMatchAllClicked ), NULL, this ); - m_matchCurrentRef->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnMatchRefClicked ), NULL, this ); - m_matchSpecifiedRef->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnMatchRefClicked ), NULL, this ); - m_specifiedRef->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnMatchRefClicked ), NULL, this ); - m_specifiedRef->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnMatchRefClicked ), NULL, this ); - m_matchCurrentValue->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnMatchValueClicked ), NULL, this ); - m_matchSpecifiedValue->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnMatchValueClicked ), NULL, this ); - m_specifiedValue->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnMatchValueClicked ), NULL, this ); - m_specifiedValue->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnMatchValueClicked ), NULL, this ); - m_matchSpecifiedID->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnMatchIDClicked ), NULL, this ); - m_specifiedIDBrowseButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::ViewAndSelectFootprint ), NULL, this ); - m_newIDBrowseButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::ViewAndSelectFootprint ), NULL, this ); - m_exportButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::RebuildCmpList ), NULL, this ); - m_applyButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnApplyClick ), NULL, this ); - m_closeButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnQuit ), NULL, this ); + this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_EXCHANGE_FOOTPRINTS_BASE::updateMatchModeRadioButtons ) ); + m_matchAll->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_EXCHANGE_FOOTPRINTS_BASE::OnMatchAllClicked ), NULL, this ); + m_matchCurrentRef->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_EXCHANGE_FOOTPRINTS_BASE::OnMatchRefClicked ), NULL, this ); + m_matchSpecifiedRef->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_EXCHANGE_FOOTPRINTS_BASE::OnMatchRefClicked ), NULL, this ); + m_specifiedRef->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_EXCHANGE_FOOTPRINTS_BASE::OnMatchRefClicked ), NULL, this ); + m_specifiedRef->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DIALOG_EXCHANGE_FOOTPRINTS_BASE::OnMatchRefClicked ), NULL, this ); + m_matchCurrentValue->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_EXCHANGE_FOOTPRINTS_BASE::OnMatchValueClicked ), NULL, this ); + m_matchSpecifiedValue->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_EXCHANGE_FOOTPRINTS_BASE::OnMatchValueClicked ), NULL, this ); + m_specifiedValue->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_EXCHANGE_FOOTPRINTS_BASE::OnMatchValueClicked ), NULL, this ); + m_specifiedValue->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DIALOG_EXCHANGE_FOOTPRINTS_BASE::OnMatchValueClicked ), NULL, this ); + m_matchSpecifiedID->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_EXCHANGE_FOOTPRINTS_BASE::OnMatchIDClicked ), NULL, this ); + m_specifiedIDBrowseButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXCHANGE_FOOTPRINTS_BASE::ViewAndSelectFootprint ), NULL, this ); + m_newIDBrowseButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXCHANGE_FOOTPRINTS_BASE::ViewAndSelectFootprint ), NULL, this ); + m_exportButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXCHANGE_FOOTPRINTS_BASE::RebuildCmpList ), NULL, this ); + m_applyButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXCHANGE_FOOTPRINTS_BASE::OnApplyClick ), NULL, this ); + m_closeButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXCHANGE_FOOTPRINTS_BASE::OnQuit ), NULL, this ); } -DIALOG_EXCHANGE_MODULE_BASE::~DIALOG_EXCHANGE_MODULE_BASE() +DIALOG_EXCHANGE_FOOTPRINTS_BASE::~DIALOG_EXCHANGE_FOOTPRINTS_BASE() { // Disconnect Events - this->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_EXCHANGE_MODULE_BASE::updateMatchModeRadioButtons ) ); - m_matchAll->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnMatchAllClicked ), NULL, this ); - m_matchCurrentRef->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnMatchRefClicked ), NULL, this ); - m_matchSpecifiedRef->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnMatchRefClicked ), NULL, this ); - m_specifiedRef->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnMatchRefClicked ), NULL, this ); - m_specifiedRef->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnMatchRefClicked ), NULL, this ); - m_matchCurrentValue->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnMatchValueClicked ), NULL, this ); - m_matchSpecifiedValue->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnMatchValueClicked ), NULL, this ); - m_specifiedValue->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnMatchValueClicked ), NULL, this ); - m_specifiedValue->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnMatchValueClicked ), NULL, this ); - m_matchSpecifiedID->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnMatchIDClicked ), NULL, this ); - m_specifiedIDBrowseButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::ViewAndSelectFootprint ), NULL, this ); - m_newIDBrowseButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::ViewAndSelectFootprint ), NULL, this ); - m_exportButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::RebuildCmpList ), NULL, this ); - m_applyButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnApplyClick ), NULL, this ); - m_closeButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnQuit ), NULL, this ); + this->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_EXCHANGE_FOOTPRINTS_BASE::updateMatchModeRadioButtons ) ); + m_matchAll->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_EXCHANGE_FOOTPRINTS_BASE::OnMatchAllClicked ), NULL, this ); + m_matchCurrentRef->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_EXCHANGE_FOOTPRINTS_BASE::OnMatchRefClicked ), NULL, this ); + m_matchSpecifiedRef->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_EXCHANGE_FOOTPRINTS_BASE::OnMatchRefClicked ), NULL, this ); + m_specifiedRef->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_EXCHANGE_FOOTPRINTS_BASE::OnMatchRefClicked ), NULL, this ); + m_specifiedRef->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DIALOG_EXCHANGE_FOOTPRINTS_BASE::OnMatchRefClicked ), NULL, this ); + m_matchCurrentValue->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_EXCHANGE_FOOTPRINTS_BASE::OnMatchValueClicked ), NULL, this ); + m_matchSpecifiedValue->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_EXCHANGE_FOOTPRINTS_BASE::OnMatchValueClicked ), NULL, this ); + m_specifiedValue->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_EXCHANGE_FOOTPRINTS_BASE::OnMatchValueClicked ), NULL, this ); + m_specifiedValue->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DIALOG_EXCHANGE_FOOTPRINTS_BASE::OnMatchValueClicked ), NULL, this ); + m_matchSpecifiedID->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_EXCHANGE_FOOTPRINTS_BASE::OnMatchIDClicked ), NULL, this ); + m_specifiedIDBrowseButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXCHANGE_FOOTPRINTS_BASE::ViewAndSelectFootprint ), NULL, this ); + m_newIDBrowseButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXCHANGE_FOOTPRINTS_BASE::ViewAndSelectFootprint ), NULL, this ); + m_exportButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXCHANGE_FOOTPRINTS_BASE::RebuildCmpList ), NULL, this ); + m_applyButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXCHANGE_FOOTPRINTS_BASE::OnApplyClick ), NULL, this ); + m_closeButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXCHANGE_FOOTPRINTS_BASE::OnQuit ), NULL, this ); } diff --git a/pcbnew/dialogs/dialog_exchange_footprints_base.fbp b/pcbnew/dialogs/dialog_exchange_footprints_base.fbp index 92a1be65ab..106c4d50db 100644 --- a/pcbnew/dialogs/dialog_exchange_footprints_base.fbp +++ b/pcbnew/dialogs/dialog_exchange_footprints_base.fbp @@ -42,7 +42,7 @@ wxID_ANY - DIALOG_EXCHANGE_MODULE_BASE + DIALOG_EXCHANGE_FOOTPRINTS_BASE -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER diff --git a/pcbnew/dialogs/dialog_exchange_footprints_base.h b/pcbnew/dialogs/dialog_exchange_footprints_base.h index 6e6266b490..1d7f9a6606 100644 --- a/pcbnew/dialogs/dialog_exchange_footprints_base.h +++ b/pcbnew/dialogs/dialog_exchange_footprints_base.h @@ -38,9 +38,9 @@ class WX_HTML_REPORT_PANEL; /////////////////////////////////////////////////////////////////////////////// -/// Class DIALOG_EXCHANGE_MODULE_BASE +/// Class DIALOG_EXCHANGE_FOOTPRINTS_BASE /////////////////////////////////////////////////////////////////////////////// -class DIALOG_EXCHANGE_MODULE_BASE : public DIALOG_SHIM +class DIALOG_EXCHANGE_FOOTPRINTS_BASE : public DIALOG_SHIM { private: @@ -79,8 +79,8 @@ class DIALOG_EXCHANGE_MODULE_BASE : public DIALOG_SHIM public: - DIALOG_EXCHANGE_MODULE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("%s"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); - ~DIALOG_EXCHANGE_MODULE_BASE(); + DIALOG_EXCHANGE_FOOTPRINTS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("%s"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + ~DIALOG_EXCHANGE_FOOTPRINTS_BASE(); }; diff --git a/pcbnew/dialogs/dialog_gen_footprint_position_file_base.cpp b/pcbnew/dialogs/dialog_gen_footprint_position_file_base.cpp index 120f03267c..45dc8ff309 100644 --- a/pcbnew/dialogs/dialog_gen_footprint_position_file_base.cpp +++ b/pcbnew/dialogs/dialog_gen_footprint_position_file_base.cpp @@ -11,7 +11,7 @@ /////////////////////////////////////////////////////////////////////////// -DIALOG_GEN_MODULE_POSITION_BASE::DIALOG_GEN_MODULE_POSITION_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) +DIALOG_GEN_FOOTPRINT_POSITION_BASE::DIALOG_GEN_FOOTPRINT_POSITION_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 ); @@ -110,14 +110,14 @@ DIALOG_GEN_MODULE_POSITION_BASE::DIALOG_GEN_MODULE_POSITION_BASE( wxWindow* pare this->Centre( wxBOTH ); // Connect Events - m_browseButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GEN_MODULE_POSITION_BASE::OnOutputDirectoryBrowseClicked ), NULL, this ); - m_sdbSizerButtonsOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GEN_MODULE_POSITION_BASE::OnOKButton ), NULL, this ); + m_browseButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GEN_FOOTPRINT_POSITION_BASE::OnOutputDirectoryBrowseClicked ), NULL, this ); + m_sdbSizerButtonsOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GEN_FOOTPRINT_POSITION_BASE::OnOKButton ), NULL, this ); } -DIALOG_GEN_MODULE_POSITION_BASE::~DIALOG_GEN_MODULE_POSITION_BASE() +DIALOG_GEN_FOOTPRINT_POSITION_BASE::~DIALOG_GEN_FOOTPRINT_POSITION_BASE() { // Disconnect Events - m_browseButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GEN_MODULE_POSITION_BASE::OnOutputDirectoryBrowseClicked ), NULL, this ); - m_sdbSizerButtonsOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GEN_MODULE_POSITION_BASE::OnOKButton ), NULL, this ); + m_browseButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GEN_FOOTPRINT_POSITION_BASE::OnOutputDirectoryBrowseClicked ), NULL, this ); + m_sdbSizerButtonsOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GEN_FOOTPRINT_POSITION_BASE::OnOKButton ), NULL, this ); } diff --git a/pcbnew/dialogs/dialog_gen_footprint_position_file_base.fbp b/pcbnew/dialogs/dialog_gen_footprint_position_file_base.fbp index cfcb208014..107aa41e64 100644 --- a/pcbnew/dialogs/dialog_gen_footprint_position_file_base.fbp +++ b/pcbnew/dialogs/dialog_gen_footprint_position_file_base.fbp @@ -42,7 +42,7 @@ wxID_ANY -1,-1 - DIALOG_GEN_MODULE_POSITION_BASE + DIALOG_GEN_FOOTPRINT_POSITION_BASE -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER diff --git a/pcbnew/dialogs/dialog_gen_footprint_position_file_base.h b/pcbnew/dialogs/dialog_gen_footprint_position_file_base.h index c160808eff..4284d965ed 100644 --- a/pcbnew/dialogs/dialog_gen_footprint_position_file_base.h +++ b/pcbnew/dialogs/dialog_gen_footprint_position_file_base.h @@ -31,9 +31,9 @@ class WX_HTML_REPORT_PANEL; /////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// -/// Class DIALOG_GEN_MODULE_POSITION_BASE +/// Class DIALOG_GEN_FOOTPRINT_POSITION_BASE /////////////////////////////////////////////////////////////////////////////// -class DIALOG_GEN_MODULE_POSITION_BASE : public DIALOG_SHIM +class DIALOG_GEN_FOOTPRINT_POSITION_BASE : public DIALOG_SHIM { private: @@ -58,8 +58,8 @@ class DIALOG_GEN_MODULE_POSITION_BASE : public DIALOG_SHIM public: - DIALOG_GEN_MODULE_POSITION_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Generate Footprint Position Files"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); - ~DIALOG_GEN_MODULE_POSITION_BASE(); + DIALOG_GEN_FOOTPRINT_POSITION_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Generate Footprint Position Files"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + ~DIALOG_GEN_FOOTPRINT_POSITION_BASE(); }; diff --git a/pcbnew/dialogs/dialog_global_footprints_fields_edition.cpp b/pcbnew/dialogs/dialog_global_footprints_fields_edition.cpp index 0e7db1fa5d..ad0bc2e806 100644 --- a/pcbnew/dialogs/dialog_global_footprints_fields_edition.cpp +++ b/pcbnew/dialogs/dialog_global_footprints_fields_edition.cpp @@ -2,7 +2,7 @@ * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2012 Jean-Pierre Charras, jp.charras at wanadoo.fr - * Copyright (C) 1992-2012 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 1992-201_ KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -23,8 +23,8 @@ */ /** - * @file dialog_global_modules_fields_edition.cpp - * @brief global module fields edition. + * @file dialog_global_footprints_fields_edition.cpp + * @brief global footprint fields edition. */ #include @@ -42,14 +42,14 @@ #include #include #include -#include +#include // The dialog to set options for global fields edition: // optionas are: // - edited fields (ref, value, others // - the footprint filter, for selective edition -class DIALOG_GLOBAL_MODULES_FIELDS_EDITION : public DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE +class DIALOG_GLOBAL_FOOTPRINTS_FIELDS_EDITION : public DIALOG_GLOBAL_FOOTPRINTS_FIELDS_EDITION_BASE { PCB_EDIT_FRAME* m_parent; BOARD_DESIGN_SETTINGS* m_brdSettings; @@ -61,8 +61,8 @@ class DIALOG_GLOBAL_MODULES_FIELDS_EDITION : public DIALOG_GLOBAL_MODULES_FIELDS public: - DIALOG_GLOBAL_MODULES_FIELDS_EDITION( PCB_EDIT_FRAME* parent ) - : DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE( parent ) + DIALOG_GLOBAL_FOOTPRINTS_FIELDS_EDITION( PCB_EDIT_FRAME* parent ) + : DIALOG_GLOBAL_FOOTPRINTS_FIELDS_EDITION_BASE( parent ) { m_parent = parent; initDialog(); @@ -74,12 +74,12 @@ private: bool TransferDataFromWindow() override; }; -bool DIALOG_GLOBAL_MODULES_FIELDS_EDITION::m_refSelection = false; -bool DIALOG_GLOBAL_MODULES_FIELDS_EDITION::m_valueSelection = false; -bool DIALOG_GLOBAL_MODULES_FIELDS_EDITION::m_othersSelection = false; -wxString DIALOG_GLOBAL_MODULES_FIELDS_EDITION::m_filterString; +bool DIALOG_GLOBAL_FOOTPRINTS_FIELDS_EDITION::m_refSelection = false; +bool DIALOG_GLOBAL_FOOTPRINTS_FIELDS_EDITION::m_valueSelection = false; +bool DIALOG_GLOBAL_FOOTPRINTS_FIELDS_EDITION::m_othersSelection = false; +wxString DIALOG_GLOBAL_FOOTPRINTS_FIELDS_EDITION::m_filterString; -void DIALOG_GLOBAL_MODULES_FIELDS_EDITION::initDialog() +void DIALOG_GLOBAL_FOOTPRINTS_FIELDS_EDITION::initDialog() { m_sdbSizerButtonsOK->SetDefault(); @@ -105,7 +105,7 @@ void DIALOG_GLOBAL_MODULES_FIELDS_EDITION::initDialog() } -bool DIALOG_GLOBAL_MODULES_FIELDS_EDITION::TransferDataFromWindow() +bool DIALOG_GLOBAL_FOOTPRINTS_FIELDS_EDITION::TransferDataFromWindow() { m_refSelection = m_ReferenceOpt->GetValue(); m_valueSelection = m_ValueOpt->GetValue(); @@ -130,7 +130,7 @@ bool DIALOG_GLOBAL_MODULES_FIELDS_EDITION::TransferDataFromWindow() void PCB_EDIT_FRAME::OnResetModuleTextSizes( wxCommandEvent& event ) { - DIALOG_GLOBAL_MODULES_FIELDS_EDITION dlg( this ); + DIALOG_GLOBAL_FOOTPRINTS_FIELDS_EDITION dlg( this ); dlg.ShowModal(); } diff --git a/pcbnew/dialogs/dialog_global_footprints_fields_edition_base.cpp b/pcbnew/dialogs/dialog_global_footprints_fields_edition_base.cpp index 400ae399a8..a26d5d4edf 100644 --- a/pcbnew/dialogs/dialog_global_footprints_fields_edition_base.cpp +++ b/pcbnew/dialogs/dialog_global_footprints_fields_edition_base.cpp @@ -9,7 +9,7 @@ /////////////////////////////////////////////////////////////////////////// -DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE::DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) +DIALOG_GLOBAL_FOOTPRINTS_FIELDS_EDITION_BASE::DIALOG_GLOBAL_FOOTPRINTS_FIELDS_EDITION_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( wxDefaultSize, wxDefaultSize ); @@ -124,6 +124,6 @@ DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE::DIALOG_GLOBAL_MODULES_FIELDS_EDITION_ bMainSizer->Fit( this ); } -DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE::~DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE() +DIALOG_GLOBAL_FOOTPRINTS_FIELDS_EDITION_BASE::~DIALOG_GLOBAL_FOOTPRINTS_FIELDS_EDITION_BASE() { } diff --git a/pcbnew/dialogs/dialog_global_footprints_fields_edition_base.fbp b/pcbnew/dialogs/dialog_global_footprints_fields_edition_base.fbp index c507eb8170..5cd4460b6d 100644 --- a/pcbnew/dialogs/dialog_global_footprints_fields_edition_base.fbp +++ b/pcbnew/dialogs/dialog_global_footprints_fields_edition_base.fbp @@ -42,7 +42,7 @@ wxID_ANY - DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE + DIALOG_GLOBAL_FOOTPRINTS_FIELDS_EDITION_BASE -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER diff --git a/pcbnew/dialogs/dialog_global_footprints_fields_edition_base.h b/pcbnew/dialogs/dialog_global_footprints_fields_edition_base.h index eb5f4d610b..bce45abe31 100644 --- a/pcbnew/dialogs/dialog_global_footprints_fields_edition_base.h +++ b/pcbnew/dialogs/dialog_global_footprints_fields_edition_base.h @@ -32,9 +32,9 @@ class DIALOG_SHIM; /////////////////////////////////////////////////////////////////////////////// -/// Class DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE +/// Class DIALOG_GLOBAL_FOOTPRINTS_FIELDS_EDITION_BASE /////////////////////////////////////////////////////////////////////////////// -class DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE : public DIALOG_SHIM +class DIALOG_GLOBAL_FOOTPRINTS_FIELDS_EDITION_BASE : public DIALOG_SHIM { private: @@ -60,8 +60,8 @@ class DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE : public DIALOG_SHIM public: - DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Set Text Size"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); - ~DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE(); + DIALOG_GLOBAL_FOOTPRINTS_FIELDS_EDITION_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Set Text Size"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + ~DIALOG_GLOBAL_FOOTPRINTS_FIELDS_EDITION_BASE(); }; diff --git a/pcbnew/exporters/gen_footprints_placefile.cpp b/pcbnew/exporters/gen_footprints_placefile.cpp index 40a9d29177..e44c4584b5 100644 --- a/pcbnew/exporters/gen_footprints_placefile.cpp +++ b/pcbnew/exporters/gen_footprints_placefile.cpp @@ -91,11 +91,11 @@ public: * The dialog to create footprint position files, * and choose options (one or 2 files, units and force all SMD footprints in list) */ -class DIALOG_GEN_MODULE_POSITION : public DIALOG_GEN_MODULE_POSITION_BASE +class DIALOG_GEN_FOOTPRINT_POSITION : public DIALOG_GEN_FOOTPRINT_POSITION_BASE { public: - DIALOG_GEN_MODULE_POSITION( PCB_EDIT_FRAME * aParent ): - DIALOG_GEN_MODULE_POSITION_BASE( aParent ), + DIALOG_GEN_FOOTPRINT_POSITION( PCB_EDIT_FRAME * aParent ): + DIALOG_GEN_FOOTPRINT_POSITION_BASE( aParent ), m_parent( aParent ), m_plotOpts( aParent->GetPlotSettings() ) { @@ -146,16 +146,16 @@ private: // Static members to remember choices -int DIALOG_GEN_MODULE_POSITION::m_unitsOpt = 0; -int DIALOG_GEN_MODULE_POSITION::m_fileOpt = 0; -int DIALOG_GEN_MODULE_POSITION::m_fileFormat = 0; +int DIALOG_GEN_FOOTPRINT_POSITION::m_unitsOpt = 0; +int DIALOG_GEN_FOOTPRINT_POSITION::m_fileOpt = 0; +int DIALOG_GEN_FOOTPRINT_POSITION::m_fileFormat = 0; // Use standard board side name. do not translate them, // they are keywords in place file const wxString frontSideName = wxT( "top" ); const wxString backSideName = wxT( "bottom" ); -void DIALOG_GEN_MODULE_POSITION::initDialog() +void DIALOG_GEN_FOOTPRINT_POSITION::initDialog() { m_config = Kiface().KifaceSettings(); m_config->Read( PLACEFILE_UNITS_KEY, &m_unitsOpt, 1 ); @@ -171,7 +171,7 @@ void DIALOG_GEN_MODULE_POSITION::initDialog() m_sdbSizerButtonsOK->SetDefault(); } -void DIALOG_GEN_MODULE_POSITION::OnOutputDirectoryBrowseClicked( wxCommandEvent& event ) +void DIALOG_GEN_FOOTPRINT_POSITION::OnOutputDirectoryBrowseClicked( wxCommandEvent& event ) { // Build the absolute path of current output plot directory // to preselect it when opening the dialog. @@ -200,7 +200,7 @@ void DIALOG_GEN_MODULE_POSITION::OnOutputDirectoryBrowseClicked( wxCommandEvent& m_outputDirectoryName->SetValue( dirName.GetFullPath() ); } -void DIALOG_GEN_MODULE_POSITION::OnOKButton( wxCommandEvent& event ) +void DIALOG_GEN_FOOTPRINT_POSITION::OnOKButton( wxCommandEvent& event ) { m_unitsOpt = m_radioBoxUnits->GetSelection(); m_fileOpt = m_radioBoxFilesCount->GetSelection(); @@ -226,7 +226,7 @@ void DIALOG_GEN_MODULE_POSITION::OnOKButton( wxCommandEvent& event ) } -bool DIALOG_GEN_MODULE_POSITION::CreateFiles() +bool DIALOG_GEN_FOOTPRINT_POSITION::CreateFiles() { BOARD * brd = m_parent->GetBoard(); wxFileName fn; @@ -401,7 +401,7 @@ static bool HasNonSMDPins( MODULE* aModule ) void PCB_EDIT_FRAME::GenFootprintsPositionFile( wxCommandEvent& event ) { - DIALOG_GEN_MODULE_POSITION dlg( this ); + DIALOG_GEN_FOOTPRINT_POSITION dlg( this ); dlg.ShowModal(); } diff --git a/pcbnew/footprint_edit_frame.cpp b/pcbnew/footprint_edit_frame.cpp index 8a24667c9c..41c714cdfa 100644 --- a/pcbnew/footprint_edit_frame.cpp +++ b/pcbnew/footprint_edit_frame.cpp @@ -66,7 +66,7 @@ #include "tools/drawing_tool.h" #include "tools/point_editor.h" #include "tools/pcbnew_control.h" -#include "tools/module_editor_tools.h" +#include "tools/footprint_editor_tools.h" #include "tools/placement_tool.h" #include "tools/picker_tool.h" #include "tools/pad_tool.h" diff --git a/pcbnew/footprint_editor_onclick.cpp b/pcbnew/footprint_editor_onclick.cpp index 32a0ce3cf2..f33886bb75 100644 --- a/pcbnew/footprint_editor_onclick.cpp +++ b/pcbnew/footprint_editor_onclick.cpp @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include @@ -531,7 +531,7 @@ void FOOTPRINT_EDIT_FRAME::OnEditItemRequest( wxDC* aDC, BOARD_ITEM* aItem ) case PCB_MODULE_T: { - DIALOG_MODULE_MODULE_EDITOR dialog( this, static_cast( aItem ) ); + DIALOG_FOOTPRINT_FP_EDITOR dialog( this, static_cast( aItem ) ); dialog.ShowModal(); GetScreen()->GetCurItem()->ClearFlags(); m_canvas->MoveCursorToCrossHair(); diff --git a/pcbnew/footprint_editor_utils.cpp b/pcbnew/footprint_editor_utils.cpp index b49ee805a1..2dddd85292 100644 --- a/pcbnew/footprint_editor_utils.cpp +++ b/pcbnew/footprint_editor_utils.cpp @@ -56,7 +56,7 @@ #include #include -#include +#include #include #include #include @@ -578,7 +578,7 @@ void FOOTPRINT_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event ) { SetCurItem( GetBoard()->m_Modules ); - DIALOG_MODULE_MODULE_EDITOR dialog( this, (MODULE*) GetScreen()->GetCurItem() ); + DIALOG_FOOTPRINT_FP_EDITOR dialog( this, (MODULE*) GetScreen()->GetCurItem() ); dialog.ShowModal(); GetScreen()->GetCurItem()->ClearFlags(); @@ -607,7 +607,7 @@ void FOOTPRINT_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event ) case ID_POPUP_PCB_EDIT_MODULE_PRMS: { - DIALOG_MODULE_MODULE_EDITOR dialog( this, (MODULE*) GetScreen()->GetCurItem() ); + DIALOG_FOOTPRINT_FP_EDITOR dialog( this, (MODULE*) GetScreen()->GetCurItem() ); dialog.ShowModal(); GetScreen()->GetCurItem()->ClearFlags(); m_canvas->MoveCursorToCrossHair(); diff --git a/pcbnew/footprint_info_impl.cpp b/pcbnew/footprint_info_impl.cpp index a5ba83c166..18b33f8ec9 100644 --- a/pcbnew/footprint_info_impl.cpp +++ b/pcbnew/footprint_info_impl.cpp @@ -227,7 +227,7 @@ bool FOOTPRINT_LIST_IMPL::JoinWorkers() SYNC_QUEUE> queue_parsed; std::vector threads; - for( size_t i = 0; i < std::thread::hardware_concurrency() + 1; ++i ) + for( size_t ii = 0; ii < std::thread::hardware_concurrency() + 1; ++ii ) { threads.push_back( std::thread( [this, &queue_parsed]() { wxString nickname; @@ -258,9 +258,9 @@ bool FOOTPRINT_LIST_IMPL::JoinWorkers() } } - for( int i = 0; i < fpnames.size() && !m_cancelled; i++ ) + for( unsigned jj = 0; jj < fpnames.size() && !m_cancelled; ++jj ) { - wxString fpname = fpnames[ i ]; + wxString fpname = fpnames[jj]; FOOTPRINT_INFO* fpinfo = new FOOTPRINT_INFO_IMPL( this, nickname, fpname ); queue_parsed.move_push( std::unique_ptr( fpinfo ) ); } diff --git a/pcbnew/pcb_edit_frame.cpp b/pcbnew/pcb_edit_frame.cpp index 1161cc87f8..43a0184253 100644 --- a/pcbnew/pcb_edit_frame.cpp +++ b/pcbnew/pcb_edit_frame.cpp @@ -50,8 +50,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -1292,7 +1292,7 @@ void PCB_EDIT_FRAME::InstallFootprintPropertiesDialog( MODULE* Module, wxDC* DC DC = NULL; #endif - DIALOG_MODULE_BOARD_EDITOR* dlg = new DIALOG_MODULE_BOARD_EDITOR( this, Module, DC ); + DIALOG_FOOTPRINT_BOARD_EDITOR* dlg = new DIALOG_FOOTPRINT_BOARD_EDITOR( this, Module, DC ); int retvalue = dlg->ShowModal(); /* retvalue = @@ -1307,11 +1307,11 @@ void PCB_EDIT_FRAME::InstallFootprintPropertiesDialog( MODULE* Module, wxDC* DC #ifdef __WXMAC__ // If something edited, push a refresh request - if( retvalue == DIALOG_MODULE_BOARD_EDITOR::PRM_EDITOR_EDIT_OK ) + if( retvalue == DIALOG_FOOTPRINT_BOARD_EDITOR::PRM_EDITOR_EDIT_OK ) m_canvas->Refresh(); #endif - if( retvalue == DIALOG_MODULE_BOARD_EDITOR::PRM_EDITOR_WANT_MODEDIT ) + if( retvalue == DIALOG_FOOTPRINT_BOARD_EDITOR::PRM_EDITOR_WANT_MODEDIT ) { FOOTPRINT_EDIT_FRAME* editor = (FOOTPRINT_EDIT_FRAME*) Kiway().Player( FRAME_PCB_MODULE_EDITOR, true ); @@ -1322,12 +1322,12 @@ void PCB_EDIT_FRAME::InstallFootprintPropertiesDialog( MODULE* Module, wxDC* DC editor->Raise(); // Iconize( false ); } - if( retvalue == DIALOG_MODULE_BOARD_EDITOR::PRM_EDITOR_WANT_UPDATE_FP ) + if( retvalue == DIALOG_FOOTPRINT_BOARD_EDITOR::PRM_EDITOR_WANT_UPDATE_FP ) { InstallExchangeModuleFrame( Module, true ); } - if( retvalue == DIALOG_MODULE_BOARD_EDITOR::PRM_EDITOR_WANT_EXCHANGE_FP ) + if( retvalue == DIALOG_FOOTPRINT_BOARD_EDITOR::PRM_EDITOR_WANT_EXCHANGE_FP ) { InstallExchangeModuleFrame( Module, false ); } @@ -1336,7 +1336,7 @@ void PCB_EDIT_FRAME::InstallFootprintPropertiesDialog( MODULE* Module, wxDC* DC int PCB_EDIT_FRAME::InstallExchangeModuleFrame( MODULE* Module, bool updateMode ) { - DIALOG_EXCHANGE_MODULE dialog( this, Module, updateMode ); + DIALOG_EXCHANGE_FOOTPRINTS dialog( this, Module, updateMode ); return dialog.ShowQuasiModal(); } diff --git a/pcbnew/swig/pcbnew.i b/pcbnew/swig/pcbnew.i index f88b5b9bfe..3181df762a 100644 --- a/pcbnew/swig/pcbnew.i +++ b/pcbnew/swig/pcbnew.i @@ -121,7 +121,7 @@ HANDLE_EXCEPTIONS(LoadBoard) %include board.i -%include module.i +%include footprint.i %include plugins.i %include units.i diff --git a/pcbnew/tools/drawing_tool.cpp b/pcbnew/tools/drawing_tool.cpp index 6fc891475c..5e1495c80d 100644 --- a/pcbnew/tools/drawing_tool.cpp +++ b/pcbnew/tools/drawing_tool.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include diff --git a/pcbnew/tools/edit_tool.cpp b/pcbnew/tools/edit_tool.cpp index 67f2691ed8..35cb02da3a 100644 --- a/pcbnew/tools/edit_tool.cpp +++ b/pcbnew/tools/edit_tool.cpp @@ -63,7 +63,7 @@ using namespace std::placeholders; #include #include -#include +#include #include @@ -1120,7 +1120,7 @@ int EDIT_TOOL::ExchangeFootprints( const TOOL_EVENT& aEvent ) // invoke the exchange dialog process { - DIALOG_EXCHANGE_MODULE dialog( frame(), mod, updateMode ); + DIALOG_EXCHANGE_FOOTPRINTS dialog( frame(), mod, updateMode ); dialog.ShowQuasiModal(); } diff --git a/pcbnew/tools/footprint_editor_tools.cpp b/pcbnew/tools/footprint_editor_tools.cpp index 495feb3c1a..d49b56b4cd 100644 --- a/pcbnew/tools/footprint_editor_tools.cpp +++ b/pcbnew/tools/footprint_editor_tools.cpp @@ -22,7 +22,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "module_editor_tools.h" +#include "footprint_editor_tools.h" #include "kicad_clipboard.h" #include "selection_tool.h" #include "pcb_actions.h"