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

Cvpcb: very minor fixes.

This commit is contained in:
jean-pierre charras 2015-01-11 19:35:02 +01:00
parent 972329527e
commit 670df702b7
3 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cvpcb/cvframe.cpp
View File

@ -687,32 +687,33 @@ void CVPCB_MAINFRAME::DisplayStatus()
} }
msg.Empty(); msg.Empty();
wxString filters;
if( m_footprintListBox ) if( m_footprintListBox )
{ {
if( m_mainToolBar->GetToolToggled( ID_CVPCB_FOOTPRINT_DISPLAY_FILTERED_LIST ) ) 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( m_mainToolBar->GetToolToggled( ID_CVPCB_FOOTPRINT_DISPLAY_PIN_FILTERED_LIST ) )
{ {
if( !msg.IsEmpty() ) if( !filters.IsEmpty() )
msg += wxT( ", " ); filters += wxT( "+" );
msg += _( "pin count" ); filters += _( "pin count" );
} }
if( m_mainToolBar->GetToolToggled( ID_CVPCB_FOOTPRINT_DISPLAY_BY_LIBRARY_LIST ) ) if( m_mainToolBar->GetToolToggled( ID_CVPCB_FOOTPRINT_DISPLAY_BY_LIBRARY_LIST ) )
{ {
if( !msg.IsEmpty() ) if( !filters.IsEmpty() )
msg += wxT( ", " ); filters += wxT( "+" );
msg += _( "library" ); filters += _( "library" );
} }
if( msg.IsEmpty() ) if( filters.IsEmpty() )
msg = _( "No filtering" ); msg = _( "No filtering" );
else else
msg = _( "Filtered by " ) + msg; msg.Printf( _( "Filtered by %s" ), GetChars( filters ) );
msg << wxT( ": " ) << m_footprintListBox->GetCount(); msg << wxT( ": " ) << m_footprintListBox->GetCount();
@ -750,7 +751,7 @@ void CVPCB_MAINFRAME::UpdateTitle()
PROJECT& prj = Prj(); PROJECT& prj = Prj();
wxFileName fn = prj.GetProjectFullName(); wxFileName fn = prj.GetProjectFullName();
if( fn.IsOk() && fn.FileExists() ) if( fn.IsOk() && !prj.GetProjectFullName().IsEmpty() && fn.FileExists() )
{ {
title += wxString::Format( _("Project: '%s' (netlist: '%s')"), title += wxString::Format( _("Project: '%s' (netlist: '%s')"),
GetChars( fn.GetFullPath() ), GetChars( fn.GetFullPath() ),

2
include/config_params.h
View File

@ -47,7 +47,7 @@
#define GROUP_SCH_LIBS wxT( "/eeschema/libraries" ) /// library list section #define GROUP_SCH_LIBS wxT( "/eeschema/libraries" ) /// library list section
#define GROUP_CVP wxT("/cvpcb") #define GROUP_CVP wxT("/cvpcb")
#define GROUP_CVP_EQU wxT("/cvpcb/libraries") #define GROUP_CVP_EQU wxT("/cvpcb/equfiles")
#define CONFIG_VERSION 1 #define CONFIG_VERSION 1

12
template/kicad.pro
View File

@ -1,15 +1,10 @@
update=30/03/2013 13:45:59 update=11/01/2015 18:31:38
version=1 version=1
last_client=pcbnew last_client=kicad
[general] [general]
version=1 version=1
RootSch= RootSch=
BoardNm= BoardNm=
[cvpcb]
version=1
NetIExt=net
[cvpcb/libraries]
EquName1=devcms
[eeschema] [eeschema]
version=1 version=1
LibDir= LibDir=
@ -68,3 +63,6 @@ SolderMaskMinWidth=0.000000000000
DrawSegmentWidth=0.200000000000 DrawSegmentWidth=0.200000000000
BoardOutlineThickness=0.100000000000 BoardOutlineThickness=0.100000000000
ModuleOutlineThickness=0.150000000000 ModuleOutlineThickness=0.150000000000
[cvpcb]
version=1
NetIExt=net