haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add Ctrl+, hotkey to preferences dialog 

Also change interactive router settings from Ctrl+, to Ctrl+Shift+,
This commit is contained in:
Michael Kavanagh 2019-04-01 18:18:29 +01:00 committed by Wayne Stambaugh
parent fe6bc411dd
commit b0674b8802
14 changed files with 65 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
eeschema/hotkeys.cpp
View File

@ -116,6 +116,7 @@ static EDA_HOTKEY HkZoomOut( _HKI( "Zoom Out" ), HK_ZOOM_OUT, GR_KB_CTRL + '-',
#endif #endif
static EDA_HOTKEY HkHelp( _HKI( "List Hotkeys" ), HK_HELP, GR_KB_CTRL + WXK_F1 ); static EDA_HOTKEY HkHelp( _HKI( "List Hotkeys" ), HK_HELP, GR_KB_CTRL + WXK_F1 );
static EDA_HOTKEY HkPreferences( _HKI( "Preferences" ), HK_PREFERENCES, GR_KB_CTRL + ',', (int) wxID_PREFERENCES );
static EDA_HOTKEY HkResetLocalCoord( _HKI( "Reset Local Coordinates" ), HK_RESET_LOCAL_COORD, ' ' ); static EDA_HOTKEY HkResetLocalCoord( _HKI( "Reset Local Coordinates" ), HK_RESET_LOCAL_COORD, ' ' );
static EDA_HOTKEY HkLeaveSheet( _HKI( "Leave Sheet" ), HK_LEAVE_SHEET, GR_KB_ALT + WXK_BACK, static EDA_HOTKEY HkLeaveSheet( _HKI( "Leave Sheet" ), HK_LEAVE_SHEET, GR_KB_ALT + WXK_BACK,
ID_POPUP_SCH_LEAVE_SHEET ); ID_POPUP_SCH_LEAVE_SHEET );
@ -265,6 +266,7 @@ static EDA_HOTKEY* common_Hotkey_List[] =
&HkUndo, &HkRedo, &HkUndo, &HkRedo,
&HkEditCut, &HkEditCopy, &HkEditPaste, &HkEditCut, &HkEditCopy, &HkEditPaste,
&HkHelp, &HkHelp,
&HkPreferences,
&HkZoomIn, &HkZoomIn,
&HkZoomOut, &HkZoomOut,
&HkZoomRedraw, &HkZoomRedraw,
@ -466,6 +468,11 @@ bool SCH_EDIT_FRAME::OnHotKey( wxDC* aDC, int aHotKey, const wxPoint& aPosition,
DisplayHotkeyList( this, g_Schematic_Hotkeys_Descr ); DisplayHotkeyList( this, g_Schematic_Hotkeys_Descr );
break; break;
case HK_PREFERENCES:
cmd.SetId( wxID_PREFERENCES );
GetEventHandler()->ProcessEvent( cmd );
break;
case HK_RESET_LOCAL_COORD: // Reset the relative coord case HK_RESET_LOCAL_COORD: // Reset the relative coord
GetScreen()->m_O_Curseur = GetCrossHairPosition(); GetScreen()->m_O_Curseur = GetCrossHairPosition();
break; break;
@ -715,6 +722,11 @@ bool LIB_EDIT_FRAME::OnHotKey( wxDC* aDC, int aHotKey, const wxPoint& aPosition,
DisplayHotkeyList( this, g_Libedit_Hotkeys_Descr ); DisplayHotkeyList( this, g_Libedit_Hotkeys_Descr );
break; break;
case HK_PREFERENCES:
cmd.SetId( wxID_PREFERENCES );
GetEventHandler()->ProcessEvent( cmd );
break;
case HK_RESET_LOCAL_COORD: // Reset the relative coord case HK_RESET_LOCAL_COORD: // Reset the relative coord
GetScreen()->m_O_Curseur = GetCrossHairPosition(); GetScreen()->m_O_Curseur = GetCrossHairPosition();
break; break;

5
eeschema/libedit/menubar_libedit.cpp
View File

@ -329,9 +329,8 @@ void LIB_EDIT_FRAME::ReCreateMenuBar()
preferencesMenu->AppendSeparator(); preferencesMenu->AppendSeparator();
// Default values and options // Default values and options
AddMenuItem( preferencesMenu, text = AddHotkeyName( _( "&Preferences..." ), g_Libedit_Hotkeys_Descr, HK_PREFERENCES );
wxID_PREFERENCES, AddMenuItem( preferencesMenu, wxID_PREFERENCES, text,
_( "&Preferences..." ),
_( "Show preferences for all open tools" ), _( "Show preferences for all open tools" ),
KiBitmap( preference_xpm ) ); KiBitmap( preference_xpm ) );

5
eeschema/menubar.cpp
View File

@ -634,7 +634,8 @@ static void preparePreferencesMenu( SCH_EDIT_FRAME* aFrame, wxMenu* aParentMenu
KiBitmap( library_table_xpm ) ); KiBitmap( library_table_xpm ) );
// Options (Preferences on WXMAC) // Options (Preferences on WXMAC)
AddMenuItem( aParentMenu, wxID_PREFERENCES, _( "Preferences..." ), wxString text = AddHotkeyName( _( "&Preferences..." ), g_Eeschema_Hotkeys_Descr, HK_PREFERENCES );
AddMenuItem( aParentMenu, wxID_PREFERENCES, text,
_( "Show preferences for all open tools" ), _( "Show preferences for all open tools" ),
KiBitmap( preference_xpm ) ); KiBitmap( preference_xpm ) );
@ -645,7 +646,7 @@ static void preparePreferencesMenu( SCH_EDIT_FRAME* aFrame, wxMenu* aParentMenu
aParentMenu->AppendSeparator(); aParentMenu->AppendSeparator();
wxString text = AddHotkeyName( _( "Modern Toolset (&Accelerated)" ), g_Eeschema_Hotkeys_Descr, text = AddHotkeyName( _( "Modern Toolset (&Accelerated)" ), g_Eeschema_Hotkeys_Descr,
HK_CANVAS_OPENGL ); HK_CANVAS_OPENGL );
AddMenuItem( aParentMenu, ID_MENU_CANVAS_OPENGL, text, AddMenuItem( aParentMenu, ID_MENU_CANVAS_OPENGL, text,
_( "Use Modern Toolset with hardware-accelerated graphics (recommended)" ), _( "Use Modern Toolset with hardware-accelerated graphics (recommended)" ),

9
gerbview/hotkeys.cpp
View File

@ -65,6 +65,8 @@ static EDA_HOTKEY HkZoomOut( _HKI( "Zoom Out" ), HK_ZOOM_OUT, WXK_F2 );
static EDA_HOTKEY HkZoomIn( _HKI( "Zoom In" ), HK_ZOOM_IN, WXK_F1 ); static EDA_HOTKEY HkZoomIn( _HKI( "Zoom In" ), HK_ZOOM_IN, WXK_F1 );
static EDA_HOTKEY HkZoomSelection( _HKI( "Zoom to Selection" ), static EDA_HOTKEY HkZoomSelection( _HKI( "Zoom to Selection" ),
HK_ZOOM_SELECTION, GR_KB_CTRL + WXK_F5 ); HK_ZOOM_SELECTION, GR_KB_CTRL + WXK_F5 );
static EDA_HOTKEY HkPreferences( _HKI( "Preferences" ),
HK_PREFERENCES, GR_KB_CTRL + ',', (int) wxID_PREFERENCES );
static EDA_HOTKEY HkHelp( _HKI( "List Hotkeys" ), HK_HELP, GR_KB_CTRL + WXK_F1 ); static EDA_HOTKEY HkHelp( _HKI( "List Hotkeys" ), HK_HELP, GR_KB_CTRL + WXK_F1 );
static EDA_HOTKEY HkSwitchUnits( _HKI( "Switch Units" ), HK_SWITCH_UNITS, 'U' ); static EDA_HOTKEY HkSwitchUnits( _HKI( "Switch Units" ), HK_SWITCH_UNITS, 'U' );
static EDA_HOTKEY HkResetLocalCoord( _HKI( "Reset Local Coordinates" ), static EDA_HOTKEY HkResetLocalCoord( _HKI( "Reset Local Coordinates" ),
@ -112,7 +114,7 @@ static EDA_HOTKEY HkMeasureTool( _HKI( "Measure Distance (Modern Toolset only)"
// List of common hotkey descriptors // List of common hotkey descriptors
EDA_HOTKEY* gerbviewHotkeyList[] = { EDA_HOTKEY* gerbviewHotkeyList[] = {
&HkHelp, &HkHelp, &HkPreferences,
&HkZoomIn, &HkZoomOut, &HkZoomRedraw, &HkZoomCenter, &HkZoomIn, &HkZoomOut, &HkZoomRedraw, &HkZoomCenter,
&HkZoomAuto, &HkZoomSelection, &HkSwitchUnits, &HkResetLocalCoord, &HkZoomAuto, &HkZoomSelection, &HkSwitchUnits, &HkResetLocalCoord,
&HkLinesDisplayMode, &HkFlashedDisplayMode, &HkPolygonDisplayMode, &HkLinesDisplayMode, &HkFlashedDisplayMode, &HkPolygonDisplayMode,
@ -175,6 +177,11 @@ bool GERBVIEW_FRAME::OnHotKey( wxDC* aDC, int aHotkeyCode, const wxPoint& aPosit
DisplayHotkeyList( this, GerbviewHotkeysDescr ); DisplayHotkeyList( this, GerbviewHotkeysDescr );
break; break;
case HK_PREFERENCES:
cmd.SetId( wxID_PREFERENCES );
GetEventHandler()->ProcessEvent( cmd );
break;
case HK_ZOOM_IN: case HK_ZOOM_IN:
cmd.SetId( ID_KEY_ZOOM_IN ); cmd.SetId( ID_KEY_ZOOM_IN );
GetEventHandler()->ProcessEvent( cmd ); GetEventHandler()->ProcessEvent( cmd );

6
gerbview/menubar.cpp
View File

@ -299,9 +299,9 @@ void GERBVIEW_FRAME::ReCreateMenuBar()
wxMenu* configMenu = new wxMenu; wxMenu* configMenu = new wxMenu;
// Options (Preferences on WXMAC) // Options (Preferences on WXMAC)
AddMenuItem( configMenu, wxID_PREFERENCES, text = AddHotkeyName( _( "&Preferences..." ), GerbviewHotkeysDescr, HK_PREFERENCES );
_( "&Preferences..." ), AddMenuItem( configMenu, wxID_PREFERENCES, text,
wxEmptyString, _( "Show preferences for all open tools" ),
KiBitmap( preference_xpm ) ); KiBitmap( preference_xpm ) );
// Canvas selection // Canvas selection

1
include/hotkeys_basic.h
View File

@ -280,6 +280,7 @@ enum common_hotkey_id_commnand {
HK_ZOOM_CENTER, HK_ZOOM_CENTER,
HK_ZOOM_AUTO, HK_ZOOM_AUTO,
HK_ZOOM_SELECTION, HK_ZOOM_SELECTION,
HK_PREFERENCES,
HK_TOGGLE_CURSOR, HK_TOGGLE_CURSOR,
HK_MEASURE_TOOL, HK_MEASURE_TOOL,
HK_COMMON_END HK_COMMON_END

9
kicad/menubar.cpp
View File

@ -151,6 +151,8 @@ static EDA_HOTKEY HkNewProject( _HKI( "New Project" ), HK_NEW, GR_KB_CTRL + 'N'
static EDA_HOTKEY HkOpenProject( _HKI( "Open Project" ), HK_OPEN, GR_KB_CTRL + 'O' ); static EDA_HOTKEY HkOpenProject( _HKI( "Open Project" ), HK_OPEN, GR_KB_CTRL + 'O' );
static EDA_HOTKEY HkSaveProject( _HKI( "Save Project" ), HK_SAVE, GR_KB_CTRL + 'S' ); static EDA_HOTKEY HkSaveProject( _HKI( "Save Project" ), HK_SAVE, GR_KB_CTRL + 'S' );
static EDA_HOTKEY HkHelp( _HKI( "List Hotkeys" ), HK_HELP, GR_KB_CTRL + WXK_F1 ); static EDA_HOTKEY HkHelp( _HKI( "List Hotkeys" ), HK_HELP, GR_KB_CTRL + WXK_F1 );
static EDA_HOTKEY HkPreferences( _HKI( "Preferences" ),
HK_PREFERENCES, GR_KB_CTRL + ',', (int) wxID_PREFERENCES );
// List of hotkey descriptors // List of hotkey descriptors
EDA_HOTKEY* common_Hotkey_List[] = EDA_HOTKEY* common_Hotkey_List[] =
@ -161,7 +163,7 @@ EDA_HOTKEY* common_Hotkey_List[] =
#if 0 #if 0
&HkSaveProject, &HkSaveProject,
#endif #endif
&HkRefresh, &HkHelp, &HkRefresh, &HkHelp, &HkPreferences,
&HkRunEeschema, &HkRunLibedit, &HkRunEeschema, &HkRunLibedit,
&HkRunPcbnew, &HkRunModedit, &HkRunGerbview, &HkRunPcbnew, &HkRunModedit, &HkRunGerbview,
&HkRunBm2Cmp, &HkRunPcbCalc, &HkRunPleditor, &HkRunBm2Cmp, &HkRunPcbCalc, &HkRunPleditor,
@ -350,9 +352,8 @@ void KICAD_MANAGER_FRAME::ReCreateMenuBar()
_( "Configure footprint library table" ), _( "Configure footprint library table" ),
KiBitmap( library_table_xpm ) ); KiBitmap( library_table_xpm ) );
AddMenuItem( preferencesMenu, msg = AddHotkeyName( _( "&Preferences..." ), kicad_Manager_Hotkeys_Descr, HK_PREFERENCES );
wxID_PREFERENCES, AddMenuItem( preferencesMenu, wxID_PREFERENCES, msg,
_( "&Preferences..." ),
_( "Show preferences for all open tools" ), _( "Show preferences for all open tools" ),
KiBitmap( preference_xpm ) ); KiBitmap( preference_xpm ) );

8
pagelayout_editor/hotkeys.cpp
View File

@ -99,6 +99,7 @@ static EDA_HOTKEY HkSave( _HKI( "Save" ), HK_SAVE, GR_KB_CTRL + 'S', (int) wxID_
static EDA_HOTKEY HkSaveAs( _HKI( "Save As" ), HK_SAVEAS, GR_KB_CTRL + GR_KB_SHIFT + 'S', static EDA_HOTKEY HkSaveAs( _HKI( "Save As" ), HK_SAVEAS, GR_KB_CTRL + GR_KB_SHIFT + 'S',
(int) wxID_SAVEAS ); (int) wxID_SAVEAS );
static EDA_HOTKEY HkPrint( _HKI( "Print" ), HK_PRINT, GR_KB_CTRL + 'P', (int) wxID_PRINT ); static EDA_HOTKEY HkPrint( _HKI( "Print" ), HK_PRINT, GR_KB_CTRL + 'P', (int) wxID_PRINT );
static EDA_HOTKEY HkPreferences( _HKI( "Preferences" ), HK_PREFERENCES, GR_KB_CTRL + ',', (int) wxID_PREFERENCES );
// List of common hotkey descriptors // List of common hotkey descriptors
EDA_HOTKEY* s_Common_Hotkey_List[] = EDA_HOTKEY* s_Common_Hotkey_List[] =
@ -107,7 +108,7 @@ EDA_HOTKEY* s_Common_Hotkey_List[] =
&HkUndo, &HkRedo, &HkUndo, &HkRedo,
&HkZoomIn, &HkZoomOut, &HkZoomRedraw, &HkZoomCenter, &HkZoomIn, &HkZoomOut, &HkZoomRedraw, &HkZoomCenter,
&HkZoomAuto, &HkZoomSelection, &HkResetLocalCoord, &HkZoomAuto, &HkZoomSelection, &HkResetLocalCoord,
&HkHelp, &HkHelp, &HkPreferences,
&HkMouseLeftClick, &HkMouseLeftClick,
&HkMouseLeftDClick, &HkMouseLeftDClick,
NULL NULL
@ -256,6 +257,11 @@ bool PL_EDITOR_FRAME::OnHotKey( wxDC* aDC, int aHotkeyCode,
DisplayHotkeyList( this, PlEditorHotkeysDescr ); DisplayHotkeyList( this, PlEditorHotkeysDescr );
break; break;
case HK_PREFERENCES:
cmd.SetId( wxID_PREFERENCES );
GetEventHandler()->ProcessEvent( cmd );
break;
case HK_SET_GRID_ORIGIN: case HK_SET_GRID_ORIGIN:
SetGridOrigin( GetCrossHairPosition() ); SetGridOrigin( GetCrossHairPosition() );
break; break;

3
pagelayout_editor/menubar.cpp
View File

@ -172,7 +172,8 @@ void PL_EDITOR_FRAME::ReCreateMenuBar()
// Menu for preferences // Menu for preferences
wxMenu* preferencesMenu = new wxMenu; wxMenu* preferencesMenu = new wxMenu;
AddMenuItem( preferencesMenu, wxID_PREFERENCES, _( "&Preferences..." ), msg = AddHotkeyName( _( "&Preferences..." ), PlEditorHotkeysDescr, HK_PREFERENCES );
AddMenuItem( preferencesMenu, wxID_PREFERENCES, msg,
_( "Show preferences for all open tools" ), _( "Show preferences for all open tools" ),
KiBitmap( preference_xpm ) ); KiBitmap( preference_xpm ) );

10
pcbnew/hotkeys.cpp
View File

@ -292,7 +292,7 @@ static EDA_HOTKEY HkSelectCopper( _HKI( "Select Connected Tracks" ), HK_SEL_COPP
'I' ); 'I' );
static EDA_HOTKEY HkRoutingOptions( _HKI( "Routing Options" ), HK_ROUTING_OPTIONS, static EDA_HOTKEY HkRoutingOptions( _HKI( "Routing Options" ), HK_ROUTING_OPTIONS,
',' + GR_KB_CTRL ); ',' + GR_KB_CTRL + GR_KB_SHIFT );
static EDA_HOTKEY HkCustomTrackWidth( _HKI( "Custom Track/Via Size" ), HK_CUSTOM_TRACK_WIDTH, 'Q' ); static EDA_HOTKEY HkCustomTrackWidth( _HKI( "Custom Track/Via Size" ), HK_CUSTOM_TRACK_WIDTH, 'Q' );
@ -327,6 +327,8 @@ static EDA_HOTKEY HkRedo( _HKI( "Redo" ), HK_REDO,
static EDA_HOTKEY HkEditCut( _HKI( "Cut" ), HK_EDIT_CUT, GR_KB_CTRL + 'X', (int) wxID_CUT ); static EDA_HOTKEY HkEditCut( _HKI( "Cut" ), HK_EDIT_CUT, GR_KB_CTRL + 'X', (int) wxID_CUT );
static EDA_HOTKEY HkEditCopy( _HKI( "Copy" ), HK_EDIT_COPY, GR_KB_CTRL + 'C', (int) wxID_COPY ); static EDA_HOTKEY HkEditCopy( _HKI( "Copy" ), HK_EDIT_COPY, GR_KB_CTRL + 'C', (int) wxID_COPY );
static EDA_HOTKEY HkEditPaste( _HKI( "Paste" ), HK_EDIT_PASTE, GR_KB_CTRL + 'V', (int) wxID_PASTE ); static EDA_HOTKEY HkEditPaste( _HKI( "Paste" ), HK_EDIT_PASTE, GR_KB_CTRL + 'V', (int) wxID_PASTE );
static EDA_HOTKEY HkPreferences( _HKI( "Preferences" ),
HK_PREFERENCES, GR_KB_CTRL + ',', (int) wxID_PREFERENCES );
static EDA_HOTKEY HkToggleCursor( _HKI( "Toggle Cursor Display (Modern Toolset only)" ), static EDA_HOTKEY HkToggleCursor( _HKI( "Toggle Cursor Display (Modern Toolset only)" ),
HK_TOGGLE_CURSOR, 'X' + GR_KB_SHIFTCTRL ); HK_TOGGLE_CURSOR, 'X' + GR_KB_SHIFTCTRL );
@ -342,8 +344,10 @@ EDA_HOTKEY* common_Hotkey_List[] =
&HkNew, &HkOpen, &HkSave, &HkSaveAs, &HkPrint, &HkNew, &HkOpen, &HkSave, &HkSaveAs, &HkPrint,
&HkUndo, &HkRedo, &HkUndo, &HkRedo,
&HkEditCut, &HkEditCopy, &HkEditPaste, &HkEditCut, &HkEditCopy, &HkEditPaste,
&HkHelp, &HkZoomIn, &HkZoomOut, &HkHelp, &HkPreferences,
&HkZoomRedraw, &HkZoomCenter, &HkZoomAuto, &HkZoomSelection, &Hk3DViewer, &HkZoomIn, &HkZoomOut,
&HkZoomRedraw, &HkZoomCenter, &HkZoomAuto, &HkZoomSelection,
&Hk3DViewer,
&HkSwitchUnits, &HkResetLocalCoord, &HkSetGridOrigin, &HkResetGridOrigin, &HkSwitchUnits, &HkResetLocalCoord, &HkSetGridOrigin, &HkResetGridOrigin,
&HkMouseLeftClick, &HkMouseLeftClick,
&HkMouseLeftDClick, &HkMouseLeftDClick,

4
pcbnew/hotkeys_board_editor.cpp
View File

@ -221,6 +221,10 @@ bool PCB_EDIT_FRAME::OnHotKey( wxDC* aDC, int aHotkeyCode, const wxPoint& aPosit
DisplayHotkeyList( this, g_Board_Editor_Hotkeys_Descr ); DisplayHotkeyList( this, g_Board_Editor_Hotkeys_Descr );
break; break;
case HK_PREFERENCES:
evt_type = wxID_PREFERENCES;
break;
case HK_ZOOM_IN: case HK_ZOOM_IN:
evt_type = ID_KEY_ZOOM_IN; evt_type = ID_KEY_ZOOM_IN;
break; break;

5
pcbnew/hotkeys_footprint_editor.cpp
View File

@ -88,6 +88,11 @@ bool FOOTPRINT_EDIT_FRAME::OnHotKey( wxDC* aDC, int aHotKey, const wxPoint& aPos
DisplayHotkeyList( this, g_Module_Editor_Hotkeys_Descr ); DisplayHotkeyList( this, g_Module_Editor_Hotkeys_Descr );
break; break;
case HK_PREFERENCES:
cmd.SetId( wxID_PREFERENCES );
GetEventHandler()->ProcessEvent( cmd );
break;
case HK_RESET_LOCAL_COORD: // set local (relative) coordinate origin case HK_RESET_LOCAL_COORD: // set local (relative) coordinate origin
GetScreen()->m_O_Curseur = GetCrossHairPosition(); GetScreen()->m_O_Curseur = GetCrossHairPosition();
break; break;

5
pcbnew/menubar_footprint_editor.cpp
View File

@ -426,8 +426,9 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar()
KiBitmap( library_table_xpm ) ); KiBitmap( library_table_xpm ) );
// Settings // Settings
AddMenuItem( prefs_menu, wxID_PREFERENCES, text = AddHotkeyName( _( "&Preferences..." ), m_hotkeysDescrList, HK_PREFERENCES );
_( "&Preferences..." ), _( "Show preferences for all open tools" ), AddMenuItem( prefs_menu, wxID_PREFERENCES, text,
_( "Show preferences for all open tools" ),
KiBitmap( preference_xpm ) ); KiBitmap( preference_xpm ) );
prefs_menu->AppendSeparator(); prefs_menu->AppendSeparator();

5
pcbnew/menubar_pcb_editor.cpp
View File

@ -153,8 +153,9 @@ void preparePreferencesMenu( PCB_EDIT_FRAME* aFrame, wxMenu* aParentMenu )
wxString text; wxString text;
AddMenuItem( aParentMenu, wxID_PREFERENCES, text = AddHotkeyName( _( "&Preferences..." ), g_Board_Editor_Hotkeys_Descr, HK_PREFERENCES );
_( "&Preferences..." ), _( "Show preferences for all open tools" ), AddMenuItem( aParentMenu, wxID_PREFERENCES, text,
_( "Show preferences for all open tools" ),
KiBitmap( preference_xpm ) ); KiBitmap( preference_xpm ) );
if( ADVANCED_CFG::GetCfg().AllowLegacyCanvas() ) if( ADVANCED_CFG::GetCfg().AllowLegacyCanvas() )