From 611d5a0dc4f60aa86123575eb3fb39afea78ce03 Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Wed, 4 Apr 2018 19:22:28 +0100
Subject: [PATCH] Standardize "assign footprints" terminology.

Fixes: lp:1760867
* https://bugs.launchpad.net/kicad/+bug/1760867
---
 cvpcb/cvpcb_mainframe.cpp | 25 +------------------------
 cvpcb/cvpcb_mainframe.h   | 10 ----------
 cvpcb/readwrite_dlgs.cpp  |  1 -
 eeschema/menubar.cpp      |  4 ++--
 4 files changed, 3 insertions(+), 37 deletions(-)

diff --git a/cvpcb/cvpcb_mainframe.cpp b/cvpcb/cvpcb_mainframe.cpp
index a36d19f438..89e7f04379 100644
--- a/cvpcb/cvpcb_mainframe.cpp
+++ b/cvpcb/cvpcb_mainframe.cpp
@@ -106,7 +106,7 @@ END_EVENT_TABLE()
 
 
 CVPCB_MAINFRAME::CVPCB_MAINFRAME( KIWAY* aKiway, wxWindow* aParent ) :
-    KIWAY_PLAYER( aKiway, aParent, FRAME_CVPCB, wxT( "CvPCB" ), wxDefaultPosition,
+    KIWAY_PLAYER( aKiway, aParent, FRAME_CVPCB, _( "Assign Footprints" ), wxDefaultPosition,
         wxDefaultSize, KICAD_DEFAULT_DRAWFRAME_STYLE, CVPCB_MAINFRAME_NAME )
 {
     m_compListBox           = NULL;
@@ -146,8 +146,6 @@ CVPCB_MAINFRAME::CVPCB_MAINFRAME( KIWAY* aKiway, wxWindow* aParent ) :
 
     m_auimgr.SetManagedWindow( this );
 
-    UpdateTitle();
-
     EDA_PANEINFO horiz;
     horiz.HorizontalToolbarPane();
 
@@ -753,27 +751,6 @@ bool CVPCB_MAINFRAME::LoadFootprintFiles()
 }
 
 
-void CVPCB_MAINFRAME::UpdateTitle()
-{
-    wxString    title;
-    PROJECT&    prj = Prj();
-    wxFileName fn = prj.GetProjectFullName();
-
-    if( fn.IsOk() && !prj.GetProjectFullName().IsEmpty() && fn.FileExists() )
-    {
-        title.Printf( _( "Cvpcb" ) + wxT( " \u2014 %s%s" ),
-                      fn.GetFullPath(),
-                      fn.IsFileWritable() ? wxString( wxEmptyString ) : _( " [Read Only]" ) );
-    }
-    else
-    {
-        title = "Cvpcb";
-    }
-
-    SetTitle( title );
-}
-
-
 void CVPCB_MAINFRAME::SendMessageToEESCHEMA()
 {
     if( m_netlist.IsEmpty() )
diff --git a/cvpcb/cvpcb_mainframe.h b/cvpcb/cvpcb_mainframe.h
index b7cf96b185..74b37e2086 100644
--- a/cvpcb/cvpcb_mainframe.h
+++ b/cvpcb/cvpcb_mainframe.h
@@ -279,16 +279,6 @@ public:
      */
     PARAM_CFG_ARRAY& GetProjectFileParameters( void );
 
-    /**
-     * Function UpdateTitle
-     * sets the main window title bar text.
-     * <p>
-     * If no current project open( eeschema run outside kicad manager with no schematic loaded),
-     * the title is set to the application name appended with "no project".
-     * Otherwise, the title shows the project name.
-     */
-    void UpdateTitle();
-
     /**
      * Function SendMessageToEESCHEMA
      * Send a remote command to Eeschema via a socket,
diff --git a/cvpcb/readwrite_dlgs.cpp b/cvpcb/readwrite_dlgs.cpp
index 0468776172..9ca7294b38 100644
--- a/cvpcb/readwrite_dlgs.cpp
+++ b/cvpcb/readwrite_dlgs.cpp
@@ -368,7 +368,6 @@ bool CVPCB_MAINFRAME::ReadNetListAndFpFiles( const std::string& aNetlist )
 
     DisplayStatus();
 
-    UpdateTitle();
     return true;
 }
 
diff --git a/eeschema/menubar.cpp b/eeschema/menubar.cpp
index 24f5a229ed..5a426921f0 100644
--- a/eeschema/menubar.cpp
+++ b/eeschema/menubar.cpp
@@ -623,8 +623,8 @@ void prepareToolsMenu( wxMenu* aParentMenu )
     // Run CvPcb
     AddMenuItem( aParentMenu,
                  ID_RUN_CVPCB,
-                 _( "A&ssign Footprints" ),
-                 _( "Run CvPcb" ),
+                 _( "A&ssign Footprints..." ),
+                 _( "Assign PCB footprints to schematic symbols" ),
                  KiBitmap( cvpcb_xpm ) );
 
     aParentMenu->AppendSeparator();