diff --git a/change_log.txt b/change_log.txt index f52abda055..0a42bd03d0 100644 --- a/change_log.txt +++ b/change_log.txt @@ -4,6 +4,18 @@ Started 2007-June-11 Please add newer entries at the top, list the date and your name with email address. +2007-Oct-10 UPDATE Dick Hollenbeck +================================================================================ ++ pcbnew + * prevent OnRightClick() from calling PcbGeneralLocateAndDisplay() when creating + a new track. + * bug fix: popup menu was not handling Mires, because the collector was not + being asked to find them. ++ all + Changed English UI text "Mire" to "Target" according to this post: + http://tech.groups.yahoo.com/group/kicad-users/message/1380 + + 2007-Oct-9 UPDATE Dick Hollenbeck ================================================================================ + pcbnew diff --git a/gerbview/tool_gerber.cpp b/gerbview/tool_gerber.cpp index 8ae9a626c0..1480c59ed8 100644 --- a/gerbview/tool_gerber.cpp +++ b/gerbview/tool_gerber.cpp @@ -373,7 +373,7 @@ void WinEDA_GerberFrame::ReCreateVToolbar( void ) BITMAP( junction_xpm ), wxNullBitmap, TRUE, -1, -1, (wxObject*) NULL, - _( "Add Mires" ) ); + _( "Add layer alignment target" ) ); m_VToolBar->AddSeparator(); m_VToolBar->AddTool( ID_TEXT_COMMENT_BUTT, diff --git a/pcbnew/class_board_item.cpp b/pcbnew/class_board_item.cpp index c8a23c1b40..d7b9974b12 100644 --- a/pcbnew/class_board_item.cpp +++ b/pcbnew/class_board_item.cpp @@ -187,7 +187,10 @@ wxString BOARD_ITEM::MenuText( const BOARD* aPcb ) const break; case TYPEMIRE: - text << _( "Mire" ); // @todo: extend text, Mire is not an english word! + text << _( "Target" ) //<< wxT( " on " ) << ReturnPcbLayerName( item->GetLayer() ).Trim() + // could use if problem with decimal point and user units was fixed: + // << wxT( " " ) << wxT( "size" ) << wxT( " " ) << ((MIREPCB*)item)->m_Size + ; break; case TYPEEDGEZONE: diff --git a/pcbnew/collectors.cpp b/pcbnew/collectors.cpp index b88e926711..c9f3eba73f 100644 --- a/pcbnew/collectors.cpp +++ b/pcbnew/collectors.cpp @@ -40,6 +40,7 @@ const KICAD_T GENERAL_COLLECTOR::AllBoardItems[] = { TYPEDRAWSEGMENT, TYPEMARQUEUR, TYPECOTATION, + TYPEMIRE, TYPEVIA, TYPETRACK, TYPEPAD, @@ -50,6 +51,7 @@ const KICAD_T GENERAL_COLLECTOR::AllBoardItems[] = { }; +/* const KICAD_T GENERAL_COLLECTOR::PrimaryItems[] = { TYPETEXTE, TYPEDRAWSEGMENT, @@ -60,6 +62,7 @@ const KICAD_T GENERAL_COLLECTOR::PrimaryItems[] = { TYPEMODULE, EOT }; +*/ const KICAD_T GENERAL_COLLECTOR::AllButZones[] = { @@ -67,6 +70,7 @@ const KICAD_T GENERAL_COLLECTOR::AllButZones[] = { TYPEDRAWSEGMENT, TYPEMARQUEUR, TYPECOTATION, + TYPEMIRE, TYPEVIA, TYPETRACK, TYPEPAD, diff --git a/pcbnew/collectors.h b/pcbnew/collectors.h index 0a04a0e748..eba1feaef9 100644 --- a/pcbnew/collectors.h +++ b/pcbnew/collectors.h @@ -211,8 +211,8 @@ public: /** * A scan list for all primary board items, omitting items which are subordinate to * a MODULE, such as D_PAD and TEXTEMODULE. - */ static const KICAD_T PrimaryItems[]; + */ /** diff --git a/pcbnew/edit.cpp b/pcbnew/edit.cpp index 7d1d1f41e2..b4f8fc330b 100644 --- a/pcbnew/edit.cpp +++ b/pcbnew/edit.cpp @@ -262,7 +262,7 @@ void WinEDA_PcbFrame::Process_Special_Functions( wxCommandEvent& event ) break; case ID_PCB_MIRE_BUTT: - SetToolID( id, wxCURSOR_PENCIL, _( "Add Mire" ) ); + SetToolID( id, wxCURSOR_PENCIL, _( "Add Layer Alignment Target" ) ); break; case ID_PCB_PLACE_OFFSET_COORD_BUTT: diff --git a/pcbnew/mirepcb.cpp b/pcbnew/mirepcb.cpp index 658622dd35..c7a1ba796b 100644 --- a/pcbnew/mirepcb.cpp +++ b/pcbnew/mirepcb.cpp @@ -79,7 +79,7 @@ void WinEDA_PcbFrame::InstallMireOptionsFrame( MIREPCB* MirePcb, WinEDA_MirePropertiesFrame::WinEDA_MirePropertiesFrame( WinEDA_PcbFrame* parent, MIREPCB* Mire, wxDC* DC, const wxPoint& framepos ) : - wxDialog( parent, -1, _( "Mire properties" ), framepos, wxSize( 270, 210 ), + wxDialog( parent, -1, _( "Target Properties" ), framepos, wxSize( 270, 210 ), DIALOG_STYLE ) { wxString number; @@ -121,7 +121,7 @@ WinEDA_MirePropertiesFrame::WinEDA_MirePropertiesFrame( WinEDA_PcbFrame* parent, // Shape wxString shape_list[2] = { _( "shape +" ), _( "shape X" ) }; m_MireShape = new wxRadioBox( this, ID_LISTBOX_SHAPE_MIRE, - _( "Mire Shape:" ), + _( "Target Shape:" ), wxDefaultPosition, wxSize( -1, -1 ), 2, shape_list, 1 ); m_MireShape->SetSelection( m_MirePcb->m_Shape ? 1 : 0 ); diff --git a/pcbnew/onrightclick.cpp b/pcbnew/onrightclick.cpp index 2f472f5e0f..8f2baa6498 100644 --- a/pcbnew/onrightclick.cpp +++ b/pcbnew/onrightclick.cpp @@ -327,12 +327,12 @@ bool WinEDA_PcbFrame::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu ) if( !flags ) { ADD_MENUITEM( aPopMenu, ID_POPUP_PCB_MOVE_MIRE_REQUEST, - _( "Move Mire" ), move_xpm ); + _( "Move Target" ), move_xpm ); } ADD_MENUITEM( aPopMenu, ID_POPUP_PCB_EDIT_MIRE, - _( "Edit Mire" ), edit_xpm ); + _( "Edit Target" ), edit_xpm ); ADD_MENUITEM( aPopMenu, ID_POPUP_PCB_DELETE_MIRE, - _( "Delete Mire" ), delete_xpm ); + _( "Delete Target" ), delete_xpm ); break; case TYPEEDGEMODULE: diff --git a/pcbnew/tool_pcb.cpp b/pcbnew/tool_pcb.cpp index 2cc654a7a4..af0531c963 100644 --- a/pcbnew/tool_pcb.cpp +++ b/pcbnew/tool_pcb.cpp @@ -452,7 +452,7 @@ void WinEDA_PcbFrame::ReCreateVToolbar() m_VToolBar->AddTool( ID_PCB_MIRE_BUTT, wxEmptyString, BITMAP( add_mires_xpm ), - _( "Add Mires" ), wxITEM_CHECK ); + _( "Add layer alignment target" ), wxITEM_CHECK ); m_VToolBar->AddSeparator(); m_VToolBar->AddTool( ID_PCB_DELETE_ITEM_BUTT, wxEmptyString,