From 670df702b71bba098eda040577824c5ad2f243ec Mon Sep 17 00:00:00 2001
From: jean-pierre charras <jp.charras@wanadoo.fr>
Date: Sun, 11 Jan 2015 19:35:02 +0100
Subject: [PATCH] Cvpcb: very minor fixes.

---
 cvpcb/cvframe.cpp       | 21 +++++++++++----------
 include/config_params.h |  2 +-
 template/kicad.pro      | 12 +++++-------
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/cvpcb/cvframe.cpp b/cvpcb/cvframe.cpp
index 9c007acebe..9ebae1a553 100644
--- a/cvpcb/cvframe.cpp
+++ b/cvpcb/cvframe.cpp
@@ -687,32 +687,33 @@ void CVPCB_MAINFRAME::DisplayStatus()
     }
 
     msg.Empty();
+    wxString filters;
 
     if( m_footprintListBox )
     {
         if( m_mainToolBar->GetToolToggled( ID_CVPCB_FOOTPRINT_DISPLAY_FILTERED_LIST ) )
-            msg = _( "key words" );
+            filters = _( "key words" );
 
         if( m_mainToolBar->GetToolToggled( ID_CVPCB_FOOTPRINT_DISPLAY_PIN_FILTERED_LIST ) )
         {
-            if( !msg.IsEmpty() )
-                msg += wxT( ", " );
+            if( !filters.IsEmpty() )
+                filters += wxT( "+" );
 
-            msg += _( "pin count" );
+            filters += _( "pin count" );
         }
 
         if( m_mainToolBar->GetToolToggled( ID_CVPCB_FOOTPRINT_DISPLAY_BY_LIBRARY_LIST ) )
         {
-            if( !msg.IsEmpty() )
-                msg += wxT( ", " );
+            if( !filters.IsEmpty() )
+                filters += wxT( "+" );
 
-            msg += _( "library" );
+            filters += _( "library" );
         }
 
-        if( msg.IsEmpty() )
+        if( filters.IsEmpty() )
             msg = _( "No filtering" );
         else
-            msg = _( "Filtered by " ) + msg;
+            msg.Printf( _( "Filtered by %s" ), GetChars( filters ) );
 
         msg << wxT( ": " ) << m_footprintListBox->GetCount();
 
@@ -750,7 +751,7 @@ void CVPCB_MAINFRAME::UpdateTitle()
     PROJECT&    prj = Prj();
     wxFileName fn = prj.GetProjectFullName();
 
-    if( fn.IsOk() && fn.FileExists() )
+    if( fn.IsOk() && !prj.GetProjectFullName().IsEmpty() && fn.FileExists() )
     {
         title += wxString::Format( _("Project: '%s'  (netlist: '%s')"),
                                    GetChars( fn.GetFullPath() ),
diff --git a/include/config_params.h b/include/config_params.h
index f7ae973c6c..16cd089bab 100644
--- a/include/config_params.h
+++ b/include/config_params.h
@@ -47,7 +47,7 @@
 #define GROUP_SCH_LIBS      wxT( "/eeschema/libraries" )    /// library list section
 
 #define GROUP_CVP           wxT("/cvpcb")
-#define GROUP_CVP_EQU       wxT("/cvpcb/libraries")
+#define GROUP_CVP_EQU       wxT("/cvpcb/equfiles")
 
 
 #define CONFIG_VERSION      1
diff --git a/template/kicad.pro b/template/kicad.pro
index f5795a5b16..7619361c14 100644
--- a/template/kicad.pro
+++ b/template/kicad.pro
@@ -1,15 +1,10 @@
-update=30/03/2013 13:45:59
+update=11/01/2015 18:31:38
 version=1
-last_client=pcbnew
+last_client=kicad
 [general]
 version=1
 RootSch=
 BoardNm=
-[cvpcb]
-version=1
-NetIExt=net
-[cvpcb/libraries]
-EquName1=devcms
 [eeschema]
 version=1
 LibDir=
@@ -68,3 +63,6 @@ SolderMaskMinWidth=0.000000000000
 DrawSegmentWidth=0.200000000000
 BoardOutlineThickness=0.100000000000
 ModuleOutlineThickness=0.150000000000
+[cvpcb]
+version=1
+NetIExt=net