Commit a015ff2a authored by diemer's avatar diemer
Browse files

Cleanup. Relabeled block zoom command.

parent 48858c30

eeschema/libedit_onrightclick.cpp

+1 −2
Original line number Original line Diff line number Diff line
@@ -237,8 +237,7 @@ void AddMenusForBlock(wxMenu * PopMenu, WinEDA_LibeditFrame * frame) 
	ADD_MENUITEM(PopMenu, ID_POPUP_LIBEDIT_CANCEL_EDITING, _("Cancel Block"), cancel_xpm);

	ADD_MENUITEM(PopMenu, ID_POPUP_LIBEDIT_CANCEL_EDITING, _("Cancel Block"), cancel_xpm);





	if ( frame->GetScreen()->BlockLocate.m_Command == BLOCK_MOVE )

	if ( frame->GetScreen()->BlockLocate.m_Command == BLOCK_MOVE )

		ADD_MENUITEM(PopMenu, ID_POPUP_ZOOM_BLOCK,

            ADD_MENUITEM(PopMenu, ID_POPUP_ZOOM_BLOCK, _("Zoom Block (drag middle mouse)"), zoom_selected_xpm);

			_("Win. Zoom (Midd butt drag mouse)"), zoom_selected_xpm);





	PopMenu->AppendSeparator();

	PopMenu->AppendSeparator();

eeschema/onrightclick.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -640,7 +640,7 @@ void AddMenusForBlock( wxMenu* PopMenu, WinEDA_SchematicFrame* frame ) 




    if( frame->GetScreen()->BlockLocate.m_Command == BLOCK_MOVE )

    if( frame->GetScreen()->BlockLocate.m_Command == BLOCK_MOVE )

        ADD_MENUITEM( PopMenu, ID_POPUP_ZOOM_BLOCK,

        ADD_MENUITEM( PopMenu, ID_POPUP_ZOOM_BLOCK,

                      _( "Win. Zoom (Midd butt drag mouse)" ), zoom_selected_xpm );

                      _( "Zoom Block (drag middle mouse)" ), zoom_selected_xpm );





    ADD_MENUITEM( PopMenu, ID_POPUP_PLACE_BLOCK, _( "Place Block" ), apply_xpm );

    ADD_MENUITEM( PopMenu, ID_POPUP_PLACE_BLOCK, _( "Place Block" ), apply_xpm );

gerbview/onrightclick.cpp

+3 −4
Original line number Original line Diff line number Diff line
@@ -16,9 +16,8 @@ 
bool WinEDA_GerberFrame::OnRightClick( const wxPoint& MousePos, wxMenu* PopMenu )

bool WinEDA_GerberFrame::OnRightClick( const wxPoint& MousePos, wxMenu* PopMenu )

/********************************************************************************/

/********************************************************************************/





/* Prepare le menu PullUp affich par un click sur le bouton droit

/* Prepare the right-click pullup menu.

 *  de la souris.

 * The menu already has a list of zoom commands.

 *  Ce menu est ensuite complt par la liste des commandes de ZOOM

 */

 */

{

{

    EDA_BaseStruct* DrawStruct = GetScreen()->GetCurItem();

    EDA_BaseStruct* DrawStruct = GetScreen()->GetCurItem();
@@ -49,7 +48,7 @@ bool WinEDA_GerberFrame::OnRightClick( const wxPoint& MousePos, wxMenu* PopMenu 
            if( BlockActive )

            if( BlockActive )

            {

            {

                PopMenu->Append( ID_POPUP_CANCEL_CURRENT_COMMAND, _( "Cancel Block" ) );

                PopMenu->Append( ID_POPUP_CANCEL_CURRENT_COMMAND, _( "Cancel Block" ) );

                PopMenu->Append( ID_POPUP_ZOOM_BLOCK, _( "Zoom Block (Midd butt drag)" ) );

                PopMenu->Append( ID_POPUP_ZOOM_BLOCK, _( "Zoom Block (drag middle mouse)" ) );

                PopMenu->AppendSeparator();

                PopMenu->AppendSeparator();

                PopMenu->Append( ID_POPUP_PLACE_BLOCK, _( "Place Block" ) );

                PopMenu->Append( ID_POPUP_PLACE_BLOCK, _( "Place Block" ) );

                PopMenu->Append( ID_POPUP_COPY_BLOCK, _( "Copy Block (shift mouse)" ) );

                PopMenu->Append( ID_POPUP_COPY_BLOCK, _( "Copy Block (shift mouse)" ) );

pcbnew/modedit_onclick.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -215,7 +215,7 @@ bool WinEDA_ModuleEditFrame::OnRightClick( const wxPoint& MousePos, 
                ADD_MENUITEM( PopMenu, ID_POPUP_CANCEL_CURRENT_COMMAND,

                ADD_MENUITEM( PopMenu, ID_POPUP_CANCEL_CURRENT_COMMAND,

                              _( "Cancel Block" ), cancel_xpm );

                              _( "Cancel Block" ), cancel_xpm );

                ADD_MENUITEM( PopMenu, ID_POPUP_ZOOM_BLOCK,

                ADD_MENUITEM( PopMenu, ID_POPUP_ZOOM_BLOCK,

                              _( "Zoom Block (Midd butt drag)" ), zoom_selected_xpm );

                              _( "Zoom Block (drag middle mouse)" ), zoom_selected_xpm );

                PopMenu->AppendSeparator();

                PopMenu->AppendSeparator();

                ADD_MENUITEM( PopMenu, ID_POPUP_PLACE_BLOCK,

                ADD_MENUITEM( PopMenu, ID_POPUP_PLACE_BLOCK,

                              _( "Place Block" ), apply_xpm );

                              _( "Place Block" ), apply_xpm );

pcbnew/onrightclick.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -483,7 +483,7 @@ void WinEDA_PcbFrame::createPopUpBlockMenu( wxMenu* menu ) 
    ADD_MENUITEM( menu, ID_POPUP_CANCEL_CURRENT_COMMAND,

    ADD_MENUITEM( menu, ID_POPUP_CANCEL_CURRENT_COMMAND,

                  _( "Cancel Block" ), cancel_xpm );

                  _( "Cancel Block" ), cancel_xpm );

    ADD_MENUITEM( menu, ID_POPUP_ZOOM_BLOCK,

    ADD_MENUITEM( menu, ID_POPUP_ZOOM_BLOCK,

                  _( "Zoom Block (Midd butt drag)" ), zoom_selected_xpm );

                  _( "Zoom Block (drag middle mouse)" ), zoom_selected_xpm );

    menu->AppendSeparator();

    menu->AppendSeparator();

    ADD_MENUITEM( menu, ID_POPUP_PLACE_BLOCK,

    ADD_MENUITEM( menu, ID_POPUP_PLACE_BLOCK,

                  _( "Place Block" ), apply_xpm );

                  _( "Place Block" ), apply_xpm );