Pcbnew: Added move and rotate hot keys in board editor. hotkeys.cpp code...

Pcbnew: Added move and rotate hot keys in board editor. hotkeys.cpp code cleaned. Fixed a bug that can crash Pcbnew when switching track posture.

include/wxBasePcbFrame.h

@@ -257,7 +257,14 @@ public:
                                               wxDC*         DC );
 
     void          AddPad( MODULE* Module, bool draw );
-    void          DeletePad( D_PAD* Pad );
+    /** Function DeletePad
+     * Delete the pad aPad.
+     * Refresh the modified screen area
+     * Refresh modified parameters of the parent module (bounding box, last date)
+     * @param aPad = the pad to delete
+     * @param aQuery = true to promt for confirmation, false to delete silently
+     */
+    void          DeletePad( D_PAD* aPad, bool aQuery = true );
     void          StartMovePad( D_PAD* Pad, wxDC* DC );
     void          RotatePad( D_PAD* Pad, wxDC* DC );
     void          PlacePad( D_PAD* Pad, wxDC* DC );

include/wxPcbStruct.h

@@ -253,10 +253,44 @@ public:
      */
     void             SetLastNetListRead( const wxString& aNetListFile );
 
-    void             OnHotKey( wxDC*           DC,
-                               int             hotkey,
-                               EDA_BaseStruct* DrawStruct );
-    bool             OnHotkeyDeleteItem( wxDC* DC, EDA_BaseStruct* DrawStruct );
+    /** Function OnHotKey.
+     *  ** Commands are case insensitive **
+     *  Some commands are relatives to the item under the mouse cursor
+     *  @param aDC = current device context
+     *  @param aHotkeyCode = hotkey code (ascii or wxWidget code for special keys)
+     *  @param aItem = NULL or pointer on a EDA_BaseStruct under the mouse cursor
+     */
+    void             OnHotKey( wxDC*           aDC,
+                               int             aHotkeyCode,
+                               EDA_BaseStruct* aItem );
+
+    /** Function OnHotkeyDeleteItem
+     * Delete the item found under the mouse cursor
+     *  Depending on the current active tool::
+     *      Tool track
+     *          if a track is in progress: Delete the last segment
+     *			else delete the entire track
+     *      Tool module (footprint):
+     *          Delete the module.
+     * @param aDC = current device context
+     * @return true if an item was deleted
+     */
+    bool             OnHotkeyDeleteItem( wxDC* aDC );
+
+    /** Function OnHotkeyMoveItem
+     * Moves or drag the item (footprint, track, text .. ) found under the mouse cursor
+     * Only a footprint or a track can be dragged
+     * @param aIdCommand = the hotkey command id
+     * @return true if an item was moved
+     */
+    bool             OnHotkeyMoveItem( int aIdCommand );
+
+    /** Function OnHotkeyRotateItem
+     * Rotate the item (text or footprint) found under the mouse cursor
+     * @param aIdCommand = the hotkey command id
+     * @return true if an item was moved
+     */
+    bool             OnHotkeyRotateItem( int aIdCommand );
 
     void             OnCloseWindow( wxCloseEvent& Event );
     void             Process_Special_Functions( wxCommandEvent& event );

pcbnew/automove.cpp

@@ -36,79 +36,77 @@ wxString ModulesMaskSelection = wxT( "*" );
 void WinEDA_PcbFrame::AutoPlace( wxCommandEvent& event )
 {
     int        id = event.GetId();
-    wxPoint    pos;
-    INSTALL_DC( dc, DrawPanel );
     bool       on_state;
 
     if( m_HToolBar == NULL )
         return;
 
-    wxGetMousePosition( &pos.x, &pos.y );
-
-    switch( id )
-    {
-    case ID_TOOLBARH_PCB_AUTOPLACE:
-    case ID_TOOLBARH_PCB_AUTOROUTE:
-        break;
-
-    case ID_POPUP_CANCEL_CURRENT_COMMAND:
-        if( DrawPanel->ManageCurseur
-            && DrawPanel->ForceCloseManageCurseur )
-        {
-            DrawPanel->ForceCloseManageCurseur( DrawPanel, &dc );
-        }
-        break;
-
-    default:   // Abort a current command (if any)
-        DrawPanel->UnManageCursor( 0, wxCURSOR_ARROW );
-        break;
-    }
-
-    /* Erase ratsnest if needed */
-    if( GetBoard()->IsElementVisible(RATSNEST_VISIBLE) )
-        DrawGeneralRatsnest( &dc );
-    GetBoard()->m_Status_Pcb |= DO_NOT_SHOW_GENERAL_RASTNEST;
+    INSTALL_DC( dc, DrawPanel );
 
     switch( id )
     {
-    case ID_TOOLBARH_PCB_AUTOPLACE:
-        on_state = m_HToolBar->GetToolState( ID_TOOLBARH_PCB_AUTOPLACE );
+    case ID_TOOLBARH_PCB_MODE_MODULE:
+        on_state = m_HToolBar->GetToolState( ID_TOOLBARH_PCB_MODE_MODULE );
         if( on_state )
         {
-            m_HToolBar->ToggleTool( ID_TOOLBARH_PCB_AUTOROUTE, FALSE );
-            m_HTOOL_current_state = ID_TOOLBARH_PCB_AUTOPLACE;
+            m_HToolBar->ToggleTool( ID_TOOLBARH_PCB_MODE_TRACKS, FALSE );
+            m_HTOOL_current_state = ID_TOOLBARH_PCB_MODE_MODULE;
         }
         else
             m_HTOOL_current_state = 0;
-        break;
+        return;
 
-    case ID_TOOLBARH_PCB_AUTOROUTE:
-        on_state = m_HToolBar->GetToolState( ID_TOOLBARH_PCB_AUTOROUTE );
+    case ID_TOOLBARH_PCB_MODE_TRACKS:
+        on_state = m_HToolBar->GetToolState( ID_TOOLBARH_PCB_MODE_TRACKS );
         if( on_state )
         {
-            m_HToolBar->ToggleTool( ID_TOOLBARH_PCB_AUTOPLACE, FALSE );
-            m_HTOOL_current_state = ID_TOOLBARH_PCB_AUTOROUTE;
+            m_HToolBar->ToggleTool( ID_TOOLBARH_PCB_MODE_MODULE, FALSE );
+            m_HTOOL_current_state = ID_TOOLBARH_PCB_MODE_TRACKS;
         }
         else
             m_HTOOL_current_state = 0;
-        break;
+        return;
+
+
+    case ID_POPUP_PCB_AUTOROUTE_SELECT_LAYERS:
+        return;
 
     case ID_POPUP_PCB_AUTOPLACE_FIXE_MODULE:
         FixeModule( (MODULE*) GetScreen()->GetCurItem(), TRUE );
-        break;
+        return;
 
     case ID_POPUP_PCB_AUTOPLACE_FREE_MODULE:
         FixeModule( (MODULE*) GetScreen()->GetCurItem(), FALSE );
-        break;
+        return;
 
     case ID_POPUP_PCB_AUTOPLACE_FREE_ALL_MODULES:
         FixeModule( NULL, FALSE );
-        break;
+        return;
 
     case ID_POPUP_PCB_AUTOPLACE_FIXE_ALL_MODULES:
         FixeModule( NULL, TRUE );
+        return;
+
+    case ID_POPUP_CANCEL_CURRENT_COMMAND:
+        if( DrawPanel->ManageCurseur
+            && DrawPanel->ForceCloseManageCurseur )
+        {
+            DrawPanel->ForceCloseManageCurseur( DrawPanel, &dc );
+        }
         break;
 
+    default:   // Abort a current command (if any)
+        DrawPanel->UnManageCursor( 0, wxCURSOR_ARROW );
+        break;
+    }
+
+    /* Erase ratsnest if needed */
+    if( GetBoard()->IsElementVisible(RATSNEST_VISIBLE) )
+        DrawGeneralRatsnest( &dc );
+    GetBoard()->m_Status_Pcb |= DO_NOT_SHOW_GENERAL_RASTNEST;
+
+    switch( id )
+    {
     case ID_POPUP_PCB_AUTOPLACE_CURRENT_MODULE:
         AutoPlaceModule( (MODULE*) GetScreen()->GetCurItem(),
                         PLACE_1_MODULE, &dc );
@@ -158,9 +156,6 @@ void WinEDA_PcbFrame::AutoPlace( wxCommandEvent& event )
         Reset_Noroutable( &dc );
         break;
 
-    case ID_POPUP_PCB_AUTOROUTE_SELECT_LAYERS:
-        break;
-
     default:
         DisplayError( this, wxT( "AutoPlace command error" ) );
         break;
@@ -168,16 +163,12 @@ void WinEDA_PcbFrame::AutoPlace( wxCommandEvent& event )
 
     GetBoard()->m_Status_Pcb &= ~DO_NOT_SHOW_GENERAL_RASTNEST;
     Compile_Ratsnest( &dc, true );
-    SetToolbars();
 }
 
 
-/* Routine allocation of components in a rectangular format 4 / 3,
- * Starting from the mouse cursor
- * The components with the FIXED status are not normally dives
- * According to the flags:
- * All modules (not fixed) will be left
- * Only PCB modules are not left
+/* Function to move components in a rectangular area format 4 / 3,
+ * starting from the mouse cursor
+ * The components with the FIXED status set are not moved
  */
 void WinEDA_PcbFrame::AutoMoveModulesOnPcb( bool PlaceModulesHorsPcb )
 {

pcbnew/controle.cpp

@@ -83,7 +83,7 @@ BOARD_ITEM* WinEDA_BasePcbFrame::PcbGeneralLocateAndDisplay( int aHotKeyCode )
     {
         switch( m_HTOOL_current_state )
         {
-        case ID_TOOLBARH_PCB_AUTOPLACE:
+        case ID_TOOLBARH_PCB_MODE_MODULE:
             scanList = GENERAL_COLLECTOR::ModuleItems;
             break;
 

pcbnew/edit.cpp

@@ -348,10 +348,13 @@ void WinEDA_PcbFrame::Process_Special_Functions( wxCommandEvent& event )
     case ID_POPUP_PCB_SWITCH_TRACK_POSTURE:
         /* change the position of initial segment when creating new tracks
          * switch from _/  to -\ .
+         * If a track is in progress, it will be redrawn
         */
-        ShowNewTrackWhenMovingCursor( DrawPanel, &dc, false );
+        if( DrawPanel->ManageCurseur == ShowNewTrackWhenMovingCursor )
+            ShowNewTrackWhenMovingCursor( DrawPanel, &dc, false );
         g_Alternate_Track_Posture = !g_Alternate_Track_Posture;
-        ShowNewTrackWhenMovingCursor( DrawPanel, &dc, false );
+        if( DrawPanel->ManageCurseur == ShowNewTrackWhenMovingCursor )
+            ShowNewTrackWhenMovingCursor( DrawPanel, &dc, false );
         break;
 
     case ID_POPUP_PCB_PLACE_MICROVIA:

pcbnew/editmod.cpp

@@ -118,7 +118,7 @@ void WinEDA_ModuleEditFrame::RemoveStruct( EDA_BaseStruct* Item )
     switch( Item->Type() )
     {
     case TYPE_PAD:
-        DeletePad( (D_PAD*) Item );
+        DeletePad( (D_PAD*) Item, false );
         break;
 
     case TYPE_TEXTE_MODULE:

pcbnew/hotkeys.h

@@ -13,9 +13,9 @@
 enum hotkey_id_commnand {
     HK_DELETE = HK_COMMON_END,
     HK_BACK_SPACE,
-    HK_ROTATE_FOOTPRINT,
-    HK_MOVE_FOOTPRINT_OR_TRACK,
-    HK_DRAG_FOOTPRINT_OR_TRACK,
+    HK_ROTATE_ITEM,
+    HK_MOVE_ITEM,
+    HK_DRAG_ITEM,
     HK_FLIP_FOOTPRINT,
     HK_GET_AND_MOVE_FOOTPRINT,
     HK_LOCK_UNLOCK_FOOTPRINT,
@@ -48,7 +48,6 @@ enum hotkey_id_commnand {
     HK_SWITCH_LAYER_TO_INNER13,
     HK_SWITCH_LAYER_TO_INNER14,
     HK_ADD_MODULE,
-    HK_MOVE_TRACK,
     HK_SLIDE_TRACK
 };
 

pcbnew/modedit.cpp

@@ -518,7 +518,7 @@ void WinEDA_ModuleEditFrame::Process_Special_Functions( wxCommandEvent& event )
 
     case ID_POPUP_PCB_DELETE_PAD:
         SaveCopyInUndoList( GetBoard()->m_Modules, UR_MODEDIT );
-        DeletePad( (D_PAD*) GetScreen()->GetCurItem() );
+        DeletePad( (D_PAD*) GetScreen()->GetCurItem(), false );
         SetCurItem( NULL );
         DrawPanel->MouseToCursorSchema();
         break;

pcbnew/modedit_onclick.cpp

@@ -116,19 +116,13 @@ m_Flags != 0\nStruct @%p, type %d m_Flag %X" ),
         break;
 
     case ID_MODEDIT_DELETE_ITEM_BUTT:
-
-        // Item in edit, cannot delete it
-        if( DrawStruct && (DrawStruct->m_Flags != 0) )
-            break;
-        DrawStruct = ModeditLocateAndDisplay();
-        if( DrawStruct == NULL || (DrawStruct->m_Flags != 0) )
+        if( DrawStruct == NULL ||           // No item to delete
+            (DrawStruct->m_Flags != 0) )    // Item in edit, cannot delete it
             break;
-        if( DrawStruct->Type() != TYPE_MODULE ) //GetBoard()->m_Modules )
+        if( DrawStruct->Type() != TYPE_MODULE ) // Cannot delete the module itself
         {
-            // Cannot delete the module itself
             SaveCopyInUndoList( GetBoard()->m_Modules, UR_MODEDIT );
             RemoveStruct( DrawStruct );
-            DrawStruct = NULL;
             SetCurItem( NULL );
         }
         break;

pcbnew/move-drag_pads.cpp

@@ -227,30 +227,36 @@ void WinEDA_BasePcbFrame::AddPad( MODULE* Module, bool draw )
 }
 
 
-/* Function to delete the pad. */
-void WinEDA_BasePcbFrame::DeletePad( D_PAD* Pad )
+/** Function DeletePad
+ * Delete the pad aPad.
+ * Refresh the modified screen area
+ * Refresh modified parameters of the parent module (bounding box, last date)
+ * @param aPad = the pad to delete
+ * @param aQuery = true to promt for confirmation, false to delete silently
+ */
+void WinEDA_BasePcbFrame::DeletePad( D_PAD* aPad, bool aQuery )
 {
     MODULE*  Module;
-    wxString line;
-
-    if( Pad == NULL )
+ 
+    if( aPad == NULL )
         return;
 
-    Module = (MODULE*) Pad->GetParent();
+    Module = (MODULE*) aPad->GetParent();
     Module->m_LastEdit_Time = time( NULL );
 
-    line.Printf( _( "Delete Pad (module %s %s) " ),
-                 GetChars( Module->m_Reference->m_Text ),
-                 GetChars( Module->m_Value->m_Text ) );
-    if( !IsOK( this, line ) )
-        return;
+    if( aQuery )
+    {
+        wxString msg;
+        msg.Printf( _( "Delete Pad (module %s %s) " ),
+                     GetChars( Module->m_Reference->m_Text ),
+                     GetChars( Module->m_Value->m_Text ) );
+        if( !IsOK( this, msg ) )
+            return;
+    }
 
     m_Pcb->m_Status_Pcb = 0;
-
-    Pad->DeleteStructure();
-
+    aPad->DeleteStructure();
     DrawPanel->PostDirtyRect( Module->GetBoundingBox() );
-
     Module->Set_Rectangle_Encadrement();
 
     OnModify();

pcbnew/onrightclick.cpp

@@ -120,7 +120,7 @@ bool WinEDA_PcbFrame::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu )
         case TYPE_MODULE:
             createPopUpMenuForFootprints( (MODULE*) item, aPopMenu );
 
-            if( m_HTOOL_current_state == ID_TOOLBARH_PCB_AUTOPLACE )
+            if( m_HTOOL_current_state == ID_TOOLBARH_PCB_MODE_MODULE )
             {
                 aPopMenu->AppendSeparator();
 
@@ -146,7 +146,7 @@ bool WinEDA_PcbFrame::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu )
                                      _( "Auto Place Module" ) );
             }
 
-            if( m_HTOOL_current_state == ID_TOOLBARH_PCB_AUTOROUTE )
+            if( m_HTOOL_current_state == ID_TOOLBARH_PCB_MODE_TRACKS )
             {
                 if( !flags )
                     aPopMenu->Append( ID_POPUP_PCB_AUTOROUTE_MODULE, _( "Autoroute Module" ) );
@@ -169,8 +169,9 @@ bool WinEDA_PcbFrame::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu )
             }
             if( !flags )
             {
+                msg = AddHotkeyName( _( "Move Drawing" ), s_Board_Editor_Hokeys_Descr, HK_MOVE_ITEM );
                 ADD_MENUITEM( aPopMenu, ID_POPUP_PCB_MOVE_DRAWING_REQUEST,
-                              _( "Move Drawing" ), move_xpm );
+                              msg, move_xpm );
                 ADD_MENUITEM( aPopMenu, ID_POPUP_PCB_EDIT_DRAWING, _( "Edit Drawing" ), edit_xpm );
                 ADD_MENUITEM( aPopMenu, ID_POPUP_PCB_DELETE_DRAWING, _(
                                   "Delete Drawing" ), delete_xpm );
@@ -225,8 +226,8 @@ bool WinEDA_PcbFrame::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu )
         case TYPE_MIRE:
             if( !flags )
             {
-                ADD_MENUITEM( aPopMenu, ID_POPUP_PCB_MOVE_MIRE_REQUEST,
-                              _( "Move Target" ), move_xpm );
+                msg = AddHotkeyName( _( "Move Target" ), s_Board_Editor_Hokeys_Descr, HK_MOVE_ITEM );
+                ADD_MENUITEM( aPopMenu, ID_POPUP_PCB_MOVE_MIRE_REQUEST, msg, move_xpm );
                 msg = AddHotkeyName( _( "Edit Target" ), s_Board_Editor_Hokeys_Descr, HK_EDIT_ITEM );
                 ADD_MENUITEM( aPopMenu, ID_POPUP_PCB_EDIT_MIRE,
                               msg, edit_xpm );
@@ -317,7 +318,7 @@ bool WinEDA_PcbFrame::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu )
         break;
 
     case 0:
-        if( m_HTOOL_current_state == ID_TOOLBARH_PCB_AUTOPLACE )
+        if( m_HTOOL_current_state == ID_TOOLBARH_PCB_MODE_MODULE )
         {
             wxMenu* commands = new wxMenu;
             ADD_MENUITEM_WITH_SUBMENU( aPopMenu, commands,
@@ -341,7 +342,7 @@ bool WinEDA_PcbFrame::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu )
             aPopMenu->AppendSeparator();
         }
 
-        if( m_HTOOL_current_state == ID_TOOLBARH_PCB_AUTOROUTE )
+        if( m_HTOOL_current_state == ID_TOOLBARH_PCB_MODE_TRACKS )
         {
             wxMenu* commands = new wxMenu;
             aPopMenu->Append( ID_POPUP_PCB_AUTOROUTE_COMMANDS, _( "Autoroute" ), commands );
@@ -601,8 +602,9 @@ void WinEDA_PcbFrame::createPopUpMenuForZones( ZONE_CONTAINER* edge_zone, wxMenu
                           _( "Remove Filled Areas in Zone" ), fill_zone_xpm );
         }
 
+        msg = AddHotkeyName( _( "Move Zone" ), s_Board_Editor_Hokeys_Descr, HK_MOVE_ITEM );
         ADD_MENUITEM( zones_menu, ID_POPUP_PCB_MOVE_ZONE_OUTLINES,
-                      _( "Move Zone" ), move_xpm );
+                      msg, move_xpm );
 
         msg = AddHotkeyName( _( "Edit Zone Params" ), s_Board_Editor_Hokeys_Descr, HK_EDIT_ITEM );
         ADD_MENUITEM( zones_menu, ID_POPUP_PCB_EDIT_ZONE_PARAMS,
@@ -636,14 +638,14 @@ void WinEDA_PcbFrame::createPopUpMenuForFootprints( MODULE* aModule, wxMenu* men
     ADD_MENUITEM_WITH_SUBMENU( menu, sub_menu_footprint, -1, msg, module_xpm );
     if( !flags )
     {
-        msg = AddHotkeyName( _( "Move" ), s_Board_Editor_Hokeys_Descr, HK_MOVE_FOOTPRINT_OR_TRACK );
+        msg = AddHotkeyName( _( "Move" ), s_Board_Editor_Hokeys_Descr, HK_MOVE_ITEM );
         ADD_MENUITEM( sub_menu_footprint, ID_POPUP_PCB_MOVE_MODULE_REQUEST,
                       msg, move_module_xpm );
-        msg = AddHotkeyName( _( "Drag" ), s_Board_Editor_Hokeys_Descr, HK_DRAG_FOOTPRINT_OR_TRACK  );
+        msg = AddHotkeyName( _( "Drag" ), s_Board_Editor_Hokeys_Descr, HK_DRAG_ITEM  );
         ADD_MENUITEM( sub_menu_footprint, ID_POPUP_PCB_DRAG_MODULE_REQUEST,
                       msg, drag_module_xpm );
     }
-    msg = AddHotkeyName( _( "Rotate +" ), s_Board_Editor_Hokeys_Descr, HK_ROTATE_FOOTPRINT );
+    msg = AddHotkeyName( _( "Rotate +" ), s_Board_Editor_Hokeys_Descr, HK_ROTATE_ITEM );
     ADD_MENUITEM( sub_menu_footprint, ID_POPUP_PCB_ROTATE_MODULE_COUNTERCLOCKWISE,
                   msg, rotate_module_pos_xpm );
     ADD_MENUITEM( sub_menu_footprint, ID_POPUP_PCB_ROTATE_MODULE_CLOCKWISE,
@@ -681,11 +683,15 @@ void WinEDA_PcbFrame::createPopUpMenuForFpTexts( TEXTE_MODULE* FpText, wxMenu* m
     ADD_MENUITEM_WITH_SUBMENU( menu, sub_menu_Fp_text, -1, msg, footprint_text_xpm );
 
     if( !flags )
+    {
+        msg = AddHotkeyName( _( "Move" ), s_Board_Editor_Hokeys_Descr, HK_MOVE_ITEM );
         ADD_MENUITEM( sub_menu_Fp_text, ID_POPUP_PCB_MOVE_TEXTMODULE_REQUEST,
-                      _( "Move" ), move_field_xpm );
+                      msg, move_field_xpm );
+    }
 
+    msg = AddHotkeyName( _( "Rotate" ), s_Board_Editor_Hokeys_Descr, HK_ROTATE_ITEM );
     ADD_MENUITEM( sub_menu_Fp_text, ID_POPUP_PCB_ROTATE_TEXTMODULE,
-                  _( "Rotate" ), rotate_field_xpm );
+                  msg, rotate_field_xpm );
     if( !flags )
     {
         msg = AddHotkeyName( _( "Edit" ), s_Board_Editor_Hokeys_Descr, HK_EDIT_ITEM );
@@ -734,10 +740,12 @@ void WinEDA_PcbFrame::createPopUpMenuForFpPads( D_PAD* Pad, wxMenu* menu )
     sub_menu_Pad = new wxMenu;
     ADD_MENUITEM_WITH_SUBMENU( menu, sub_menu_Pad, -1, msg, pad_xpm );
 
+    msg = AddHotkeyName( _( "Move" ), s_Board_Editor_Hokeys_Descr, HK_MOVE_ITEM );
     ADD_MENUITEM( sub_menu_Pad, ID_POPUP_PCB_MOVE_PAD_REQUEST,
-                  _( "Move" ), move_pad_xpm );
+                  msg, move_pad_xpm );
+    msg = AddHotkeyName( _( "Drag" ), s_Board_Editor_Hokeys_Descr, HK_DRAG_ITEM );
     ADD_MENUITEM( sub_menu_Pad, ID_POPUP_PCB_DRAG_PAD_REQUEST,
-                  _( "Drag" ), drag_pad_xpm );
+                  msg, drag_pad_xpm );
 
     msg = AddHotkeyName( _( "Edit Pad" ), s_Board_Editor_Hokeys_Descr, HK_EDIT_ITEM );
     ADD_MENUITEM( sub_menu_Pad, ID_POPUP_PCB_EDIT_PAD, msg, options_pad_xpm );
@@ -761,7 +769,7 @@ void WinEDA_PcbFrame::createPopUpMenuForFpPads( D_PAD* Pad, wxMenu* menu )
     ADD_MENUITEM( sub_menu_Pad, ID_POPUP_PCB_DELETE_PAD,
                   _( "Delete" ), delete_pad_xpm );
 
-    if( m_HTOOL_current_state == ID_TOOLBARH_PCB_AUTOROUTE )
+    if( m_HTOOL_current_state == ID_TOOLBARH_PCB_MODE_TRACKS )
     {
         menu->Append( ID_POPUP_PCB_AUTOROUTE_PAD, _( "Autoroute Pad" ) );
         menu->Append( ID_POPUP_PCB_AUTOROUTE_NET, _( "Autoroute Net" ) );
@@ -791,11 +799,13 @@ void WinEDA_PcbFrame::createPopUpMenuForTexts( TEXTE_PCB* Text, wxMenu* menu )
 
     if( !flags )
     {
+        msg = AddHotkeyName( _( "Move" ), s_Board_Editor_Hokeys_Descr, HK_MOVE_ITEM );
         ADD_MENUITEM( sub_menu_Text, ID_POPUP_PCB_MOVE_TEXTEPCB_REQUEST,
-                      _( "Move" ), move_text_xpm );
+                      msg, move_text_xpm );
     }
+    msg = AddHotkeyName( _( "Rotate" ), s_Board_Editor_Hokeys_Descr, HK_ROTATE_ITEM );
     ADD_MENUITEM( sub_menu_Text, ID_POPUP_PCB_ROTATE_TEXTEPCB,
-                  _( "Rotate" ), rotate_pos_xpm );
+                  msg, rotate_pos_xpm );
     msg = AddHotkeyName( _( "Edit" ), s_Board_Editor_Hokeys_Descr, HK_EDIT_ITEM );
     ADD_MENUITEM( sub_menu_Text, ID_POPUP_PCB_EDIT_TEXTEPCB,
                   msg, edit_text_xpm );

pcbnew/pcbframe.cpp

@@ -183,8 +183,8 @@ BEGIN_EVENT_TABLE( WinEDA_PcbFrame, WinEDA_BasePcbFrame )
                          WinEDA_PcbFrame::Tracks_and_Vias_Size_Event )
     EVT_KICAD_CHOICEBOX( ID_AUX_TOOLBAR_PCB_VIA_SIZE,
                          WinEDA_PcbFrame::Tracks_and_Vias_Size_Event )
-    EVT_TOOL( ID_TOOLBARH_PCB_AUTOPLACE, WinEDA_PcbFrame::AutoPlace )
-    EVT_TOOL( ID_TOOLBARH_PCB_AUTOROUTE, WinEDA_PcbFrame::AutoPlace )
+    EVT_TOOL( ID_TOOLBARH_PCB_MODE_MODULE, WinEDA_PcbFrame::AutoPlace )
+    EVT_TOOL( ID_TOOLBARH_PCB_MODE_TRACKS, WinEDA_PcbFrame::AutoPlace )
     EVT_TOOL( ID_TOOLBARH_PCB_FREEROUTE_ACCESS,
               WinEDA_PcbFrame::Access_to_External_Tool )
 

pcbnew/pcbnew_id.h

@@ -215,8 +215,8 @@ enum pcbnew_ids
     ID_MENU_PCB_SWAP_LAYERS,
     ID_GEN_EXPORT_FILE_VRML,
 
-    ID_TOOLBARH_PCB_AUTOPLACE,
-    ID_TOOLBARH_PCB_AUTOROUTE,
+    ID_TOOLBARH_PCB_MODE_MODULE,
+    ID_TOOLBARH_PCB_MODE_TRACKS,
     ID_TOOLBARH_PCB_FREEROUTE_ACCESS,
 
     ID_AUX_TOOLBAR_PCB_SELECT_LAYER_PAIR,

pcbnew/tool_pcb.cpp

@@ -216,8 +216,12 @@ void WinEDA_PcbFrame::ReCreateHToolbar()
 #endif
 
     m_HToolBar->AddSeparator();
+    msg = AddHotkeyName( HELP_UNDO, s_Board_Editor_Hokeys_Descr,
+                         HK_UNDO, false );
     m_HToolBar->AddTool( wxID_UNDO, wxEmptyString, wxBitmap( undo_xpm ),
                          HELP_UNDO );
+    msg = AddHotkeyName( HELP_REDO, s_Board_Editor_Hokeys_Descr,
+                         HK_REDO, false );
     m_HToolBar->AddTool( wxID_REDO, wxEmptyString, wxBitmap( redo_xpm ),
                          HELP_REDO );
 
@@ -270,13 +274,13 @@ void WinEDA_PcbFrame::ReCreateHToolbar()
                          *LayerPairBitmap, SEL_LAYER_HELP );
 
     m_HToolBar->AddSeparator();
-    m_HToolBar->AddTool( ID_TOOLBARH_PCB_AUTOPLACE, wxEmptyString,
+    m_HToolBar->AddTool( ID_TOOLBARH_PCB_MODE_MODULE, wxEmptyString,
                          wxBitmap( mode_module_xpm ),
-                         _( "Manual and automatic move or place of modules" ),
+                         _( "Mode footprint: manual and automatic move and place modules" ),
                          wxITEM_CHECK );
-    m_HToolBar->AddTool( ID_TOOLBARH_PCB_AUTOROUTE, wxEmptyString,
+    m_HToolBar->AddTool( ID_TOOLBARH_PCB_MODE_TRACKS, wxEmptyString,
                          wxBitmap( mode_track_xpm ),
-                         _( "Mode Track and Autorouting" ), wxITEM_CHECK );
+                         _( "Mode track: autorouting" ), wxITEM_CHECK );
 
     // Fast call to FreeROUTE Web Bases router
     m_HToolBar->AddSeparator();