diff --git a/eeschema/hotkeys.cpp b/eeschema/hotkeys.cpp index a59af8c145f..245e4c12696 100644 --- a/eeschema/hotkeys.cpp +++ b/eeschema/hotkeys.cpp @@ -65,7 +65,6 @@ * add the HkMyNewEntry pointer in the schematic_Hotkey_List list or the * libEdit_Hotkey_List list or common_Hotkey_List if the same command is * added both in Eeschema and libedit) - * add the EDA_HOTKEY entry in the default_values_Hotkey_List list * Add the new code in the switch in OnHotKey() function. * when the variable itemInEdit is true, an item is currently edited. * This can be useful if the new function cannot be executed while an item is @@ -321,67 +320,6 @@ static EDA_HOTKEY* viewlib_Hotkey_List[] = NULL }; -// List of copies of all hotkey descriptors for default values to be available -EDA_HOTKEY default_values_Hotkey_List[] = { - HkZoomAuto, - HkZoomCenter, - HkZoomRedraw, - HkZoomIn, - HkZoomOut, - HkHelp, - HkResetLocalCoord, - HkLeaveSheet, - HkUndo, - HkRedo, - HkMouseLeftClick, - HkMouseLeftDClick, - HkBeginWire, - HkBeginBus, - HkEndLineWireBus, - HkAddLabel, - HkAddHierarchicalLabel, - HkAddGlobalLabel, - HkAddJunction, - HkAddComponent, - HkAddPower, - HkAddNoConn, - HkAddHierSheet, - HkAddBusEntry, - HkAddWireEntry, - HkAddGraphicPolyLine, - HkAddGraphicText, - HkMirrorY, - HkMirrorX, - HkOrientNormalComponent, - HkRotate, - HkEdit, - HkEditComponentValue, - HkEditComponentReference, - HkEditComponentFootprint, - HkEditComponentWithLibedit, - HkMove, - HkCopyComponentOrText, - HkDrag, - HkSaveBlock, - HkMove2Drag, - HkInsert, - HkDelete, - HkDeleteNode, - HkFindItem, - HkFindNextItem, - HkFindReplace, - HkFindNextDrcMarker, - HkCreatePin, - HkInsertPin, - HkMoveLibItem, - HkSaveLib, - HkSaveSchematic, - HkLoadSchematic, - HkAutoplaceFields, - HkUpdatePcbFromSch, - EDA_HOTKEY( NULL, HK_NOT_FOUND, WXK_NONE ) -}; - // Keyword Identifiers (tags) in key code configuration file (section names) // (.m_SectionTag member of a EDA_HOTKEY_CONFIG) static wxString schematicSectionTag( wxT( "[eeschema]" ) ); diff --git a/gerbview/hotkeys.cpp b/gerbview/hotkeys.cpp index 9e8e47e3c88..eae1ad0bc20 100644 --- a/gerbview/hotkeys.cpp +++ b/gerbview/hotkeys.cpp @@ -51,7 +51,6 @@ * an item is currently edited. This can be usefull if the new function cannot be * executed while an item is currently being edited * ( For example, one cannot start a new wire when a component is moving.) - * add the EDA_HOTKEY entry in the default_values_Hotkey_List list * * Note: If an hotkey is a special key, be sure the corresponding wxWidget keycode (WXK_XXXX) * is handled in the hotkey_name_descr s_Hotkey_Name_List list (see hotkeys_basic.cpp) @@ -91,26 +90,6 @@ EDA_HOTKEY* gerbviewHotkeyList[] = { }; -// List of copies of all hotkey descriptors for default values to be available -EDA_HOTKEY default_values_Hotkey_List[] = { - HkZoomAuto, - HkZoomCenter, - HkZoomRedraw, - HkZoomOut, - HkZoomIn, - HkHelp, - HkSwitchUnits, - HkResetLocalCoord, - HkLinesDisplayMode, - HkFlashedDisplayMode, - HkPolygonDisplayMode, - HkNegativeObjDisplayMode, - HkDCodesDisplayMode, - HkSwitch2NextCopperLayer, - HkSwitch2PreviousCopperLayer, - EDA_HOTKEY( NULL, HK_NOT_FOUND, WXK_NONE ) -}; - // list of sections and corresponding hotkey list for GerbView (used to create an hotkey // config file) static wxString gerbviewSectionTag( wxT( "[gerbview]" ) ); diff --git a/kicad/menubar.cpp b/kicad/menubar.cpp index 41e2316e2a1..8d7b72ecfe1 100644 --- a/kicad/menubar.cpp +++ b/kicad/menubar.cpp @@ -165,24 +165,6 @@ EDA_HOTKEY* common_Hotkey_List[] = NULL }; -// List of copies of all hotkey descriptors for default values to be available -EDA_HOTKEY default_values_Hotkey_List[] = { - HkHelp, - HkLoadPrj, - HkSavePrj, - HkNewProject, - HkNewPrjFromTemplate, - HkRunEeschema, - HkRunLibedit, - HkRunPcbnew, - HkRunModedit, - HkRunGerbview, - HkRunBm2Cmp, - HkRunPcbCalc, - HkRunPleditor, - EDA_HOTKEY( NULL, HK_NOT_FOUND, WXK_NONE ) -}; - // list of sections and corresponding hotkey list for Kicad // (used to create an hotkey config file, and edit hotkeys ) // here we have only one section. diff --git a/pagelayout_editor/hotkeys.cpp b/pagelayout_editor/hotkeys.cpp index 021b7e34d40..095553e2b80 100644 --- a/pagelayout_editor/hotkeys.cpp +++ b/pagelayout_editor/hotkeys.cpp @@ -54,7 +54,6 @@ * 'Default key value' is the default hotkey for this command. * Can be overrided by the user hotkey list * Add the 'HkMyNewEntry' pointer in the s_PlEditor_Hotkey_List list - * add the EDA_HOTKEY entry in the default_values_Hotkey_List list * Add the new code in the switch in OnHotKey() function. * * Note: If an hotkey is a special key, be sure the corresponding wxWidget keycode (WXK_XXXX) @@ -111,27 +110,6 @@ EDA_HOTKEY* s_PlEditor_Hotkey_List[] = NULL }; -// List of copies of all hotkey descriptors for default values to be available -EDA_HOTKEY default_values_Hotkey_List[] = { - HkMouseLeftClick, - HkMouseLeftDClick, - HkResetLocalCoord, - HkZoomAuto, - HkZoomCenter, - HkZoomRedraw, - HkZoomOut, - HkZoomIn, - HkHelp, - HkMoveItem, - HkPlaceItem, - HkMoveStartPoint, - HkMoveEndPoint, - HkDeleteItem, - HkUndo, - HkRedo, - EDA_HOTKEY( NULL, HK_NOT_FOUND, WXK_NONE ) -}; - // Titles for hotkey editor and hotkey display static wxString commonSectionTitle( _HKI( "Common" ) ); diff --git a/pcbnew/hotkeys.cpp b/pcbnew/hotkeys.cpp index b48dbaba7e3..1311fdd1e64 100644 --- a/pcbnew/hotkeys.cpp +++ b/pcbnew/hotkeys.cpp @@ -51,7 +51,6 @@ * hotkey list file * add the HkMyNewEntry pointer in the s_board_edit_Hotkey_List list ( or/and the * s_module_edit_Hotkey_List list) - * add the EDA_HOTKEY entry in the default_values_Hotkey_List list * Add the new code in the switch in OnHotKey() function. * Note: when the variable itemCurrentlyEdited is true, an item is currently edited. * This can be useful if the new function cannot be executed while an item is currently @@ -342,99 +341,6 @@ EDA_HOTKEY* module_viewer_Hotkey_List[] = { NULL }; -// List of copies of all hotkey descriptors for default values to be available -EDA_HOTKEY default_values_Hotkey_List[] = { - HkMouseLeftClick, - HkMouseLeftDClick, - HkSwitch2CopperLayer, - HkSwitch2ComponentLayer, - HkSwitch2InnerLayer1, - HkSwitch2InnerLayer2, - HkSwitch2InnerLayer3, - HkSwitch2InnerLayer4, - HkSwitch2InnerLayer5, - HkSwitch2InnerLayer6, - HkSwitch2NextCopperLayer, - HkSwitch2PreviousCopperLayer, - HkSaveModule, - HkSavefile, - HkSavefileAs, - HkLoadfile, - HkFindItem, - HkBackspace, - HkAddNewTrack, - HkAddThroughVia, - HkSelLayerAndAddThroughVia, - HkAddMicroVia, - HkAddBlindBuriedVia, - HkSelLayerAndAddBlindBuriedVia, - HkSwitchTrackPosture, - HkDragTrackKeepSlope, - HkPlaceItem, - HkEditBoardItem, - HkEditWithModedit, - HkFlipItem, - HkRotateItem, - HkMoveItem, - HkMoveItemExact, - HkDuplicateItem, - HkDuplicateItemAndIncrement, - HkCreateArray, - HkCopyItem, - HkDragFootprint, - HkGetAndMoveFootprint, - HkLock_Unlock_Footprint, - HkDelete, - HkResetLocalCoord, - HkSwitchHighContrastMode, - HkSetGridOrigin, - HkResetGridOrigin, - HkCanvasDefault, - HkCanvasOpenGL, - HkCanvasCairo, - HkZoneFillOrRefill, - HkZoneRemoveFilled, - HkZoomAuto, - HkZoomCenter, - HkZoomRedraw, - HkZoomIn, - HkZoomOut, - Hk3DViewer, - HkHelp, - HkUndo, - HkRedo, - HkSwitchTrackWidthToNext, - HkSwitchTrackWidthToPrevious, - HkSwitchGridToFastGrid1, - HkSwitchGridToFastGrid2, - HkSwitchGridToNext, - HkSwitchGridToPrevious, - HkSwitchUnits, - HkTrackDisplayMode, - HkAddModule, - HkRecordMacros0, - HkCallMacros0, - HkRecordMacros1, - HkCallMacros1, - HkRecordMacros2, - HkCallMacros2, - HkRecordMacros3, - HkCallMacros3, - HkRecordMacros4, - HkCallMacros4, - HkRecordMacros5, - HkCallMacros5, - HkRecordMacros6, - HkCallMacros6, - HkRecordMacros7, - HkCallMacros7, - HkRecordMacros8, - HkCallMacros8, - HkRecordMacros9, - HkCallMacros9, - EDA_HOTKEY( NULL, HK_NOT_FOUND, WXK_NONE ) -}; - // Keyword Identifiers (tags) in key code configuration file (section names) // (.m_SectionTag member of a EDA_HOTKEY_CONFIG) static wxString boardEditorSectionTag( wxT( "[pcbnew]" ) ); diff --git a/pcbnew/hotkeys.h b/pcbnew/hotkeys.h index fc93facda9a..5e445720a8e 100644 --- a/pcbnew/hotkeys.h +++ b/pcbnew/hotkeys.h @@ -125,9 +125,6 @@ enum hotkey_id_commnand { HK_ZONE_REMOVE_FILLED }; -// Full list of hotkey descriptor objects for default values to be available -extern EDA_HOTKEY default_values_Hotkey_List[]; - // Full list of hotkey descriptors for board editor and footprint editor extern struct EDA_HOTKEY_CONFIG g_Pcbnew_Editor_Hokeys_Descr[];