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

2.9 wx rat race

This commit is contained in:
Dick Hollenbeck 2013-04-10 16:06:49 -05:00
parent 297a54fa3e
commit e5740af069
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
kicad/prjconfig.cpp
View File

@ -58,8 +58,9 @@ PARAM_CFG_ARRAY s_KicadManagerParams;
void KICAD_MANAGER_FRAME::CreateNewProject( const wxString aPrjFullFileName, bool aTemplateSelector = false ) void KICAD_MANAGER_FRAME::CreateNewProject( const wxString aPrjFullFileName, bool aTemplateSelector = false )
{ {
wxString filename; wxString filename;
wxFileName newProjectName = aPrjFullFileName; wxFileName newProjectName = aPrjFullFileName;
wxChar sep[2] = { SEP(), 0 }; // nul terminated separator wxChar string.
ClearMsg(); ClearMsg();
@ -71,40 +72,42 @@ void KICAD_MANAGER_FRAME::CreateNewProject( const wxString aPrjFullFileName, boo
{ {
DIALOG_TEMPLATE_SELECTOR* ps = new DIALOG_TEMPLATE_SELECTOR( this ); DIALOG_TEMPLATE_SELECTOR* ps = new DIALOG_TEMPLATE_SELECTOR( this );
wxFileName templatePath; wxFileName templatePath;
wxString envStr;
wxGetEnv( wxT( "KICAD" ), &envStr );
// Add a new tab for system templates // Add a new tab for system templates
if( ::wxGetEnv( wxT( "KICAD" ), NULL ) ) if( !envStr.empty() )
{ {
wxString kicadEnv; // user may or may not have including terminating separator.
wxGetEnv( wxT( "KICAD"), &kicadEnv ); if( !envStr.EndsWith( sep ) )
envStr += sep;
templatePath = kicadEnv + SEP() + wxT("template") + SEP(); templatePath = envStr + wxT("template") + sep;
} }
else else
{ {
templatePath = wxPathOnly(wxStandardPaths::Get().GetExecutablePath()) + templatePath = wxPathOnly(wxStandardPaths::Get().GetExecutablePath()) +
SEP() + wxT( ".." ) + SEP() + wxT( "share" ) + SEP() + wxT( "template" ) + SEP(); sep + wxT( ".." ) + sep + wxT( "share" ) + sep + wxT( "template" ) + sep;
} }
ps->AddPage( _( "System Templates" ), templatePath ); ps->AddPage( _( "System Templates" ), templatePath );
// Add a new tab for user templates // Add a new tab for user templates
wxFileName userPath = wxStandardPaths::Get().GetDocumentsDir() + wxFileName userPath = wxStandardPaths::Get().GetDocumentsDir() +
SEP() + wxT( "kicad" ) + SEP() + wxT( "template" ) + SEP(); sep + wxT( "kicad" ) + sep + wxT( "template" ) + sep;
ps->AddPage( _( "User Templates" ), userPath ); ps->AddPage( _( "User Templates" ), userPath );
// Check to see if a custom template location is available and setup a new selection tab // Check to see if a custom template location is available and setup a
// if there is // new selection tab if there is.
wxString envStr; envStr.clear();
wxGetEnv( wxT( "KICAD_PTEMPLATES" ), &envStr ); wxGetEnv( wxT( "KICAD_PTEMPLATES" ), &envStr );
if( envStr ) if( !envStr.empty() )
{ {
wxChar sep = SEP(); if( !envStr.EndsWith( sep ) )
if( !envStr.EndsWith( &sep ) )
envStr += sep; envStr += sep;
wxFileName envPath = envStr; wxFileName envPath = envStr;