From ca0164aa07661cfe760c4345ddb779a5a31f615c Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Wed, 30 Jan 2019 19:51:49 +0000 Subject: [PATCH] Unify library browser terminology. Fixes: lp:1813882 * https://bugs.launchpad.net/kicad/+bug/1813882 --- eeschema/libedit/menubar_libedit.cpp | 2 +- eeschema/menubar.cpp | 2 +- eeschema/viewlib_frame.cpp | 2 +- pcbnew/footprint_viewer_frame.cpp | 2 +- pcbnew/menubar_footprint_editor.cpp | 4 ++-- pcbnew/menubar_pcb_editor.cpp | 4 ++-- qa/qa_utils/CMakeLists.txt | 1 + 7 files changed, 9 insertions(+), 8 deletions(-) diff --git a/eeschema/libedit/menubar_libedit.cpp b/eeschema/libedit/menubar_libedit.cpp index 47e9f96c79..9270fb50e6 100644 --- a/eeschema/libedit/menubar_libedit.cpp +++ b/eeschema/libedit/menubar_libedit.cpp @@ -168,7 +168,7 @@ void LIB_EDIT_FRAME::ReCreateMenuBar() AddMenuItem( viewMenu, ID_TO_LIBVIEW, - _( "Library Browser" ), + _( "Symbol Library Browser" ), _( "Open the symbol viewer" ), KiBitmap( library_browse_xpm ) ); diff --git a/eeschema/menubar.cpp b/eeschema/menubar.cpp index 0a03ebde1e..c209a40385 100644 --- a/eeschema/menubar.cpp +++ b/eeschema/menubar.cpp @@ -131,7 +131,7 @@ void prepareViewMenu( wxMenu* aParentMenu ) AddMenuItem( aParentMenu, ID_TO_LIBVIEW, - _( "Library &Browser" ), HELP_RUN_LIB_VIEWER, + _( "Symbol Library &Browser" ), HELP_RUN_LIB_VIEWER, KiBitmap( library_browse_xpm ) ); AddMenuItem( aParentMenu, diff --git a/eeschema/viewlib_frame.cpp b/eeschema/viewlib_frame.cpp index 0e81b19dc3..336e4df4c5 100644 --- a/eeschema/viewlib_frame.cpp +++ b/eeschema/viewlib_frame.cpp @@ -103,7 +103,7 @@ END_EVENT_TABLE() LIB_VIEW_FRAME::LIB_VIEW_FRAME( KIWAY* aKiway, wxWindow* aParent, FRAME_T aFrameType, const wxString& aLibraryName ) : - SCH_BASE_FRAME( aKiway, aParent, aFrameType, _( "Library Browser" ), + SCH_BASE_FRAME( aKiway, aParent, aFrameType, _( "Symbol Library Browser" ), wxDefaultPosition, wxDefaultSize, aFrameType == FRAME_SCH_VIEWER_MODAL ? LIB_VIEW_STYLE_MODAL : LIB_VIEW_STYLE, aFrameType == FRAME_SCH_VIEWER_MODAL ? LIB_VIEW_NAME_MODAL : LIB_VIEW_NAME ), diff --git a/pcbnew/footprint_viewer_frame.cpp b/pcbnew/footprint_viewer_frame.cpp index c335915126..45b0daa150 100644 --- a/pcbnew/footprint_viewer_frame.cpp +++ b/pcbnew/footprint_viewer_frame.cpp @@ -725,7 +725,7 @@ void FOOTPRINT_VIEWER_FRAME::UpdateTitle() wxString title; wxString path; - title.Printf( _( "Library Browser" ) + L" \u2014 %s", + title.Printf( _( "Footprint Library Browser" ) + L" \u2014 %s", getCurNickname().size() ? getCurNickname() : _( "no library selected" ) ); diff --git a/pcbnew/menubar_footprint_editor.cpp b/pcbnew/menubar_footprint_editor.cpp index ced90d1474..45d27dcd92 100644 --- a/pcbnew/menubar_footprint_editor.cpp +++ b/pcbnew/menubar_footprint_editor.cpp @@ -191,8 +191,8 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar() wxMenu* viewMenu = new wxMenu; AddMenuItem( viewMenu, ID_OPEN_MODULE_VIEWER, - _( "&Library Browser" ), - _( "Open the Library Browser" ), + _( "Footprint &Library Browser" ), + _( "Browse footprint libraries" ), KiBitmap( modview_icon_xpm ) ); text = AddHotkeyName( _( "&3D Viewer" ), m_hotkeysDescrList, HK_3D_VIEWER ); diff --git a/pcbnew/menubar_pcb_editor.cpp b/pcbnew/menubar_pcb_editor.cpp index 9683cfe803..2fdf37450b 100644 --- a/pcbnew/menubar_pcb_editor.cpp +++ b/pcbnew/menubar_pcb_editor.cpp @@ -546,8 +546,8 @@ void prepareViewMenu( wxMenu* aParentMenu, bool aUseGal ) KiBitmap( mw_toolbar_xpm ), wxITEM_CHECK ); AddMenuItem( aParentMenu, ID_OPEN_MODULE_VIEWER, - _( "&Library Browser" ), - _( "Open the Library Browser" ), + _( "Footprint &Library Browser" ), + _( "Browse footprint libraries" ), KiBitmap( modview_icon_xpm ) ); text = AddHotkeyName( _( "&3D Viewer" ), g_Board_Editor_Hotkeys_Descr, HK_3D_VIEWER ); diff --git a/qa/qa_utils/CMakeLists.txt b/qa/qa_utils/CMakeLists.txt index 20fed4511b..29d2b23add 100644 --- a/qa/qa_utils/CMakeLists.txt +++ b/qa/qa_utils/CMakeLists.txt @@ -42,4 +42,5 @@ target_link_libraries( qa_utils target_include_directories( qa_utils PUBLIC include + ${Boost_INCLUDE_DIR} ) \ No newline at end of file