haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Maciej Suminski 2017-12-19 12:10:11 +01:00
parent f85a886ae4
commit 017fc4da8f
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
eeschema/menubar_libedit.cpp
View File

@ -65,13 +65,13 @@ void LIB_EDIT_FRAME::ReCreateMenuBar()
// Creating/loading libraries // Creating/loading libraries
AddMenuItem( fileMenu, AddMenuItem( fileMenu,
ID_LIBEDIT_NEW_LIBRARY, ID_LIBEDIT_NEW_LIBRARY,
_( "&Create New Library" ), _( "&New Library" ),
_( "Creates an empty library" ), _( "Creates an empty library" ),
KiBitmap( new_library_xpm ) ); KiBitmap( new_library_xpm ) );
AddMenuItem( fileMenu, AddMenuItem( fileMenu,
ID_LIBEDIT_ADD_LIBRARY, ID_LIBEDIT_ADD_LIBRARY,
_( "&Add Existing Library" ), _( "&Add Library" ),
_( "Adds a previously created library" ), _( "Adds a previously created library" ),
KiBitmap( add_library_xpm ) ); KiBitmap( add_library_xpm ) );
@ -87,13 +87,13 @@ void LIB_EDIT_FRAME::ReCreateMenuBar()
AddMenuItem( fileMenu, AddMenuItem( fileMenu,
ID_LIBEDIT_SAVE_LIBRARY_AS, ID_LIBEDIT_SAVE_LIBRARY_AS,
_( "&Save Library As.." ), _( "Save Library As.." ),
_( "Save the current library to a new file" ), _( "Save the current library to a new file" ),
KiBitmap( save_as_xpm ) ); KiBitmap( save_as_xpm ) );
AddMenuItem( fileMenu, AddMenuItem( fileMenu,
ID_LIBEDIT_SAVE_ALL_LIBS, ID_LIBEDIT_SAVE_ALL_LIBS,
_( "&Save All Libraries" ), _( "Save All &Libraries" ),
_( "Save all library changes" ), _( "Save all library changes" ),
KiBitmap( save_xpm ) ); KiBitmap( save_xpm ) );
@ -190,7 +190,7 @@ void LIB_EDIT_FRAME::ReCreateMenuBar()
AddMenuItem( partMenu, AddMenuItem( partMenu,
ID_LIBEDIT_NEW_PART, ID_LIBEDIT_NEW_PART,
_( "Create &New" ), _( "&New Part" ),
_( "Create a new empty part" ), _( "Create a new empty part" ),
KiBitmap( new_component_xpm ) ); KiBitmap( new_component_xpm ) );
@ -205,13 +205,13 @@ void LIB_EDIT_FRAME::ReCreateMenuBar()
AddMenuItem( partMenu, AddMenuItem( partMenu,
ID_LIBEDIT_IMPORT_PART, ID_LIBEDIT_IMPORT_PART,
_( "&Import" ), _( "&Import Part" ),
_( "Import a part to the current library" ), _( "Import a part to the current library" ),
KiBitmap( import_part_xpm ) ); KiBitmap( import_part_xpm ) );
AddMenuItem( partMenu, AddMenuItem( partMenu,
ID_LIBEDIT_EXPORT_PART, ID_LIBEDIT_EXPORT_PART,
_( "&Export" ), _( "&Export Part" ),
_( "Export the current part" ), _( "Export the current part" ),
KiBitmap( export_part_xpm ) ); KiBitmap( export_part_xpm ) );
@ -352,7 +352,7 @@ void LIB_EDIT_FRAME::ReCreateMenuBar()
menuBar->Append( fileMenu, _( "&File" ) ); menuBar->Append( fileMenu, _( "&File" ) );
menuBar->Append( editMenu, _( "&Edit" ) ); menuBar->Append( editMenu, _( "&Edit" ) );
menuBar->Append( viewMenu, _( "&View" ) ); menuBar->Append( viewMenu, _( "&View" ) );
menuBar->Append( partMenu, _( "&Part" ) ); menuBar->Append( partMenu, _( "P&art" ) );
menuBar->Append( placeMenu, _( "&Place" ) ); menuBar->Append( placeMenu, _( "&Place" ) );
menuBar->Append( preferencesMenu, _( "P&references" ) ); menuBar->Append( preferencesMenu, _( "P&references" ) );
menuBar->Append( helpMenu, _( "&Help" ) ); menuBar->Append( helpMenu, _( "&Help" ) );

36
eeschema/widgets/cmp_tree_pane.cpp
View File

@ -47,32 +47,32 @@ CMP_TREE_PANE::CMP_TREE_PANE( LIB_EDIT_FRAME* aParent, LIB_MANAGER* aLibMgr )
// Setup right click-context menus // Setup right click-context menus
std::unique_ptr<wxMenu> menuLibrary = std::make_unique<wxMenu>(); std::unique_ptr<wxMenu> menuLibrary = std::make_unique<wxMenu>();
menuLibrary->Append( ID_LIBEDIT_NEW_LIBRARY, _( "New library..." ) ); menuLibrary->Append( ID_LIBEDIT_NEW_LIBRARY, _( "&New Library..." ) );
menuLibrary->Append( ID_LIBEDIT_ADD_LIBRARY, _( "Add existing library..." ) ); menuLibrary->Append( ID_LIBEDIT_ADD_LIBRARY, _( "&Add Library..." ) );
menuLibrary->Append( ID_LIBEDIT_SAVE_LIBRARY, _( "Save library" ) ); menuLibrary->Append( ID_LIBEDIT_SAVE_LIBRARY, _( "&Save Library" ) );
menuLibrary->Append( ID_LIBEDIT_SAVE_LIBRARY_AS, _( "Save library as..." ) ); menuLibrary->Append( ID_LIBEDIT_SAVE_LIBRARY_AS, _( "Save Library As..." ) );
menuLibrary->Append( ID_LIBEDIT_REVERT_LIBRARY, _( "Revert library" ) ); menuLibrary->Append( ID_LIBEDIT_REVERT_LIBRARY, _( "&Revert Library" ) );
menuLibrary->AppendSeparator(); menuLibrary->AppendSeparator();
menuLibrary->Append( ID_LIBEDIT_NEW_PART, _( "New part..." ) ); menuLibrary->Append( ID_LIBEDIT_NEW_PART, _( "New &Part..." ) );
menuLibrary->Append( ID_LIBEDIT_IMPORT_PART, _( "Import part..." ) ); menuLibrary->Append( ID_LIBEDIT_IMPORT_PART, _( "Import Part..." ) );
menuLibrary->Append( ID_LIBEDIT_PASTE_PART, _( "Paste part" ) ); menuLibrary->Append( ID_LIBEDIT_PASTE_PART, _( "Paste Part" ) );
std::unique_ptr<wxMenu> menuPart = std::make_unique<wxMenu>(); std::unique_ptr<wxMenu> menuPart = std::make_unique<wxMenu>();
menuPart->Append( ID_LIBEDIT_EDIT_PART, _( "Edit" ) ); menuPart->Append( ID_LIBEDIT_EDIT_PART, _( "Edit Part" ) );
menuPart->Append( ID_LIBEDIT_REMOVE_PART, _( "Remove" ) ); menuPart->Append( ID_LIBEDIT_REMOVE_PART, _( "Remove Part" ) );
menuPart->Append( ID_LIBEDIT_EXPORT_PART, _( "Export..." ) ); menuPart->Append( ID_LIBEDIT_EXPORT_PART, _( "Export Part..." ) );
menuPart->Append( ID_LIBEDIT_SAVE_PART, _( "Save" ) ); menuPart->Append( ID_LIBEDIT_SAVE_PART, _( "&Save Part" ) );
menuPart->Append( ID_LIBEDIT_REVERT_PART, _( "Revert" ) ); menuPart->Append( ID_LIBEDIT_REVERT_PART, _( "&Revert Part" ) );
menuPart->AppendSeparator(); menuPart->AppendSeparator();
menuPart->Append( ID_LIBEDIT_CUT_PART, _( "Cut" ) ); menuPart->Append( ID_LIBEDIT_CUT_PART, _( "Cut Part" ) );
menuPart->Append( ID_LIBEDIT_COPY_PART, _( "Copy" ) ); menuPart->Append( ID_LIBEDIT_COPY_PART, _( "Copy Part" ) );
menuPart->Append( ID_LIBEDIT_DUPLICATE_PART, _( "Duplicate" ) ); menuPart->Append( ID_LIBEDIT_DUPLICATE_PART, _( "Duplicate Part" ) );
menuPart->AppendSeparator(); menuPart->AppendSeparator();
// Menu displayed when nothing is selected // Menu displayed when nothing is selected
std::unique_ptr<wxMenu> menuNoSelection = std::make_unique<wxMenu>(); std::unique_ptr<wxMenu> menuNoSelection = std::make_unique<wxMenu>();
menuNoSelection->Append( ID_LIBEDIT_NEW_LIBRARY, _( "New library..." ) ); menuNoSelection->Append( ID_LIBEDIT_NEW_LIBRARY, _( "&New Library..." ) );
menuNoSelection->Append( ID_LIBEDIT_ADD_LIBRARY, _( "Add existing 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::LIBID, std::move( menuPart ) );
m_tree->SetMenu( CMP_TREE_NODE::LIB, std::move( menuLibrary ) ); m_tree->SetMenu( CMP_TREE_NODE::LIB, std::move( menuLibrary ) );