Loading common/dialogs/dialog_hotkeys_editor.cpp +4 −3 Original line number Diff line number Diff line Loading @@ -175,7 +175,7 @@ void HOTKEYS_EDITOR_DIALOG::OnClickOnCell( wxGridEvent& event ) /** OnRightClickOnCell * If a cell is selected, display a list of keys for selection * The list is restricted to keys that cannot be entered: * tab, home ... because these keys have special functions in dialogs * tab, home, return ... because these keys have special functions in dialogs */ void HOTKEYS_EDITOR_DIALOG::OnRightClickOnCell( wxGridEvent& event ) { Loading @@ -186,8 +186,8 @@ void HOTKEYS_EDITOR_DIALOG::OnRightClickOnCell( wxGridEvent& event ) return; // Do not translate these key names. They are internally used. //ee hotkeys_basic.cpp #define C_COUNT 8 // See hotkeys_basic.cpp #define C_COUNT 9 wxString choices[C_COUNT] = { wxT("End") Loading @@ -198,6 +198,7 @@ void HOTKEYS_EDITOR_DIALOG::OnRightClickOnCell( wxGridEvent& event ) wxT("Space"), wxT("Ctrl+Space"), wxT("Alt+Space"), wxT("Return") }; wxString keyname = wxGetSingleChoice( _( "Special keys only. For others keys, use keyboard" ), Loading common/hotkey_grid_table.cpp +23 −0 Original line number Diff line number Diff line /* * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 1992-2014 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, you may find one here: * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * or you may search the http://www.gnu.org website for the version 2 license, * or you may write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ #include <hotkey_grid_table.h> /* Loading common/hotkeys_basic.cpp +2 −0 Original line number Diff line number Diff line Loading @@ -133,6 +133,8 @@ static struct hotkey_name_descr s_Hotkey_Name_List[] = { wxT( "Left" ), WXK_LEFT }, { wxT( "Right" ), WXK_RIGHT }, { wxT( "Return" ), WXK_RETURN }, { wxT( "Space" ), WXK_SPACE }, // Do not change this line: end of list Loading eeschema/hotkeys.cpp +28 −0 Original line number Diff line number Diff line Loading @@ -128,6 +128,10 @@ static EDA_HOTKEY HkRedo( wxT( "Redo" ), HK_REDO, GR_KB_SHIFT + GR_KB_CTRL + 'Z' (int) wxID_REDO ); #endif // mouse click command: static EDA_HOTKEY HkMouseLeftClick( wxT( "Mouse Left Click" ), HK_LEFT_CLICK, WXK_RETURN, 0 ); static EDA_HOTKEY HkMouseLeftDClick( wxT( "Mouse Left DClick" ), HK_LEFT_DCLICK, WXK_END, 0 ); // Schematic editor static EDA_HOTKEY HkBeginWire( wxT( "Begin Wire" ), HK_BEGIN_WIRE, 'W', ID_WIRE_BUTT ); static EDA_HOTKEY HkBeginBus( wxT( "Begin Bus" ), HK_BEGIN_BUS, 'B', ID_BUS_BUTT ); Loading Loading @@ -191,6 +195,8 @@ static EDA_HOTKEY HkDelete( wxT( "Delete Item" ), HK_DELETE, WXK_DELETE ); static EDA_HOTKEY HkFindItem( wxT( "Find Item" ), HK_FIND_ITEM, 'F' + GR_KB_CTRL, ID_FIND_ITEMS ); static EDA_HOTKEY HkFindNextItem( wxT( "Find Next Item" ), HK_FIND_NEXT_ITEM, WXK_F5, wxEVT_COMMAND_FIND ); static EDA_HOTKEY HkFindReplace( wxT( "Find and Replace" ), HK_FIND_REPLACE, 'F' + GR_KB_CTRL + GR_KB_ALT, wxID_REPLACE ); static EDA_HOTKEY HkFindNextDrcMarker( wxT( "Find Next DRC Marker" ), HK_FIND_NEXT_DRC_MARKER, WXK_F5 + GR_KB_SHIFT, EVT_COMMAND_FIND_DRC_MARKER ); Loading Loading @@ -220,6 +226,8 @@ EDA_HOTKEY* s_Common_Hotkey_List[] = &HkDrag, &HkUndo, &HkRedo, &HkMouseLeftClick, &HkMouseLeftDClick, NULL }; Loading @@ -231,6 +239,7 @@ EDA_HOTKEY* s_Schematic_Hotkey_List[] = &HkFindItem, &HkFindNextItem, &HkFindNextDrcMarker, &HkFindReplace, &HkInsert, &HkMove2Drag, &HkSaveBlock, Loading Loading @@ -361,6 +370,15 @@ void SCH_EDIT_FRAME::OnHotKey( wxDC* aDC, int aHotKey, const wxPoint& aPosition, GetScreen()->m_O_Curseur = GetCrossHairPosition(); break; case HK_LEFT_CLICK: OnLeftClick( aDC, aPosition ); break; case HK_LEFT_DCLICK: // Simulate a double left click: generate 2 events OnLeftClick( aDC, aPosition ); OnLeftDClick( aDC, aPosition ); break; case HK_ZOOM_IN: case HK_ZOOM_OUT: case HK_ZOOM_REDRAW: Loading Loading @@ -395,6 +413,7 @@ void SCH_EDIT_FRAME::OnHotKey( wxDC* aDC, int aHotKey, const wxPoint& aPosition, case HK_UNDO: case HK_REDO: case HK_FIND_ITEM: case HK_FIND_REPLACE: if( notBusy ) { cmd.SetId( hotKey->m_IdMenuEvent ); Loading Loading @@ -558,6 +577,15 @@ void LIB_EDIT_FRAME::OnHotKey( wxDC* aDC, int aHotKey, const wxPoint& aPosition, GetScreen()->m_O_Curseur = GetCrossHairPosition(); break; case HK_LEFT_CLICK: OnLeftClick( aDC, aPosition ); break; case HK_LEFT_DCLICK: // Simulate a double left click: generate 2 events OnLeftClick( aDC, aPosition ); OnLeftDClick( aDC, aPosition ); break; case HK_ZOOM_IN: case HK_ZOOM_OUT: case HK_ZOOM_REDRAW: Loading eeschema/hotkeys.h +4 −1 Original line number Diff line number Diff line Loading @@ -13,6 +13,7 @@ enum hotkey_id_commnand { HK_FIND_NEXT_ITEM = HK_COMMON_END, HK_FIND_NEXT_DRC_MARKER, HK_FIND_ITEM, HK_FIND_REPLACE, HK_DELETE, HK_REPEAT_LAST, HK_LIBEDIT_MOVE_GRAPHIC_ITEM, Loading Loading @@ -48,7 +49,9 @@ enum hotkey_id_commnand { HK_ADD_NOCONN_FLAG, HK_SAVE_LIB, HK_SAVE_SCH, HK_LOAD_SCH HK_LOAD_SCH, HK_LEFT_CLICK, HK_LEFT_DCLICK }; // List of hotkey descriptors for Eeschema Loading Loading
common/dialogs/dialog_hotkeys_editor.cpp +4 −3 Original line number Diff line number Diff line Loading @@ -175,7 +175,7 @@ void HOTKEYS_EDITOR_DIALOG::OnClickOnCell( wxGridEvent& event ) /** OnRightClickOnCell * If a cell is selected, display a list of keys for selection * The list is restricted to keys that cannot be entered: * tab, home ... because these keys have special functions in dialogs * tab, home, return ... because these keys have special functions in dialogs */ void HOTKEYS_EDITOR_DIALOG::OnRightClickOnCell( wxGridEvent& event ) { Loading @@ -186,8 +186,8 @@ void HOTKEYS_EDITOR_DIALOG::OnRightClickOnCell( wxGridEvent& event ) return; // Do not translate these key names. They are internally used. //ee hotkeys_basic.cpp #define C_COUNT 8 // See hotkeys_basic.cpp #define C_COUNT 9 wxString choices[C_COUNT] = { wxT("End") Loading @@ -198,6 +198,7 @@ void HOTKEYS_EDITOR_DIALOG::OnRightClickOnCell( wxGridEvent& event ) wxT("Space"), wxT("Ctrl+Space"), wxT("Alt+Space"), wxT("Return") }; wxString keyname = wxGetSingleChoice( _( "Special keys only. For others keys, use keyboard" ), Loading
common/hotkey_grid_table.cpp +23 −0 Original line number Diff line number Diff line /* * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 1992-2014 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, you may find one here: * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * or you may search the http://www.gnu.org website for the version 2 license, * or you may write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ #include <hotkey_grid_table.h> /* Loading
common/hotkeys_basic.cpp +2 −0 Original line number Diff line number Diff line Loading @@ -133,6 +133,8 @@ static struct hotkey_name_descr s_Hotkey_Name_List[] = { wxT( "Left" ), WXK_LEFT }, { wxT( "Right" ), WXK_RIGHT }, { wxT( "Return" ), WXK_RETURN }, { wxT( "Space" ), WXK_SPACE }, // Do not change this line: end of list Loading
eeschema/hotkeys.cpp +28 −0 Original line number Diff line number Diff line Loading @@ -128,6 +128,10 @@ static EDA_HOTKEY HkRedo( wxT( "Redo" ), HK_REDO, GR_KB_SHIFT + GR_KB_CTRL + 'Z' (int) wxID_REDO ); #endif // mouse click command: static EDA_HOTKEY HkMouseLeftClick( wxT( "Mouse Left Click" ), HK_LEFT_CLICK, WXK_RETURN, 0 ); static EDA_HOTKEY HkMouseLeftDClick( wxT( "Mouse Left DClick" ), HK_LEFT_DCLICK, WXK_END, 0 ); // Schematic editor static EDA_HOTKEY HkBeginWire( wxT( "Begin Wire" ), HK_BEGIN_WIRE, 'W', ID_WIRE_BUTT ); static EDA_HOTKEY HkBeginBus( wxT( "Begin Bus" ), HK_BEGIN_BUS, 'B', ID_BUS_BUTT ); Loading Loading @@ -191,6 +195,8 @@ static EDA_HOTKEY HkDelete( wxT( "Delete Item" ), HK_DELETE, WXK_DELETE ); static EDA_HOTKEY HkFindItem( wxT( "Find Item" ), HK_FIND_ITEM, 'F' + GR_KB_CTRL, ID_FIND_ITEMS ); static EDA_HOTKEY HkFindNextItem( wxT( "Find Next Item" ), HK_FIND_NEXT_ITEM, WXK_F5, wxEVT_COMMAND_FIND ); static EDA_HOTKEY HkFindReplace( wxT( "Find and Replace" ), HK_FIND_REPLACE, 'F' + GR_KB_CTRL + GR_KB_ALT, wxID_REPLACE ); static EDA_HOTKEY HkFindNextDrcMarker( wxT( "Find Next DRC Marker" ), HK_FIND_NEXT_DRC_MARKER, WXK_F5 + GR_KB_SHIFT, EVT_COMMAND_FIND_DRC_MARKER ); Loading Loading @@ -220,6 +226,8 @@ EDA_HOTKEY* s_Common_Hotkey_List[] = &HkDrag, &HkUndo, &HkRedo, &HkMouseLeftClick, &HkMouseLeftDClick, NULL }; Loading @@ -231,6 +239,7 @@ EDA_HOTKEY* s_Schematic_Hotkey_List[] = &HkFindItem, &HkFindNextItem, &HkFindNextDrcMarker, &HkFindReplace, &HkInsert, &HkMove2Drag, &HkSaveBlock, Loading Loading @@ -361,6 +370,15 @@ void SCH_EDIT_FRAME::OnHotKey( wxDC* aDC, int aHotKey, const wxPoint& aPosition, GetScreen()->m_O_Curseur = GetCrossHairPosition(); break; case HK_LEFT_CLICK: OnLeftClick( aDC, aPosition ); break; case HK_LEFT_DCLICK: // Simulate a double left click: generate 2 events OnLeftClick( aDC, aPosition ); OnLeftDClick( aDC, aPosition ); break; case HK_ZOOM_IN: case HK_ZOOM_OUT: case HK_ZOOM_REDRAW: Loading Loading @@ -395,6 +413,7 @@ void SCH_EDIT_FRAME::OnHotKey( wxDC* aDC, int aHotKey, const wxPoint& aPosition, case HK_UNDO: case HK_REDO: case HK_FIND_ITEM: case HK_FIND_REPLACE: if( notBusy ) { cmd.SetId( hotKey->m_IdMenuEvent ); Loading Loading @@ -558,6 +577,15 @@ void LIB_EDIT_FRAME::OnHotKey( wxDC* aDC, int aHotKey, const wxPoint& aPosition, GetScreen()->m_O_Curseur = GetCrossHairPosition(); break; case HK_LEFT_CLICK: OnLeftClick( aDC, aPosition ); break; case HK_LEFT_DCLICK: // Simulate a double left click: generate 2 events OnLeftClick( aDC, aPosition ); OnLeftDClick( aDC, aPosition ); break; case HK_ZOOM_IN: case HK_ZOOM_OUT: case HK_ZOOM_REDRAW: Loading
eeschema/hotkeys.h +4 −1 Original line number Diff line number Diff line Loading @@ -13,6 +13,7 @@ enum hotkey_id_commnand { HK_FIND_NEXT_ITEM = HK_COMMON_END, HK_FIND_NEXT_DRC_MARKER, HK_FIND_ITEM, HK_FIND_REPLACE, HK_DELETE, HK_REPEAT_LAST, HK_LIBEDIT_MOVE_GRAPHIC_ITEM, Loading Loading @@ -48,7 +49,9 @@ enum hotkey_id_commnand { HK_ADD_NOCONN_FLAG, HK_SAVE_LIB, HK_SAVE_SCH, HK_LOAD_SCH HK_LOAD_SCH, HK_LEFT_CLICK, HK_LEFT_DCLICK }; // List of hotkey descriptors for Eeschema Loading