diff --git a/common/dialog_about/AboutDialog_main.cpp b/common/dialog_about/AboutDialog_main.cpp index 996ba1a80f..5aa09687d6 100644 --- a/common/dialog_about/AboutDialog_main.cpp +++ b/common/dialog_about/AboutDialog_main.cpp @@ -312,7 +312,7 @@ static void InitKiCadAboutNew( AboutAppInfo& info ) info.AddTranslator( new Contributor( wxT( "Rafael Sokolowski" ), wxT( "rafael.sokolowski@web.de" ), wxT( "German (DE)" ), KiBitmapNew( lang_de_xpm ) ) ); info.AddTranslator( - new Contributor( wxT( "Kenta Yonekura" ), wxT( "midpika@hotmail.com" ), wxT( "Japanese (JA)" ), KiBitmapNew( lang_jp_xpm ) ) ); + new Contributor( wxT( "Kenta Yonekura" ), wxT( "yoneken@kicad.jp" ), wxT( "Japanese (JA)" ), KiBitmapNew( lang_jp_xpm ) ) ); info.AddTranslator( new Contributor( wxT( "Manolis Stefanis" ), wxT( "" ), wxT( "Greek (el_GR)" ), KiBitmapNew( lang_gr_xpm ) ) ); info.AddTranslator( @@ -328,9 +328,6 @@ static void InitKiCadAboutNew( AboutAppInfo& info ) info.AddTranslator( new Contributor( wxT( "Evgeniy Ivanov" ), wxT( "evgeniy_p_ivanov@yahoo.ca" ), wxT( "Bulgarian (BG)" ), KiBitmapNew( lang_bg_xpm ) ) ); - // TODO: are these all russian translators, - // placed them here now, - // or else align them below other language maintainer with mail adress info.AddTranslator( new Contributor( wxT( "Remy Halvick" ), wxEmptyString, wxT( "Others" ) ) ); info.AddTranslator( new Contributor( wxT( "David Briscoe" ), wxEmptyString, wxT( "Others" ) ) ); info.AddTranslator( new Contributor( wxT( "Dominique Laigle" ), wxEmptyString, wxT( "Others" ) ) ); diff --git a/include/wxPcbStruct.h b/include/wxPcbStruct.h index 9ce7651859..8fcd89ac4b 100644 --- a/include/wxPcbStruct.h +++ b/include/wxPcbStruct.h @@ -1105,9 +1105,8 @@ public: * The ratsnest and pad list are recalculated * @param aModule = footprint to delete * @param aDC = currentDevice Context. if NULL: do not redraw new ratsnest - * @param aAskBeforeDeleting : if true: ask for confirmation before deleting */ - bool Delete_Module( MODULE* aModule, wxDC* aDC, bool aAskBeforeDeleting ); + bool Delete_Module( MODULE* aModule, wxDC* aDC ); /** * Function Change_Side_Module diff --git a/pcbnew/edit.cpp b/pcbnew/edit.cpp index eb44ef8d1c..aa8001d899 100644 --- a/pcbnew/edit.cpp +++ b/pcbnew/edit.cpp @@ -744,7 +744,7 @@ void PCB_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event ) break; } - if( Delete_Module( (MODULE*) GetCurItem(), &dc, true ) ) + if( Delete_Module( (MODULE*) GetCurItem(), &dc ) ) { SetCurItem( NULL ); } @@ -1268,7 +1268,7 @@ void PCB_EDIT_FRAME::RemoveStruct( BOARD_ITEM* Item, wxDC* DC ) switch( Item->Type() ) { case PCB_MODULE_T: - Delete_Module( (MODULE*) Item, DC, true ); + Delete_Module( (MODULE*) Item, DC ); break; case PCB_DIMENSION_T: diff --git a/pcbnew/modules.cpp b/pcbnew/modules.cpp index 370ca3c9ae..cb83e39b38 100644 --- a/pcbnew/modules.cpp +++ b/pcbnew/modules.cpp @@ -249,7 +249,7 @@ void MoveFootprint( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aPosition, } -bool PCB_EDIT_FRAME::Delete_Module( MODULE* aModule, wxDC* aDC, bool aAskBeforeDeleting ) +bool PCB_EDIT_FRAME::Delete_Module( MODULE* aModule, wxDC* aDC ) { wxString msg; @@ -258,21 +258,6 @@ bool PCB_EDIT_FRAME::Delete_Module( MODULE* aModule, wxDC* aDC, bool aAskBeforeD SetMsgPanel( aModule ); - /* Confirm module delete. */ - if( aAskBeforeDeleting ) - { - msg.Printf( _( "Delete Footprint %s (value %s) ?" ), - GetChars( aModule->GetReference() ), - GetChars( aModule->GetValue() ) ); - - if( !IsOK( this, msg ) ) - { - return false; - } - } - - OnModify(); - /* Remove module from list, and put it in undo command list */ m_Pcb->m_Modules.Remove( aModule ); aModule->SetState( IS_DELETED, true ); @@ -285,6 +270,8 @@ bool PCB_EDIT_FRAME::Delete_Module( MODULE* aModule, wxDC* aDC, bool aAskBeforeD if( aDC ) m_canvas->Refresh(); + OnModify(); + return true; } diff --git a/pcbnew/zones_by_polygon.cpp b/pcbnew/zones_by_polygon.cpp index 127d0ed966..c6e1056a58 100644 --- a/pcbnew/zones_by_polygon.cpp +++ b/pcbnew/zones_by_polygon.cpp @@ -345,11 +345,9 @@ void PCB_EDIT_FRAME::End_Move_Zone_Corner_Or_Outlines( wxDC* DC, ZONE_CONTAINER* SetCurItem( NULL ); // This outline can be deleted when merging outlines // Combine zones if possible - wxBusyCursor dummy; GetBoard()->OnAreaPolygonModified( &s_AuxiliaryList, aZone ); m_canvas->Refresh(); - int ii = GetBoard()->GetAreaIndex( aZone ); // test if aZone exists if( ii < 0 )