From 1afbfad44a30bf50efe04270ff94feaf11d17163 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Fri, 9 Feb 2018 16:28:33 +0000 Subject: [PATCH] Use "..." uniformly in menus. See the bug report for some wording changes and a couple of menu restructurings that were also cleaned up. Fixes: lp:1597827 * https://bugs.launchpad.net/kicad/+bug/1597827 --- 3d-viewer/3d_viewer/3d_toolbar.cpp | 46 ++++----- common/hotkeys_basic.cpp | 6 +- common/zoom.cpp | 8 +- cvpcb/menubar.cpp | 6 +- eeschema/libedit_onrightclick.cpp | 26 ++--- eeschema/menubar.cpp | 124 ++++++++++-------------- eeschema/menubar_libedit.cpp | 28 +++--- eeschema/onrightclick.cpp | 48 ++++----- eeschema/sim/sim_plot_frame.cpp | 6 +- gerbview/menubar.cpp | 18 ++-- gerbview/onrightclick.cpp | 8 +- gerbview/tools/selection_tool.cpp | 10 +- kicad/menubar.cpp | 10 +- kicad/tree_project_frame.cpp | 8 +- pagelayout_editor/menubar.cpp | 14 +-- pagelayout_editor/onrightclick.cpp | 10 +- pcbnew/footprint_editor_onclick.cpp | 34 +++---- pcbnew/menubar_footprint_editor.cpp | 44 ++++----- pcbnew/menubar_pcb_editor.cpp | 108 ++++++++++----------- pcbnew/onrightclick.cpp | 68 ++++++------- pcbnew/router/length_tuner_tool.cpp | 10 +- pcbnew/router/router_tool.cpp | 16 +-- pcbnew/tool_footprint_viewer.cpp | 2 +- pcbnew/tools/edit_tool.cpp | 12 +-- pcbnew/tools/module_editor_tools.cpp | 4 +- pcbnew/tools/pad_tool.cpp | 2 +- pcbnew/tools/pcb_editor_control.cpp | 2 +- pcbnew/tools/placement_tool.cpp | 2 +- pcbnew/tools/position_relative_tool.cpp | 2 +- pcbnew/tools/selection_tool.cpp | 6 +- qa/common/mocks.cpp | 2 +- 31 files changed, 334 insertions(+), 356 deletions(-) diff --git a/3d-viewer/3d_viewer/3d_toolbar.cpp b/3d-viewer/3d_viewer/3d_toolbar.cpp index 33a34e5f3f..fb31c14194 100644 --- a/3d-viewer/3d_viewer/3d_toolbar.cpp +++ b/3d-viewer/3d_viewer/3d_toolbar.cpp @@ -141,29 +141,31 @@ void EDA_3D_VIEWER::CreateMenuBar() wxMenuBar* menuBar = new wxMenuBar; wxMenu* fileMenu = new wxMenu; + wxMenu* editMenu = new wxMenu; wxMenu* prefsMenu = new wxMenu; wxMenu* helpMenu = new wxMenu; menuBar->Append( fileMenu, _( "&File" ) ); AddMenuItem( fileMenu, ID_MENU_SCREENCOPY_PNG, - _( "Create Image (png format)" ), + _( "Export Current View as PNG..." ), KiBitmap( export_xpm ) ); AddMenuItem( fileMenu, ID_MENU_SCREENCOPY_JPEG, - _( "Create Image (jpeg format)" ), + _( "Export Current View as JPEG..." ), KiBitmap( export_xpm ) ); - fileMenu->AppendSeparator(); - AddMenuItem( fileMenu, ID_TOOL_SCREENCOPY_TOCLIBBOARD, - _( "Copy 3D Image to Clipboard" ), - KiBitmap( copy_xpm ) ); - fileMenu->AppendSeparator(); AddMenuItem( fileMenu, wxID_EXIT, _( "&Exit" ), KiBitmap( exit_xpm ) ); + menuBar->Append( editMenu, _( "&Edit" ) ); + + AddMenuItem( editMenu, ID_TOOL_SCREENCOPY_TOCLIBBOARD, + _( "Copy 3D Image" ), + KiBitmap( copy_xpm ) ); + menuBar->Append( prefsMenu, _( "&Preferences" ) ); AddMenuItem( prefsMenu, ID_MENU3D_MOUSEWHEEL_PANNING, @@ -203,15 +205,15 @@ void EDA_3D_VIEWER::CreateMenuBar() _( "Material Properties" ), KiBitmap( color_materials_xpm ) ); materialsList->AppendRadioItem( ID_MENU3D_FL_RENDER_MATERIAL_MODE_NORMAL, - _( "Use all properties" ), + _( "Use All Properties" ), _( "Use all material properties from each 3D model file" ) ); materialsList->AppendRadioItem( ID_MENU3D_FL_RENDER_MATERIAL_MODE_DIFFUSE_ONLY, - _( "Use diffuse only" ), + _( "Use Diffuse Only" ), _( "Use only the diffuse color property from model 3D model file " ) ); materialsList->AppendRadioItem( ID_MENU3D_FL_RENDER_MATERIAL_MODE_CAD_MODE, - _( "CAD color style" ), + _( "CAD Color Style" ), _( "Use a CAD color style based on the diffuse color of the material" ) ); // Add specific preferences for OpenGL @@ -247,7 +249,7 @@ void EDA_3D_VIEWER::CreateMenuBar() KiBitmap( green_xpm ), wxITEM_CHECK ); AddMenuItem( renderOptionsMenu_RAYTRACING, ID_MENU3D_FL_RAYTRACING_BACKFLOOR, - _( "Add floor" ), + _( "Add Floor" ), _( "Adds a floor plane below the board (slow)"), KiBitmap( green_xpm ), wxITEM_CHECK ); @@ -287,25 +289,25 @@ void EDA_3D_VIEWER::CreateMenuBar() _( "Background Color" ), KiBitmap( palette_xpm ) ); AddMenuItem( setBgColorMenu, ID_MENU3D_BGCOLOR_TOP_SELECTION, - _( "Background Top Color" ), KiBitmap( setcolor_3d_bg_xpm ) ); + _( "Background Top Color..." ), KiBitmap( setcolor_3d_bg_xpm ) ); AddMenuItem( setBgColorMenu, ID_MENU3D_BGCOLOR_BOTTOM_SELECTION, - _( "Background Bottom Color" ), KiBitmap( setcolor_3d_bg_xpm ) ); + _( "Background Bottom Color..." ), KiBitmap( setcolor_3d_bg_xpm ) ); AddMenuItem( setColorMenu, ID_MENU3D_SILKSCREEN_COLOR_SELECTION, - _( "Silkscreen Color" ), KiBitmap( setcolor_silkscreen_xpm ) ); + _( "Silkscreen Color..." ), KiBitmap( setcolor_silkscreen_xpm ) ); AddMenuItem( setColorMenu, ID_MENU3D_SOLDERMASK_COLOR_SELECTION, - _( "Solder Mask Color" ), KiBitmap( setcolor_soldermask_xpm ) ); + _( "Solder Mask Color..." ), KiBitmap( setcolor_soldermask_xpm ) ); AddMenuItem( setColorMenu, ID_MENU3D_SOLDERPASTE_COLOR_SELECTION, - _( "Solder Paste Color" ), KiBitmap( setcolor_solderpaste_xpm ) ); + _( "Solder Paste Color..." ), KiBitmap( setcolor_solderpaste_xpm ) ); AddMenuItem( setColorMenu, ID_MENU3D_COPPER_COLOR_SELECTION, - _( "Copper/Surface Finish Color" ), KiBitmap( setcolor_copper_xpm ) ); + _( "Copper/Surface Finish Color..." ), KiBitmap( setcolor_copper_xpm ) ); AddMenuItem( setColorMenu, ID_MENU3D_PCB_BODY_COLOR_SELECTION, - _( "Board Body Color" ), KiBitmap( setcolor_board_body_xpm ) ); + _( "Board Body Color..." ), KiBitmap( setcolor_board_body_xpm ) ); AddMenuItem( prefsMenu, ID_MENU3D_AXIS_ONOFF, _( "Show 3D &Axis" ), KiBitmap( axis3d_front_xpm ), wxITEM_CHECK ); @@ -349,11 +351,11 @@ void EDA_3D_VIEWER::CreateMenuBar() AddMenuItem( prefsMenu, moduleAttributes, ID_MENU3D_MODULE_ONOFF, _( "Show 3D M&odels" ), KiBitmap( shape_3d_xpm ) ); moduleAttributes->AppendCheckItem( ID_MENU3D_MODULE_ONOFF_ATTRIBUTES_NORMAL, - _( "Through hole" ), + _( "Through Hole" ), _( "Footprint Properties -> Placement type -> Through hole" ) ); moduleAttributes->AppendCheckItem( ID_MENU3D_MODULE_ONOFF_ATTRIBUTES_NORMAL_INSERT, - _( "Surface mount" ), + _( "Surface Mount" ), _( "Footprint Properties -> Placement type -> Surface mount" ) ); moduleAttributes->AppendCheckItem( ID_MENU3D_MODULE_ONOFF_ATTRIBUTES_VIRTUAL, @@ -393,7 +395,7 @@ void EDA_3D_VIEWER::CreateMenuBar() prefsMenu->AppendSeparator(); AddMenuItem( prefsMenu, ID_MENU3D_RESET_DEFAULTS, - _( "Reset to default settings" ), + _( "Reset to Default Settings" ), KiBitmap( tools_xpm ) ); // Help menu @@ -401,7 +403,7 @@ void EDA_3D_VIEWER::CreateMenuBar() menuBar->Append( helpMenu, _( "&Help" ) ); AddMenuItem( helpMenu, ID_MENU3D_HELP_HOTKEY_SHOW_CURRENT_LIST, - _( "&List Hotkeys" ), + _( "&List Hotkeys..." ), _( "Displays the current hotkeys list and corresponding commands" ), KiBitmap( hotkeys_xpm ) ); diff --git a/common/hotkeys_basic.cpp b/common/hotkeys_basic.cpp index 917f8b838b..4167102397 100644 --- a/common/hotkeys_basic.cpp +++ b/common/hotkeys_basic.cpp @@ -796,7 +796,7 @@ void AddHotkeyConfigMenu( wxMenu* aMenu ) // Call hotkeys editor AddMenuItem( HotkeySubmenu, ID_PREFERENCES_HOTKEY_SHOW_EDITOR, - _( "&Edit Hotkeys" ), + _( "&Edit Hotkeys..." ), _( "Edit hotkeys list" ), KiBitmap( config_xpm ) ); @@ -804,13 +804,13 @@ void AddHotkeyConfigMenu( wxMenu* aMenu ) // create hotkey file to export current hotkeys config AddMenuItem( HotkeySubmenu, ID_PREFERENCES_HOTKEY_EXPORT_CONFIG, - _( "E&xport Hotkeys" ), + _( "E&xport Hotkeys..." ), _( "Export current hotkeys into configuration file" ), KiBitmap( hotkeys_export_xpm ) ); // Reload hotkey file AddMenuItem( HotkeySubmenu, ID_PREFERENCES_HOTKEY_IMPORT_CONFIG, - _( "&Import Hotkeys" ), + _( "&Import Hotkeys..." ), _( "Load existing hotkey configuration file" ), KiBitmap( hotkeys_import_xpm ) ); diff --git a/common/zoom.cpp b/common/zoom.cpp index f3eff2c80b..1c68d56f71 100644 --- a/common/zoom.cpp +++ b/common/zoom.cpp @@ -251,13 +251,13 @@ void EDA_DRAW_FRAME::AddMenuZoomAndGrid( wxMenu* MasterMenu ) msg = AddHotkeyName( _( "Center" ), m_hotkeysDescrList, HK_ZOOM_CENTER ); AddMenuItem( MasterMenu, ID_POPUP_ZOOM_CENTER, msg, KiBitmap( zoom_center_on_screen_xpm ) ); - msg = AddHotkeyName( _( "Zoom in" ), m_hotkeysDescrList, HK_ZOOM_IN ); + msg = AddHotkeyName( _( "Zoom In" ), m_hotkeysDescrList, HK_ZOOM_IN ); AddMenuItem( MasterMenu, ID_POPUP_ZOOM_IN, msg, KiBitmap( zoom_in_xpm ) ); - msg = AddHotkeyName( _( "Zoom out" ), m_hotkeysDescrList, HK_ZOOM_OUT ); + msg = AddHotkeyName( _( "Zoom Out" ), m_hotkeysDescrList, HK_ZOOM_OUT ); AddMenuItem( MasterMenu, ID_POPUP_ZOOM_OUT, msg, KiBitmap( zoom_out_xpm ) ); - msg = AddHotkeyName( _( "Redraw view" ), m_hotkeysDescrList, HK_ZOOM_REDRAW ); + msg = AddHotkeyName( _( "Redraw View" ), m_hotkeysDescrList, HK_ZOOM_REDRAW ); AddMenuItem( MasterMenu, ID_POPUP_ZOOM_REDRAW, msg, KiBitmap( zoom_redraw_xpm ) ); - msg = AddHotkeyName( _( "Zoom auto" ), m_hotkeysDescrList, HK_ZOOM_AUTO ); + msg = AddHotkeyName( _( "Zoom Auto" ), m_hotkeysDescrList, HK_ZOOM_AUTO ); AddMenuItem( MasterMenu, ID_POPUP_ZOOM_PAGE, msg, KiBitmap( zoom_fit_in_page_xpm ) ); diff --git a/cvpcb/menubar.cpp b/cvpcb/menubar.cpp index 0b76e5d352..6d8c673988 100644 --- a/cvpcb/menubar.cpp +++ b/cvpcb/menubar.cpp @@ -78,19 +78,19 @@ void CVPCB_MAINFRAME::ReCreateMenuBar() wxMenu* preferencesMenu = new wxMenu; AddMenuItem( preferencesMenu, ID_CVPCB_LIB_TABLE_EDIT, - _( "Manage Footprint &Libraries" ), _( "Manage footprint libraries" ), + _( "Manage Footprint &Libraries..." ), _( "Manage footprint libraries" ), KiBitmap( library_table_xpm ) ); // Path configuration edit dialog. AddMenuItem( preferencesMenu, ID_PREFERENCES_CONFIGURE_PATHS, - _( "Configure &Paths" ), + _( "Configure &Paths..." ), _( "Edit path configuration environment variables" ), KiBitmap( editor_xpm ) ); preferencesMenu->AppendSeparator(); AddMenuItem( preferencesMenu, ID_CVPCB_EQUFILES_LIST_EDIT, - _( "Footprint &Association Files" ), + _( "Footprint &Association Files..." ), _( "Configure footprint association file (.equ) list." "These files are used to automatically assign " "the footprint name from the symbol value" ), diff --git a/eeschema/libedit_onrightclick.cpp b/eeschema/libedit_onrightclick.cpp index b9834dc5cd..828ff30f87 100644 --- a/eeschema/libedit_onrightclick.cpp +++ b/eeschema/libedit_onrightclick.cpp @@ -145,7 +145,7 @@ bool LIB_EDIT_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* PopMenu ) KiBitmap( move_rectangle_xpm ) ); } - msg = AddHotkeyName( _( "Edit Circle Options" ), g_Libedit_Hokeys_Descr, HK_EDIT ); + msg = AddHotkeyName( _( "Edit Circle Options..." ), g_Libedit_Hokeys_Descr, HK_EDIT ); AddMenuItem( PopMenu, ID_POPUP_LIBEDIT_BODY_EDIT_ITEM, msg, KiBitmap( options_circle_xpm ) ); @@ -166,7 +166,7 @@ bool LIB_EDIT_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* PopMenu ) KiBitmap( move_rectangle_xpm ) ); } - msg = AddHotkeyName( _( "Edit Rectangle Options" ), g_Libedit_Hokeys_Descr, HK_EDIT ); + msg = AddHotkeyName( _( "Edit Rectangle Options..." ), g_Libedit_Hokeys_Descr, HK_EDIT ); AddMenuItem( PopMenu, ID_POPUP_LIBEDIT_BODY_EDIT_ITEM, msg, KiBitmap( options_rectangle_xpm ) ); @@ -191,7 +191,7 @@ bool LIB_EDIT_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* PopMenu ) KiBitmap( move_xpm ) ); } - msg = AddHotkeyName( _( "Edit" ), g_Libedit_Hokeys_Descr, HK_EDIT ); + msg = AddHotkeyName( _( "Edit..." ), g_Libedit_Hokeys_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 ); @@ -221,7 +221,7 @@ 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_Hokeys_Descr, HK_EDIT ); AddMenuItem( PopMenu, ID_POPUP_LIBEDIT_BODY_EDIT_ITEM, msg, KiBitmap( options_segment_xpm ) ); @@ -255,7 +255,7 @@ bool LIB_EDIT_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* PopMenu ) msg = AddHotkeyName( _( "Rotate Clockwise" ), g_Libedit_Hokeys_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_Hokeys_Descr, HK_EDIT ); AddMenuItem( PopMenu, ID_POPUP_LIBEDIT_FIELD_EDIT_ITEM, msg, KiBitmap( edit_text_xpm ) ); break; @@ -285,7 +285,7 @@ void AddMenusForPin( wxMenu* PopMenu, LIB_PIN* Pin, LIB_EDIT_FRAME* frame ) 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_Hokeys_Descr, HK_EDIT); AddMenuItem( PopMenu, ID_LIBEDIT_EDIT_PIN, msg, KiBitmap( edit_xpm ) ); msg = AddHotkeyName( _( "Rotate Clockwise" ), g_Libedit_Hokeys_Descr, HK_ROTATE ); @@ -303,16 +303,16 @@ void AddMenusForPin( wxMenu* PopMenu, LIB_PIN* Pin, LIB_EDIT_FRAME* frame ) _( "Global" ), KiBitmap( pin_to_xpm ) ); AddMenuItem( global_pin_change, ID_POPUP_LIBEDIT_PIN_GLOBAL_CHANGE_PINSIZE_ITEM, - selected ? _( "Pin Size to selected pins" ) : - _( "Pin Size to Others" ), KiBitmap( pin_size_to_xpm ) ); + selected ? _( "Push Pin Size to Selected Pin" ) : + _( "Push Pin Size to Others" ), KiBitmap( pin_size_to_xpm ) ); AddMenuItem( global_pin_change, ID_POPUP_LIBEDIT_PIN_GLOBAL_CHANGE_PINNAMESIZE_ITEM, - selected ? _( "Pin Name Size to selected pin" ) : - _( "Pin Name Size to Others" ), KiBitmap( pin_name_to_xpm ) ); + selected ? _( "Push Pin Name Size to Selected Pin" ) : + _( "Push Pin Name Size to Others" ), KiBitmap( pin_name_to_xpm ) ); AddMenuItem( global_pin_change, ID_POPUP_LIBEDIT_PIN_GLOBAL_CHANGE_PINNUMSIZE_ITEM, - selected ? _( "Pin Num Size to selected pin" ) : - _( "Pin Num Size to Others" ), KiBitmap( pin_number_to_xpm ) ); + selected ? _( "Push Pin Num Size to Selected Pin" ) : + _( "Push Pin Num Size to Others" ), KiBitmap( pin_number_to_xpm ) ); } @@ -326,7 +326,7 @@ void AddMenusForBlock( wxMenu* PopMenu, LIB_EDIT_FRAME* frame ) if( frame->GetScreen()->m_BlockLocate.GetCommand() == BLOCK_MOVE ) AddMenuItem( PopMenu, ID_POPUP_ZOOM_BLOCK, - _( "Zoom Block (drag middle mouse)" ), + _( "Zoom Block" ), KiBitmap( zoom_area_xpm ) ); PopMenu->AppendSeparator(); diff --git a/eeschema/menubar.cpp b/eeschema/menubar.cpp index 9aedeab590..660ff1b88f 100644 --- a/eeschema/menubar.cpp +++ b/eeschema/menubar.cpp @@ -55,9 +55,6 @@ static void prepareToolsMenu( wxMenu* aParentMenu ); // Build the help menu static void prepareHelpMenu( wxMenu* aParentMenu ); -// Build the import/export submenu -static void prepareImportExportMenu( wxMenu* aParentMenu ); - // Build the edit menu static void prepareEditMenu( wxMenu* aParentMenu ); @@ -304,11 +301,11 @@ void prepareFilesMenu( wxMenu* aParentMenu, bool aIsOutsideProject ) { AddMenuItem( aParentMenu, ID_NEW_PROJECT, - _( "&New" ), + _( "&New..." ), _( "Clear current schematic hierarchy and start new schematic root sheet" ), KiBitmap( new_document_xpm ) ); - text = AddHotkeyName( _( "&Open" ), g_Schematic_Hokeys_Descr, HK_LOAD_SCH ); + text = AddHotkeyName( _( "&Open..." ), g_Schematic_Hokeys_Descr, HK_LOAD_SCH ); AddMenuItem( aParentMenu, ID_LOAD_PROJECT, text, _( "Open existing schematic" ), @@ -338,12 +335,12 @@ void prepareFilesMenu( wxMenu* aParentMenu, bool aIsOutsideProject ) } AddMenuItem( aParentMenu, - ID_APPEND_PROJECT, _( "App&end Schematic Sheet" ), + ID_APPEND_PROJECT, _( "App&end Schematic Sheet..." ), _( "Import schematic sheet content from another project to current sheet" ), KiBitmap( add_document_xpm ) ); AddMenuItem( aParentMenu, - ID_IMPORT_NON_KICAD_SCH, _( "&Import Non-Kicad Schematic File" ), + ID_IMPORT_NON_KICAD_SCH, _( "&Import Non-Kicad Schematic File..." ), _( "Import schematic file from other applications" ), KiBitmap( import_document_xpm ) ); // TODO needs a different icon @@ -366,7 +363,7 @@ void prepareFilesMenu( wxMenu* aParentMenu, bool aIsOutsideProject ) { AddMenuItem( aParentMenu, ID_SAVE_ONE_SHEET_UNDER_NEW_NAME, - _( "Save C&urrent Sheet As" ), + _( "Save C&urrent Sheet As..." ), _( "Save current schematic sheet with new name" ), KiBitmap( save_as_xpm ) ); } @@ -375,35 +372,26 @@ void prepareFilesMenu( wxMenu* aParentMenu, bool aIsOutsideProject ) // Edit page layout: AddMenuItem( aParentMenu, ID_SHEET_SET, - _( "Pa&ge Settings" ), + _( "Pa&ge Settings..." ), _( "Settings for sheet size and frame references" ), KiBitmap( sheetset_xpm ) ); AddMenuItem( aParentMenu, wxID_PRINT, - _( "Pri&nt" ), + _( "Pri&nt..." ), _( "Print schematic sheet" ), KiBitmap( print_button_xpm ) ); - // Plot submenu - wxMenu* choice_plot_fmt = new wxMenu; - - AddMenuItem( choice_plot_fmt, ID_GEN_PLOT_SCHEMATIC, _( "&Plot" ), + AddMenuItem( aParentMenu, ID_GEN_PLOT_SCHEMATIC, _( "&Plot..." ), _( "Plot schematic sheet in PostScript, PDF, SVG, DXF or HPGL format" ), KiBitmap( plot_xpm ) ); // Plot to Clipboard - AddMenuItem( choice_plot_fmt, ID_GEN_COPY_SHEET_TO_CLIPBOARD, + AddMenuItem( aParentMenu, ID_GEN_COPY_SHEET_TO_CLIPBOARD, _( "Plot to C&lipboard" ), _( "Export drawings to clipboard" ), KiBitmap( copy_xpm ) ); - // Add plot submenu - AddMenuItem( aParentMenu, choice_plot_fmt, - ID_GEN_PLOT, _( "&Plot" ), - _( "Plot schematic sheet in HPGL, PostScript or SVG format" ), - KiBitmap( plot_xpm ) ); - // Quit aParentMenu->AppendSeparator(); AddMenuItem( aParentMenu, wxID_EXIT, _( "&Close" ), _( "Close Eeschema" ), @@ -433,11 +421,11 @@ void prepareEditMenu( wxMenu* aParentMenu ) // Find aParentMenu->AppendSeparator(); - text = AddHotkeyName( _( "&Find" ), g_Schematic_Hokeys_Descr, HK_FIND_ITEM ); + text = AddHotkeyName( _( "&Find..." ), g_Schematic_Hokeys_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_Hokeys_Descr, HK_FIND_REPLACE ); AddMenuItem( aParentMenu, wxID_REPLACE, text, HELP_REPLACE, KiBitmap( find_replace_xpm ) ); @@ -445,20 +433,20 @@ void prepareEditMenu( wxMenu* aParentMenu ) // Import footprint association .cmp file which can be created by Pcbnew: aParentMenu->AppendSeparator(); AddMenuItem( aParentMenu, ID_BACKANNO_ITEMS, - _( "Import Footprint Association File" ), + _( "Import Footprint Association File..." ), HELP_IMPORT_FOOTPRINTS, KiBitmap( import_footprint_names_xpm ) ); // Update field values AddMenuItem( aParentMenu, ID_UPDATE_FIELDS, - _( "Update Field Values" ), + _( "Update Field Values..." ), _( "Sets symbol fields to original library values" ), KiBitmap( update_fields_xpm ) ); // Edit components to symbols library links (change LIB_ID values) aParentMenu->AppendSeparator(); AddMenuItem( aParentMenu, ID_EDIT_COMPONENTS_TO_SYMBOLS_LIB_ID, - _( "Edit Symbol Library Links" ), + _( "Edit Symbol Library Links..." ), _( "Edit schematic symbol's symbol library links" ), KiBitmap( edit_cmp_symb_links_xpm ) ); } @@ -468,7 +456,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_Hokeys_Descr, HK_UPDATE_PCB_FROM_SCH ); AddMenuItem( aParentMenu, @@ -497,13 +485,13 @@ void prepareToolsMenu( wxMenu* aParentMenu ) AddMenuItem( aParentMenu, ID_RESCUE_CACHED, - _( "&Rescue Symbols" ), + _( "&Rescue Symbols..." ), _( "Find old symbols in project and rename/rescue them" ), KiBitmap( rescue_xpm ) ); AddMenuItem( aParentMenu, ID_REMAP_SYMBOLS, - _( "Remap Symbols" ), + _( "Remap Symbols..." ), _( "Remap legacy library symbols to symbol library table" ), KiBitmap( rescue_xpm ) ); @@ -511,7 +499,7 @@ void prepareToolsMenu( wxMenu* aParentMenu ) AddMenuItem( aParentMenu, ID_GET_ANNOTATE, - _( "&Annotate Schematic" ), HELP_ANNOTATE, + _( "&Annotate Schematic..." ), HELP_ANNOTATE, KiBitmap( annotate_xpm ) ); // ERC @@ -523,18 +511,18 @@ void prepareToolsMenu( wxMenu* aParentMenu ) AddMenuItem( aParentMenu, ID_GET_NETLIST, - _( "Generate &Netlist File" ), + _( "Generate &Netlist File..." ), _( "Generate netlist file" ), KiBitmap( netlist_xpm ) ); AddMenuItem( aParentMenu, ID_OPEN_CMP_TABLE, - _( "Symbol Table &View" ), + _( "S&ymbol Table..." ), KiBitmap( spreadsheet_xpm ) ); AddMenuItem( aParentMenu, ID_GET_TOOLS, - _( "Generate Bill of &Materials" ), + _( "Generate Bill of &Materials..." ), HELP_GENERATE_BOM, KiBitmap( bom_xpm ) ); @@ -545,7 +533,7 @@ void prepareToolsMenu( wxMenu* aParentMenu ) // Run CvPcb AddMenuItem( aParentMenu, ID_RUN_CVPCB, - _( "A&ssign Footprint" ), + _( "A&ssign Footprints" ), _( "Run CvPcb" ), KiBitmap( cvpcb_xpm ) ); @@ -578,7 +566,7 @@ void prepareHelpMenu( wxMenu* aParentMenu ) AddMenuItem( aParentMenu, ID_PREFERENCES_HOTKEY_SHOW_CURRENT_LIST, - _( "&List Hotkeys" ), + _( "&List Hotkeys..." ), _( "Displays current hotkeys list and corresponding commands" ), KiBitmap( hotkeys_xpm ) ); @@ -597,48 +585,19 @@ void prepareHelpMenu( wxMenu* aParentMenu ) } -void prepareImportExportMenu( wxMenu* aParentMenu ) -{ - AddMenuItem( aParentMenu, - ID_CONFIG_SAVE, - _( "&Save Preferences" ), - _( "Save application preferences" ), - KiBitmap( save_setup_xpm ) ); - - AddMenuItem( aParentMenu, - ID_CONFIG_READ, - _( "Load Prefe&rences" ), - _( "Load application preferences" ), - KiBitmap( import_setup_xpm ) ); - - aParentMenu->AppendSeparator(); - - AddMenuItem( aParentMenu, - ID_PREFERENCES_HOTKEY_EXPORT_CONFIG, - _( "E&xport Hotkeys" ), - _( "Create hotkey configuration file with current hotkeys" ), - KiBitmap( hotkeys_export_xpm ) ); - - AddMenuItem( aParentMenu, - ID_PREFERENCES_HOTKEY_IMPORT_CONFIG, - _( "&Import Hotkeys" ), - _( "Load existing hotkey configuration file" ), - KiBitmap( hotkeys_import_xpm ) ); -} - static void preparePreferencesMenu( SCH_EDIT_FRAME* aFrame, wxMenu* aParentMenu ) { // Library AddMenuItem( aParentMenu, ID_EDIT_SYM_LIB_TABLE, - _( "Manage Symbol Library Tables" ), + _( "Manage Symbol Library Tables..." ), _( "Edit the global and project symbol library tables (list of active libraries)." ), KiBitmap( library_table_xpm ) ); // Path configuration edit dialog. AddMenuItem( aParentMenu, ID_PREFERENCES_CONFIGURE_PATHS, - _( "Configure &Paths" ), + _( "Configure &Paths..." ), _( "Edit path configuration environment variables" ), KiBitmap( path_xpm ) ); @@ -660,14 +619,31 @@ static void preparePreferencesMenu( SCH_EDIT_FRAME* aFrame, wxMenu* aParentMenu // Icons options submenu aFrame->AddMenuIconsOptions( aParentMenu ); - // Import/export (submenu in preferences menu) + // Import/export aParentMenu->AppendSeparator(); - wxMenu* importExportSubmenu = new wxMenu(); - prepareImportExportMenu( importExportSubmenu ); - - AddMenuItem( aParentMenu, importExportSubmenu, - wxID_ANY, - _( "&Import and Export" ), - _( "Import and export settings" ), + AddMenuItem( aParentMenu, + ID_CONFIG_SAVE, + _( "&Save Preferences..." ), + _( "Save application preferences" ), KiBitmap( save_setup_xpm ) ); + + AddMenuItem( aParentMenu, + ID_CONFIG_READ, + _( "Load Prefe&rences..." ), + _( "Load application preferences" ), + KiBitmap( import_setup_xpm ) ); + + aParentMenu->AppendSeparator(); + + AddMenuItem( aParentMenu, + ID_PREFERENCES_HOTKEY_EXPORT_CONFIG, + _( "E&xport Hotkeys..." ), + _( "Create hotkey configuration file with current hotkeys" ), + KiBitmap( hotkeys_export_xpm ) ); + + AddMenuItem( aParentMenu, + ID_PREFERENCES_HOTKEY_IMPORT_CONFIG, + _( "&Import Hotkeys..." ), + _( "Load existing hotkey configuration file" ), + KiBitmap( hotkeys_import_xpm ) ); } diff --git a/eeschema/menubar_libedit.cpp b/eeschema/menubar_libedit.cpp index 8cbb4ce6f9..a59dfd00dc 100644 --- a/eeschema/menubar_libedit.cpp +++ b/eeschema/menubar_libedit.cpp @@ -65,13 +65,13 @@ void LIB_EDIT_FRAME::ReCreateMenuBar() // Creating/loading libraries AddMenuItem( fileMenu, ID_LIBEDIT_NEW_LIBRARY, - _( "&New Library" ), + _( "&New Library..." ), _( "Creates an empty library" ), KiBitmap( new_library_xpm ) ); AddMenuItem( fileMenu, ID_LIBEDIT_ADD_LIBRARY, - _( "&Add Library" ), + _( "&Add Library..." ), _( "Adds a previously created library" ), KiBitmap( add_library_xpm ) ); @@ -103,8 +103,8 @@ void LIB_EDIT_FRAME::ReCreateMenuBar() // Export as png file AddMenuItem( fileMenu, ID_LIBEDIT_GEN_PNG_FILE, - _( "Create &PNG File from Screen..." ), - _( "Create a PNG file from the current symbol" ), + _( "Export Current View as &PNG..." ), + _( "Create a PNG file from the current view" ), KiBitmap( plot_xpm ) ); // Export as SVG file @@ -190,7 +190,7 @@ void LIB_EDIT_FRAME::ReCreateMenuBar() AddMenuItem( partMenu, ID_LIBEDIT_NEW_PART, - _( "&New Symbol" ), + _( "&New Symbol..." ), _( "Create a new empty symbol" ), KiBitmap( new_component_xpm ) ); @@ -205,13 +205,13 @@ void LIB_EDIT_FRAME::ReCreateMenuBar() AddMenuItem( partMenu, ID_LIBEDIT_IMPORT_PART, - _( "&Import Symbol" ), + _( "&Import Symbol..." ), _( "Import a symbol to the current library" ), KiBitmap( import_part_xpm ) ); AddMenuItem( partMenu, ID_LIBEDIT_EXPORT_PART, - _( "&Export Symbol" ), + _( "&Export Symbol..." ), _( "Export the current symbol" ), KiBitmap( export_part_xpm ) ); @@ -219,13 +219,13 @@ void LIB_EDIT_FRAME::ReCreateMenuBar() AddMenuItem( partMenu, ID_LIBEDIT_GET_FRAME_EDIT_PART, - _( "&Properties" ), + _( "&Properties..." ), _( "Edit symbol properties" ), KiBitmap( part_properties_xpm ) ); AddMenuItem( partMenu, ID_LIBEDIT_GET_FRAME_EDIT_FIELDS, - _( "&Fields" ), + _( "&Fields..." ), _( "Edit field properties" ), KiBitmap( edit_text_xpm ) ); @@ -233,13 +233,13 @@ void LIB_EDIT_FRAME::ReCreateMenuBar() AddMenuItem( partMenu, ID_LIBEDIT_EDIT_PIN_BY_TABLE, - _( "Pi&n Table" ), + _( "Pi&n Table..." ), _( "Show pin table" ), KiBitmap( pin_table_xpm ) ); AddMenuItem( partMenu, ID_LIBEDIT_CHECK_PART, - _( "ERC" ), + _( "Electrical Rules Checker" ), _( "Check duplicate and off grid pins" ), KiBitmap( erc_xpm ) ); @@ -294,14 +294,14 @@ void LIB_EDIT_FRAME::ReCreateMenuBar() // Library list AddMenuItem( preferencesMenu, ID_EDIT_SYM_LIB_TABLE, - _( "Manage Symbol Libraries" ), + _( "Manage Symbol Libraries..." ), _( "Edit the global and project symbol library tables." ), KiBitmap( library_table_xpm ) ); // Default values and options AddMenuItem( preferencesMenu, wxID_PREFERENCES, - _( "General &Options" ), + _( "General &Options..." ), _( "Set Symbol Editor default values and options" ), KiBitmap( preference_xpm ) ); @@ -329,7 +329,7 @@ void LIB_EDIT_FRAME::ReCreateMenuBar() AddMenuItem( helpMenu, ID_PREFERENCES_HOTKEY_SHOW_CURRENT_LIST, - _( "&List Hotkeys" ), + _( "&List Hotkeys..." ), _( "Displays the current hotkeys list and corresponding commands" ), KiBitmap( hotkeys_xpm ) ); diff --git a/eeschema/onrightclick.cpp b/eeschema/onrightclick.cpp index 659cb883c9..2627a7fffc 100644 --- a/eeschema/onrightclick.cpp +++ b/eeschema/onrightclick.cpp @@ -98,33 +98,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_Hokeys_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_Hokeys_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_Hokeys_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_Hokeys_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_Hokeys_Descr, HK_EDIT ); AddMenuItem( PopMenu, ID_SCH_EDIT_ITEM, msg, KiBitmap( image_xpm ) ); PopMenu->AppendSeparator(); break; @@ -329,19 +329,19 @@ void AddMenusForComponentField( wxMenu* PopMenu, SCH_FIELD* Field ) { case REFERENCE: id = HK_EDIT_COMPONENT_REFERENCE; - name = _( "Edit Reference" ); + name = _( "Edit Reference..." ); break; case VALUE: id = HK_EDIT_COMPONENT_VALUE; - name = _( "Edit Value" ); + name = _( "Edit Value..." ); break; case FOOTPRINT: id = HK_EDIT_COMPONENT_FOOTPRINT; - name = _( "Edit Footprint Field" ); + name = _( "Edit Footprint Field..." ); break; default: id = HK_EDIT; - name = _( "Edit Field" ); + name = _( "Edit Field..." ); break; } msg = AddHotkeyName( name, g_Schematic_Hokeys_Descr, id ); @@ -430,22 +430,22 @@ 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_Hokeys_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_Hokeys_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_Hokeys_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_Hokeys_Descr, HK_EDIT_COMPONENT_FOOTPRINT ); AddMenuItem( editmenu, ID_SCH_EDIT_COMPONENT_FOOTPRINT, msg, KiBitmap( edit_comp_footprint_xpm ) ); @@ -513,7 +513,7 @@ void AddMenusForGLabel( wxMenu* PopMenu, SCH_GLOBALLABEL* GLabel ) msg = AddHotkeyName( _( "Rotate Clockwise" ), g_Schematic_Hokeys_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_Hokeys_Descr, HK_EDIT ); AddMenuItem( PopMenu, ID_SCH_EDIT_ITEM, msg, KiBitmap( edit_text_xpm ) ); msg = AddHotkeyName( _( "Delete" ), g_Schematic_Hokeys_Descr, HK_DELETE ); AddMenuItem( PopMenu, ID_POPUP_SCH_DELETE, msg, KiBitmap( delete_xpm ) ); @@ -549,7 +549,7 @@ void AddMenusForHLabel( wxMenu* PopMenu, SCH_HIERLABEL* HLabel ) msg = AddHotkeyName( _( "Rotate Clockwise" ), g_Schematic_Hokeys_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_Hokeys_Descr, HK_EDIT ); AddMenuItem( PopMenu, ID_SCH_EDIT_ITEM, msg, KiBitmap( edit_text_xpm ) ); msg = AddHotkeyName( _( "Delete" ), g_Schematic_Hokeys_Descr, HK_DELETE ); AddMenuItem( PopMenu, ID_POPUP_SCH_DELETE, msg, KiBitmap( delete_xpm ) ); @@ -585,7 +585,7 @@ void AddMenusForLabel( wxMenu* PopMenu, SCH_LABEL* Label ) msg = AddHotkeyName( _( "Rotate Counterclockwise" ), g_Schematic_Hokeys_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_Hokeys_Descr, HK_EDIT ); AddMenuItem( PopMenu, ID_SCH_EDIT_ITEM, msg, KiBitmap( edit_text_xpm ) ); msg = AddHotkeyName( _( "Delete" ), g_Schematic_Hokeys_Descr, HK_DELETE ); AddMenuItem( PopMenu, ID_POPUP_SCH_DELETE, msg, KiBitmap( delete_xpm ) ); @@ -619,7 +619,7 @@ void AddMenusForText( wxMenu* PopMenu, SCH_TEXT* Text ) msg = AddHotkeyName( _( "Rotate Counterclockwise" ), g_Schematic_Hokeys_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_Hokeys_Descr, HK_EDIT ); AddMenuItem( PopMenu, ID_SCH_EDIT_ITEM, msg, KiBitmap( edit_text_xpm ) ); msg = AddHotkeyName( _( "Delete" ), g_Schematic_Hokeys_Descr, HK_DELETE ); AddMenuItem( PopMenu, ID_POPUP_SCH_DELETE, msg, KiBitmap( delete_xpm ) ); @@ -710,12 +710,12 @@ void AddMenusForWire( wxMenu* PopMenu, SCH_LINE* Wire, SCH_EDIT_FRAME* frame ) msg = AddHotkeyName( _( "Add Junction" ), g_Schematic_Hokeys_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_Hokeys_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. if( Wire->IsEndPoint( pos ) ) - AddMenuItem( PopMenu, ID_POPUP_SCH_ADD_GLABEL, _( "Add Global Label" ), + AddMenuItem( PopMenu, ID_POPUP_SCH_ADD_GLABEL, _( "Add Global Label..." ), KiBitmap( add_glabel_xpm ) ); } @@ -748,12 +748,12 @@ void AddMenusForBus( wxMenu* PopMenu, SCH_LINE* Bus, SCH_EDIT_FRAME* frame ) PopMenu->AppendSeparator(); msg = AddHotkeyName( _( "Add Junction" ), g_Schematic_Hokeys_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_Hokeys_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. if( Bus->IsEndPoint( pos ) ) - AddMenuItem( PopMenu, ID_POPUP_SCH_ADD_GLABEL, _( "Add Global Label" ), + AddMenuItem( PopMenu, ID_POPUP_SCH_ADD_GLABEL, _( "Add Global Label..." ), KiBitmap( add_glabel_xpm ) ); } @@ -804,7 +804,7 @@ void AddMenusForHierchicalSheet( wxMenu* PopMenu, SCH_SHEET* Sheet ) } else { - msg = AddHotkeyName( _( "Edit" ), g_Schematic_Hokeys_Descr, HK_EDIT ); + msg = AddHotkeyName( _( "Edit..." ), g_Schematic_Hokeys_Descr, HK_EDIT ); AddMenuItem( PopMenu, ID_SCH_EDIT_ITEM, msg, KiBitmap( editor_xpm ) ); AddMenuItem( PopMenu, ID_POPUP_SCH_RESIZE_SHEET, _( "Resize" ), @@ -835,7 +835,7 @@ void AddMenusForSheetPin( wxMenu* PopMenu, SCH_SHEET_PIN* PinSheet ) AddMenuItem( PopMenu, ID_SCH_MOVE_ITEM, msg, KiBitmap( move_xpm ) ); } - AddMenuItem( PopMenu, ID_SCH_EDIT_ITEM, _( "Edit" ), KiBitmap( edit_xpm ) ); + AddMenuItem( PopMenu, ID_SCH_EDIT_ITEM, _( "Edit..." ), KiBitmap( edit_xpm ) ); if( !PinSheet->GetFlags() ) AddMenuItem( PopMenu, ID_POPUP_SCH_DELETE, _( "Delete" ), @@ -920,7 +920,7 @@ void AddMenusForBitmap( wxMenu* aPopMenu, SCH_BITMAP * aBitmap ) 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 ); + msg = AddHotkeyName( _( "Edit Image..." ), g_Schematic_Hokeys_Descr, HK_EDIT ); AddMenuItem( aPopMenu, ID_SCH_EDIT_ITEM, msg, KiBitmap( image_xpm ) ); if( aBitmap->GetFlags() == 0 ) diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp index f152fac6d5..9810be372b 100644 --- a/eeschema/sim/sim_plot_frame.cpp +++ b/eeschema/sim/sim_plot_frame.cpp @@ -1223,17 +1223,17 @@ SIM_PLOT_FRAME::SIGNAL_CONTEXT_MENU::SIGNAL_CONTEXT_MENU( const wxString& aSigna { SIM_PLOT_PANEL* plot = m_plotFrame->CurrentPlot(); - AddMenuItem( this, HIDE_SIGNAL, _( "Hide signal" ), + AddMenuItem( this, HIDE_SIGNAL, _( "Hide Signal" ), _( "Erase the signal from plot screen" ), KiBitmap( delete_xpm ) ); TRACE* trace = plot->GetTrace( m_signal ); if( trace->HasCursor() ) - AddMenuItem( this, HIDE_CURSOR, _( "Hide cursor" ), + AddMenuItem( this, HIDE_CURSOR, _( "Hide Cursor" ), wxEmptyString, KiBitmap( pcb_target_xpm ) ); else - AddMenuItem( this, SHOW_CURSOR, _( "Show cursor" ), + AddMenuItem( this, SHOW_CURSOR, _( "Show Cursor" ), wxEmptyString, KiBitmap( pcb_target_xpm ) ); Connect( wxEVT_COMMAND_MENU_SELECTED, wxMenuEventHandler( SIGNAL_CONTEXT_MENU::onMenuEvent ), NULL, this ); diff --git a/gerbview/menubar.cpp b/gerbview/menubar.cpp index 6223f95e58..fec4d4e425 100644 --- a/gerbview/menubar.cpp +++ b/gerbview/menubar.cpp @@ -61,25 +61,25 @@ void GERBVIEW_FRAME::ReCreateMenuBar() // Load Gerber files AddMenuItem( fileMenu, wxID_FILE, - _( "Load &Gerber File" ), + _( "Load &Gerber File..." ), _( "Load a new Gerber file on the current layer. Previous data will be deleted" ), KiBitmap( load_gerber_xpm ) ); // Load Excellon drill files AddMenuItem( fileMenu, ID_GERBVIEW_LOAD_DRILL_FILE, - _( "Load &EXCELLON Drill File" ), + _( "Load &EXCELLON Drill File..." ), _( "Load excellon drill file" ), KiBitmap( gerbview_drill_file_xpm ) ); // Load Gerber job files AddMenuItem( fileMenu, ID_GERBVIEW_LOAD_JOB_FILE, - _( "Load Gerber &Job File" ), + _( "Load Gerber &Job File..." ), _( "Load a Gerber job file, and load gerber files depending on the job" ), KiBitmap( gerber_job_file_xpm ) ); // Load Zip archive files AddMenuItem( fileMenu, ID_GERBVIEW_LOAD_ZIP_ARCHIVE_FILE, - _( "Load &Zip Archive File" ), + _( "Load &Zip Archive File..." ), _( "Load a zipped archive (Gerber and drill) file" ), KiBitmap( zip_xpm ) ); @@ -159,7 +159,7 @@ void GERBVIEW_FRAME::ReCreateMenuBar() // Export to Pcbnew AddMenuItem( fileMenu, ID_GERBVIEW_EXPORT_TO_PCBNEW, - _( "E&xport to Pcbnew" ), + _( "E&xport to Pcbnew..." ), _( "Export data in Pcbnew format" ), KiBitmap( export_xpm ) ); @@ -168,7 +168,7 @@ void GERBVIEW_FRAME::ReCreateMenuBar() // Print AddMenuItem( fileMenu, wxID_PRINT, - _( "&Print" ), _( "Print gerber" ), + _( "&Print..." ), _( "Print gerber" ), KiBitmap( print_button_xpm ) ); // Separator @@ -211,7 +211,7 @@ void GERBVIEW_FRAME::ReCreateMenuBar() // Canvas selection configMenu->AppendSeparator(); - text = AddHotkeyName( _( "Legacy graphic&s" ), GerbviewHokeysDescr, + text = AddHotkeyName( _( "Legacy Graphic&s" ), GerbviewHokeysDescr, HK_CANVAS_LEGACY ); configMenu->Append( @@ -264,7 +264,7 @@ void GERBVIEW_FRAME::ReCreateMenuBar() // Text editor (usefull to browse source files) AddMenuItem( miscellaneousMenu, ID_MENU_GERBVIEW_SELECT_PREFERED_EDITOR, - _( "&Text Editor" ), + _( "Set &Text Editor..." ), _( "Select your preferred text editor" ), KiBitmap( editor_xpm ) ); @@ -277,7 +277,7 @@ void GERBVIEW_FRAME::ReCreateMenuBar() KiBitmap( online_help_xpm ) ); AddMenuItem( helpMenu, ID_PREFERENCES_HOTKEY_SHOW_CURRENT_LIST, - _( "&List Hotkeys" ), + _( "&List Hotkeys..." ), _( "Displays the current hotkeys list and corresponding commands" ), KiBitmap( hotkeys_xpm ) ); diff --git a/gerbview/onrightclick.cpp b/gerbview/onrightclick.cpp index 42480ed431..ec5b9b300f 100644 --- a/gerbview/onrightclick.cpp +++ b/gerbview/onrightclick.cpp @@ -103,7 +103,7 @@ bool GERBVIEW_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* aPopMenu ) ( net_attr.m_NetAttribType & GBR_NETLIST_METADATA::GBR_NETINFO_CMP ) ) { AddMenuItem( aPopMenu, ID_HIGHLIGHT_CMP_ITEMS, - wxString::Format( _( "Highlight items of component \"%s\"" ), + wxString::Format( _( "Highlight Items of Component \"%s\"" ), GetChars( net_attr.m_Cmpref ) ), KiBitmap( file_footprint_xpm ) ); add_separator = true; @@ -112,7 +112,7 @@ bool GERBVIEW_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* aPopMenu ) if( ( net_attr.m_NetAttribType & GBR_NETLIST_METADATA::GBR_NETINFO_NET ) ) { AddMenuItem( aPopMenu, ID_HIGHLIGHT_NET_ITEMS, - wxString::Format( _( "Highlight items of net \"%s\"" ), + wxString::Format( _( "Highlight Items of Net \"%s\"" ), GetChars( net_attr.m_Netname ) ), KiBitmap( general_ratsnest_xpm ) ); add_separator = true; @@ -123,7 +123,7 @@ bool GERBVIEW_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* aPopMenu ) if( apertDescr && !apertDescr->m_AperFunction.IsEmpty() ) { AddMenuItem( aPopMenu, ID_HIGHLIGHT_APER_ATTRIBUTE_ITEMS, - wxString::Format( _( "Highlight aperture type \"%s\"" ), + wxString::Format( _( "Highlight Aperture Type \"%s\"" ), GetChars( apertDescr->m_AperFunction ) ), KiBitmap( flag_xpm ) ); add_separator = true; @@ -134,7 +134,7 @@ bool GERBVIEW_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* aPopMenu ) } AddMenuItem( aPopMenu, ID_HIGHLIGHT_REMOVE_ALL, - _( "Clear highlight" ), + _( "Clear Highlight" ), KiBitmap( gerbview_clear_layers_xpm ) ); aPopMenu->AppendSeparator(); diff --git a/gerbview/tools/selection_tool.cpp b/gerbview/tools/selection_tool.cpp index c4ccc95856..bc3f0f6121 100644 --- a/gerbview/tools/selection_tool.cpp +++ b/gerbview/tools/selection_tool.cpp @@ -71,7 +71,7 @@ TOOL_ACTION GERBVIEW_ACTIONS::selectionClear( "gerbview.InteractiveSelection.Cle TOOL_ACTION GERBVIEW_ACTIONS::measureTool( "gerbview.InteractiveSelection.measureTool", AS_GLOBAL, MD_CTRL + MD_SHIFT + 'M', - _( "Measure tool" ), _( "Interactively measure distance between points" ), + _( "Measure Tool" ), _( "Interactively measure distance between points" ), nullptr, AF_ACTIVATE ); @@ -81,7 +81,7 @@ public: HIGHLIGHT_MENU() { SetIcon( net_highlight_schematic_xpm ); - SetTitle( _( "Highlight..." ) ); + SetTitle( _( "Highlight" ) ); } private: @@ -101,7 +101,7 @@ private: ( net_attr.m_NetAttribType & GBR_NETLIST_METADATA::GBR_NETINFO_CMP ) ) { auto menuEntry = Add( GERBVIEW_ACTIONS::highlightComponent ); - menuEntry->SetItemLabel( wxString::Format( _( "Highlight items of component \"%s\"" ), + menuEntry->SetItemLabel( wxString::Format( _( "Highlight Items of Component \"%s\"" ), GetChars( net_attr.m_Cmpref ) ) ); addSeparator = true; } @@ -109,7 +109,7 @@ private: if( ( net_attr.m_NetAttribType & GBR_NETLIST_METADATA::GBR_NETINFO_NET ) ) { auto menuEntry = Add( GERBVIEW_ACTIONS::highlightNet ); - menuEntry->SetItemLabel( wxString::Format( _( "Highlight items of net \"%s\"" ), + menuEntry->SetItemLabel( wxString::Format( _( "Highlight Items of Net \"%s\"" ), GetChars( net_attr.m_Netname ) ) ); addSeparator = true; } @@ -119,7 +119,7 @@ private: if( apertDescr && !apertDescr->m_AperFunction.IsEmpty() ) { auto menuEntry = Add( GERBVIEW_ACTIONS::highlightAttribute ); - menuEntry->SetItemLabel( wxString::Format( _( "Highlight aperture type \"%s\"" ), + menuEntry->SetItemLabel( wxString::Format( _( "Highlight Aperture Type \"%s\"" ), GetChars( apertDescr->m_AperFunction ) ) ); addSeparator = true; } diff --git a/kicad/menubar.cpp b/kicad/menubar.cpp index a093d45235..8fa6c20818 100644 --- a/kicad/menubar.cpp +++ b/kicad/menubar.cpp @@ -269,7 +269,7 @@ void KICAD_MANAGER_FRAME::ReCreateMenuBar() fileMenu->AppendSeparator(); wxMenu* importprjSubMenu = new wxMenu(); - AddMenuItem( importprjSubMenu, ID_IMPORT_EAGLE_PROJECT, _( "Eagle CAD" ), + AddMenuItem( importprjSubMenu, ID_IMPORT_EAGLE_PROJECT, _( "Eagle CAD..." ), _( "Import Eagle CAD XML schematic and board" ), KiBitmap( import_project_xpm ) ); @@ -329,7 +329,7 @@ void KICAD_MANAGER_FRAME::ReCreateMenuBar() // View file AddMenuItem( browseMenu, ID_BROWSE_AN_SELECT_FILE, - _( "&Open Local File" ), + _( "&Open Local File..." ), _( "Edit local file" ), KiBitmap( browse_files_xpm ) ); @@ -339,14 +339,14 @@ void KICAD_MANAGER_FRAME::ReCreateMenuBar() // Path configuration edit dialog. AddMenuItem( preferencesMenu, ID_PREFERENCES_CONFIGURE_PATHS, - _( "Configure Pa&ths" ), + _( "Configure Pa&ths..." ), _( "Edit path configuration environment variables" ), KiBitmap( path_xpm ) ); // Text editor AddMenuItem( preferencesMenu, ID_SELECT_PREFERED_EDITOR, - _( "&Set Text Editor" ), + _( "&Set Text Editor..." ), _( "Set your preferred text editor" ), KiBitmap( editor_xpm ) ); @@ -375,7 +375,7 @@ void KICAD_MANAGER_FRAME::ReCreateMenuBar() // Append PDF Viewer submenu to preferences AddMenuItem( SubMenuPdfBrowserChoice, ID_SELECT_PREFERED_PDF_BROWSER_NAME, - _( "Set &PDF Viewer" ), + _( "Set &PDF Viewer..." ), _( "Set favourite PDF viewer" ), KiBitmap( datasheet_xpm ) ); diff --git a/kicad/tree_project_frame.cpp b/kicad/tree_project_frame.cpp index 4b220094ba..ac4167d7c0 100644 --- a/kicad/tree_project_frame.cpp +++ b/kicad/tree_project_frame.cpp @@ -679,14 +679,14 @@ void TREE_PROJECT_FRAME::OnRight( wxTreeEvent& Event ) { case TREE_PROJECT: AddMenuItem( &popupMenu, ID_PROJECT_NEWDIR, - _( "New D&irectory" ), + _( "New D&irectory..." ), _( "Create a New Directory" ), KiBitmap( directory_xpm ) ); break; case TREE_DIRECTORY: AddMenuItem( &popupMenu, ID_PROJECT_NEWDIR, - _( "New D&irectory" ), + _( "New D&irectory..." ), _( "Create a New Directory" ), KiBitmap( directory_xpm ) ); AddMenuItem( &popupMenu, ID_PROJECT_DELETE, @@ -697,11 +697,11 @@ void TREE_PROJECT_FRAME::OnRight( wxTreeEvent& Event ) default: AddMenuItem( &popupMenu, ID_PROJECT_TXTEDIT, - _( "&Edit in a text editor" ), + _( "&Edit in a Text Editor" ), _( "Open the file in a Text Editor" ), KiBitmap( editor_xpm ) ); AddMenuItem( &popupMenu, ID_PROJECT_RENAME, - _( "&Rename file" ), + _( "&Rename File..." ), _( "Rename file" ), KiBitmap( right_xpm ) ); AddMenuItem( &popupMenu, ID_PROJECT_DELETE, diff --git a/pagelayout_editor/menubar.cpp b/pagelayout_editor/menubar.cpp index e1b766265f..d54d3545c7 100644 --- a/pagelayout_editor/menubar.cpp +++ b/pagelayout_editor/menubar.cpp @@ -94,7 +94,7 @@ void PL_EDITOR_FRAME::ReCreateMenuBar() _( "Save current page layout design file" ), KiBitmap( save_xpm ) ); - msg = AddHotkeyName( _( "Save &As" ), PlEditorHokeysDescr, HK_SAVEAS ); + msg = AddHotkeyName( _( "Save &As..." ), PlEditorHokeysDescr, HK_SAVEAS ); AddMenuItem( fileMenu, wxID_SAVEAS, msg, _( "Save current page layout design file with a different name" ), KiBitmap( save_as_xpm ) ); @@ -131,21 +131,21 @@ void PL_EDITOR_FRAME::ReCreateMenuBar() // View Menu: wxMenu* viewMenu = new wxMenu; - msg = AddHotkeyName( _( "Zoom in" ), PlEditorHokeysDescr, HK_ZOOM_IN ); + msg = AddHotkeyName( _( "Zoom In" ), PlEditorHokeysDescr, HK_ZOOM_IN ); AddMenuItem( viewMenu, ID_ZOOM_IN, msg, wxEmptyString, KiBitmap( zoom_in_xpm ) ); - msg = AddHotkeyName( _( "Zoom out" ), PlEditorHokeysDescr, HK_ZOOM_OUT ); + msg = AddHotkeyName( _( "Zoom Out" ), PlEditorHokeysDescr, HK_ZOOM_OUT ); AddMenuItem( viewMenu, ID_ZOOM_OUT, msg, wxEmptyString, KiBitmap( zoom_out_xpm ) ); - msg = AddHotkeyName( _( "Zoom all" ), PlEditorHokeysDescr, HK_ZOOM_AUTO ); + msg = AddHotkeyName( _( "Zoom All" ), PlEditorHokeysDescr, 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" ), PlEditorHokeysDescr, HK_ZOOM_SELECTION ); AddMenuItem( viewMenu, ID_ZOOM_SELECTION, msg, wxEmptyString, KiBitmap( zoom_area_xpm ) ); viewMenu->AppendSeparator(); - msg = AddHotkeyName( _( "Redraw view" ), PlEditorHokeysDescr, HK_ZOOM_REDRAW ); + msg = AddHotkeyName( _( "Redraw View" ), PlEditorHokeysDescr, HK_ZOOM_REDRAW ); AddMenuItem( viewMenu, ID_ZOOM_REDRAW, msg, wxEmptyString, KiBitmap( zoom_redraw_xpm ) ); @@ -188,7 +188,7 @@ void PL_EDITOR_FRAME::ReCreateMenuBar() // Text editor selection AddMenuItem( preferencesMenu, ID_MENU_PL_EDITOR_SELECT_PREFERED_EDITOR, - _( "&Text Editor" ), + _( "Set &Text Editor..." ), _( "Select your preferred text editor" ), KiBitmap( editor_xpm ) ); diff --git a/pagelayout_editor/onrightclick.cpp b/pagelayout_editor/onrightclick.cpp index 2cfc9119c0..d948eeefad 100644 --- a/pagelayout_editor/onrightclick.cpp +++ b/pagelayout_editor/onrightclick.cpp @@ -42,16 +42,16 @@ // Helper function to add menuitems relative to items creation void AddNewItemsCommand( wxMenu* aMainMenu ) { - AddMenuItem( aMainMenu, ID_POPUP_ITEM_ADD_LINE, _( "Add Line" ), + AddMenuItem( aMainMenu, ID_POPUP_ITEM_ADD_LINE, _( "Add Line..." ), KiBitmap( add_dashed_line_xpm ) ); - AddMenuItem( aMainMenu, ID_POPUP_ITEM_ADD_RECT, _( "Add Rectangle" ), + AddMenuItem( aMainMenu, ID_POPUP_ITEM_ADD_RECT, _( "Add Rectangle..." ), KiBitmap( add_rectangle_xpm ) ); - AddMenuItem( aMainMenu, ID_POPUP_ITEM_ADD_TEXT, _( "Add Text" ), + AddMenuItem( aMainMenu, ID_POPUP_ITEM_ADD_TEXT, _( "Add Text..." ), KiBitmap( text_xpm ) ); - AddMenuItem( aMainMenu, ID_POPUP_ITEM_ADD_BITMAP, _( "Add Bitmap" ), + AddMenuItem( aMainMenu, ID_POPUP_ITEM_ADD_BITMAP, _( "Add Bitmap..." ), KiBitmap( image_xpm ) ); AddMenuItem( aMainMenu, ID_POPUP_ITEM_APPEND_PAGE_LAYOUT, - _( "Append Existing Page Layout Design File" ), + _( "Append Existing Page Layout Design File..." ), KiBitmap( pagelayout_load_xpm ) ); } diff --git a/pcbnew/footprint_editor_onclick.cpp b/pcbnew/footprint_editor_onclick.cpp index c082d4b725..78d92d2e97 100644 --- a/pcbnew/footprint_editor_onclick.cpp +++ b/pcbnew/footprint_editor_onclick.cpp @@ -248,7 +248,7 @@ bool FOOTPRINT_EDIT_FRAME::OnRightClick( const wxPoint& MousePos, wxMenu* PopMen AddMenuItem( PopMenu, ID_POPUP_CANCEL_CURRENT_COMMAND, _( "Cancel Block" ), KiBitmap( cancel_xpm ) ); AddMenuItem( PopMenu, ID_POPUP_ZOOM_BLOCK, - _( "Zoom Block (drag middle mouse)" ), + _( "Zoom Block" ), KiBitmap( zoom_area_xpm ) ); PopMenu->AppendSeparator(); AddMenuItem( PopMenu, ID_POPUP_PLACE_BLOCK, @@ -266,7 +266,7 @@ bool FOOTPRINT_EDIT_FRAME::OnRightClick( const wxPoint& MousePos, wxMenu* PopMen _( "Delete Block (shift+ctrl + drag mouse)" ), KiBitmap( delete_xpm ) ); - msg = AddHotkeyName( _("Move Block Exactly" ), + msg = AddHotkeyName( _("Move Block Exactly..." ), g_Module_Editor_Hokeys_Descr, HK_MOVE_ITEM_EXACT ); AddMenuItem( PopMenu, ID_POPUP_MOVE_BLOCK_EXACT, msg, KiBitmap( move_xpm ) ); @@ -296,7 +296,7 @@ bool FOOTPRINT_EDIT_FRAME::OnRightClick( const wxPoint& MousePos, wxMenu* PopMen KiBitmap( rotate_ccw_xpm ) ); AddMenuItem( transform_choice, ID_MODEDIT_MODULE_MIRROR, _( "Mirror" ), KiBitmap( mirror_h_xpm ) ); - AddMenuItem( transform_choice, ID_MODEDIT_MODULE_MOVE_EXACT, _( "Move Exactly" ), + AddMenuItem( transform_choice, ID_MODEDIT_MODULE_MOVE_EXACT, _( "Move Exactly..." ), KiBitmap( move_exactly_xpm ) ); msg = AddHotkeyName( _( "Edit Footprint" ), g_Module_Editor_Hokeys_Descr, HK_EDIT_ITEM ); @@ -314,7 +314,7 @@ bool FOOTPRINT_EDIT_FRAME::OnRightClick( const wxPoint& MousePos, wxMenu* PopMen AddMenuItem( PopMenu, ID_POPUP_PCB_MOVE_PAD_REQUEST, msg, KiBitmap( move_pad_xpm ) ); } - msg = AddHotkeyName( _("Edit Pad" ), g_Module_Editor_Hokeys_Descr, HK_EDIT_ITEM ); + msg = AddHotkeyName( _("Edit Pad..." ), g_Module_Editor_Hokeys_Descr, HK_EDIT_ITEM ); AddMenuItem( PopMenu, ID_POPUP_PCB_EDIT_PAD, msg, KiBitmap( options_pad_xpm ) ); AddMenuItem( PopMenu, ID_POPUP_PCB_COPY_PAD_SETTINGS, _( "Copy Pad Settings" ), KiBitmap( copy_pad_settings_xpm ) ); @@ -326,10 +326,10 @@ bool FOOTPRINT_EDIT_FRAME::OnRightClick( const wxPoint& MousePos, wxMenu* PopMen msg = AddHotkeyName( _( "Duplicate Pad" ), g_Module_Editor_Hokeys_Descr, HK_DUPLICATE_ITEM ); AddMenuItem( PopMenu, ID_POPUP_PCB_DUPLICATE_ITEM, msg, KiBitmap( duplicate_xpm ) ); - msg = AddHotkeyName( _("Move Pad Exactly" ), g_Module_Editor_Hokeys_Descr, HK_MOVE_ITEM_EXACT ); + msg = AddHotkeyName( _("Move Pad Exactly..." ), g_Module_Editor_Hokeys_Descr, HK_MOVE_ITEM_EXACT ); AddMenuItem( PopMenu, ID_POPUP_PCB_MOVE_EXACT, msg, KiBitmap( move_pad_xpm ) ); - msg = AddHotkeyName( _("Create Pad Array" ), g_Module_Editor_Hokeys_Descr, HK_CREATE_ARRAY ); + msg = AddHotkeyName( _("Create Pad Array..." ), g_Module_Editor_Hokeys_Descr, HK_CREATE_ARRAY ); AddMenuItem( PopMenu, ID_POPUP_PCB_CREATE_ARRAY, msg, KiBitmap( array_xpm ) ); @@ -337,7 +337,7 @@ bool FOOTPRINT_EDIT_FRAME::OnRightClick( const wxPoint& MousePos, wxMenu* PopMen { PopMenu->AppendSeparator(); AddMenuItem( PopMenu, ID_POPUP_PCB_GLOBAL_IMPORT_PAD_SETTINGS, - _( "Push Pad Settings" ), KiBitmap( push_pad_settings_xpm ) ); + _( "Push Pad Settings..." ), KiBitmap( push_pad_settings_xpm ) ); } break; @@ -369,19 +369,19 @@ bool FOOTPRINT_EDIT_FRAME::OnRightClick( const wxPoint& MousePos, wxMenu* PopMen AddMenuItem( PopMenu, ID_POPUP_PCB_DUPLICATE_ITEM, msg, KiBitmap( duplicate_xpm ) ); - msg = AddHotkeyName( _("Create Array" ), + msg = AddHotkeyName( _("Create Array..." ), g_Module_Editor_Hokeys_Descr, HK_CREATE_ARRAY ); AddMenuItem( PopMenu, ID_POPUP_PCB_CREATE_ARRAY, msg, KiBitmap( array_xpm ) ); } } - msg = AddHotkeyName( _("Move Exactly" ), g_Module_Editor_Hokeys_Descr, HK_MOVE_ITEM_EXACT ); + msg = AddHotkeyName( _("Move Exactly..." ), g_Module_Editor_Hokeys_Descr, HK_MOVE_ITEM_EXACT ); AddMenuItem( PopMenu, ID_POPUP_PCB_MOVE_EXACT, msg, KiBitmap( move_exactly_xpm ) ); if( !flags ) { - msg = AddHotkeyName( _("Edit" ), g_Module_Editor_Hokeys_Descr, + msg = AddHotkeyName( _("Edit..." ), g_Module_Editor_Hokeys_Descr, HK_EDIT_ITEM ); AddMenuItem( PopMenu, ID_POPUP_PCB_EDIT_TEXTMODULE, msg, KiBitmap( edit_text_xpm ) ); @@ -398,7 +398,7 @@ bool FOOTPRINT_EDIT_FRAME::OnRightClick( const wxPoint& MousePos, wxMenu* PopMen case PCB_MODULE_EDGE_T: { if( (flags & IS_NEW) ) - AddMenuItem( PopMenu, ID_POPUP_PCB_STOP_CURRENT_DRAWING, _( "End edge" ), + AddMenuItem( PopMenu, ID_POPUP_PCB_STOP_CURRENT_DRAWING, _( "End Edge" ), KiBitmap( checked_ok_xpm ) ); if( !flags ) @@ -410,17 +410,17 @@ bool FOOTPRINT_EDIT_FRAME::OnRightClick( const wxPoint& MousePos, wxMenu* PopMen msg = AddHotkeyName( _( "Duplicate" ), g_Module_Editor_Hokeys_Descr, HK_DUPLICATE_ITEM ); AddMenuItem( PopMenu, ID_POPUP_PCB_DUPLICATE_ITEM, msg, KiBitmap( duplicate_xpm ) ); - msg = AddHotkeyName( _("Move Exactly" ), g_Module_Editor_Hokeys_Descr, HK_MOVE_ITEM_EXACT ); + msg = AddHotkeyName( _("Move Exactly..." ), g_Module_Editor_Hokeys_Descr, HK_MOVE_ITEM_EXACT ); AddMenuItem( PopMenu, ID_POPUP_PCB_MOVE_EXACT, msg, KiBitmap( move_exactly_xpm ) ); - msg = AddHotkeyName( _("Create Array" ), g_Module_Editor_Hokeys_Descr, HK_CREATE_ARRAY ); + msg = AddHotkeyName( _("Create Array..." ), g_Module_Editor_Hokeys_Descr, HK_CREATE_ARRAY ); AddMenuItem( PopMenu, ID_POPUP_PCB_CREATE_ARRAY, msg, KiBitmap( array_xpm ) ); if( ( flags & (IS_NEW | IS_MOVED) ) == IS_MOVED ) - AddMenuItem( PopMenu, ID_POPUP_PCB_PLACE_EDGE, _( "Place edge" ), + AddMenuItem( PopMenu, ID_POPUP_PCB_PLACE_EDGE, _( "Place Edge" ), KiBitmap( checked_ok_xpm ) ); - msg = AddHotkeyName( _("Edit" ), g_Module_Editor_Hokeys_Descr, HK_EDIT_ITEM ); + msg = AddHotkeyName( _("Edit..." ), g_Module_Editor_Hokeys_Descr, HK_EDIT_ITEM ); AddMenuItem( PopMenu, ID_POPUP_MODEDIT_EDIT_BODY_ITEM, msg, KiBitmap( options_segment_xpm ) ); @@ -433,7 +433,7 @@ bool FOOTPRINT_EDIT_FRAME::OnRightClick( const wxPoint& MousePos, wxMenu* PopMen AddMenuItem( edit_global_mnu, ID_POPUP_MODEDIT_EDIT_WIDTH_ALL_EDGE, _( "Change Body Items Width" ), KiBitmap( width_segment_xpm ) ); AddMenuItem( edit_global_mnu, ID_POPUP_MODEDIT_EDIT_LAYER_ALL_EDGE, - _( "Change Body Items Layer" ), KiBitmap( select_layer_pair_xpm ) ); + _( "Change Body Items Layer..." ), KiBitmap( select_layer_pair_xpm ) ); } break; @@ -471,7 +471,7 @@ bool FOOTPRINT_EDIT_FRAME::OnRightClick( const wxPoint& MousePos, wxMenu* PopMen ( GetToolId() == ID_MODEDIT_CIRCLE_TOOL ) || ( GetToolId() == ID_MODEDIT_ARC_TOOL ) ) { - AddMenuItem( PopMenu, ID_POPUP_MODEDIT_ENTER_EDGE_WIDTH, _("Set Line Width" ), + AddMenuItem( PopMenu, ID_POPUP_MODEDIT_ENTER_EDGE_WIDTH, _("Set Line Width..." ), KiBitmap( width_segment_xpm ) ); PopMenu->AppendSeparator(); } diff --git a/pcbnew/menubar_footprint_editor.cpp b/pcbnew/menubar_footprint_editor.cpp index 0bf42e5aa5..6bb31798f6 100644 --- a/pcbnew/menubar_footprint_editor.cpp +++ b/pcbnew/menubar_footprint_editor.cpp @@ -62,14 +62,14 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar() wxMenu* fileMenu = new wxMenu; // Active library selection - AddMenuItem( fileMenu, ID_MODEDIT_SELECT_CURRENT_LIB, _("Set Acti&ve Library"), + AddMenuItem( fileMenu, ID_MODEDIT_SELECT_CURRENT_LIB, _("Set Acti&ve Library..."), _( "Select active library" ), KiBitmap( open_library_xpm ) ); fileMenu->AppendSeparator(); // New module AddMenuItem( fileMenu, ID_MODEDIT_NEW_MODULE, - _( "&New Footprint" ), _( "Create new footprint" ), + _( "&New Footprint..." ), _( "Create new footprint" ), KiBitmap( new_footprint_xpm ) ); // Open submenu @@ -77,19 +77,19 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar() // from File AddMenuItem( openSubmenu, ID_MODEDIT_IMPORT_PART, - _( "&Import Footprint From File" ), + _( "&Import Footprint From File..." ), _( "Import footprint from an existing file" ), KiBitmap( import_module_xpm ) ); // from Library AddMenuItem( openSubmenu, ID_MODEDIT_LOAD_MODULE, - _( "Load Footprint From Current Li&brary" ), - _( "Open footprint from library" ), + _( "Load Footprint From Active Li&brary..." ), + _( "Open footprint from active library" ), KiBitmap( module_xpm ) ); // from current Board AddMenuItem( openSubmenu, ID_MODEDIT_LOAD_MODULE_FROM_BOARD, - _( "Load Footprint From &Current Board" ), + _( "Load Footprint From &Current Board..." ), _( "Load footprint from current board" ), KiBitmap( load_module_board_xpm ) ); @@ -102,8 +102,8 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar() // Save the currently loaded legacy library as an s-expression library. AddMenuItem( fileMenu, ID_MODEDIT_SAVE_LIBRARY_AS, - _( "Save &Current Library As..." ), - _( "Save entire current library under a new name" ), + _( "Save A&ctive Library As..." ), + _( "Save entire active library under a new name" ), KiBitmap( copy_library_xpm ) ); // Save module @@ -116,19 +116,19 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar() // Save module in new lib AddMenuItem( fileMenu, ID_MODEDIT_CREATE_NEW_LIB_AND_SAVE_CURRENT_PART, - _( "S&ave Footprint in New Library" ), + _( "S&ave Footprint in New Library..." ), _( "Create new library and save current footprint in it" ), KiBitmap( new_library_xpm ) ); // Export module AddMenuItem( fileMenu, ID_MODEDIT_EXPORT_PART, - _( "&Export Footprint" ), + _( "&Export Footprint..." ), _( "Save currently loaded footprint into file" ), KiBitmap( export_module_xpm ) ); // Import DXF File AddMenuItem( fileMenu, ID_GEN_IMPORT_DXF_FILE, - _( "&Import DXF File" ), + _( "&Import DXF File..." ), _( "Import 2D Drawing DXF file to Pcbnew on Drawings layer" ), KiBitmap( import_xpm ) ); @@ -136,7 +136,7 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar() // Print AddMenuItem( fileMenu, wxID_PRINT, - _( "&Print" ), + _( "&Print..." ), _( "Print current footprint" ), KiBitmap( plot_xpm ) ); @@ -188,7 +188,7 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar() // Properties AddMenuItem( editMenu, ID_MODEDIT_EDIT_MODULE_PROPERTIES, - _( "Footprint &Properties" ), + _( "Footprint &Properties..." ), _( "Edit footprint properties" ), KiBitmap( module_options_xpm ) ); @@ -197,18 +197,18 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar() // User grid size AddMenuItem( dimensions_Submenu, ID_PCB_USER_GRID_SETUP, - _( "Set Custom &User Grid" ), _( "Set custom user grid size" ), + _( "Set Custom &User Grid..." ), _( "Set custom user grid size" ), KiBitmap( grid_xpm ) ); // Sizes and Widths AddMenuItem( dimensions_Submenu, ID_PCB_DRAWINGS_WIDTHS_SETUP, - _( "Text &Size and Width" ), + _( "Text &Size and Width..." ), _( "Adjust width for text and drawing" ), KiBitmap( text_xpm ) ); // Pad settings AddMenuItem( dimensions_Submenu, ID_MODEDIT_PAD_SETTINGS, - _( "&Pad Properties" ), _( "Edit settings for new pads" ), + _( "Default &Pad Properties..." ), _( "Edit settings for new pads" ), KiBitmap( pad_dimensions_xpm ) ); //--------- View menu ---------------- @@ -252,7 +252,7 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar() // Add canvas selection viewMenu->AppendSeparator(); - text = AddHotkeyName( _( "Legacy graphic&s" ), m_hotkeysDescrList, + text = AddHotkeyName( _( "Legacy Graphic&s" ), m_hotkeysDescrList, HK_CANVAS_LEGACY ); viewMenu->Append( @@ -320,27 +320,27 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar() wxMenu* prefs_menu = new wxMenu; AddMenuItem( prefs_menu, ID_PCB_LIB_WIZARD, - _( "&Footprint Library Wizard" ), _( "Add footprint libraries with wizard" ), + _( "&Footprint Library Wizard..." ), _( "Add footprint libraries with wizard" ), KiBitmap( wizard_add_fplib_small_xpm ) ); AddMenuItem( prefs_menu, ID_PCB_LIB_TABLE_EDIT, - _( "Footprint Li&brary Table" ), _( "Configure footprint library table" ), + _( "Footprint Li&brary Table..." ), _( "Configure footprint library table" ), KiBitmap( library_table_xpm ) ); // Path configuration edit dialog. AddMenuItem( prefs_menu, ID_PREFERENCES_CONFIGURE_PATHS, - _( "Configure Pa&ths" ), + _( "Configure Pa&ths..." ), _( "Edit path configuration environment variables" ), KiBitmap( path_xpm ) ); // Settings AddMenuItem( prefs_menu, wxID_PREFERENCES, - _( "General &Settings" ), _( "Change footprint editor settings." ), + _( "General &Settings..." ), _( "Change footprint editor settings." ), KiBitmap( preference_xpm ) ); AddMenuItem( prefs_menu, ID_PCB_DISPLAY_OPTIONS_SETUP, - _( "&Display Settings" ), + _( "&Display Settings..." ), _( "Change footprint editor display settings" ), KiBitmap( display_options_xpm ) ); diff --git a/pcbnew/menubar_pcb_editor.cpp b/pcbnew/menubar_pcb_editor.cpp index 84a070266a..f669832a10 100644 --- a/pcbnew/menubar_pcb_editor.cpp +++ b/pcbnew/menubar_pcb_editor.cpp @@ -180,11 +180,11 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() void prepareDesignRulesMenu( wxMenu* aParentMenu ) { AddMenuItem( aParentMenu, ID_MENU_PCB_SHOW_DESIGN_RULES_DIALOG, - _( "&Design Rules" ), + _( "&Design Rules..." ), _( "Open design rules editor" ), KiBitmap( config_xpm ) ); AddMenuItem( aParentMenu, ID_PCB_LAYERS_SETUP, - _( "&Layers Setup" ), _( "Enable and set layer properties" ), + _( "&Layers Setup..." ), _( "Enable and set layer properties" ), KiBitmap( copper_layers_setup_xpm ) ); } @@ -210,12 +210,12 @@ void preparePreferencesMenu( PCB_EDIT_FRAME* aFrame, wxMenu* aParentMenu ) #endif AddMenuItem( aParentMenu, ID_PCB_DISPLAY_OPTIONS_SETUP, - _( "&Display Settings" ), + _( "&Display Settings..." ), _( "Select how items (pads, tracks, texts) are displayed" ), KiBitmap( display_options_xpm ) ); AddMenuItem( aParentMenu, ID_MENU_INTERACTIVE_ROUTER_SETTINGS, - _( "&Interactive Routing" ), + _( "&Interactive Routing..." ), _( "Configure interactive router" ), KiBitmap( add_tracks_xpm ) ); // fixme: icon @@ -232,12 +232,12 @@ void preparePreferencesMenu( PCB_EDIT_FRAME* aFrame, wxMenu* aParentMenu ) aParentMenu->AppendSeparator(); AddMenuItem( aParentMenu, ID_CONFIG_SAVE, - _( "&Save Preferences" ), + _( "&Save Preferences..." ), _( "Save application preferences" ), KiBitmap( save_setup_xpm ) ); AddMenuItem( aParentMenu, ID_CONFIG_READ, - _( "Load Prefe&rences" ), + _( "Load Prefe&rences..." ), _( "Load application preferences" ), KiBitmap( read_setup_xpm ) ); } @@ -279,23 +279,23 @@ void prepareRouteMenu( wxMenu* aParentMenu ) void prepareLibraryMenu( wxMenu* aParentMenu ) { AddMenuItem( aParentMenu, ID_PCB_LIB_WIZARD, - _( "&Footprint Library Wizard" ), _( "Add footprint library using wizard" ), + _( "&Footprint Library Wizard..." ), _( "Add footprint library using wizard" ), KiBitmap( wizard_add_fplib_small_xpm ) ); AddMenuItem( aParentMenu, ID_PCB_LIB_TABLE_EDIT, - _( "Footprint Li&brary Table" ), _( "Configure footprint library table" ), + _( "Footprint Li&brary Table..." ), _( "Configure footprint library table" ), KiBitmap( library_table_xpm ) ); // Path configuration edit dialog. AddMenuItem( aParentMenu, ID_PREFERENCES_CONFIGURE_PATHS, - _( "Configure Pa&ths" ), + _( "Configure Pa&ths..." ), _( "Edit path configuration environment variables" ), KiBitmap( path_xpm ) ); #ifdef BUILD_GITHUB_PLUGIN AddMenuItem( aParentMenu, ID_PCB_3DSHAPELIB_WIZARD, - _( "&3D Shape Downloader" ), + _( "&3D Shape Downloader..." ), _( "Download from Github 3D shape libraries using wizard" ), KiBitmap( import3d_xpm ) ); #endif @@ -373,23 +373,23 @@ void prepareToolsMenu( wxMenu* aParentMenu ) { AddMenuItem( aParentMenu, ID_UPDATE_PCB_FROM_SCH, - _( "Update PCB from Schematic" ), + _( "Update PCB from Schematic..." ), _( "Update PCB design with current schematic (forward annotation)" ), KiBitmap( import_brd_file_xpm ) ); aParentMenu->AppendSeparator( ); AddMenuItem( aParentMenu, ID_GET_NETLIST, - _( "Load &Netlist" ), + _( "Load &Netlist..." ), _( "Read netlist and update board connectivity" ), KiBitmap( netlist_xpm ) ); AddMenuItem( aParentMenu, ID_AUX_TOOLBAR_PCB_SELECT_LAYER_PAIR, - _( "Set &Layer Pair" ), _( "Change active layer pair" ), + _( "Set &Layer Pair..." ), _( "Change active layer pair" ), KiBitmap( select_layer_pair_xpm ) ); AddMenuItem( aParentMenu, ID_DRC_CONTROL, - _( "&Design Rules Check" ), + _( "&Design Rules Checker" ), _( "Perform design rules check" ), KiBitmap( erc_xpm ) ); AddMenuItem( aParentMenu, ID_TOOLBARH_PCB_FREEROUTE_ACCESS, @@ -410,7 +410,7 @@ void prepareToolsMenu( wxMenu* aParentMenu ) wxMenu* submenuActionPluginsMenu = new wxMenu(); AddMenuItem( aParentMenu, submenuActionPluginsMenu, ID_TOOLBARH_PCB_ACTION_PLUGIN, - _( "&External Plugins" ), + _( "&External Plugins..." ), _( "Execute or reload python action plugins" ), KiBitmap( hammer_xpm ) ); @@ -476,41 +476,41 @@ void prepareEditMenu( wxMenu* aParentMenu, bool aUseGal ) aParentMenu->AppendSeparator(); - text = AddHotkeyName( _( "&Find" ), g_Pcbnew_Editor_Hokeys_Descr, HK_FIND_ITEM ); + text = AddHotkeyName( _( "&Find..." ), g_Pcbnew_Editor_Hokeys_Descr, HK_FIND_ITEM ); AddMenuItem( aParentMenu, ID_FIND_ITEMS, text, HELP_FIND , KiBitmap( find_xpm ) ); aParentMenu->AppendSeparator(); AddMenuItem( aParentMenu, ID_PCB_EDIT_ALL_VIAS_AND_TRACK_SIZE, - _( "Edit All Tracks and Vias" ), KiBitmap( width_track_via_xpm ) ); + _( "Edit All Tracks and Vias..." ), KiBitmap( width_track_via_xpm ) ); AddMenuItem( aParentMenu, ID_MENU_PCB_RESET_TEXTMODULE_FIELDS_SIZES, - _( "Set Footp&rint Field Sizes" ), + _( "Set Footp&rint Field Sizes..." ), _( "Set text size and width of footprint fields" ), KiBitmap( reset_text_xpm ) ); AddMenuItem( aParentMenu, ID_MENU_PCB_UPDATE_FOOTPRINTS, - _( "Update Footprints from Library" ), + _( "Update Footprints from Library..." ), _( "Update footprints to include any changes from the library" ), KiBitmap( reload_xpm ) ); AddMenuItem( aParentMenu, ID_MENU_PCB_EXCHANGE_FOOTPRINTS, - _( "Change Footprints" ), + _( "Change Footprints..." ), _( "Assign different footprints from the library" ), KiBitmap( exchange_xpm ) ); AddMenuItem( aParentMenu, ID_MENU_PCB_SWAP_LAYERS, - _( "&Swap Layers" ), + _( "&Swap Layers..." ), _( "Swap tracks on copper layers or drawings on other layers" ), KiBitmap( swap_layer_xpm ) ); aParentMenu->AppendSeparator(); AddMenuItem( aParentMenu, ID_PCB_GLOBAL_DELETE, - _( "&Global Deletions" ), + _( "&Global Deletions..." ), _( "Delete tracks, footprints and texts on board" ), KiBitmap( general_deletions_xpm ) ); AddMenuItem( aParentMenu, ID_MENU_PCB_CLEAN, - _( "&Cleanup Tracks and Vias" ), + _( "&Cleanup Tracks and Vias..." ), _( "Clean stubs, vias, delete break points or unconnected tracks" ), KiBitmap( delete_xpm ) ); } @@ -569,7 +569,7 @@ void prepareViewMenu( wxMenu* aParentMenu ) aParentMenu->AppendSeparator(); - text = AddHotkeyName( _( "Legacy graphic&s" ), g_Pcbnew_Editor_Hokeys_Descr, + text = AddHotkeyName( _( "Legacy Graphic&s" ), g_Pcbnew_Editor_Hokeys_Descr, HK_CANVAS_LEGACY ); aParentMenu->Append( @@ -599,31 +599,31 @@ void prepareViewMenu( wxMenu* aParentMenu ) void prepareDimensionsMenu( wxMenu* aParentMenu ) { AddMenuItem( aParentMenu, ID_PCB_USER_GRID_SETUP, - _( "User Defined G&rid" ),_( "Adjust custom user-defined grid dimensions" ), + _( "User Defined G&rid..." ),_( "Adjust custom user-defined grid dimensions" ), KiBitmap( grid_xpm ) ); AddMenuItem( aParentMenu, ID_PCB_DRAWINGS_WIDTHS_SETUP, - _( "Te&xts and Drawings" ), + _( "Te&xts and Drawings..." ), _( "Adjust dimensions for texts and drawings" ), KiBitmap( text_xpm ) ); AddMenuItem( aParentMenu, ID_PCB_PAD_SETUP, - _( "&Pads Size" ), _( "Adjust default pad characteristics" ), + _( "Default &Pad Properties..." ), _( "Adjust default pad characteristics" ), KiBitmap( pad_dimensions_xpm ) ); AddMenuItem( aParentMenu, ID_PCB_MASK_CLEARANCE, - _( "Pads to &Mask Clearance" ), + _( "Pads to &Mask Clearance..." ), _( "Adjust global clearance between pads and solder resist mask" ), KiBitmap( pads_mask_layers_xpm ) ); AddMenuItem( aParentMenu, ID_MENU_DIFF_PAIR_DIMENSIONS, - _( "&Differential Pairs" ), + _( "&Differential Pairs..." ), _( "Define global gap/width for differential pairs." ), KiBitmap( ps_diff_pair_xpm ) ); aParentMenu->AppendSeparator(); AddMenuItem( aParentMenu, ID_CONFIG_SAVE, - _( "&Save Preferences" ), _( "Save dimension preferences" ), + _( "&Save Preferences..." ), _( "Save dimension preferences" ), KiBitmap( save_xpm ) ); } @@ -642,7 +642,7 @@ void prepareFilesMenu( wxMenu* aParentMenu, bool aIsOutsideProject ) _( "Create new board" ), KiBitmap( new_board_xpm ) ); - text = AddHotkeyName( _( "&Open" ), g_Pcbnew_Editor_Hokeys_Descr, HK_LOAD_BOARD ); + text = AddHotkeyName( _( "&Open..." ), g_Pcbnew_Editor_Hokeys_Descr, HK_LOAD_BOARD ); AddMenuItem( aParentMenu, ID_LOAD_FILE, text, _( "Open existing board" ), KiBitmap( open_brd_file_xpm ) ); @@ -671,12 +671,12 @@ void prepareFilesMenu( wxMenu* aParentMenu, bool aIsOutsideProject ) KiBitmap( recent_xpm ) ); AddMenuItem( aParentMenu, ID_APPEND_FILE, - _( "&Append Board" ), + _( "&Append Board..." ), _( "Append another board to currently loaded board" ), KiBitmap( add_board_xpm ) ); AddMenuItem( aParentMenu, ID_IMPORT_NON_KICAD_BOARD, - _( "Import Non-Kicad Board File" ), + _( "Import Non-Kicad Board File..." ), _( "Import board file from other applications" ), KiBitmap( import_brd_file_xpm ) ); @@ -695,7 +695,7 @@ void prepareFilesMenu( wxMenu* aParentMenu, bool aIsOutsideProject ) // when not under a project mgr, we are free to change filenames, cwd ... if( Kiface().IsSingle() ) // not when under a project mgr (pcbnew is run as stand alone) { - text = AddHotkeyName( _( "Sa&ve As" ), g_Pcbnew_Editor_Hokeys_Descr, HK_SAVE_BOARD_AS ); + text = AddHotkeyName( _( "Sa&ve As..." ), g_Pcbnew_Editor_Hokeys_Descr, HK_SAVE_BOARD_AS ); AddMenuItem( aParentMenu, ID_SAVE_BOARD_AS, text, _( "Save current board with new name" ), KiBitmap( save_as_xpm ) ); @@ -704,7 +704,7 @@ void prepareFilesMenu( wxMenu* aParentMenu, bool aIsOutsideProject ) // but do not change the current board file name else { - text = AddHotkeyName( _( "Sa&ve Copy As" ), g_Pcbnew_Editor_Hokeys_Descr, HK_SAVE_BOARD_AS ); + text = AddHotkeyName( _( "Sa&ve Copy As..." ), g_Pcbnew_Editor_Hokeys_Descr, HK_SAVE_BOARD_AS ); AddMenuItem( aParentMenu, ID_COPY_BOARD_AS, text, _( "Save copy of the current board" ), KiBitmap( save_as_xpm ) ); @@ -726,27 +726,27 @@ void prepareFilesMenu( wxMenu* aParentMenu, bool aIsOutsideProject ) //----- Fabrication Outputs submenu ----------------------------------------- wxMenu* fabricationOutputsMenu = new wxMenu; AddMenuItem( fabricationOutputsMenu, ID_PCB_GEN_POS_MODULES_FILE, - _( "Footprint &Position (.pos) File" ), + _( "Footprint &Position (.pos) File..." ), _( "Generate footprint position file for pick and place" ), KiBitmap( post_compo_xpm ) ); AddMenuItem( fabricationOutputsMenu, ID_PCB_GEN_DRILL_FILE, - _( "&Drill (.drl) File" ), + _( "&Drill (.drl) File..." ), _( "Generate excellon2 drill file" ), KiBitmap( post_drill_xpm ) ); AddMenuItem( fabricationOutputsMenu, ID_GEN_EXPORT_FILE_MODULE_REPORT, - _( "&Footprint (.rpt) Report.." ), + _( "&Footprint (.rpt) Report..." ), _( "Create report of all footprints from current board" ), KiBitmap( tools_xpm ) ); AddMenuItem( fabricationOutputsMenu, ID_PCB_GEN_D356_FILE, - _( "IPC-D-356 Netlist File" ), + _( "IPC-D-356 Netlist File..." ), _( "Generate IPC-D-356 netlist file" ), KiBitmap( netlist_xpm ) ); AddMenuItem( fabricationOutputsMenu, ID_PCB_GEN_BOM_FILE_FROM_BOARD, - _( "&BOM File" ), + _( "&BOM File..." ), _( "Create bill of materials from current schematic" ), KiBitmap( bom_xpm ) ); @@ -759,12 +759,12 @@ void prepareFilesMenu( wxMenu* aParentMenu, bool aIsOutsideProject ) wxMenu* submenuImport = new wxMenu(); AddMenuItem( submenuImport, ID_GEN_IMPORT_SPECCTRA_SESSION, - _( "&Specctra Session" ), + _( "&Specctra Session..." ), _( "Import routed \"Specctra Session\" (*.ses) file" ), KiBitmap( import_xpm ) ); AddMenuItem( submenuImport, ID_GEN_IMPORT_DXF_FILE, - _( "&DXF File" ), + _( "&DXF File..." ), _( "Import 2D Drawing DXF file to Pcbnew on Drawings layer" ), KiBitmap( import_xpm ) ); @@ -784,21 +784,21 @@ void prepareFilesMenu( wxMenu* aParentMenu, bool aIsOutsideProject ) aParentMenu->AppendSeparator(); AddMenuItem( aParentMenu, ID_SHEET_SET, - _( "Page S&ettings" ), + _( "Page S&ettings..." ), _( "Settings for sheet size and frame references" ), KiBitmap( sheetset_xpm ) ); AddMenuItem( aParentMenu, wxID_PRINT, - _( "&Print" ), _( "Print board" ), + _( "&Print..." ), _( "Print board" ), KiBitmap( print_button_xpm ) ); AddMenuItem( aParentMenu, ID_GEN_PLOT_SVG, - _( "Export SV&G" ), + _( "Export SV&G..." ), _( "Export board file in Scalable Vector Graphics format" ), KiBitmap( plot_svg_xpm ) ); AddMenuItem( aParentMenu, ID_GEN_PLOT, - _( "P&lot" ), + _( "P&lot..." ), _( "Plot board in HPGL, PostScript or Gerber RS-274X format)" ), KiBitmap( plot_xpm ) ); @@ -808,13 +808,13 @@ void prepareFilesMenu( wxMenu* aParentMenu, bool aIsOutsideProject ) wxMenu* submenuarchive = new wxMenu(); AddMenuItem( submenuarchive, ID_MENU_ARCHIVE_MODULES_IN_LIBRARY, - _( "&Archive Footprints in Project Library" ), + _( "&Archive Footprints in Existing Library..." ), _( "Archive all footprints in existing library in footprint Lib table" "(does not remove other footprints in this library)" ), KiBitmap( library_archive_xpm ) ); AddMenuItem( submenuarchive, ID_MENU_CREATE_LIBRARY_AND_ARCHIVE_MODULES, - _( "&Create New Library and Archive Footprints" ), + _( "&Create New Library and Archive Footprints..." ), _( "Archive all footprints in new library\n" "(if the library already exists it will be deleted)" ), KiBitmap( library_archive_as_xpm ) ); @@ -834,29 +834,29 @@ void prepareFilesMenu( wxMenu* aParentMenu, bool aIsOutsideProject ) void prepareExportMenu( wxMenu* aParentMenu ) { AddMenuItem( aParentMenu, ID_GEN_EXPORT_SPECCTRA, - _( "&Specctra DSN" ), + _( "&Specctra DSN..." ), _( "Export current board to \"Specctra DSN\" file" ), KiBitmap( export_dsn_xpm ) ); AddMenuItem( aParentMenu, ID_GEN_EXPORT_FILE_GENCADFORMAT, - _( "&GenCAD" ), _( "Export GenCAD format" ), + _( "&GenCAD..." ), _( "Export GenCAD format" ), KiBitmap( export_xpm ) ); AddMenuItem( aParentMenu, ID_GEN_EXPORT_FILE_VRML, - _( "&VRML" ), + _( "&VRML..." ), _( "Export VRML board representation" ), KiBitmap( export3d_xpm ) ); AddMenuItem( aParentMenu, ID_GEN_EXPORT_FILE_IDF3, - _( "I&DFv3" ), _( "IDFv3 board and symbol export" ), + _( "I&DFv3..." ), _( "IDFv3 board and symbol export" ), KiBitmap( export_idf_xpm ) ); AddMenuItem( aParentMenu, ID_GEN_EXPORT_FILE_STEP, - _( "S&TEP" ), _( "STEP export" ), + _( "S&TEP..." ), _( "STEP export" ), KiBitmap( export_step_xpm ) ); AddMenuItem( aParentMenu, ID_PCB_GEN_CMP_FILE, - _( "&Footprint Association (.cmp) File" ), + _( "&Footprint Association (.cmp) File..." ), _( "Export footprint association file (*.cmp) for schematic back annotation" ), KiBitmap( create_cmp_file_xpm ) ); } diff --git a/pcbnew/onrightclick.cpp b/pcbnew/onrightclick.cpp index 2857dc248d..579b138249 100644 --- a/pcbnew/onrightclick.cpp +++ b/pcbnew/onrightclick.cpp @@ -202,17 +202,17 @@ bool PCB_EDIT_FRAME::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu ) AddMenuItem( aPopMenu, ID_POPUP_PCB_DUPLICATE_ITEM, msg, KiBitmap( duplicate_xpm ) ); - msg = AddHotkeyName( _("Move Exactly" ), g_Board_Editor_Hokeys_Descr, + msg = AddHotkeyName( _("Move Exactly..." ), g_Board_Editor_Hokeys_Descr, HK_MOVE_ITEM_EXACT ); AddMenuItem( aPopMenu, ID_POPUP_PCB_MOVE_EXACT, msg, KiBitmap( move_exactly_xpm ) ); - msg = AddHotkeyName( _("Create Array" ), g_Board_Editor_Hokeys_Descr, + msg = AddHotkeyName( _("Create Array..." ), g_Board_Editor_Hokeys_Descr, HK_CREATE_ARRAY ); AddMenuItem( aPopMenu, ID_POPUP_PCB_CREATE_ARRAY, msg, KiBitmap( array_xpm ) ); - msg = AddHotkeyName( _( "Edit" ), g_Board_Editor_Hokeys_Descr, + msg = AddHotkeyName( _( "Edit..." ), g_Board_Editor_Hokeys_Descr, HK_EDIT_ITEM ); AddMenuItem( aPopMenu, ID_POPUP_PCB_EDIT_DRAWING, msg, KiBitmap( edit_xpm ) ); @@ -264,7 +264,7 @@ bool PCB_EDIT_FRAME::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu ) case PCB_DIMENSION_T: if( !flags ) { - msg = AddHotkeyName( _( "Edit" ), g_Board_Editor_Hokeys_Descr, + msg = AddHotkeyName( _( "Edit..." ), g_Board_Editor_Hokeys_Descr, HK_EDIT_ITEM ); AddMenuItem( aPopMenu, ID_POPUP_PCB_EDIT_DIMENSION, msg, KiBitmap( edit_xpm ) ); @@ -278,7 +278,7 @@ bool PCB_EDIT_FRAME::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu ) AddMenuItem( aPopMenu, ID_POPUP_PCB_DUPLICATE_ITEM, msg, KiBitmap( duplicate_xpm ) ); - msg = AddHotkeyName( _("Move Exactly" ), g_Board_Editor_Hokeys_Descr, + msg = AddHotkeyName( _("Move Exactly..." ), g_Board_Editor_Hokeys_Descr, HK_MOVE_ITEM_EXACT ); AddMenuItem( aPopMenu, ID_POPUP_PCB_MOVE_EXACT, msg, KiBitmap( move_exactly_xpm ) ); @@ -299,7 +299,7 @@ bool PCB_EDIT_FRAME::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu ) AddMenuItem( aPopMenu, ID_POPUP_PCB_MOVE_PCB_TARGET_REQUEST, msg, KiBitmap( move_target_xpm ) ); - msg = AddHotkeyName( _("Move Exactly" ), g_Board_Editor_Hokeys_Descr, + msg = AddHotkeyName( _("Move Exactly..." ), g_Board_Editor_Hokeys_Descr, HK_MOVE_ITEM_EXACT ); AddMenuItem( aPopMenu, ID_POPUP_PCB_MOVE_EXACT, msg, KiBitmap( move_exactly_xpm ) ); @@ -309,7 +309,7 @@ bool PCB_EDIT_FRAME::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu ) AddMenuItem( aPopMenu, ID_POPUP_PCB_DUPLICATE_ITEM, msg, KiBitmap( duplicate_xpm ) ); - msg = AddHotkeyName( _( "Edit" ), g_Board_Editor_Hokeys_Descr, + msg = AddHotkeyName( _( "Edit..." ), g_Board_Editor_Hokeys_Descr, HK_EDIT_ITEM ); AddMenuItem( aPopMenu, ID_POPUP_PCB_EDIT_PCB_TARGET, msg, KiBitmap( edit_xpm ) ); @@ -347,7 +347,7 @@ bool PCB_EDIT_FRAME::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu ) if( !flags ) { - msg = AddHotkeyName( _( "Get and Move Footprint" ), + msg = AddHotkeyName( _( "Get and Move Footprint..." ), g_Board_Editor_Hokeys_Descr, HK_GET_AND_MOVE_FOOTPRINT ); AddMenuItem( aPopMenu, ID_POPUP_PCB_GET_AND_MOVE_MODULE_REQUEST, msg, KiBitmap( move_xpm ) ); @@ -372,13 +372,13 @@ bool PCB_EDIT_FRAME::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu ) } AddMenuItem( aPopMenu, ID_POPUP_PCB_SELECT_LAYER, - _( "Select Working Layer" ), KiBitmap( select_w_layer_xpm ) ); + _( "Select Working Layer..." ), KiBitmap( select_w_layer_xpm ) ); aPopMenu->AppendSeparator(); break; case ID_PCB_KEEPOUT_AREA_BUTT: AddMenuItem( aPopMenu, ID_POPUP_PCB_SELECT_LAYER, - _( "Select Working Layer" ), KiBitmap( select_w_layer_xpm ) ); + _( "Select Working Layer..." ), KiBitmap( select_w_layer_xpm ) ); aPopMenu->AppendSeparator(); break; @@ -396,9 +396,9 @@ bool PCB_EDIT_FRAME::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu ) KiBitmap( width_track_xpm ) ); AddMenuItem( aPopMenu, ID_POPUP_PCB_SELECT_CU_LAYER, - _( "Select Working Layer" ), KiBitmap( select_w_layer_xpm ) ); + _( "Select Working Layer..." ), KiBitmap( select_w_layer_xpm ) ); AddMenuItem( aPopMenu, ID_POPUP_PCB_SELECT_LAYER_PAIR, - _( "Select Layer Pair for Vias" ), KiBitmap( select_layer_pair_xpm ) ); + _( "Select Layer Pair for Vias..." ), KiBitmap( select_layer_pair_xpm ) ); aPopMenu->AppendSeparator(); } break; @@ -409,7 +409,7 @@ bool PCB_EDIT_FRAME::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu ) case ID_PCB_ADD_LINE_BUTT: case ID_PCB_DIMENSION_BUTT: AddMenuItem( aPopMenu, ID_POPUP_PCB_SELECT_NO_CU_LAYER, - _( "Select Working Layer" ), KiBitmap( select_w_layer_xpm ) ); + _( "Select Working Layer..." ), KiBitmap( select_w_layer_xpm ) ); aPopMenu->AppendSeparator(); break; @@ -451,7 +451,7 @@ bool PCB_EDIT_FRAME::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu ) wxMenu* commands = new wxMenu; aPopMenu->Append( ID_POPUP_PCB_AUTOROUTE_COMMANDS, _( "Autoroute" ), commands ); AddMenuItem( commands, ID_POPUP_PCB_SELECT_LAYER_PAIR, - _( "Select Layer Pair" ), KiBitmap( select_layer_pair_xpm ) ); + _( "Select Layer Pair..." ), KiBitmap( select_layer_pair_xpm ) ); commands->AppendSeparator(); commands->Append( ID_POPUP_PCB_AUTOROUTE_ALL_MODULES, _( "Automatically Route All Footprints" ) ); @@ -470,7 +470,7 @@ bool PCB_EDIT_FRAME::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu ) KiBitmap( width_track_xpm ) ); AddMenuItem( aPopMenu, ID_POPUP_PCB_SELECT_LAYER, - _( "Select Working Layer" ), KiBitmap( select_w_layer_xpm ) ); + _( "Select Working Layer..." ), KiBitmap( select_w_layer_xpm ) ); aPopMenu->AppendSeparator(); } break; @@ -547,12 +547,12 @@ void PCB_EDIT_FRAME::createPopupMenuForTracks( TRACK* Track, wxMenu* PopMenu ) AddMenuItem( PopMenu, ID_POPUP_PCB_DUPLICATE_ITEM, msg, KiBitmap( duplicate_xpm ) ); - msg = AddHotkeyName( _("Move Exactly" ), g_Board_Editor_Hokeys_Descr, + msg = AddHotkeyName( _("Move Exactly..." ), g_Board_Editor_Hokeys_Descr, HK_MOVE_ITEM_EXACT ); AddMenuItem( PopMenu, ID_POPUP_PCB_MOVE_EXACT, msg, KiBitmap( move_exactly_xpm ) ); - msg = AddHotkeyName( _("Create Track Array" ), g_Board_Editor_Hokeys_Descr, + msg = AddHotkeyName( _("Create Track Array..." ), g_Board_Editor_Hokeys_Descr, HK_CREATE_ARRAY ); AddMenuItem( PopMenu, ID_POPUP_PCB_CREATE_ARRAY, msg, KiBitmap( array_xpm ) ); @@ -563,7 +563,7 @@ void PCB_EDIT_FRAME::createPopupMenuForTracks( TRACK* Track, wxMenu* PopMenu ) } AddMenuItem( PopMenu, ID_POPUP_PCB_SELECT_CU_LAYER, - _( "Select Working Layer" ), KiBitmap( select_w_layer_xpm ) ); + _( "Select Working Layer..." ), KiBitmap( select_w_layer_xpm ) ); } else if( flags & IS_DRAGGED ) // Drag via or node in progress { @@ -582,7 +582,7 @@ void PCB_EDIT_FRAME::createPopupMenuForTracks( TRACK* Track, wxMenu* PopMenu ) msg = AddHotkeyName( _( "Place Through Via" ), g_Board_Editor_Hokeys_Descr, HK_ADD_THROUGH_VIA ); AddMenuItem( PopMenu, ID_POPUP_PCB_PLACE_THROUGH_VIA, msg, KiBitmap( via_xpm ) ); - msg = AddHotkeyName( _( "Select Layer and Place Through Via" ), + msg = AddHotkeyName( _( "Select Layer and Place Through Via..." ), g_Board_Editor_Hokeys_Descr, HK_SEL_LAYER_AND_ADD_THROUGH_VIA ); AddMenuItem( PopMenu, ID_POPUP_PCB_SELECT_CU_LAYER_AND_PLACE_THROUGH_VIA, msg, KiBitmap( select_w_layer_xpm ) ); @@ -593,7 +593,7 @@ void PCB_EDIT_FRAME::createPopupMenuForTracks( TRACK* Track, wxMenu* PopMenu ) g_Board_Editor_Hokeys_Descr, HK_ADD_BLIND_BURIED_VIA ); AddMenuItem( PopMenu, ID_POPUP_PCB_PLACE_BLIND_BURIED_VIA, msg, KiBitmap( via_buried_xpm ) ); - msg = AddHotkeyName( _( "Select Layer and Place Blind/Buried Via" ), + msg = AddHotkeyName( _( "Select Layer and Place Blind/Buried Via..." ), g_Board_Editor_Hokeys_Descr, HK_SEL_LAYER_AND_ADD_BLIND_BURIED_VIA ); AddMenuItem( PopMenu, ID_POPUP_PCB_SELECT_CU_LAYER_AND_PLACE_BLIND_BURIED_VIA, msg, KiBitmap( select_w_layer_xpm ) ); @@ -661,7 +661,7 @@ void PCB_EDIT_FRAME::createPopupMenuForTracks( TRACK* Track, wxMenu* PopMenu ) { PopMenu->AppendSeparator(); AddMenuItem( PopMenu, ID_POPUP_PCB_EDIT_ALL_VIAS_AND_TRACK_SIZE, - _( "Edit All Tracks and Vias" ), KiBitmap( width_track_via_xpm ) ); + _( "Edit All Tracks and Vias..." ), KiBitmap( width_track_via_xpm ) ); } // Add lock/unlock flags menu: @@ -741,7 +741,7 @@ void PCB_EDIT_FRAME::createPopUpMenuForZones( ZONE_CONTAINER* edge_zone, wxMenu* _( "Add Cutout Area" ), KiBitmap( add_zone_cutout_xpm ) ); AddMenuItem( zones_menu, ID_POPUP_PCB_ZONE_DUPLICATE, - _( "Duplicate Zone Onto Layer" ), KiBitmap( zone_duplicate_xpm ) ); + _( "Duplicate Zone Onto Layer..." ), KiBitmap( zone_duplicate_xpm ) ); zones_menu->AppendSeparator(); @@ -758,12 +758,12 @@ void PCB_EDIT_FRAME::createPopUpMenuForZones( ZONE_CONTAINER* edge_zone, wxMenu* msg = AddHotkeyName( _( "Move Zone" ), g_Board_Editor_Hokeys_Descr, HK_MOVE_ITEM ); AddMenuItem( zones_menu, ID_POPUP_PCB_MOVE_ZONE_OUTLINES, msg, KiBitmap( move_xpm ) ); - msg = AddHotkeyName( _("Move Zone Exactly" ), g_Board_Editor_Hokeys_Descr, + msg = AddHotkeyName( _("Move Zone Exactly..." ), g_Board_Editor_Hokeys_Descr, HK_MOVE_ITEM_EXACT ); AddMenuItem( zones_menu, ID_POPUP_PCB_MOVE_EXACT, msg, KiBitmap( move_xpm ) ); - msg = AddHotkeyName( _( "Edit Zone Properties" ), g_Board_Editor_Hokeys_Descr, + msg = AddHotkeyName( _( "Edit Zone Properties..." ), g_Board_Editor_Hokeys_Descr, HK_EDIT_ITEM ); AddMenuItem( zones_menu, ID_POPUP_PCB_EDIT_ZONE_PARAMS, msg, KiBitmap( edit_xpm ) ); @@ -816,7 +816,7 @@ void PCB_EDIT_FRAME::createPopUpMenuForFootprints( MODULE* aModule, wxMenu* menu if( !flags ) { - msg = AddHotkeyName( _( "Edit Parameters" ), + msg = AddHotkeyName( _( "Edit Parameters..." ), g_Board_Editor_Hokeys_Descr, HK_EDIT_ITEM ); AddMenuItem( sub_menu_footprint, ID_POPUP_PCB_EDIT_MODULE_PRMS, msg, KiBitmap( edit_module_xpm ) ); @@ -835,7 +835,7 @@ void PCB_EDIT_FRAME::createPopUpMenuForFootprints( MODULE* aModule, wxMenu* menu sub_menu_footprint->AppendSeparator(); - msg = AddHotkeyName( _("Move Exactly" ), g_Board_Editor_Hokeys_Descr, + msg = AddHotkeyName( _("Move Exactly..." ), g_Board_Editor_Hokeys_Descr, HK_MOVE_ITEM_EXACT ); AddMenuItem( sub_menu_footprint, ID_POPUP_PCB_MOVE_EXACT, msg, KiBitmap( move_exactly_xpm ) ); @@ -845,16 +845,16 @@ void PCB_EDIT_FRAME::createPopUpMenuForFootprints( MODULE* aModule, wxMenu* menu AddMenuItem( sub_menu_footprint, ID_POPUP_PCB_DUPLICATE_ITEM, msg, KiBitmap( duplicate_xpm ) ); - msg = AddHotkeyName( _("Create Array" ), g_Board_Editor_Hokeys_Descr, + msg = AddHotkeyName( _("Create Array..." ), g_Board_Editor_Hokeys_Descr, HK_CREATE_ARRAY ); AddMenuItem( sub_menu_footprint, ID_POPUP_PCB_CREATE_ARRAY, msg, KiBitmap( array_xpm ) ); AddMenuItem( sub_menu_footprint, ID_POPUP_PCB_UPDATE_FOOTPRINTS, - _( "Update Footprint" ), KiBitmap( reload_xpm ) ); + _( "Update Footprint..." ), KiBitmap( reload_xpm ) ); AddMenuItem( sub_menu_footprint, ID_POPUP_PCB_EXCHANGE_FOOTPRINTS, - _( "Change Footprint" ), KiBitmap( exchange_xpm ) ); + _( "Change Footprint..." ), KiBitmap( exchange_xpm ) ); } } @@ -878,7 +878,7 @@ void PCB_EDIT_FRAME::createPopUpMenuForFpTexts( TEXTE_MODULE* FpText, wxMenu* me AddMenuItem( sub_menu_Fp_text, ID_POPUP_PCB_MOVE_TEXTMODULE_REQUEST, msg, KiBitmap( move_xpm ) ); - msg = AddHotkeyName( _("Move Exactly" ), g_Board_Editor_Hokeys_Descr, + msg = AddHotkeyName( _("Move Exactly..." ), g_Board_Editor_Hokeys_Descr, HK_MOVE_ITEM_EXACT ); AddMenuItem( sub_menu_Fp_text, ID_POPUP_PCB_MOVE_EXACT, msg, KiBitmap( move_exactly_xpm ) ); @@ -890,7 +890,7 @@ void PCB_EDIT_FRAME::createPopUpMenuForFpTexts( TEXTE_MODULE* FpText, wxMenu* me if( !flags ) { - msg = AddHotkeyName( _( "Edit" ), g_Board_Editor_Hokeys_Descr, HK_EDIT_ITEM ); + msg = AddHotkeyName( _( "Edit..." ), g_Board_Editor_Hokeys_Descr, HK_EDIT_ITEM ); AddMenuItem( sub_menu_Fp_text, ID_POPUP_PCB_EDIT_TEXTMODULE, msg, KiBitmap( edit_text_xpm ) ); AddMenuItem( sub_menu_Fp_text, ID_POPUP_PCB_RESET_TEXT_SIZE, @@ -940,7 +940,7 @@ void PCB_EDIT_FRAME::createPopUpMenuForFpPads( D_PAD* Pad, wxMenu* menu ) AddMenuItem( sub_menu_Pad, ID_POPUP_PCB_DRAG_PAD_REQUEST, _( "Drag Pad" ), KiBitmap( drag_pad_xpm ) ); - msg = AddHotkeyName( _( "Edit Pad" ), g_Board_Editor_Hokeys_Descr, HK_EDIT_ITEM ); + msg = AddHotkeyName( _( "Edit Pad..." ), g_Board_Editor_Hokeys_Descr, HK_EDIT_ITEM ); AddMenuItem( sub_menu_Pad, ID_POPUP_PCB_EDIT_PAD, msg, KiBitmap( options_pad_xpm ) ); sub_menu_Pad->AppendSeparator(); @@ -953,7 +953,7 @@ void PCB_EDIT_FRAME::createPopUpMenuForFpPads( D_PAD* Pad, wxMenu* menu ) wxEmptyString, KiBitmap( apply_pad_settings_xpm ) ); AddMenuItem( sub_menu_Pad, ID_POPUP_PCB_GLOBAL_IMPORT_PAD_SETTINGS, - _( "Push Pad Settings" ), + _( "Push Pad Settings..." ), _( "Copy this pad's settings to all pads in this footprint (or similar footprints)" ), KiBitmap( push_pad_settings_xpm ) ); sub_menu_Pad->AppendSeparator(); @@ -1002,7 +1002,7 @@ void PCB_EDIT_FRAME::createPopUpMenuForTexts( TEXTE_PCB* Text, wxMenu* menu ) AddMenuItem( sub_menu_Text, ID_POPUP_PCB_ROTATE_TEXTEPCB, msg, KiBitmap( rotate_ccw_xpm ) ); msg = AddHotkeyName( _( "Flip" ), g_Board_Editor_Hokeys_Descr, HK_FLIP_ITEM ); AddMenuItem( sub_menu_Text, ID_POPUP_PCB_FLIP_TEXTEPCB, msg, KiBitmap( mirror_h_xpm ) ); - msg = AddHotkeyName( _( "Edit" ), g_Board_Editor_Hokeys_Descr, HK_EDIT_ITEM ); + msg = AddHotkeyName( _( "Edit..." ), g_Board_Editor_Hokeys_Descr, HK_EDIT_ITEM ); AddMenuItem( sub_menu_Text, ID_POPUP_PCB_EDIT_TEXTEPCB, msg, KiBitmap( edit_text_xpm ) ); if( !flags ) { diff --git a/pcbnew/router/length_tuner_tool.cpp b/pcbnew/router/length_tuner_tool.cpp index 6e3ae18aba..7043c7c439 100644 --- a/pcbnew/router/length_tuner_tool.cpp +++ b/pcbnew/router/length_tuner_tool.cpp @@ -52,23 +52,23 @@ static TOOL_ACTION ACT_EndTuning( "pcbnew.LengthTuner.EndTuning", AS_CONTEXT, WX _( "End Track" ), _( "Stops laying the current meander." ) ); static TOOL_ACTION ACT_Settings( "pcbnew.LengthTuner.Settings", AS_CONTEXT, 'L', - _( "Length Tuning Settings" ), _( "Sets the length tuning parameters for currently routed item." ), + _( "Length Tuning Settings..." ), _( "Sets the length tuning parameters for currently routed item." ), router_len_tuner_setup_xpm ); static TOOL_ACTION ACT_SpacingIncrease( "pcbnew.LengthTuner.SpacingIncrease", AS_CONTEXT, '1', - _( "Increase spacing" ), _( "Increase meander spacing by one step." ), + _( "Increase Spacing" ), _( "Increase meander spacing by one step." ), router_len_tuner_dist_incr_xpm ); static TOOL_ACTION ACT_SpacingDecrease( "pcbnew.LengthTuner.SpacingDecrease", AS_CONTEXT, '2', - _( "Decrease spacing" ), _( "Decrease meander spacing by one step." ), + _( "Decrease Spacing" ), _( "Decrease meander spacing by one step." ), router_len_tuner_dist_decr_xpm ); static TOOL_ACTION ACT_AmplIncrease( "pcbnew.LengthTuner.AmplIncrease", AS_CONTEXT, '3', - _( "Increase amplitude" ), _( "Increase meander amplitude by one step." ), + _( "Increase Amplitude" ), _( "Increase meander amplitude by one step." ), router_len_tuner_amplitude_incr_xpm ); static TOOL_ACTION ACT_AmplDecrease( "pcbnew.LengthTuner.AmplDecrease", AS_CONTEXT, '4', - _( "Decrease amplitude" ), _( "Decrease meander amplitude by one step." ), + _( "Decrease Amplitude" ), _( "Decrease meander amplitude by one step." ), router_len_tuner_amplitude_decr_xpm ); diff --git a/pcbnew/router/router_tool.cpp b/pcbnew/router/router_tool.cpp index 66942218ab..ac32044fd1 100644 --- a/pcbnew/router/router_tool.cpp +++ b/pcbnew/router/router_tool.cpp @@ -90,12 +90,12 @@ TOOL_ACTION PCB_ACTIONS::routerActivateDiffPair( "pcbnew.InteractiveRouter.DiffP TOOL_ACTION PCB_ACTIONS::routerActivateSettingsDialog( "pcbnew.InteractiveRouter.SettingsDialog", AS_GLOBAL, 0, - _( "Interactive Router Settings" ), + _( "Interactive Router Settings..." ), _( "Open Interactive Router settings" ), NULL, AF_ACTIVATE ); TOOL_ACTION PCB_ACTIONS::routerActivateDpDimensionsDialog( "pcbnew.InteractiveRouter.DpDimensionsDialog", AS_GLOBAL, 0, - _( "Differential Pair Dimension settings" ), + _( "Differential Pair Dimension Settings..." ), _( "Open Differential Pair Dimension settings" ), ps_diff_pair_gap_xpm, AF_ACTIVATE ); TOOL_ACTION PCB_ACTIONS::routerActivateTuneSingleTrace( "pcbnew.LengthTuner.TuneSingleTrack", @@ -166,7 +166,7 @@ static const TOOL_ACTION ACT_PlaceMicroVia( "pcbnew.InteractiveRouter.PlaceMicro static const TOOL_ACTION ACT_SelLayerAndPlaceThroughVia( "pcbnew.InteractiveRouter.SelLayerAndPlaceVia", AS_CONTEXT, TOOL_ACTION::LegacyHotKey( HK_SEL_LAYER_AND_ADD_THROUGH_VIA ), - _( "Select Layer and Place Through Via" ), + _( "Select Layer and Place Through Via..." ), _( "Select a layer, then add a through-hole via at the end of currently routed track." ), select_w_layer_xpm, AF_NONE, (void*) ( VIA_ACTION_FLAGS::VIA | VIA_ACTION_FLAGS::SELECT_LAYER ) ); @@ -174,14 +174,14 @@ static const TOOL_ACTION ACT_SelLayerAndPlaceThroughVia( static const TOOL_ACTION ACT_SelLayerAndPlaceBlindVia( "pcbnew.InteractiveRouter.SelLayerAndPlaceBlindVia", AS_CONTEXT, TOOL_ACTION::LegacyHotKey( HK_SEL_LAYER_AND_ADD_BLIND_BURIED_VIA ), - _( "Select Layer and Place Blind/Buried Via" ), + _( "Select Layer and Place Blind/Buried Via..." ), _( "Select a layer, then add a blind or buried via at the end of currently routed track."), select_w_layer_xpm, AF_NONE, (void*) ( VIA_ACTION_FLAGS::BLIND_VIA | VIA_ACTION_FLAGS::SELECT_LAYER ) ); static const TOOL_ACTION ACT_CustomTrackWidth( "pcbnew.InteractiveRouter.CustomTrackViaSize", AS_CONTEXT, TOOL_ACTION::LegacyHotKey( HK_CUSTOM_TRACK_WIDTH ), - _( "Custom Track/Via Size" ), + _( "Custom Track/Via Size..." ), _( "Shows a dialog for changing the track width and via size." ), width_track_xpm ); @@ -219,13 +219,13 @@ public: Clear(); - Append( ID_POPUP_PCB_SELECT_CUSTOM_WIDTH, _( "Custom size" ), + Append( ID_POPUP_PCB_SELECT_CUSTOM_WIDTH, _( "Custom Size" ), wxEmptyString, wxITEM_CHECK ); - Append( ID_POPUP_PCB_SELECT_AUTO_WIDTH, _( "Use the starting track width" ), + Append( ID_POPUP_PCB_SELECT_AUTO_WIDTH, _( "Use Starting Track Width" ), _( "Route using the width of the starting track." ), wxITEM_CHECK ); - Append( ID_POPUP_PCB_SELECT_USE_NETCLASS_VALUES, _( "Use net class values" ), + Append( ID_POPUP_PCB_SELECT_USE_NETCLASS_VALUES, _( "Use Net Class Values" ), _( "Use track and via sizes from the net class" ), wxITEM_CHECK ); AppendSeparator(); diff --git a/pcbnew/tool_footprint_viewer.cpp b/pcbnew/tool_footprint_viewer.cpp index 2201935bc9..1085ad166b 100644 --- a/pcbnew/tool_footprint_viewer.cpp +++ b/pcbnew/tool_footprint_viewer.cpp @@ -138,7 +138,7 @@ void FOOTPRINT_VIEWER_FRAME::ReCreateMenuBar( void ) wxMenu* fileMenu = new wxMenu; // Active library selection - AddMenuItem( fileMenu, ID_MODVIEW_SELECT_LIB, _("Set Current Library"), + AddMenuItem( fileMenu, ID_MODVIEW_SELECT_LIB, _("Set Active Library..."), _( "Select library to be displayed" ), KiBitmap( open_library_xpm ) ); fileMenu->AppendSeparator(); diff --git a/pcbnew/tools/edit_tool.cpp b/pcbnew/tools/edit_tool.cpp index ed9e34cbc7..a8fe42ba88 100644 --- a/pcbnew/tools/edit_tool.cpp +++ b/pcbnew/tools/edit_tool.cpp @@ -111,12 +111,12 @@ TOOL_ACTION PCB_ACTIONS::duplicateIncrement( "pcbnew.InteractiveEdit.duplicateIn TOOL_ACTION PCB_ACTIONS::moveExact( "pcbnew.InteractiveEdit.moveExact", AS_GLOBAL, TOOL_ACTION::LegacyHotKey( HK_MOVE_ITEM_EXACT ), - _( "Move Exactly" ), _( "Moves the selected item(s) by an exact amount" ), + _( "Move Exactly..." ), _( "Moves the selected item(s) by an exact amount" ), move_exactly_xpm ); TOOL_ACTION PCB_ACTIONS::createArray( "pcbnew.InteractiveEdit.createArray", AS_GLOBAL, TOOL_ACTION::LegacyHotKey( HK_CREATE_ARRAY ), - _( "Create Array" ), _( "Create array" ), array_xpm, AF_ACTIVATE ); + _( "Create Array..." ), _( "Create array" ), array_xpm, AF_ACTIVATE ); TOOL_ACTION PCB_ACTIONS::rotateCw( "pcbnew.InteractiveEdit.rotateCw", AS_GLOBAL, MD_SHIFT + 'R', @@ -148,17 +148,17 @@ TOOL_ACTION PCB_ACTIONS::removeAlt( "pcbnew.InteractiveEdit.removeAlt", TOOL_ACTION PCB_ACTIONS::updateFootprints( "pcbnew.InteractiveEdit.updateFootprints", AS_GLOBAL, 0, - _( "Update Footprint" ), _( "Update the footprint from the library" ), + _( "Update Footprint..." ), _( "Update the footprint from the library" ), reload_xpm ); TOOL_ACTION PCB_ACTIONS::exchangeFootprints( "pcbnew.InteractiveEdit.ExchangeFootprints", AS_GLOBAL, 0, - _( "Change Footprint" ), _( "Assign a different footprint from the library" ), + _( "Change Footprint..." ), _( "Assign a different footprint from the library" ), exchange_xpm ); TOOL_ACTION PCB_ACTIONS::properties( "pcbnew.InteractiveEdit.properties", AS_GLOBAL, TOOL_ACTION::LegacyHotKey( HK_EDIT_ITEM ), - _( "Properties" ), _( "Displays item properties dialog" ), config_xpm ); + _( "Properties..." ), _( "Displays item properties dialog" ), config_xpm ); TOOL_ACTION PCB_ACTIONS::selectionModified( "pcbnew.InteractiveEdit.ModifiedSelection", AS_GLOBAL, 0, @@ -166,7 +166,7 @@ TOOL_ACTION PCB_ACTIONS::selectionModified( "pcbnew.InteractiveEdit.ModifiedSele TOOL_ACTION PCB_ACTIONS::measureTool( "pcbnew.InteractiveEdit.measureTool", AS_GLOBAL, MD_CTRL + MD_SHIFT + 'M', - _( "Measuring tool" ), _( "Interactively measure distance between points" ), + _( "Measuring Tool" ), _( "Interactively measure distance between points" ), nullptr, AF_ACTIVATE ); TOOL_ACTION PCB_ACTIONS::copyToClipboard( "pcbnew.InteractiveEdit.CopyToClipboard", diff --git a/pcbnew/tools/module_editor_tools.cpp b/pcbnew/tools/module_editor_tools.cpp index 33199c2ec2..f6a2cf0aba 100644 --- a/pcbnew/tools/module_editor_tools.cpp +++ b/pcbnew/tools/module_editor_tools.cpp @@ -70,13 +70,13 @@ TOOL_ACTION PCB_ACTIONS::createPadFromShapes( "pcbnew.ModuleEditor.createPadFrom TOOL_ACTION PCB_ACTIONS::explodePadToShapes( "pcbnew.ModuleEditor.explodePadToShapes", AS_CONTEXT, 0, - _( "Explode Selected Pad to Graphical Shapes" ), + _( "Explode Pad to Graphic Shapes" ), _( "Converts a custom-shaped pads to a set of graphical shapes" ), custom_pad_to_primitives_xpm ); TOOL_ACTION PCB_ACTIONS::enumeratePads( "pcbnew.ModuleEditor.enumeratePads", AS_GLOBAL, 0, - _( "Enumerate Pads" ), _( "Enumerate pads" ), pad_enumerate_xpm, AF_ACTIVATE ); + _( "Renumber Pads..." ), _( "Renumber pads by clicking on them in the desired order" ), pad_enumerate_xpm, AF_ACTIVATE ); TOOL_ACTION PCB_ACTIONS::moduleEdgeOutlines( "pcbnew.ModuleEditor.graphicOutlines", AS_GLOBAL, 0, diff --git a/pcbnew/tools/pad_tool.cpp b/pcbnew/tools/pad_tool.cpp index c79996376b..4330954911 100644 --- a/pcbnew/tools/pad_tool.cpp +++ b/pcbnew/tools/pad_tool.cpp @@ -60,7 +60,7 @@ TOOL_ACTION PCB_ACTIONS::applyPadSettings( TOOL_ACTION PCB_ACTIONS::pushPadSettings( "pcbnew.PadTool.PushPadSettings", AS_GLOBAL, 0, - _( "Push Pad Settings" ), _( "Copy the current pad settings to other pads" ), + _( "Push Pad Settings..." ), _( "Copy the current pad settings to other pads" ), push_pad_settings_xpm ); diff --git a/pcbnew/tools/pcb_editor_control.cpp b/pcbnew/tools/pcb_editor_control.cpp index 454802ec49..a0af906f71 100644 --- a/pcbnew/tools/pcb_editor_control.cpp +++ b/pcbnew/tools/pcb_editor_control.cpp @@ -97,7 +97,7 @@ TOOL_ACTION PCB_ACTIONS::zoneMerge( "pcbnew.EditorControl.zoneMerge", TOOL_ACTION PCB_ACTIONS::zoneDuplicate( "pcbnew.EditorControl.zoneDuplicate", AS_GLOBAL, 0, - _( "Duplicate Zone onto Layer" ), _( "Duplicate zone outline onto a different layer" ), + _( "Duplicate Zone onto Layer..." ), _( "Duplicate zone outline onto a different layer" ), zone_duplicate_xpm ); diff --git a/pcbnew/tools/placement_tool.cpp b/pcbnew/tools/placement_tool.cpp index 72e163f091..2edf30328d 100644 --- a/pcbnew/tools/placement_tool.cpp +++ b/pcbnew/tools/placement_tool.cpp @@ -93,7 +93,7 @@ bool ALIGN_DISTRIBUTE_TOOL::Init() // Create a context menu and make it available through selection tool m_placementMenu = new CONTEXT_MENU; m_placementMenu->SetIcon( align_items_xpm ); - m_placementMenu->SetTitle( _( "Align/distribute" ) ); + m_placementMenu->SetTitle( _( "Align/Distribute" ) ); // Add all align/distribute commands m_placementMenu->Add( PCB_ACTIONS::alignTop ); diff --git a/pcbnew/tools/position_relative_tool.cpp b/pcbnew/tools/position_relative_tool.cpp index e016f077b9..2dc0697e5a 100644 --- a/pcbnew/tools/position_relative_tool.cpp +++ b/pcbnew/tools/position_relative_tool.cpp @@ -41,7 +41,7 @@ using namespace std::placeholders; TOOL_ACTION PCB_ACTIONS::positionRelative( "pcbnew.PositionRelative.positionRelative", AS_GLOBAL, TOOL_ACTION::LegacyHotKey( HK_POSITION_RELATIVE ), - _( "Position Relative to..." ), _( + _( "Position Relative To..." ), _( "Positions the selected item(s) by an exact amount relative to another" ), move_relative_xpm ); diff --git a/pcbnew/tools/selection_tool.cpp b/pcbnew/tools/selection_tool.cpp index 64b963ca92..c8ce568c19 100644 --- a/pcbnew/tools/selection_tool.cpp +++ b/pcbnew/tools/selection_tool.cpp @@ -114,14 +114,14 @@ TOOL_ACTION PCB_ACTIONS::selectSameSheet( "pcbnew.InteractiveSelection.SelectSam TOOL_ACTION PCB_ACTIONS::find( "pcbnew.InteractiveSelection.Find", AS_GLOBAL, 0, //TOOL_ACTION::LegacyHotKey( HK_FIND_ITEM ), // handled by wxWidgets - _( "Find Item" ),_( "Searches the document for an item" ), find_xpm ); + _( "Find Item..." ),_( "Searches the document for an item" ), find_xpm ); TOOL_ACTION PCB_ACTIONS::findMove( "pcbnew.InteractiveSelection.FindMove", AS_GLOBAL, TOOL_ACTION::LegacyHotKey( HK_GET_AND_MOVE_FOOTPRINT ) ); TOOL_ACTION PCB_ACTIONS::filterSelection( "pcbnew.InteractiveSelection.FilterSelection", AS_GLOBAL, 0, - _( "Filter Selection" ), _( "Filter the types of items in the selection" ), + _( "Filter Selection..." ), _( "Filter the types of items in the selection" ), nullptr ); class SELECT_MENU: public CONTEXT_MENU @@ -129,7 +129,7 @@ class SELECT_MENU: public CONTEXT_MENU public: SELECT_MENU() { - SetTitle( _( "Select..." ) ); + SetTitle( _( "Select" ) ); Add( PCB_ACTIONS::filterSelection ); diff --git a/qa/common/mocks.cpp b/qa/common/mocks.cpp index 20a689a30a..0494b78b6b 100644 --- a/qa/common/mocks.cpp +++ b/qa/common/mocks.cpp @@ -275,7 +275,7 @@ TOOL_ACTION PCB_ACTIONS::flip( "pcbnew.InteractiveEdit.flip", TOOL_ACTION PCB_ACTIONS::properties( "pcbnew.InteractiveEdit.properties", AS_GLOBAL, TOOL_ACTION::LegacyHotKey( HK_EDIT_ITEM ), - _( "Properties" ), _( "Displays item properties dialog" ), nullptr ); + _( "Properties..." ), _( "Displays item properties dialog" ), nullptr ); TOOL_ACTION PCB_ACTIONS::highlightNet( "pcbnew.EditorControl.highlightNet", AS_GLOBAL, 0,