diff --git a/eeschema/eeschema_id.h b/eeschema/eeschema_id.h index 6574447e16..c282b64675 100644 --- a/eeschema/eeschema_id.h +++ b/eeschema/eeschema_id.h @@ -100,7 +100,7 @@ enum id_eeschema_frm ID_TB_OPTIONS_BUS_WIRES_ORIENT, /* Schematic editor context menu IDs. */ - ID_POPUP_SCH_COPY_ITEM, + ID_POPUP_SCH_DUPLICATE_ITEM, ID_POPUP_START_RANGE, ID_POPUP_SCH_DELETE, diff --git a/eeschema/hotkeys.cpp b/eeschema/hotkeys.cpp index c2cee153c4..a03da85e8b 100644 --- a/eeschema/hotkeys.cpp +++ b/eeschema/hotkeys.cpp @@ -188,12 +188,12 @@ static EDA_HOTKEY HkMove( _HKI( "Move Schematic Item" ), HK_MOVE_COMPONENT_OR_ITEM, 'M', ID_SCH_MOVE_ITEM ); -static EDA_HOTKEY HkCopyComponentOrText( _HKI( "Duplicate Component or Label" ), - HK_COPY_COMPONENT_OR_LABEL, 'C', - ID_POPUP_SCH_COPY_ITEM ); +static EDA_HOTKEY HkDuplicateItem( _HKI( "Duplicate Component or Label" ), + HK_DUPLICATE_ITEM, 'C', + ID_POPUP_SCH_DUPLICATE_ITEM ); static EDA_HOTKEY HkDrag( _HKI( "Drag Item" ), HK_DRAG, 'G', ID_SCH_DRAG_ITEM ); -static EDA_HOTKEY HkSaveBlock( _HKI( "Copy Block" ), HK_SAVE_BLOCK, 'C' + GR_KB_CTRL, wxID_COPY ); +static EDA_HOTKEY HkCopyBlock( _HKI( "Copy Block" ), HK_COPY_BLOCK, 'C' + GR_KB_CTRL, wxID_COPY ); static EDA_HOTKEY HkPasteBlock( _HKI( "Paste Block" ), HK_PASTE_BLOCK, 'V' + GR_KB_CTRL, wxID_PASTE ); static EDA_HOTKEY HkCutBlock( _HKI( "Cut Block" ), HK_CUT_BLOCK, 'X' + GR_KB_CTRL, wxID_CUT ); static EDA_HOTKEY HkMove2Drag( _HKI( "Move Block -> Drag Block" ), @@ -282,11 +282,11 @@ static EDA_HOTKEY* schematic_Hotkey_List[] = &HkFindReplace, &HkInsert, &HkMove2Drag, - &HkSaveBlock, + &HkCopyBlock, &HkPasteBlock, &HkCutBlock, &HkMove, - &HkCopyComponentOrText, + &HkDuplicateItem, &HkAddComponent, &HkAddPower, &HkMirrorX, @@ -476,7 +476,7 @@ bool SCH_EDIT_FRAME::OnHotKey( wxDC* aDC, int aHotKey, const wxPoint& aPosition, case HK_ZOOM_SELECTION: case HK_MOVEBLOCK_TO_DRAGBLOCK: // Switch to drag mode, when block moving case HK_PASTE_BLOCK: - case HK_SAVE_BLOCK: // Copy block to paste buffer. + case HK_COPY_BLOCK: // Copy block to paste buffer. case HK_CUT_BLOCK: cmd.SetId( hotKey->m_IdMenuEvent ); GetEventHandler()->ProcessEvent( cmd ); @@ -575,7 +575,7 @@ bool SCH_EDIT_FRAME::OnHotKey( wxDC* aDC, int aHotKey, const wxPoint& aPosition, } break; - case HK_COPY_COMPONENT_OR_LABEL: // Duplicate component or text/label + case HK_DUPLICATE_ITEM: // Duplicate component or text/label if( itemInEdit ) break; diff --git a/eeschema/hotkeys.h b/eeschema/hotkeys.h index 9df3d982d3..aa7350ed22 100644 --- a/eeschema/hotkeys.h +++ b/eeschema/hotkeys.h @@ -42,7 +42,7 @@ enum hotkey_id_commnand { HK_REPEAT_LAST, HK_LIBEDIT_MOVE_GRAPHIC_ITEM, HK_MOVEBLOCK_TO_DRAGBLOCK, - HK_SAVE_BLOCK, + HK_COPY_BLOCK, HK_PASTE_BLOCK, HK_CUT_BLOCK, HK_LIBEDIT_LOAD_PART, @@ -58,7 +58,7 @@ enum hotkey_id_commnand { HK_MIRROR_Y, HK_ORIENT_NORMAL_COMPONENT, HK_MOVE_COMPONENT_OR_ITEM, - HK_COPY_COMPONENT_OR_LABEL, + HK_DUPLICATE_ITEM, HK_DRAG, HK_ADD_NEW_COMPONENT, HK_ADD_NEW_POWER, diff --git a/eeschema/onrightclick.cpp b/eeschema/onrightclick.cpp index 0f2e61c8b3..365b55f06b 100644 --- a/eeschema/onrightclick.cpp +++ b/eeschema/onrightclick.cpp @@ -388,8 +388,8 @@ void AddMenusForComponent( wxMenu* PopMenu, SCH_COMPONENT* Component, PART_LIBS* if( !Component->GetFlags() ) { msg = AddHotkeyName( _( "Duplicate" ), g_Schematic_Hokeys_Descr, - HK_COPY_COMPONENT_OR_LABEL ); - AddMenuItem( PopMenu, ID_POPUP_SCH_COPY_ITEM, msg, KiBitmap( duplicate_module_xpm ) ); + HK_DUPLICATE_ITEM ); + AddMenuItem( PopMenu, ID_POPUP_SCH_DUPLICATE_ITEM, msg, KiBitmap( duplicate_module_xpm ) ); msg = AddHotkeyName( _( "Delete" ), g_Schematic_Hokeys_Descr, HK_DELETE ); AddMenuItem( PopMenu, ID_POPUP_SCH_DELETE_CMP, msg, KiBitmap( delete_xpm ) ); } @@ -495,8 +495,8 @@ void AddMenusForGLabel( wxMenu* PopMenu, SCH_GLOBALLABEL* GLabel ) HK_DRAG ); AddMenuItem( PopMenu, ID_SCH_DRAG_ITEM, msg, KiBitmap( drag_xpm ) ); msg = AddHotkeyName( _( "Duplicate" ), g_Schematic_Hokeys_Descr, - HK_COPY_COMPONENT_OR_LABEL ); - AddMenuItem( PopMenu, ID_POPUP_SCH_COPY_ITEM, msg, KiBitmap( duplicate_module_xpm ) ); + HK_DUPLICATE_ITEM ); + AddMenuItem( PopMenu, ID_POPUP_SCH_DUPLICATE_ITEM, msg, KiBitmap( duplicate_module_xpm ) ); } msg = AddHotkeyName( _( "Rotate" ), g_Schematic_Hokeys_Descr, HK_ROTATE ); @@ -531,8 +531,8 @@ void AddMenusForHLabel( wxMenu* PopMenu, SCH_HIERLABEL* HLabel ) msg = AddHotkeyName( _( "Drag Hierarchical Label" ), g_Schematic_Hokeys_Descr, HK_DRAG ); AddMenuItem( PopMenu, ID_SCH_DRAG_ITEM, msg, KiBitmap( drag_xpm ) ); msg = AddHotkeyName( _( "Copy Hierarchical Label" ), g_Schematic_Hokeys_Descr, - HK_COPY_COMPONENT_OR_LABEL ); - AddMenuItem( PopMenu, ID_POPUP_SCH_COPY_ITEM, msg, KiBitmap( copy_xpm ) ); + HK_DUPLICATE_ITEM ); + AddMenuItem( PopMenu, ID_POPUP_SCH_DUPLICATE_ITEM, msg, KiBitmap( copy_xpm ) ); } msg = AddHotkeyName( _( "Rotate Hierarchical Label" ), g_Schematic_Hokeys_Descr, HK_ROTATE ); @@ -567,8 +567,8 @@ void AddMenusForLabel( wxMenu* PopMenu, SCH_LABEL* Label ) msg = AddHotkeyName( _( "Drag Label" ), g_Schematic_Hokeys_Descr, HK_DRAG ); AddMenuItem( PopMenu, ID_SCH_DRAG_ITEM, msg, KiBitmap( drag_xpm ) ); msg = AddHotkeyName( _( "Duplicate Label" ), g_Schematic_Hokeys_Descr, - HK_COPY_COMPONENT_OR_LABEL ); - AddMenuItem( PopMenu, ID_POPUP_SCH_COPY_ITEM, msg, KiBitmap( duplicate_module_xpm ) ); + HK_DUPLICATE_ITEM ); + AddMenuItem( PopMenu, ID_POPUP_SCH_DUPLICATE_ITEM, msg, KiBitmap( duplicate_module_xpm ) ); } msg = AddHotkeyName( _( "Rotate Label" ), g_Schematic_Hokeys_Descr, HK_ROTATE ); @@ -601,8 +601,8 @@ void AddMenusForText( wxMenu* PopMenu, SCH_TEXT* Text ) HK_MOVE_COMPONENT_OR_ITEM ); AddMenuItem( PopMenu, ID_SCH_MOVE_ITEM, msg, KiBitmap( move_xpm ) ); msg = AddHotkeyName( _( "Duplicate" ), g_Schematic_Hokeys_Descr, - HK_COPY_COMPONENT_OR_LABEL ); - AddMenuItem( PopMenu, ID_POPUP_SCH_COPY_ITEM, msg, KiBitmap( duplicate_module_xpm ) ); + HK_DUPLICATE_ITEM ); + AddMenuItem( PopMenu, ID_POPUP_SCH_DUPLICATE_ITEM, msg, KiBitmap( duplicate_module_xpm ) ); } msg = AddHotkeyName( _( "Rotate" ), g_Schematic_Hokeys_Descr, HK_ROTATE ); @@ -842,7 +842,7 @@ void AddMenusForBlock( wxMenu* PopMenu, SCH_EDIT_FRAME* frame ) if( frame->GetScreen()->m_BlockLocate.GetCommand() == BLOCK_MOVE ) { msg = AddHotkeyName( _( "Copy Block" ), g_Schematic_Hokeys_Descr, - HK_SAVE_BLOCK ); + HK_COPY_BLOCK ); AddMenuItem( PopMenu, wxID_COPY, msg, KiBitmap( copy_xpm ) ); AddMenuItem( PopMenu, ID_POPUP_COPY_BLOCK, _( "Duplicate Block" ), KiBitmap( duplicate_module_xpm ) ); msg = AddHotkeyName( _( "Drag Block" ), g_Schematic_Hokeys_Descr, diff --git a/eeschema/schframe.cpp b/eeschema/schframe.cpp index 3e7c2ddb69..aa08851c88 100644 --- a/eeschema/schframe.cpp +++ b/eeschema/schframe.cpp @@ -234,7 +234,7 @@ BEGIN_EVENT_TABLE( SCH_EDIT_FRAME, EDA_DRAW_FRAME ) EVT_MENU( ID_GEN_COPY_SHEET_TO_CLIPBOARD, EDA_DRAW_FRAME::CopyToClipboard ) EVT_MENU( wxID_EXIT, SCH_EDIT_FRAME::OnExit ) - EVT_MENU( ID_POPUP_SCH_COPY_ITEM, SCH_EDIT_FRAME::OnCopySchematicItemRequest ) + EVT_MENU( ID_POPUP_SCH_DUPLICATE_ITEM, SCH_EDIT_FRAME::OnCopySchematicItemRequest ) EVT_MENU( ID_CONFIG_REQ, SCH_EDIT_FRAME::InstallConfigFrame ) EVT_MENU( ID_CONFIG_SAVE, SCH_EDIT_FRAME::Process_Config )