From c842787492004ddddda849ae1aef7945310f5a07 Mon Sep 17 00:00:00 2001 From: Wayne Stambaugh Date: Fri, 5 Jan 2018 13:07:43 -0500 Subject: [PATCH] Minor UI menu string improvements. Change term "Flip Horizontal" to "Mirror About Horizontal(X) Axis" in the schematic editor symbol context menu to improve clarity. Change term "Flip Vertical" to "Mirror About Vertical(Y) Axis" in the schematic editor symbol context menu to improve clarity. Change to the same mirror terminology in the block context menu. Change "Exchange Footprint" to "Change Footprint" in the board footprint context menu for improved clarity. Fixes lp:1740593 https://bugs.launchpad.net/kicad/+bug/1740593 --- eeschema/libedit_onrightclick.cpp | 6 ++++-- eeschema/onrightclick.cpp | 25 +++++++++++++++---------- pcbnew/onrightclick.cpp | 2 +- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/eeschema/libedit_onrightclick.cpp b/eeschema/libedit_onrightclick.cpp index 289e1f6e8f..688cedf00e 100644 --- a/eeschema/libedit_onrightclick.cpp +++ b/eeschema/libedit_onrightclick.cpp @@ -345,10 +345,12 @@ void AddMenusForBlock( wxMenu* PopMenu, LIB_EDIT_FRAME* frame ) AddMenuItem( PopMenu, wxID_COPY, msg, KiBitmap( copy_xpm ) ); AddMenuItem( PopMenu, ID_POPUP_DUPLICATE_BLOCK, _( "Duplicate Block" ), KiBitmap( duplicate_xpm ) ); - msg = AddHotkeyName( _( "Flip Block Horizonal" ), g_Libedit_Hokeys_Descr, HK_MIRROR_Y ); + msg = AddHotkeyName( _( "Mirror Block Around Horizontal(X) Axis" ), g_Libedit_Hokeys_Descr, + HK_MIRROR_Y ); AddMenuItem( PopMenu, ID_POPUP_MIRROR_Y_BLOCK, msg, KiBitmap( mirror_h_xpm ) ); - msg = AddHotkeyName( _( "Flip Block Vertical" ), g_Libedit_Hokeys_Descr, HK_MIRROR_X ); + msg = AddHotkeyName( _( "Mirror Block Around Vertical(Y) Axis" ), g_Libedit_Hokeys_Descr, + HK_MIRROR_X ); AddMenuItem( PopMenu, ID_POPUP_MIRROR_X_BLOCK, msg, KiBitmap( mirror_v_xpm ) ); msg = AddHotkeyName( _( "Rotate Counterclockwise" ), g_Libedit_Hokeys_Descr, HK_ROTATE ); diff --git a/eeschema/onrightclick.cpp b/eeschema/onrightclick.cpp index 5a8bff2905..e7a26063bd 100644 --- a/eeschema/onrightclick.cpp +++ b/eeschema/onrightclick.cpp @@ -377,9 +377,11 @@ void AddMenusForComponent( wxMenu* PopMenu, SCH_COMPONENT* Component, SYMBOL_LIB 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( _( "Flip Vertical" ), g_Schematic_Hokeys_Descr, HK_MIRROR_X ); + msg = AddHotkeyName( _( "Mirror Around Horizontal(X) Axis" ), g_Schematic_Hokeys_Descr, + HK_MIRROR_X ); AddMenuItem( orientmenu, ID_SCH_MIRROR_X, msg, KiBitmap( mirror_v_xpm ) ); - msg = AddHotkeyName( _( "Flip Horizontal" ), g_Schematic_Hokeys_Descr, HK_MIRROR_Y ); + msg = AddHotkeyName( _( "Mirror Around Vertical(Y) Axis" ), g_Schematic_Hokeys_Descr, + HK_MIRROR_Y ); AddMenuItem( orientmenu, ID_SCH_MIRROR_Y, msg, KiBitmap( mirror_h_xpm ) ); msg = AddHotkeyName( _( "Reset to Default" ), g_Schematic_Hokeys_Descr, HK_ORIENT_NORMAL_COMPONENT ); @@ -776,7 +778,8 @@ void AddMenusForHierchicalSheet( wxMenu* PopMenu, SCH_SHEET* Sheet ) AddMenuItem( PopMenu, ID_SCH_DRAG_ITEM, msg, KiBitmap( drag_xpm ) ); PopMenu->AppendSeparator(); - msg = AddHotkeyName( _( "Select Items On PCB" ), g_Schematic_Hokeys_Descr, HK_SELECT_ITEMS_ON_PCB ); + msg = AddHotkeyName( _( "Select Items On PCB" ), g_Schematic_Hokeys_Descr, + HK_SELECT_ITEMS_ON_PCB ); AddMenuItem( PopMenu, ID_POPUP_SCH_SELECT_ON_PCB, msg, KiBitmap( select_same_sheet_xpm ) ); PopMenu->AppendSeparator(); @@ -787,9 +790,11 @@ void AddMenusForHierchicalSheet( wxMenu* PopMenu, SCH_SHEET* Sheet ) AddMenuItem( orientmenu, ID_SCH_ROTATE_COUNTERCLOCKWISE, _( "Rotate Counterclockwise" ), KiBitmap( rotate_ccw_xpm ) ); - msg = AddHotkeyName( _( "Flip Vertical" ), g_Schematic_Hokeys_Descr, HK_MIRROR_X ); + msg = AddHotkeyName( _( "Mirror Around Horizontal(X) Axis" ), g_Schematic_Hokeys_Descr, + HK_MIRROR_X ); AddMenuItem( orientmenu, ID_SCH_MIRROR_X, msg, KiBitmap( mirror_v_xpm ) ); - msg = AddHotkeyName( _( "Flip Horizontal" ), g_Schematic_Hokeys_Descr, HK_MIRROR_Y ); + msg = AddHotkeyName( _( "Mirror Around Vertical(Y) Axis" ), g_Schematic_Hokeys_Descr, + HK_MIRROR_Y ); AddMenuItem( orientmenu, ID_SCH_MIRROR_Y, msg, KiBitmap( mirror_h_xpm ) ); AddMenuItem( PopMenu, orientmenu, ID_POPUP_SCH_GENERIC_ORIENT_CMP, @@ -872,11 +877,11 @@ void AddMenusForBlock( wxMenu* PopMenu, SCH_EDIT_FRAME* frame ) AddMenuItem( PopMenu, ID_POPUP_DRAG_BLOCK, msg, KiBitmap( drag_xpm ) ); msg = AddHotkeyName( _( "Delete Block" ), g_Schematic_Hokeys_Descr, HK_DELETE ); AddMenuItem( PopMenu, ID_POPUP_DELETE_BLOCK, msg, KiBitmap( delete_xpm ) ); - msg = AddHotkeyName( _( "Flip Block Vertical" ), g_Schematic_Hokeys_Descr, + msg = AddHotkeyName( _( "Mirror Block Around Vertical(Y) Axis" ), g_Schematic_Hokeys_Descr, HK_MIRROR_Y ); AddMenuItem( PopMenu, ID_SCH_MIRROR_Y, msg, KiBitmap( mirror_h_xpm ) ); - msg = AddHotkeyName( _( "Flip Block Horizontal" ), g_Schematic_Hokeys_Descr, - HK_MIRROR_X ); + msg = AddHotkeyName( _( "Mirror Block Around Horizontal(X) Axis" ), + g_Schematic_Hokeys_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 ); AddMenuItem( PopMenu, ID_SCH_ROTATE_CLOCKWISE, msg, KiBitmap( rotate_ccw_xpm ) ); @@ -912,10 +917,10 @@ void AddMenusForBitmap( wxMenu* aPopMenu, SCH_BITMAP * aBitmap ) msg = AddHotkeyName( _( "Rotate Counterclockwise" ), g_Schematic_Hokeys_Descr, HK_ROTATE ); AddMenuItem( aPopMenu, ID_SCH_ROTATE_CLOCKWISE, msg, KiBitmap( rotate_ccw_xpm ) ); - msg = AddHotkeyName( _( "Flip Vertical" ), g_Schematic_Hokeys_Descr, + msg = AddHotkeyName( _( "Mirror Around Horizontal(X) Axis" ), g_Schematic_Hokeys_Descr, HK_MIRROR_X ); AddMenuItem( aPopMenu, ID_SCH_MIRROR_X, msg, KiBitmap( mirror_v_xpm ) ); - msg = AddHotkeyName( _( "Flip Horizontal" ), g_Schematic_Hokeys_Descr, + msg = AddHotkeyName( _( "Mirror Around Vertical(Y) Axis" ), g_Schematic_Hokeys_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 ); diff --git a/pcbnew/onrightclick.cpp b/pcbnew/onrightclick.cpp index 6b6dd00f4c..d39a67cd48 100644 --- a/pcbnew/onrightclick.cpp +++ b/pcbnew/onrightclick.cpp @@ -851,7 +851,7 @@ void PCB_EDIT_FRAME::createPopUpMenuForFootprints( MODULE* aModule, wxMenu* menu msg, KiBitmap( array_xpm ) ); AddMenuItem( sub_menu_footprint, ID_POPUP_PCB_EXCHANGE_FOOTPRINTS, - _( "Exchange Footprint" ), KiBitmap( exchange_xpm ) ); + _( "Change Footprint" ), KiBitmap( exchange_xpm ) ); } }