enhancements about hot keys

common/drawpanel.cpp

@@ -1344,6 +1344,13 @@ void WinEDA_DrawPanel::OnKeyEvent( wxKeyEvent& event )
     if( event.ShiftDown() && (key > 256) )
         localkey |= GR_KB_SHIFT;
 
+    /* Normalize keys code to easily handle keys from Ctrl+A to Ctrl+Z
+     * They have an ascii code from 1 to 27 remapped
+     * GR_KB_CTRL + 'A' to GR_KB_CTRL + 'Z'
+     */
+    if( (localkey & (GR_KB_CTRL|GR_KB_ALT|GR_KB_SHIFT)) == GR_KB_CTRL )
+        localkey += 'A' - 1;
+
     INSTALL_DC( DC, this );
 
     BASE_SCREEN* Screen = GetScreen();

eeschema/hotkeys.cpp

@@ -233,10 +233,6 @@ void WinEDA_SchematicFrame::OnHotKey( wxDC* DC, int hotkey,
 
     wxPoint MousePos = GetScreen()->m_MousePosition;
 
-    // Remap the control key Ctrl A (0x01) to GR_KB_CTRL + 'A' (easier to
-    // handle...)
-    if( (hotkey & GR_KB_CTRL) != 0 )
-        hotkey += 'A' - 1;
     /* Convert lower to upper case (the usual toupper function has problem
      * with non ascii codes like function keys */
     if( (hotkey >= 'a') && (hotkey <= 'z') )
@@ -640,11 +636,6 @@ void WinEDA_LibeditFrame::OnHotKey( wxDC* DC, int hotkey,
     if( hotkey == 0 )
         return;
 
-    // Remap the control key Ctrl A (0x01) to GR_KB_CTRL + 'A' (easier to
-    // handle...)
-    if( (hotkey & GR_KB_CTRL) != 0 )
-        hotkey += 'A' - 1;
-
     /* Convert lower to upper case (the usual toupper function has problem
      * with non ascii codes like function keys */
     if( (hotkey >= 'a') && (hotkey <= 'z') )

eeschema/menubar.cpp

@@ -151,11 +151,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
     wxMenu* editMenu = new wxMenu;
 
     /* Undo */
-#if !defined( __WXMAC__)
     text  = AddHotkeyName( _( "Undo" ), s_Schematic_Hokeys_Descr, HK_UNDO);
-#else
-    text = _( "Undo\tCtrl+Z" );
-#endif
 
     item = new wxMenuItem( editMenu, wxID_UNDO, text,
                            _( "Undo last edition" ), wxITEM_NORMAL );
@@ -163,11 +159,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
     editMenu->Append( item );
 
     /* Redo */
-#if !defined( __WXMAC__)
     text  = AddHotkeyName( _( "Redo" ), s_Schematic_Hokeys_Descr, HK_REDO);
-#else
-    text = _( "Redo\tShift+Ctrl+Z" );
-#endif
 
     item = new wxMenuItem( editMenu, wxID_REDO, text,
                            _( "Redo the last undo command" ), wxITEM_NORMAL );

eeschema/onrightclick.cpp

@@ -60,16 +60,10 @@ bool WinEDA_SchematicFrame::OnRightClick( const wxPoint& MousePos,
         return true;
     }
 
-    if (DrawStruct)
-        	cout << "Drawstruct Type before: " << DrawStruct -> Type() << endl;
-
     // Try to locate items at cursor position.
     if( (DrawStruct == NULL) || (DrawStruct->m_Flags == 0) )
     {
         DrawStruct = SchematicGeneralLocateAndDisplay( false );
-        if (DrawStruct)
-            	cout << "Drawstruct Type locate : " << DrawStruct -> Type() << endl;
-
 
         if( DrawStruct && (DrawStruct->Type() == DRAW_SHEET_STRUCT_TYPE) )
         {
@@ -81,9 +75,6 @@ bool WinEDA_SchematicFrame::OnRightClick( const wxPoint& MousePos,
         }
     }
 
-    if (DrawStruct)
-    	cout << "Drawstruct Type : " << DrawStruct -> Type() << endl;
-
     // If Command in progress: add "cancel" and "end tool" menu
     if(  m_ID_current_state )
     {

gerbview/hotkeys.cpp

@@ -84,9 +84,6 @@ void WinEDA_GerberFrame::OnHotKey( wxDC* DC, int hotkey,
     wxCommandEvent cmd( wxEVT_COMMAND_MENU_SELECTED );
     cmd.SetEventObject( this );
 
-    // Remap the control key Ctrl A (0x01) to GR_KB_CTRL + 'A' (easier to handle...)
-    if( (hotkey & GR_KB_CTRL) != 0 )
-        hotkey += 'A' - 1;
     /* Convert lower to upper case (the usual toupper function has problem with non ascii codes like function keys */
     if( (hotkey >= 'a') && (hotkey <= 'z') )
         hotkey += 'A' - 'a';

pcbnew/hotkeys.cpp

@@ -218,10 +218,6 @@ void WinEDA_PcbFrame::OnHotKey( wxDC* DC, int hotkey, EDA_BaseStruct* DrawStruct
 
     MODULE* module = NULL;
 
-    // Remap the control key Ctrl A (0x01) to GR_KB_CTRL + 'A' (just easier to handle...)
-    if( (hotkey & GR_KB_CTRL) != 0 )
-        hotkey += 'A' - 1;
-
     /* Convert lower to upper case
      * (the usual toupper function has problem with non ascii codes like function keys
      */
@@ -676,10 +672,6 @@ void WinEDA_ModuleEditFrame::OnHotKey( wxDC* DC, int hotkey,
     wxCommandEvent cmd( wxEVT_COMMAND_MENU_SELECTED );
     cmd.SetEventObject( this );
 
-    // Remap the control key Ctrl A (0x01) to GR_KB_CTRL + 'A' (just easier to handle...)
-    if( (hotkey & GR_KB_CTRL) != 0 )
-        hotkey += 'A' - 1;
-
     /* Convert lower to upper case (the usual toupper function has problem with non ascii codes like function keys */
     if( (hotkey >= 'a') && (hotkey <= 'z') )
         hotkey += 'A' - 'a';