diff --git a/eeschema/eeschema.cpp b/eeschema/eeschema.cpp index f7f4b37c61..b42f3c45bf 100644 --- a/eeschema/eeschema.cpp +++ b/eeschema/eeschema.cpp @@ -258,7 +258,7 @@ bool IFACE::OnKifaceStart( PGM_BASE* aProgram, int aCtlBits ) // Must be called before creating the main frame in order to // display the real hotkeys in menus or tool tips - ReadHotkeyConfig( SCH_EDIT_FRAME_NAME, g_Eeschema_Hokeys_Descr ); + ReadHotkeyConfig( SCH_EDIT_FRAME_NAME, g_Eeschema_Hotkeys_Descr ); wxConfigLoadSetups( KifaceSettings(), cfg_params() ); diff --git a/eeschema/eeschema_config.cpp b/eeschema/eeschema_config.cpp index 6c8ba02391..166582c239 100644 --- a/eeschema/eeschema_config.cpp +++ b/eeschema/eeschema_config.cpp @@ -133,7 +133,7 @@ void LIB_EDIT_FRAME::Process_Config( wxCommandEvent& event ) { case ID_PREFERENCES_HOTKEY_SHOW_CURRENT_LIST: // Display current hotkey list for LibEdit. - DisplayHotkeyList( this, g_Libedit_Hokeys_Descr ); + DisplayHotkeyList( this, g_Libedit_Hotkeys_Descr ); break; default: @@ -182,7 +182,7 @@ void SCH_EDIT_FRAME::Process_Config( wxCommandEvent& event ) case ID_PREFERENCES_HOTKEY_SHOW_CURRENT_LIST: // Display current hotkey list for eeschema. - DisplayHotkeyList( this, g_Schematic_Hokeys_Descr ); + DisplayHotkeyList( this, g_Schematic_Hotkeys_Descr ); break; default: @@ -193,7 +193,7 @@ void SCH_EDIT_FRAME::Process_Config( wxCommandEvent& event ) void SCH_EDIT_FRAME::OnPreferencesOptions( wxCommandEvent& event ) { - if( ShowPreferences( g_Eeschema_Hokeys_Descr, g_Schematic_Hokeys_Descr, wxT( "eeschema" ) ) ) + if( ShowPreferences( g_Eeschema_Hotkeys_Descr, g_Schematic_Hotkeys_Descr, wxT( "eeschema" ) ) ) { SaveSettings( config() ); // save values shared by eeschema applications. m_canvas->Refresh( true ); @@ -388,7 +388,7 @@ void SCH_EDIT_FRAME::LoadSettings( wxConfigBase* aCfg ) long tmp; - ReadHotkeyConfig( SCH_EDIT_FRAME_NAME, g_Schematic_Hokeys_Descr ); + ReadHotkeyConfig( SCH_EDIT_FRAME_NAME, g_Schematic_Hotkeys_Descr ); wxConfigLoadSetups( aCfg, GetConfigurationSettings() ); SetDefaultBusThickness( (int) aCfg->Read( DefaultBusWidthEntry, DEFAULTBUSTHICKNESS ) ); @@ -517,7 +517,7 @@ void LIB_EDIT_FRAME::LoadSettings( wxConfigBase* aCfg ) { EDA_DRAW_FRAME::LoadSettings( aCfg ); - ReadHotkeyConfig( LIB_EDIT_FRAME_NAME, g_Libedit_Hokeys_Descr ); + ReadHotkeyConfig( LIB_EDIT_FRAME_NAME, g_Libedit_Hotkeys_Descr ); SetDefaultLineThickness( (int) aCfg->Read( DefaultDrawLineWidthEntry, DEFAULTDRAWLINETHICKNESS ) ); SetDefaultPinLength( (int) aCfg->Read( DefaultPinLengthEntry, DEFAULTPINLENGTH ) ); @@ -579,7 +579,7 @@ void LIB_EDIT_FRAME::SaveSettings( wxConfigBase* aCfg ) void LIB_EDIT_FRAME::OnPreferencesOptions( wxCommandEvent& event ) { - if( ShowPreferences( g_Eeschema_Hokeys_Descr, g_Libedit_Hokeys_Descr, wxT( "eeschema" ) ) ) + if( ShowPreferences( g_Eeschema_Hotkeys_Descr, g_Libedit_Hotkeys_Descr, wxT( "eeschema" ) ) ) { SaveSettings( config() ); // save values shared by eeschema applications. m_canvas->Refresh( true ); diff --git a/eeschema/hotkeys.cpp b/eeschema/hotkeys.cpp index cd8a72fbf9..49b6d2d4f4 100644 --- a/eeschema/hotkeys.cpp +++ b/eeschema/hotkeys.cpp @@ -367,7 +367,7 @@ static wxString libEditSectionTitle( _HKI( "Library Editor" ) ); // list of sections and corresponding hotkey list for Eeschema (used to create // an hotkey config file) -struct EDA_HOTKEY_CONFIG g_Eeschema_Hokeys_Descr[] = +struct EDA_HOTKEY_CONFIG g_Eeschema_Hotkeys_Descr[] = { { &g_CommonSectionTag, common_Hotkey_List, &commonSectionTitle }, { &schematicSectionTag, schematic_Hotkey_List, &schematicSectionTitle }, @@ -377,7 +377,7 @@ struct EDA_HOTKEY_CONFIG g_Eeschema_Hokeys_Descr[] = // list of sections and corresponding hotkey list for the schematic editor // (used to list current hotkeys) -struct EDA_HOTKEY_CONFIG g_Schematic_Hokeys_Descr[] = +struct EDA_HOTKEY_CONFIG g_Schematic_Hotkeys_Descr[] = { { &g_CommonSectionTag, common_Hotkey_List, &commonSectionTitle }, { &schematicSectionTag, schematic_Hotkey_List, &schematicSectionTitle }, @@ -386,7 +386,7 @@ struct EDA_HOTKEY_CONFIG g_Schematic_Hokeys_Descr[] = // list of sections and corresponding hotkey list for the component editor // (used to list current hotkeys) -struct EDA_HOTKEY_CONFIG g_Libedit_Hokeys_Descr[] = +struct EDA_HOTKEY_CONFIG g_Libedit_Hotkeys_Descr[] = { { &g_CommonSectionTag, common_Hotkey_List, &commonSectionTitle }, { &libEditSectionTag, libEdit_Hotkey_List, &libEditSectionTitle }, @@ -395,7 +395,7 @@ struct EDA_HOTKEY_CONFIG g_Libedit_Hokeys_Descr[] = // list of sections and corresponding hotkey list for the component browser // (used to list current hotkeys) -struct EDA_HOTKEY_CONFIG g_Viewlib_Hokeys_Descr[] = +struct EDA_HOTKEY_CONFIG g_Viewlib_Hotkeys_Descr[] = { { &g_CommonSectionTag, common_basic_Hotkey_List, &commonSectionTitle }, { NULL, NULL, NULL } @@ -459,7 +459,7 @@ bool SCH_EDIT_FRAME::OnHotKey( wxDC* aDC, int aHotKey, const wxPoint& aPosition, return false; case HK_HELP: // Display Current hotkey list - DisplayHotkeyList( this, g_Schematic_Hokeys_Descr ); + DisplayHotkeyList( this, g_Schematic_Hotkeys_Descr ); break; case HK_RESET_LOCAL_COORD: // Reset the relative coord @@ -707,7 +707,7 @@ bool LIB_EDIT_FRAME::OnHotKey( wxDC* aDC, int aHotKey, const wxPoint& aPosition, return false; case HK_HELP: // Display Current hotkey list - DisplayHotkeyList( this, g_Libedit_Hokeys_Descr ); + DisplayHotkeyList( this, g_Libedit_Hotkeys_Descr ); break; case HK_RESET_LOCAL_COORD: // Reset the relative coord @@ -925,7 +925,7 @@ bool LIB_VIEW_FRAME::OnHotKey( wxDC* aDC, int aHotKey, const wxPoint& aPosition, return false; case HK_HELP: // Display Current hotkey list - DisplayHotkeyList( this, g_Viewlib_Hokeys_Descr ); + DisplayHotkeyList( this, g_Viewlib_Hotkeys_Descr ); break; case HK_RESET_LOCAL_COORD: // set local (relative) coordinate origin diff --git a/eeschema/hotkeys.h b/eeschema/hotkeys.h index d3b068b63f..98afe7d3e2 100644 --- a/eeschema/hotkeys.h +++ b/eeschema/hotkeys.h @@ -85,15 +85,15 @@ enum hotkey_id_commnand { }; // List of hotkey descriptors for Eeschema -extern struct EDA_HOTKEY_CONFIG g_Eeschema_Hokeys_Descr[]; +extern struct EDA_HOTKEY_CONFIG g_Eeschema_Hotkeys_Descr[]; // List of hotkey descriptors for the schematic editor only -extern struct EDA_HOTKEY_CONFIG g_Schematic_Hokeys_Descr[]; +extern struct EDA_HOTKEY_CONFIG g_Schematic_Hotkeys_Descr[]; // List of hotkey descriptors for the lib editor only -extern struct EDA_HOTKEY_CONFIG g_Libedit_Hokeys_Descr[]; +extern struct EDA_HOTKEY_CONFIG g_Libedit_Hotkeys_Descr[]; // List of hotkey descriptors for the lib browser only -extern struct EDA_HOTKEY_CONFIG g_Viewlib_Hokeys_Descr[]; +extern struct EDA_HOTKEY_CONFIG g_Viewlib_Hotkeys_Descr[]; #endif // EESCHEMA_KOTKEYS_H_ diff --git a/eeschema/libedit/lib_edit_frame.cpp b/eeschema/libedit/lib_edit_frame.cpp index 9a81b354e1..5ce030ee92 100644 --- a/eeschema/libedit/lib_edit_frame.cpp +++ b/eeschema/libedit/lib_edit_frame.cpp @@ -205,7 +205,7 @@ LIB_EDIT_FRAME::LIB_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ) : SetShowDeMorgan( false ); m_drawSpecificConvert = true; m_drawSpecificUnit = false; - m_hotkeysDescrList = g_Libedit_Hokeys_Descr; + m_hotkeysDescrList = g_Libedit_Hotkeys_Descr; m_syncPinEdit = false; m_repeatPinStep = DEFAULT_REPEAT_OFFSET_PIN; SetShowElectricalType( true ); diff --git a/eeschema/libedit/libedit_onrightclick.cpp b/eeschema/libedit/libedit_onrightclick.cpp index 08cb1211e5..68113c0fe8 100644 --- a/eeschema/libedit/libedit_onrightclick.cpp +++ b/eeschema/libedit/libedit_onrightclick.cpp @@ -102,7 +102,7 @@ bool LIB_EDIT_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* PopMenu ) { if( GetToolId() == ID_NO_TOOL_SELECTED ) { - msg = AddHotkeyName( _( "&Paste" ), g_Libedit_Hokeys_Descr, HK_EDIT_PASTE ); + msg = AddHotkeyName( _( "&Paste" ), g_Libedit_Hotkeys_Descr, HK_EDIT_PASTE ); AddMenuItem( PopMenu, ID_POPUP_PASTE_BLOCK, msg, _( "Pastes copied item(s)" ), KiBitmap( paste_xpm ) ); PopMenu->AppendSeparator(); @@ -123,20 +123,20 @@ bool LIB_EDIT_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* PopMenu ) case LIB_ARC_T: if( not_edited ) { - msg = AddHotkeyName( _( "Move" ), g_Libedit_Hokeys_Descr, + msg = AddHotkeyName( _( "Move" ), g_Libedit_Hotkeys_Descr, HK_LIBEDIT_MOVE_GRAPHIC_ITEM ); AddMenuItem( PopMenu, ID_POPUP_LIBEDIT_MOVE_ITEM_REQUEST, msg, KiBitmap( move_xpm ) ); - msg = AddHotkeyName( _( "Drag Arc Edge" ), g_Libedit_Hokeys_Descr, HK_DRAG ); + msg = AddHotkeyName( _( "Drag Arc Edge" ), g_Libedit_Hotkeys_Descr, HK_DRAG ); AddMenuItem( PopMenu, ID_POPUP_LIBEDIT_MODIFY_ITEM, msg, KiBitmap( move_xpm ) ); } - msg = AddHotkeyName( _( "Edit Arc Options" ), g_Libedit_Hokeys_Descr, HK_EDIT ); + msg = AddHotkeyName( _( "Edit Arc Options" ), g_Libedit_Hotkeys_Descr, HK_EDIT ); AddMenuItem( PopMenu, ID_POPUP_LIBEDIT_BODY_EDIT_ITEM, msg, KiBitmap( options_arc_xpm ) ); if( not_edited ) { - msg = AddHotkeyName( _( "Delete" ), g_Libedit_Hokeys_Descr, HK_DELETE ); + msg = AddHotkeyName( _( "Delete" ), g_Libedit_Hotkeys_Descr, HK_DELETE ); AddMenuItem( PopMenu, ID_POPUP_LIBEDIT_DELETE_ITEM, msg, KiBitmap( delete_xpm ) ); } break; @@ -144,22 +144,22 @@ bool LIB_EDIT_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* PopMenu ) case LIB_CIRCLE_T: if( not_edited ) { - msg = AddHotkeyName( _( "Move" ), g_Libedit_Hokeys_Descr, + msg = AddHotkeyName( _( "Move" ), g_Libedit_Hotkeys_Descr, HK_LIBEDIT_MOVE_GRAPHIC_ITEM ); AddMenuItem( PopMenu, ID_POPUP_LIBEDIT_MOVE_ITEM_REQUEST, msg, KiBitmap( move_xpm ) ); - msg = AddHotkeyName( _( "Drag Circle Outline" ), g_Libedit_Hokeys_Descr, HK_DRAG ); + msg = AddHotkeyName( _( "Drag Circle Outline" ), g_Libedit_Hotkeys_Descr, HK_DRAG ); AddMenuItem( PopMenu, ID_POPUP_LIBEDIT_MODIFY_ITEM, msg, KiBitmap( move_rectangle_xpm ) ); } - msg = AddHotkeyName( _( "Edit Circle Options..." ), g_Libedit_Hokeys_Descr, HK_EDIT ); + msg = AddHotkeyName( _( "Edit Circle Options..." ), g_Libedit_Hotkeys_Descr, HK_EDIT ); AddMenuItem( PopMenu, ID_POPUP_LIBEDIT_BODY_EDIT_ITEM, msg, KiBitmap( options_circle_xpm ) ); if( not_edited ) { - msg = AddHotkeyName( _( "Delete" ), g_Libedit_Hokeys_Descr, HK_DELETE ); + msg = AddHotkeyName( _( "Delete" ), g_Libedit_Hotkeys_Descr, HK_DELETE ); AddMenuItem( PopMenu, ID_POPUP_LIBEDIT_DELETE_ITEM, msg, KiBitmap( delete_circle_xpm ) ); } @@ -168,22 +168,22 @@ bool LIB_EDIT_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* PopMenu ) case LIB_RECTANGLE_T: if( not_edited ) { - msg = AddHotkeyName( _( "Move Rectangle" ), g_Libedit_Hokeys_Descr, + msg = AddHotkeyName( _( "Move Rectangle" ), g_Libedit_Hotkeys_Descr, HK_LIBEDIT_MOVE_GRAPHIC_ITEM ); AddMenuItem( PopMenu, ID_POPUP_LIBEDIT_MOVE_ITEM_REQUEST, msg, KiBitmap( move_rectangle_xpm ) ); } - msg = AddHotkeyName( _( "Edit Rectangle Options..." ), g_Libedit_Hokeys_Descr, HK_EDIT ); + msg = AddHotkeyName( _( "Edit Rectangle Options..." ), g_Libedit_Hotkeys_Descr, HK_EDIT ); AddMenuItem( PopMenu, ID_POPUP_LIBEDIT_BODY_EDIT_ITEM, msg, KiBitmap( options_rectangle_xpm ) ); if( not_edited ) { - msg = AddHotkeyName( _( "Drag Rectangle Edge" ), g_Libedit_Hokeys_Descr, HK_DRAG ); + msg = AddHotkeyName( _( "Drag Rectangle Edge" ), g_Libedit_Hotkeys_Descr, HK_DRAG ); AddMenuItem( PopMenu, ID_POPUP_LIBEDIT_MODIFY_ITEM, msg, KiBitmap( move_rectangle_xpm ) ); - msg = AddHotkeyName( _( "Delete" ), g_Libedit_Hokeys_Descr, HK_DELETE ); + msg = AddHotkeyName( _( "Delete" ), g_Libedit_Hotkeys_Descr, HK_DELETE ); AddMenuItem( PopMenu, ID_POPUP_LIBEDIT_DELETE_ITEM, msg, KiBitmap( delete_rectangle_xpm ) ); } @@ -193,21 +193,21 @@ bool LIB_EDIT_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* PopMenu ) case LIB_TEXT_T: if( not_edited ) { - msg = AddHotkeyName( _( "Move" ), g_Libedit_Hokeys_Descr, + msg = AddHotkeyName( _( "Move" ), g_Libedit_Hotkeys_Descr, HK_LIBEDIT_MOVE_GRAPHIC_ITEM ); AddMenuItem( PopMenu, ID_POPUP_LIBEDIT_MOVE_ITEM_REQUEST, msg, KiBitmap( move_xpm ) ); } - msg = AddHotkeyName( _( "Edit..." ), g_Libedit_Hokeys_Descr, HK_EDIT ); + msg = AddHotkeyName( _( "Edit..." ), g_Libedit_Hotkeys_Descr, HK_EDIT ); AddMenuItem( PopMenu, ID_POPUP_LIBEDIT_BODY_EDIT_ITEM, msg, KiBitmap( edit_text_xpm ) ); - msg = AddHotkeyName( _( "Rotate Clockwise" ), g_Libedit_Hokeys_Descr, HK_ROTATE ); + msg = AddHotkeyName( _( "Rotate Clockwise" ), g_Libedit_Hotkeys_Descr, HK_ROTATE ); AddMenuItem( PopMenu, ID_LIBEDIT_ROTATE_ITEM, msg, KiBitmap( rotate_cw_xpm ) ); if( not_edited ) { - msg = AddHotkeyName( _( "Delete" ), g_Libedit_Hokeys_Descr, HK_DELETE ); + msg = AddHotkeyName( _( "Delete" ), g_Libedit_Hotkeys_Descr, HK_DELETE ); AddMenuItem( PopMenu, ID_POPUP_LIBEDIT_DELETE_ITEM, msg, KiBitmap( delete_xpm ) ); } break; @@ -215,11 +215,11 @@ bool LIB_EDIT_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* PopMenu ) case LIB_POLYLINE_T: if( not_edited ) { - msg = AddHotkeyName( _( "Move" ), g_Libedit_Hokeys_Descr, + msg = AddHotkeyName( _( "Move" ), g_Libedit_Hotkeys_Descr, HK_LIBEDIT_MOVE_GRAPHIC_ITEM ); AddMenuItem( PopMenu, ID_POPUP_LIBEDIT_MOVE_ITEM_REQUEST, msg, KiBitmap( move_xpm ) ); - msg = AddHotkeyName( _( "Drag Edge Point" ), g_Libedit_Hokeys_Descr, HK_DRAG ); + msg = AddHotkeyName( _( "Drag Edge Point" ), g_Libedit_Hotkeys_Descr, HK_DRAG ); AddMenuItem( PopMenu, ID_POPUP_LIBEDIT_MODIFY_ITEM, msg, KiBitmap( move_exactly_xpm ) ); } @@ -229,13 +229,13 @@ bool LIB_EDIT_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* PopMenu ) KiBitmap( checked_ok_xpm ) ); } - msg = AddHotkeyName( _( "Edit Line Options..." ), g_Libedit_Hokeys_Descr, HK_EDIT ); + msg = AddHotkeyName( _( "Edit Line Options..." ), g_Libedit_Hotkeys_Descr, HK_EDIT ); AddMenuItem( PopMenu, ID_POPUP_LIBEDIT_BODY_EDIT_ITEM, msg, KiBitmap( options_segment_xpm ) ); if( not_edited ) { - msg = AddHotkeyName( _( "Delete" ), g_Libedit_Hokeys_Descr, HK_DELETE ); + msg = AddHotkeyName( _( "Delete" ), g_Libedit_Hotkeys_Descr, HK_DELETE ); AddMenuItem( PopMenu, ID_POPUP_LIBEDIT_DELETE_ITEM, msg, KiBitmap( delete_xpm ) ); } @@ -244,7 +244,7 @@ bool LIB_EDIT_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* PopMenu ) { if( ( (LIB_POLYLINE*) item )->GetCornerCount() > 2 ) { - msg = AddHotkeyName( _( "Delete" ), g_Libedit_Hokeys_Descr, HK_DELETE ); + msg = AddHotkeyName( _( "Delete" ), g_Libedit_Hotkeys_Descr, HK_DELETE ); AddMenuItem( PopMenu, ID_POPUP_LIBEDIT_DELETE_CURRENT_POLY_SEGMENT, msg, KiBitmap( delete_xpm ) ); } @@ -255,15 +255,15 @@ bool LIB_EDIT_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* PopMenu ) case LIB_FIELD_T: if( not_edited ) { - msg = AddHotkeyName( _( "Move" ), g_Libedit_Hokeys_Descr, + msg = AddHotkeyName( _( "Move" ), g_Libedit_Hotkeys_Descr, HK_LIBEDIT_MOVE_GRAPHIC_ITEM ); AddMenuItem( PopMenu, ID_POPUP_LIBEDIT_MOVE_ITEM_REQUEST, msg, KiBitmap( move_xpm ) ); } - msg = AddHotkeyName( _( "Rotate Clockwise" ), g_Libedit_Hokeys_Descr, HK_ROTATE ); + msg = AddHotkeyName( _( "Rotate Clockwise" ), g_Libedit_Hotkeys_Descr, HK_ROTATE ); AddMenuItem( PopMenu, ID_LIBEDIT_ROTATE_ITEM, msg, KiBitmap( rotate_cw_xpm ) ); - msg = AddHotkeyName( _( "Edit..." ), g_Libedit_Hokeys_Descr, HK_EDIT ); + msg = AddHotkeyName( _( "Edit..." ), g_Libedit_Hotkeys_Descr, HK_EDIT ); AddMenuItem( PopMenu, ID_POPUP_LIBEDIT_FIELD_EDIT_ITEM, msg, KiBitmap( edit_text_xpm ) ); break; @@ -287,20 +287,20 @@ void AddMenusForPin( wxMenu* PopMenu, LIB_PIN* Pin, LIB_EDIT_FRAME* frame ) if( not_in_move ) { - msg = AddHotkeyName( _( "Move" ), g_Libedit_Hokeys_Descr, + msg = AddHotkeyName( _( "Move" ), g_Libedit_Hotkeys_Descr, HK_LIBEDIT_MOVE_GRAPHIC_ITEM ); AddMenuItem( PopMenu, ID_POPUP_LIBEDIT_MOVE_ITEM_REQUEST, msg, KiBitmap( move_xpm ) ); } - msg = AddHotkeyName( _( "Edit..." ), g_Libedit_Hokeys_Descr, HK_EDIT); + msg = AddHotkeyName( _( "Edit..." ), g_Libedit_Hotkeys_Descr, HK_EDIT); AddMenuItem( PopMenu, ID_LIBEDIT_EDIT_PIN, msg, KiBitmap( edit_xpm ) ); - msg = AddHotkeyName( _( "Rotate Clockwise" ), g_Libedit_Hokeys_Descr, HK_ROTATE ); + msg = AddHotkeyName( _( "Rotate Clockwise" ), g_Libedit_Hotkeys_Descr, HK_ROTATE ); AddMenuItem( PopMenu, ID_LIBEDIT_ROTATE_ITEM, msg, KiBitmap( rotate_cw_xpm ) ); if( not_in_move ) { - msg = AddHotkeyName( _( "Delete" ), g_Libedit_Hokeys_Descr, HK_DELETE ); + msg = AddHotkeyName( _( "Delete" ), g_Libedit_Hotkeys_Descr, HK_DELETE ); AddMenuItem( PopMenu, ID_POPUP_LIBEDIT_DELETE_ITEM, msg, KiBitmap( delete_xpm ) ); } @@ -345,25 +345,25 @@ void AddMenusForBlock( wxMenu* PopMenu, LIB_EDIT_FRAME* frame ) AddMenuItem( PopMenu, ID_POPUP_SELECT_ITEMS_BLOCK, _( "Select Items" ), KiBitmap( green_xpm ) ); - msg = AddHotkeyName( _( "Cut Block" ), g_Schematic_Hokeys_Descr, HK_EDIT_CUT ); + msg = AddHotkeyName( _( "Cut Block" ), g_Schematic_Hotkeys_Descr, HK_EDIT_CUT ); AddMenuItem( PopMenu, ID_POPUP_CUT_BLOCK, msg, KiBitmap( cut_xpm ) ); - msg = AddHotkeyName( _( "Copy Block" ), g_Schematic_Hokeys_Descr, HK_EDIT_COPY ); + msg = AddHotkeyName( _( "Copy Block" ), g_Schematic_Hotkeys_Descr, HK_EDIT_COPY ); AddMenuItem( PopMenu, ID_POPUP_COPY_BLOCK, msg, KiBitmap( copy_xpm ) ); AddMenuItem( PopMenu, ID_POPUP_DUPLICATE_BLOCK, _( "Duplicate Block" ), KiBitmap( duplicate_xpm ) ); - msg = AddHotkeyName( _( "Mirror Block Around Horizontal(X) Axis" ), g_Libedit_Hokeys_Descr, HK_MIRROR_X ); + msg = AddHotkeyName( _( "Mirror Block Around Horizontal(X) Axis" ), g_Libedit_Hotkeys_Descr, HK_MIRROR_X ); AddMenuItem( PopMenu, ID_POPUP_MIRROR_X_BLOCK, msg, KiBitmap( mirror_v_xpm ) ); - msg = AddHotkeyName( _( "Mirror Block Around Vertical(Y) Axis" ), g_Libedit_Hokeys_Descr, HK_MIRROR_Y ); + msg = AddHotkeyName( _( "Mirror Block Around Vertical(Y) Axis" ), g_Libedit_Hotkeys_Descr, HK_MIRROR_Y ); AddMenuItem( PopMenu, ID_POPUP_MIRROR_Y_BLOCK, msg, KiBitmap( mirror_h_xpm ) ); - msg = AddHotkeyName( _( "Rotate Counterclockwise" ), g_Libedit_Hokeys_Descr, HK_ROTATE ); + msg = AddHotkeyName( _( "Rotate Counterclockwise" ), g_Libedit_Hotkeys_Descr, HK_ROTATE ); AddMenuItem( PopMenu, ID_POPUP_ROTATE_BLOCK, msg, KiBitmap( rotate_ccw_xpm ) ); diff --git a/eeschema/libedit/menubar_libedit.cpp b/eeschema/libedit/menubar_libedit.cpp index fc3de52ff9..9de220b9eb 100644 --- a/eeschema/libedit/menubar_libedit.cpp +++ b/eeschema/libedit/menubar_libedit.cpp @@ -72,14 +72,14 @@ void LIB_EDIT_FRAME::ReCreateMenuBar() fileMenu->AppendSeparator(); - text = AddHotkeyName( _( "&Save" ), g_Libedit_Hokeys_Descr, HK_SAVE ); + text = AddHotkeyName( _( "&Save" ), g_Libedit_Hotkeys_Descr, HK_SAVE ); AddMenuItem( fileMenu, ID_LIBEDIT_SAVE, text, _( "Save changes" ), KiBitmap( save_xpm ) ); - text = AddHotkeyName( _( "Save &As..." ), g_Libedit_Hokeys_Descr, HK_SAVEAS ); + text = AddHotkeyName( _( "Save &As..." ), g_Libedit_Hotkeys_Descr, HK_SAVEAS ); AddMenuItem( fileMenu, ID_LIBEDIT_SAVE_AS, text, @@ -135,14 +135,14 @@ void LIB_EDIT_FRAME::ReCreateMenuBar() // Edit menu wxMenu* editMenu = new wxMenu; - text = AddHotkeyName( _( "&Undo" ), g_Libedit_Hokeys_Descr, HK_UNDO ); + text = AddHotkeyName( _( "&Undo" ), g_Libedit_Hotkeys_Descr, HK_UNDO ); AddMenuItem( editMenu, wxID_UNDO, text, _( "Undo last edit" ), KiBitmap( undo_xpm ) ); - text = AddHotkeyName( _( "&Redo" ), g_Libedit_Hokeys_Descr, HK_REDO ); + text = AddHotkeyName( _( "&Redo" ), g_Libedit_Hotkeys_Descr, HK_REDO ); AddMenuItem( editMenu, wxID_REDO, text, @@ -196,16 +196,16 @@ void LIB_EDIT_FRAME::ReCreateMenuBar() AddMenuItem( viewMenu, ID_ZOOM_OUT, text, HELP_ZOOM_OUT, KiBitmap( zoom_out_xpm ) ); // Fit on screen - text = AddHotkeyName( _( "&Zoom to Fit" ), g_Libedit_Hokeys_Descr, HK_ZOOM_AUTO ); + text = AddHotkeyName( _( "&Zoom to Fit" ), g_Libedit_Hotkeys_Descr, HK_ZOOM_AUTO ); AddMenuItem( viewMenu, ID_ZOOM_PAGE, text, _( "Zoom to fit symbol" ), KiBitmap( zoom_fit_in_page_xpm ) ); text = AddHotkeyName( _( "Zoom to Selection" ), - g_Schematic_Hokeys_Descr, HK_ZOOM_SELECTION ); + g_Schematic_Hotkeys_Descr, HK_ZOOM_SELECTION ); AddMenuItem( viewMenu, ID_MENU_ZOOM_SELECTION, text, KiBitmap( zoom_area_xpm ) ); // Redraw - text = AddHotkeyName( _( "&Redraw" ), g_Libedit_Hokeys_Descr, HK_ZOOM_REDRAW ); + text = AddHotkeyName( _( "&Redraw" ), g_Libedit_Hotkeys_Descr, HK_ZOOM_REDRAW ); AddMenuItem( viewMenu, ID_ZOOM_REDRAW, text, HELP_ZOOM_REDRAW, KiBitmap( zoom_redraw_xpm ) ); viewMenu->AppendSeparator(); @@ -296,7 +296,7 @@ void LIB_EDIT_FRAME::ReCreateMenuBar() wxMenu* inspectMenu = new wxMenu; - text = AddHotkeyName( _( "Show Datasheet" ), g_Libedit_Hokeys_Descr, HK_LIBEDIT_VIEW_DOC ); + text = AddHotkeyName( _( "Show Datasheet" ), g_Libedit_Hotkeys_Descr, HK_LIBEDIT_VIEW_DOC ); AddMenuItem( inspectMenu, ID_LIBEDIT_VIEW_DOC, text, @@ -340,13 +340,13 @@ void LIB_EDIT_FRAME::ReCreateMenuBar() preferencesMenu->AppendSeparator(); - text = AddHotkeyName( _( "Modern Toolset (&Accelerated)" ), g_Libedit_Hokeys_Descr, + text = AddHotkeyName( _( "Modern Toolset (&Accelerated)" ), g_Libedit_Hotkeys_Descr, HK_CANVAS_OPENGL ); AddMenuItem( preferencesMenu, ID_MENU_CANVAS_OPENGL, text, _( "Use Modern Toolset with hardware-accelerated graphics (recommended)" ), KiBitmap( tools_xpm ), wxITEM_RADIO ); - text = AddHotkeyName( _( "Modern Toolset (Fallba&ck)" ), g_Libedit_Hokeys_Descr, + text = AddHotkeyName( _( "Modern Toolset (Fallba&ck)" ), g_Libedit_Hotkeys_Descr, HK_CANVAS_CAIRO ); AddMenuItem( preferencesMenu, ID_MENU_CANVAS_CAIRO, text, _( "Use Modern Toolset with software graphics (fall-back)" ), @@ -370,7 +370,7 @@ void LIB_EDIT_FRAME::ReCreateMenuBar() _( "Open the \"Getting Started in KiCad\" guide for beginners" ), KiBitmap( help_xpm ) ); - text = AddHotkeyName( _( "&List Hotkeys..." ), g_Libedit_Hokeys_Descr, HK_HELP ); + text = AddHotkeyName( _( "&List Hotkeys..." ), g_Libedit_Hotkeys_Descr, HK_HELP ); AddMenuItem( helpMenu, ID_PREFERENCES_HOTKEY_SHOW_CURRENT_LIST, text, diff --git a/eeschema/libedit/tool_lib.cpp b/eeschema/libedit/tool_lib.cpp index 487afaf625..f27c438327 100644 --- a/eeschema/libedit/tool_lib.cpp +++ b/eeschema/libedit/tool_lib.cpp @@ -121,25 +121,25 @@ void LIB_EDIT_FRAME::ReCreateHToolbar() KiScaledSeparator( m_mainToolBar, this ); - msg = AddHotkeyName( HELP_UNDO, g_Libedit_Hokeys_Descr, HK_UNDO, IS_COMMENT ); + msg = AddHotkeyName( HELP_UNDO, g_Libedit_Hotkeys_Descr, HK_UNDO, IS_COMMENT ); m_mainToolBar->AddTool( wxID_UNDO, wxEmptyString, KiScaledBitmap( undo_xpm, this ), msg ); - msg = AddHotkeyName( HELP_REDO, g_Libedit_Hokeys_Descr, HK_REDO, IS_COMMENT ); + msg = AddHotkeyName( HELP_REDO, g_Libedit_Hotkeys_Descr, HK_REDO, IS_COMMENT ); m_mainToolBar->AddTool( wxID_REDO, wxEmptyString, KiScaledBitmap( redo_xpm, this ), msg ); KiScaledSeparator( m_mainToolBar, this ); - msg = AddHotkeyName( HELP_ZOOM_REDRAW, g_Libedit_Hokeys_Descr, HK_ZOOM_REDRAW, IS_COMMENT ); + msg = AddHotkeyName( HELP_ZOOM_REDRAW, g_Libedit_Hotkeys_Descr, HK_ZOOM_REDRAW, IS_COMMENT ); m_mainToolBar->AddTool( ID_ZOOM_REDRAW, wxEmptyString, KiScaledBitmap( zoom_redraw_xpm, this ), msg ); - msg = AddHotkeyName( HELP_ZOOM_IN, g_Libedit_Hokeys_Descr, HK_ZOOM_IN, IS_COMMENT ); + msg = AddHotkeyName( HELP_ZOOM_IN, g_Libedit_Hotkeys_Descr, HK_ZOOM_IN, IS_COMMENT ); m_mainToolBar->AddTool( ID_ZOOM_IN, wxEmptyString, KiScaledBitmap( zoom_in_xpm, this ), msg ); - msg = AddHotkeyName( HELP_ZOOM_OUT, g_Libedit_Hokeys_Descr, HK_ZOOM_OUT, IS_COMMENT ); + msg = AddHotkeyName( HELP_ZOOM_OUT, g_Libedit_Hotkeys_Descr, HK_ZOOM_OUT, IS_COMMENT ); m_mainToolBar->AddTool( ID_ZOOM_OUT, wxEmptyString, KiScaledBitmap( zoom_out_xpm, this ), msg ); - msg = AddHotkeyName( _( "Zoom to fit symbol" ), g_Libedit_Hokeys_Descr, + msg = AddHotkeyName( _( "Zoom to fit symbol" ), g_Libedit_Hotkeys_Descr, HK_ZOOM_AUTO, IS_COMMENT ); m_mainToolBar->AddTool( ID_ZOOM_PAGE, wxEmptyString, KiScaledBitmap( zoom_fit_in_page_xpm, this ), msg ); diff --git a/eeschema/menubar.cpp b/eeschema/menubar.cpp index c209a40385..5fb13cc448 100644 --- a/eeschema/menubar.cpp +++ b/eeschema/menubar.cpp @@ -140,7 +140,7 @@ void prepareViewMenu( wxMenu* aParentMenu ) _( "Navigate schematic hierarchy" ), KiBitmap( hierarchy_nav_xpm ) ); - text = AddHotkeyName( _( "&Leave Sheet" ), g_Schematic_Hokeys_Descr, HK_LEAVE_SHEET ); + text = AddHotkeyName( _( "&Leave Sheet" ), g_Schematic_Hotkeys_Descr, HK_LEAVE_SHEET ); AddMenuItem( aParentMenu, ID_POPUP_SCH_LEAVE_SHEET, text, _( "Return to parent schematic sheet" ), @@ -163,24 +163,24 @@ void prepareViewMenu( wxMenu* aParentMenu ) * using in AddHotkeyName call the option "false" (not a shortcut) */ - text = AddHotkeyName( _( "Zoom &In" ), g_Schematic_Hokeys_Descr, + text = AddHotkeyName( _( "Zoom &In" ), g_Schematic_Hotkeys_Descr, HK_ZOOM_IN, IS_ACCELERATOR ); // add an accelerator, not a shortcut AddMenuItem( aParentMenu, ID_ZOOM_IN, text, HELP_ZOOM_IN, KiBitmap( zoom_in_xpm ) ); - text = AddHotkeyName( _( "Zoom &Out" ), g_Schematic_Hokeys_Descr, + text = AddHotkeyName( _( "Zoom &Out" ), g_Schematic_Hotkeys_Descr, HK_ZOOM_OUT, IS_ACCELERATOR ); // add accelerator, not a shortcut AddMenuItem( aParentMenu, ID_ZOOM_OUT, text, HELP_ZOOM_OUT, KiBitmap( zoom_out_xpm ) ); - text = AddHotkeyName( _( "&Zoom to Fit" ), g_Schematic_Hokeys_Descr, HK_ZOOM_AUTO ); + text = AddHotkeyName( _( "&Zoom to Fit" ), g_Schematic_Hotkeys_Descr, HK_ZOOM_AUTO ); AddMenuItem( aParentMenu, ID_ZOOM_PAGE, text, HELP_ZOOM_FIT, KiBitmap( zoom_fit_in_page_xpm ) ); - text = AddHotkeyName( _( "Zoom to Selection" ), g_Eeschema_Hokeys_Descr, HK_ZOOM_SELECTION ); + text = AddHotkeyName( _( "Zoom to Selection" ), g_Eeschema_Hotkeys_Descr, HK_ZOOM_SELECTION ); AddMenuItem( aParentMenu, ID_MENU_ZOOM_SELECTION, text, KiBitmap( zoom_area_xpm ) ); - text = AddHotkeyName( _( "&Redraw" ), g_Schematic_Hokeys_Descr, HK_ZOOM_REDRAW ); + text = AddHotkeyName( _( "&Redraw" ), g_Schematic_Hotkeys_Descr, HK_ZOOM_REDRAW ); AddMenuItem( aParentMenu, ID_ZOOM_REDRAW, text, HELP_ZOOM_REDRAW, KiBitmap( zoom_redraw_xpm ) ); @@ -232,59 +232,59 @@ void preparePlaceMenu( wxMenu* aParentMenu ) { wxString text; - text = AddHotkeyName( _( "&Symbol" ), g_Schematic_Hokeys_Descr, + text = AddHotkeyName( _( "&Symbol" ), g_Schematic_Hotkeys_Descr, HK_ADD_NEW_COMPONENT, IS_ACCELERATOR ); // add an accelerator, not a shortcut AddMenuItem( aParentMenu, ID_MENU_PLACE_COMPONENT, text, HELP_PLACE_COMPONENTS, KiBitmap( add_component_xpm ) ); - text = AddHotkeyName( _( "&Power Port" ), g_Schematic_Hokeys_Descr, + text = AddHotkeyName( _( "&Power Port" ), g_Schematic_Hotkeys_Descr, HK_ADD_NEW_POWER, IS_ACCELERATOR ); // add an accelerator, not a shortcut AddMenuItem( aParentMenu, ID_MENU_PLACE_POWER_BUTT, text, HELP_PLACE_POWERPORT, KiBitmap( add_power_xpm ) ); - text = AddHotkeyName( _( "&Wire" ), g_Schematic_Hokeys_Descr, + text = AddHotkeyName( _( "&Wire" ), g_Schematic_Hotkeys_Descr, HK_BEGIN_WIRE, IS_ACCELERATOR ); // add an accelerator, not a shortcut AddMenuItem( aParentMenu, ID_MENU_WIRE_BUTT, text, HELP_PLACE_WIRE, KiBitmap( add_line_xpm ) ); - text = AddHotkeyName( _( "&Bus" ), g_Schematic_Hokeys_Descr, + text = AddHotkeyName( _( "&Bus" ), g_Schematic_Hotkeys_Descr, HK_BEGIN_BUS, IS_ACCELERATOR ); // add an accelerator, not a shortcut AddMenuItem( aParentMenu, ID_MENU_BUS_BUTT, text, HELP_PLACE_BUS, KiBitmap( add_bus_xpm ) ); - text = AddHotkeyName( _( "Wire to Bus &Entry" ), g_Schematic_Hokeys_Descr, + text = AddHotkeyName( _( "Wire to Bus &Entry" ), g_Schematic_Hotkeys_Descr, HK_ADD_WIRE_ENTRY, IS_ACCELERATOR ); // add an accelerator, not a shortcut AddMenuItem( aParentMenu, ID_MENU_WIRETOBUS_ENTRY_BUTT, text, HELP_PLACE_WIRE2BUS_ENTRY, KiBitmap( add_line2bus_xpm ) ); - text = AddHotkeyName( _( "Bus &to Bus Entry" ), g_Schematic_Hokeys_Descr, + text = AddHotkeyName( _( "Bus &to Bus Entry" ), g_Schematic_Hotkeys_Descr, HK_ADD_BUS_ENTRY, IS_ACCELERATOR ); // add an accelerator, not a shortcut AddMenuItem( aParentMenu, ID_MENU_BUSTOBUS_ENTRY_BUTT, text, HELP_PLACE_BUS2BUS_ENTRY, KiBitmap( add_bus2bus_xpm ) ); - text = AddHotkeyName( _( "&No Connect Flag" ), g_Schematic_Hokeys_Descr, + text = AddHotkeyName( _( "&No Connect Flag" ), g_Schematic_Hotkeys_Descr, HK_ADD_NOCONN_FLAG, IS_ACCELERATOR ); // add an accelerator, not a shortcut AddMenuItem( aParentMenu, ID_MENU_NOCONN_BUTT, text, HELP_PLACE_NC_FLAG, KiBitmap( noconn_xpm ) ); - text = AddHotkeyName( _( "&Junction" ), g_Schematic_Hokeys_Descr, + text = AddHotkeyName( _( "&Junction" ), g_Schematic_Hotkeys_Descr, HK_ADD_JUNCTION, IS_ACCELERATOR ); // add an accelerator, not a shortcut AddMenuItem( aParentMenu, ID_MENU_JUNCTION_BUTT, text, HELP_PLACE_JUNCTION, KiBitmap( add_junction_xpm ) ); - text = AddHotkeyName( _( "&Label" ), g_Schematic_Hokeys_Descr, + text = AddHotkeyName( _( "&Label" ), g_Schematic_Hotkeys_Descr, HK_ADD_LABEL, IS_ACCELERATOR ); // add an accelerator, not a shortcut AddMenuItem( aParentMenu, ID_MENU_LABEL_BUTT, text, HELP_PLACE_NETLABEL, KiBitmap( add_line_label_xpm ) ); - text = AddHotkeyName( _( "Gl&obal Label" ), g_Schematic_Hokeys_Descr, + text = AddHotkeyName( _( "Gl&obal Label" ), g_Schematic_Hotkeys_Descr, HK_ADD_GLABEL, IS_ACCELERATOR ); // add an accelerator, not a shortcut AddMenuItem( aParentMenu, ID_MENU_GLABEL_BUTT, text, HELP_PLACE_GLOBALLABEL, @@ -292,14 +292,14 @@ void preparePlaceMenu( wxMenu* aParentMenu ) aParentMenu->AppendSeparator(); - text = AddHotkeyName( _( "&Hierarchical Label" ), g_Schematic_Hokeys_Descr, + text = AddHotkeyName( _( "&Hierarchical Label" ), g_Schematic_Hotkeys_Descr, HK_ADD_HLABEL, IS_ACCELERATOR ); // add an accelerator, not a shortcut AddMenuItem( aParentMenu, ID_MENU_HIERLABEL_BUTT, text, HELP_PLACE_HIER_LABEL, KiBitmap( add_hierarchical_label_xpm ) ); - text = AddHotkeyName( _( "Hierar&chical Sheet" ), g_Schematic_Hokeys_Descr, + text = AddHotkeyName( _( "Hierar&chical Sheet" ), g_Schematic_Hotkeys_Descr, HK_ADD_HIER_SHEET, IS_ACCELERATOR ); // add an accelerator, not a shortcut AddMenuItem( aParentMenu, ID_MENU_SHEET_SYMBOL_BUTT, text, HELP_PLACE_SHEET, @@ -319,13 +319,13 @@ void preparePlaceMenu( wxMenu* aParentMenu ) aParentMenu->AppendSeparator(); - text = AddHotkeyName( _( "Graphic Pol&yline" ), g_Schematic_Hokeys_Descr, + text = AddHotkeyName( _( "Graphic Pol&yline" ), g_Schematic_Hotkeys_Descr, HK_ADD_GRAPHIC_POLYLINE, IS_ACCELERATOR ); // add an accelerator, not a shortcut AddMenuItem( aParentMenu, ID_MENU_LINE_COMMENT_BUTT, text, HELP_PLACE_GRAPHICLINES, KiBitmap( add_dashed_line_xpm ) ); - text = AddHotkeyName( _( "&Graphic Text" ), g_Schematic_Hokeys_Descr, + text = AddHotkeyName( _( "&Graphic Text" ), g_Schematic_Hotkeys_Descr, HK_ADD_GRAPHIC_TEXT, IS_ACCELERATOR ); // add an accelerator, not a shortcut AddMenuItem( aParentMenu, ID_MENU_TEXT_COMMENT_BUTT, text, HELP_PLACE_GRAPHICTEXTS, @@ -358,12 +358,12 @@ void prepareFilesMenu( wxMenu* aParentMenu, bool aIsOutsideProject ) if( aIsOutsideProject ) // not when under a project mgr { - text = AddHotkeyName( _( "&New..." ), g_Schematic_Hokeys_Descr, HK_NEW ); + text = AddHotkeyName( _( "&New..." ), g_Schematic_Hotkeys_Descr, HK_NEW ); AddMenuItem( aParentMenu, ID_NEW_PROJECT, text, _( "Start new schematic root sheet" ), KiBitmap( new_document_xpm ) ); - text = AddHotkeyName( _( "&Open..." ), g_Schematic_Hokeys_Descr, HK_OPEN ); + text = AddHotkeyName( _( "&Open..." ), g_Schematic_Hotkeys_Descr, HK_OPEN ); AddMenuItem( aParentMenu, ID_LOAD_PROJECT, text, _( "Open existing schematic" ), KiBitmap( open_document_xpm ) ); @@ -375,7 +375,7 @@ void prepareFilesMenu( wxMenu* aParentMenu, bool aIsOutsideProject ) aParentMenu->AppendSeparator(); } - text = AddHotkeyName( _( "&Save" ), g_Schematic_Hokeys_Descr, HK_SAVE ); + text = AddHotkeyName( _( "&Save" ), g_Schematic_Hotkeys_Descr, HK_SAVE ); AddMenuItem( aParentMenu, ID_SAVE_PROJECT, text, _( "Save changes" ), KiBitmap( save_xpm ) ); @@ -384,7 +384,7 @@ void prepareFilesMenu( wxMenu* aParentMenu, bool aIsOutsideProject ) _( "Save only the current sheet" ), KiBitmap( save_xpm ) ); - text = AddHotkeyName( _( "Save C&urrent Sheet As..." ), g_Schematic_Hokeys_Descr, HK_SAVEAS ); + text = AddHotkeyName( _( "Save C&urrent Sheet As..." ), g_Schematic_Hotkeys_Descr, HK_SAVEAS ); AddMenuItem( aParentMenu, ID_SAVE_ONE_SHEET_UNDER_NEW_NAME, text, _( "Save a copy of the current sheet" ), KiBitmap( save_as_xpm ) ); @@ -431,7 +431,7 @@ void prepareFilesMenu( wxMenu* aParentMenu, bool aIsOutsideProject ) _( "Settings for sheet size and frame references" ), KiBitmap( sheetset_xpm ) ); - text = AddHotkeyName( _( "&Print..." ), g_Schematic_Hokeys_Descr, HK_PRINT ); + text = AddHotkeyName( _( "&Print..." ), g_Schematic_Hotkeys_Descr, HK_PRINT ); AddMenuItem( aParentMenu, wxID_PRINT, text, _( "Print schematic sheet" ), KiBitmap( print_button_xpm ) ); @@ -454,28 +454,28 @@ void prepareEditMenu( wxMenu* aParentMenu ) wxString text; // Undo - text = AddHotkeyName( _( "&Undo" ), g_Schematic_Hokeys_Descr, HK_UNDO ); + text = AddHotkeyName( _( "&Undo" ), g_Schematic_Hotkeys_Descr, HK_UNDO ); AddMenuItem( aParentMenu, wxID_UNDO, text, HELP_UNDO, KiBitmap( undo_xpm ) ); // Redo - text = AddHotkeyName( _( "&Redo" ), g_Schematic_Hokeys_Descr, HK_REDO ); + text = AddHotkeyName( _( "&Redo" ), g_Schematic_Hotkeys_Descr, HK_REDO ); AddMenuItem( aParentMenu, wxID_REDO, text, HELP_REDO, KiBitmap( redo_xpm ) ); aParentMenu->AppendSeparator(); - text = AddHotkeyName( _( "&Cut" ), g_Schematic_Hokeys_Descr, HK_EDIT_CUT ); + text = AddHotkeyName( _( "&Cut" ), g_Schematic_Hotkeys_Descr, HK_EDIT_CUT ); AddMenuItem( aParentMenu, wxID_CUT, text, _( "Cuts the selected item(s) to the Clipboard" ), KiBitmap( cut_xpm ) ); - text = AddHotkeyName( _( "&Copy" ), g_Schematic_Hokeys_Descr, HK_EDIT_COPY ); + text = AddHotkeyName( _( "&Copy" ), g_Schematic_Hotkeys_Descr, HK_EDIT_COPY ); AddMenuItem( aParentMenu, wxID_COPY, text, _( "Copies the selected item(s) to the Clipboard" ), KiBitmap( copy_xpm ) ); - text = AddHotkeyName( _( "&Paste" ), g_Schematic_Hokeys_Descr, HK_EDIT_PASTE ); + text = AddHotkeyName( _( "&Paste" ), g_Schematic_Hotkeys_Descr, HK_EDIT_PASTE ); AddMenuItem( aParentMenu, wxID_PASTE, text, _( "Pastes item(s) from the Clipboard" ), KiBitmap( paste_xpm ) ); @@ -488,11 +488,11 @@ void prepareEditMenu( wxMenu* aParentMenu ) // Find aParentMenu->AppendSeparator(); - text = AddHotkeyName( _( "&Find..." ), g_Schematic_Hokeys_Descr, HK_FIND_ITEM ); + text = AddHotkeyName( _( "&Find..." ), g_Schematic_Hotkeys_Descr, HK_FIND_ITEM ); AddMenuItem( aParentMenu, ID_FIND_ITEMS, text, HELP_FIND, KiBitmap( find_xpm ) ); // Find/Replace - text = AddHotkeyName( _( "Find and Re&place..." ), g_Schematic_Hokeys_Descr, + text = AddHotkeyName( _( "Find and Re&place..." ), g_Schematic_Hotkeys_Descr, HK_FIND_REPLACE ); AddMenuItem( aParentMenu, wxID_REPLACE, text, HELP_REPLACE, KiBitmap( find_replace_xpm ) ); @@ -520,7 +520,7 @@ void prepareToolsMenu( wxMenu* aParentMenu ) { wxString text; - text = AddHotkeyName( _( "Update PCB from Schematic..." ), g_Schematic_Hokeys_Descr, + text = AddHotkeyName( _( "Update PCB from Schematic..." ), g_Schematic_Hotkeys_Descr, HK_UPDATE_PCB_FROM_SCH ); AddMenuItem( aParentMenu, @@ -600,7 +600,7 @@ void prepareHelpMenu( wxMenu* aParentMenu ) _( "Open \"Getting Started in KiCad\" guide for beginners" ), KiBitmap( help_xpm ) ); - wxString text = AddHotkeyName( _( "&List Hotkeys..." ), g_Eeschema_Hokeys_Descr, HK_HELP ); + wxString text = AddHotkeyName( _( "&List Hotkeys..." ), g_Eeschema_Hotkeys_Descr, HK_HELP ); AddMenuItem( aParentMenu, ID_PREFERENCES_HOTKEY_SHOW_CURRENT_LIST, text, _( "Displays current hotkeys table and corresponding commands" ), KiBitmap( hotkeys_xpm ) ); @@ -639,13 +639,13 @@ static void preparePreferencesMenu( SCH_EDIT_FRAME* aFrame, wxMenu* aParentMenu aParentMenu->AppendSeparator(); - wxString text = AddHotkeyName( _( "Modern Toolset (&Accelerated)" ), g_Eeschema_Hokeys_Descr, + wxString text = AddHotkeyName( _( "Modern Toolset (&Accelerated)" ), g_Eeschema_Hotkeys_Descr, HK_CANVAS_OPENGL ); AddMenuItem( aParentMenu, ID_MENU_CANVAS_OPENGL, text, _( "Use Modern Toolset with hardware-accelerated graphics (recommended)" ), KiBitmap( tools_xpm ), wxITEM_RADIO ); - text = AddHotkeyName( _( "Modern Toolset (Fallba&ck)" ), g_Eeschema_Hokeys_Descr, + text = AddHotkeyName( _( "Modern Toolset (Fallba&ck)" ), g_Eeschema_Hotkeys_Descr, HK_CANVAS_CAIRO ); AddMenuItem( aParentMenu, ID_MENU_CANVAS_CAIRO, text, _( "Use Modern Toolset with software graphics (fall-back)" ), diff --git a/eeschema/onrightclick.cpp b/eeschema/onrightclick.cpp index 273547635a..aff1cd46e8 100644 --- a/eeschema/onrightclick.cpp +++ b/eeschema/onrightclick.cpp @@ -101,33 +101,33 @@ bool SCH_EDIT_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* PopMenu ) break; case SCH_TEXT_T: - msg = AddHotkeyName( _( "Edit Text..." ), g_Schematic_Hokeys_Descr, HK_EDIT ); + msg = AddHotkeyName( _( "Edit Text..." ), g_Schematic_Hotkeys_Descr, HK_EDIT ); AddMenuItem( PopMenu, ID_SCH_EDIT_ITEM, msg, KiBitmap( edit_text_xpm ) ); PopMenu->AppendSeparator(); break; case SCH_LABEL_T: - msg = AddHotkeyName( _( "Edit Label..." ), g_Schematic_Hokeys_Descr, HK_EDIT ); + msg = AddHotkeyName( _( "Edit Label..." ), g_Schematic_Hotkeys_Descr, HK_EDIT ); AddMenuItem( PopMenu, ID_SCH_EDIT_ITEM, msg, KiBitmap( edit_text_xpm ) ); PopMenu->AppendSeparator(); break; case SCH_GLOBAL_LABEL_T: - msg = AddHotkeyName( _( "Edit Global Label..." ), g_Schematic_Hokeys_Descr, + msg = AddHotkeyName( _( "Edit Global Label..." ), g_Schematic_Hotkeys_Descr, HK_EDIT ); AddMenuItem( PopMenu, ID_SCH_EDIT_ITEM, msg, KiBitmap( edit_text_xpm ) ); PopMenu->AppendSeparator(); break; case SCH_HIERARCHICAL_LABEL_T: - msg = AddHotkeyName( _( "Edit Hierarchical Label..." ), g_Schematic_Hokeys_Descr, + msg = AddHotkeyName( _( "Edit Hierarchical Label..." ), g_Schematic_Hotkeys_Descr, HK_EDIT ); AddMenuItem( PopMenu, ID_SCH_EDIT_ITEM, msg, KiBitmap( edit_text_xpm ) ); PopMenu->AppendSeparator(); break; case SCH_BITMAP_T: - msg = AddHotkeyName( _( "Edit Image..." ), g_Schematic_Hokeys_Descr, HK_EDIT ); + msg = AddHotkeyName( _( "Edit Image..." ), g_Schematic_Hotkeys_Descr, HK_EDIT ); AddMenuItem( PopMenu, ID_SCH_EDIT_ITEM, msg, KiBitmap( image_xpm ) ); PopMenu->AppendSeparator(); break; @@ -201,7 +201,7 @@ bool SCH_EDIT_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* PopMenu ) { if( GetToolId() == ID_NO_TOOL_SELECTED && m_blockItems.GetCount() > 0 ) { - msg = AddHotkeyName( _( "&Paste" ), g_Schematic_Hokeys_Descr, HK_EDIT_PASTE ); + msg = AddHotkeyName( _( "&Paste" ), g_Schematic_Hotkeys_Descr, HK_EDIT_PASTE ); AddMenuItem( PopMenu, wxID_PASTE, msg, _( "Pastes item(s) from the Clipboard" ), KiBitmap( paste_xpm ) ); @@ -210,7 +210,7 @@ bool SCH_EDIT_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* PopMenu ) if( m_CurrentSheet->Last() != g_RootSheet ) { - msg = AddHotkeyName( _( "Leave Sheet" ), g_Schematic_Hokeys_Descr, HK_LEAVE_SHEET ); + msg = AddHotkeyName( _( "Leave Sheet" ), g_Schematic_Hotkeys_Descr, HK_LEAVE_SHEET ); AddMenuItem( PopMenu, ID_POPUP_SCH_LEAVE_SHEET, msg, KiBitmap( leave_sheet_xpm ) ); PopMenu->AppendSeparator(); @@ -326,7 +326,7 @@ void AddMenusForComponentField( wxMenu* PopMenu, SCH_FIELD* Field ) default: name = _( "Move Field" ); break; } - msg = AddHotkeyName( name, g_Schematic_Hokeys_Descr, + msg = AddHotkeyName( name, g_Schematic_Hotkeys_Descr, HK_MOVE_COMPONENT_OR_ITEM ); AddMenuItem( PopMenu, ID_SCH_MOVE_ITEM, msg, KiBitmap( move_xpm ) ); } @@ -339,7 +339,7 @@ void AddMenusForComponentField( wxMenu* PopMenu, SCH_FIELD* Field ) default: name = _( "Rotate Field" ); break; } - msg = AddHotkeyName( name, g_Schematic_Hokeys_Descr, HK_ROTATE ); + msg = AddHotkeyName( name, g_Schematic_Hotkeys_Descr, HK_ROTATE ); AddMenuItem( PopMenu, ID_SCH_ROTATE_CLOCKWISE, msg, KiBitmap( rotate_cw_xpm ) ); // Ref, value and footprint have specific hotkeys. Show the specific hotkey: @@ -367,7 +367,7 @@ void AddMenusForComponentField( wxMenu* PopMenu, SCH_FIELD* Field ) name = _( "Edit Field..." ); break; } - msg = AddHotkeyName( name, g_Schematic_Hokeys_Descr, id ); + msg = AddHotkeyName( name, g_Schematic_Hotkeys_Descr, id ); AddMenuItem( PopMenu, ID_SCH_EDIT_ITEM, msg, KiBitmap( edit_text_xpm ) ); } @@ -385,24 +385,24 @@ void AddMenusForComponent( wxMenu* PopMenu, SCH_COMPONENT* Component, SYMBOL_LIB if( !Component->GetFlags() ) { msg.Printf( _( "Move %s" ), Component->GetField( REFERENCE )->GetText() ); - msg = AddHotkeyName( msg, g_Schematic_Hokeys_Descr, HK_MOVE_COMPONENT_OR_ITEM ); + msg = AddHotkeyName( msg, g_Schematic_Hotkeys_Descr, HK_MOVE_COMPONENT_OR_ITEM ); AddMenuItem( PopMenu, ID_SCH_MOVE_ITEM, msg, KiBitmap( move_xpm ) ); - msg = AddHotkeyName( _( "Drag" ), g_Schematic_Hokeys_Descr, HK_DRAG ); + msg = AddHotkeyName( _( "Drag" ), g_Schematic_Hotkeys_Descr, HK_DRAG ); AddMenuItem( PopMenu, ID_SCH_DRAG_ITEM, msg, KiBitmap( drag_xpm ) ); } wxMenu* orientmenu = new wxMenu; - msg = AddHotkeyName( _( "Rotate Clockwise" ), g_Schematic_Hokeys_Descr, HK_ROTATE ); + msg = AddHotkeyName( _( "Rotate Clockwise" ), g_Schematic_Hotkeys_Descr, HK_ROTATE ); AddMenuItem( orientmenu, ID_SCH_ROTATE_CLOCKWISE, msg, KiBitmap( rotate_cw_xpm ) ); AddMenuItem( orientmenu, ID_SCH_ROTATE_COUNTERCLOCKWISE, _( "Rotate Counterclockwise" ), KiBitmap( rotate_ccw_xpm ) ); - msg = AddHotkeyName( _( "Mirror Around Horizontal(X) Axis" ), g_Schematic_Hokeys_Descr, + msg = AddHotkeyName( _( "Mirror Around Horizontal(X) Axis" ), g_Schematic_Hotkeys_Descr, HK_MIRROR_X ); AddMenuItem( orientmenu, ID_SCH_MIRROR_X, msg, KiBitmap( mirror_v_xpm ) ); - msg = AddHotkeyName( _( "Mirror Around Vertical(Y) Axis" ), g_Schematic_Hokeys_Descr, + msg = AddHotkeyName( _( "Mirror Around Vertical(Y) Axis" ), g_Schematic_Hotkeys_Descr, HK_MIRROR_Y ); AddMenuItem( orientmenu, ID_SCH_MIRROR_Y, msg, KiBitmap( mirror_h_xpm ) ); - msg = AddHotkeyName( _( "Reset to Default" ), g_Schematic_Hokeys_Descr, + msg = AddHotkeyName( _( "Reset to Default" ), g_Schematic_Hotkeys_Descr, HK_ORIENT_NORMAL_COMPONENT ); AddMenuItem( orientmenu, ID_SCH_ORIENT_NORMAL, msg, KiBitmap( normal_xpm ) ); AddMenuItem( PopMenu, orientmenu, ID_POPUP_SCH_GENERIC_ORIENT_CMP, @@ -412,14 +412,14 @@ void AddMenusForComponent( wxMenu* PopMenu, SCH_COMPONENT* Component, SYMBOL_LIB if( !Component->GetFlags() ) { - msg = AddHotkeyName( _( "Duplicate" ), g_Schematic_Hokeys_Descr, + msg = AddHotkeyName( _( "Duplicate" ), g_Schematic_Hotkeys_Descr, HK_DUPLICATE_ITEM ); AddMenuItem( PopMenu, ID_POPUP_SCH_DUPLICATE_ITEM, msg, KiBitmap( duplicate_xpm ) ); - msg = AddHotkeyName( _( "Delete" ), g_Schematic_Hokeys_Descr, HK_DELETE ); + msg = AddHotkeyName( _( "Delete" ), g_Schematic_Hotkeys_Descr, HK_DELETE ); AddMenuItem( PopMenu, ID_POPUP_SCH_DELETE_CMP, msg, KiBitmap( delete_xpm ) ); } - msg = AddHotkeyName( _( "Autoplace Fields" ), g_Schematic_Hokeys_Descr, HK_AUTOPLACE_FIELDS ); + msg = AddHotkeyName( _( "Autoplace Fields" ), g_Schematic_Hotkeys_Descr, HK_AUTOPLACE_FIELDS ); AddMenuItem( PopMenu, ID_AUTOPLACE_FIELDS, msg, KiBitmap( autoplace_fields_xpm ) ); if( !Component->GetField( DATASHEET )->GetFullyQualifiedText().IsEmpty() ) @@ -452,27 +452,27 @@ void AddMenusForEditComponent( wxMenu* PopMenu, SCH_COMPONENT* Component, SYMBOL part = alias->GetPart(); wxMenu* editmenu = new wxMenu; - msg = AddHotkeyName( _( "Edit Properties..." ), g_Schematic_Hokeys_Descr, HK_EDIT ); + msg = AddHotkeyName( _( "Edit Properties..." ), g_Schematic_Hotkeys_Descr, HK_EDIT ); AddMenuItem( editmenu, ID_SCH_EDIT_ITEM, msg, KiBitmap( config_xpm ) ); if( part && part->IsNormal() ) { - msg = AddHotkeyName( _( "Edit Value..." ), g_Schematic_Hokeys_Descr, + msg = AddHotkeyName( _( "Edit Value..." ), g_Schematic_Hotkeys_Descr, HK_EDIT_COMPONENT_VALUE ); AddMenuItem( editmenu, ID_SCH_EDIT_COMPONENT_VALUE, msg, KiBitmap( edit_comp_value_xpm ) ); - msg = AddHotkeyName( _( "Edit Reference..." ), g_Schematic_Hokeys_Descr, + msg = AddHotkeyName( _( "Edit Reference..." ), g_Schematic_Hotkeys_Descr, HK_EDIT_COMPONENT_REFERENCE ); AddMenuItem( editmenu, ID_SCH_EDIT_COMPONENT_REFERENCE, msg, KiBitmap( edit_comp_ref_xpm ) ); - msg = AddHotkeyName( _( "Edit Footprint..." ), g_Schematic_Hokeys_Descr, + msg = AddHotkeyName( _( "Edit Footprint..." ), g_Schematic_Hotkeys_Descr, HK_EDIT_COMPONENT_FOOTPRINT ); AddMenuItem( editmenu, ID_SCH_EDIT_COMPONENT_FOOTPRINT, msg, KiBitmap( edit_comp_footprint_xpm ) ); - msg = AddHotkeyName( _( "Show Datasheet" ), g_Schematic_Hokeys_Descr, + msg = AddHotkeyName( _( "Show Datasheet" ), g_Schematic_Hotkeys_Descr, HK_SHOW_COMPONENT_DATASHEET ); AddMenuItem( editmenu, ID_POPUP_SCH_DISPLAYDOC_CMP, msg, KiBitmap( datasheet_xpm ) ); @@ -509,7 +509,7 @@ void AddMenusForEditComponent( wxMenu* PopMenu, SCH_COMPONENT* Component, SYMBOL if( !Component->GetFlags() ) { - msg = AddHotkeyName( _( "Edit with Library Editor" ), g_Schematic_Hokeys_Descr, + msg = AddHotkeyName( _( "Edit with Library Editor" ), g_Schematic_Hotkeys_Descr, HK_EDIT_COMPONENT_WITH_LIBEDIT ); AddMenuItem( editmenu, ID_POPUP_SCH_CALL_LIBEDIT_AND_LOAD_CMP, msg, KiBitmap( libedit_xpm ) ); @@ -527,22 +527,22 @@ void AddMenusForGLabel( wxMenu* PopMenu, SCH_GLOBALLABEL* GLabel ) if( !GLabel->GetFlags() ) { - msg = AddHotkeyName( _( "Move" ), g_Schematic_Hokeys_Descr, + msg = AddHotkeyName( _( "Move" ), g_Schematic_Hotkeys_Descr, HK_MOVE_COMPONENT_OR_ITEM ); AddMenuItem( PopMenu, ID_SCH_MOVE_ITEM, msg, KiBitmap( move_xpm ) ); - msg = AddHotkeyName( _( "Drag" ), g_Schematic_Hokeys_Descr, + msg = AddHotkeyName( _( "Drag" ), g_Schematic_Hotkeys_Descr, HK_DRAG ); AddMenuItem( PopMenu, ID_SCH_DRAG_ITEM, msg, KiBitmap( drag_xpm ) ); - msg = AddHotkeyName( _( "Duplicate" ), g_Schematic_Hokeys_Descr, + msg = AddHotkeyName( _( "Duplicate" ), g_Schematic_Hotkeys_Descr, HK_DUPLICATE_ITEM ); AddMenuItem( PopMenu, ID_POPUP_SCH_DUPLICATE_ITEM, msg, KiBitmap( duplicate_xpm ) ); } - msg = AddHotkeyName( _( "Rotate Clockwise" ), g_Schematic_Hokeys_Descr, HK_ROTATE ); + msg = AddHotkeyName( _( "Rotate Clockwise" ), g_Schematic_Hotkeys_Descr, HK_ROTATE ); AddMenuItem( PopMenu, ID_SCH_ROTATE_CLOCKWISE, msg, KiBitmap( rotate_cw_xpm ) ); - msg = AddHotkeyName( _( "Edit..." ), g_Schematic_Hokeys_Descr, HK_EDIT ); + msg = AddHotkeyName( _( "Edit..." ), g_Schematic_Hotkeys_Descr, HK_EDIT ); AddMenuItem( PopMenu, ID_SCH_EDIT_ITEM, msg, KiBitmap( edit_text_xpm ) ); - msg = AddHotkeyName( _( "Delete" ), g_Schematic_Hokeys_Descr, HK_DELETE ); + msg = AddHotkeyName( _( "Delete" ), g_Schematic_Hotkeys_Descr, HK_DELETE ); AddMenuItem( PopMenu, ID_POPUP_SCH_DELETE, msg, KiBitmap( delete_xpm ) ); // add menu change type text (to label, glabel, text): @@ -564,21 +564,21 @@ void AddMenusForHLabel( wxMenu* PopMenu, SCH_HIERLABEL* HLabel ) if( !HLabel->GetFlags() ) { - msg = AddHotkeyName( _( "Move" ), g_Schematic_Hokeys_Descr, + msg = AddHotkeyName( _( "Move" ), g_Schematic_Hotkeys_Descr, HK_MOVE_COMPONENT_OR_ITEM ); AddMenuItem( PopMenu, ID_SCH_MOVE_ITEM, msg, KiBitmap( move_xpm ) ); - msg = AddHotkeyName( _( "Drag" ), g_Schematic_Hokeys_Descr, HK_DRAG ); + msg = AddHotkeyName( _( "Drag" ), g_Schematic_Hotkeys_Descr, HK_DRAG ); AddMenuItem( PopMenu, ID_SCH_DRAG_ITEM, msg, KiBitmap( drag_xpm ) ); - msg = AddHotkeyName( _( "Copy" ), g_Schematic_Hokeys_Descr, + msg = AddHotkeyName( _( "Copy" ), g_Schematic_Hotkeys_Descr, HK_DUPLICATE_ITEM ); AddMenuItem( PopMenu, ID_POPUP_SCH_DUPLICATE_ITEM, msg, KiBitmap( copy_xpm ) ); } - msg = AddHotkeyName( _( "Rotate Clockwise" ), g_Schematic_Hokeys_Descr, HK_ROTATE ); + msg = AddHotkeyName( _( "Rotate Clockwise" ), g_Schematic_Hotkeys_Descr, HK_ROTATE ); AddMenuItem( PopMenu, ID_SCH_ROTATE_CLOCKWISE, msg, KiBitmap( rotate_cw_xpm ) ); - msg = AddHotkeyName( _( "Edit..." ), g_Schematic_Hokeys_Descr, HK_EDIT ); + msg = AddHotkeyName( _( "Edit..." ), g_Schematic_Hotkeys_Descr, HK_EDIT ); AddMenuItem( PopMenu, ID_SCH_EDIT_ITEM, msg, KiBitmap( edit_text_xpm ) ); - msg = AddHotkeyName( _( "Delete" ), g_Schematic_Hokeys_Descr, HK_DELETE ); + msg = AddHotkeyName( _( "Delete" ), g_Schematic_Hotkeys_Descr, HK_DELETE ); AddMenuItem( PopMenu, ID_POPUP_SCH_DELETE, msg, KiBitmap( delete_xpm ) ); // add menu change type text (to label, glabel, text): @@ -600,19 +600,19 @@ void AddMenusForLabel( wxMenu* PopMenu, SCH_LABEL* Label ) if( !Label->GetFlags() ) { - msg = AddHotkeyName( _( "Move" ), g_Schematic_Hokeys_Descr, HK_MOVE_COMPONENT_OR_ITEM ); + msg = AddHotkeyName( _( "Move" ), g_Schematic_Hotkeys_Descr, HK_MOVE_COMPONENT_OR_ITEM ); AddMenuItem( PopMenu, ID_SCH_MOVE_ITEM, msg, KiBitmap( move_xpm ) ); - msg = AddHotkeyName( _( "Drag" ), g_Schematic_Hokeys_Descr, HK_DRAG ); + msg = AddHotkeyName( _( "Drag" ), g_Schematic_Hotkeys_Descr, HK_DRAG ); AddMenuItem( PopMenu, ID_SCH_DRAG_ITEM, msg, KiBitmap( drag_xpm ) ); - msg = AddHotkeyName( _( "Duplicate" ), g_Schematic_Hokeys_Descr, HK_DUPLICATE_ITEM ); + msg = AddHotkeyName( _( "Duplicate" ), g_Schematic_Hotkeys_Descr, HK_DUPLICATE_ITEM ); AddMenuItem( PopMenu, ID_POPUP_SCH_DUPLICATE_ITEM, msg, KiBitmap( duplicate_xpm ) ); } - msg = AddHotkeyName( _( "Rotate Counterclockwise" ), g_Schematic_Hokeys_Descr, HK_ROTATE ); + msg = AddHotkeyName( _( "Rotate Counterclockwise" ), g_Schematic_Hotkeys_Descr, HK_ROTATE ); AddMenuItem( PopMenu, ID_SCH_ROTATE_CLOCKWISE, msg, KiBitmap( rotate_ccw_xpm ) ); - msg = AddHotkeyName( _( "Edit..." ), g_Schematic_Hokeys_Descr, HK_EDIT ); + msg = AddHotkeyName( _( "Edit..." ), g_Schematic_Hotkeys_Descr, HK_EDIT ); AddMenuItem( PopMenu, ID_SCH_EDIT_ITEM, msg, KiBitmap( edit_text_xpm ) ); - msg = AddHotkeyName( _( "Delete" ), g_Schematic_Hokeys_Descr, HK_DELETE ); + msg = AddHotkeyName( _( "Delete" ), g_Schematic_Hotkeys_Descr, HK_DELETE ); AddMenuItem( PopMenu, ID_POPUP_SCH_DELETE, msg, KiBitmap( delete_xpm ) ); // add menu change type text (to label, glabel, text): @@ -634,17 +634,17 @@ void AddMenusForText( wxMenu* PopMenu, SCH_TEXT* Text ) if( !Text->GetFlags() ) { - msg = AddHotkeyName( _( "Move" ), g_Schematic_Hokeys_Descr, HK_MOVE_COMPONENT_OR_ITEM ); + msg = AddHotkeyName( _( "Move" ), g_Schematic_Hotkeys_Descr, HK_MOVE_COMPONENT_OR_ITEM ); AddMenuItem( PopMenu, ID_SCH_MOVE_ITEM, msg, KiBitmap( move_xpm ) ); - msg = AddHotkeyName( _( "Duplicate" ), g_Schematic_Hokeys_Descr, HK_DUPLICATE_ITEM ); + msg = AddHotkeyName( _( "Duplicate" ), g_Schematic_Hotkeys_Descr, HK_DUPLICATE_ITEM ); AddMenuItem( PopMenu, ID_POPUP_SCH_DUPLICATE_ITEM, msg, KiBitmap( duplicate_xpm ) ); } - msg = AddHotkeyName( _( "Rotate Counterclockwise" ), g_Schematic_Hokeys_Descr, HK_ROTATE ); + msg = AddHotkeyName( _( "Rotate Counterclockwise" ), g_Schematic_Hotkeys_Descr, HK_ROTATE ); AddMenuItem( PopMenu, ID_SCH_ROTATE_CLOCKWISE, msg, KiBitmap( rotate_ccw_xpm ) ); - msg = AddHotkeyName( _( "Edit..." ), g_Schematic_Hokeys_Descr, HK_EDIT ); + msg = AddHotkeyName( _( "Edit..." ), g_Schematic_Hotkeys_Descr, HK_EDIT ); AddMenuItem( PopMenu, ID_SCH_EDIT_ITEM, msg, KiBitmap( edit_text_xpm ) ); - msg = AddHotkeyName( _( "Delete" ), g_Schematic_Hokeys_Descr, HK_DELETE ); + msg = AddHotkeyName( _( "Delete" ), g_Schematic_Hotkeys_Descr, HK_DELETE ); AddMenuItem( PopMenu, ID_POPUP_SCH_DELETE, msg, KiBitmap( delete_xpm ) ); /* add menu change type text (to label, glabel, text), @@ -669,7 +669,7 @@ void SCH_EDIT_FRAME::addJunctionMenuEntries( wxMenu* aMenu, SCH_JUNCTION* aJunct wxString msg; SCH_SCREEN* screen = GetScreen(); - msg = AddHotkeyName( _( "Delete Junction" ), g_Schematic_Hokeys_Descr, HK_DELETE ); + msg = AddHotkeyName( _( "Delete Junction" ), g_Schematic_Hotkeys_Descr, HK_DELETE ); AddMenuItem( aMenu, ID_POPUP_SCH_DELETE, msg, KiBitmap( delete_xpm ) ); if( !aJunction->IsNew() ) @@ -700,22 +700,22 @@ void AddMenusForWire( wxMenu* PopMenu, SCH_LINE* Wire, SCH_EDIT_FRAME* frame ) if( Wire == NULL ) { - msg = AddHotkeyName( _( "Begin Wire" ), g_Schematic_Hokeys_Descr, HK_BEGIN_WIRE ); + msg = AddHotkeyName( _( "Begin Wire" ), g_Schematic_Hotkeys_Descr, HK_BEGIN_WIRE ); AddMenuItem( PopMenu, ID_POPUP_SCH_BEGIN_WIRE, msg, KiBitmap( add_line_xpm ) ); return; } if( Wire->IsNew() ) { - msg = AddHotkeyName( _( "Wire End" ), g_Schematic_Hokeys_Descr, HK_END_CURR_LINEWIREBUS ); + msg = AddHotkeyName( _( "Wire End" ), g_Schematic_Hotkeys_Descr, HK_END_CURR_LINEWIREBUS ); AddMenuItem( PopMenu, ID_POPUP_END_LINE, msg, KiBitmap( checked_ok_xpm ) ); return; } - msg = AddHotkeyName( _( "Drag Wire" ), g_Schematic_Hokeys_Descr, HK_DRAG ); + msg = AddHotkeyName( _( "Drag Wire" ), g_Schematic_Hotkeys_Descr, HK_DRAG ); AddMenuItem( PopMenu, ID_SCH_DRAG_ITEM, msg, KiBitmap( drag_xpm ) ); PopMenu->AppendSeparator(); - msg = AddHotkeyName( _( "Delete Wire" ), g_Schematic_Hokeys_Descr, HK_DELETE ); + msg = AddHotkeyName( _( "Delete Wire" ), g_Schematic_Hotkeys_Descr, HK_DELETE ); AddMenuItem( PopMenu, ID_POPUP_SCH_DELETE, msg, KiBitmap( delete_xpm ) ); AddMenuItem( PopMenu, ID_POPUP_SCH_DELETE_NODE, _( "Delete Node" ), KiBitmap( delete_node_xpm ) ); @@ -730,9 +730,9 @@ void AddMenusForWire( wxMenu* PopMenu, SCH_LINE* Wire, SCH_EDIT_FRAME* frame ) PopMenu->AppendSeparator(); - msg = AddHotkeyName( _( "Add Junction" ), g_Schematic_Hokeys_Descr, HK_ADD_JUNCTION ); + msg = AddHotkeyName( _( "Add Junction" ), g_Schematic_Hotkeys_Descr, HK_ADD_JUNCTION ); AddMenuItem( PopMenu, ID_POPUP_SCH_ADD_JUNCTION, msg, KiBitmap( add_junction_xpm ) ); - msg = AddHotkeyName( _( "Add Label..." ), g_Schematic_Hokeys_Descr, HK_ADD_LABEL ); + msg = AddHotkeyName( _( "Add Label..." ), g_Schematic_Hotkeys_Descr, HK_ADD_LABEL ); AddMenuItem( PopMenu, ID_POPUP_SCH_ADD_LABEL, msg, KiBitmap( add_line_label_xpm ) ); // Add global label command only if the cursor is over one end of the wire. @@ -749,27 +749,27 @@ void AddMenusForBus( wxMenu* PopMenu, SCH_LINE* Bus, SCH_EDIT_FRAME* frame ) if( Bus == NULL ) { - msg = AddHotkeyName( _( "Begin Bus" ), g_Schematic_Hokeys_Descr, HK_BEGIN_BUS ); + msg = AddHotkeyName( _( "Begin Bus" ), g_Schematic_Hotkeys_Descr, HK_BEGIN_BUS ); AddMenuItem( PopMenu, ID_POPUP_SCH_BEGIN_BUS, msg, KiBitmap( add_bus_xpm ) ); return; } if( Bus->IsNew() ) { - msg = AddHotkeyName( _( "Bus End" ), g_Schematic_Hokeys_Descr, HK_END_CURR_LINEWIREBUS ); + msg = AddHotkeyName( _( "Bus End" ), g_Schematic_Hotkeys_Descr, HK_END_CURR_LINEWIREBUS ); AddMenuItem( PopMenu, ID_POPUP_END_LINE, msg, KiBitmap( checked_ok_xpm ) ); return; } - msg = AddHotkeyName( _( "Delete Bus" ), g_Schematic_Hokeys_Descr, HK_DELETE ); + msg = AddHotkeyName( _( "Delete Bus" ), g_Schematic_Hotkeys_Descr, HK_DELETE ); AddMenuItem( PopMenu, ID_POPUP_SCH_DELETE, msg, KiBitmap( delete_bus_xpm ) ); AddMenuItem( PopMenu, ID_POPUP_SCH_BREAK_WIRE, _( "Break Bus" ), KiBitmap( break_bus_xpm ) ); PopMenu->AppendSeparator(); - msg = AddHotkeyName( _( "Add Junction" ), g_Schematic_Hokeys_Descr, HK_ADD_JUNCTION ); + msg = AddHotkeyName( _( "Add Junction" ), g_Schematic_Hotkeys_Descr, HK_ADD_JUNCTION ); AddMenuItem( PopMenu, ID_POPUP_SCH_ADD_JUNCTION, msg, KiBitmap( add_junction_xpm ) ); - msg = AddHotkeyName( _( "Add Label..." ), g_Schematic_Hokeys_Descr, HK_ADD_LABEL ); + msg = AddHotkeyName( _( "Add Label..." ), g_Schematic_Hotkeys_Descr, HK_ADD_LABEL ); AddMenuItem( PopMenu, ID_POPUP_SCH_ADD_LABEL, msg, KiBitmap( add_line_label_xpm ) ); // Add global label command only if the cursor is over one end of the bus. @@ -788,30 +788,30 @@ void AddMenusForHierchicalSheet( wxMenu* PopMenu, SCH_SHEET* Sheet ) AddMenuItem( PopMenu, ID_POPUP_SCH_ENTER_SHEET, _( "Enter Sheet" ), KiBitmap( enter_sheet_xpm ) ); PopMenu->AppendSeparator(); - msg = AddHotkeyName( _( "Move" ), g_Schematic_Hokeys_Descr, + msg = AddHotkeyName( _( "Move" ), g_Schematic_Hotkeys_Descr, HK_MOVE_COMPONENT_OR_ITEM ); AddMenuItem( PopMenu, ID_SCH_MOVE_ITEM, msg, KiBitmap( move_xpm ) ); - msg = AddHotkeyName( _( "Drag" ), g_Schematic_Hokeys_Descr, HK_DRAG ); + msg = AddHotkeyName( _( "Drag" ), g_Schematic_Hotkeys_Descr, HK_DRAG ); AddMenuItem( PopMenu, ID_SCH_DRAG_ITEM, msg, KiBitmap( drag_xpm ) ); PopMenu->AppendSeparator(); - msg = AddHotkeyName( _( "Select Items On PCB" ), g_Schematic_Hokeys_Descr, + msg = AddHotkeyName( _( "Select Items On PCB" ), g_Schematic_Hotkeys_Descr, HK_SELECT_ITEMS_ON_PCB ); AddMenuItem( PopMenu, ID_POPUP_SCH_SELECT_ON_PCB, msg, KiBitmap( select_same_sheet_xpm ) ); PopMenu->AppendSeparator(); wxMenu* orientmenu = new wxMenu; - msg = AddHotkeyName( _( "Rotate Clockwise" ), g_Schematic_Hokeys_Descr, HK_ROTATE ); + msg = AddHotkeyName( _( "Rotate Clockwise" ), g_Schematic_Hotkeys_Descr, HK_ROTATE ); AddMenuItem( orientmenu, ID_SCH_ROTATE_CLOCKWISE, msg, KiBitmap( rotate_cw_xpm ) ); AddMenuItem( orientmenu, ID_SCH_ROTATE_COUNTERCLOCKWISE, _( "Rotate Counterclockwise" ), KiBitmap( rotate_ccw_xpm ) ); - msg = AddHotkeyName( _( "Mirror Around Horizontal(X) Axis" ), g_Schematic_Hokeys_Descr, + msg = AddHotkeyName( _( "Mirror Around Horizontal(X) Axis" ), g_Schematic_Hotkeys_Descr, HK_MIRROR_X ); AddMenuItem( orientmenu, ID_SCH_MIRROR_X, msg, KiBitmap( mirror_v_xpm ) ); - msg = AddHotkeyName( _( "Mirror Around Vertical(Y) Axis" ), g_Schematic_Hokeys_Descr, + msg = AddHotkeyName( _( "Mirror Around Vertical(Y) Axis" ), g_Schematic_Hotkeys_Descr, HK_MIRROR_Y ); AddMenuItem( orientmenu, ID_SCH_MIRROR_Y, msg, KiBitmap( mirror_h_xpm ) ); @@ -825,7 +825,7 @@ void AddMenusForHierchicalSheet( wxMenu* PopMenu, SCH_SHEET* Sheet ) } else { - msg = AddHotkeyName( _( "Edit..." ), g_Schematic_Hokeys_Descr, HK_EDIT ); + msg = AddHotkeyName( _( "Edit..." ), g_Schematic_Hotkeys_Descr, HK_EDIT ); AddMenuItem( PopMenu, ID_SCH_EDIT_ITEM, msg, KiBitmap( editor_xpm ) ); AddMenuItem( PopMenu, ID_POPUP_SCH_RESIZE_SHEET, _( "Resize" ), @@ -839,7 +839,7 @@ void AddMenusForHierchicalSheet( wxMenu* PopMenu, SCH_SHEET* Sheet ) KiBitmap( options_pinsheet_xpm ) ); PopMenu->AppendSeparator(); - msg = AddHotkeyName( _( "Delete" ), g_Schematic_Hokeys_Descr, HK_DELETE ); + msg = AddHotkeyName( _( "Delete" ), g_Schematic_Hotkeys_Descr, HK_DELETE ); AddMenuItem( PopMenu, ID_POPUP_SCH_DELETE, msg, KiBitmap( delete_sheet_xpm ) ); } } @@ -851,7 +851,7 @@ void AddMenusForSheetPin( wxMenu* PopMenu, SCH_SHEET_PIN* PinSheet ) if( !PinSheet->GetFlags() ) { - msg = AddHotkeyName( _( "Move" ), g_Schematic_Hokeys_Descr, HK_MOVE_COMPONENT_OR_ITEM ); + msg = AddHotkeyName( _( "Move" ), g_Schematic_Hotkeys_Descr, HK_MOVE_COMPONENT_OR_ITEM ); AddMenuItem( PopMenu, ID_SCH_MOVE_ITEM, msg, KiBitmap( move_xpm ) ); } @@ -880,26 +880,26 @@ void AddMenusForBlock( wxMenu* PopMenu, SCH_EDIT_FRAME* frame ) // a block function. if( frame->GetScreen()->m_BlockLocate.GetCommand() == BLOCK_MOVE ) { - msg = AddHotkeyName( _( "Cut Block" ), g_Schematic_Hokeys_Descr, + msg = AddHotkeyName( _( "Cut Block" ), g_Schematic_Hotkeys_Descr, HK_EDIT_CUT ); AddMenuItem( PopMenu, ID_POPUP_CUT_BLOCK, msg, KiBitmap( cut_xpm ) ); - msg = AddHotkeyName( _( "Copy Block" ), g_Schematic_Hokeys_Descr, + msg = AddHotkeyName( _( "Copy Block" ), g_Schematic_Hotkeys_Descr, HK_EDIT_COPY ); AddMenuItem( PopMenu, ID_POPUP_COPY_BLOCK, msg, KiBitmap( copy_xpm ) ); AddMenuItem( PopMenu, ID_POPUP_DUPLICATE_BLOCK, _( "Duplicate Block" ), KiBitmap( duplicate_xpm ) ); - msg = AddHotkeyName( _( "Drag Block" ), g_Schematic_Hokeys_Descr, + msg = AddHotkeyName( _( "Drag Block" ), g_Schematic_Hotkeys_Descr, HK_MOVEBLOCK_TO_DRAGBLOCK ); AddMenuItem( PopMenu, ID_POPUP_DRAG_BLOCK, msg, KiBitmap( drag_xpm ) ); - msg = AddHotkeyName( _( "Delete Block" ), g_Schematic_Hokeys_Descr, HK_DELETE ); + msg = AddHotkeyName( _( "Delete Block" ), g_Schematic_Hotkeys_Descr, HK_DELETE ); AddMenuItem( PopMenu, ID_POPUP_DELETE_BLOCK, msg, KiBitmap( delete_xpm ) ); - msg = AddHotkeyName( _( "Mirror Block Around Vertical(Y) Axis" ), g_Schematic_Hokeys_Descr, + msg = AddHotkeyName( _( "Mirror Block Around Vertical(Y) Axis" ), g_Schematic_Hotkeys_Descr, HK_MIRROR_Y ); AddMenuItem( PopMenu, ID_SCH_MIRROR_Y, msg, KiBitmap( mirror_h_xpm ) ); msg = AddHotkeyName( _( "Mirror Block Around Horizontal(X) Axis" ), - g_Schematic_Hokeys_Descr, HK_MIRROR_X ); + g_Schematic_Hotkeys_Descr, HK_MIRROR_X ); AddMenuItem( PopMenu, ID_SCH_MIRROR_X, msg, KiBitmap( mirror_v_xpm ) ); - msg = AddHotkeyName( _( "Rotate Block CCW" ), g_Schematic_Hokeys_Descr, HK_ROTATE ); + msg = AddHotkeyName( _( "Rotate Block CCW" ), g_Schematic_Hotkeys_Descr, HK_ROTATE ); AddMenuItem( PopMenu, ID_SCH_ROTATE_CLOCKWISE, msg, KiBitmap( rotate_ccw_xpm ) ); #if 0 @@ -926,26 +926,26 @@ void AddMenusForBitmap( wxMenu* aPopMenu, SCH_BITMAP * aBitmap ) if( aBitmap->GetFlags() == 0 ) { - msg = AddHotkeyName( _( "Move" ), g_Schematic_Hokeys_Descr, + msg = AddHotkeyName( _( "Move" ), g_Schematic_Hotkeys_Descr, HK_MOVE_COMPONENT_OR_ITEM ); AddMenuItem( aPopMenu, ID_SCH_MOVE_ITEM, msg, KiBitmap( move_xpm ) ); } - msg = AddHotkeyName( _( "Rotate Counterclockwise" ), g_Schematic_Hokeys_Descr, HK_ROTATE ); + msg = AddHotkeyName( _( "Rotate Counterclockwise" ), g_Schematic_Hotkeys_Descr, HK_ROTATE ); AddMenuItem( aPopMenu, ID_SCH_ROTATE_CLOCKWISE, msg, KiBitmap( rotate_ccw_xpm ) ); - msg = AddHotkeyName( _( "Mirror Around Horizontal(X) Axis" ), g_Schematic_Hokeys_Descr, + msg = AddHotkeyName( _( "Mirror Around Horizontal(X) Axis" ), g_Schematic_Hotkeys_Descr, HK_MIRROR_X ); AddMenuItem( aPopMenu, ID_SCH_MIRROR_X, msg, KiBitmap( mirror_v_xpm ) ); - msg = AddHotkeyName( _( "Mirror Around Vertical(Y) Axis" ), g_Schematic_Hokeys_Descr, + msg = AddHotkeyName( _( "Mirror Around Vertical(Y) Axis" ), g_Schematic_Hotkeys_Descr, HK_MIRROR_Y ); AddMenuItem( aPopMenu, ID_SCH_MIRROR_Y, msg, KiBitmap( mirror_h_xpm ) ); - msg = AddHotkeyName( _( "Edit Image..." ), g_Schematic_Hokeys_Descr, HK_EDIT ); + msg = AddHotkeyName( _( "Edit Image..." ), g_Schematic_Hotkeys_Descr, HK_EDIT ); AddMenuItem( aPopMenu, ID_SCH_EDIT_ITEM, msg, KiBitmap( image_xpm ) ); if( aBitmap->GetFlags() == 0 ) { aPopMenu->AppendSeparator(); - msg = AddHotkeyName( _( "Delete" ), g_Schematic_Hokeys_Descr, HK_DELETE ); + msg = AddHotkeyName( _( "Delete" ), g_Schematic_Hotkeys_Descr, HK_DELETE ); AddMenuItem( aPopMenu, ID_POPUP_SCH_DELETE, msg, KiBitmap( delete_xpm ) ); } } @@ -957,7 +957,7 @@ void AddMenusForBusEntry( wxMenu* aPopMenu, SCH_BUS_ENTRY_BASE* aBusEntry ) if( !aBusEntry->GetFlags() ) { - msg = AddHotkeyName( _( "Move Bus Entry" ), g_Schematic_Hokeys_Descr, + msg = AddHotkeyName( _( "Move Bus Entry" ), g_Schematic_Hotkeys_Descr, HK_MOVE_COMPONENT_OR_ITEM ); AddMenuItem( aPopMenu, ID_SCH_MOVE_ITEM, msg, KiBitmap( move_xpm ) ); } @@ -969,6 +969,6 @@ void AddMenusForBusEntry( wxMenu* aPopMenu, SCH_BUS_ENTRY_BASE* aBusEntry ) AddMenuItem( aPopMenu, ID_POPUP_SCH_ENTRY_SELECT_ANTISLASH, _( "Set Bus Entry Shape \\" ), KiBitmap( change_entry_orient_xpm ) ); - msg = AddHotkeyName( _( "Delete Bus Entry" ), g_Schematic_Hokeys_Descr, HK_DELETE ); + msg = AddHotkeyName( _( "Delete Bus Entry" ), g_Schematic_Hotkeys_Descr, HK_DELETE ); AddMenuItem( aPopMenu, ID_POPUP_SCH_DELETE, msg, KiBitmap( delete_xpm ) ); } diff --git a/eeschema/sch_edit_frame.cpp b/eeschema/sch_edit_frame.cpp index 78fade11b5..fd89b304ef 100644 --- a/eeschema/sch_edit_frame.cpp +++ b/eeschema/sch_edit_frame.cpp @@ -380,7 +380,7 @@ SCH_EDIT_FRAME::SCH_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ): m_printMonochrome = true; m_printSheetReference = true; SetShowPageLimits( true ); - m_hotkeysDescrList = g_Schematic_Hokeys_Descr; + m_hotkeysDescrList = g_Schematic_Hotkeys_Descr; m_dlgFindReplace = NULL; m_findReplaceData = new wxFindReplaceData( wxFR_DOWN ); m_findReplaceStatus = new wxString( wxEmptyString ); diff --git a/eeschema/tool_sch.cpp b/eeschema/tool_sch.cpp index b07cdeecf9..eaeaef06ad 100644 --- a/eeschema/tool_sch.cpp +++ b/eeschema/tool_sch.cpp @@ -91,16 +91,16 @@ void SCH_EDIT_FRAME::ReCreateHToolbar() KiScaledSeparator( m_mainToolBar, this ); - msg = AddHotkeyName( HELP_UNDO, g_Schematic_Hokeys_Descr, HK_UNDO, IS_COMMENT ); + msg = AddHotkeyName( HELP_UNDO, g_Schematic_Hotkeys_Descr, HK_UNDO, IS_COMMENT ); m_mainToolBar->AddTool( wxID_UNDO, wxEmptyString, KiScaledBitmap( undo_xpm, this ), msg ); - msg = AddHotkeyName( HELP_REDO, g_Schematic_Hokeys_Descr, HK_REDO, IS_COMMENT ); + msg = AddHotkeyName( HELP_REDO, g_Schematic_Hotkeys_Descr, HK_REDO, IS_COMMENT ); m_mainToolBar->AddTool( wxID_REDO, wxEmptyString, KiScaledBitmap( redo_xpm, this ), msg ); KiScaledSeparator( m_mainToolBar, this ); - msg = AddHotkeyName( HELP_FIND, g_Schematic_Hokeys_Descr, HK_FIND_ITEM, IS_COMMENT ); + msg = AddHotkeyName( HELP_FIND, g_Schematic_Hotkeys_Descr, HK_FIND_ITEM, IS_COMMENT ); m_mainToolBar->AddTool( ID_FIND_ITEMS, wxEmptyString, KiScaledBitmap( find_xpm, this ), msg ); m_mainToolBar->AddTool( wxID_REPLACE, wxEmptyString, KiScaledBitmap( find_replace_xpm, this ), @@ -110,17 +110,17 @@ void SCH_EDIT_FRAME::ReCreateHToolbar() KiScaledSeparator( m_mainToolBar, this ); - msg = AddHotkeyName( HELP_ZOOM_REDRAW, g_Schematic_Hokeys_Descr, HK_ZOOM_REDRAW, IS_COMMENT ); + msg = AddHotkeyName( HELP_ZOOM_REDRAW, g_Schematic_Hotkeys_Descr, HK_ZOOM_REDRAW, IS_COMMENT ); m_mainToolBar->AddTool( ID_ZOOM_REDRAW, wxEmptyString, KiScaledBitmap( zoom_redraw_xpm, this ), msg ); - msg = AddHotkeyName( HELP_ZOOM_IN, g_Schematic_Hokeys_Descr, HK_ZOOM_IN, IS_COMMENT ); + msg = AddHotkeyName( HELP_ZOOM_IN, g_Schematic_Hotkeys_Descr, HK_ZOOM_IN, IS_COMMENT ); m_mainToolBar->AddTool( ID_ZOOM_IN, wxEmptyString, KiScaledBitmap( zoom_in_xpm, this ), msg ); - msg = AddHotkeyName( HELP_ZOOM_OUT, g_Schematic_Hokeys_Descr, HK_ZOOM_OUT, IS_COMMENT ); + msg = AddHotkeyName( HELP_ZOOM_OUT, g_Schematic_Hotkeys_Descr, HK_ZOOM_OUT, IS_COMMENT ); m_mainToolBar->AddTool( ID_ZOOM_OUT, wxEmptyString, KiScaledBitmap( zoom_out_xpm, this ), msg ); - msg = AddHotkeyName( HELP_ZOOM_FIT, g_Schematic_Hokeys_Descr, HK_ZOOM_AUTO, IS_COMMENT ); + msg = AddHotkeyName( HELP_ZOOM_FIT, g_Schematic_Hotkeys_Descr, HK_ZOOM_AUTO, IS_COMMENT ); m_mainToolBar->AddTool( ID_ZOOM_PAGE, wxEmptyString, KiScaledBitmap( zoom_fit_in_page_xpm, this ), msg ); diff --git a/eeschema/tool_viewlib.cpp b/eeschema/tool_viewlib.cpp index a62b51b68d..52c928b9f2 100644 --- a/eeschema/tool_viewlib.cpp +++ b/eeschema/tool_viewlib.cpp @@ -62,22 +62,22 @@ void LIB_VIEW_FRAME::ReCreateHToolbar() _( "Display next symbol" ) ); m_mainToolBar->AddSeparator(); - msg = AddHotkeyName( _( "Zoom in" ), g_Viewlib_Hokeys_Descr, + msg = AddHotkeyName( _( "Zoom in" ), g_Viewlib_Hotkeys_Descr, HK_ZOOM_IN, IS_COMMENT ); m_mainToolBar->AddTool( ID_ZOOM_IN, wxEmptyString, KiScaledBitmap( zoom_in_xpm, this ), msg ); - msg = AddHotkeyName( _( "Zoom out" ), g_Viewlib_Hokeys_Descr, + msg = AddHotkeyName( _( "Zoom out" ), g_Viewlib_Hotkeys_Descr, HK_ZOOM_OUT, IS_COMMENT ); m_mainToolBar->AddTool( ID_ZOOM_OUT, wxEmptyString, KiScaledBitmap( zoom_out_xpm, this ), msg ); - msg = AddHotkeyName( _( "Redraw view" ), g_Viewlib_Hokeys_Descr, + msg = AddHotkeyName( _( "Redraw view" ), g_Viewlib_Hotkeys_Descr, HK_ZOOM_REDRAW, IS_COMMENT ); m_mainToolBar->AddTool( ID_ZOOM_REDRAW, wxEmptyString, KiScaledBitmap( zoom_redraw_xpm, this ), msg ); - msg = AddHotkeyName( _( "Zoom to fit symbol" ), g_Viewlib_Hokeys_Descr, + msg = AddHotkeyName( _( "Zoom to fit symbol" ), g_Viewlib_Hotkeys_Descr, HK_ZOOM_AUTO, IS_COMMENT ); m_mainToolBar->AddTool( ID_ZOOM_PAGE, wxEmptyString, KiScaledBitmap( zoom_fit_in_page_xpm, this ), msg ); @@ -147,19 +147,19 @@ void LIB_VIEW_FRAME::ReCreateMenuBar( void ) // View menu wxMenu* viewMenu = new wxMenu; - text = AddHotkeyName( _( "Zoom &In" ), g_Viewlib_Hokeys_Descr, + text = AddHotkeyName( _( "Zoom &In" ), g_Viewlib_Hotkeys_Descr, HK_ZOOM_IN, IS_ACCELERATOR ); AddMenuItem( viewMenu, ID_ZOOM_IN, text, HELP_ZOOM_IN, KiBitmap( zoom_in_xpm ) ); - text = AddHotkeyName( _( "Zoom &Out" ), g_Viewlib_Hokeys_Descr, + text = AddHotkeyName( _( "Zoom &Out" ), g_Viewlib_Hotkeys_Descr, HK_ZOOM_OUT, IS_ACCELERATOR ); AddMenuItem( viewMenu, ID_ZOOM_OUT, text, HELP_ZOOM_OUT, KiBitmap( zoom_out_xpm ) ); - text = AddHotkeyName( _( "&Zoom to Fit" ), g_Viewlib_Hokeys_Descr, HK_ZOOM_AUTO ); + text = AddHotkeyName( _( "&Zoom to Fit" ), g_Viewlib_Hotkeys_Descr, HK_ZOOM_AUTO ); AddMenuItem( viewMenu, ID_ZOOM_PAGE, text, _( "Zoom to fit symbol" ), KiBitmap( zoom_fit_in_page_xpm ) ); - text = AddHotkeyName( _( "&Redraw" ), g_Viewlib_Hokeys_Descr, HK_ZOOM_REDRAW ); + text = AddHotkeyName( _( "&Redraw" ), g_Viewlib_Hotkeys_Descr, HK_ZOOM_REDRAW ); AddMenuItem( viewMenu, ID_ZOOM_REDRAW, text, HELP_ZOOM_REDRAW, KiBitmap( zoom_redraw_xpm ) ); diff --git a/eeschema/viewlib_frame.cpp b/eeschema/viewlib_frame.cpp index 116dd7c8a3..49daa2488e 100644 --- a/eeschema/viewlib_frame.cpp +++ b/eeschema/viewlib_frame.cpp @@ -126,7 +126,7 @@ LIB_VIEW_FRAME::LIB_VIEW_FRAME( KIWAY* aKiway, wxWindow* aParent, FRAME_T aFrame icon.CopyFromBitmap( KiBitmap( library_browse_xpm ) ); SetIcon( icon ); - m_hotkeysDescrList = g_Viewlib_Hokeys_Descr; + m_hotkeysDescrList = g_Viewlib_Hotkeys_Descr; m_libListWidth = 200; m_cmpListWidth = 300; m_listPowerCmpOnly = false; diff --git a/gerbview/gerbview.cpp b/gerbview/gerbview.cpp index ae6f4147d4..d50151aa5f 100644 --- a/gerbview/gerbview.cpp +++ b/gerbview/gerbview.cpp @@ -128,7 +128,7 @@ bool IFACE::OnKifaceStart( PGM_BASE* aProgram, int aCtlBits ) // Must be called before creating the main frame in order to // display the real hotkeys in menus or tool tips - ReadHotkeyConfig( GERBVIEW_FRAME_NAME, GerbviewHokeysDescr ); + ReadHotkeyConfig( GERBVIEW_FRAME_NAME, GerbviewHotkeysDescr ); return true; } diff --git a/gerbview/gerbview_config.cpp b/gerbview/gerbview_config.cpp index 5580efd74d..12c0d5e132 100644 --- a/gerbview/gerbview_config.cpp +++ b/gerbview/gerbview_config.cpp @@ -46,12 +46,12 @@ void GERBVIEW_FRAME::Process_Config( wxCommandEvent& event ) switch( id ) { case wxID_PREFERENCES: - ShowPreferences( GerbviewHokeysDescr, GerbviewHokeysDescr, wxT( "gerbview" ) ); + ShowPreferences( GerbviewHotkeysDescr, GerbviewHotkeysDescr, wxT( "gerbview" ) ); break; case ID_PREFERENCES_HOTKEY_SHOW_CURRENT_LIST: // Display current hotkey list for GerbView. - DisplayHotkeyList( this, GerbviewHokeysDescr ); + DisplayHotkeyList( this, GerbviewHotkeysDescr ); break; default: diff --git a/gerbview/gerbview_frame.cpp b/gerbview/gerbview_frame.cpp index d2e5f1178f..31280fcf0d 100644 --- a/gerbview/gerbview_frame.cpp +++ b/gerbview/gerbview_frame.cpp @@ -86,7 +86,7 @@ GERBVIEW_FRAME::GERBVIEW_FRAME( KIWAY* aKiway, wxWindow* aParent ): m_showAxis = true; // true to show X and Y axis on screen m_showBorderAndTitleBlock = false; // true for reference drawings. - m_hotkeysDescrList = GerbviewHokeysDescr; + m_hotkeysDescrList = GerbviewHotkeysDescr; m_SelLayerBox = NULL; m_DCodeSelector = NULL; m_SelComponentBox = nullptr; diff --git a/gerbview/hotkeys.cpp b/gerbview/hotkeys.cpp index d4345fd207..9a8ef0b0e6 100644 --- a/gerbview/hotkeys.cpp +++ b/gerbview/hotkeys.cpp @@ -133,7 +133,7 @@ EDA_HOTKEY* gerbviewHotkeyList[] = { static wxString gerbviewSectionTag( wxT( "[gerbview]" ) ); static wxString gerbviewSectionTitle( _HKI( "Gerbview Hotkeys" ) ); -struct EDA_HOTKEY_CONFIG GerbviewHokeysDescr[] = +struct EDA_HOTKEY_CONFIG GerbviewHotkeysDescr[] = { { &gerbviewSectionTag, gerbviewHotkeyList, &gerbviewSectionTitle }, { NULL, NULL, NULL } @@ -172,7 +172,7 @@ bool GERBVIEW_FRAME::OnHotKey( wxDC* aDC, int aHotkeyCode, const wxPoint& aPosit return false; case HK_HELP: // Display Current hotkey list - DisplayHotkeyList( this, GerbviewHokeysDescr ); + DisplayHotkeyList( this, GerbviewHotkeysDescr ); break; case HK_ZOOM_IN: diff --git a/gerbview/hotkeys.h b/gerbview/hotkeys.h index 376b05b20a..b110e4db02 100644 --- a/gerbview/hotkeys.h +++ b/gerbview/hotkeys.h @@ -50,6 +50,6 @@ enum hotkey_id_commnand { }; // List of hotkey descriptors for GerbView. -extern struct EDA_HOTKEY_CONFIG GerbviewHokeysDescr[]; +extern struct EDA_HOTKEY_CONFIG GerbviewHotkeysDescr[]; #endif // GERBVIEW_KOTKEYS_H_ diff --git a/gerbview/menubar.cpp b/gerbview/menubar.cpp index 4151b80200..a3f471598d 100644 --- a/gerbview/menubar.cpp +++ b/gerbview/menubar.cpp @@ -200,22 +200,22 @@ void GERBVIEW_FRAME::ReCreateMenuBar() * in other words HK_ZOOM_IN and HK_ZOOM_OUT *are NOT* accelerators * for Zoom in and Zoom out sub menus */ - text = AddHotkeyName( _( "Zoom &In" ), GerbviewHokeysDescr, + text = AddHotkeyName( _( "Zoom &In" ), GerbviewHotkeysDescr, HK_ZOOM_IN, IS_ACCELERATOR ); AddMenuItem( viewMenu, ID_ZOOM_IN, text, _( "Zoom in" ), KiBitmap( zoom_in_xpm ) ); - text = AddHotkeyName( _( "Zoom &Out" ), GerbviewHokeysDescr, + text = AddHotkeyName( _( "Zoom &Out" ), GerbviewHotkeysDescr, HK_ZOOM_OUT, IS_ACCELERATOR ); AddMenuItem( viewMenu, ID_ZOOM_OUT, text, _( "Zoom out" ), KiBitmap( zoom_out_xpm ) ); - text = AddHotkeyName( _( "Zoom to &Fit" ), GerbviewHokeysDescr, HK_ZOOM_AUTO ); + text = AddHotkeyName( _( "Zoom to &Fit" ), GerbviewHotkeysDescr, HK_ZOOM_AUTO ); AddMenuItem( viewMenu, ID_ZOOM_PAGE, text, _( "Zoom to fit" ), KiBitmap( zoom_fit_in_page_xpm ) ); - text = AddHotkeyName( _( "Zoom to Selection" ), GerbviewHokeysDescr, HK_ZOOM_SELECTION ); + text = AddHotkeyName( _( "Zoom to Selection" ), GerbviewHotkeysDescr, HK_ZOOM_SELECTION ); AddMenuItem( viewMenu, ID_ZOOM_SELECTION, text, KiBitmap( zoom_area_xpm ), wxITEM_CHECK ); - text = AddHotkeyName( _( "&Redraw" ), GerbviewHokeysDescr, HK_ZOOM_REDRAW ); + text = AddHotkeyName( _( "&Redraw" ), GerbviewHotkeysDescr, HK_ZOOM_REDRAW ); AddMenuItem( viewMenu, ID_ZOOM_REDRAW, text, _( "Refresh screen" ), KiBitmap( zoom_redraw_xpm ) ); @@ -246,27 +246,27 @@ void GERBVIEW_FRAME::ReCreateMenuBar() viewMenu->AppendSeparator(); - text = AddHotkeyName( _( "Sketch F&lashed Items" ), GerbviewHokeysDescr, HK_GBR_FLASHED_DISPLAY_MODE ); + text = AddHotkeyName( _( "Sketch F&lashed Items" ), GerbviewHotkeysDescr, HK_GBR_FLASHED_DISPLAY_MODE ); AddMenuItem( viewMenu, ID_TB_OPTIONS_SHOW_FLASHED_ITEMS_SKETCH, text, _( "Show flashed items in outline mode" ), KiBitmap( pad_sketch_xpm ), wxITEM_CHECK ); - text = AddHotkeyName( _( "Sketch &Lines" ), GerbviewHokeysDescr, HK_GBR_LINES_DISPLAY_MODE ); + text = AddHotkeyName( _( "Sketch &Lines" ), GerbviewHotkeysDescr, HK_GBR_LINES_DISPLAY_MODE ); AddMenuItem( viewMenu, ID_TB_OPTIONS_SHOW_LINES_SKETCH, text, _( "Show lines in outline mode" ), KiBitmap( showtrack_xpm ), wxITEM_CHECK ); - text = AddHotkeyName( _( "Sketch Pol&ygons" ), GerbviewHokeysDescr, HK_GBR_POLYGON_DISPLAY_MODE ); + text = AddHotkeyName( _( "Sketch Pol&ygons" ), GerbviewHotkeysDescr, HK_GBR_POLYGON_DISPLAY_MODE ); AddMenuItem( viewMenu, ID_TB_OPTIONS_SHOW_POLYGONS_SKETCH, text, _( "Show polygons in outline mode" ), KiBitmap( opt_show_polygon_xpm ), wxITEM_CHECK ); - text = AddHotkeyName( _( "Show &DCodes" ), GerbviewHokeysDescr, HK_GBR_DCODE_DISPLAY_ONOFF ); + text = AddHotkeyName( _( "Show &DCodes" ), GerbviewHotkeysDescr, HK_GBR_DCODE_DISPLAY_ONOFF ); AddMenuItem( viewMenu, ID_TB_OPTIONS_SHOW_DCODES, text, _( "Show or hide DCodes" ), KiBitmap( show_dcodenumber_xpm ), wxITEM_CHECK ); - text = AddHotkeyName( _( "Show &Negative Objects" ), GerbviewHokeysDescr, HK_GBR_NEGATIVE_DISPLAY_ONOFF ); + text = AddHotkeyName( _( "Show &Negative Objects" ), GerbviewHotkeysDescr, HK_GBR_NEGATIVE_DISPLAY_ONOFF ); AddMenuItem( viewMenu, ID_TB_OPTIONS_SHOW_NEGATIVE_ITEMS, text, _( "Show negative objects in ghost color" ), KiBitmap( gerbview_show_negative_objects_xpm ), wxITEM_CHECK ); @@ -277,7 +277,7 @@ void GERBVIEW_FRAME::ReCreateMenuBar() _( "Show in Differential Mode" ), _( "Show layers in differential mode" ), KiBitmap( gbr_select_mode2_xpm ), wxITEM_CHECK ); - text = AddHotkeyName( _( "Show in High Contrast" ), GerbviewHokeysDescr, HK_SWITCH_HIGHCONTRAST_MODE ); + text = AddHotkeyName( _( "Show in High Contrast" ), GerbviewHotkeysDescr, HK_SWITCH_HIGHCONTRAST_MODE ); AddMenuItem( viewMenu, ID_TB_OPTIONS_HIGH_CONTRAST_MODE, text, _( "Show in high contrast mode" ), KiBitmap( contrast_mode_xpm ), wxITEM_CHECK ); @@ -309,18 +309,18 @@ void GERBVIEW_FRAME::ReCreateMenuBar() if( ADVANCED_CFG::GetCfg().AllowLegacyCanvas() ) { - text = AddHotkeyName( _( "Legacy Tool&set" ), GerbviewHokeysDescr, HK_CANVAS_LEGACY ); + text = AddHotkeyName( _( "Legacy Tool&set" ), GerbviewHotkeysDescr, HK_CANVAS_LEGACY ); AddMenuItem( configMenu, ID_MENU_CANVAS_LEGACY, text, _( "Use Legacy Toolset (not all features will be available)" ), KiBitmap( tools_xpm ), wxITEM_RADIO ); } - text = AddHotkeyName( _( "Modern Toolset (&Accelerated)" ), GerbviewHokeysDescr, HK_CANVAS_OPENGL ); + text = AddHotkeyName( _( "Modern Toolset (&Accelerated)" ), GerbviewHotkeysDescr, HK_CANVAS_OPENGL ); AddMenuItem( configMenu, ID_MENU_CANVAS_OPENGL, text, _( "Use Modern Toolset with hardware-accelerated graphics (recommended)" ), KiBitmap( tools_xpm ), wxITEM_RADIO ); - text = AddHotkeyName( _( "Modern Toolset (Fallba&ck)" ), GerbviewHokeysDescr, HK_CANVAS_CAIRO ); + text = AddHotkeyName( _( "Modern Toolset (Fallba&ck)" ), GerbviewHotkeysDescr, HK_CANVAS_CAIRO ); AddMenuItem( configMenu, ID_MENU_CANVAS_CAIRO, text, _( "Use Modern Toolset with software graphics (fall-back)" ), KiBitmap( tools_xpm ), wxITEM_RADIO ); @@ -357,7 +357,7 @@ void GERBVIEW_FRAME::ReCreateMenuBar() _( "Open the GerbView Manual" ), KiBitmap( online_help_xpm ) ); - text = AddHotkeyName( _( "&List Hotkeys..." ), GerbviewHokeysDescr, HK_HELP ); + text = AddHotkeyName( _( "&List Hotkeys..." ), GerbviewHotkeysDescr, HK_HELP ); AddMenuItem( helpMenu, ID_PREFERENCES_HOTKEY_SHOW_CURRENT_LIST, text, _( "Displays the current hotkeys list and corresponding commands" ), KiBitmap( hotkeys_xpm ) ); diff --git a/gerbview/toolbars_gerber.cpp b/gerbview/toolbars_gerber.cpp index 32e3a513df..8ca4daecd8 100644 --- a/gerbview/toolbars_gerber.cpp +++ b/gerbview/toolbars_gerber.cpp @@ -72,16 +72,16 @@ void GERBVIEW_FRAME::ReCreateHToolbar( void ) _( "Print layers" ) ); KiScaledSeparator( m_mainToolBar, this ); - msg = AddHotkeyName( _( "Redraw view" ), GerbviewHokeysDescr, HK_ZOOM_REDRAW, IS_COMMENT ); + msg = AddHotkeyName( _( "Redraw view" ), GerbviewHotkeysDescr, HK_ZOOM_REDRAW, IS_COMMENT ); m_mainToolBar->AddTool( ID_ZOOM_REDRAW, wxEmptyString, KiScaledBitmap( zoom_redraw_xpm, this ), msg ); - msg = AddHotkeyName( _( "Zoom in" ), GerbviewHokeysDescr, HK_ZOOM_IN, IS_COMMENT ); + msg = AddHotkeyName( _( "Zoom in" ), GerbviewHotkeysDescr, HK_ZOOM_IN, IS_COMMENT ); m_mainToolBar->AddTool( ID_ZOOM_IN, wxEmptyString, KiScaledBitmap( zoom_in_xpm, this ), msg ); - msg = AddHotkeyName( _( "Zoom out" ), GerbviewHokeysDescr, HK_ZOOM_OUT, IS_COMMENT ); + msg = AddHotkeyName( _( "Zoom out" ), GerbviewHotkeysDescr, HK_ZOOM_OUT, IS_COMMENT ); m_mainToolBar->AddTool( ID_ZOOM_OUT, wxEmptyString, KiScaledBitmap( zoom_out_xpm, this ), msg ); - msg = AddHotkeyName( _( "Zoom to fit" ), GerbviewHokeysDescr, HK_ZOOM_AUTO, IS_COMMENT ); + msg = AddHotkeyName( _( "Zoom to fit" ), GerbviewHotkeysDescr, HK_ZOOM_AUTO, IS_COMMENT ); m_mainToolBar->AddTool( ID_ZOOM_PAGE, wxEmptyString, KiScaledBitmap( zoom_fit_in_page_xpm, this ), msg ); diff --git a/kicad/kicad.cpp b/kicad/kicad.cpp index c5b9c2350e..2ca33d77ee 100644 --- a/kicad/kicad.cpp +++ b/kicad/kicad.cpp @@ -127,8 +127,8 @@ bool PGM_KICAD::OnPgmInit() // Must be called before creating the main frame in order to // display the real hotkeys in menus or tool tips - extern struct EDA_HOTKEY_CONFIG kicad_Manager_Hokeys_Descr[]; - ReadHotkeyConfig( KICAD_MANAGER_FRAME_NAME, kicad_Manager_Hokeys_Descr ); + extern struct EDA_HOTKEY_CONFIG kicad_Manager_Hotkeys_Descr[]; + ReadHotkeyConfig( KICAD_MANAGER_FRAME_NAME, kicad_Manager_Hotkeys_Descr ); KICAD_MANAGER_FRAME* frame = new KICAD_MANAGER_FRAME( NULL, wxT( "KiCad" ), wxDefaultPosition, wxSize( 775, -1 ) ); diff --git a/kicad/kicad.h b/kicad/kicad.h index 79b47195f7..4a19375412 100644 --- a/kicad/kicad.h +++ b/kicad/kicad.h @@ -299,7 +299,7 @@ private: wxAuiToolBar* m_VToolBar; // Vertical toolbar (not used) int m_leftWinWidth; - EDA_HOTKEY_CONFIG* m_manager_Hokeys_Descr; + EDA_HOTKEY_CONFIG* m_manager_Hotkeys_Descr; void language_change( wxCommandEvent& event ); diff --git a/kicad/mainframe.cpp b/kicad/mainframe.cpp index 4d4ec27f49..2fa62d3a10 100644 --- a/kicad/mainframe.cpp +++ b/kicad/mainframe.cpp @@ -61,7 +61,7 @@ KICAD_MANAGER_FRAME::KICAD_MANAGER_FRAME( wxWindow* parent, { m_active_project = false; m_leftWinWidth = 60; - m_manager_Hokeys_Descr = NULL; + m_manager_Hotkeys_Descr = NULL; // Create the status line (bottom of the frame) static const int dims[3] = { -1, -1, 100 }; @@ -560,7 +560,7 @@ void KICAD_MANAGER_FRAME::PrintPrjInfo() void KICAD_MANAGER_FRAME::OnShowHotkeys( wxCommandEvent& event ) { - DisplayHotkeyList( this, m_manager_Hokeys_Descr ); + DisplayHotkeyList( this, m_manager_Hotkeys_Descr ); } @@ -587,5 +587,5 @@ void KICAD_MANAGER_FRAME::OnEditFpLibTable( wxCommandEvent& aEvent ) void KICAD_MANAGER_FRAME::OnPreferences( wxCommandEvent& aEvent ) { - ShowPreferences( m_manager_Hokeys_Descr, m_manager_Hokeys_Descr, wxT( "kicad" ) ); + ShowPreferences( m_manager_Hotkeys_Descr, m_manager_Hotkeys_Descr, wxT( "kicad" ) ); } diff --git a/kicad/menubar.cpp b/kicad/menubar.cpp index 1824803045..ccb0a1c5f2 100644 --- a/kicad/menubar.cpp +++ b/kicad/menubar.cpp @@ -173,7 +173,7 @@ EDA_HOTKEY* common_Hotkey_List[] = // here we have only one section. static wxString sectionTitle( _HKI( "Kicad Manager Hotkeys" ) ); -struct EDA_HOTKEY_CONFIG kicad_Manager_Hokeys_Descr[] = { +struct EDA_HOTKEY_CONFIG kicad_Manager_Hotkeys_Descr[] = { { &g_CommonSectionTag, common_Hotkey_List, §ionTitle }, { NULL, NULL, NULL } }; @@ -189,7 +189,7 @@ void KICAD_MANAGER_FRAME::ReCreateMenuBar() static wxMenu* openRecentMenu; // Open Recent submenu, // static to remember this menu - m_manager_Hokeys_Descr = kicad_Manager_Hokeys_Descr; + m_manager_Hotkeys_Descr = kicad_Manager_Hotkeys_Descr; // wxWidgets handles the Mac Application menu behind the scenes, but that means // we always have to start from scratch with a new wxMenuBar. @@ -208,12 +208,12 @@ void KICAD_MANAGER_FRAME::ReCreateMenuBar() // New project creation wxMenu* newprjSubMenu = new wxMenu(); - msg = AddHotkeyName( _( "&Project..." ), kicad_Manager_Hokeys_Descr, HK_NEW ); + msg = AddHotkeyName( _( "&Project..." ), kicad_Manager_Hotkeys_Descr, HK_NEW ); AddMenuItem( newprjSubMenu, ID_NEW_PROJECT, msg, _( "Create new blank project" ), KiBitmap( new_project_xpm ) ); msg = AddHotkeyName( _( "Project from &Template..." ), - kicad_Manager_Hokeys_Descr, HK_NEW_PRJ_TEMPLATE ); + kicad_Manager_Hotkeys_Descr, HK_NEW_PRJ_TEMPLATE ); AddMenuItem( newprjSubMenu, ID_NEW_PROJECT_FROM_TEMPLATE, msg, _( "Create new project from template" ), KiBitmap( new_project_with_template_xpm ) ); @@ -224,7 +224,7 @@ void KICAD_MANAGER_FRAME::ReCreateMenuBar() KiBitmap( new_project_xpm ) ); // Open - msg = AddHotkeyName( _( "&Open Project..." ), kicad_Manager_Hokeys_Descr, HK_OPEN ); + msg = AddHotkeyName( _( "&Open Project..." ), kicad_Manager_Hotkeys_Descr, HK_OPEN ); AddMenuItem( fileMenu, ID_LOAD_PROJECT, msg, _( "Open an existing project" ), KiBitmap( open_project_xpm ) ); @@ -243,7 +243,7 @@ void KICAD_MANAGER_FRAME::ReCreateMenuBar() // (Kicad manager does not save any info in .pro file) #if 0 // Save - msg = AddHotkeyName( _( "&Save" ), kicad_Manager_Hokeys_Descr, HK_SAVE ); + msg = AddHotkeyName( _( "&Save" ), kicad_Manager_Hotkeys_Descr, HK_SAVE ); AddMenuItem( fileMenu, ID_SAVE_PROJECT, msg, _( "Save current project" ), KiBitmap( save_project_xpm ) ); @@ -294,7 +294,7 @@ void KICAD_MANAGER_FRAME::ReCreateMenuBar() wxMenu* viewMenu = new wxMenu(); // Refresh project tree - msg = AddHotkeyName( _( "&Refresh" ), kicad_Manager_Hokeys_Descr, HK_REFRESH ); + msg = AddHotkeyName( _( "&Refresh" ), kicad_Manager_Hotkeys_Descr, HK_REFRESH ); AddMenuItem( viewMenu, ID_PROJECT_TREE_REFRESH, msg, _( "Refresh project tree" ), KiBitmap( reload_xpm ) ); @@ -364,37 +364,37 @@ void KICAD_MANAGER_FRAME::ReCreateMenuBar() // Menu Tools: wxMenu* toolsMenu = new wxMenu; - msg = AddHotkeyName( _( "Edit Schematic" ), kicad_Manager_Hokeys_Descr, HK_RUN_EESCHEMA ); + msg = AddHotkeyName( _( "Edit Schematic" ), kicad_Manager_Hotkeys_Descr, HK_RUN_EESCHEMA ); AddMenuItem( toolsMenu, ID_TO_SCH, msg, KiBitmap( eeschema_xpm ) ); msg = AddHotkeyName( _( "Edit Schematic Symbols" ), - kicad_Manager_Hokeys_Descr, HK_RUN_LIBEDIT ); + kicad_Manager_Hotkeys_Descr, HK_RUN_LIBEDIT ); AddMenuItem( toolsMenu, ID_TO_SCH_LIB_EDITOR, msg, KiBitmap( libedit_xpm ) ); msg = AddHotkeyName( _( "Edit PCB" ), - kicad_Manager_Hokeys_Descr, HK_RUN_PCBNEW ); + kicad_Manager_Hotkeys_Descr, HK_RUN_PCBNEW ); AddMenuItem( toolsMenu, ID_TO_PCB, msg, KiBitmap( pcbnew_xpm ) ); msg = AddHotkeyName( _( "Edit PCB Footprints" ), - kicad_Manager_Hokeys_Descr, HK_RUN_FPEDITOR ); + kicad_Manager_Hotkeys_Descr, HK_RUN_FPEDITOR ); AddMenuItem( toolsMenu, ID_TO_PCB_FP_EDITOR, msg, KiBitmap( module_editor_xpm ) ); msg = AddHotkeyName( _( "View Gerber Files" ), - kicad_Manager_Hokeys_Descr, HK_RUN_GERBVIEW ); + kicad_Manager_Hotkeys_Descr, HK_RUN_GERBVIEW ); AddMenuItem( toolsMenu, ID_TO_GERBVIEW, msg, KiBitmap( icon_gerbview_small_xpm ) ); msg = AddHotkeyName( _( "Convert Image" ), - kicad_Manager_Hokeys_Descr, HK_RUN_BM2COMPONENT ); + kicad_Manager_Hotkeys_Descr, HK_RUN_BM2COMPONENT ); AddMenuItem( toolsMenu, ID_TO_BITMAP_CONVERTER, msg, _( "Convert bitmap images to schematic or PCB components." ), KiBitmap( bitmap2component_xpm ) ); - msg = AddHotkeyName( _( "Calculator Tools" ), kicad_Manager_Hokeys_Descr, HK_RUN_PCBCALCULATOR ); + msg = AddHotkeyName( _( "Calculator Tools" ), kicad_Manager_Hotkeys_Descr, HK_RUN_PCBCALCULATOR ); AddMenuItem( toolsMenu, ID_TO_PCB_CALCULATOR, msg, _( "Run component calculations, track width calculations, etc." ), KiBitmap( calculator_xpm ) ); - msg = AddHotkeyName( _( "Edit Worksheet" ), kicad_Manager_Hokeys_Descr, HK_RUN_PLEDITOR ); + msg = AddHotkeyName( _( "Edit Worksheet" ), kicad_Manager_Hotkeys_Descr, HK_RUN_PLEDITOR ); AddMenuItem( toolsMenu, ID_TO_PL_EDITOR, msg, _( "Edit worksheet graphics and text" ), KiBitmap( pagelayout_load_xpm ) ); @@ -450,7 +450,7 @@ void KICAD_MANAGER_FRAME::ReCreateMenuBar() // Note Use wxMenuBar::SetLabel only after the menubar // has been associated with a frame. (see wxWidgets doc) msg = AddHotkeyName( menuBar->GetLabel( ID_PREFERENCES_HOTKEY_SHOW_CURRENT_LIST ), - kicad_Manager_Hokeys_Descr, HK_HELP ); + kicad_Manager_Hotkeys_Descr, HK_HELP ); menuBar->SetLabel( ID_PREFERENCES_HOTKEY_SHOW_CURRENT_LIST, msg ); } diff --git a/pagelayout_editor/hotkeys.cpp b/pagelayout_editor/hotkeys.cpp index a4e12ec22e..d72221062b 100644 --- a/pagelayout_editor/hotkeys.cpp +++ b/pagelayout_editor/hotkeys.cpp @@ -130,7 +130,7 @@ static wxString commonSectionTitle( _HKI( "Common" ) ); static wxString s_PlEditorSectionTag( wxT( "[pl_editor]" ) ); static wxString s_PlEditorSectionTitle( _HKI( "Page Layout Editor" ) ); -struct EDA_HOTKEY_CONFIG PlEditorHokeysDescr[] = +struct EDA_HOTKEY_CONFIG PlEditorHotkeysDescr[] = { { &g_CommonSectionTag, s_Common_Hotkey_List, &commonSectionTitle }, { &s_PlEditorSectionTag, s_PlEditor_Hotkey_List, &s_PlEditorSectionTitle }, @@ -253,7 +253,7 @@ bool PL_EDITOR_FRAME::OnHotKey( wxDC* aDC, int aHotkeyCode, break; case HK_HELP: // Display Current hotkey list - DisplayHotkeyList( this, PlEditorHokeysDescr ); + DisplayHotkeyList( this, PlEditorHotkeysDescr ); break; case HK_SET_GRID_ORIGIN: diff --git a/pagelayout_editor/hotkeys.h b/pagelayout_editor/hotkeys.h index 92c6e53c92..e30963fc7f 100644 --- a/pagelayout_editor/hotkeys.h +++ b/pagelayout_editor/hotkeys.h @@ -46,6 +46,6 @@ enum hotkey_id_commnand { }; // List of hotkey descriptors for PlEditor. -extern struct EDA_HOTKEY_CONFIG PlEditorHokeysDescr[]; +extern struct EDA_HOTKEY_CONFIG PlEditorHotkeysDescr[]; #endif // PL_EDITOR_KOTKEYS_H_ diff --git a/pagelayout_editor/menubar.cpp b/pagelayout_editor/menubar.cpp index d5190da7de..df4f7bf278 100644 --- a/pagelayout_editor/menubar.cpp +++ b/pagelayout_editor/menubar.cpp @@ -59,12 +59,12 @@ void PL_EDITOR_FRAME::ReCreateMenuBar() // File Menu: wxMenu* fileMenu = new wxMenu; - msg = AddHotkeyName( _( "&New" ), PlEditorHokeysDescr, HK_NEW ); + msg = AddHotkeyName( _( "&New" ), PlEditorHotkeysDescr, HK_NEW ); AddMenuItem( fileMenu, wxID_NEW, msg, _( "Create new page layout design" ), KiBitmap( new_page_layout_xpm ) ); - msg = AddHotkeyName( _( "&Open..." ), PlEditorHokeysDescr, HK_OPEN ); + msg = AddHotkeyName( _( "&Open..." ), PlEditorHotkeysDescr, HK_OPEN ); AddMenuItem( fileMenu, wxID_OPEN, msg, _( "Open an existing page layout design file" ), KiBitmap( open_page_layout_xpm ) ); @@ -78,19 +78,19 @@ void PL_EDITOR_FRAME::ReCreateMenuBar() fileMenu->AppendSeparator(); - msg = AddHotkeyName( _( "&Save" ), PlEditorHokeysDescr, HK_SAVE ); + msg = AddHotkeyName( _( "&Save" ), PlEditorHotkeysDescr, HK_SAVE ); AddMenuItem( fileMenu, wxID_SAVE, msg, _( "Save current page layout design file" ), KiBitmap( save_xpm ) ); - msg = AddHotkeyName( _( "Save &As..." ), PlEditorHokeysDescr, HK_SAVEAS ); + msg = AddHotkeyName( _( "Save &As..." ), PlEditorHotkeysDescr, HK_SAVEAS ); AddMenuItem( fileMenu, wxID_SAVEAS, msg, _( "Save current page layout design file with a different name" ), KiBitmap( save_as_xpm ) ); fileMenu->AppendSeparator(); - msg = AddHotkeyName( _( "&Print..." ), PlEditorHokeysDescr, HK_PRINT ); + msg = AddHotkeyName( _( "&Print..." ), PlEditorHotkeysDescr, HK_PRINT ); AddMenuItem( fileMenu, wxID_PRINT, msg, KiBitmap( print_button_xpm ) ); AddMenuItem( fileMenu, wxID_PREVIEW, _( "Print Pre&view..." ), KiBitmap( print_button_xpm ) ); @@ -105,10 +105,10 @@ void PL_EDITOR_FRAME::ReCreateMenuBar() // Edit Menu: wxMenu* editMenu = new wxMenu; - msg = AddHotkeyName( _( "Undo" ), PlEditorHokeysDescr, HK_UNDO ); + msg = AddHotkeyName( _( "Undo" ), PlEditorHotkeysDescr, HK_UNDO ); AddMenuItem( editMenu, wxID_UNDO, msg, wxEmptyString, KiBitmap( undo_xpm ) ); - msg = AddHotkeyName( _( "Redo" ), PlEditorHokeysDescr, HK_REDO ); + msg = AddHotkeyName( _( "Redo" ), PlEditorHotkeysDescr, HK_REDO ); AddMenuItem( editMenu, wxID_REDO, msg, wxEmptyString, KiBitmap( redo_xpm ) ); editMenu->AppendSeparator(); @@ -119,16 +119,16 @@ void PL_EDITOR_FRAME::ReCreateMenuBar() // View Menu: wxMenu* viewMenu = new wxMenu; - msg = AddHotkeyName( _( "Zoom In" ), PlEditorHokeysDescr, HK_ZOOM_IN, IS_ACCELERATOR ); + msg = AddHotkeyName( _( "Zoom In" ), PlEditorHotkeysDescr, HK_ZOOM_IN, IS_ACCELERATOR ); AddMenuItem( viewMenu, ID_ZOOM_IN, msg, wxEmptyString, KiBitmap( zoom_in_xpm ) ); - msg = AddHotkeyName( _( "Zoom Out" ), PlEditorHokeysDescr, HK_ZOOM_OUT, IS_ACCELERATOR ); + msg = AddHotkeyName( _( "Zoom Out" ), PlEditorHotkeysDescr, HK_ZOOM_OUT, IS_ACCELERATOR ); AddMenuItem( viewMenu, ID_ZOOM_OUT, msg, wxEmptyString, KiBitmap( zoom_out_xpm ) ); - msg = AddHotkeyName( _( "Zoom to Fit" ), PlEditorHokeysDescr, HK_ZOOM_AUTO ); + msg = AddHotkeyName( _( "Zoom to Fit" ), PlEditorHotkeysDescr, HK_ZOOM_AUTO ); AddMenuItem( viewMenu, ID_ZOOM_PAGE, msg, wxEmptyString, KiBitmap( zoom_fit_in_page_xpm ) ); - msg = AddHotkeyName( _( "Zoom to Selection" ), PlEditorHokeysDescr, HK_ZOOM_SELECTION ); + msg = AddHotkeyName( _( "Zoom to Selection" ), PlEditorHotkeysDescr, HK_ZOOM_SELECTION ); AddMenuItem( viewMenu, ID_MENU_ZOOM_SELECTION, msg, wxEmptyString, KiBitmap( zoom_area_xpm ) ); viewMenu->AppendSeparator(); @@ -143,7 +143,7 @@ void PL_EDITOR_FRAME::ReCreateMenuBar() viewMenu->AppendSeparator(); - msg = AddHotkeyName( _( "Redraw View" ), PlEditorHokeysDescr, HK_ZOOM_REDRAW ); + msg = AddHotkeyName( _( "Redraw View" ), PlEditorHotkeysDescr, HK_ZOOM_REDRAW ); AddMenuItem( viewMenu, ID_ZOOM_REDRAW, msg, wxEmptyString, KiBitmap( zoom_redraw_xpm ) ); @@ -191,7 +191,7 @@ void PL_EDITOR_FRAME::ReCreateMenuBar() _( "Open \"Getting Started in KiCad\" guide for beginners" ), KiBitmap( help_xpm ) ); - msg = AddHotkeyName( _( "&List Hotkeys" ), PlEditorHokeysDescr, HK_HELP ); + msg = AddHotkeyName( _( "&List Hotkeys" ), PlEditorHotkeysDescr, HK_HELP ); AddMenuItem( helpMenu, ID_PREFERENCES_HOTKEY_SHOW_CURRENT_LIST, msg, _( "Displays the current hotkeys list and corresponding commands" ), KiBitmap( hotkeys_xpm ) ); diff --git a/pagelayout_editor/onrightclick.cpp b/pagelayout_editor/onrightclick.cpp index b89a4d15d6..222a81c516 100644 --- a/pagelayout_editor/onrightclick.cpp +++ b/pagelayout_editor/onrightclick.cpp @@ -99,7 +99,7 @@ bool PL_EDITOR_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* aPopMenu ) { if( (item->GetFlags() & LOCATE_STARTPOINT) ) { - msg = AddHotkeyName( _( "Move Start Point" ), PlEditorHokeysDescr, + msg = AddHotkeyName( _( "Move Start Point" ), PlEditorHotkeysDescr, HK_MOVE_START_POINT ); AddMenuItem( aPopMenu, ID_POPUP_ITEM_MOVE_START_POINT, msg, KiBitmap( move_xpm ) ); @@ -107,19 +107,19 @@ bool PL_EDITOR_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* aPopMenu ) if( (item->GetFlags() & LOCATE_ENDPOINT ) ) { - msg = AddHotkeyName( _( "Move End Point" ), PlEditorHokeysDescr, + msg = AddHotkeyName( _( "Move End Point" ), PlEditorHotkeysDescr, HK_MOVE_END_POINT ); AddMenuItem( aPopMenu, ID_POPUP_ITEM_MOVE_END_POINT, msg, KiBitmap( move_xpm ) ); } - msg = AddHotkeyName( _( "Move Item" ), PlEditorHokeysDescr, + msg = AddHotkeyName( _( "Move Item" ), PlEditorHotkeysDescr, HK_MOVE_ITEM ); AddMenuItem( aPopMenu, ID_POPUP_ITEM_MOVE, msg, KiBitmap( move_xpm ) ); aPopMenu->AppendSeparator(); - msg = AddHotkeyName( _( "Delete" ), PlEditorHokeysDescr, + msg = AddHotkeyName( _( "Delete" ), PlEditorHotkeysDescr, HK_DELETE_ITEM ); AddMenuItem( aPopMenu, ID_POPUP_ITEM_DELETE, msg, KiBitmap( delete_xpm ) ); aPopMenu->AppendSeparator(); @@ -127,7 +127,7 @@ bool PL_EDITOR_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* aPopMenu ) } else // An item is currently in edit { - msg = AddHotkeyName( _( "Place Item" ), PlEditorHokeysDescr, + msg = AddHotkeyName( _( "Place Item" ), PlEditorHotkeysDescr, HK_PLACE_ITEM ); AddMenuItem( aPopMenu, ID_POPUP_ITEM_PLACE, msg, KiBitmap( move_xpm ) ); diff --git a/pagelayout_editor/pl_editor.cpp b/pagelayout_editor/pl_editor.cpp index a2ec8bce43..760f225e63 100644 --- a/pagelayout_editor/pl_editor.cpp +++ b/pagelayout_editor/pl_editor.cpp @@ -122,7 +122,7 @@ bool IFACE::OnKifaceStart( PGM_BASE* aProgram, int aCtlBits ) // Must be called before creating the main frame in order to // display the real hotkeys in menus or tool tips - ReadHotkeyConfig( PL_EDITOR_FRAME_NAME, PlEditorHokeysDescr ); + ReadHotkeyConfig( PL_EDITOR_FRAME_NAME, PlEditorHotkeysDescr ); return true; } @@ -155,7 +155,7 @@ bool MYFACE::OnKifaceStart( PGM_BASE* aProgram ) // Must be called before creating the main frame in order to // display the real hotkeys in menus or tool tips - ReadHotkeyConfig( PL_EDITOR_FRAME_NAME, s_PlEditor_Hokeys_Descr ); + ReadHotkeyConfig( PL_EDITOR_FRAME_NAME, s_PlEditor_Hotkeys_Descr ); PL_EDITOR_FRAME * frame = new PL_EDITOR_FRAME( NULL, wxT( "PlEditorFrame" ), wxPoint( 0, 0 ), wxSize( 600, 400 ) ); diff --git a/pagelayout_editor/pl_editor_config.cpp b/pagelayout_editor/pl_editor_config.cpp index 347e6c655b..7b171cdf40 100644 --- a/pagelayout_editor/pl_editor_config.cpp +++ b/pagelayout_editor/pl_editor_config.cpp @@ -66,11 +66,11 @@ void PL_EDITOR_FRAME::Process_Config( wxCommandEvent& event ) break; case wxID_PREFERENCES: - ShowPreferences( PlEditorHokeysDescr, PlEditorHokeysDescr, wxT( "pl_editor" ) ); + ShowPreferences( PlEditorHotkeysDescr, PlEditorHotkeysDescr, wxT( "pl_editor" ) ); break; case ID_PREFERENCES_HOTKEY_SHOW_CURRENT_LIST: - DisplayHotkeyList( this, PlEditorHokeysDescr ); + DisplayHotkeyList( this, PlEditorHotkeysDescr ); break; default: diff --git a/pagelayout_editor/pl_editor_frame.cpp b/pagelayout_editor/pl_editor_frame.cpp index 5a9057f0b2..f5ee7de751 100644 --- a/pagelayout_editor/pl_editor_frame.cpp +++ b/pagelayout_editor/pl_editor_frame.cpp @@ -66,7 +66,7 @@ PL_EDITOR_FRAME::PL_EDITOR_FRAME( KIWAY* aKiway, wxWindow* aParent ) : m_showAxis = false; // true to show X and Y axis on screen m_showGridAxis = true; m_showBorderAndTitleBlock = true; // true for reference drawings. - m_hotkeysDescrList = PlEditorHokeysDescr; + m_hotkeysDescrList = PlEditorHotkeysDescr; m_originSelectChoice = 0; SetDrawBgColor( WHITE ); // default value, user option (WHITE/BLACK) SetShowPageLimits( true ); diff --git a/pagelayout_editor/toolbars_pl_editor.cpp b/pagelayout_editor/toolbars_pl_editor.cpp index a4ee6d06ad..2bb054e97a 100644 --- a/pagelayout_editor/toolbars_pl_editor.cpp +++ b/pagelayout_editor/toolbars_pl_editor.cpp @@ -79,17 +79,17 @@ void PL_EDITOR_FRAME::ReCreateHToolbar( void ) // Standard Zoom controls: m_mainToolBar->AddSeparator(); - msg = AddHotkeyName( _( "Redraw view" ), PlEditorHokeysDescr, HK_ZOOM_REDRAW, IS_COMMENT ); + msg = AddHotkeyName( _( "Redraw view" ), PlEditorHotkeysDescr, HK_ZOOM_REDRAW, IS_COMMENT ); m_mainToolBar->AddTool( ID_ZOOM_REDRAW, wxEmptyString, KiScaledBitmap( zoom_redraw_xpm, this ), msg ); - msg = AddHotkeyName( _( "Zoom in" ), PlEditorHokeysDescr, HK_ZOOM_IN, IS_COMMENT ); + msg = AddHotkeyName( _( "Zoom in" ), PlEditorHotkeysDescr, HK_ZOOM_IN, IS_COMMENT ); m_mainToolBar->AddTool( ID_ZOOM_IN, wxEmptyString, KiScaledBitmap( zoom_in_xpm, this ), msg ); - msg = AddHotkeyName( _( "Zoom out" ), PlEditorHokeysDescr, HK_ZOOM_OUT, IS_COMMENT ); + msg = AddHotkeyName( _( "Zoom out" ), PlEditorHotkeysDescr, HK_ZOOM_OUT, IS_COMMENT ); m_mainToolBar->AddTool( ID_ZOOM_OUT, wxEmptyString, KiScaledBitmap( zoom_out_xpm, this ), msg ); - msg = AddHotkeyName( _( "Zoom to fit page" ), PlEditorHokeysDescr, HK_ZOOM_AUTO, IS_COMMENT ); + msg = AddHotkeyName( _( "Zoom to fit page" ), PlEditorHotkeysDescr, HK_ZOOM_AUTO, IS_COMMENT ); m_mainToolBar->AddTool( ID_ZOOM_PAGE, wxEmptyString, KiScaledBitmap( zoom_fit_in_page_xpm, this ), msg ); diff --git a/qa/common/test_hotkey_store.cpp b/qa/common/test_hotkey_store.cpp index e6db29f101..34c9878b7f 100644 --- a/qa/common/test_hotkey_store.cpp +++ b/qa/common/test_hotkey_store.cpp @@ -59,7 +59,7 @@ static EDA_HOTKEY* sectionBHotkeyList[] = NULL }; -static EDA_HOTKEY_CONFIG test_hokeys_descr[] = +static EDA_HOTKEY_CONFIG test_hotkeys_descr[] = { { §ionATag, sectionAHotkeyList, §ionATitle }, { §ionBTag, sectionBHotkeyList, §ionBTitle }, @@ -68,14 +68,14 @@ static EDA_HOTKEY_CONFIG test_hokeys_descr[] = // Number of sections in the above table static const unsigned num_cfg_sections = - sizeof( test_hokeys_descr ) / sizeof( EDA_HOTKEY_CONFIG ) - 1; + sizeof( test_hotkeys_descr ) / sizeof( EDA_HOTKEY_CONFIG ) - 1; // ---------------------------------------------------------------------------- struct HotkeyStoreFixture { HotkeyStoreFixture(): - m_hotkey_store( test_hokeys_descr ) + m_hotkey_store( test_hotkeys_descr ) {} HOTKEY_STORE m_hotkey_store; @@ -119,7 +119,7 @@ BOOST_AUTO_TEST_CASE( HotkeyConflict ) // See if we conflicted with the correct key in the correct section BOOST_CHECK_EQUAL( conflict, false ); BOOST_CHECK_EQUAL( conf_key->m_Idcommand, actionA1.m_Idcommand ); - BOOST_CHECK_EQUAL( conf_sect, &test_hokeys_descr[0] ); + BOOST_CHECK_EQUAL( conf_sect, &test_hotkeys_descr[0] ); }