From 0c8200aaeb6a7966f5b1b78d97a2482eed0c2135 Mon Sep 17 00:00:00 2001 From: Fabrizio Tappero Date: Mon, 3 Jul 2017 17:21:22 +0200 Subject: [PATCH] Rename actions in eeschema: copy->duplicate, save->copy --- eeschema/hotkeys.cpp | 4 ++-- eeschema/onrightclick.cpp | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eeschema/hotkeys.cpp b/eeschema/hotkeys.cpp index 8f75c87ad4..c2cee153c4 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( "Copy Component or Label" ), +static EDA_HOTKEY HkCopyComponentOrText( _HKI( "Duplicate Component or Label" ), HK_COPY_COMPONENT_OR_LABEL, 'C', ID_POPUP_SCH_COPY_ITEM ); static EDA_HOTKEY HkDrag( _HKI( "Drag Item" ), HK_DRAG, 'G', ID_SCH_DRAG_ITEM ); -static EDA_HOTKEY HkSaveBlock( _HKI( "Save Block" ), HK_SAVE_BLOCK, 'C' + GR_KB_CTRL, wxID_COPY ); +static EDA_HOTKEY HkSaveBlock( _HKI( "Copy Block" ), HK_SAVE_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" ), diff --git a/eeschema/onrightclick.cpp b/eeschema/onrightclick.cpp index b330a30c61..0f2e61c8b3 100644 --- a/eeschema/onrightclick.cpp +++ b/eeschema/onrightclick.cpp @@ -387,7 +387,7 @@ void AddMenusForComponent( wxMenu* PopMenu, SCH_COMPONENT* Component, PART_LIBS* if( !Component->GetFlags() ) { - msg = AddHotkeyName( _( "Copy" ), g_Schematic_Hokeys_Descr, + msg = AddHotkeyName( _( "Duplicate" ), g_Schematic_Hokeys_Descr, HK_COPY_COMPONENT_OR_LABEL ); AddMenuItem( PopMenu, ID_POPUP_SCH_COPY_ITEM, msg, KiBitmap( duplicate_module_xpm ) ); msg = AddHotkeyName( _( "Delete" ), g_Schematic_Hokeys_Descr, HK_DELETE ); @@ -494,7 +494,7 @@ void AddMenusForGLabel( wxMenu* PopMenu, SCH_GLOBALLABEL* GLabel ) msg = AddHotkeyName( _( "Drag" ), g_Schematic_Hokeys_Descr, HK_DRAG ); AddMenuItem( PopMenu, ID_SCH_DRAG_ITEM, msg, KiBitmap( drag_xpm ) ); - msg = AddHotkeyName( _( "Copy" ), g_Schematic_Hokeys_Descr, + msg = AddHotkeyName( _( "Duplicate" ), g_Schematic_Hokeys_Descr, HK_COPY_COMPONENT_OR_LABEL ); AddMenuItem( PopMenu, ID_POPUP_SCH_COPY_ITEM, msg, KiBitmap( duplicate_module_xpm ) ); } @@ -566,7 +566,7 @@ void AddMenusForLabel( wxMenu* PopMenu, SCH_LABEL* Label ) AddMenuItem( PopMenu, ID_SCH_MOVE_ITEM, msg, KiBitmap( move_xpm ) ); msg = AddHotkeyName( _( "Drag Label" ), g_Schematic_Hokeys_Descr, HK_DRAG ); AddMenuItem( PopMenu, ID_SCH_DRAG_ITEM, msg, KiBitmap( drag_xpm ) ); - msg = AddHotkeyName( _( "Copy Label" ), g_Schematic_Hokeys_Descr, + 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 ) ); } @@ -600,7 +600,7 @@ void AddMenusForText( wxMenu* PopMenu, SCH_TEXT* Text ) msg = AddHotkeyName( _( "Move" ), g_Schematic_Hokeys_Descr, HK_MOVE_COMPONENT_OR_ITEM ); AddMenuItem( PopMenu, ID_SCH_MOVE_ITEM, msg, KiBitmap( move_xpm ) ); - msg = AddHotkeyName( _( "Copy" ), g_Schematic_Hokeys_Descr, + msg = AddHotkeyName( _( "Duplicate" ), g_Schematic_Hokeys_Descr, HK_COPY_COMPONENT_OR_LABEL ); AddMenuItem( PopMenu, ID_POPUP_SCH_COPY_ITEM, msg, KiBitmap( duplicate_module_xpm ) ); } @@ -841,7 +841,7 @@ void AddMenusForBlock( wxMenu* PopMenu, SCH_EDIT_FRAME* frame ) // a block function. if( frame->GetScreen()->m_BlockLocate.GetCommand() == BLOCK_MOVE ) { - msg = AddHotkeyName( _( "Save Block" ), g_Schematic_Hokeys_Descr, + msg = AddHotkeyName( _( "Copy Block" ), g_Schematic_Hokeys_Descr, HK_SAVE_BLOCK ); AddMenuItem( PopMenu, wxID_COPY, msg, KiBitmap( copy_xpm ) ); AddMenuItem( PopMenu, ID_POPUP_COPY_BLOCK, _( "Duplicate Block" ), KiBitmap( duplicate_module_xpm ) );