Browse Source

Treat action buttons in Symbol/Footprint Properties as OK, not Cancel.

Fixes https://gitlab.com/kicad/code/kicad/issues/7001
6.0.7
Jeff Young 5 years ago
parent
commit
7760570d76
  1. 12
      eeschema/dialogs/dialog_symbol_properties.cpp
  2. 28
      pcbnew/dialogs/dialog_footprint_properties.cpp

12
eeschema/dialogs/dialog_symbol_properties.cpp

@ -906,25 +906,29 @@ void DIALOG_SYMBOL_PROPERTIES::OnMoveDown( wxCommandEvent& event )
void DIALOG_SYMBOL_PROPERTIES::OnEditSymbol( wxCommandEvent& )
{
EndQuasiModal( SYMBOL_PROPS_EDIT_SCHEMATIC_SYMBOL );
if( TransferDataFromWindow() )
EndQuasiModal( SYMBOL_PROPS_EDIT_SCHEMATIC_SYMBOL );
}
void DIALOG_SYMBOL_PROPERTIES::OnEditLibrarySymbol( wxCommandEvent& )
{
EndQuasiModal( SYMBOL_PROPS_EDIT_LIBRARY_SYMBOL );
if( TransferDataFromWindow() )
EndQuasiModal( SYMBOL_PROPS_EDIT_LIBRARY_SYMBOL );
}
void DIALOG_SYMBOL_PROPERTIES::OnUpdateSymbol( wxCommandEvent& )
{
EndQuasiModal( SYMBOL_PROPS_WANT_UPDATE_SYMBOL );
if( TransferDataFromWindow() )
EndQuasiModal( SYMBOL_PROPS_WANT_UPDATE_SYMBOL );
}
void DIALOG_SYMBOL_PROPERTIES::OnExchangeSymbol( wxCommandEvent& )
{
EndQuasiModal( SYMBOL_PROPS_WANT_EXCHANGE_SYMBOL );
if( TransferDataFromWindow() )
EndQuasiModal( SYMBOL_PROPS_WANT_EXCHANGE_SYMBOL );
}

28
pcbnew/dialogs/dialog_footprint_properties.cpp

@ -203,29 +203,41 @@ DIALOG_FOOTPRINT_PROPERTIES::~DIALOG_FOOTPRINT_PROPERTIES()
void DIALOG_FOOTPRINT_PROPERTIES::EditFootprint( wxCommandEvent& )
{
m_returnValue = FP_PROPS_EDIT_BOARD_FP;
Close();
if( TransferDataFromWindow() )
{
m_returnValue = FP_PROPS_EDIT_BOARD_FP;
Close();
}
}
void DIALOG_FOOTPRINT_PROPERTIES::EditLibraryFootprint( wxCommandEvent& )
{
m_returnValue = FP_PROPS_EDIT_LIBRARY_FP;
Close();
if( TransferDataFromWindow() )
{
m_returnValue = FP_PROPS_EDIT_LIBRARY_FP;
Close();
}
}
void DIALOG_FOOTPRINT_PROPERTIES::UpdateFootprint( wxCommandEvent& )
{
m_returnValue = FP_PROPS_UPDATE_FP;
Close();
if( TransferDataFromWindow() )
{
m_returnValue = FP_PROPS_UPDATE_FP;
Close();
}
}
void DIALOG_FOOTPRINT_PROPERTIES::ChangeFootprint( wxCommandEvent& )
{
m_returnValue = FP_PROPS_CHANGE_FP;
Close();
if( TransferDataFromWindow() )
{
m_returnValue = FP_PROPS_CHANGE_FP;
Close();
}
}

Loading…
Cancel
Save