Preparing hotkeys/shortcuts changes in place menu.

common/class_layer_box_selector.cpp

@@ -143,7 +143,7 @@ void LAYER_BOX_SELECTOR::Resync()
         layername = board->GetLayerName( layerid );
 
         if( m_layerhotkeys && m_hotkeys != NULL )
-            layername = AddHotkeyName( layername, m_hotkeys, layerhk[layerid], false );
+            layername = AddHotkeyName( layername, m_hotkeys, layerhk[layerid], IS_COMMENT );
 
         Append( layername, layerbmp, (void*) layerid );
     }

common/hotkeys_basic.cpp

@@ -171,17 +171,40 @@ wxString ReturnKeyNameFromKeyCode( int aKeycode, bool* aIsFound )
 }
 
 
+/*
+ * helper function use in AddHotkeyName to calculate an accelerator string
+ * In some menus, accelerators do not perform exactely the same action as
+ * the hotkey that perfoms a similar action.
+ * this is usually the case when this action uses the current mouse position
+ * for instance zoom action is ran from the F1 key or the Zoom menu.
+ * a zoom uses the mouse position from a hot key and not from the menu
+ * In this case, the accelerator if Shift+<hotkey>
+ * But for some keys, the Shift modifier is not usable, and the accelerator is Alt+<hotkey>
+ */
+static void AddModifierToKey( wxString& aFullKey, const wxString & aKey )
+{
+#if 1       // set to 0 for new behavior, 1 for old
+    aFullKey << wxT( " <" ) << aKey << wxT( ">" );
+#else
+    if( aKey.IsSameAs(wxT( "/" ) ) )
+        aFullKey << wxT( "\t" ) << MODIFIER_ALT << aKey;
+    else
+        aFullKey << wxT( "\t" ) << MODIFIER_SHIFT << aKey;
+#endif
+}
+
 /* AddHotkeyName
  * Add the key name from the Command id value ( m_Idcommand member value)
  *  aText = a wxString. returns aText + key name
  *  aList = pointer to a Ki_HotkeyInfo list of commands
  *  aCommandId = Command Id value
- *  aIsShortCut = true to add <tab><keyname> (active shortcuts in menus)
- *                    = false to add <spaces><(keyname)>
+ *  aShortCutType = IS_HOTKEY to add <tab><keyname> (shortcuts in menus, same as hotkeys)
+ *                  IS_ACCELERATOR to add <tab><Shift+keyname> (accelerators in menus, not hotkeys)
+ *                  IS_COMMENT to add <spaces><(keyname)> mainly in tooltips
  *  Return a wxString (aTest + key name) if key found or aText without modification
  */
 wxString AddHotkeyName( const wxString& aText, Ki_HotkeyInfo** aList,
-                        int aCommandId, bool aIsShortCut )
+                        int aCommandId, HOTKEY_ACTION_TYPE aShortCutType )
 {
     wxString msg = aText;
     wxString keyname;
@@ -191,10 +214,18 @@ wxString AddHotkeyName( const wxString& aText, Ki_HotkeyInfo** aList,
 
     if( !keyname.IsEmpty() )
     {
-        if( aIsShortCut )
+        switch( aShortCutType )
+        {
+            case IS_HOTKEY:
                 msg << wxT( "\t" ) << keyname;
-        else
-            msg << wxT( " <" ) << keyname << wxT( ">" );
+                break;
+            case IS_ACCELERATOR:
+                AddModifierToKey( msg, keyname );
+                break;
+            case IS_COMMENT:
+                msg << wxT( " (" ) << keyname << wxT( ")" );
+                break;
+        }
     }
 
     return msg;
@@ -206,14 +237,15 @@ wxString AddHotkeyName( const wxString& aText, Ki_HotkeyInfo** aList,
  *  aText = a wxString. returns aText + key name
  *  aList = pointer to a Ki_HotkeyInfoSectionDescriptor DescrList of commands
  *  aCommandId = Command Id value
- *  aIsShortCut = true to add <tab><keyname> (active shortcuts in menus)
- *                    = false to add <spaces><(keyname)>
+ *  aShortCutType = IS_HOTKEY to add <tab><keyname> (active shortcuts in menus)
+ *                  IS_ACCELERATOR to add <tab><Shift+keyname> (active accelerators in menus)
+ *                  IS_COMMENT to add <spaces><(keyname)>
  * Return a wxString (aText + key name) if key found or aText without modification
  */
 wxString AddHotkeyName( const wxString&                        aText,
                         struct Ki_HotkeyInfoSectionDescriptor* aDescList,
                         int                                    aCommandId,
-                        bool                                   aIsShortCut )
+                        HOTKEY_ACTION_TYPE                     aShortCutType )
 {
     wxString        msg = aText;
     wxString        keyname;
@@ -228,11 +260,18 @@ wxString AddHotkeyName( const wxString&                        aText,
 
             if( !keyname.IsEmpty() )
             {
-                if( aIsShortCut )
+                switch( aShortCutType )
+                {
+                    case IS_HOTKEY:
                         msg << wxT( "\t" ) << keyname;
-                else
-                    msg << wxT( " <" ) << keyname << wxT( ">" );
-
+                        break;
+                    case IS_ACCELERATOR:
+                        AddModifierToKey( msg, keyname );
+                        break;
+                    case IS_COMMENT:
+                        msg << wxT( " (" ) << keyname << wxT( ")" );
+                        break;
+                }
                 break;
             }
         }

eeschema/menubar.cpp

@@ -219,12 +219,12 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
 
     // Zoom in
     text = AddHotkeyName( _( "Zoom In" ), s_Schematic_Hokeys_Descr,
-                          ID_ZOOM_IN, false );  // add comment, not a shortcut
+                          HK_ZOOM_IN, IS_ACCELERATOR );  // add an accelerator, not a shortcut
     AddMenuItem( viewMenu, ID_ZOOM_IN, text, HELP_ZOOM_IN, KiBitmap( zoom_in_xpm ) );
 
     // Zoom out
     text = AddHotkeyName( _( "Zoom Out" ), s_Schematic_Hokeys_Descr,
-                          ID_ZOOM_OUT, false );  // add comment, not a shortcut
+                          HK_ZOOM_OUT, IS_ACCELERATOR );  // add accelerator, not a shortcut
     AddMenuItem( viewMenu, ID_ZOOM_OUT, text, HELP_ZOOM_OUT, KiBitmap( zoom_out_xpm ) );
 
     // Fit on screen
@@ -252,68 +252,68 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
 
     // Component
     text = AddHotkeyName( _( "Component" ), s_Schematic_Hokeys_Descr,
-                          HK_ADD_NEW_COMPONENT, false );    // add comment, not a shortcut
+                          HK_ADD_NEW_COMPONENT, IS_ACCELERATOR );    // add an accelerator, not a shortcut
     AddMenuItem( placeMenu, ID_SCH_PLACE_COMPONENT, text,
                 HELP_PLACE_COMPONENTS,
                 KiBitmap( add_component_xpm ) );
 
     // Power port
     text = AddHotkeyName( _( "Power Port" ), s_Schematic_Hokeys_Descr,
-                          HK_ADD_NEW_POWER, false );    // add comment, not a shortcut
+                          HK_ADD_NEW_POWER, IS_ACCELERATOR );    // add an accelerator, not a shortcut
     AddMenuItem( placeMenu, ID_PLACE_POWER_BUTT, text,
                 HELP_PLACE_POWERPORT,
                 KiBitmap( add_power_xpm ) );
 
     // Wire
     text = AddHotkeyName( _( "Wire" ), s_Schematic_Hokeys_Descr,
-                          HK_BEGIN_WIRE, false );    // add comment, not a shortcut
+                          HK_BEGIN_WIRE, IS_ACCELERATOR );    // add an accelerator, not a shortcut
     AddMenuItem( placeMenu, ID_WIRE_BUTT, text,
                 HELP_PLACE_WIRE,
                 KiBitmap( add_line_xpm ) );
 
     // Bus
     text = AddHotkeyName( _( "Bus" ), s_Schematic_Hokeys_Descr,
-                          HK_BEGIN_BUS, false );    // add comment, not a shortcut
+                          HK_BEGIN_BUS, IS_ACCELERATOR );    // add an accelerator, not a shortcut
     AddMenuItem( placeMenu, ID_BUS_BUTT, text,
                 HELP_PLACE_BUS,
                 KiBitmap( add_bus_xpm ) );
 
     // Wire to Bus entry
     text = AddHotkeyName( _( "Wire to Bus Entry" ), s_Schematic_Hokeys_Descr,
-                          HK_ADD_WIRE_ENTRY, false );    // add comment, not a shortcut
+                          HK_ADD_WIRE_ENTRY, IS_ACCELERATOR );    // addan accelerator, not a shortcut
     AddMenuItem( placeMenu, ID_WIRETOBUS_ENTRY_BUTT, text,
                 HELP_PLACE_WIRE2BUS_ENTRY,
                 KiBitmap( add_line2bus_xpm ) );
 
     // Bus to Bus entry
     text = AddHotkeyName( _( "Bus to Bus Entry" ), s_Schematic_Hokeys_Descr,
-                          HK_ADD_BUS_ENTRY, false );    // add comment, not a shortcut
+                          HK_ADD_BUS_ENTRY, IS_ACCELERATOR );    // add an accelerator, not a shortcut
     AddMenuItem( placeMenu, ID_BUSTOBUS_ENTRY_BUTT, text,
                 HELP_PLACE_BUS2BUS_ENTRY,
                 KiBitmap( add_bus2bus_xpm ) );
 
     // No Connect Flag
     text = AddHotkeyName( _( "No Connect Flag" ), s_Schematic_Hokeys_Descr,
-                          HK_ADD_NOCONN_FLAG, false );    // add comment, not a shortcut
+                          HK_ADD_NOCONN_FLAG, IS_ACCELERATOR );    // add an accelerator, not a shortcut
     AddMenuItem( placeMenu, ID_NOCONN_BUTT, text, HELP_PLACE_NC_FLAG, KiBitmap( noconn_xpm ) );
 
     // Net name
     text = AddHotkeyName( _( "Label" ), s_Schematic_Hokeys_Descr,
-                          HK_ADD_LABEL, false );    // add comment, not a shortcut
+                          HK_ADD_LABEL, IS_ACCELERATOR );    // add an accelerator, not a shortcut
     AddMenuItem( placeMenu, ID_LABEL_BUTT, text,
                 HELP_PLACE_NETLABEL,
                 KiBitmap( add_line_label_xpm ) );
 
     // Global label
     text = AddHotkeyName( _( "Global Label" ), s_Schematic_Hokeys_Descr,
-                          HK_ADD_GLABEL, false );    // add comment, not a shortcut
+                          HK_ADD_GLABEL, IS_ACCELERATOR );    // add an accelerator, not a shortcut
     AddMenuItem( placeMenu, ID_GLABEL_BUTT, text,
                 HELP_PLACE_GLOBALLABEL,
                 KiBitmap( add_glabel_xpm ) );
 
     // Junction
     text = AddHotkeyName( _( "Junction" ), s_Schematic_Hokeys_Descr,
-                          HK_ADD_JUNCTION, false );    // add comment, not a shortcut
+                          HK_ADD_JUNCTION, IS_ACCELERATOR );    // add an accelerator, not a shortcut
     AddMenuItem( placeMenu, ID_JUNCTION_BUTT, text,
                 HELP_PLACE_JUNCTION,
                 KiBitmap( add_junction_xpm ) );
@@ -323,9 +323,9 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
 
     // Hierarchical label
     text = AddHotkeyName( _( "Hierarchical Label" ), s_Schematic_Hokeys_Descr,
-                          HK_ADD_HLABEL, false );       // add comment, not a shortcut
+                          HK_ADD_HLABEL, IS_ACCELERATOR );          // add an accelerator, not a shortcut
     text = AddHotkeyName( _( "Hierarchical Label" ), s_Schematic_Hokeys_Descr,
-                          HK_ADD_HLABEL, false );       // add comment, not a shortcut
+                          HK_ADD_HLABEL, IS_ACCELERATOR );          // add an accelerator, not a shortcut
     AddMenuItem( placeMenu, ID_HIERLABEL_BUTT,
                 text, HELP_PLACE_HIER_LABEL,
                 KiBitmap( add_hierarchical_label_xpm ) );
@@ -333,7 +333,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
 
     // Hierarchical sheet
     text = AddHotkeyName( _( "Hierarchical Sheet" ), s_Schematic_Hokeys_Descr,
-                          HK_ADD_HIER_SHEET, false );    // add comment, not a shortcut
+                          HK_ADD_HIER_SHEET, IS_ACCELERATOR );    // add an accelerator, not a shortcut
     AddMenuItem( placeMenu, ID_SHEET_SYMBOL_BUTT, text,
                 HELP_PLACE_SHEET,
                 KiBitmap( add_hierarchical_subsheet_xpm ) );
@@ -357,20 +357,20 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
 
     // Graphic line or polygon
     text = AddHotkeyName( _( "Graphic Polyline" ), s_Schematic_Hokeys_Descr,
-                          HK_ADD_GRAPHIC_POLYLINE, false );    // add comment, not a shortcut
+                          HK_ADD_GRAPHIC_POLYLINE, IS_ACCELERATOR );    // add an accelerator, not a shortcut
     AddMenuItem( placeMenu, ID_LINE_COMMENT_BUTT, text,
                 HELP_PLACE_GRAPHICLINES,
                 KiBitmap( add_dashed_line_xpm ) );
 
     // Graphic text
     text = AddHotkeyName( _( "Graphic Text" ), s_Schematic_Hokeys_Descr,
-                          HK_ADD_GRAPHIC_TEXT, false );    // add comment, not a shortcut
+                          HK_ADD_GRAPHIC_TEXT, IS_ACCELERATOR );    // add an accelerator, not a shortcut
     AddMenuItem( placeMenu, ID_TEXT_COMMENT_BUTT, text,
                 HELP_PLACE_GRAPHICTEXTS,
                 KiBitmap( add_text_xpm ) );
 
     // Graphic image
-    AddMenuItem( placeMenu, ID_ADD_IMAGE_BUTT, _("Image"),
+    AddMenuItem( placeMenu, ID_ADD_IMAGE_BUTT, _( "Image" ),
                 HELP_PLACE_GRAPHICIMAGES,
                 KiBitmap( image_xpm ) );
 
@@ -394,7 +394,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
     // Options (Preferences on WXMAC)
 
 #ifdef __WXMAC__
-    preferencesMenu->Append(wxID_PREFERENCES);
+    preferencesMenu->Append( wxID_PREFERENCES );
 #else
     AddMenuItem( preferencesMenu,
                 wxID_PREFERENCES,

eeschema/tool_lib.cpp

@@ -116,9 +116,9 @@ void LIB_EDIT_FRAME::ReCreateHToolbar()
                          _( "Save current component to new library" ) );
 
     m_HToolBar->AddSeparator();
-    msg = AddHotkeyName( _( "Undo last command" ), s_Schematic_Hokeys_Descr, HK_UNDO, false );
+    msg = AddHotkeyName( _( "Undo last command" ), s_Schematic_Hokeys_Descr, HK_UNDO, IS_COMMENT );
     m_HToolBar->AddTool( wxID_UNDO, wxEmptyString, KiBitmap( undo_xpm ), msg );
-    msg = AddHotkeyName( _( "Redo the last command" ), s_Schematic_Hokeys_Descr, HK_REDO, false );
+    msg = AddHotkeyName( _( "Redo the last command" ), s_Schematic_Hokeys_Descr, HK_REDO, IS_COMMENT );
     m_HToolBar->AddTool( wxID_REDO, wxEmptyString, KiBitmap( redo_xpm ), msg );
 
     m_HToolBar->AddSeparator();
@@ -133,16 +133,16 @@ void LIB_EDIT_FRAME::ReCreateHToolbar()
                          _( "Test for duplicate pins and off grid pins" ) );
 
     m_HToolBar->AddSeparator();
-    msg = AddHotkeyName( HELP_ZOOM_IN, s_Libedit_Hokeys_Descr, HK_ZOOM_IN, false );
+    msg = AddHotkeyName( HELP_ZOOM_IN, s_Libedit_Hokeys_Descr, HK_ZOOM_IN, IS_COMMENT );
     m_HToolBar->AddTool( ID_ZOOM_IN, wxEmptyString, KiBitmap( zoom_in_xpm ), msg );
 
-    msg = AddHotkeyName( HELP_ZOOM_OUT, s_Libedit_Hokeys_Descr, HK_ZOOM_OUT, false );
+    msg = AddHotkeyName( HELP_ZOOM_OUT, s_Libedit_Hokeys_Descr, HK_ZOOM_OUT, IS_COMMENT );
     m_HToolBar->AddTool( ID_ZOOM_OUT, wxEmptyString, KiBitmap( zoom_out_xpm ), msg );
 
-    msg = AddHotkeyName( HELP_ZOOM_REDRAW, s_Libedit_Hokeys_Descr, HK_ZOOM_REDRAW, false );
+    msg = AddHotkeyName( HELP_ZOOM_REDRAW, s_Libedit_Hokeys_Descr, HK_ZOOM_REDRAW, IS_COMMENT );
     m_HToolBar->AddTool( ID_ZOOM_REDRAW, wxEmptyString, KiBitmap( zoom_redraw_xpm ), msg );
 
-    msg = AddHotkeyName( HELP_ZOOM_FIT, s_Libedit_Hokeys_Descr, HK_ZOOM_AUTO, false );
+    msg = AddHotkeyName( HELP_ZOOM_FIT, s_Libedit_Hokeys_Descr, HK_ZOOM_AUTO, IS_COMMENT );
     m_HToolBar->AddTool( ID_ZOOM_PAGE, wxEmptyString, KiBitmap( zoom_fit_in_page_xpm ), msg );
 
     m_HToolBar->AddSeparator();

eeschema/tool_sch.cpp

@@ -64,33 +64,33 @@ void SCH_EDIT_FRAME::ReCreateHToolbar()
     m_HToolBar->AddSeparator();
 
 
-    msg = AddHotkeyName( HELP_UNDO, s_Schematic_Hokeys_Descr, HK_UNDO, false );
+    msg = AddHotkeyName( HELP_UNDO, s_Schematic_Hokeys_Descr, HK_UNDO, IS_COMMENT );
     m_HToolBar->AddTool( wxID_UNDO, wxEmptyString, KiBitmap( undo_xpm ), msg );
 
-    msg = AddHotkeyName( HELP_REDO, s_Schematic_Hokeys_Descr, HK_REDO, false );
+    msg = AddHotkeyName( HELP_REDO, s_Schematic_Hokeys_Descr, HK_REDO, IS_COMMENT );
     m_HToolBar->AddTool( wxID_REDO, wxEmptyString, KiBitmap( redo_xpm ), msg );
 
 
     m_HToolBar->AddSeparator();
 
 
-    msg = AddHotkeyName( HELP_FIND, s_Schematic_Hokeys_Descr, HK_FIND_ITEM, false );
+    msg = AddHotkeyName( HELP_FIND, s_Schematic_Hokeys_Descr, HK_FIND_ITEM, IS_COMMENT );
     m_HToolBar->AddTool( ID_FIND_ITEMS, wxEmptyString, KiBitmap( find_xpm ), msg );
 
 
     m_HToolBar->AddSeparator();
 
 
-    msg = AddHotkeyName( HELP_ZOOM_IN, s_Schematic_Hokeys_Descr, HK_ZOOM_IN, false );
+    msg = AddHotkeyName( HELP_ZOOM_IN, s_Schematic_Hokeys_Descr, HK_ZOOM_IN, IS_COMMENT );
     m_HToolBar->AddTool( ID_ZOOM_IN, wxEmptyString, KiBitmap( zoom_in_xpm ), msg );
 
-    msg = AddHotkeyName( HELP_ZOOM_OUT, s_Schematic_Hokeys_Descr, HK_ZOOM_OUT, false );
+    msg = AddHotkeyName( HELP_ZOOM_OUT, s_Schematic_Hokeys_Descr, HK_ZOOM_OUT, IS_COMMENT );
     m_HToolBar->AddTool( ID_ZOOM_OUT, wxEmptyString, KiBitmap( zoom_out_xpm ), msg );
 
-    msg = AddHotkeyName( HELP_ZOOM_REDRAW, s_Schematic_Hokeys_Descr, HK_ZOOM_REDRAW, false );
+    msg = AddHotkeyName( HELP_ZOOM_REDRAW, s_Schematic_Hokeys_Descr, HK_ZOOM_REDRAW, IS_COMMENT );
     m_HToolBar->AddTool( ID_ZOOM_REDRAW, wxEmptyString, KiBitmap( zoom_redraw_xpm ), msg );
 
-    msg = AddHotkeyName( HELP_ZOOM_FIT, s_Schematic_Hokeys_Descr, HK_ZOOM_AUTO, false );
+    msg = AddHotkeyName( HELP_ZOOM_FIT, s_Schematic_Hokeys_Descr, HK_ZOOM_AUTO, IS_COMMENT );
     m_HToolBar->AddTool( ID_ZOOM_PAGE, wxEmptyString, KiBitmap( zoom_fit_in_page_xpm ), msg );
 
 

eeschema/tool_viewlib.cpp

@@ -47,22 +47,22 @@ void LIB_VIEW_FRAME::ReCreateHToolbar()
 
         m_HToolBar->AddSeparator();
         msg = AddHotkeyName( _( "Zoom in" ), s_Viewlib_Hokeys_Descr,
-                             HK_ZOOM_IN, false );
+                             HK_ZOOM_IN, IS_COMMENT );
         m_HToolBar->AddTool( ID_ZOOM_IN, wxEmptyString,
                              KiBitmap( zoom_in_xpm ), msg );
 
         msg = AddHotkeyName( _( "Zoom out" ), s_Viewlib_Hokeys_Descr,
-                             HK_ZOOM_OUT, false );
+                             HK_ZOOM_OUT, IS_COMMENT );
         m_HToolBar->AddTool( ID_ZOOM_OUT, wxEmptyString,
                              KiBitmap( zoom_out_xpm ), msg );
 
         msg = AddHotkeyName( _( "Redraw view" ), s_Viewlib_Hokeys_Descr,
-                             HK_ZOOM_REDRAW, false );
+                             HK_ZOOM_REDRAW, IS_COMMENT );
         m_HToolBar->AddTool( ID_ZOOM_REDRAW, wxEmptyString,
                              KiBitmap( zoom_redraw_xpm ), msg );
 
         msg = AddHotkeyName( _( "Zoom auto" ), s_Viewlib_Hokeys_Descr,
-                             HK_ZOOM_AUTO, false );
+                             HK_ZOOM_AUTO, IS_COMMENT );
         m_HToolBar->AddTool( ID_ZOOM_PAGE, wxEmptyString,
                              KiBitmap( zoom_fit_in_page_xpm ), msg );
 

gerbview/toolbars_gerber.cpp

@@ -42,16 +42,16 @@ void GERBVIEW_FRAME::ReCreateHToolbar( void )
                          _( "Print layers" ) );
 
     m_HToolBar->AddSeparator();
-    msg = AddHotkeyName( _( "Zoom in" ), s_Gerbview_Hokeys_Descr, HK_ZOOM_IN, false );
+    msg = AddHotkeyName( _( "Zoom in" ), s_Gerbview_Hokeys_Descr, HK_ZOOM_IN,  IS_COMMENT );
     m_HToolBar->AddTool( ID_ZOOM_IN, wxEmptyString, KiBitmap( zoom_in_xpm ), msg );
 
-    msg = AddHotkeyName( _( "Zoom out" ), s_Gerbview_Hokeys_Descr, HK_ZOOM_OUT, false );
+    msg = AddHotkeyName( _( "Zoom out" ), s_Gerbview_Hokeys_Descr, HK_ZOOM_OUT,  IS_COMMENT );
     m_HToolBar->AddTool( ID_ZOOM_OUT, wxEmptyString, KiBitmap( zoom_out_xpm ), msg );
 
-    msg = AddHotkeyName( _( "Redraw view" ), s_Gerbview_Hokeys_Descr, HK_ZOOM_REDRAW, false );
+    msg = AddHotkeyName( _( "Redraw view" ), s_Gerbview_Hokeys_Descr, HK_ZOOM_REDRAW,  IS_COMMENT );
     m_HToolBar->AddTool( ID_ZOOM_REDRAW, wxEmptyString, KiBitmap( zoom_redraw_xpm ), msg );
 
-    msg = AddHotkeyName( _( "Zoom auto" ), s_Gerbview_Hokeys_Descr, HK_ZOOM_AUTO, false );
+    msg = AddHotkeyName( _( "Zoom auto" ), s_Gerbview_Hokeys_Descr, HK_ZOOM_AUTO,  IS_COMMENT );
     m_HToolBar->AddTool( ID_ZOOM_PAGE, wxEmptyString, KiBitmap( zoom_fit_in_page_xpm ), msg );
 
     m_HToolBar->AddSeparator();

include/hotkeys_basic.h

@@ -14,7 +14,7 @@
 class EDA_DRAW_FRAME;
 
 
-/* Class to handle hotkey commnands. hotkeys have a default value
+/* Class to handle hotkey commands. hotkeys have a default value
  *  This class allows the real key code changed by user(from a key code list file)
  */
 class Ki_HotkeyInfo
@@ -93,6 +93,20 @@ wxString        ReturnKeyNameFromCommandId( Ki_HotkeyInfo** aList, int aCommandI
  */
 int ReturnKeyCodeFromKeyName( const wxString& keyname );
 
+/* An helper enum for AddHotkeyName function
+ * In menus we can an a hot key, or an accelerator , or sometimes just a comment
+ * Hot keys can perform actions using the current mouse cursor position
+ * Accelerators performs the same action as the associated menu
+ * A comment is used in tool tips for some tools (zoom ..)
+ *    to show the hot key that perfoms this action
+ */
+enum HOTKEY_ACTION_TYPE
+{
+    IS_HOTKEY,
+    IS_ACCELERATOR,
+    IS_COMMENT
+};
+
 /**
  * Function AddHotkeyName
  * Add the key name from the Command id value ( m_Idcommand member value)
@@ -105,7 +119,7 @@ int ReturnKeyCodeFromKeyName( const wxString& keyname );
  */
 wxString        AddHotkeyName( const wxString& aText, Ki_HotkeyInfo** aList,
                                int  aCommandId,
-                               bool aIsShortCut = true);
+                               HOTKEY_ACTION_TYPE aShortCutType = IS_HOTKEY);
 
 /**
  * Function AddHotkeyName
@@ -120,7 +134,7 @@ wxString        AddHotkeyName( const wxString& aText, Ki_HotkeyInfo** aList,
 wxString        AddHotkeyName( const wxString&                        aText,
                                struct Ki_HotkeyInfoSectionDescriptor* aDescrList,
                                int                                    aCommandId,
-                               bool                                   aIsShortCut = true);
+                               HOTKEY_ACTION_TYPE           aShortCutType = IS_HOTKEY );
 
 /**
  * Function DisplayHotkeyList

pcbnew/menubar_pcbframe.cpp

@@ -44,11 +44,11 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
     filesMenu->Append( item );
 
     // Open
-    item = new wxMenuItem( filesMenu, ID_LOAD_FILE,
-                           _( "&Open\tCtrl+O" ),
-                           _( "Delete current board and load new board" ) );
-    SET_BITMAP( KiBitmap( open_document_xpm ) );
-    filesMenu->Append( item );
+    text = AddHotkeyName( _( "&Open" ), g_Board_Editor_Hokeys_Descr,
+                          HK_LOAD_BOARD );
+    AddMenuItem( filesMenu, ID_LOAD_FILE, text,
+                _( "Delete current board and load new board" ),
+                KiBitmap( open_document_xpm ) );
 
     // Load Recent submenu
     static wxMenu* openRecentMenu;
@@ -78,11 +78,11 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
     filesMenu->AppendSeparator();
 
     // Save
-    item = new wxMenuItem( filesMenu, ID_SAVE_BOARD,
-                           _( "&Save\tCtrl+S" ),
-                           _( "Save current board" ) );
-    SET_BITMAP( KiBitmap( save_xpm ) );
-    filesMenu->Append( item );
+    text = AddHotkeyName( _( "&Save" ), g_Board_Editor_Hokeys_Descr,
+                          HK_SAVE_BOARD );
+    AddMenuItem( filesMenu, ID_SAVE_BOARD, text,
+                _( "Save current board" ),
+                KiBitmap( save_xpm ) );
 
     // Save As
     item = new wxMenuItem( filesMenu, ID_SAVE_BOARD_AS,
@@ -204,7 +204,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
 
     // Print
     item = new wxMenuItem( filesMenu, wxID_PRINT,
-                           _( "&Print\tCtrl+P" ),
+                           _( "&Print" ),
                            _( "Print board" ) );
     SET_BITMAP( KiBitmap( print_button_xpm ) );
     filesMenu->Append( item );
@@ -336,20 +336,23 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
      * for Zoom in and Zoom out sub menus
      */
     // Zoom In
-    text = AddHotkeyName( _( "Zoom In" ), g_Pcbnew_Editor_Hokeys_Descr, HK_ZOOM_IN, false );
+    text = AddHotkeyName( _( "Zoom In" ), g_Pcbnew_Editor_Hokeys_Descr,
+                          HK_ZOOM_IN, IS_ACCELERATOR );
     item = new wxMenuItem( viewMenu, ID_ZOOM_IN, text, HELP_ZOOM_IN, wxITEM_NORMAL );
     SET_BITMAP( KiBitmap( zoom_in_xpm ) );
     viewMenu->Append( item );
 
     // Zoom Out
-    text = AddHotkeyName( _( "Zoom Out" ), g_Pcbnew_Editor_Hokeys_Descr, HK_ZOOM_OUT, false );
+    text = AddHotkeyName( _( "Zoom Out" ), g_Pcbnew_Editor_Hokeys_Descr,
+                          HK_ZOOM_OUT, IS_ACCELERATOR );
     item = new wxMenuItem( viewMenu, ID_ZOOM_OUT, text, HELP_ZOOM_OUT, wxITEM_NORMAL );
 
     SET_BITMAP( KiBitmap( zoom_out_xpm ) );
     viewMenu->Append( item );
 
     // Fit on Screen
-    text = AddHotkeyName( _( "Fit on Screen" ), g_Pcbnew_Editor_Hokeys_Descr, HK_ZOOM_AUTO );
+    text = AddHotkeyName( _( "Fit on Screen" ), g_Pcbnew_Editor_Hokeys_Descr,
+                          HK_ZOOM_AUTO );
 
     item = new wxMenuItem( viewMenu, ID_ZOOM_PAGE, text, HELP_ZOOM_FIT, wxITEM_NORMAL );
     SET_BITMAP( KiBitmap( zoom_fit_in_page_xpm ) );
@@ -361,8 +364,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
     text = AddHotkeyName( _( "Redraw" ), g_Pcbnew_Editor_Hokeys_Descr, HK_ZOOM_REDRAW );
 
     item = new wxMenuItem( viewMenu, ID_ZOOM_REDRAW, text,
-                           HELP_ZOOM_REDRAW,
-                           wxITEM_NORMAL );
+                           HELP_ZOOM_REDRAW, wxITEM_NORMAL );
     SET_BITMAP( KiBitmap( zoom_redraw_xpm ) );
     viewMenu->Append( item );
     viewMenu->AppendSeparator();
@@ -387,7 +389,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
     wxMenu* placeMenu = new wxMenu;
 
     // Module
-    text = AddHotkeyName( _( "Module" ), g_Pcbnew_Editor_Hokeys_Descr, HK_ADD_MODULE, false );
+    text = AddHotkeyName( _( "Module" ), g_Pcbnew_Editor_Hokeys_Descr, HK_ADD_MODULE, IS_ACCELERATOR );
     item = new wxMenuItem( placeMenu, ID_PCB_MODULE_BUTT, text,
                            _( "Add modules" ), wxITEM_NORMAL );
 
@@ -395,7 +397,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
     placeMenu->Append( item );
 
     // Track
-    text = AddHotkeyName( _( "Track" ), g_Pcbnew_Editor_Hokeys_Descr, HK_ADD_NEW_TRACK, false );
+    text = AddHotkeyName( _( "Track" ), g_Pcbnew_Editor_Hokeys_Descr, HK_ADD_NEW_TRACK, IS_ACCELERATOR );
     item = new wxMenuItem( placeMenu, ID_TRACK_BUTT, text,
                            _( "Add tracks and vias" ), wxITEM_NORMAL );
 

pcbnew/tool_modedit.cpp

@@ -87,16 +87,16 @@ void FOOTPRINT_EDIT_FRAME::ReCreateHToolbar()
                          _( "Print module" ) );
 
     m_HToolBar->AddSeparator();
-    msg = AddHotkeyName( _( "Zoom in" ), g_Module_Editor_Hokeys_Descr, HK_ZOOM_IN, false );
+    msg = AddHotkeyName( _( "Zoom in" ), g_Module_Editor_Hokeys_Descr, HK_ZOOM_IN, IS_COMMENT );
     m_HToolBar->AddTool( ID_ZOOM_IN, wxEmptyString, KiBitmap( zoom_in_xpm ), msg );
 
-    msg = AddHotkeyName( _( "Zoom out" ), g_Module_Editor_Hokeys_Descr, HK_ZOOM_OUT, false );
+    msg = AddHotkeyName( _( "Zoom out" ), g_Module_Editor_Hokeys_Descr, HK_ZOOM_OUT, IS_COMMENT );
     m_HToolBar->AddTool( ID_ZOOM_OUT, wxEmptyString, KiBitmap( zoom_out_xpm ), msg );
 
-    msg = AddHotkeyName( _( "Redraw view" ), g_Module_Editor_Hokeys_Descr, HK_ZOOM_REDRAW, false );
+    msg = AddHotkeyName( _( "Redraw view" ), g_Module_Editor_Hokeys_Descr, HK_ZOOM_REDRAW, IS_COMMENT );
     m_HToolBar->AddTool( ID_ZOOM_REDRAW, wxEmptyString, KiBitmap( zoom_redraw_xpm ), msg );
 
-    msg = AddHotkeyName( _( "Zoom auto" ), g_Module_Editor_Hokeys_Descr, HK_ZOOM_AUTO, false );
+    msg = AddHotkeyName( _( "Zoom auto" ), g_Module_Editor_Hokeys_Descr, HK_ZOOM_AUTO, IS_COMMENT );
     m_HToolBar->AddTool( ID_ZOOM_PAGE, wxEmptyString, KiBitmap( zoom_fit_in_page_xpm ), msg );
 
     m_HToolBar->AddSeparator();

pcbnew/tool_pcb.cpp

@@ -217,9 +217,9 @@ void PCB_EDIT_FRAME::ReCreateHToolbar()
 #endif
 
     m_HToolBar->AddSeparator();
-    msg = AddHotkeyName( HELP_UNDO, g_Board_Editor_Hokeys_Descr, HK_UNDO, false );
+    msg = AddHotkeyName( HELP_UNDO, g_Board_Editor_Hokeys_Descr, HK_UNDO, IS_COMMENT );
     m_HToolBar->AddTool( wxID_UNDO, wxEmptyString, KiBitmap( undo_xpm ), HELP_UNDO );
-    msg = AddHotkeyName( HELP_REDO, g_Board_Editor_Hokeys_Descr, HK_REDO, false );
+    msg = AddHotkeyName( HELP_REDO, g_Board_Editor_Hokeys_Descr, HK_REDO, IS_COMMENT );
     m_HToolBar->AddTool( wxID_REDO, wxEmptyString, KiBitmap( redo_xpm ), HELP_REDO );
 
     m_HToolBar->AddSeparator();
@@ -229,20 +229,20 @@ void PCB_EDIT_FRAME::ReCreateHToolbar()
                          _( "Plot (HPGL, PostScript, or GERBER format)" ) );
 
     m_HToolBar->AddSeparator();
-    msg = AddHotkeyName( HELP_ZOOM_IN, g_Board_Editor_Hokeys_Descr, HK_ZOOM_IN, false );
+    msg = AddHotkeyName( HELP_ZOOM_IN, g_Board_Editor_Hokeys_Descr, HK_ZOOM_IN, IS_COMMENT );
     m_HToolBar->AddTool( ID_ZOOM_IN, wxEmptyString, KiBitmap( zoom_in_xpm ), msg );
 
-    msg = AddHotkeyName( HELP_ZOOM_OUT, g_Board_Editor_Hokeys_Descr, HK_ZOOM_OUT, false );
+    msg = AddHotkeyName( HELP_ZOOM_OUT, g_Board_Editor_Hokeys_Descr, HK_ZOOM_OUT, IS_COMMENT );
     m_HToolBar->AddTool( ID_ZOOM_OUT, wxEmptyString, KiBitmap( zoom_out_xpm ), msg );
 
-    msg = AddHotkeyName( HELP_ZOOM_REDRAW, g_Board_Editor_Hokeys_Descr, HK_ZOOM_REDRAW, false );
+    msg = AddHotkeyName( HELP_ZOOM_REDRAW, g_Board_Editor_Hokeys_Descr, HK_ZOOM_REDRAW, IS_COMMENT );
     m_HToolBar->AddTool( ID_ZOOM_REDRAW, wxEmptyString, KiBitmap( zoom_redraw_xpm ), msg );
 
-    msg = AddHotkeyName( HELP_ZOOM_FIT, g_Board_Editor_Hokeys_Descr, HK_ZOOM_AUTO, false );
+    msg = AddHotkeyName( HELP_ZOOM_FIT, g_Board_Editor_Hokeys_Descr, HK_ZOOM_AUTO, IS_COMMENT );
     m_HToolBar->AddTool( ID_ZOOM_PAGE, wxEmptyString, KiBitmap( zoom_fit_in_page_xpm ), msg );
 
     m_HToolBar->AddSeparator();
-    msg = AddHotkeyName( HELP_FIND, g_Board_Editor_Hokeys_Descr, HK_FIND_ITEM, false );
+    msg = AddHotkeyName( HELP_FIND, g_Board_Editor_Hokeys_Descr, HK_FIND_ITEM, IS_COMMENT );
     m_HToolBar->AddTool( ID_FIND_ITEMS, wxEmptyString, KiBitmap( find_xpm ), msg );
 
     m_HToolBar->AddSeparator();