From 017fc4da8fbec079eb78590fe4d88a666f27b3b2 Mon Sep 17 00:00:00 2001 From: Maciej Suminski Date: Tue, 19 Dec 2017 12:10:11 +0100 Subject: [PATCH] Fixed capitalization and accelerators in Symbol Library Editor Menu item labels follow the KiCad UI guideline. Removed an accelerator conflict for 'Place' and 'Part' menus. --- eeschema/menubar_libedit.cpp | 16 ++++++------- eeschema/widgets/cmp_tree_pane.cpp | 36 +++++++++++++++--------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eeschema/menubar_libedit.cpp b/eeschema/menubar_libedit.cpp index 64c1595a1b..a2582912e4 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, - _( "&Create New Library" ), + _( "&New Library" ), _( "Creates an empty library" ), KiBitmap( new_library_xpm ) ); AddMenuItem( fileMenu, ID_LIBEDIT_ADD_LIBRARY, - _( "&Add Existing Library" ), + _( "&Add Library" ), _( "Adds a previously created library" ), KiBitmap( add_library_xpm ) ); @@ -87,13 +87,13 @@ void LIB_EDIT_FRAME::ReCreateMenuBar() AddMenuItem( fileMenu, ID_LIBEDIT_SAVE_LIBRARY_AS, - _( "&Save Library As.." ), + _( "Save Library As.." ), _( "Save the current library to a new file" ), KiBitmap( save_as_xpm ) ); AddMenuItem( fileMenu, ID_LIBEDIT_SAVE_ALL_LIBS, - _( "&Save All Libraries" ), + _( "Save All &Libraries" ), _( "Save all library changes" ), KiBitmap( save_xpm ) ); @@ -190,7 +190,7 @@ void LIB_EDIT_FRAME::ReCreateMenuBar() AddMenuItem( partMenu, ID_LIBEDIT_NEW_PART, - _( "Create &New" ), + _( "&New Part" ), _( "Create a new empty part" ), KiBitmap( new_component_xpm ) ); @@ -205,13 +205,13 @@ void LIB_EDIT_FRAME::ReCreateMenuBar() AddMenuItem( partMenu, ID_LIBEDIT_IMPORT_PART, - _( "&Import" ), + _( "&Import Part" ), _( "Import a part to the current library" ), KiBitmap( import_part_xpm ) ); AddMenuItem( partMenu, ID_LIBEDIT_EXPORT_PART, - _( "&Export" ), + _( "&Export Part" ), _( "Export the current part" ), KiBitmap( export_part_xpm ) ); @@ -352,7 +352,7 @@ void LIB_EDIT_FRAME::ReCreateMenuBar() menuBar->Append( fileMenu, _( "&File" ) ); menuBar->Append( editMenu, _( "&Edit" ) ); menuBar->Append( viewMenu, _( "&View" ) ); - menuBar->Append( partMenu, _( "&Part" ) ); + menuBar->Append( partMenu, _( "P&art" ) ); menuBar->Append( placeMenu, _( "&Place" ) ); menuBar->Append( preferencesMenu, _( "P&references" ) ); menuBar->Append( helpMenu, _( "&Help" ) ); diff --git a/eeschema/widgets/cmp_tree_pane.cpp b/eeschema/widgets/cmp_tree_pane.cpp index e4b0e8d063..bbab4449af 100644 --- a/eeschema/widgets/cmp_tree_pane.cpp +++ b/eeschema/widgets/cmp_tree_pane.cpp @@ -47,32 +47,32 @@ CMP_TREE_PANE::CMP_TREE_PANE( LIB_EDIT_FRAME* aParent, LIB_MANAGER* aLibMgr ) // Setup right click-context menus std::unique_ptr menuLibrary = std::make_unique(); - menuLibrary->Append( ID_LIBEDIT_NEW_LIBRARY, _( "New library..." ) ); - menuLibrary->Append( ID_LIBEDIT_ADD_LIBRARY, _( "Add existing library..." ) ); - menuLibrary->Append( ID_LIBEDIT_SAVE_LIBRARY, _( "Save library" ) ); - menuLibrary->Append( ID_LIBEDIT_SAVE_LIBRARY_AS, _( "Save library as..." ) ); - menuLibrary->Append( ID_LIBEDIT_REVERT_LIBRARY, _( "Revert library" ) ); + menuLibrary->Append( ID_LIBEDIT_NEW_LIBRARY, _( "&New Library..." ) ); + menuLibrary->Append( ID_LIBEDIT_ADD_LIBRARY, _( "&Add Library..." ) ); + menuLibrary->Append( ID_LIBEDIT_SAVE_LIBRARY, _( "&Save Library" ) ); + menuLibrary->Append( ID_LIBEDIT_SAVE_LIBRARY_AS, _( "Save Library As..." ) ); + menuLibrary->Append( ID_LIBEDIT_REVERT_LIBRARY, _( "&Revert Library" ) ); menuLibrary->AppendSeparator(); - menuLibrary->Append( ID_LIBEDIT_NEW_PART, _( "New part..." ) ); - menuLibrary->Append( ID_LIBEDIT_IMPORT_PART, _( "Import part..." ) ); - menuLibrary->Append( ID_LIBEDIT_PASTE_PART, _( "Paste part" ) ); + menuLibrary->Append( ID_LIBEDIT_NEW_PART, _( "New &Part..." ) ); + menuLibrary->Append( ID_LIBEDIT_IMPORT_PART, _( "Import Part..." ) ); + menuLibrary->Append( ID_LIBEDIT_PASTE_PART, _( "Paste Part" ) ); std::unique_ptr menuPart = std::make_unique(); - menuPart->Append( ID_LIBEDIT_EDIT_PART, _( "Edit" ) ); - menuPart->Append( ID_LIBEDIT_REMOVE_PART, _( "Remove" ) ); - menuPart->Append( ID_LIBEDIT_EXPORT_PART, _( "Export..." ) ); - menuPart->Append( ID_LIBEDIT_SAVE_PART, _( "Save" ) ); - menuPart->Append( ID_LIBEDIT_REVERT_PART, _( "Revert" ) ); + menuPart->Append( ID_LIBEDIT_EDIT_PART, _( "Edit Part" ) ); + menuPart->Append( ID_LIBEDIT_REMOVE_PART, _( "Remove Part" ) ); + menuPart->Append( ID_LIBEDIT_EXPORT_PART, _( "Export Part..." ) ); + menuPart->Append( ID_LIBEDIT_SAVE_PART, _( "&Save Part" ) ); + menuPart->Append( ID_LIBEDIT_REVERT_PART, _( "&Revert Part" ) ); menuPart->AppendSeparator(); - menuPart->Append( ID_LIBEDIT_CUT_PART, _( "Cut" ) ); - menuPart->Append( ID_LIBEDIT_COPY_PART, _( "Copy" ) ); - menuPart->Append( ID_LIBEDIT_DUPLICATE_PART, _( "Duplicate" ) ); + menuPart->Append( ID_LIBEDIT_CUT_PART, _( "Cut Part" ) ); + menuPart->Append( ID_LIBEDIT_COPY_PART, _( "Copy Part" ) ); + menuPart->Append( ID_LIBEDIT_DUPLICATE_PART, _( "Duplicate Part" ) ); menuPart->AppendSeparator(); // Menu displayed when nothing is selected std::unique_ptr menuNoSelection = std::make_unique(); - menuNoSelection->Append( ID_LIBEDIT_NEW_LIBRARY, _( "New library..." ) ); - menuNoSelection->Append( ID_LIBEDIT_ADD_LIBRARY, _( "Add existing library..." ) ); + menuNoSelection->Append( ID_LIBEDIT_NEW_LIBRARY, _( "&New Library..." ) ); + menuNoSelection->Append( ID_LIBEDIT_ADD_LIBRARY, _( "&Add Library..." ) ); m_tree->SetMenu( CMP_TREE_NODE::LIBID, std::move( menuPart ) ); m_tree->SetMenu( CMP_TREE_NODE::LIB, std::move( menuLibrary ) );